Merge pull request #2 from mishamyrt/develop

Release 1.000
mishamyrt · Oct 25, 2019 · 23fa466 · 23fa466
2 parents 9804b6a + d8e9f8d
commit 23fa466
Show file tree

Hide file tree

Showing 61 changed files with 90 additions and 83 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.000] — October 25, 2019
+
+Removed Retina, added Medium.
+
 ## [1.000 rc1] — October 21, 2019
 
 Rebuilt from bash scripts to Makefile.
@@ -32,4 +36,6 @@ IBM Plex Mono version: 3.000
 
 [1.000 beta2]: https://github.com/mishamyrt/Lilex/releases/tag/1.000-beta2
 
-[1.000 rc1]: https://github.com/mishamyrt/Lilex/releases/tag/1.000-rc1
+[1.000 rc1]: https://github.com/mishamyrt/Lilex/releases/tag/1.000-rc1
+
+[1.000]: https://github.com/mishamyrt/Lilex/releases/tag/1.000
diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
-BUILD_DIRECTORY=build
-DESIGNSPACE_FILE=source/Lilex.designspace
-VF_FILE="$(BUILD_DIRECTORY)/variable_ttf/Lilex-VF.ttf"
+BUILD_DIRECTORY := "build"
+DESIGNSPACE_FILE := "source/Lilex.designspace"
+VF_FILE := "$(BUILD_DIRECTORY)/variable_ttf/Lilex-VF.ttf"
 UNAME := $(shell uname)
 ifeq (, $(shell which lsb_release))
-OS := $(UNAME)
+OS := "$(UNAME)"
 else
-OS := $(shell lsb_release -si)
+OS := "$(shell lsb_release -si)"
 endif
 
 all: ttf otf variable_ttf
@@ -14,10 +14,11 @@ ttf: raw_ttf
 	$(foreach file,$(wildcard $(BUILD_DIRECTORY)/ttf/*.ttf),$(call ttf_fix,$(file)))
 
 raw_ttf:
-	fontmake -m $(DESIGNSPACE_FILE) -o ttf --output-dir "$(BUILD_DIRECTORY)/ttf" -i
+	fontmake -m $(DESIGNSPACE_FILE) -o ttf \
+	--output-dir "$(BUILD_DIRECTORY)/ttf" -i
 
 otf:
-	fontmake -m $(DESIGNSPACE_FILE) -o otf  \
+	fontmake -m $(DESIGNSPACE_FILE) -o otf \
 	--output-dir "$(BUILD_DIRECTORY)/otf" -i
 
 variable_ttf:
@@ -31,22 +32,22 @@ variable_ttf:
 	rm $(BUILD_DIRECTORY)/variable_ttf/Lilex-VF.ttf.fix
 
 install:
-	 -@make install_$(UNAME)
+	make install_$(UNAME)
 
 bootstrap:
-	 -@make bootstrap_$(OS)
+	make bootstrap_$(OS)
 
 install_Darwin:
 	rm -rf ~/Library/Fonts/Lilex
 	cp -r build/otf ~/Library/Fonts/Lilex
 
 bootstrap_Darwin:
 	brew install cairo freetype harfbuzz pkg-config ttfautohint python3
-	-@make bootstrap_pip
+	make bootstrap_pip
 
 bootstrap_Ubuntu:
 	apt install python3-setuptools ttfautohint
-	-@make bootstrap_pip
+	make bootstrap_pip
 
 bootstrap_pip:
 	pip3 install fonttools git+https://github.com/googlefonts/gftools fontmake

diff --git a/source/Lilex.designspace b/source/Lilex.designspace
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
 <designspace format="3">
  <axes>
-  <axis name="weight" tag="wght" minimum="340" maximum="700" default="400">
+  <axis maximum="700" default="400" minimum="340" tag="wght" name="weight">
    <labelname xml:lang="en">Weight</labelname>
   </axis>
  </axes>
  <sources>
-  <source name="Regular" filename="masters/Lilex-Regular.ufo" stylename="Regular" familyname="Lilex">
+  <source familyname="Lilex" stylename="Regular" name="Regular" filename="masters/Lilex-Regular.ufo">
    <lib copy="1"/>
    <groups copy="1"/>
    <info copy="1"/>
@@ -15,31 +15,31 @@
     <dimension name="weight" xvalue="400"/>
    </location>
   </source>
-  <source name="Bold" filename="masters/Lilex-Bold.ufo" stylename="Bold" familyname="Lilex">
+  <source familyname="Lilex" stylename="Bold" name="Bold" filename="masters/Lilex-Bold.ufo">
    <location>
     <dimension name="weight" xvalue="700"/>
    </location>
   </source>
  </sources>
  <instances>
-  <instance name="Regular" filename="instances/Lilex-Regular.ufo" stylename="Regular" familyname="Lilex">
+  <instance familyname="Lilex" stylename="Light" name="Light" filename="instances/Lilex-Light.ufo">
    <location>
-    <dimension name="weight" xvalue="400"/>
+    <dimension name="weight" xvalue="340"/>
    </location>
   </instance>
-  <instance name="Bold" filename="instances/Lilex-Bold.ufo" stylename="Bold" familyname="Lilex">
+  <instance familyname="Lilex" stylename="Regular" name="Regular" filename="instances/Lilex-Regular.ufo">
    <location>
-    <dimension name="weight" xvalue="700"/>
+    <dimension name="weight" xvalue="400"/>
    </location>
   </instance>
-  <instance name="Light" filename="instances/Lilex-Light.ufo" stylename="Light" familyname="Lilex">
+  <instance familyname="Lilex" stylename="Medium" name="Medium" filename="instances/Lilex-Medium.ufo">
    <location>
-    <dimension name="weight" xvalue="340"/>
+    <dimension name="weight" xvalue="500"/>
    </location>
   </instance>
-  <instance name="Retina" filename="instances/Lilex-Retina.ufo" stylename="Retina" familyname="Lilex">
+  <instance familyname="Lilex" stylename="Bold" name="Bold" filename="instances/Lilex-Bold.ufo">
    <location>
-    <dimension name="weight" xvalue="410"/>
+    <dimension name="weight" xvalue="700"/>
    </location>
   </instance>
  </instances>

diff --git a/source/masters/Lilex-Bold.ufo/fontinfo.plist b/source/masters/Lilex-Bold.ufo/fontinfo.plist
@@ -15,7 +15,7 @@
   <key>italicAngle</key>
   <integer>0</integer>
   <key>openTypeHeadCreated</key>
-  <string>2019/10/20 21:32:44</string>
+  <string>2019/10/25 20:29:12</string>
   <key>openTypeHeadFlags</key>
   <array>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/_path_arrowhead_single.glif b/source/masters/Lilex-Bold.ufo/glyphs/_path_arrowhead_single.glif
@@ -20,7 +20,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.636</real>
+    <real>0.642</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/colon.valign.glif b/source/masters/Lilex-Bold.ufo/glyphs/colon.valign.glif
@@ -9,7 +9,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.609</real>
+    <real>0.616</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/colon_colon.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/colon_colon.liga.glif
@@ -10,7 +10,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.676</real>
+    <real>0.682</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/colon_equal.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/colon_equal.liga.glif
@@ -10,7 +10,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.649</real>
+    <real>0.656</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/equal_colon_equal.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/equal_colon_equal.liga.glif
@@ -11,7 +11,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.616</real>
+    <real>0.622</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/equal_exclam_equal.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/equal_exclam_equal.liga.glif
@@ -11,7 +11,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.616</real>
+    <real>0.622</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/equal_greater_greater.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/equal_greater_greater.liga.glif
@@ -47,7 +47,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.616</real>
+    <real>0.622</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/greater_greater.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/greater_greater.liga.glif
@@ -10,7 +10,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.622</real>
+    <real>0.629</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/hyphen_greater.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/hyphen_greater.liga.glif
@@ -17,7 +17,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.636</real>
+    <real>0.642</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/hyphen_hyphen.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/hyphen_hyphen.liga.glif
@@ -10,7 +10,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.676</real>
+    <real>0.682</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/less_equal_greater.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/less_equal_greater.liga.glif
@@ -50,7 +50,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.622</real>
+    <real>0.629</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/less_hyphen.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/less_hyphen.liga.glif
@@ -9,7 +9,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.629</real>
+    <real>0.636</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/less_less_equal.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/less_less_equal.liga.glif
@@ -9,7 +9,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.602</real>
+    <real>0.609</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/less_slash.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/less_slash.liga.glif
@@ -24,7 +24,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.676</real>
+    <real>0.682</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/less_slash_greater.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/less_slash_greater.liga.glif
@@ -34,7 +34,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.629</real>
+    <real>0.636</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/numbersign_exclam.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/numbersign_exclam.liga.glif
@@ -37,7 +37,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.676</real>
+    <real>0.682</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/numbersign_numbersign.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/numbersign_numbersign.liga.glif
@@ -60,7 +60,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.622</real>
+    <real>0.629</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/numbersign_numbersign_numbersign.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/numbersign_numbersign_numbersign.liga.glif
@@ -84,7 +84,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.622</real>
+    <real>0.629</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/numbersign_numbersign_numbersign_numbersign.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/numbersign_numbersign_numbersign_numbersign.liga.glif
@@ -106,7 +106,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.622</real>
+    <real>0.629</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/period_equal.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/period_equal.liga.glif
@@ -10,7 +10,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.649</real>
+    <real>0.656</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/period_period.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/period_period.liga.glif
@@ -10,7 +10,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.676</real>
+    <real>0.682</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/period_period_period.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/period_period_period.liga.glif
@@ -11,7 +11,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.676</real>
+    <real>0.682</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/plus_plus.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/plus_plus.liga.glif
@@ -30,7 +30,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.676</real>
+    <real>0.682</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/slash_asciitilde_backslash.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/slash_asciitilde_backslash.liga.glif
@@ -4,14 +4,14 @@
   <outline>
     <component base="slash" xOffset="-2403"/>
     <component base="backslash" xOffset="-3"/>
-    <component base="asciitilde_asciitilde.liga" xScale="0.951864" yScale="1" xOffset="-650.989" yOffset="-718"/>
+    <component base="asciitilde_asciitilde.liga" xScale="0.951864" xOffset="-650.989" yOffset="-718"/>
   </outline>
   <lib>
   <dict>
   <key>com.typemytype.robofont.mark</key>
   <array>
-    <real>0.604</real>
     <real>0.6</real>
+    <real>0.602</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/slash_equal.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/slash_equal.liga.glif
@@ -26,7 +26,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.649</real>
+    <real>0.656</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/slash_greater.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/slash_greater.liga.glif
@@ -24,7 +24,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.676</real>
+    <real>0.682</real>
     <real>1</real>
     <real>1</real>
   </array>

diff --git a/source/masters/Lilex-Bold.ufo/glyphs/underscore_underscore.liga.glif b/source/masters/Lilex-Bold.ufo/glyphs/underscore_underscore.liga.glif
@@ -14,7 +14,7 @@
   <key>com.typemytype.robofont.mark</key>
   <array>
     <real>0.6</real>
-    <real>0.649</real>
+    <real>0.656</real>
     <real>1</real>
     <real>1</real>
   </array>