Skip to content

Commit

Permalink
Updated middle weights in masters to see if that fixed VF gen issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@EbenSorkin
EbenSorkin committed Feb 18, 2019
1 parent 8efc1f8 commit b7670e1
Show file tree
Hide file tree
Showing 3,575 changed files with 102,280 additions and 109,601 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified fonts/ttfs/MerriweatherSans-Black.ttf
View file
Binary file not shown.
Binary file modified fonts/ttfs/MerriweatherSans-Bold.ttf
View file
Binary file not shown.
Binary file modified fonts/ttfs/MerriweatherSans-BoldItalic.ttf
View file
Binary file not shown.
Binary file modified fonts/ttfs/MerriweatherSans-Italic.ttf
View file
Binary file not shown.
Binary file modified fonts/ttfs/MerriweatherSans-Light.ttf
View file
Binary file not shown.
Binary file modified fonts/ttfs/MerriweatherSans-LightItalic.ttf
View file
Binary file not shown.
Binary file modified fonts/ttfs/MerriweatherSans-Regular.ttf
View file
Binary file not shown.
Binary file modified fonts/ttfs/MerriweatherSans-UltraBoldItalic.ttf
View file
Binary file not shown.
49,335 changes: 24,234 additions & 25,101 deletions sources/MerriweatherSans for VF.glyphs
View file

Large diffs are not rendered by default.

78,510 changes: 35,862 additions & 42,648 deletions sources/MerriweatherSans-Italic for VF.glyphs
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions sources/build.sh
View file
Expand Up @@ -3,17 +3,17 @@ set -e

cd sources

# echo "Generating Static fonts"
# mkdir -p ../fonts/ttfs
# fontmake -g "MerriweatherSans for VF.glyphs" -i -o ttf --output-dir ../fonts/ttfs/
# fontmake -g "MerriweatherSans-Italic for VF.glyphs" -i -o ttf --output-dir ../fonts/ttfs/
echo "Generating Static fonts"
mkdir -p ../fonts/ttfs
fontmake -g "MerriweatherSans for VF.glyphs" -i -o ttf --output-dir ../fonts/ttfs/
fontmake -g "MerriweatherSans-Italic for VF.glyphs" -i -o ttf --output-dir ../fonts/ttfs/

echo "Generating VFs"
mkdir -p ../fonts/variable
fontmake -g "MerriweatherSans for VF.glyphs" -o variable --output-path ../fonts/variable/MerriweatherSans-Roman-VF.ttf
fontmake -g "MerriweatherSans-Italic for VF.glyphs" -o variable --output-path ../fonts/variable/MerriweatherSans-Italic-VF.ttf

rm -rf master_ufo/ instance_ufo/
# rm -rf master_ufo/ instance_ufo/
echo "Post processing"


Expand Down
4 changes: 2 additions & 2 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/L_caron.glif
View file
Expand Up @@ -9,12 +9,12 @@
<anchor x="528.0" y="743.0" name="topright"/>
<outline>
<component base="L"/>
<component base="caronvertical" xOffset="351.0"/>
<component base="caroncomb.alt" xOffset="320.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/01/21 06:08:13</string>
<string>2019/02/18 19:53:16</string>
<key>com.schriftgestaltung.componentsAlignment</key>
<array>
<integer>-1</integer>
Expand Down
11 changes: 8 additions & 3 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/O_horn.glif
View file
Expand Up @@ -8,15 +8,20 @@
<anchor x="392.0" y="372.0" name="center"/>
<anchor x="705.0" y="10.0" name="ogonek"/>
<anchor x="20.0" y="743.0" name="topleft"/>
<anchor x="763.0" y="743.0" name="topright"/>
<anchor x="599.0" y="743.0" name="topright"/>
<outline>
<component base="O"/>
<component base="horncomb.case" xOffset="657.0" yOffset="186.0"/>
<component base="horncomb.case" xOffset="493.0" yOffset="186.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:39:16</string>
<string>2019/02/18 20:05:25</string>
<key>com.schriftgestaltung.componentsAlignment</key>
<array>
<integer>0</integer>
<integer>-1</integer>
</array>
</dict>
</lib>
</glyph>
6 changes: 4 additions & 2 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/O_hornacute.glif
View file
Expand Up @@ -8,15 +8,17 @@
<anchor x="705.0" y="10.0" name="ogonek"/>
<anchor x="392.0" y="956.0" name="top"/>
<anchor x="20.0" y="743.0" name="topleft"/>
<anchor x="763.0" y="743.0" name="topright"/>
<anchor x="599.0" y="743.0" name="topright"/>
<outline>
<component base="Ohorn"/>
<component base="acutecomb.case" xOffset="392.0" yOffset="-87.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:25</string>
<string>2019/02/18 20:05:37</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
6 changes: 4 additions & 2 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/O_horndotbelow.glif
View file
Expand Up @@ -8,15 +8,17 @@
<anchor x="705.0" y="10.0" name="ogonek"/>
<anchor x="392.0" y="743.0" name="top"/>
<anchor x="20.0" y="743.0" name="topleft"/>
<anchor x="763.0" y="743.0" name="topright"/>
<anchor x="599.0" y="743.0" name="topright"/>
<outline>
<component base="Ohorn"/>
<component base="dotbelowcomb.case" xOffset="392.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:25</string>
<string>2019/02/18 20:05:37</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
6 changes: 4 additions & 2 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/O_horngrave.glif
View file
Expand Up @@ -8,15 +8,17 @@
<anchor x="705.0" y="10.0" name="ogonek"/>
<anchor x="337.0" y="934.0" name="top"/>
<anchor x="20.0" y="743.0" name="topleft"/>
<anchor x="763.0" y="743.0" name="topright"/>
<anchor x="599.0" y="743.0" name="topright"/>
<outline>
<component base="Ohorn"/>
<component base="gravecomb.case" xOffset="392.0" yOffset="-87.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:25</string>
<string>2019/02/18 20:05:37</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
6 changes: 4 additions & 2 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/O_hornhookabove.glif
View file
Expand Up @@ -8,15 +8,17 @@
<anchor x="705.0" y="10.0" name="ogonek"/>
<anchor x="392.0" y="896.0" name="top"/>
<anchor x="20.0" y="743.0" name="topleft"/>
<anchor x="763.0" y="743.0" name="topright"/>
<anchor x="599.0" y="743.0" name="topright"/>
<outline>
<component base="Ohorn"/>
<component base="hookabovecomb.case" xOffset="392.0" yOffset="-94.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:25</string>
<string>2019/02/18 20:05:37</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
6 changes: 4 additions & 2 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/O_horntilde.glif
View file
Expand Up @@ -8,15 +8,17 @@
<anchor x="705.0" y="10.0" name="ogonek"/>
<anchor x="392.0" y="970.0" name="top"/>
<anchor x="20.0" y="743.0" name="topleft"/>
<anchor x="763.0" y="743.0" name="topright"/>
<anchor x="599.0" y="743.0" name="topright"/>
<outline>
<component base="Ohorn"/>
<component base="tildecomb.case" xOffset="392.0" yOffset="-102.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:25</string>
<string>2019/02/18 20:05:37</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
2 changes: 1 addition & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/caroncomb.alt.glif
View file
Expand Up @@ -24,7 +24,7 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/15 20:51:28</string>
<string>2019/02/18 19:50:58</string>
<key>com.schriftgestaltung.Glyphs.originalWidth</key>
<real>293.0</real>
</dict>
Expand Down
6 changes: 3 additions & 3 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/dcaron.glif
View file
Expand Up @@ -9,16 +9,16 @@
<anchor x="654.0" y="557.0" name="topright"/>
<outline>
<component base="d"/>
<component base="caronvertical" xOffset="651.0"/>
<component base="caroncomb.alt" xOffset="622.0" yOffset="1.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/01/21 06:08:13</string>
<string>2019/02/18 19:50:33</string>
<key>com.schriftgestaltung.componentsAlignment</key>
<array>
<integer>-1</integer>
<integer>-1</integer>
<integer>0</integer>
</array>
</dict>
</lib>
Expand Down
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/emacronacute.glif
View file
Expand Up @@ -14,7 +14,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/15 05:55:18</string>
<string>2019/02/18 20:07:59</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/emacrongrave.glif
View file
Expand Up @@ -14,7 +14,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/15 05:55:18</string>
<string>2019/02/18 20:07:59</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 2 additions & 2 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/lcaron.glif
View file
Expand Up @@ -9,12 +9,12 @@
<anchor x="317.0" y="983.0" name="topright"/>
<outline>
<component base="l"/>
<component base="caronvertical" xOffset="311.0"/>
<component base="caroncomb.alt" xOffset="291.0" yOffset="-28.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/01/21 06:08:13</string>
<string>2019/02/18 19:52:11</string>
<key>com.schriftgestaltung.componentsAlignment</key>
<array>
<integer>-1</integer>
Expand Down
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/ohorn.glif
View file
Expand Up @@ -15,7 +15,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:25</string>
<string>2019/02/18 20:06:06</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/ohornacute.glif
View file
Expand Up @@ -15,7 +15,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/15 20:52:13</string>
<string>2019/02/18 20:06:06</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/ohorndotbelow.glif
View file
Expand Up @@ -15,7 +15,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:25</string>
<string>2019/02/18 20:06:06</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/ohorngrave.glif
View file
Expand Up @@ -15,7 +15,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/15 20:52:13</string>
<string>2019/02/18 20:06:06</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/ohornhookabove.glif
View file
Expand Up @@ -15,12 +15,14 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/15 20:52:13</string>
<string>2019/02/18 20:06:06</string>
<key>com.schriftgestaltung.componentsAlignment</key>
<array>
<integer>-1</integer>
<integer>-1</integer>
</array>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/ohorntilde.glif
View file
Expand Up @@ -15,7 +15,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/15 20:52:13</string>
<string>2019/02/18 20:06:06</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/rlinebelow.glif
View file
Expand Up @@ -12,7 +12,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:25</string>
<string>2019/02/18 20:07:31</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 2 additions & 2 deletions sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/tcaron.glif
View file
Expand Up @@ -9,12 +9,12 @@
<anchor x="432.0" y="557.0" name="topright"/>
<outline>
<component base="t"/>
<component base="caronvertical" xOffset="336.0" yOffset="103.0"/>
<component base="caroncomb.alt" xOffset="301.0"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/01/21 06:08:13</string>
<string>2019/02/18 19:52:45</string>
<key>com.schriftgestaltung.componentsAlignment</key>
<array>
<integer>-1</integer>
Expand Down
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/uhornacute.glif
View file
Expand Up @@ -14,7 +14,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:09</string>
<string>2019/02/18 20:06:30</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/uhorndotbelow.glif
View file
Expand Up @@ -14,7 +14,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:09</string>
<string>2019/02/18 20:06:30</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/uhorngrave.glif
View file
Expand Up @@ -14,7 +14,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:09</string>
<string>2019/02/18 20:06:30</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/uhornhookabove.glif
View file
Expand Up @@ -14,12 +14,14 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/15 20:52:10</string>
<string>2019/02/18 20:06:30</string>
<key>com.schriftgestaltung.componentsAlignment</key>
<array>
<integer>-1</integer>
<integer>-1</integer>
</array>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>
4 changes: 3 additions & 1 deletion sources/instance_ufo/MerriweatherSans-Black.ufo/glyphs/uhorntilde.glif
View file
Expand Up @@ -14,7 +14,9 @@
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.lastChange</key>
<string>2019/02/16 05:40:09</string>
<string>2019/02/18 20:06:30</string>
<key>public.markColor</key>
<string>0.85,0.26,0.06,1</string>
</dict>
</lib>
</glyph>

0 comments on commit b7670e1

Please sign in to comment.