Skip to content

Commit

Permalink
Roman: add f_f_t, f_j and f_f_j ligatures
Browse files Browse the repository at this point in the history
fixes #79
  • Loading branch information
frankrolf committed Sep 28, 2020
1 parent 4b0cfac commit 5970889
Show file tree
Hide file tree
Showing 56 changed files with 1,284 additions and 9 deletions.
3 changes: 3 additions & 0 deletions Roman/GlyphOrderAndAliasDB
Original file line number Diff line number Diff line change
Expand Up @@ -416,11 +416,14 @@ uni0259 schwa
uni0251 alphalatin
uni0261 gscript
f_i f_i uniFB01
f_j f_j
f_l f_l uniFB02
f_t f_t
f_f f_f uniFB00
f_f_i f_f_i uniFB03
f_f_j f_f_j
f_f_l f_f_l uniFB04
f_f_t f_f_t
ampersand ampersand
zero.slash zero.slash
zero zero
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1838,12 +1838,18 @@
<string>f_f.glif</string>
<key>f_f_i</key>
<string>f_f_i.glif</string>
<key>f_f_j</key>
<string>f_f_j.glif</string>
<key>f_f_l</key>
<string>f_f_l.glif</string>
<key>f_f_t</key>
<string>f_f_t.glif</string>
<key>f_i</key>
<string>f_i.glif</string>
<key>f_i.sc</key>
<string>f_i.sc.glif</string>
<key>f_j</key>
<string>f_j.glif</string>
<key>f_l</key>
<string>f_l.glif</string>
<key>f_l.sc</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="f_f_j" format="2">
<advance width="995"/>
<outline>
<component base="f.ligalong"/>
<component base="f_j" xOffset="339"/>
</outline>
<lib>
<dict>
<key>public.markColor</key>
<string>0,1,0.8,0.2</string>
</dict>
</lib>
</glyph>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="f_f_t" format="2">
<advance width="1042"/>
<outline>
<component base="f.ligalong"/>
<component base="f_t" xOffset="339"/>
</outline>
<lib>
<dict>
<key>public.markColor</key>
<string>0,1,0.8,0.2</string>
</dict>
</lib>
</glyph>
92 changes: 92 additions & 0 deletions Roman/Masters/caption/master_0/SourceSerif_c0.ufo/glyphs/f_j.glif
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="f_j" format="2">
<advance width="656"/>
<outline>
<contour>
<point x="44" y="0" type="line"/>
<point x="292" y="0" type="line"/>
<point x="292" y="28" type="line"/>
<point x="176" y="28" type="line"/>
<point x="160" y="28" type="line"/>
<point x="44" y="28" type="line"/>
</contour>
<contour>
<point x="152" y="0" type="curve"/>
<point x="184" y="0" type="line"/>
<point x="184" y="73"/>
<point x="184" y="147"/>
<point x="184" y="220" type="curve" smooth="yes"/>
<point x="184" y="500" type="line" smooth="yes"/>
<point x="184" y="575"/>
<point x="200" y="632"/>
<point x="235" y="673" type="curve" smooth="yes"/>
<point x="266" y="710"/>
<point x="301" y="726"/>
<point x="366" y="736" type="curve"/>
<point x="297" y="730" type="line"/>
<point x="384" y="730" type="line"/>
<point x="368" y="736" type="line"/>
<point x="388" y="720" type="line" smooth="yes"/>
<point x="416" y="698"/>
<point x="430" y="690"/>
<point x="450" y="690" type="curve" smooth="yes"/>
<point x="470" y="690"/>
<point x="479" y="701"/>
<point x="480" y="714" type="curve"/>
<point x="470" y="736"/>
<point x="432" y="750"/>
<point x="364" y="750" type="curve" smooth="yes"/>
<point x="301" y="750"/>
<point x="245" y="725"/>
<point x="210" y="684" type="curve" smooth="yes"/>
<point x="186" y="655"/>
<point x="152" y="608"/>
<point x="152" y="488" type="curve"/>
<point x="160" y="500" type="line"/>
<point x="44" y="494" type="line"/>
<point x="44" y="471" type="line"/>
<point x="152" y="471" type="line"/>
<point x="152" y="220" type="line" smooth="yes"/>
<point x="152" y="147"/>
<point x="152" y="73"/>
</contour>
<contour>
<point x="353" y="-252" type="curve" smooth="yes"/>
<point x="415" y="-252"/>
<point x="452" y="-216"/>
<point x="478" y="-160" type="curve" smooth="yes"/>
<point x="504" y="-104"/>
<point x="512" y="-24"/>
<point x="512" y="88" type="curve" smooth="yes"/>
<point x="512" y="400" type="line"/>
<point x="512" y="500" type="line"/>
<point x="496" y="500" type="line"/>
<point x="449" y="500" type="line"/>
<point x="168" y="500" type="line"/>
<point x="168" y="471" type="line"/>
<point x="480" y="471" type="line"/>
<point x="480" y="408"/>
<point x="480" y="346"/>
<point x="480" y="283" type="curve" smooth="yes"/>
<point x="480" y="88" type="line" smooth="yes"/>
<point x="480" y="-16"/>
<point x="472" y="-96"/>
<point x="452" y="-144" type="curve" smooth="yes"/>
<point x="432" y="-192"/>
<point x="416" y="-208"/>
<point x="382" y="-234" type="curve"/>
<point x="400" y="-226" type="line"/>
<point x="375" y="-226" type="line"/>
<point x="397" y="-236" type="line"/>
<point x="387" y="-224" type="line" smooth="yes"/>
<point x="372" y="-207"/>
<point x="359" y="-198"/>
<point x="335" y="-198" type="curve" smooth="yes"/>
<point x="312" y="-198"/>
<point x="299" y="-212"/>
<point x="295" y="-226" type="curve"/>
<point x="299" y="-234"/>
<point x="313" y="-252"/>
</contour>
</outline>
</glyph>
12 changes: 12 additions & 0 deletions Roman/Masters/caption/master_0/SourceSerif_c0.ufo/groups.plist
Original file line number Diff line number Diff line change
Expand Up @@ -865,11 +865,14 @@
<string>alphalatin</string>
<string>gscript</string>
<string>f_i</string>
<string>f_j</string>
<string>f_l</string>
<string>f_t</string>
<string>f_f</string>
<string>f_f_i</string>
<string>f_f_j</string>
<string>f_f_l</string>
<string>f_f_t</string>
<string>A.sc</string>
<string>B.sc</string>
<string>C.sc</string>
Expand Down Expand Up @@ -1492,11 +1495,14 @@
<string>alphalatin</string>
<string>gscript</string>
<string>f_i</string>
<string>f_j</string>
<string>f_l</string>
<string>f_t</string>
<string>f_f</string>
<string>f_f_i</string>
<string>f_f_j</string>
<string>f_f_l</string>
<string>f_f_t</string>
<string>florin</string>
<string>litre</string>
<string>alpha</string>
Expand Down Expand Up @@ -2844,6 +2850,8 @@
<string>jcircumflex</string>
<string>eng</string>
<string>gscript</string>
<string>f_j</string>
<string>f_f_j</string>
</array>
<key>public.kern1.LAT_k</key>
<array>
Expand Down Expand Up @@ -2907,6 +2915,7 @@
<string>tdotbelow</string>
<string>tlinebelow</string>
<string>f_t</string>
<string>f_f_t</string>
</array>
<key>public.kern1.LAT_u</key>
<array>
Expand Down Expand Up @@ -4251,11 +4260,14 @@
<string>longs</string>
<string>germandbls</string>
<string>f_i</string>
<string>f_j</string>
<string>f_l</string>
<string>f_t</string>
<string>f_f</string>
<string>f_f_i</string>
<string>f_f_j</string>
<string>f_f_l</string>
<string>f_f_t</string>
</array>
<key>public.kern2.LAT_g</key>
<array>
Expand Down
5 changes: 4 additions & 1 deletion Roman/Masters/caption/master_0/SourceSerif_c0.ufo/lib.plist
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,14 @@
<string>alphalatin</string>
<string>gscript</string>
<string>f_i</string>
<string>f_j</string>
<string>f_l</string>
<string>f_t</string>
<string>f_f</string>
<string>f_f_i</string>
<string>f_f_j</string>
<string>f_f_l</string>
<string>f_f_t</string>
<string>ampersand</string>
<string>zero.slash</string>
<string>zero</string>
Expand Down Expand Up @@ -1493,6 +1496,7 @@
<string>commabelowcmb.alt</string>
<string>tonos.cap</string>
<string>f.ligalong</string>
<string>dieresiscmb.tight</string>
<string>IJ</string>
<string>Tbar</string>
<string>colontriangularmod</string>
Expand All @@ -1503,7 +1507,6 @@
<string>tbar</string>
<string>triangularbullet</string>
<string>turkicdsccmb</string>
<string>dieresiscmb.tight</string>
</array>
<key>public.postscriptNames</key>
<dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1838,12 +1838,18 @@
<string>f_f.glif</string>
<key>f_f_i</key>
<string>f_f_i.glif</string>
<key>f_f_j</key>
<string>f_f_j.glif</string>
<key>f_f_l</key>
<string>f_f_l.glif</string>
<key>f_f_t</key>
<string>f_f_t.glif</string>
<key>f_i</key>
<string>f_i.glif</string>
<key>f_i.sc</key>
<string>f_i.sc.glif</string>
<key>f_j</key>
<string>f_j.glif</string>
<key>f_l</key>
<string>f_l.glif</string>
<key>f_l.sc</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="f_f_j" format="2">
<advance width="1018"/>
<outline>
<component base="f.ligalong"/>
<component base="f_j" xOffset="344"/>
</outline>
<lib>
<dict>
<key>public.markColor</key>
<string>0,1,0.8,0.2</string>
</dict>
</lib>
</glyph>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="f_f_t" format="2">
<advance width="1080"/>
<outline>
<component base="f.ligalong"/>
<component base="f_t" xOffset="344"/>
</outline>
<lib>
<dict>
<key>public.markColor</key>
<string>0,1,0.8,0.2</string>
</dict>
</lib>
</glyph>
92 changes: 92 additions & 0 deletions Roman/Masters/caption/master_1/SourceSerif_c1.ufo/glyphs/f_j.glif
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="f_j" format="2">
<advance width="674"/>
<outline>
<contour>
<point x="44" y="0" type="line"/>
<point x="304" y="0" type="line"/>
<point x="304" y="60" type="line"/>
<point x="208" y="60" type="line"/>
<point x="144" y="60" type="line"/>
<point x="44" y="60" type="line"/>
</contour>
<contour>
<point x="128" y="0" type="curve"/>
<point x="224" y="0" type="line"/>
<point x="224" y="73"/>
<point x="224" y="147"/>
<point x="224" y="220" type="curve" smooth="yes"/>
<point x="224" y="480" type="line" smooth="yes"/>
<point x="224" y="540"/>
<point x="235" y="584"/>
<point x="258" y="623" type="curve" smooth="yes"/>
<point x="278" y="656"/>
<point x="307" y="683"/>
<point x="340" y="703" type="curve"/>
<point x="286" y="694" type="line"/>
<point x="384" y="694" type="line"/>
<point x="355" y="701" type="line"/>
<point x="388" y="668" type="line" smooth="yes"/>
<point x="412" y="644"/>
<point x="440" y="628"/>
<point x="478" y="628" type="curve" smooth="yes"/>
<point x="516" y="628"/>
<point x="538" y="649"/>
<point x="540" y="684" type="curve"/>
<point x="522" y="727"/>
<point x="483" y="742"/>
<point x="395" y="742" type="curve" smooth="yes"/>
<point x="304" y="742"/>
<point x="238" y="696"/>
<point x="206" y="664" type="curve" smooth="yes"/>
<point x="174" y="632"/>
<point x="138" y="584"/>
<point x="132" y="496" type="curve"/>
<point x="152" y="512" type="line"/>
<point x="39" y="496" type="line"/>
<point x="39" y="446" type="line"/>
<point x="128" y="446" type="line"/>
<point x="128" y="220" type="line" smooth="yes"/>
<point x="128" y="147"/>
<point x="128" y="73"/>
</contour>
<contour>
<point x="380" y="-236" type="curve" smooth="yes"/>
<point x="456" y="-236"/>
<point x="500" y="-200"/>
<point x="528" y="-144" type="curve" smooth="yes"/>
<point x="556" y="-88"/>
<point x="568" y="-24"/>
<point x="568" y="96" type="curve" smooth="yes"/>
<point x="568" y="400" type="line"/>
<point x="568" y="508" type="line"/>
<point x="528" y="508" type="line"/>
<point x="452" y="508" type="line"/>
<point x="184" y="508" type="line"/>
<point x="184" y="446" type="line"/>
<point x="472" y="446" type="line"/>
<point x="472" y="399"/>
<point x="472" y="353"/>
<point x="472" y="306" type="curve" smooth="yes"/>
<point x="472" y="96" type="line" smooth="yes"/>
<point x="472" y="-16"/>
<point x="466" y="-80"/>
<point x="460" y="-120" type="curve" smooth="yes"/>
<point x="454" y="-160"/>
<point x="450" y="-176"/>
<point x="440" y="-201" type="curve"/>
<point x="454" y="-192" type="line"/>
<point x="430" y="-192" type="line"/>
<point x="453" y="-201" type="line"/>
<point x="434" y="-172" type="line" smooth="yes"/>
<point x="418" y="-148"/>
<point x="394" y="-128"/>
<point x="354" y="-128" type="curve" smooth="yes"/>
<point x="308" y="-128"/>
<point x="288" y="-152"/>
<point x="282" y="-180" type="curve"/>
<point x="290" y="-200"/>
<point x="316" y="-236"/>
</contour>
</outline>
</glyph>
Loading

0 comments on commit 5970889

Please sign in to comment.