Skip to content

Commit

Permalink
Merge pull request #103 from uswds/dw-fix-line-breaks
Browse files Browse the repository at this point in the history 
Public Sans 1.004
  • Loading branch information
@thisisdano
thisisdano authored Jun 3, 2019
2 parents fbb64ec + f7e551e commit 4beb325
Show file tree
Hide file tree
Showing 4,267 changed files with 180,780 additions and 132,674 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1,596 changes: 0 additions & 1,596 deletions fonts/afm/Public-Sans-black.afm
View file

This file was deleted.

1,460 changes: 1,460 additions & 0 deletions fonts/afm/Public-Sans-black.metrics
View file

Large diffs are not rendered by default.

1,627 changes: 0 additions & 1,627 deletions fonts/afm/Public-Sans-italics-black.afm
View file

This file was deleted.

1,458 changes: 1,458 additions & 0 deletions fonts/afm/Public-Sans-italics-black.metrics
View file

Large diffs are not rendered by default.

1,603 changes: 0 additions & 1,603 deletions fonts/afm/Public-Sans-italics-thin.afm
View file

This file was deleted.

1,445 changes: 1,445 additions & 0 deletions fonts/afm/Public-Sans-italics-thin.metrics
View file

Large diffs are not rendered by default.

1,596 changes: 0 additions & 1,596 deletions fonts/afm/Public-Sans-thin.afm
View file

This file was deleted.

1,448 changes: 1,448 additions & 0 deletions fonts/afm/Public-Sans-thin.metrics
View file

Large diffs are not rendered by default.

Binary file modified fonts/otf/PublicSans-Black.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-BlackItalic.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-Bold.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-BoldItalic.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-ExtraBold.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-ExtraBoldItalic.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-ExtraLight.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-ExtraLightItalic.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-Italic.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-Light.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-LightItalic.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-Medium.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-MediumItalic.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-Regular.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-SemiBold.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-SemiBoldItalic.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-Thin.otf
View file
Binary file not shown.
Binary file modified fonts/otf/PublicSans-ThinItalic.otf
View file
Binary file not shown.
16 changes: 13 additions & 3 deletions fonts/ufo/italic/Public Sans-Black.ufo/features.fea
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
# automatic
languagesystem DFLT dflt;
languagesystem latn dflt;
languagesystem cyrl dflt;
languagesystem latn CAT;
languagesystem latn ROM;
languagesystem latn MOL;
languagesystem latn KAZ;
languagesystem latn TAT;
languagesystem latn TRK;
languagesystem latn CRT;
languagesystem latn AZE;
languagesystem cyrl TAT;

feature aalt {
# automatic
Expand Down Expand Up @@ -38,6 +39,11 @@ lookup ccmp_Other_1 {
sub [i j]' @CombiningNonTopAccents @CombiningTopAccents by [idotless jdotless];
} ccmp_Other_1;

lookup ccmp_Other_2 {
lookupflag 0;
sub space emdash space by space_emdash_space.liga;
} ccmp_Other_2;

lookup ccmp_latn_1 {
lookupflag 0;
sub brevecomb acutecomb by brevecomb_acutecomb;
Expand All @@ -51,6 +57,7 @@ lookup ccmp_latn_1 {
} ccmp_latn_1;

script latn;
lookup ccmp_latn_1;
} ccmp;

feature locl {
Expand All @@ -71,14 +78,16 @@ sub Tcedilla by Tcommaaccent;
sub tcedilla by tcommaaccent;
language KAZ;
sub i by idotaccent;
language TAT;
sub i by idotaccent;
language TRK;
sub i by idotaccent;
language CRT;
sub i by idotaccent;
language AZE;
sub i by idotaccent;

script cyrl;
language TAT;
sub i by idotaccent;
} locl;

feature subs {
Expand Down Expand Up @@ -237,6 +246,7 @@ feature liga {
sub colon f l a g two colon by colon_f_l_a_g_two_colon.liga;
sub colon f l a g colon by colon_f_l_a_g_colon.liga;
sub colon one eight F colon by colon_one_eight_F_colon.liga;
sub space emdash space by space_emdash_space.liga;
sub f i by fi;
sub f l by fl;
} liga;
Expand Down
98 changes: 70 additions & 28 deletions fonts/ufo/italic/Public Sans-Black.ufo/fontinfo.plist
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>ascender</key>
<integer>1560</integer>
<integer>1597</integer>
<key>capHeight</key>
<integer>1446</integer>
<integer>1481</integer>
<key>descender</key>
<integer>-440</integer>
<integer>-451</integer>
<key>familyName</key>
<string>Public Sans</string>
<key>guidelines</key>
<array>
<dict>
<key>angle</key>
<integer>0</integer>
<key>x</key>
<integer>885</integer>
<key>y</key>
<integer>1415</integer>
</dict>
<dict>
<key>angle</key>
<integer>0</integer>
<key>x</key>
<integer>-82</integer>
<key>y</key>
<integer>-504</integer>
</dict>
<dict>
<key>angle</key>
<integer>0</integer>
<key>x</key>
<integer>909</integer>
<key>y</key>
<integer>1606</integer>
</dict>
<dict>
<key>angle</key>
<real>261.946</real>
<key>x</key>
<integer>248</integer>
<key>y</key>
<integer>1481</integer>
</dict>
<dict>
<key>angle</key>
<real>261.946</real>
<key>x</key>
<integer>754</integer>
<key>y</key>
<integer>1481</integer>
</dict>
</array>
<key>italicAngle</key>
<real>-8.0</real>
<key>note</key>
<string>Based on Libre Franklin
</string>
<key>openTypeHeadCreated</key>
<string>2019/05/07 07:56:17</string>
<string>2019/06/03 07:56:17</string>
<key>openTypeHheaAscender</key>
<integer>1990</integer>
<integer>2038</integer>
<key>openTypeHheaDescender</key>
<integer>-440</integer>
<integer>-451</integer>
<key>openTypeNameDescription</key>
<string>Libre Franklin is a reinterpretation and expansion of the 1912 Morris Fuller Benton￢ﾀﾙs classic.</string>
<key>openTypeNameDesigner</key>
Expand All @@ -33,12 +76,11 @@
<key>openTypeNamePreferredSubfamilyName</key>
<string>Black Italic</string>
<key>openTypeOS2Type</key>
<array>
</array>
<array/>
<key>openTypeOS2TypoAscender</key>
<integer>1560</integer>
<integer>1597</integer>
<key>openTypeOS2TypoDescender</key>
<integer>-440</integer>
<integer>-451</integer>
<key>openTypeOS2TypoLineGap</key>
<integer>0</integer>
<key>openTypeOS2VendorID</key>
Expand All @@ -48,39 +90,39 @@
<key>openTypeOS2WidthClass</key>
<integer>5</integer>
<key>openTypeOS2WinAscent</key>
<integer>1990</integer>
<integer>2038</integer>
<key>openTypeOS2WinDescent</key>
<integer>440</integer>
<integer>451</integer>
<key>postscriptBlueValues</key>
<array>
<integer>-21</integer>
<integer>-23</integer>
<integer>0</integer>
<integer>1034</integer>
<integer>1055</integer>
<integer>1446</integer>
<integer>1466</integer>
<integer>1471</integer>
<integer>1486</integer>
<integer>1059</integer>
<integer>1082</integer>
<integer>1481</integer>
<integer>1501</integer>
<integer>1507</integer>
<integer>1522</integer>
</array>
<key>postscriptFontName</key>
<string>PublicSans-BlackItalic</string>
<key>postscriptOtherBlues</key>
<array>
<integer>-338</integer>
<integer>-330</integer>
<integer>-322</integer>
</array>
<key>postscriptStemSnapH</key>
<array>
<integer>318</integer>
<integer>326</integer>
</array>
<key>postscriptStemSnapV</key>
<array>
<integer>390</integer>
<integer>399</integer>
</array>
<key>postscriptUnderlinePosition</key>
<integer>-370</integer>
<integer>-379</integer>
<key>postscriptUnderlineThickness</key>
<integer>150</integer>
<integer>154</integer>
<key>styleMapFamilyName</key>
<string>Public Sans Black</string>
<key>styleMapStyleName</key>
Expand All @@ -90,12 +132,12 @@
<key>trademark</key>
<string>Public Sans is based on Libre Franklin, which is a trademark of Impallari Type.</string>
<key>unitsPerEm</key>
<integer>2000</integer>
<integer>2048</integer>
<key>versionMajor</key>
<integer>1</integer>
<key>versionMinor</key>
<integer>3</integer>
<integer>4</integer>
<key>xHeight</key>
<integer>1034</integer>
<integer>1059</integer>
</dict>
</plist>
56 changes: 56 additions & 0 deletions fonts/ufo/italic/Public Sans-Black.ufo/glyphs.public.background/A_.glif
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="A" format="2">
<advance width="1508"/>
<anchor x="1531" y="18" name="ogonek"/>
<anchor x="812" y="1520" name="top"/>
<outline>
<contour>
<point x="91" y="0" type="curve" smooth="yes"/>
<point x="402" y="0" type="line" smooth="yes"/>
<point x="431" y="0"/>
<point x="445" y="14"/>
<point x="452" y="31" type="curve" smooth="yes"/>
<point x="536" y="272" type="line" smooth="yes"/>
<point x="540" y="287"/>
<point x="550" y="295"/>
<point x="566" y="295" type="curve" smooth="yes"/>
<point x="1000" y="295" type="line" smooth="yes"/>
<point x="1021" y="295"/>
<point x="1025" y="285"/>
<point x="1031" y="270" type="curve" smooth="yes"/>
<point x="1111" y="35" type="line" smooth="yes"/>
<point x="1119" y="8"/>
<point x="1136" y="0"/>
<point x="1156" y="0" type="curve" smooth="yes"/>
<point x="1558" y="0" type="line" smooth="yes"/>
<point x="1588" y="0"/>
<point x="1596" y="41"/>
<point x="1586" y="70" type="curve" smooth="yes"/>
<point x="1095" y="1464" type="line" smooth="yes"/>
<point x="1082" y="1497"/>
<point x="1056" y="1520"/>
<point x="1021" y="1520" type="curve" smooth="yes"/>
<point x="617" y="1520" type="line" smooth="yes"/>
<point x="581" y="1520"/>
<point x="568" y="1505"/>
<point x="556" y="1473" type="curve" smooth="yes"/>
<point x="60" y="76" type="line" smooth="yes"/>
<point x="44" y="31"/>
<point x="60" y="0"/>
</contour>
<contour>
<point x="665" y="643" type="line" smooth="yes"/>
<point x="640" y="643"/>
<point x="634" y="659"/>
<point x="644" y="686" type="curve" smooth="yes"/>
<point x="769" y="1034" type="line" smooth="yes"/>
<point x="773" y="1049"/>
<point x="787" y="1049"/>
<point x="794" y="1034" type="curve" smooth="yes"/>
<point x="916" y="684" type="line" smooth="yes"/>
<point x="925" y="657"/>
<point x="921" y="643"/>
<point x="898" y="643" type="curve" smooth="yes"/>
</contour>
</outline>
</glyph>
87 changes: 87 additions & 0 deletions fonts/ufo/italic/Public Sans-Black.ufo/glyphs.public.background/A_E_.glif
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="AE" format="2">
<advance width="2243"/>
<anchor x="1460" y="1520" name="top"/>
<outline>
<contour>
<point x="2179" y="336" type="curve" smooth="yes"/>
<point x="1513" y="336" type="line" smooth="yes"/>
<point x="1495" y="336"/>
<point x="1489" y="342"/>
<point x="1489" y="365" type="curve" smooth="yes"/>
<point x="1489" y="569" type="line" smooth="yes"/>
<point x="1489" y="586"/>
<point x="1501" y="598"/>
<point x="1522" y="598" type="curve" smooth="yes"/>
<point x="1901" y="598" type="line" smooth="yes"/>
<point x="1927" y="598"/>
<point x="1937" y="614"/>
<point x="1937" y="633" type="curve" smooth="yes"/>
<point x="1937" y="887" type="line" smooth="yes"/>
<point x="1937" y="913"/>
<point x="1923" y="928"/>
<point x="1894" y="928" type="curve" smooth="yes"/>
<point x="1526" y="928" type="line" smooth="yes"/>
<point x="1505" y="928"/>
<point x="1489" y="942"/>
<point x="1489" y="971" type="curve" smooth="yes"/>
<point x="1489" y="1145" type="line" smooth="yes"/>
<point x="1489" y="1171"/>
<point x="1505" y="1184"/>
<point x="1536" y="1184" type="curve" smooth="yes"/>
<point x="2150" y="1184" type="line" smooth="yes"/>
<point x="2187" y="1184"/>
<point x="2204" y="1206"/>
<point x="2204" y="1239" type="curve" smooth="yes"/>
<point x="2206" y="1477" type="line" smooth="yes"/>
<point x="2206" y="1503"/>
<point x="2193" y="1520"/>
<point x="2169" y="1520" type="curve" smooth="yes"/>
<point x="840" y="1520" type="line" smooth="yes"/>
<point x="805" y="1520"/>
<point x="788" y="1505"/>
<point x="772" y="1473" type="curve" smooth="yes"/>
<point x="47" y="76" type="line" smooth="yes"/>
<point x="23" y="31"/>
<point x="35" y="0"/>
<point x="66" y="0" type="curve" smooth="yes"/>
<point x="377" y="0" type="line" smooth="yes"/>
<point x="405" y="0"/>
<point x="422" y="14"/>
<point x="430" y="31" type="curve" smooth="yes"/>
<point x="551" y="272" type="line"/>
<point x="557" y="287"/>
<point x="569" y="295"/>
<point x="586" y="295" type="curve" smooth="yes"/>
<point x="997" y="295" type="line" smooth="yes"/>
<point x="1018" y="295"/>
<point x="1024" y="285"/>
<point x="1024" y="266" type="curve" smooth="yes"/>
<point x="1024" y="51" type="line" smooth="yes"/>
<point x="1024" y="16"/>
<point x="1038" y="0"/>
<point x="1079" y="0" type="curve" smooth="yes"/>
<point x="2175" y="0" type="line" smooth="yes"/>
<point x="2210" y="0"/>
<point x="2224" y="20"/>
<point x="2224" y="45" type="curve" smooth="yes"/>
<point x="2224" y="297" type="line" smooth="yes"/>
<point x="2224" y="326"/>
<point x="2208" y="336"/>
</contour>
<contour>
<point x="985" y="643" type="curve" smooth="yes"/>
<point x="745" y="643" type="line" smooth="yes"/>
<point x="721" y="643"/>
<point x="717" y="659"/>
<point x="733" y="686" type="curve"/>
<point x="942" y="1100" type="line" smooth="yes"/>
<point x="975" y="1161"/>
<point x="1024" y="1157"/>
<point x="1024" y="1096" type="curve" smooth="yes"/>
<point x="1024" y="684" type="line" smooth="yes"/>
<point x="1024" y="657"/>
<point x="1010" y="643"/>
</contour>
</outline>
</glyph>
Loading

0 comments on commit 4beb325

Please sign in to comment.