diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..8895d6b --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,36 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: + branches: [ main, develop ] + pull_request: + branches: [ main, develop ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Setup environment + run: | + sudo apt install fontforge + sudo python3 -m pip install -r requirements.txt + + # Runs a set of commands using the runners shell + - name: Run the limited set of tests + run: | + make travistest diff --git a/.gitignore b/.gitignore index 279805c..7562347 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ build gfonts_files +social_preview.png diff --git a/3270_HQ.sfd b/3270_HQ.sfd index 3f96726..a791758 100644 --- a/3270_HQ.sfd +++ b/3270_HQ.sfd @@ -6,7 +6,7 @@ Weight: Regular Copyright: Copyright 2011-2021 The 3270font Project Authors (https://github.com/rbanffy/3270font) UComments: "2011-5-25: Created." FontLog: "See the CHANGELOG.md file" -Version: 2.3.1 +Version: 3.0.0 DefaultBaseFilename: 3270 ItalicAngle: 0 UnderlinePosition: -200 @@ -14,22 +14,20 @@ UnderlineWidth: 120 Ascent: 1600 Descent: 400 InvalidEm: 0 -woffMajor: 1 +woffMajor: 3 woffMinor: 0 LayerCount: 2 Layer: 0 0 "Back" 1 Layer: 1 0 "Fore" 0 HasVMetrics: 1 -NeedsXUIDChange: 1 -XUID: [1021 799 1486169484 15238768] -UseXUID: 1 +XUID: [1021 799 1486169484 15238772] StyleMap: 0x0040 FSType: 0 OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1306332354 -ModificationTime: 1633716936 +ModificationTime: 1656628079 PfmFamily: 49 TTFWeight: 400 TTFWidth: 5 @@ -63,7 +61,7 @@ DisplaySize: -36 AntiAlias: 1 FitToEm: 1 ExtremaBound: 10 -WinInfo: 858 22 11 +WinInfo: 23 23 11 BeginPrivate: 1 BlueValues 36 [98 106 950 954 1196 1196 1318 1318] EndPrivate @@ -132,7 +130,7 @@ Grid Named: "1080" EndSplineSet TeXData: 1 0 0 566231 281018 187345 492831 1048576 187345 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 1114339 2212 +BeginChars: 1114343 2230 StartChar: NameMe.1024 Encoding: 1114112 -1 0 @@ -140,9 +138,10 @@ Width: 540 VWidth: 0 LayerCount: 2 Back -Image2: image/png 107 0 781.06 30.5176 30.5176 +Image2: image/png 120 0 781.06 30.5176 30.5176 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!A8OPjD#T[D_?k?dT?ku-p[&Nz8OZBB +5j$^2!!!!E8OPjD#T[D_@$"f)?k 524 122<108 230 352 832> 768 122<108 228 352 898> 1196 12 VStem: 230 122<438 524 646 768 890 988> LayerCount: 2 Back -Image2: image/png 169 705 1562.12 61.0352 61.0352 +Image2: image/png 167 705 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!?H/k[`7t<@Z_').@d[Ooa4s<&s7SO5VCB+>7!(fUS7'8jaJcGcN +5j$^2!!!!p8OPjD#TYd]0b1uA$j.#Ok^kj=mP>\Vo/o3BQ'q]=X>mX%i!(fRiJ$oT[E;osb0HAV +nID]QLGuWAT1S"$m^TN&iWmUQSh8MEHiF+>#n,=?&GOWR!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -260,9 +259,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 115 0 1562.12 61.0352 61.0352 +Image2: image/png 119 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!@8OPjD#T[D_?k?jV?kBF EndImage2 Fore Validated: 1 @@ -277,7 +276,7 @@ LayerCount: 2 Back Image2: image/png 115 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!\:M@BP/[/`r-lu$)/!!!!j78?7R6=>BF +5j$^2!!!!<8OPjD#T[D_?r16=?kBF EndImage2 Fore Validated: 1 @@ -289,10 +288,10 @@ Width: 540 VWidth: 0 LayerCount: 2 Back -Image2: image/png 124 0 781.06 30.5176 30.5176 +Image2: image/png 135 0 781.06 30.5176 30.5176 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF EndImage2 Fore Validated: 1 @@ -307,10 +306,10 @@ HStem: 356 576<401.094 690.906> VStem: 266 560<495.131 793.757> LayerCount: 2 Back -Image2: image/png 149 0 1562.12 61.0352 61.0352 +Image2: image/png 148 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!;CJdF\ -!80DHHrCRu!9Ic"*/>r&1]RLU!(fUS7'8jaJcGcN +5j$^2!!!!]8OPjD#T[D_?r1KD?k VStem: 238 596<600 712> LayerCount: 2 Back -Image2: image/png 124 0 1562.12 61.0352 61.0352 +Image2: image/png 127 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Ou036_[.\;UL.qK-'9z8OZBB -Y!QNJ +5j$^2!!!!H8OPjD#T[D_?k?jV?kBF EndImage2 Fore SplineSet @@ -357,10 +356,10 @@ Flags: W VStem: 250 588 LayerCount: 2 Back -Image2: image/png 159 0 1562.12 61.0352 61.0352 +Image2: image/png 162 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!bK9U?id'7TGYU"!9+6,?o9(7 -lp*0o0?=P+"q_ut1`n9f^]4AScj%5/BF +5j$^2!!!!k8OPjD#T[D_?k?jV?kXiOJEjD,&!g[4!!(F;#3b2!oI^+D!!#SZ:.26O@"J@Y EndImage2 Fore Refer: 9 60 N -1 0 0 -1 1088 1297.59 2 @@ -375,10 +374,10 @@ Flags: W VStem: 250 588 LayerCount: 2 Back -Image2: image/png 158 0 1562.12 61.0352 61.0352 +Image2: image/png 162 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!YQMF`:^gfc`#'!b -)%V67U_]a2UmD=B0`Vlm#QV9a##,O<*^Ti,!!#SZ:.26O@"J@Y +5j$^2!!!!k8OPjD#T[D_?k?jV?k 1196 122<474 714> VStem: 358 356<-26 98 1196 1318> 358 116<98 1196> LayerCount: 2 Back -Image2: image/png 127 0 1562.12 61.0352 61.0352 +Image2: image/png 133 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!N8OPjD#T[D_@,PR'?k/i-PPM*p&.]D)V0TQph7U"7"-!&rI3Zrlpg +CB+>7!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -441,10 +440,10 @@ HStem: -26 124<358 596> 1196 122<358 596> VStem: 358 356<-26 98 1196 1318> 596 118<98 1196> LayerCount: 2 Back -Image2: image/png 132 0 1562.12 61.0352 61.0352 +Image2: image/png 133 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!aE(kW)0TTsX+ -z8OZBBY!QNJ +5j$^2!!!!N8OPjD#T[D_@,PL%?k 1175 21G<419 433> VStem: 620 114<426 866> LayerCount: 2 Back -Image2: image/png 151 0 1562.12 61.0352 61.0352 +Image2: image/png 154 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!c8OPjD#T[D_@,PL%?k 1176 20G<667 682> VStem: 368 114<428 868> LayerCount: 2 Back -Image2: image/png 146 0 1562.12 61.0352 61.0352 +Image2: image/png 149 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!B] -"qX*:!$lV?sq6p:]M2V^qda1J:W9^!Jl;3lrX94%TEO.$do.. +CB1.bJ.T!l!5#fH:bOR!AH2]1!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -529,10 +528,10 @@ HStem: 0 120<228 384> 614 120<678 750> 1226 120<228 384> VStem: 474 120<208 526 820 1138> LayerCount: 2 Back -Image2: image/png 144 0 1562.12 61.0352 61.0352 +Image2: image/png 148 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! 614 120<194 266> 1226 120<560 716> VStem: 350 120<208 526 820 1138> LayerCount: 2 Back -Image2: image/png 143 0 1562.12 61.0352 61.0352 +Image2: image/png 147 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!V!R!>U,=*!jGb -5R%464U#b(6^lp5!!!!j78?7R6=>BF +5j$^2!!!!\8OPjD#T[D_@,PL%?k6XC'6oCP9!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -665,9 +664,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 114 0 1562.12 61.0352 61.0352 +Image2: image/png 118 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! 822 112<120 952> LayerCount: 2 Back -Image2: image/png 132 0 1562.12 61.0352 61.0352 +Image2: image/png 133 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!"O2p61,&\.MLbqTb7pXY -z8OZBBY!QNJ +5j$^2!!!!N8OPjD#T[D_@,PL%?k VStem: 230 124<952 1318> 596 122<952 1318> LayerCount: 2 Back -Image2: image/png 121 0 1562.12 61.0352 61.0352 +Image2: image/png 128 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!<>[b5a7=&@4/`0JGEcFWCI&*WU0\&>L^_ -?sj1ri<7lU1&r8E":]$nB\3:b!!#SZ:.26O@"J@Y +5j$^2!!!!`8OPjD#T[D_@,PL%?k<>[b5a7=&@4/`0JGF>0JFOJEZP4#!>)"U +?sm@HMW"]la>*`P#m/e'!!!!j78?7R6=>BF EndImage2 Fore Refer: 20 47 S 0 -1 1 0 -96 1190 2 @@ -820,10 +819,10 @@ Flags: W VStem: 474 122<-236 1440> LayerCount: 2 Back -Image2: image/png 125 0 1562.12 61.0352 61.0352 +Image2: image/png 128 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!^Y4B+>23ad_1T.!MUBKjX6\-=Vh!:NAf^2J?R -3<0$Z!(fUS7'8jaJcGcN +5j$^2!!!!N8OPjD#T[D_@,PL%?k^Y4B+>23ad_1T,CHFBKjX6\-=Vh!;C.;kbH-^ +;ZHdt!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -876,8 +875,8 @@ LayerCount: 2 Back Image2: image/png 155 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!QD\QJG9*Q -.f^H#huJiL_AIe4=Te_01^Gn,iuh2!!!!!j78?7R6=>BF +5j$^2!!!!d8OPjD#T[D_@,PL%?kQD\QJG9*Q +.f^H#huJiL_AIe4=Te_H]EiH$KV76'!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -924,8 +923,8 @@ LayerCount: 2 Back Image2: image/png 133 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!^#qr-oErC-h.D -(s'W*"H\<^#qr-oErC-h.D +(s'W*"H\< 224 114<240 310> 706 122<120 368 488 732> 1196 1 VStem: 368 120<320 706 828 1110> LayerCount: 2 Back -Image2: image/png 153 0 1562.12 61.0352 61.0352 +Image2: image/png 156 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!az!(fUS7'8jaJcGcN +5j$^2!!!!e8OPjD#T[D_@,PL%?k8T5o 342 122<108 474 596 962> 708 122<108 474 596 962> VStem: 474 122<98 342 464 708 830 896> LayerCount: 2 Back -Image2: image/png 153 0 1562.12 61.0352 61.0352 +Image2: image/png 154 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!It3*dr]^O< -fZ4nr3)C>.cpHjs!8MH%r+g2``;flZY% +K@n6^QT.eV)ULh5!s%tQ%lYfTRn`q`!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -1373,8 +1372,8 @@ LayerCount: 2 Back Image2: image/png 154 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!QE$jFA)G"t0Yk0K"?1Hk;&& -Teo0"!`1`_LqjiM)?@-M%,"q!(N'3Q!!#SZ:.26O@"J@Y +5j$^2!!!!c8OPjD#T[D_@,PL%?kQE$jFA)G"t0Yk0K"?1Hk;&& +Teo0"!`1`_LqjiM)?A!/%28f!#=8Cj!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -1499,10 +1498,10 @@ HStem: 356 96<415.647 635.306> 838 94<416.444 631.556> VStem: 236 96<522.957 766.312> 716 96<522.568 765.926> LayerCount: 2 Back -Image2: image/png 163 0 1562.12 61.0352 61.0352 +Image2: image/png 164 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!m8OPjD#T[D_@,PL%?k1f -!NZL$RR)[hJ\cr/J\cjS#p5I@0K9L%__>1f +!NZL$HY&!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -1599,10 +1598,10 @@ HStem: 100 21G<476 596> VStem: 476 120<100 1108> LayerCount: 2 Back -Image2: image/png 143 0 1562.12 61.0352 61.0352 +Image2: image/png 144 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!WI"7E3*Q[@F@NHY(J7E"52R5<$D1O/I'Li7r -aBS^_!=uDKa0F+o!!!!j78?7R6=>BF +5j$^2!!!!Y8OPjD#T[D_@,PL%?k 952 21G<120 238> 1200 120<446 748> VStem: 120 118<952 992> 834 118<910 1114> LayerCount: 2 Back -Image2: image/png 167 0 1562.12 61.0352 61.0352 +Image2: image/png 168 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!q8OPjD#T[D_@,PL%?k4+@$,Y1+mK9rKMa\O +.TnAQ0\kKl?Y`Q[qp8pOh'Qt.FeD`AUOcS.%,pFn;*o.Vlf!O3%E>6(o/'"7hd -^gR1LJ:R_LL)%VML!rA-(6AOs@$h1_TH?(cz8OZBBY!QNJ +5j$^2!!!!i8OPjD#T[D_@,PL%?k.FeDlafncS.%,pFn;*o.Vlf!O3%E>6(o/'"7hd +^gR1LJ:R_LL)%VML!rA-(6AOsGddq'OaIiGz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -1766,8 +1765,8 @@ LayerCount: 2 Back Image2: image/png 156 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!a6$b59#dP!AXC2C]ri(coz8OZBBY!QNJ +5j$^2!!!!e8OPjD#T[D_@,PL%?ka6$b59#dP!A`9@R:4T*uJz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -1807,8 +1806,8 @@ LayerCount: 2 Back Image2: image/png 165 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!d8OPjD#T[D_@,PL%?kBF EndImage2 Fore SplineSet @@ -1891,8 +1890,8 @@ LayerCount: 2 Back Image2: image/png 160 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!UhhIr(z8OZBBY!QNJ EndImage2 Fore SplineSet @@ -1956,8 +1955,8 @@ LayerCount: 2 Back Image2: image/png 167 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!p8OPjD#T[D_@,PL%?kBF EndImage2 Fore SplineSet @@ -2005,10 +2004,10 @@ HStem: 106 118<556 762> 1202 116<430 518> VStem: 110 112<98 1006> 600 114<1038 1116> 844 114<304 502> LayerCount: 2 Back -Image2: image/png 172 0 1562.12 61.0352 61.0352 +Image2: image/png 173 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!eC0=3WDcd[<@?#@k3_8Zo#2u+VS?8OBDW)T4^/0/z8OZBBY!QNJ +5j$^2!!!"!8OPjD#TZ(Pb6`\Q&4OtS=Tht4=0>GST8fL4V$l%`'FPNCqB6@Zo*0pM)PGQGYX:NR +;H_((bj()r)"dOTR?\I$>!3Ora6)dNIe(N,2.LKh)h8h8<$.,*J,fQL!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -2229,8 +2228,8 @@ LayerCount: 2 Back Image2: image/png 186 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!S=f)YJ"Q>RK@Kc/9W`4l/p$GTGQ;te7)/pt5Un'-!57d`M$s*W2eP6)E!!#SZ +5j$^2!!!".8OPjD#TYeFYmGq7'SPFP/-8+H-Peuf+^uZu\5Gpl#B6UMi"-dB!A$?1&&&;C35>TT +]I?W1Vo:Ahl1O7NO`?!s6-'[IR_X8h)AsuJ-k6\>=XAH):S"1SlEnn5Es!1e%$G_1Gj>>0!!#SZ :.26O@"J@Y EndImage2 Fore @@ -2306,7 +2305,7 @@ LayerCount: 2 Back Image2: image/png 131 -4 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!%5`A&&Dh$k2iZ+;i$d`ouF'](*+0Oei(DC'PV[.bquC +5j$^2!!!!L8OPjD#T[D_@,PL%?k$cS@pfba$k2iZ+;i$d`ouF'](*+0Oei(\ncr/;peQ5: !!!!j78?7R6=>BF EndImage2 Fore @@ -2398,8 +2397,8 @@ LayerCount: 2 Back Image2: image/png 158 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!'R_aNB!J*Hk0GjkrYqZfZ"7\Su#-'N\ +C.$#W5V`*7$k3&!N!\-uK`IP<$qmY1OB_bc!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -2459,10 +2458,10 @@ HStem: -26 116<725.471 852.389> 230 116<724.863 855.1> 940 116<239.471 366.389> VStem: 120 114<1061.65 1190.63> 374 110<1061.98 1190.33> 606 114<95.6509 224.627> 860 110<95.9812 224.331> LayerCount: 2 Back -Image2: image/png 169 0 1562.12 61.0352 61.0352 +Image2: image/png 171 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!#`N)<7*!q9$k^Zf",qUpW1Q"1X -MM=\<.<fkYL^]4?7!(fUS7'8jaJcGcN +5j$^2!!!!t8OPjD#TZ?m_$PWG&-PK)"ss':-,C2s5CuU4Ju)V-V)V>.#K%$&[m1I_nm+"+*@nbc +!E)l$R:MLKDJ1X.-Ud+3G$rGcjnToNb@nStRdpH2^'0m,@m2XJ!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -2561,8 +2560,8 @@ LayerCount: 2 Back Image2: image/png 138 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z4Z0dY*0W"l0!Mkk2$k2k0+W-n<#JjqY!!&4D -".l/t3Q_=%!!#SZ:.26O@"J@Y +5j$^2!!!!S8OPjD#T[D_@,PL%?kE"L(3H)&N@FBF +5j$^2!!!!p8OPjD#T[D_@,PL%?k!?hn[$8H%:I^!"FS!5]ZE($k1/"5hsZ#@!E0[ +mLKk10JHT/Yrn,m%hrM]#@a>E"L(3H)&N@^Fq-bB2bR6Q!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -2852,7 +2851,7 @@ LayerCount: 2 Back Image2: image/png 130 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZtYke;Q0Rth[(r-tVclf[R!!'_a!m0[*9q_Oe +5j$^2!!!!K8OPjD#T[D_@,PL%?k VStem: 358 238<100 322> LayerCount: 2 Back -Image2: image/png 161 0 1562.12 61.0352 61.0352 +Image2: image/png 166 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!3Go%0"36XQo-&n'Gr9IaX1#TuO +Noies`e''_G"_DN9F1.SHBF +5j$^2!!!!P8OPjD#T[D_?smVT?kBF EndImage2 Fore SplineSet @@ -2935,7 +2934,7 @@ LayerCount: 2 Back Image2: image/png 132 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!\*fus[<(m$IW!m3co"0jS33O01rI$=i0:%40A +5j$^2!!!!M8OPjD#T[D_?smVT?kGq!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -2998,7 +2997,7 @@ LayerCount: 2 Back Image2: image/png 125 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! 1206 112<387.478 564.522> VStem: 240 114<980.636 1174.62> 598 114<980.636 1174.62> LayerCount: 2 Back -Image2: image/png 136 0 1562.12 61.0352 61.0352 +Image2: image/png 135 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF EndImage2 Fore SplineSet @@ -3080,8 +3079,8 @@ LayerCount: 2 Back Image2: image/png 134 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z4Z&QS9joZ##a;CTNh(43fKI)."!!!!&"2cZ! -,Y.n8!!#SZ:.26O@"J@Y +5j$^2!!!!O8OPjD#T[D_?smVT?kBF +5j$^2!!!!T8OPjD#T[D_?smVT?kBF EndImage2 Fore SplineSet @@ -3309,10 +3308,10 @@ HStem: -145 120<245 402.147> VStem: 479 120<51.8528 350> LayerCount: 2 Back -Image2: image/png 142 0 1562.12 61.0352 61.0352 +Image2: image/png 143 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z4YpGLa0W"o1_8(!ia@*q)5X'Z"&-JaOp44)( -!W_;K"hP=dinFG5!!#SZ:.26O@"J@Y +5j$^2!!!!X8OPjD#T[D_?smVT?kBF EndImage2 Fore SplineSet @@ -3342,11 +3341,11 @@ LayerCount: 2 Back Image2: image/png 170 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!t:,6Pk,`DFeY -LOhbjNrak:ODb-<+L_2tTR%`8!!O2A895rZ)$&.u$@kfplBhPO!!#SZ:.26O@"J@Y +5j$^2!!!!s8OPjD#T[D_?smVT?k?i+!Kqgq%,s!#fJ#!#Y\%9&!9?BGrs&`4rZ=Cc$kS%*6S\T_ +"pXlf"q284^&\q#f^f&nl@BcR'OV=lc%X)J!!)*9$ES:_'3>/6!!#SZ:.26O@"J@Y EndImage2 Fore -Refer: 61 96 N 1 0 0 1 -134 114 2 +Refer: 61 96 S 1 0 0 1 -134 114 2 Refer: 128 97 N 1 0 0 1 0 0 3 Validated: 1 EndChar @@ -3360,10 +3359,10 @@ HStem: 102 112<318 844> 462 124<234 724> 830 122<322 638> 1066 366 VStem: 114 118<304 462 586 740> 232 368 724 116<586 742> LayerCount: 2 Back -Image2: image/png 165 0 1562.12 61.0352 61.0352 +Image2: image/png 168 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Uc5jaz8OZBBY!QNJ EndImage2 Fore Refer: 61 96 N 1 0 0 1 -136 114 2 @@ -3382,10 +3381,10 @@ HStem: 98 21G<474 596> 932 20G<474 596> 1070 366 VStem: 242 368 474 122<98 952> LayerCount: 2 Back -Image2: image/png 140 0 1562.12 61.0352 61.0352 +Image2: image/png 145 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!=bZ5QM:pJ40mH%S38p.qC74 -6*C\o=Yi=%z8OZBBY!QNJ +5j$^2!!!!Z8OPjD#T[D_@,PL%?k?gU#*R1>$k/("J;a`7$k**2EEgj_8(!i.#8P3aeS07 +i'nI_!+/_7K+eIU.f]PL!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -3416,10 +3415,10 @@ HStem: 106 114<320 644> 836 118<320 646> 1066 366 VStem: 114 120<304 748> 174 368 724 120<304 748> LayerCount: 2 Back -Image2: image/png 160 0 1562.12 61.0352 61.0352 +Image2: image/png 157 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!0Za9%@'G`tAM=*6`l*%> -0aekT>*'d0"t:Z1K:9XaV;W*gVL]&V@%@Hlz8OZBBY!QNJ +5j$^2!!!!f8OPjD#T[D_!!=q[*[&]4`9]b5gq^_@GQ>eb@4:(6^q_)mK7Uj*`g4F@W#-3&_8Rs9 ++DO2g(`7(>=:ApO(R0YQ!2J6Sa.q[#-3+#G!(fUS7'8jaJcGcN EndImage2 Fore Refer: 61 96 N 1 0 0 1 -194 114 2 @@ -3436,10 +3435,10 @@ HStem: 102 116<316 632 864 962> 932 20G<116 234 716 836> 1066 366 VStem: 116 118<300 952> 230 368 716 120<306 952> LayerCount: 2 Back -Image2: image/png 150 0 1562.12 61.0352 61.0352 +Image2: image/png 153 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! 468 116<318 720> 834 118<230 638> 1078 120<696 7 VStem: 114 118<306 380> 720 120<218 468 584 750> LayerCount: 2 Back -Image2: image/png 159 0 1562.12 61.0352 61.0352 +Image2: image/png 162 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!k8OPjD#T[D_@,PR'?krrIq*!;SB8b_*_/Ii'$` +s!TR'!6#A>(rVa?%oa(XR(s&3#QXlA$KVr%*^]o-!!#SZ:.26O@"J@Y EndImage2 Fore Refer: 59 126 S 1 0 0 1 4 118 2 @@ -3477,10 +3476,10 @@ HStem: 106 114<320 644> 836 118<320 646> 1078 120<620 702> 1314 120<254 336> VStem: 114 120<304 748> 724 120<304 748> LayerCount: 2 Back -Image2: image/png 155 0 1562.12 61.0352 61.0352 +Image2: image/png 154 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!c8OPjD#T[D_?k?jV?k`)nIt?TlTQ)Wjs.h4/Bq'D_%L!9&HbCT?!*a'H;W!.DI@aR -qV2-2IS?AhnmWiS5Sqe;OH+n!b;X"$aNUSP2:"CcN!lUR#S2*o$)IV%!!#SZ:.26O@"J@Y +5j$^2!!!""8OPjD#TYd^5mi,r&-GFKn?N`]$:=2fpEYHEDt@[,`@(E`K678`8-6E="tZLl*6\qI +(=hScd$]BE%+Q\^p0;",/*VWD()NcFSM"HHRECOrKO2$\#L*S\e)UK/!!#SZ:.26O@"J@Y EndImage2 Fore Refer: 316 255 N 1 0 0 1 0 0 2 @@ -3517,10 +3516,10 @@ HStem: 100 21G<474 596> 1220 364 VStem: 120 120<1156 1194> 464 362 474 122<100 742> 832 120<1156 1194> LayerCount: 2 Back -Image2: image/png 164 0 1562.12 61.0352 61.0352 +Image2: image/png 166 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!QD\Qe/9)50JF=t",5BY;LGJQHpDt#TKMfN"pW'P -RUCE&)@/5ij6K&,5\UL#KJB.,&VpVkD[$YAjh<0/z8OZBBY!QNJ +5j$^2!!!!o8OPjD#T[D_@'F&>"!/R6"2ks?>en:nnA(KDi;`t4!OFV8"hPV($m,QR+&JOL.*qgB +JV!=l:`W@R2hpN$W^$Vj:c:+k#0J_U!!%>I%6(-CJOohA!!#SZ:.26O@"J@Y EndImage2 Fore Refer: 62 180 N 1 0 0 1 106 266 2 @@ -3663,8 +3662,8 @@ LayerCount: 2 Back Image2: image/png 152 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! 468 116<318 720> 834 118<230 638> 1198 122<210 3 VStem: 114 118<306 380> 210 126<1198 1320> 578 124<1198 1320> 720 120<218 468 584 750> LayerCount: 2 Back -Image2: image/png 151 0 1562.12 61.0352 61.0352 +Image2: image/png 152 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!*e_q.N]!!!!j78?7R6=>BF +5j$^2!!!!a8OPjD#T[D_?nc,!@'BlF"X%Dfi%\U>@iu![n:+hRi;WflOo]#5"Qoa%^`X0+(-jSV +-jHs 836 118<320 646> 1194 122<208 334 576 700> VStem: 114 120<304 748> 208 126<1194 1316> 576 124<1194 1316> 724 120<304 748> LayerCount: 2 Back -Image2: image/png 149 0 1562.12 61.0352 61.0352 +Image2: image/png 147 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! +@6W1#(^0p98dGuO%_cr`!!!!j78?7R6=>BF EndImage2 Fore Refer: 60 168 N 1 0 0 1 -20 -2 2 @@ -3769,8 +3768,8 @@ LayerCount: 2 Back Image2: image/png 141 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!jQ9!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -3813,8 +3812,8 @@ LayerCount: 2 Back Image2: image/png 168 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ueVP(TdK3n's?-%?Lr/#n,']z8OZBBY!QNJ +5j$^2!!!!q8OPjD#TZX`0a`Fb&4Fo![XiO$JQs@0)Ek]&nHbF0"T 836 118<320 646> 1050 374 VStem: 114 120<304 748> 152 632 724 120<304 748> LayerCount: 2 Back -Image2: image/png 158 0 1562.12 61.0352 61.0352 +Image2: image/png 156 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!74J\`+X@HMVS%"thbK-CT)rZ*#Dz8OZBBY!QNJ EndImage2 Fore Refer: 58 94 N 1 0 0 1 -70 100 2 @@ -3900,8 +3899,8 @@ LayerCount: 2 Back Image2: image/png 146 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!rWM!!#SZ:.26O@"J@Y +5j$^2!!!![8OPjD#T[D_@'F')#0]=BHNOc\rrHm>Sc]69!s8`3gfOSGcD#oA62hAs"907+I\::4 +OFXZf$ilX*$.k^h[%@ 932 20G<470 596> 1072 364 VStem: 470 126<98 952> 470 362 LayerCount: 2 Back -Image2: image/png 145 0 1562.12 61.0352 61.0352 +Image2: image/png 144 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! -5kD5_!)dGRYR:SUo`":_X#d@1`V+[KU-5 +q:G]J;Rm4&@3lBjz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -3997,10 +3996,10 @@ HStem: 106 114<320 644> 836 118<320 646> 1074 364 VStem: 114 120<304 748> 404 362 724 120<304 748> LayerCount: 2 Back -Image2: image/png 165 0 1562.12 61.0352 61.0352 +Image2: image/png 164 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!SuE!^q_)mK7Uj*`g4Gk#H/UE +gVLi[A0>VQH5IK8JJ`&afE*[e!&=NSqHaMur^rm'z8OZBBY!QNJ EndImage2 Fore Refer: 62 180 N 1 0 0 1 46 120 2 @@ -4017,10 +4016,10 @@ HStem: 102 116<316 632 864 962> 932 20G<116 234 716 836> 1074 364 VStem: 116 118<300 952> 458 362 716 120<306 952> LayerCount: 2 Back -Image2: image/png 155 0 1562.12 61.0352 61.0352 +Image2: image/png 153 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!b8OPjD#T[D_?smMQ?k?gU0E=uS5l:U1E^5S7\\X_c)9@L4"!4*JS6,e\c9dPB62j(N +"93#DDAWIH9-CJW!,^*hU9f'[,6.]D!(fUS7'8jaJcGcN EndImage2 Fore Refer: 62 180 N 1 0 0 1 100 120 2 @@ -4037,10 +4036,10 @@ HStem: 100 23G<240 360 730 844> 834 116<114 212 444 644> 1078 120<680 762> 1314 VStem: 240 120<100 746> 730 114<102 752> LayerCount: 2 Back -Image2: image/png 148 0 1562.12 61.0352 61.0352 +Image2: image/png 146 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Ur#%hZ)G?OtH!!#SZ:.26O@"J@Y EndImage2 Fore Refer: 59 126 N 1 0 0 1 -12 118 2 @@ -4227,10 +4226,10 @@ HStem: 526 122<446 792> 1202 116<508 588> VStem: 312 108<1078 1114> 672 112<1034 1118> LayerCount: 2 Back -Image2: image/png 161 0 1562.12 61.0352 61.0352 +Image2: image/png 160 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!"5PQ?XabX[j$!/KtIiMNuuXT/>$!(fUS7'8jaJcGcN +5j$^2!!!!i8OPjD#T[D_?smGO?k"5"GnAI8!=,WLtW+4Ge+=,z8OZBBY!QNJ EndImage2 Fore SplineSet @@ -4330,10 +4329,10 @@ HStem: 530 118<438 574> 1196 122<292 636> VStem: 658 120<732 806> LayerCount: 2 Back -Image2: image/png 157 0 1562.12 61.0352 61.0352 +Image2: image/png 156 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!d8OPjD#T[D_?smGO?kBF EndImage2 Fore SplineSet @@ -4439,8 +4438,8 @@ LayerCount: 2 Back Image2: image/png 150 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!X4$k+9& -^`X$'R-$cd!<@P"$,q_&VuZku!!#SZ:.26O@"J@Y +5j$^2!!!!_8OPjD#T[D_?smGO?kX4$k+9& +^gIDcR-$cd!<@Pt$/Z,5]kRNI!!#SZ:.26O@"J@Y EndImage2 Fore Refer: 320 186 N 1 0 0 1 0 0 2 @@ -4454,10 +4453,10 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 165 0 1562.12 61.0352 61.0352 +Image2: image/png 166 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!.4#,E$1#G`.:'G*qBIO$fR!!;Bm3GZ5BB`J,5!(fUS7'8jaJcGcN +5j$^2!!!!o8OPjD#T[D_?smGO?kMWNAmf"/cG76Na2#JC_na'#_8%0l^qa@JJ:XE` +!!Ir,+>Jrt8.A*A8.S6E![o1Y%/`Y4"oo;r$Y2Zfi\pi;!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -4492,8 +4491,8 @@ LayerCount: 2 Back Image2: image/png 162 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!/!!s?.D!sAT\@Eq?jpL# -pOVDl^hQ,L6$beB+[?f6@5f8V!<>=F$pgFs*8LSp!!#SZ:.26O@"J@Y +5j$^2!!!!k8OPjD#T[D_?smGO?k/!!s?.D!sAT\@Eq?jpL# +pOVDl^hQ,L6$beB+i"RY@5f8V!<>>C$sQB'7hl"(!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -4528,10 +4527,10 @@ HStem: 98 21G<474 596> 932 20G<474 596> 1196 122<474 596> VStem: 474 122<98 952 1196 1318> LayerCount: 2 Back -Image2: image/png 131 0 1562.12 61.0352 61.0352 +Image2: image/png 132 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!mk4!+b-.$Fo2Jg/*>#1)BpV:^h_F+Z\!O -!!!!j78?7R6=>BF +5j$^2!!!!M8OPjD#T[D_?smGO?k 1202 122<594 724> VStem: 230 128<290 392> 594 122<780 960 1202 1324> 838 122<288 472> LayerCount: 2 Back -Image2: image/png 161 0 1562.12 61.0352 61.0352 +Image2: image/png 162 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!NZ_;ZRt+>*ZR#7M$"#8e;F)]0FE)&*q_ +Ql-`cTU:c\./"0"pBRW,!sg'.!!&R2#)tHVI-^h5!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -4611,10 +4610,10 @@ HStem: 98 21G<120 238 832 952> 488 112<240 832> 1316 122<272 398 640 764> VStem: 120 118<98 488 600 748> 272 126<1316 1438> 640 124<1316 1438> 832 120<98 488 600 746> LayerCount: 2 Back -Image2: image/png 163 0 1562.12 61.0352 61.0352 +Image2: image/png 164 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!m8OPjD#T[D_?smGO?k?i+iF)^r+9r2)(`3`b1GD"#?sruL^qaj(^q_>8^`^P8^gP"( +^gOs:_"RdG)!q8QTSOc7K8i5A7$)ZoHB\\NG#Z.Xz8OZBBY!QNJ EndImage2 Fore Refer: 60 168 N 1 0 0 1 44 120 2 @@ -4633,8 +4632,8 @@ LayerCount: 2 Back Image2: image/png 148 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Jsa&;C/g -(^!=8,-`!c^o[qd"[LJlz8OZBBY!QNJ +5j$^2!!!!]8OPjD#T[D_?smGO?k?i+iF)^r+9r1^)=7B-"#0n1!K`'GgOEU=!+B\a+>Jsa&;C/g +(^!=8,-`!cd$"f/qgk.>z8OZBBY!QNJ EndImage2 Fore Refer: 60 168 N 1 0 0 1 46 120 2 @@ -4651,10 +4650,10 @@ HStem: 96 122<358 476 596 714> 1074 120<358 476 596 714> 1310 122<280 406 648 77 VStem: 280 126<1310 1432> 358 356<96 218 1074 1194> 648 124<1310 1432> LayerCount: 2 Back -Image2: image/png 140 0 1562.12 61.0352 61.0352 +Image2: image/png 139 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF EndImage2 Fore Refer: 60 168 N 1 0 0 1 52 114 2 @@ -4673,8 +4672,8 @@ LayerCount: 2 Back Image2: image/png 146 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! 1322 122<268 394 636 760> VStem: 120 116<304 1194> 268 126<1322 1444> 636 124<1322 1444> 832 120<306 1194> LayerCount: 2 Back -Image2: image/png 141 0 1562.12 61.0352 61.0352 +Image2: image/png 142 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!1>@SUj*+*s2WF+,FX0U_#9t -!,QQWpN?'<&HDe2!(fUS7'8jaJcGcN +5j$^2!!!!W8OPjD#T[D_?smGO?k?i+iF)^r+9r03)%;n7JXD!ZXFR%jJt7HYrZ;4Eru[&2W2't[ +(BAkF"sX5AQK/#G!!#SZ:.26O@"J@Y EndImage2 Fore Refer: 60 168 N 1 0 0 1 40 126 2 @@ -4713,8 +4712,8 @@ LayerCount: 2 Back Image2: image/png 164 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!FpjdpHq#_0Ia8s7>JJ\Y&+N2qb(`<$Y(`6fY(`4gV -)&NdL)&V`?KFpjdpHq#_0Ia8s8]JJ\Y&+N2qb(`<$Y(`6fY(`4gV +)&NdL)&V`?K(llbh>dNU!(fUS7'8jaJcGcN +5j$^2!!!!Z8OPjD#T[D_@'F&>K*)MjN"6aBQp1SUJK@Y/)D#_)T7I#r%=gQWfH-t4K[JmhqS7iY +&;%tc!6cJm[(g8V"onW'!(fUS7'8jaJcGcN EndImage2 Fore Refer: 58 94 N 1 0 0 1 -10 278 2 @@ -4773,8 +4772,8 @@ LayerCount: 2 Back Image2: image/png 146 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!FpjeQZq#^^$ZN3l.$MaWT0Za9(@'F$O?nbt8%YN8_ -oRQQH!!"T.$56t>n4ir`!!#SZ:.26O@"J@Y +5j$^2!!!![8OPjD#T[D_?nc,!@'F9O32"(&pjeKXq#^^$ZN3l.$MaWT0Za9(@'F$O?nbt8%YN8_ +oRQQH!!"l`$74&m\Ldd]!!#SZ:.26O@"J@Y EndImage2 Fore Refer: 58 94 S 1 0 0 1 2 276 2 @@ -4793,8 +4792,8 @@ LayerCount: 2 Back Image2: image/png 143 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!FpjeQZq#^^$ZN3l.$4N:>(eDU]ljOBF +5j$^2!!!!X8OPjD#T[D_?nc,!@'F9O32"(&pjeKXq#^^$ZN3l.$4N:>(eDU]ljOBF EndImage2 Fore Refer: 58 94 N 1 0 0 1 -20 276 2 @@ -4979,10 +4978,10 @@ HStem: 104 114<234 514> 832 118<234 522> 1298 20G<114 234> VStem: 114 120<218 832 950 1318> 726 118<426 624> LayerCount: 2 Back -Image2: image/png 151 0 1562.12 61.0352 61.0352 +Image2: image/png 148 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!]8OPjD#T[D_@'F'I?k 832 118<438 844> VStem: 114 118<426 624> LayerCount: 2 Back -Image2: image/png 144 0 1562.12 61.0352 61.0352 +Image2: image/png 141 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A![#O@D#aP9!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -5058,8 +5057,8 @@ LayerCount: 2 Back Image2: image/png 150 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!g'd?sj4K4s42:Lb4/0!"FS!5]Ru) -+LN=TR",uU#QUD)#)AHEAWZrm!!#SZ:.26O@"J@Y +5j$^2!!!!_8OPjD#T[D_@'F'I?kg'd?sj4K4s42:Lb4/0!"FS!5]Ru) ++LN=TR",uU#QVt$#4#jLGQ.XC!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -5098,8 +5097,8 @@ LayerCount: 2 Back Image2: image/png 155 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZDn:+hROT3/4?m3G'@).E1p4!nrm/JIf(][RR -YQ^+?%i"13@S@nr/-Gr&/dVDGRD1EU!!!!j78?7R6=>BF +5j$^2!!!!d8OPjD#T[D_@'F'I?kBF EndImage2 Fore SplineSet @@ -5142,10 +5141,10 @@ HStem: 98 21G<362 480> 830 122<114 362 482 724> 1198 120<562 844> VStem: 362 118<98 830 952 1116> LayerCount: 2 Back -Image2: image/png 140 0 1562.12 61.0352 61.0352 +Image2: image/png 139 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!qJJfj=_tG/h(dJqX-^KK)MkFnu9Ek\$ -$ZuWQK?$lEz8OZBBY!QNJ +5j$^2!!!!T8OPjD#T[D_@'F'I?kBF EndImage2 Fore SplineSet @@ -5181,10 +5180,10 @@ HStem: -140 120<430 704> 224 120<434 576> 836 120<440 694> VStem: 114 120<544 630> 780 120<56 380 548 750> LayerCount: 2 Back -Image2: image/png 168 0 1562.12 61.0352 61.0352 +Image2: image/png 169 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!z8OZBBY!QNJ +5j$^2!!!!r8OPjD#TZWuYmQ"8&47Ppcp\WgS1=@ANWoC]+*(=Q'2WB#*TV6$huX\ACR$pW"n=pZ +0IFjA73!BqG4MGFe'.u7X/aAP_B!k!"(mU$%GDm0D\GOQOoPI^!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -5237,10 +5236,10 @@ HStem: 832 118<444 634> VStem: 114 120<96 630 796 1332> 724 120<96 744> LayerCount: 2 Back -Image2: image/png 153 0 1562.12 61.0352 61.0352 +Image2: image/png 152 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!?iU0e#Rk*YnMeSj +5j$^2!!!!L8OPjD#T[D_@'F'I?k?iU1BF EndImage2 Fore @@ -5307,8 +5306,8 @@ LayerCount: 2 Back Image2: image/png 146 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!NZ_;ZRtCfg^n3)CHjSkk)lJc,fU"7lbZ +;*lB,"ou--"5Fo$Ye0r9!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -5346,8 +5345,8 @@ LayerCount: 2 Back Image2: image/png 163 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!K0BF +5j$^2!!!!l8OPjD#T[D_@'F'I?kK0BF EndImage2 Fore SplineSet @@ -5380,7 +5379,7 @@ LayerCount: 2 Back Image2: image/png 132 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! 476 122<98 746> 840 120<98 748> CounterMasks: 1 38 LayerCount: 2 Back -Image2: image/png 142 0 1562.12 61.0352 61.0352 +Image2: image/png 141 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZDnCoWNaT#aXY^Fa3?uQr'$XaR!W'N-@bRm,V -!WXks%=,;8%9 834 116<114 212 444 644> +HStem: 100 23G<240 360 730 844> 830 120<114 212 444 644> VStem: 240 120<100 746> 730 114<102 752> LayerCount: 2 Back -Image2: image/png 133 0 1562.12 61.0352 61.0352 +Image2: image/png 134 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!s2Vpj_[aW/`+'KK^`4&0!>3QYD2/B4 -li7"c!(fUS7'8jaJcGcN +5j$^2!!!!O8OPjD#T[D_@'F'I?ks2Vpj_[aW/`+'KK^`6*[+TO[q"4?Wj +I@pQ?!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -5476,8 +5475,8 @@ SplineSet 844 102 l 1 730 102 l 1 730 752 l 1 - 644 834 l 1 - 444 834 l 1 + 644 830 l 5 + 444 830 l 5 360 746 l 1 360 100 l 1 240 100 l 1 @@ -5504,8 +5503,8 @@ LayerCount: 2 Back Image2: image/png 143 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZDn:+hROT3/4?m3G'@).DT'i;h6C-ZN"H8#@Q -Z4I#SrBF +5j$^2!!!!X8OPjD#T[D_@'F'I?kBF EndImage2 Fore SplineSet @@ -5545,14 +5544,14 @@ Encoding: 112 112 143 Width: 1080 VWidth: 0 Flags: W -HStem: 100 118<234 520> 848 108<234 514> -VStem: 114 120<-268 100 218 848> 726 118<426 646> +HStem: 100 118<234 520> 830 126<234 532> +VStem: 114 120<-268 100 218 830> 726 118<426 646> LayerCount: 2 Back Image2: image/png 153 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZDfH4L/Y^aI(?r-jA(-jDQ`&q]M,R0D6WWB(& -kqQR2a'<",TJ-WO!!Y%^/_;`9]`8$4!(fUS7'8jaJcGcN +5j$^2!!!!b8OPjD#T[D_@'F'I?kZD0`PQh?jC.)*X2fd+LV8Z""4AY6"1rsO;a3a -"s=k9'c7e_JUA#@0E;\=!!&9a#'lq9rDWas!!#SZ:.26O@"J@Y +5j$^2!!!!g8OPjD#T[D_@'F'I?k 830 122<114 195.345 538 634> +Flags: W +HStem: 100 21G<214 332> 830 122<114 195.345 538 634> VStem: 214 118<100 626> 724 120<708 744> LayerCount: 2 Back Image2: image/png 143 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZD=SuT8Yl)PW+Q(J[^sC6?^^$+c+TeDU!p8tr -$NU5`cNDoXAES4BF +5j$^2!!!!X8OPjD#T[D_@'F'I?kBF EndImage2 Fore SplineSet @@ -5676,8 +5675,8 @@ LayerCount: 2 Back Image2: image/png 161 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZDn:+hROT3/4?m,Wj4:DW`MLc:ofafbj0L$+V -?ml"q//T345k7/K;@Cp*#uJhL!<.HR:!;Rd`W,u=!(fUS7'8jaJcGcN +5j$^2!!!!j8OPjD#T[D_@'F'I?kP!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -5765,10 +5764,10 @@ HStem: 102 116<316 632 864 962> 932 20G<116 234 716 836> VStem: 116 118<300 952> 716 120<306 952> LayerCount: 2 Back -Image2: image/png 138 0 1562.12 61.0352 61.0352 +Image2: image/png 139 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZD)"96;_#c$*(30flo)BREpckMj!TfuA$NMi] -"a4HT3dq&/!!#SZ:.26O@"J@Y +5j$^2!!!!T8OPjD#T[D_@'F'I?kBF EndImage2 Fore SplineSet @@ -5810,8 +5809,8 @@ LayerCount: 2 Back Image2: image/png 155 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZD(bdb]Ym!s-L6$n:LBiG,A.0=-/Jo=l%AaFXC!m0+/GitscV!!!!j78?7R6=>BF +5j$^2!!!!d8OPjD#T[D_@'F'I?kaFXCN&I!Au)=AFD!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -5845,8 +5844,8 @@ LayerCount: 2 Back Image2: image/png 148 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZD(bdaRa+o6*:i,ooJ\h+;","9M",!*`!s9&E -M@iYp0ZD(bda"=KjS8aRCoub!,R73L;@Cp*$(-g.!.t[a)GQ@I`W,u=!(fUS7'8jaJcGcN +5j$^2!!!!f8OPjD#T[D_@'F'I?kZD)"96;`"kHB$o1(n4rFP/FpeKYjpqk/N":I6 -!0H":'OssIhufDPP\.-"Z42=@'EA,,M$D;hci_>h!!!!j78?7R6=>BF +5j$^2!!!!l8OPjD#T[D_@'F'I?kBF EndImage2 Fore SplineSet @@ -5968,8 +5967,8 @@ LayerCount: 2 Back Image2: image/png 154 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZDf`,Ra@g5,iYRD(I!-&#N5@@l,4M\bJgq^_@ -%ckL&iTbu'W'D)c$NLiJ#bTtjR,J#F!!#SZ:.26O@"J@Y +5j$^2!!!!c8OPjD#T[D_@'F'I?kZDf\8)6f`,Gh@!iFu50UgX%)hKtbkI`\5mE,s -%PTRR5dBDQ"pT@G(r&41/I"Hp(B=IT%'B2(cA_f(!!#SZ:.26O@"J@Y +5j$^2!!!!k8OPjD#T[D_@'F'I?k/Z/l&l#'ljY^HGCF#2hlb!<=]9%2$]b`C'\+!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -6066,8 +6065,8 @@ LayerCount: 2 Back Image2: image/png 169 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZD0Rm\B@/nQg^aI1<^`rs"2F(LL`,?J0GgA&t -nFlo;%o=='jacpq58Y5r5JW4SJ2)S]0bTrV!"S6!k'J&Dp](9o!(fUS7'8jaJcGcN +5j$^2!!!!r8OPjD#T[D_@'F'I?km=p]J_G"W.>4)^DU*!':Vr8lQd.z!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -6119,8 +6118,8 @@ LayerCount: 2 Back Image2: image/png 162 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!P8OPjD#T[D_@'F'I?kMWp?pMQL.d[0k0Rti4^ocGn8JrBF EndImage2 Fore SplineSet @@ -6201,10 +6200,10 @@ HStem: 708 244<474 718> 1074 244<108 962> VStem: 474 244<708 952> LayerCount: 2 Back -Image2: image/png 153 0 1562.12 61.0352 61.0352 +Image2: image/png 152 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!j+A@OSq2G)W/gZS!sAE$ -"pY&270\2do?joG!-gR9WdjD`%KHJ/!(fUS7'8jaJcGcN +5j$^2!!!!a8OPjD#T[D_@'F9O?k'LBSiEJ=uh()UgPBXe20n\G\bcbR=%<6+oeJV!b" +!s=#T1BTk)q.SI^H++ 934 20G<474 596> 1074 244<108 962> VStem: 474 122<98 466 586 954> LayerCount: 2 Back -Image2: image/png 160 0 1562.12 61.0352 61.0352 +Image2: image/png 159 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Ok85'2mP$?! ->teH$5=%l_FSz8OZBBY!QNJ +5j$^2!!!!h8OPjD#T[D_@'F9O?k'`"p8`7@0^'*Zeh+P>U+","R4"pUK:$k.N-(`:mW ++;i$$M1O_QC1-=X/2SK"bQe.81_@Vk/DRf:!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -6284,10 +6283,10 @@ HStem: 98 21G<120 238 832 952> 488 112<240 832> VStem: 120 118<98 488 600 748> 832 120<98 488 600 746> LayerCount: 2 Back -Image2: image/png 159 0 1562.12 61.0352 61.0352 +Image2: image/png 158 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!g8OPjD#T[D_@'F9O?k$eIs+-BMrW`N-NslTk!AQYMK@iFDI\7Ydj,sZ3[Jtbn --B)dH@t84mBKc^`TY!%az8OZBBY!QNJ +5j$^2!!!!]8OPjD#T[D_@'F9O?k%.Ss1t/?rW`N-NslTk!AQYMK@iFDI\7Ydj,sZ3[Jtbn +-B)dH@t84mJ8kl<`rsOLz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -6376,8 +6375,8 @@ LayerCount: 2 Back Image2: image/png 156 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!$bHs+-BMrW`N-NslTk!AQYI1ZQ=Z&35gjOBS:uOC%ep -aC`$bHs1t/?rW`N-NslTk!AQYI1ZQ=Z&35gjOBS:uOC%ep +aC`BF +5j$^2!!!!T8OPjD#T[D_@'F9O?kBF EndImage2 Fore SplineSet @@ -6494,8 +6493,8 @@ LayerCount: 2 Back Image2: image/png 139 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!T8OPjD#T[D_@'F9O?kBF EndImage2 Fore SplineSet @@ -6525,8 +6524,8 @@ LayerCount: 2 Back Image2: image/png 160 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!%,]r.1&_r-9@P[uaF`.RWUSFQ%z8OZBBY!QNJ +5j$^2!!!!i8OPjD#T[D_@'F9O?k$iUr5"hQr-9@P[uaNM6`3p"f>$z8OZBBY!QNJ EndImage2 Fore SplineSet @@ -6571,7 +6570,7 @@ LayerCount: 2 Back Image2: image/png 130 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!$lVr.,N;JRSl*_]ZX#rEs+]^a+Sp6t.qP!!ZX;oHR+l -=TAF%!(fUS7'8jaJcGcN +5j$^2!!!!N8OPjD#T[D_@'F9O?k$lVr4s;-JRSl*_]ZX#rEs+]^a+Sp6t.qP!$:kF0Qdg! +kPtS_!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -6637,8 +6636,8 @@ LayerCount: 2 Back Image2: image/png 142 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!"[N!9J\ggU"+tRq"+rTF -gB6+e%i?-75]Ru)+LN=T+MGu-=F_R#(]_4=$6Ru:N3!!Z!!#SZ:.26O@"J@Y +5j$^2!!!!o8OPjD#T[D_@'F9O?k"[N!9J\ggU"+tRq"+rTF +gB6+e%i?-75]Ru)+LN=T+MGu-=F_R#(]`)G$%+R^q^8p$q+P.%!D:D)&PUU'/1U%+R^gIVi$q+P.%!D:DJL1IR-=B4W!W\:B#$[j,$9\@h !!#SZ:.26O@"J@Y EndImage2 Fore @@ -6744,8 +6743,8 @@ LayerCount: 2 Back Image2: image/png 155 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!d8OPjD#T[D_@'F9O?kBF EndImage2 Fore SplineSet @@ -6785,8 +6784,8 @@ LayerCount: 2 Back Image2: image/png 160 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!$iUs+ce(rZ;5p"Zlg=!AeF,U^*]^rsuE'0X`6c!MTTC -(C/01)&AnG!!!!j78?7R6=>BF +5j$^2!!!!T8OPjD#T[D_@'F9O?k%2_s2UQorZ;5p"Zlg=!AeF,U^*]^rsuE'0X`6c!MTT[ +8dGY'r0=tr!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -6863,8 +6862,8 @@ LayerCount: 2 Back Image2: image/png 150 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!%!4%10 -Z!h0A+`%0i+TRRu#^2up-Na>K!!#SZ:.26O@"J@Y +5j$^2!!!!_8OPjD#T[D_@'F9O?k%!4%10 +Z!h0A+`%0i+TSH*#dS/0Wn.4N!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -6901,10 +6900,10 @@ HStem: 104 120<446 530> 1076 118<446 630> VStem: 120 120<428 872> 472 120<350 464> 832 120<426 868> LayerCount: 2 Back -Image2: image/png 163 0 1562.12 61.0352 61.0352 +Image2: image/png 164 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!n8R70@.Pp=UJh^t%^ra"$!mC%Y8jt8U_t!f -k)-GAFNnIAGE5lh[`"(?04$d.4`;s'M$a/fnbkrX!!!!j78?7R6=>BF +5j$^2!!!!m8OPjD#T\?:+UW`r!!CRQ5M3nbd6e`SK,=-&#+K6[)P)IfEj2B'b\5ID3ou`.-Zr3l +1KFqGVe\J#^3e)`YpE_hGk'd-mWijSR3`2$n+=DMz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -6957,8 +6956,8 @@ LayerCount: 2 Back Image2: image/png 156 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!/kB#m:='IF1H^Ks,Mz8OZBBY!QNJ +5j$^2!!!!e8OPjD#T[D_@'F9O?k/kB#m:=/A_c9R$U'tz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -7004,8 +7003,8 @@ LayerCount: 2 Back Image2: image/png 166 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!%&[s+ce(rZ;5p"Zlg=!Ab8hV(I4"*f0V2(`4)#!#Z;t -\-@cVJ?hF_$m9[X%+57+bPqeqL&m['70&`"$""KF:I5$]!!#SZ:.26O@"J@Y +5j$^2!!!!o8OPjD#T[D_@'F9O?k$kKs5+`NJRSk?_$[^&!O\[(?=YYg:Xot\4(2MVz8OZBB Y!QNJ EndImage2 Fore @@ -7088,8 +7087,8 @@ LayerCount: 2 Back Image2: image/png 135 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!%4U^s!,'$tNcSFp80HIgcb`Iuqp.Ym"MD&.JVZU]p8I -h,FFU!!!!j78?7R6=>BF +5j$^2!!!!P8OPjD#T[D_@'F9O?kBF EndImage2 Fore SplineSet @@ -7124,8 +7123,8 @@ LayerCount: 2 Back Image2: image/png 161 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!J!(fUS7'8jaJcGcN +5j$^2!!!!j8OPjD#T[D_@'F9O?k 474 120<426 704> 832 120<302 1194> LayerCount: 2 Back -Image2: image/png 147 0 1562.12 61.0352 61.0352 +Image2: image/png 146 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!![8OPjD#T[D_@'F9O?k%"O^haIu%(Ph9TH"k.I*BB6r#'/lcq$/W"pQ+iA2@Y1 ++W(;L!s"Fu$7EIb'fH$l!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -7203,8 +7202,8 @@ LayerCount: 2 Back Image2: image/png 157 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Jrt8.A*A9HT)1"L?*8!;\\\,LZH$LB%;S!(fUS7'8jaJcGcN +5j$^2!!!!f8OPjD#T[D_@'F9O?kJrt8.A*A9HT)1"L?*8!#K8QCAH65`W,u=!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -7248,8 +7247,8 @@ LayerCount: 2 Back Image2: image/png 147 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!7(_ -.4W\7joPPBlO0pTeMf&[!!!!j78?7R6=>BF +5j$^2!!!!\8OPjD#T[D_@'F9O?k7(_ +.4W\7joPM_)%62DE/k5)!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -7284,8 +7283,8 @@ LayerCount: 2 Back Image2: image/png 159 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!$nLs.9s\JRZhgbRVR=5V*#U(-l+)`"*\%(_6VC)_e)t -JC5RR@/W>K"+pZBKFi`+C^'lgHjN)8,VIIE!!!!j78?7R6=>BF +5j$^2!!!!h8OPjD#T[D_@'F9O?kK"+pZBKFi`+C^'m/RgFnZW/Kj>!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -7317,10 +7316,10 @@ HStem: 98 120<718 962> 462 124<230 596> 586 122<718 962> 1074 120<718 962> VStem: 106 124<98 462 586 748> 596 366<98 218 586 708> 596 122<218 462 708 1074> LayerCount: 2 Back -Image2: image/png 158 0 1562.12 61.0352 61.0352 +Image2: image/png 156 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!hER&buD,!!#SZ:.26O@"J@Y +5j$^2!!!!e8OPjD#T[D_@'F9O?k,"2krt$rdbcbPqh#9Gj6*`W4Bdp\tTOZ,s4lz8OZBBY!QNJ +5j$^2!!!!u8OPjD#T[D_@'F9O?k,"2krt$rdbcbPqh#9Gj6*`W4Bd'Z:A!K?'Xrz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -7414,8 +7413,8 @@ LayerCount: 2 Back Image2: image/png 159 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!S0Kt#CZ!/n9nB!@BF +5j$^2!!!!h8OPjD#T[D_@'F9O?k?gUrkO&9)%J>S0Kt#CZ!/n9nB!@BF EndImage2 Fore Refer: 683 -1 N 1 0 0 1 0 0 2 @@ -7433,10 +7432,10 @@ HStem: -372.488 112.261<342 502> 98 120<570 760> 1076 118<568 762> VStem: 120 120<546 748> 586 114<-176.998 95.9125> LayerCount: 2 Back -Image2: image/png 169 0 1562.12 61.0352 61.0352 +Image2: image/png 170 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!$RZ:+jDttJz8OZBBY!QNJ +5j$^2!!!!Y8OPjD#T[D_@'F'I?k+=deXJ6R,kz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -7481,8 +7480,8 @@ LayerCount: 2 Back Image2: image/png 155 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!'$k*ol)&Qo00ei+Q@:3KPYQ\JA)^GWN"0#]g -?jB^CA>'$(+BF +5j$^2!!!!d8OPjD#T[D_@'F6N?k'$k*ol)&Qo00ei+Q@:3KPYQ\JA)^GWN"0#]g +?jB^CA>'$I+BF EndImage2 Fore SplineSet @@ -7523,7 +7522,7 @@ LayerCount: 2 Back Image2: image/png 119 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!=TJFO@)&`B!!!!j78?7R6=>BF +5j$^2!!!!@8OPjD#T[D_@'F6N?kBF EndImage2 Fore Validated: 1 @@ -7536,10 +7535,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 123 0 1562.12 61.0352 61.0352 +Image2: image/png 119 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z$?n2eM8!Z&%jo>BNBF +5j$^2!!!!@8OPjD#T[D_@'F6N?kBF EndImage2 Fore Validated: 1 @@ -7554,7 +7552,7 @@ LayerCount: 2 Back Image2: image/png 118 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZdOj/Pq('#T2!*"+H4J)TR!!#SZ:.26O@"J@Y +5j$^2!!!!?8OPjD#T[D_@'F'I?kZ$?jdO-8!]H-jo>B1#QT8mY^^0`!!!!j78?7R +5j$^2!!!!D8OPjD#T[D_@'F'I?kB]/-+Z&p+8Z4!!!!j78?7R 6=>BF EndImage2 Fore @@ -7585,7 +7583,7 @@ LayerCount: 2 Back Image2: image/png 122 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Zda>Q<3c[j#H!!"-$!-JYYTTB-R!!#SZ:.26O +5j$^2!!!!C8OPjD#T[D_@'F'I?kQ<3c[j#H!!#\t!85n&%A!P"!!#SZ:.26O @"J@Y EndImage2 Fore @@ -7599,9 +7597,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 119 0 1562.12 61.0352 61.0352 +Image2: image/png 118 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Mbm+4np]-^$=aNgB!!!!j78?7R6=>BF +5j$^2!!!!?8OPjD#T[D_@'F'I?kI4A1!!#SZ:.26O@"J@Y EndImage2 Fore Validated: 1 @@ -7616,7 +7614,7 @@ LayerCount: 2 Back Image2: image/png 114 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -7644,9 +7642,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -7659,9 +7657,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"!D1Y@_)U@9U,UP78M#Vz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -7674,9 +7672,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -7689,10 +7687,10 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 124 0 1562.12 61.0352 61.0352 +Image2: image/png 132 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!s2JiHR]\FVi +z8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -7705,9 +7703,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 100 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -7720,9 +7718,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -7735,9 +7733,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 103 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!08OPjD#T[D_@'F&V5QCd)bQ'f(KbX4\!!!!j78?7R6=>BF EndImage2 Fore Validated: 1 @@ -7750,9 +7748,10 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 149 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!^8OPjD#T[D_@'F(T%2>I5W^,8Db2r`QVGO]>O>_`sKqPdUPi`+s,!`4<`!Sa 342 120<558 718> 830 120<558 718> 1076 118<382 696> VStem: 116 120<364 928> 354 120<548 744> 840 120<364 928> LayerCount: 2 Back -Image2: image/png 156 0 1562.12 61.0352 61.0352 +Image2: image/png 155 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!jr.]U)BF EndImage2 Fore SplineSet @@ -7832,8 +7831,8 @@ LayerCount: 2 Back Image2: image/png 162 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!d8OPjD#T[D_?nc"s?k?i+!KqIgC_+J'%1EXU%ko[W5f3PPC_/dL5QOBF EndImage2 Fore SplineSet @@ -7950,10 +7949,10 @@ Flags: W HStem: 932 20G<514.511 553.422> LayerCount: 2 Back -Image2: image/png 171 0 1562.12 61.0352 61.0352 +Image2: image/png 170 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!TukMV6li!q_sIF[I`YZUu. -=2?g$*TDT++i!O-_G"E,d=Z+=<2VScL&:nfC&%jBQkT<_N\BJo!!!!j78?7R6=>BF +5j$^2!!!!s8OPjD#TZp(Yml4+'LX#dOcn"U-*4Jhc"+1#Kb5^^#l73,jGN\p45^*^l^H)V=p51: +"lCGEL]c(Yr5+X*1Pl]4&#+>HSSTJWp]$"ijUYlK'DQMJV0i7C!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -7979,8 +7978,8 @@ LayerCount: 2 Back Image2: image/png 161 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!%!4s8PY55/7/NLOlPe5^X&tcQM6Y#8kbc35BK^%M843 -jad,r$rANPlnD6G#!ljP0EZqBZ:+aB-nFPi@-FNh!!!!j78?7R6=>BF +5j$^2!!!!l8OPjD#T[D_?nc"s?kQp!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -8104,10 +8103,10 @@ HStem: 218 124<108 962> 830 122<108 474 596 962> 1298 20G<474 596> VStem: 474 122<462 830 952 1318> LayerCount: 2 Back -Image2: image/png 141 0 1562.12 61.0352 61.0352 +Image2: image/png 138 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -8144,8 +8143,8 @@ LayerCount: 2 Back Image2: image/png 159 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!+cpu?Mb6e1DO:++O,h_AcMg.XU'eVE*JY/!!!!j78?7R6=>BF +5j$^2!!!!h8OPjD#T[D_?nc"s?k%"Os1t/?rW`N-NslTk!AQYI1F'.&@0QoIL579DBTO-o +>+cpu?Mb6e1DO:++O,h_AcMgGHO.\FrG+b#!!!!j78?7R6=>BF EndImage2 Fore SplineSet @@ -8191,10 +8190,10 @@ Flags: W HStem: 586 122<0 610> 932 20G<610 633.66> LayerCount: 2 Back -Image2: image/png 141 0 1562.12 61.0352 61.0352 +Image2: image/png 137 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZD0Gjf#(-l[<`-)Ots8PG?L^b+%aaqqQ"Dl./ -!6/=L:=mZ3WrN,"!(fUS7'8jaJcGcN +5j$^2!!!!R8OPjD#T[D_?nc"s?k`-aho%`HRf$tAf7JE9%2 -5\aa(5Vsfq6P]_'8:q1?i_IJ"z8OZBBY!QNJ +5j$^2!!!!a8OPjD#T[D_?nc"s?k`-aho%`HRf$tAf7JE9%2 +5\aa(5Vsfq6P]_'@8R;dd`,,@z8OZBBY!QNJ EndImage2 Fore SplineSet @@ -8263,8 +8262,8 @@ LayerCount: 2 Back Image2: image/png 160 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!(]XO9!(fUS7'8jaJcGcN +5j$^2!!!!n8OPjD#T[D_?nc"s?klR=U'\-jFN[3_?Pk5`BeMU2'B:L4V2#:nGiLh -0SYGBVCdn+!6Q`"&'X_^,ldoF!(fUS7'8jaJcGcN +5j$^2!!!!^8OPjD#T[D_?nc"s?k?i+s1lFcs+>lR=U'\-1kF9t_?Pk5`BeMU2'B:L4V2#:nGiLh +0SYGBVCdn+!93_^9mLi)M?!VV!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -8402,10 +8401,10 @@ HStem: 544 120<284 352 724 788> 1196 120<472 604> VStem: 352 120<664 1196> 604 120<664 1196> LayerCount: 2 Back -Image2: image/png 164 0 1562.12 61.0352 61.0352 +Image2: image/png 165 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!XHq/;aT2K'SVSl%-*.p' -pC@m-(YrJ2BGG974?j@Pa1Z],UQ>AdG,#@-6TNJ.z8OZBBY!QNJ +5j$^2!!!!n8OPjD#T[D_?nc"s?kL(7h!!!!j78?7R6=>BF +5j$^2!!!!l8OPjD#T[D_?nc"s?k?iCs8N'9+(,)b(CZ'`r+7qfirHtWR0*k1GS'WMOF7*WG/+08 +$\8!Q&0F0S@/]BF EndImage2 Fore SplineSet @@ -8497,7 +8496,7 @@ LayerCount: 2 Back Image2: image/png 126 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BnW!!#SZ :.26O@"J@Y EndImage2 Fore @@ -8518,10 +8517,10 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 122 0 1562.12 61.0352 61.0352 +Image2: image/png 121 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZdaQ>b9YCsi+!!"f6!0dmAb9%l,(6!)*OrdT??#jT#8\!(fUS7'8ja +JcGcN EndImage2 Fore Validated: 1 @@ -8536,7 +8535,7 @@ LayerCount: 2 Back Image2: image/png 123 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z4Z'g^+j=kkA2$!\25QGq..kHJV!!!!j78?7R +5j$^2!!!!D8OPjD#T[D_?nc"s?kd"=!!!!j78?7R 6=>BF EndImage2 Fore @@ -8550,10 +8549,10 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 123 0 1562.12 61.0352 61.0352 +Image2: image/png 122 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z$?n2eM8!XoUjo>BN)?@C#,AtI#!!!!j78?7R -6=>BF +5j$^2!!!!C8OPjD#T[D_@'F6N?kBF +5j$^2!!!!@8OPjD#T[D_@'F6N?kBF EndImage2 Fore Validated: 1 @@ -8581,10 +8580,10 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 128 0 1562.12 61.0352 61.0352 +Image2: image/png 126 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z4Z'g^+fU*<("HgWIOk:'B5[=AipSuY"z8OZBB -Y!QNJ +5j$^2!!!!G8OPjD#T[D_@'F6N?k\9)@M24JCeS/G5lb1(!:[(cP"u&X!!#SZ +:.26O@"J@Y EndImage2 Fore Validated: 1 @@ -8599,7 +8598,7 @@ LayerCount: 2 Back Image2: image/png 119 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!@8OPjD#T[D_@'F6N?kBF EndImage2 Fore Validated: 1 @@ -8614,7 +8613,7 @@ LayerCount: 2 Back Image2: image/png 118 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!..I9;!!#SZ:.26O@"J@Y EndImage2 Fore Validated: 1 @@ -8627,9 +8626,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 112 0 1562.12 61.0352 61.0352 +Image2: image/png 111 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF EndImage2 Fore Validated: 1 @@ -8642,9 +8641,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -8657,9 +8656,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -8674,7 +8673,7 @@ LayerCount: 2 Back Image2: image/png 132 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!_2u8pH#$O +5j$^2!!!!M8OPjD#T[D_@,PL%?ks3'.-(2,$1B z8OZBBY!QNJ EndImage2 Fore @@ -8688,9 +8687,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -8703,9 +8702,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 111 0 1562.12 61.0352 61.0352 +Image2: image/png 112 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -8718,9 +8717,9 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 112 0 1562.12 61.0352 61.0352 +Image2: image/png 111 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF EndImage2 Fore Validated: 1 @@ -8733,10 +8732,10 @@ VWidth: 0 Flags: W LayerCount: 2 Back -Image2: image/png 127 0 1562.12 61.0352 61.0352 +Image2: image/png 126 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!+;m!,$!!!!j -78?7R6=>BF +5j$^2!!!!G8OPjD#T[D_J--9@$c9-!o(@O?(n)F&Xo_F]&Lmh0b62D:V#WpH!9aZO-_(/:!!#SZ +:.26O@"J@Y EndImage2 Fore Validated: 1 @@ -8748,9 +8747,9 @@ Width: 540 VWidth: 0 LayerCount: 2 Back -Image2: image/png 111 0 781.06 30.5176 30.5176 +Image2: image/png 112 0 781.06 30.5176 30.5176 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!!!!j78?7R6=>BF +5j$^2!!!!98OPjD#T[D_?nc,!@'BlF"X%C[@_)U@77@3>Hn$Jsz8OZBBY!QNJ EndImage2 Fore Validated: 1 @@ -8764,10 +8763,10 @@ Flags: W HStem: 586 124<0 298 782 1070> LayerCount: 2 Back -Image2: image/png 162 0 1562.12 61.0352 61.0352 +Image2: image/png 164 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!LfRI +>E;OU$u:Ej6LSKAhgqP*P=""q;]pBg)LtZNa'h1quui!!!!j78?7R +5j$^2!!!!D8OPjD#T[D_?nc(u?k"th%BF EndImage2 Fore @@ -8875,8 +8874,8 @@ LayerCount: 2 Back Image2: image/png 158 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!@]=oAu+>33!l^OL#.NbjT#0Li^HBnO2!!#SZ:.26O@"J@Y +5j$^2!!!!g8OPjD#TYLUb6bs<%)ip..lhg6SpDq./YdTub,HHgnaHdnJQ"V'Mel@(2S8IYKTTNE +`#?sOfCr2[`$,,(IFE7AjTDJD#,[&/8"K\\!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -8938,8 +8937,8 @@ LayerCount: 2 Back Image2: image/png 157 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!&P/!!s3+ -#7#c/%j1uujrsL.$j+Ki!&D%hLQE]8YlFb(!(fUS7'8jaJcGcN +5j$^2!!!!f8OPjD#T[D_?nc(u?k&P/!!s3+ +#7#c/%j1uujrsL.$j+Ki!(SmO]_&n.])Vg2!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -8984,11 +8983,11 @@ VWidth: 0 Flags: HW LayerCount: 2 Back -Image2: image/png 186 0 1562.12 61.0352 61.0352 +Image2: image/png 184 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!bTnRH5H8<)r"DcgTN=qQ8)*jNUQ!oHb;B+.n!;ubFJV5!!#SZ -:.26O@"J@Y +5j$^2!!!",8OPjD#TYLU_$PWG&-PLNp^Ge?HLTlP5QNYgz8OZBB +Y!QNJ EndImage2 Fore SplineSet @@ -9018,8 +9017,8 @@ LayerCount: 2 Back Image2: image/png 168 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! 932 20G<436.34 460> LayerCount: 2 Back -Image2: image/png 173 0 1562.12 61.0352 61.0352 +Image2: image/png 140 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!'.bl$`Fz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -9061,10 +9060,10 @@ HStem: 96 120<244 526> 828 120<244 528> 1298 20G<120 244> VStem: 120 124<-268 96 216 828 948 1318> 734 120<426 622> LayerCount: 2 Back -Image2: image/png 152 0 1562.12 61.0352 61.0352 +Image2: image/png 160 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!C^n<*2?_bV?sp3g!+ZlGYlt]^!&5!&#)Rol +J8.>a6$a[M(#\3k0X-)\$kNC=YTsS9euG#lz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -9105,8 +9104,8 @@ LayerCount: 2 Back Image2: image/png 144 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!\*g&M)E@/0d%!!Dh*AGgt/Jb]9K1[r62@V;@T -!s%ta%_6D]J:%=s!!#SZ:.26O@"J@Y +5j$^2!!!!W8OPjD#T[D_?nc(u?k%6;s8R![5/7/R#!c2i&:Z[TE"Ig9D`GOOgu&1M3?UKf +`97.cn,XXN"[buaR0CG9$uF!#!FpjdpHq#^^$]7h[9T+!(L%hAa^oD`6,!+BCm&/tZR -)#jP"!6-])gb^sq'EFO8$fiO(C%20'!!#SZ:.26O@"J@Y +5j$^2!!!!c8OPjD#T[D_?nc(u?k?gU35E>FpjdpHq#^^$]*/9=T8YW0%hAa^oD`6,!+BCm&/tZR +)#jP"!6-])gb^sq'EF>o$eirHRhYo'!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -9264,7 +9263,7 @@ LayerCount: 2 Back Image2: image/png 131 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!;)CjJUR0s"ug)U`KBKOrK +5j$^2!!!!L8OPjD#T[D_?nc(u?k;)CjJUR0s#5X;sc9Dq3hI !!!!j78?7R6=>BF EndImage2 Fore @@ -9297,10 +9296,10 @@ HStem: -140 108<196 872> 588 122<124 476 598 956> 1084 120<480.806 595.285> 1320 VStem: 0 124<64 588 710 1320> 356 120<955.946 1078.9> 476 122<370 588 710 863.186> 600 120<955.827 1079.16> 956 116<54 588 710 1320> LayerCount: 2 Back -Image2: image/png 171 0 1562.12 61.0352 61.0352 +Image2: image/png 172 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!).GKp&&^XS"T\U\auTSnb.T5(!!!!j78?7R6=>BF +5j$^2!!!!u8OPjD#T[D_?nc(u?k?iCs8N'9+(,)bcO>Rnr!)-_%#5:b(rQX).GKp%g.G9&AnMKT//Me_L0'Qz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -9353,7 +9352,7 @@ LayerCount: 2 Back Image2: image/png 131 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z4YpGLa0W"i/!Mg0df[uS4C)I":XT6?fU)5H^ +5j$^2!!!!L8OPjD#T[D_?nc(u?kBF EndImage2 Fore @@ -9369,10 +9368,10 @@ HStem: -26 124<368 610> 1196 122<368 610> VStem: 368 364<-26 98 1196 1318> 610 122<98 1196> LayerCount: 2 Back -Image2: image/png 134 0 1562.12 61.0352 61.0352 +Image2: image/png 168 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!1e*]<.Y +X$sAc4oZH)'rj*);lN-n0"7#1N,jtc8[[+[Urj%Lf@a$rz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -9400,8 +9399,8 @@ LayerCount: 2 Back Image2: image/png 136 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!/i-OEN^MS3]D)V*TQq[O%=jf\Lf"-P@JL'k -s1ehRz8OZBBY!QNJ +5j$^2!!!!Q8OPjD#T[D_?nbtr?k/i-OEN^MS3]D)UPTQq[O62#6u0a[m\=KDZE +9L1g6z8OZBBY!QNJ EndImage2 Fore SplineSet @@ -9426,10 +9425,10 @@ Flags: W VStem: 488 122<-400 1600> LayerCount: 2 Back -Image2: image/png 120 0 1562.12 61.0352 61.0352 +Image2: image/png 121 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!1H?;F'c5"@z8OZBBY!QNJ - +5j$^2!!!!B8OPjD#T[D_3+0P;E'Ohf)3D'VODTuq8!]p7D1udY!(=12c[R4k+ohTC!(fUS7'8ja +JcGcN EndImage2 Fore SplineSet @@ -9450,10 +9449,10 @@ Flags: W VStem: 184 120<-398 1602> 792 124<-398 1602> LayerCount: 2 Back -Image2: image/png 125 0 1562.12 61.0352 61.0352 +Image2: image/png 121 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!b!(Fj0K7C8gq#CBp!(fUS -7'8jaJcGcN +5j$^2!!!!B8OPjD#T[E:?o)2P?kWWO"sb`/A6U;KOl\!&>9]OE!'6nYQFF3*)uos=!(fUS7'8ja +JcGcN EndImage2 Fore SplineSet @@ -9479,10 +9478,10 @@ Flags: W HStem: -208 122<0 1072> 1258 120<0 1072> LayerCount: 2 Back -Image2: image/png 141 0 1562.12 61.0352 61.0352 +Image2: image/png 127 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF EndImage2 Fore SplineSet @@ -9510,7 +9509,7 @@ LayerCount: 2 Back Image2: image/png 121 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!9KCC!-#CJJ.Lg?3rf6\!(fUS7'8ja +5j$^2!!!!B8OPjD#T[D_?o)1u?kWWO"shD!A6U;KOl\!&>9KCC!,s7cK*)'Z+ohTC!(fUS7'8ja JcGcN EndImage2 Fore @@ -9558,7 +9557,7 @@ LayerCount: 2 Back Image2: image/png 121 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!))Q1Q<!+l6cg:D\Oa8c2?!(fUS 7'8jaJcGcN EndImage2 Fore @@ -9606,7 +9605,7 @@ LayerCount: 2 Back Image2: image/png 122 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!?qX4Ca!!#SZ:.26O @"J@Y EndImage2 Fore @@ -9631,7 +9630,7 @@ LayerCount: 2 Back Image2: image/png 129 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!\JAH2[ZJ:TP)#[':j]_O*kM+,i^z8OZBB +5j$^2!!!!E8OPjD#T[D_?nbtr?kZtYlF_f^];6I"&!/V!2To)'-QkdScA`j!(fUS +5j$^2!!!!F8OPjD#T[D_?nbtr?k+-2o=msu +5j$^2!!!!M8OPjD#T[D_3+0P;E'Ohf)3D'LODTuq8!X7_*rtj2!t5V25YNq@6Il/;3=?ZtZKi#T0`218#='^\76K]tBF EndImage2 Fore @@ -9789,10 +9788,10 @@ HStem: 586 122<610 1070> VStem: 488 122<-398 586 708 1602> LayerCount: 2 Back -Image2: image/png 138 0 1562.12 61.0352 61.0352 +Image2: image/png 139 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF EndImage2 Fore SplineSet @@ -9820,7 +9819,7 @@ LayerCount: 2 Back Image2: image/png 128 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! VStem: 488 122<-396 586 708 1602> LayerCount: 2 Back -Image2: image/png 136 0 1562.12 61.0352 61.0352 +Image2: image/png 137 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!7!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -9880,10 +9879,10 @@ HStem: 588 120<18 398> VStem: 484 120<792 1560> LayerCount: 2 Back -Image2: image/png 135 0 1562.12 61.0352 61.0352 +Image2: image/png 136 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!Q8OPjD#T[D_3+0P;E'Ohf)3?NgODTuq8![Xm?j*M.&&Jc@EMZtYl?X90`4/N^q^5o$m]6fAG#qtq@E&BF EndImage2 Fore @@ -9932,7 +9931,7 @@ LayerCount: 2 Back Image2: image/png 129 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!E'Ohf)3D'_ONiX#8!\e3rr^f(0WIBF +5j$^2!!!!P8OPjD#T[D_?nc,!?kBF EndImage2 Fore SplineSet @@ -9989,7 +9988,7 @@ LayerCount: 2 Back Image2: image/png 121 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A![?fo-FY(mmNA0X1RB`?6ms*-&aq=W%35b6W!n -*lr!p!!!!j78?7R6=>BF +5j$^2!!!!P8OPjD#T[D_?nc,!?kBF EndImage2 Fore SplineSet @@ -10037,8 +10036,8 @@ LayerCount: 2 Back Image2: image/png 133 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!dNU!(fUS7'8jaJcGcN EndImage2 Fore Validated: 1 @@ -10055,8 +10054,8 @@ LayerCount: 2 Back Image2: image/png 144 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!pn/Hk8c'6eFZ#&F]oqJZo.U$s!AU_SEqk -@t84m4O"3Z6;O?fz8OZBBY!QNJ +5j$^2!!!!Y8OPjD#T[D_?nc(u?k9XDpNSeL%z8OZBBY!QNJ EndImage2 Fore SplineSet @@ -10097,8 +10096,8 @@ LayerCount: 2 Back Image2: image/png 151 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!BF +5j$^2!!!!`8OPjD#T[D_?nc,!?kBF EndImage2 Fore SplineSet @@ -10139,8 +10138,8 @@ LayerCount: 2 Back Image2: image/png 158 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!^/=ODV44OC6uL@KnfX"c@rn5\f68#E\T`LsJ=@ -M#RL3Da6$N*6:PK2?]4p!<^/=ODU(iOC59s@KnfX"c@rn5\f68#E\T`LsJ=@ +M#RL3Da6$N*6:PK2?]4p!<*SdbZ"!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -10213,8 +10212,8 @@ LayerCount: 2 Back Image2: image/png 148 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!RXrM0!K?g]5[k-1+?@RF)mU%U)1Da? +.QJHPz8OZBBY!QNJ EndImage2 Fore SplineSet @@ -10281,8 +10280,8 @@ LayerCount: 2 Back Image2: image/png 148 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A! VStem: 184 120<770 1074> 488 122<158 646 1074 1378> LayerCount: 2 Back -Image2: image/png 150 0 1562.12 61.0352 61.0352 +Image2: image/png 149 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!f#.U*R)B"YghaY1b$cOD]fJ0>Gd?s+IRIfQP]=e +BtI2a:>@Gt$h\r\:!kEag&M*Q!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -10357,8 +10356,8 @@ LayerCount: 2 Back Image2: image/png 144 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!jE"*oo -#;QeiKa8$/eTs79z8OZBBY!QNJ +5j$^2!!!!Y8OPjD#T[D_?nc,!?kJp9B5]Qc-"pT7D)C?S]K0MU:#TF>jE"*oo +#;QeiT61LQFOnT/z8OZBBY!QNJ EndImage2 Fore SplineSet @@ -10402,7 +10401,7 @@ LayerCount: 2 Back Image2: image/png 131 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!eZ46jqbRRkaAY**+ +5j$^2!!!!L8OPjD#T[D_3+0hCE'Ohf)3D'&ODTuq8![Xm?j*M.&&Jc@EKU>eZ46jqq$ph$_)c]= !!!!j78?7R6=>BF EndImage2 Fore @@ -10433,7 +10432,7 @@ LayerCount: 2 Back Image2: image/png 131 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZtYl?X90`4/N^q^5o$m]6fAG#qa#nOaijLHuF +5j$^2!!!!L8OPjD#T[D_?nc,!?kBF EndImage2 Fore @@ -10452,7 +10451,7 @@ LayerCount: 2 Back Image2: image/png 131 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZtZKi#T0`218#='^\76K]tBF EndImage2 Fore @@ -10471,8 +10470,8 @@ LayerCount: 2 Back Image2: image/png 138 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!E'Ohf)3D',ONiX#8!Yr?@!D\4s$+<7:_1J]^]Hk+E'Ohf)3D'NONiX#8!\e3s8P=!!5b]20\'US9-EO$!(CZCKlT9i -O8o7\!(fUS7'8jaJcGcN +5j$^2!!!!N8OPjD#T[D_3+0bAE'Ohf)3D'bODTuq8!\e3s8P=!!5b]20\'US9-EO$!*W5>].n!r +^An66!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -10522,7 +10521,7 @@ LayerCount: 2 Back Image2: image/png 126 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!#)Sue=V(Q5!!#SZ +5j$^2!!!!G8OPjD#T[D_?nc%t?k?iCs8N'9"$$L7*=d@"id=#a@Q=!6!!'o9#%`RJga)q#!!#SZ :.26O@"J@Y EndImage2 Fore @@ -10546,7 +10545,7 @@ LayerCount: 2 Back Image2: image/png 123 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!H!!!!j78?7R 6=>BF EndImage2 Fore @@ -10570,7 +10569,7 @@ LayerCount: 2 Back Image2: image/png 124 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!Z$c2RbC!!Zdbl7YB!!T^!!#SZ :.26O@"J@Y EndImage2 Fore @@ -10643,7 +10642,7 @@ LayerCount: 2 Back Image2: image/png 129 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZtYlF_f^];4[5XZFs+K8d:@P[ua14BiMTM,>C +5j$^2!!!!M8OPjD#T[D_?nc%t?k LayerCount: 2 Back -Image2: image/png 168 0 1562.12 61.0352 61.0352 +Image2: image/png 170 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!!M_z8OZBBY!QNJ +5j$^2!!!!s8OPjD#T[D_?nc%t?k%/^^gkX)+9N=a!9+&&I_`b7G^t?r\Uf<_*Q[>p@LsJ( +`cqL)GQ>Z)[3.UT]f\Og"nM[1(dOI>_%J'tU&c":#qSk*"`jYD!!#SZ:.26O@"J@Y EndImage2 Fore SplineSet @@ -10821,10 +10820,10 @@ Flags: W HStem: -146 120<184 916> LayerCount: 2 Back -Image2: image/png 165 0 1562.12 61.0352 61.0352 +Image2: image/png 166 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!9!+M$*)(5]o6"1?I -C-ZOeJR":C*[$19!+H 954 120<124 246 366 732 854 976> VStem: 246 120<298 954> 732 124<98 952> LayerCount: 2 Back -Image2: image/png 136 0 1562.12 61.0352 61.0352 +Image2: image/png 137 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!=G$eDs"c?Z0Fn[XXFMKJ"&pcO`Q4oCfIY*1!/B/0 +[H*\4/-#YM!(fUS7'8jaJcGcN EndImage2 Fore SplineSet @@ -10898,10 +10897,10 @@ Flags: W HStem: 462 124<122 282 576 976> 708 122<120 528 820 974> LayerCount: 2 Back -Image2: image/png 146 0 1562.12 61.0352 61.0352 +Image2: image/png 148 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!8T5o<`5R;EJqfXCtQ -56_=]5;5HeBcCRm!1#kV;t[*FcN!qF!(fUS7'8jaJcGcN +5j$^2!!!!b8OPjD#T[D_?nc%t?k8T5o<`5R;EJqfXCtQ +56_=]5;5HeBcCRm!1Hmo@()9odJs7I!(fUS7'8jaJcGcN EndImage2 Fore Refer: 28 163 N 1 0 0 1 0 0 2 @@ -10960,7 +10959,7 @@ LayerCount: 2 Back Image2: image/png 127 0 1562.12 61.0352 61.0352 M,6r;%14!\!!!!.8Ou6I!!!!3!!!!A!ZtYaH"U0Haj6"ZQ[1O_"OaVZVJEae(*a!!!!j +5j$^2!!!!H8OPjD#T[D_?nc%t?kBF EndImage2 Fore @@ -11111,7 +11110,7 @@ StartChar: uni1E55 Encoding: 7765 7765 318 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 118<220 506> 848 108<220 500> 1074 364 VStem: 100 120<-268 100 218 848> 444 362 712 118<426 646> LayerCount: 2 @@ -11125,7 +11124,7 @@ StartChar: uni1E57 Encoding: 7767 7767 319 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 118<220 506> 848 108<220 500> 1126 224<289.844 466.156> VStem: 100 120<-268 100 218 848> 266 224<1149.84 1326.16> 712 118<426 646> LayerCount: 2 @@ -11305,7 +11304,7 @@ StartChar: nacute Encoding: 324 324 326 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 23G<226 346 716 830> 834 116<100 198 430 630> 1074 364 VStem: 226 120<100 746> 450 362 716 114<102 752> LayerCount: 2 @@ -13312,7 +13311,7 @@ StartChar: uniFF4E Encoding: 65358 65358 471 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 23G<240 360 730 844> 834 116<114 212 444 644> VStem: 240 120<100 746> 730 114<102 752> LayerCount: 2 @@ -13338,7 +13337,7 @@ StartChar: uniFF50 Encoding: 65360 65360 473 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 118<234 520> 848 108<234 514> VStem: 114 120<-268 100 218 848> 726 118<426 646> LayerCount: 2 @@ -14690,75 +14689,51 @@ StartChar: uniE0A2 Encoding: 57506 57506 533 Width: 1080 VWidth: 0 -Flags: W -HStem: 238 238<470.468 601.362> 776 120<470.186 601.814> 1256 120<451.725 621.961> -VStem: 116 330<498.591 755.471> 296 120<896 1227.6> 626 330<498.7 755.471> 656 120<896 1227.74> +Flags: HW +HStem: 238 238<472.654 599.398> 776 120<470.694 601.651> 1256 120<451.37 621.858> +VStem: 116 330<501.293 755.578> 296 120<896 1226.96> 626 330<497.896 755.471> 656 120<896 1222.5> +CounterMasks: 1 e0 LayerCount: 2 Fore SplineSet -536 1376 m 0xf0 - 568 1376 598 1372 626 1360 c 0xf4 - 652 1348 672 1336 688 1318 c 0 - 708 1300 720 1278 732 1256 c 0 - 744 1236 752 1214 758 1194 c 0 - 764 1172 768 1154 770 1136 c 0 - 772 1118 776 1106 776 1094 c 1 - 776 1078 l 1 - 776 896 l 1xe2 +536 1376 m 0xe8 + 682 1376 756 1265 770 1136 c 0 + 772 1118 776 1106 776 1094 c 0 + 776 1028 776 962 776 896 c 1xea 956 896 l 1 - 956 716 l 2 - 956 710 956 700 956 688 c 0 - 956 676 952 656 948 622 c 0 - 940 590 932 556 924 526 c 0 - 914 496 900 464 878 428 c 0 - 856 392 832 358 804 332 c 0 - 772 304 736 284 692 266 c 0 - 648 248 592 238 536 238 c 0 - 492 238 448 242 410 254 c 0 - 372 266 340 280 314 298 c 0 - 288 316 264 338 242 362 c 0 + 956 688 l 2 + 956 644 935 566 924 526 c 0 + 902 460 852 377 804 332 c 0 + 742 278 650 238 536 238 c 0 + 395 238 309 289 242 362 c 0 220 386 200 410 188 436 c 0 - 176 464 160 490 152 518 c 0 - 144 544 136 568 132 592 c 0 + 167 485 142 534 132 592 c 0 124 616 124 638 122 656 c 0 - 120 674 116 688 116 700 c 2 - 116 716 l 1 - 116 896 l 1xf4 + 120 674 116 688 116 700 c 0xf4 + 116 765 116 831 116 896 c 1 296 896 l 1 - 296 1078 l 2 - 296 1082 296 1088 296 1094 c 0xe8 + 296 1094 l 2 296 1100 302 1114 302 1136 c 0 302 1156 308 1176 314 1194 c 0 - 320 1212 328 1232 340 1256 c 0 - 352 1280 368 1300 384 1318 c 0 - 398 1336 420 1348 446 1360 c 0 - 472 1372 504 1376 536 1376 c 0xf0 + 328 1237 356 1286 384 1318 c 0 + 412 1353 473 1376 536 1376 c 0xe8 536 1256 m 0 - 516 1256 500 1252 484 1246 c 0 - 470 1240 460 1232 452 1214 c 0 - 444 1196 436 1184 432 1168 c 0 - 424 1154 422 1130 422 1094 c 0 + 496 1256 466 1245 452 1214 c 0 + 433 1171 422 1161 422 1094 c 0 422 1058 416 1030 416 1006 c 0 416 982 416 946 416 896 c 1 656 896 l 1 - 656 944 656 982 656 1006 c 0 - 656 1030 656 1060 656 1094 c 0xea - 656 1126 648 1154 640 1168 c 0 - 636 1184 628 1202 620 1216 c 0 - 612 1232 600 1240 588 1246 c 0 - 576 1252 556 1256 536 1256 c 0 + 656 1094 l 2 + 656 1126 648 1154 640 1168 c 1 + 627 1220 601 1256 536 1256 c 0 536 776 m 0 - 518 776 504 770 488 754 c 0 - 472 740 460 718 456 698 c 0 + 496 776 463 733 456 698 c 0 448 676 446 652 446 626 c 0 - 446 598 448 574 456 554 c 0 - 460 532 472 514 488 500 c 0 + 446 570 457 527 488 500 c 0 504 484 518 476 536 476 c 0 - 554 476 568 484 584 500 c 0 - 600 514 612 532 616 554 c 0 + 573 476 610 519 616 554 c 1 624 574 626 598 626 626 c 0xf4 - 626 652 624 676 616 698 c 0 - 612 718 600 740 584 754 c 0 + 626 679 615 727 584 754 c 0 568 770 554 776 536 776 c 0 EndSplineSet Validated: 1 @@ -15520,12 +15495,12 @@ StartChar: Imacron Encoding: 298 298 571 Width: 1080 VWidth: 0 -Flags: HW -HStem: 96 122<358 476 596 714> 1074 120<358 476 596 714> 1318 122<108 962> -VStem: 358 356<96 218 1074 1194> +Flags: W +HStem: 96 122<358 476 596 714> 1074 120<358 476 596 714> 1318 122<208 862> +VStem: 208 654<1318 1440> 358 356<96 218 1074 1194> LayerCount: 2 Fore -Refer: 55 175 N 1 0 0 1 0 122 2 +Refer: 55 175 S 1 0 0 1 0 122 2 Refer: 168 73 N 1 0 0 1 0 0 2 Validated: 1 EndChar @@ -16062,7 +16037,7 @@ Refer: 62 180 N 1 0 0 1 0 0 2 Validated: 1 EndChar -StartChar: racute +StartChar: NameMe.2214 Encoding: 1114241 -1 596 Width: 1080 VWidth: 0 @@ -21074,7 +21049,7 @@ StartChar: ndotaccent Encoding: 7749 7749 713 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 23G<240 360 730 844> 834 116<114 212 444 644> 1126 224<395.844 572.156> VStem: 240 120<100 746> 372 224<1149.84 1326.16> 730 114<102 752> LayerCount: 2 @@ -22694,7 +22669,7 @@ StartChar: afii10082 Encoding: 1088 1088 777 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 118<234 520> 848 108<234 514> VStem: 114 120<-268 100 218 848> 726 118<426 646> LayerCount: 2 @@ -26571,7 +26546,7 @@ StartChar: ncommaaccent Encoding: 326 326 881 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: -242 340 100 23G<240 360 730 844> 834 116<114 212 444 644> VStem: 240 120<100 746> 530 120<4 98> 730 114<102 752> LayerCount: 2 @@ -26613,7 +26588,7 @@ StartChar: napostrophe Encoding: 329 329 884 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 23G<240 360 730 844> 834 116<114 212 444 644> 1036 366<114 236> VStem: 114 122<1036 1402> 240 120<100 746> 730 114<102 752> LayerCount: 2 @@ -26640,7 +26615,7 @@ StartChar: eng Encoding: 331 331 886 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 23G<240 360 730 844> 834 116<114 212 444 644> VStem: 240 120<100 746> 730 114<102 752> LayerCount: 2 @@ -33836,9 +33811,10 @@ StartChar: uni1680 Encoding: 5760 5760 1199 Width: 1080 VWidth: 0 -Flags: W +Flags: HW LayerCount: 2 Fore +Refer: 529 9472 N 1 0 0 1 0 0 2 Validated: 1 EndChar @@ -33847,7 +33823,7 @@ Encoding: 5761 5761 1200 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<476 596> VStem: 476 120<160 636> LayerCount: 2 @@ -33860,7 +33836,7 @@ SplineSet 476 636 l 1 EndSplineSet Refer: 1199 5760 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1682 @@ -33868,7 +33844,7 @@ Encoding: 5762 5762 1201 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<392 512 564 684> VStem: 392 120<160 636> 564 120<160 636> LayerCount: 2 @@ -33886,7 +33862,7 @@ SplineSet 564 636 l 1 EndSplineSet Refer: 1199 5760 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1683 @@ -33894,7 +33870,7 @@ Encoding: 5763 5763 1202 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<298 418 476 596 648 768> VStem: 298 120<160 636> 476 120<160 636> 648 120<160 636> LayerCount: 2 @@ -33912,7 +33888,7 @@ SplineSet 648 636 l 1 EndSplineSet Refer: 1200 5761 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1684 @@ -33920,7 +33896,7 @@ Encoding: 5764 5764 1203 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<224 344 392 512 564 684 742 862> VStem: 224 120<160 636> 392 120<160 636> 564 120<160 636> 742 120<160 636> LayerCount: 2 @@ -33938,7 +33914,7 @@ SplineSet 742 636 l 1 EndSplineSet Refer: 1201 5762 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1685 @@ -33946,7 +33922,7 @@ Encoding: 5765 5765 1204 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<120 240 298 418 476 596 648 768 828 948> VStem: 120 120<160 636> 298 120<160 636> 476 120<160 636> 648 120<160 636> 828 120<160 636> LayerCount: 2 @@ -33964,7 +33940,7 @@ SplineSet 828 636 l 1 EndSplineSet Refer: 1202 5763 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1686 @@ -33972,13 +33948,13 @@ Encoding: 5766 5766 1205 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 662 476<482 602> VStem: 482 120<662 1138> LayerCount: 2 Fore Refer: 1200 5761 N -1 0 0 -1 1078 1298 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1687 @@ -33986,13 +33962,13 @@ Encoding: 5767 5767 1206 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 662 476<394 514 566 686> VStem: 394 120<662 1138> 566 120<662 1138> LayerCount: 2 Fore Refer: 1201 5762 N -1 0 0 -1 1078 1298 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1688 @@ -34000,13 +33976,13 @@ Encoding: 5768 5768 1207 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 662 476<310 430 482 602 660 780> VStem: 310 120<662 1138> 482 120<662 1138> 660 120<662 1138> LayerCount: 2 Fore Refer: 1202 5763 N -1 0 0 -1 1078 1298 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1689 @@ -34014,13 +33990,13 @@ Encoding: 5769 5769 1208 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 662 476<216 336 394 514 566 686 734 854> VStem: 216 120<662 1138> 394 120<662 1138> 566 120<662 1138> 734 120<662 1138> LayerCount: 2 Fore Refer: 1203 5764 N -1 0 0 -1 1078 1298 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni168A @@ -34028,13 +34004,13 @@ Encoding: 5770 5770 1209 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 662 476<130 250 310 430 482 602 660 780 838 958> VStem: 130 120<662 1138> 310 120<662 1138> 482 120<662 1138> 660 120<662 1138> 838 120<662 1138> LayerCount: 2 Fore Refer: 1204 5765 N -1 0 0 -1 1078 1298 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni168B @@ -34042,7 +34018,7 @@ Encoding: 5771 5771 1210 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW VStem: 356 370 LayerCount: 2 Fore @@ -34054,7 +34030,7 @@ SplineSet 610 1208 l 1 EndSplineSet Refer: 1199 5760 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni168C @@ -34062,7 +34038,7 @@ Encoding: 5772 5772 1211 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW VStem: 254 560 LayerCount: 2 Fore @@ -34079,7 +34055,7 @@ SplineSet 508 1208 l 1 EndSplineSet Refer: 1199 5760 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni168D @@ -34087,7 +34063,7 @@ Encoding: 5773 5773 1212 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW VStem: 356 370 LayerCount: 2 Fore @@ -34104,7 +34080,7 @@ SplineSet 788 1208 l 1 EndSplineSet Refer: 1210 5771 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni168E @@ -34112,7 +34088,7 @@ Encoding: 5774 5774 1213 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW VStem: 254 560 LayerCount: 2 Fore @@ -34129,7 +34105,7 @@ SplineSet 878 1208 l 1 EndSplineSet Refer: 1211 5772 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni168F @@ -34137,7 +34113,7 @@ Encoding: 5775 5775 1214 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW VStem: 356 370 LayerCount: 2 Fore @@ -34154,7 +34130,7 @@ SplineSet 956 1208 l 1 EndSplineSet Refer: 1212 5773 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1690 @@ -34162,14 +34138,14 @@ Encoding: 5776 5776 1215 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<476 596> 662 476<482 602> VStem: 476 120<160 636> 482 120<662 1138> LayerCount: 2 Fore Refer: 1205 5766 N 1 0 0 1 0 0 2 Refer: 1200 5761 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1691 @@ -34177,14 +34153,14 @@ Encoding: 5777 5777 1216 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<392 512 564 684> 662 476<394 514 566 686> VStem: 392 120<160 636> 394 120<662 1138> 564 120<160 636> 566 120<662 1138> LayerCount: 2 Fore Refer: 1206 5767 N 1 0 0 1 0 0 2 Refer: 1201 5762 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1692 @@ -34192,14 +34168,14 @@ Encoding: 5778 5778 1217 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<298 418 476 596 648 768> 662 476<310 430 482 602 660 780> VStem: 298 120<160 636> 310 120<662 1138> 476 120<160 636> 482 120<662 1138> 648 120<160 636> 660 120<662 1138> LayerCount: 2 Fore Refer: 1207 5768 N 1 0 0 1 0 0 2 Refer: 1202 5763 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1693 @@ -34207,14 +34183,14 @@ Encoding: 5779 5779 1218 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<224 344 392 512 564 684 742 862> 662 476<216 336 394 514 566 686 734 854> VStem: 216 120<662 1138> 224 120<160 636> 392 120<160 636> 394 120<662 1138> 564 120<160 636> 566 120<662 1138> 734 120<662 1138> 742 120<160 636> LayerCount: 2 Fore Refer: 1208 5769 N 1 0 0 1 0 0 2 Refer: 1203 5764 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1694 @@ -34222,14 +34198,14 @@ Encoding: 5780 5780 1219 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 160 476<120 240 298 418 476 596 648 768 828 948> 662 476<130 250 310 430 482 602 660 780 838 958> VStem: 120 120<160 636> 130 120<662 1138> 298 120<160 636> 310 120<662 1138> 476 120<160 636> 482 120<662 1138> 648 120<160 636> 660 120<662 1138> 828 120<160 636> 838 120<662 1138> LayerCount: 2 Fore Refer: 1209 5770 N 1 0 0 1 0 0 2 Refer: 1204 5765 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1695 @@ -34237,7 +34213,7 @@ Encoding: 5781 5781 1220 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW VStem: 356 370 LayerCount: 2 Fore @@ -34257,7 +34233,7 @@ Encoding: 5782 5782 1221 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet @@ -34285,7 +34261,7 @@ Encoding: 5783 5783 1222 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 40 120<290 780> VStem: 170 120<160 632> 476 120<264 352> 780 120<160 352> LayerCount: 2 @@ -34310,7 +34286,7 @@ SplineSet 170 632 l 1 EndSplineSet Refer: 1199 5760 N 1 0 0 1 0 0 2 -Validated: 1 +Validated: 5 EndChar StartChar: uni1698 @@ -34318,7 +34294,7 @@ Encoding: 5784 5784 1223 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet @@ -34457,7 +34433,7 @@ Encoding: 5786 5786 1225 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 340 112<238 834> VStem: 238 596<340 452> LayerCount: 2 @@ -34751,12 +34727,13 @@ StartChar: uni21F5 Encoding: 8693 8693 1241 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 21G<108 228 724 846> 932 20G<108 228 707.014 846> VStem: 108 120<100 156 368 952> 724 122<100 742> LayerCount: 2 Fore -Refer: 722 1080 N 1 0 0 1 0 0 2 +Refer: 1072 8593 N 1 0 0 1 270 0 2 +Refer: 1073 8595 N 1 0 0 1 -150 0 2 Validated: 1 EndChar @@ -35577,7 +35554,7 @@ StartChar: u1D5C7 Encoding: 120263 120263 1303 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 23G<240 360 730 844> 834 116<114 212 444 644> VStem: 240 120<100 746> 730 114<102 752> LayerCount: 2 @@ -35603,7 +35580,7 @@ StartChar: u1D5C9 Encoding: 120265 120265 1305 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 118<234 520> 848 108<234 514> VStem: 114 120<-268 100 218 848> 726 118<426 646> LayerCount: 2 @@ -38568,7 +38545,7 @@ Encoding: 1167 1167 1476 Width: 1080 VWidth: 0 UnlinkRmOvrlpSave: 1 -Flags: W +Flags: HW HStem: 92 352 100 118<234 520> 848 108<234 514> VStem: 114 120<-268 100 218 848> 514 352 726 118<426 646> LayerCount: 2 @@ -39851,10 +39828,11 @@ Encoding: 1239 1239 1545 Width: 1080 VWidth: 0 Flags: W -HStem: 102 112<318 844> 462 124<234 724> 830 122<322 638> -VStem: 114 118<304 462 586 740> 724 116<586 742> +HStem: 102 112<318 844> 462 124<234 724> 830 122<322 638> 1022 120<368.912 601.088> 1298 20G<186 307 662 782> +VStem: 114 118<304 462 586 740> 198 116<1196.35 1318> 662 120<1202.95 1318> 724 116<586 742> LayerCount: 2 Fore +Refer: 575 728 S 1 0 0 1 -40 0 2 Refer: 768 1077 N 1 0 0 1 0 0 2 Validated: 1 EndChar @@ -39876,7 +39854,7 @@ StartChar: afii10846 Encoding: 1241 1241 1547 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 102 122<320 636> 468 124<234 724> 840 112<114 640> VStem: 118 116<312 468> 726 118<314 468 592 750> LayerCount: 2 @@ -44061,7 +44039,7 @@ StartChar: u1D697 Encoding: 120471 120471 1703 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 23G<240 360 730 844> 834 116<114 212 444 644> VStem: 240 120<100 746> 730 114<102 752> LayerCount: 2 @@ -44087,7 +44065,7 @@ StartChar: u1D699 Encoding: 120473 120473 1705 Width: 1080 VWidth: 0 -Flags: W +Flags: HW HStem: 100 118<234 520> 848 108<234 514> VStem: 114 120<-268 100 218 848> 726 118<426 646> LayerCount: 2 @@ -59053,11 +59031,11 @@ Encoding: 12557 12557 2024 Width: 1080 VWidth: 0 Flags: W -HStem: -230 120<270 480 600 810> -VStem: 480 120<-110 80> +VStem: 168 490 408 490 LayerCount: 2 Fore -Refer: 2088 -1 N 1 0 0 1 0 -460 2 +Refer: 2128 10216 N 1 0 0 1 120 0 2 +Refer: 2128 10216 N 1 0 0 1 -120 0 2 Validated: 1 EndChar @@ -61034,7 +61012,7 @@ StartChar: arrowdblleft Encoding: 8656 8656 2124 Width: 1080 VWidth: 0 -Flags: HW +Flags: W HStem: 494 104<460 1070> 695 111<460 1070> 932 20G<436.34 460> LayerCount: 2 Fore @@ -61140,8 +61118,8 @@ StartChar: uni27E8 Encoding: 10216 10216 2128 Width: 1080 VWidth: 0 -Flags: HW -VStem: 288 493 +Flags: W +VStem: 288 490 LayerCount: 2 Fore SplineSet @@ -61273,7 +61251,7 @@ StartChar: uni22A3 Encoding: 8867 8867 2134 Width: 1080 VWidth: 0 -Flags: HW +Flags: W HStem: 601 120<134 822> VStem: 822 124<233 601 721 1087> LayerCount: 2 @@ -62869,10 +62847,10 @@ StartChar: uni02C4 Encoding: 708 708 2196 Width: 1080 VWidth: 0 -Flags: W +Flags: HW LayerCount: 2 Fore -Refer: 2194 706 N 0 -1 1 0 -142 1058 2 +Refer: 2194 706 S 0 -1 1 0 -114 1058 2 Validated: 1 EndChar @@ -63033,47 +63011,47 @@ Encoding: 8412 8412 2204 Width: 1080 VWidth: 0 Flags: W -HStem: 1406 116<174 240 394 460 614 680 834 900> -VStem: 149 116<1431 1497> 369 116<1431 1497> 589 116<1431 1497> 809 116<1431 1497> -LayerCount: 2 -Fore -SplineSet -809 1497 m 25 - 834 1522 l 25 - 900 1522 l 25 - 925 1497 l 25 - 925 1431 l 25 - 900 1406 l 25 - 834 1406 l 25 - 809 1431 l 25 - 809 1497 l 25 -589 1497 m 25 - 614 1522 l 25 - 680 1522 l 25 - 705 1497 l 25 - 705 1431 l 25 - 680 1406 l 25 - 614 1406 l 25 - 589 1431 l 25 - 589 1497 l 25 -369 1497 m 25 - 394 1522 l 25 - 460 1522 l 25 - 485 1497 l 25 - 485 1431 l 25 - 460 1406 l 25 - 394 1406 l 25 - 369 1431 l 25 - 369 1497 l 25 -149 1497 m 25 - 174 1522 l 25 - 240 1522 l 25 - 265 1497 l 25 - 265 1431 l 25 - 240 1406 l 25 - 174 1406 l 25 - 149 1431 l 25 - 149 1497 l 25 +HStem: 1434 116<174 240 394 460 614 680 834 900> +VStem: 149 116<1459 1525> 369 116<1459 1525> 589 116<1459 1525> 809 116<1459 1525> +LayerCount: 2 +Fore +SplineSet +809 1525 m 25 + 834 1550 l 25 + 900 1550 l 25 + 925 1525 l 25 + 925 1459 l 25 + 900 1434 l 25 + 834 1434 l 25 + 809 1459 l 25 + 809 1525 l 25 +589 1525 m 25 + 614 1550 l 25 + 680 1550 l 25 + 705 1525 l 25 + 705 1459 l 25 + 680 1434 l 25 + 614 1434 l 25 + 589 1459 l 25 + 589 1525 l 25 +369 1525 m 25 + 394 1550 l 25 + 460 1550 l 25 + 485 1525 l 25 + 485 1459 l 25 + 460 1434 l 25 + 394 1434 l 25 + 369 1459 l 25 + 369 1525 l 25 +149 1525 m 25 + 174 1550 l 25 + 240 1550 l 25 + 265 1525 l 25 + 265 1459 l 25 + 240 1434 l 25 + 174 1434 l 25 + 149 1459 l 25 + 149 1525 l 25 EndSplineSet Validated: 1 EndChar @@ -63191,44 +63169,419 @@ Encoding: 8411 8411 2211 Width: 1080 VWidth: 0 Flags: W -HStem: 1406 116<284 350 504 570 724 790> -VStem: 259 116<1431 1497> 479 116<1431 1497> 699 116<1431 1497> +HStem: 1434 116<284 350 504 570 724 790> +VStem: 259 116<1459 1525> 479 116<1459 1525> 699 116<1459 1525> CounterMasks: 1 70 LayerCount: 2 Fore SplineSet -699 1497 m 25 - 724 1522 l 25 - 790 1522 l 25 - 815 1497 l 25 - 815 1431 l 25 - 790 1406 l 25 - 724 1406 l 25 - 699 1431 l 25 - 699 1497 l 25 -479 1497 m 25 - 504 1522 l 25 - 570 1522 l 25 - 595 1497 l 25 - 595 1431 l 25 - 570 1406 l 25 - 504 1406 l 25 - 479 1431 l 25 - 479 1497 l 25 -259 1497 m 25 - 284 1522 l 25 - 350 1522 l 25 - 375 1497 l 25 - 375 1431 l 25 - 350 1406 l 25 - 284 1406 l 25 - 259 1431 l 25 - 259 1497 l 25 +699 1525 m 25 + 724 1550 l 25 + 790 1550 l 25 + 815 1525 l 25 + 815 1459 l 25 + 790 1434 l 25 + 724 1434 l 25 + 699 1459 l 25 + 699 1525 l 25 +479 1525 m 25 + 504 1550 l 25 + 570 1550 l 25 + 595 1525 l 25 + 595 1459 l 25 + 570 1434 l 25 + 504 1434 l 25 + 479 1459 l 25 + 479 1525 l 25 +259 1525 m 25 + 284 1550 l 25 + 350 1550 l 25 + 375 1525 l 25 + 375 1459 l 25 + 350 1434 l 25 + 284 1434 l 25 + 259 1459 l 25 + 259 1525 l 25 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni22C8 +Encoding: 8904 8904 2212 +Width: 1080 +VWidth: 0 +Flags: W +VStem: 160 120<469 839> 822 120<473 843> +LayerCount: 2 +Fore +SplineSet +466 657 m 1 + 280 839 l 1 + 280 469 l 1 + 466 655 l 1 + 465 656 l 1 + 466 657 l 1 +636 655 m 1 + 822 473 l 1 + 822 843 l 1 + 636 657 l 1 + 637 656 l 1 + 636 655 l 1 +942 1133 m 1 + 942 187 l 1 + 551 571 l 1 + 160 179 l 1 + 160 1125 l 1 + 551 741 l 1 + 942 1133 l 1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni2A1D +Encoding: 10781 10781 2213 +Width: 1080 +VWidth: 0 +Flags: W +HStem: 370 572 +VStem: 160 120<539 769> 822 120<543 773> +LayerCount: 2 +Fore +SplineSet +942 430 m 2 + 942 394 912 370 882 370 c 0 + 869 370 857 375 848 380 c 2 + 551 582 l 1 + 254 375 l 2 + 246 369 234 364 220 364 c 0 + 190 364 160 387 160 424 c 2 + 160 882 l 2 + 160 918 190 942 220 942 c 0 + 233 942 245 937 254 932 c 2 + 551 730 l 1 + 848 937 l 2 + 856 943 868 948 882 948 c 0 + 912 948 942 925 942 888 c 2 + 942 430 l 2 +822 773 m 1 + 656 657 l 1 + 822 543 l 1 + 822 773 l 1 +280 539 m 1 + 446 655 l 1 + 280 769 l 1 + 280 539 l 1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni22C9 +Encoding: 8905 8905 2214 +Width: 1080 +VWidth: 0 +UnlinkRmOvrlpSave: 1 +Flags: W +VStem: 160 120<469 839> +LayerCount: 2 +Fore +SplineSet +467 656 m 5 + 280 839 l 5 + 280 469 l 5 + 467 656 l 5 +940 949 m 5 + 644 656 l 5 + 940 356 l 5 + 940 187 l 5 + 551 571 l 5 + 160 179 l 5 + 160 1125 l 5 + 551 741 l 5 + 940 1130 l 5 + 940 949 l 5 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni22CA +Encoding: 8906 8906 2215 +Width: 1080 +VWidth: 0 +Flags: W +VStem: 820 120<470 840> +LayerCount: 2 +Fore +SplineSet +633 653 m 5 + 820 470 l 5 + 820 840 l 5 + 633 653 l 5 +160 360 m 5 + 456 653 l 5 + 160 953 l 5 + 160 1122 l 5 + 549 738 l 5 + 940 1130 l 5 + 940 184 l 5 + 549 568 l 5 + 160 179 l 5 + 160 360 l 5 +EndSplineSet +Validated: 1 +EndChar + +StartChar: Omacron +Encoding: 332 332 2216 +Width: 1080 +VWidth: 0 +Flags: W +HStem: 100 120<322 746> 1076 118<324 746> 1318 122<208 862> +VStem: 120 124<300 988> 208 654<1318 1440> 832 120<306 986> +LayerCount: 2 +Fore +Refer: 55 175 N 1 0 0 1 0 122 2 +Refer: 174 79 N 1 0 0 1 0 0 2 +Validated: 1 +EndChar + +StartChar: racute +Encoding: 341 341 2217 +Width: 1080 +VWidth: 0 +Flags: W +HStem: 100 21G<214 332> 830 122<114 195.345 538 634> 954 364 +VStem: 214 118<100 626> 358 362 724 120<708 744> +LayerCount: 2 +Fore +Refer: 62 180 S 1 0 0 1 0 0 2 +Refer: 145 114 N 1 0 0 1 0 0 2 +Validated: 1 +EndChar + +StartChar: uni02C5 +Encoding: 709 709 2218 +Width: 1080 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 2194 706 N 0 1 -1 0 1086 209 2 +Validated: 1 +EndChar + +StartChar: uni0450 +Encoding: 1104 1104 2219 +Width: 1080 +VWidth: 0 +Flags: W +HStem: 102 112<318 844> 462 124<234 724> 830 122<322 638> 1066 366 +VStem: 114 118<304 462 586 740> 234 368 724 116<586 742> +LayerCount: 2 +Fore +Refer: 61 96 N 1 0 0 1 -134 114 2 +Refer: 768 1077 N 1 0 0 1 0 0 2 +Validated: 1 +EndChar + +StartChar: uni04D5 +Encoding: 1237 1237 2220 +Width: 1080 +VWidth: 0 +Flags: W +HStem: 98 120<316 390 682 960> 462 126<596 846> 588 120<440 476> 830 120<108 388 680 758> +VStem: 108 120<302 380> 476 120<306 462 708 744> 846 120<588 746> +LayerCount: 2 +Fore +Refer: 154 230 S 1 0 0 1 0 0 2 +Validated: 1 +EndChar + +StartChar: arrowdblup +Encoding: 8657 8657 2221 +Width: 1080 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 2124 8656 S 0 -1 1 0 -63 1231 2 +Validated: 1 +EndChar + +StartChar: uni2214 +Encoding: 8724 8724 2222 +Width: 1080 +VWidth: 0 +Flags: W +HStem: 586 126<120 476 596 952> 1126 224<447.844 624.156> +VStem: 424 224<1149.84 1326.16> 476 120<266 586 712 1044> +LayerCount: 2 +Fore +Refer: 696 729 S 1 0 0 1 52 0 2 +Refer: 53 43 N 1 0 0 1 0 0 2 +Validated: 1 +EndChar + +StartChar: uni2719 +Encoding: 10009 10009 2223 +Width: 1080 +VWidth: 0 +Flags: W +HStem: 191 30<431 641> 511 30<75 401 671 997> 586 126<120 476 596 952> 757 30<75 401 671 997> 1089 30<431 641> +VStem: 45 30<541 757> 401 30<221 511 787 1089> 476 120<266 586 712 1044> 641 30<221 511 787 1089> 997 30<541 757> +LayerCount: 2 +Fore +SplineSet +596 1044 m 1 + 596 712 l 1 + 952 712 l 1 + 952 586 l 1 + 596 586 l 1 + 596 266 l 1 + 476 266 l 1 + 476 586 l 1 + 120 586 l 1 + 120 712 l 1 + 476 712 l 1 + 476 1044 l 1 + 596 1044 l 1 +401 511 m 1 + 45 511 l 1 + 45 787 l 1 + 401 787 l 1 + 401 1119 l 1 + 671 1119 l 1 + 671 787 l 1 + 1027 787 l 1 + 1027 511 l 1 + 671 511 l 1 + 671 191 l 1 + 401 191 l 1 + 401 511 l 1 +431 757 m 1 + 75 757 l 1 + 75 541 l 1 + 431 541 l 1 + 431 221 l 1 + 641 221 l 1 + 641 541 l 1 + 997 541 l 1 + 997 757 l 1 + 641 757 l 1 + 641 1089 l 1 + 431 1089 l 1 + 431 757 l 1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni2301 +Encoding: 8961 8961 2224 +Width: 1080 +VWidth: 0 +Flags: W +HStem: 98 120<332 1072> 590 120<0 528> +LayerCount: 2 +Fore +Refer: 242 -1 N 1 0 0 1 0 0 2 +Validated: 1 +EndChar + +StartChar: arrowdbldown +Encoding: 8659 8659 2225 +Width: 1080 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 2221 8657 S -1 0 0 -1 1168 1294 2 +Validated: 1 +EndChar + +StartChar: NameMe.2223 +Encoding: 1114339 -1 2226 +Width: 2000 +Flags: H +LayerCount: 2 +Fore +SplineSet +0 800 m 5 + 541 800 l 5 + 541 400 l 5 + 0 400 l 5 + 0 800 l 5 +0 1600 m 5 + 541 1600 l 5 + 541 1200 l 5 + 0 1200 l 5 + 0 1600 l 5 +EndSplineSet +Validated: 1 +EndChar + +StartChar: NameMe.2224 +Encoding: 1114340 -1 2227 +Width: 2000 +Flags: HW +LayerCount: 2 +Fore +SplineSet +0 400 m 5 + 541 400 l 5 + 541 0 l 5 + 0 0 l 5 + 0 400 l 5 +0 1200 m 5 + 541 1200 l 5 + 541 800 l 5 + 0 800 l 5 + 0 1200 l 5 +EndSplineSet +Validated: 1 +EndChar + +StartChar: NameMe.2225 +Encoding: 1114341 -1 2228 +Width: 2000 +Flags: HW +LayerCount: 2 +Fore +SplineSet +539 800 m 5 + 1080 800 l 5 + 1080 400 l 5 + 539 400 l 5 + 539 800 l 5 +539 1600 m 5 + 1080 1600 l 5 + 1080 1200 l 5 + 539 1200 l 5 + 539 1600 l 5 +EndSplineSet +Validated: 1 +EndChar + +StartChar: NameMe.2226 +Encoding: 1114342 -1 2229 +Width: 2000 +Flags: HW +LayerCount: 2 +Fore +SplineSet +539 400 m 5 + 1080 400 l 5 + 1080 0 l 5 + 539 0 l 5 + 539 400 l 5 +539 1200 m 5 + 1080 1200 l 5 + 1080 800 l 5 + 539 800 l 5 + 539 1200 l 5 EndSplineSet Validated: 1 EndChar EndChars -BitmapFont: 14 2213 11 3 1 +BitmapFont: 14 2231 11 3 1 BDFChar: 1 1114113 8 0 0 0 0 0 z BDFChar: 2 8364 8 1 6 0 9 0 @@ -67369,6 +67722,14 @@ BDFChar: 2209 9591 8 0 0 0 0 0 z BDFChar: 2211 8411 8 0 0 0 0 0 z +BDFChar: 2212 8904 8 0 0 0 0 0 +z +BDFChar: 2216 332 8 0 0 0 0 0 +z +BDFChar: 2224 8961 8 0 0 0 0 0 +z +BDFChar: 2225 8659 8 2 5 1 6 0 +@.7Q3?sis7 BDFRefChar: 1580 1747 0 0 N BDFRefChar: 1598 166 0 0 N BDFRefChar: 1609 720 0 0 N @@ -67485,8 +67846,11 @@ BDFRefChar: 2207 529 0 0 N BDFRefChar: 2208 528 0 0 N BDFRefChar: 2209 528 0 0 N BDFRefChar: 2211 39 0 0 N +BDFRefChar: 2212 2134 0 0 N +BDFRefChar: 2216 174 0 0 N +BDFRefChar: 2224 242 0 0 N EndBitmapFont -BitmapFont: 17 2213 14 3 1 +BitmapFont: 17 2231 14 3 1 BDFChar: 1 1114113 9 0 0 0 0 0 z BDFChar: 2 8364 9 1 7 1 11 0 @@ -71627,6 +71991,14 @@ BDFChar: 2209 9591 9 0 0 0 0 0 z BDFChar: 2211 8411 9 0 0 0 0 0 z +BDFChar: 2212 8904 9 0 0 0 0 0 +z +BDFChar: 2216 332 9 0 0 0 0 0 +z +BDFChar: 2224 8961 9 0 0 0 0 0 +z +BDFChar: 2225 8659 9 3 6 1 8 0 +@.7Q3?smAM BDFRefChar: 1580 1747 0 0 N BDFRefChar: 1598 166 0 0 N BDFRefChar: 1609 720 0 0 N @@ -71743,8 +72115,11 @@ BDFRefChar: 2207 529 0 0 N BDFRefChar: 2208 528 0 0 N BDFRefChar: 2209 528 0 0 N BDFRefChar: 2211 39 0 0 N +BDFRefChar: 2212 2134 0 0 N +BDFRefChar: 2216 174 0 0 N +BDFRefChar: 2224 242 0 0 N EndBitmapFont -BitmapFont: 25 2213 20 5 1 +BitmapFont: 25 2231 20 5 1 BDFChar: 1 1114113 14 0 0 0 0 0 z BDFChar: 2 8364 14 1 11 1 16 0 @@ -75887,6 +76262,14 @@ BDFChar: 2209 9591 14 0 0 0 0 0 z BDFChar: 2211 8411 14 0 0 0 0 0 z +BDFChar: 2212 8904 14 0 0 0 0 0 +z +BDFChar: 2216 332 14 0 0 0 0 0 +z +BDFChar: 2224 8961 14 0 0 0 0 0 +z +BDFChar: 2225 8659 14 4 10 2 13 0 +&3,((C1q9oBP;'m BDFRefChar: 1580 1747 0 0 N BDFRefChar: 1598 166 0 0 N BDFRefChar: 1609 720 0 0 N @@ -76003,8 +76386,11 @@ BDFRefChar: 2207 529 0 0 N BDFRefChar: 2208 528 0 0 N BDFRefChar: 2209 528 0 0 N BDFRefChar: 2211 39 0 0 N +BDFRefChar: 2212 2134 0 0 N +BDFRefChar: 2216 174 0 0 N +BDFRefChar: 2224 242 0 0 N EndBitmapFont -BitmapFont: 28 2213 22 6 1 +BitmapFont: 28 2231 22 6 1 BDFChar: 1 1114113 15 0 0 0 0 0 z BDFChar: 2 8364 15 2 12 1 18 0 @@ -80147,6 +80533,14 @@ BDFChar: 2209 9591 15 0 0 0 0 0 z BDFChar: 2211 8411 15 0 0 0 0 0 z +BDFChar: 2212 8904 15 0 0 0 0 0 +z +BDFChar: 2216 332 15 0 0 0 0 0 +z +BDFChar: 2224 8961 15 0 0 0 0 0 +z +BDFChar: 2225 8659 15 5 11 2 14 0 +0R3N`84Z9B84Z9B8,rVi BDFRefChar: 1580 1747 0 0 N BDFRefChar: 1598 166 0 0 N BDFRefChar: 1609 720 0 0 N @@ -80263,8 +80657,11 @@ BDFRefChar: 2207 529 0 0 N BDFRefChar: 2208 528 0 0 N BDFRefChar: 2209 528 0 0 N BDFRefChar: 2211 39 0 0 N +BDFRefChar: 2212 2134 0 0 N +BDFRefChar: 2216 174 0 0 N +BDFRefChar: 2224 242 0 0 N EndBitmapFont -BitmapFont: 33 2213 26 7 1 +BitmapFont: 33 2231 26 7 1 BDFChar: 1 1114113 18 0 0 0 0 0 z BDFChar: 2 8364 18 2 15 2 21 0 @@ -84559,6 +84956,14 @@ BDFChar: 2209 9591 18 0 0 0 0 0 z BDFChar: 2211 8411 18 0 0 0 0 0 z +BDFChar: 2212 8904 18 0 0 0 0 0 +z +BDFChar: 2216 332 18 0 0 0 0 0 +z +BDFChar: 2224 8961 18 0 0 0 0 0 +z +BDFChar: 2225 8659 18 5 13 3 18 0 +#QP85)ur/&IfT4n2?5W82?5W82?5W82?5W82?5W8 BDFRefChar: 1580 1747 0 0 N BDFRefChar: 1598 166 0 0 N BDFRefChar: 1609 720 0 0 N @@ -84675,8 +85080,11 @@ BDFRefChar: 2207 529 0 0 N BDFRefChar: 2208 528 0 0 N BDFRefChar: 2209 528 0 0 N BDFRefChar: 2211 39 0 0 N +BDFRefChar: 2212 2134 0 0 N +BDFRefChar: 2216 174 0 0 N +BDFRefChar: 2224 242 0 0 N EndBitmapFont -BitmapFont: 50 2213 40 10 1 +BitmapFont: 50 2231 40 10 1 BDFChar: 1 1114113 27 0 0 0 0 0 z BDFChar: 2 8364 27 3 23 2 32 0 @@ -90554,6 +90962,14 @@ BDFChar: 2209 9591 27 0 0 0 0 0 z BDFChar: 2211 8411 27 0 0 0 0 0 z +BDFChar: 2212 8904 27 0 0 0 0 0 +z +BDFChar: 2216 332 27 0 0 0 0 0 +z +BDFChar: 2224 8961 27 0 0 0 0 0 +z +BDFChar: 2225 8659 27 7 21 4 27 0 +!<<4P#J^l.&+C\1559MQr-f&n$ucVo$ucVo$ucVo$ucVo$ucVo$ucVo$ucVo BDFRefChar: 1580 1747 0 0 N BDFRefChar: 1598 166 0 0 N BDFRefChar: 1609 720 0 0 N @@ -90670,5 +91086,8 @@ BDFRefChar: 2207 529 0 0 N BDFRefChar: 2208 528 0 0 N BDFRefChar: 2209 528 0 0 N BDFRefChar: 2211 39 0 0 N +BDFRefChar: 2212 2134 0 0 N +BDFRefChar: 2216 174 0 0 N +BDFRefChar: 2224 242 0 0 N EndBitmapFont EndSplineFont diff --git a/CHANGELOG.md b/CHANGELOG.md index a8cad1a..9ffc198 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ -v2.3.1 ------- +## v3.0.0 + +- Set version to 3.0.0 because font metrics changed +- Fix WOFF major version +- Remove unnecessary Adobe XUID +- Change width for semi-condensed and condensed versions +- Add sample images for each font variation +- Scale glyphs before making the bounding box narrower +- Generate a ‘PfEd’ table and store glyph comments in the PS font +- Change OTF flags - don't generate glyph map remove PS-related flag +- Added building blocks for Kaypro octants +- Fix ӗ, ⇵, ㄍ, , p, n +- Re-add Ogham bar +- Added a social preview image +- Added note to README on build dependencies +- Added ⋈, ⨝, ⋉, ⋊, Ō, ŕ, ˅, ѐ, ӕ, ⇑, ⇓, ∔, ✙, ⌁ +- Added 4-dotted numbers to rendering sample +- Moved ⃛ and ⃜ up away from topline +- Add GitHub workflow for testing +- Fix cache clear utility +- Update requirements.txt +- Set version to 2.3.2 + +## v2.3.1 - Swap ⊓ and ⊔ - Fix ˜ (make it different from ~) @@ -11,17 +33,15 @@ v2.3.1 - Use a constant to set which font file to use - Set version to 2.3.1 -v2.3.0 ------- +## v2.3.0 - Add '⋅' -- Add "╭", "╮", "╰", and "╯". Fixes #89 +- Add "╭", "╮", "╰", and "╯". Fixes \#89 - Improve ▴, ►, ▾, ◄ - Add missing glyph ▋, ▽, △ - Version set to 2.3.0 -v2.2.1 ------- +## v2.2.1 - Add a hooks folder with a suggested pre-commit hook - Add APL and BQN glyphs ⊂, ⊃, ⊆, ⊇, ⊏, ⊐, ⊑, ⊒, ⊔, ⊓, ⊕, ⊖, ⊗, ⊘, ⊙, ⌾, @@ -41,18 +61,16 @@ v2.2.1 - Simplify cedilla, fix overlap in ç and Ç - Set version to 2.1.1 (next release) -v2.1.0 ------- +## v2.1.0 - Update spline format to 3.2 -- Fixed "🬉" (U+1fb09 - BLOCK SEXTANT-24) #71 -- PEP-8 improvements to generate_sample_image.py +- Fixed "🬉" (U+1fb09 - BLOCK SEXTANT-24) \#71 +- PEP-8 improvements to generate\_sample\_image.py - Interim fix for pinned Pillow in gftools - Update Travis environment to Ubuntu Focal and Python 3.8 - Set version to 2.1.0 (next release) -v2.0.4 ------- +## v2.0.4 - Fixes to all half, quarter and eights blocks, ░, ▒, ▓, ⍲, X, Ò, Ó, Ô, Õ, Ö, Ō, ō, Ŏ, ←, ↑, →, ↓ @@ -60,7 +78,7 @@ v2.0.4 - Adjust OS/2 metrics - Set vertical advance to 0 - Added vertical metrics - (https://fontforge.org/fontinfo.html#PS-General) + (https://fontforge.org/fontinfo.html\#PS-General) - Removed 🍺, 🍻, 💖, 💡, 😪 - Added ➥, ➦, Unicode 13 Symbols for Legacy Computing - Sample rendering now includes blurred easily confused pairs @@ -69,8 +87,7 @@ v2.0.4 - Branch cleanup (back to master/develop) - Set version to 2.0.4 (next release) -v2.0.3 ------- +## v2.0.3 - Skipping FontBakery tests on TravisCI for now - Makefile now defaults to `help` target instead of `font` @@ -83,8 +100,7 @@ v2.0.3 - Removed slots below 0x1f - Set version to 2.0.3 (next release) -v2.0.2 ------- +## v2.0.2 - Add ★, ⚑, ✚ - Instal .ttf files by default @@ -99,8 +115,7 @@ v2.0.2 - Sorted symbols in the SFD file - Set version to 2.0.2 (next release) -v2.0.1 ------- +## v2.0.1 - Added ◢, ◣, ◤, ◥, ▮, and ◆ - Use new AWS S3 vhost-based names, add HTTPS where applicable @@ -108,8 +123,7 @@ v2.0.1 - New implementation for ℅, add ℆ - New implementation for ‘, ’, “, and ” -v2.0.0 ------- +## v2.0.0 - Added ˎ, qqˏ, ː, ˑ, ˤ, ˬ, ̀, ̂, ̃, ̄, ̅, ̆, ̇, ̈, ̊, ̋, ̌, Ͱ, ͱ, Ͳ, ͳ, Ϳ, Ϗ, ϐ, ϑ, ϒ, ϓ, ϔ, ϖ, Ϟ, Ϸ, ϸ, Ҕ, ҕ, Җ, җ, Ҙ, ҙ, Қ, қ, Ҝ, ҝ, ҟ, Ҡ, ҡ, Ң, ң, Ҥ, ҥ, @@ -128,8 +142,7 @@ v2.0.0 - Fixed some overlap and rounding issues - Add missing glyph slots up to uni04CF -v1.2.23 -------- +## v1.2.23 - Simplify tilde - Added ⎇ and ⎈ @@ -137,8 +150,7 @@ v1.2.23 - Change zip target dependency to derived instead of all (doesn't require PIL) -v1.2.22 -------- +## v1.2.22 - Removed unused Hangul characters - Added Ogham symbols @@ -146,49 +158,46 @@ v1.2.22 - Added SIL Open Font License option - Fix line drawing discontiuities -v1.2.21 -------- +## v1.2.21 - Build process now uses a build folder - Added 💖, 😪, ⇤, ⇥, 𝖠-𝟿 (math symbols), ѝ, Ѝ, ∓, ∛, ∜, ∝, ∀, ∁, ∃, ∄, ∅, ⏏, ↚, ↛, ∈, ∉, ∊, ∋, ∌, ∍, ∐ - Added placeholders for Ogham -v1.2.20 -------- +## v1.2.20 - Force extension of 4 and 6 to properly render on Linux - Added "", "�", "⋮", "⅟", U+e16c, "⁋", "⁎", "⁑", "Ⅰ", "Ⅴ", "Ⅹ", "Ⅼ", "Ⅽ", "Ⅾ", "Ⅿ", "℗", "⋎" - Fixed "❮" and "❯" -v1.2.19 -------- +## v1.2.19 - Added normal "⸨" and "⸩", full-width "⦅" and "⦆", ❮, ♡, ♢, ♤, ♧, ♁, ⅐, ⅑, ⅒, ⅓, ⅔, ⅕, ⅖, ⅗, ⅘, ⅙, ⅚ - Fixed "⌚", "w", "4", "6" -v1.2.18 -------- +## v1.2.18 + - Improved sample image generation (rendering can be now tested!) - Sample image is generated in CI - Added missing WGL4 glyphs - Rendering fixes for "p" and "8" for lower resolution screens - Numerous fixes (git log is your friend) -v1.2.17 -------- +## v1.2.17 + - Added glyps for ␀, ␁, ␂, ␃, ␄, ␅, ␆, ␇, ␈, ␉, ␊, ␋, ␌, ␍, ␎, ␏, ␐, ␑, ␒, ␓, ␔, ␕, ␖, ␗, ␘, ␙, ␚, ␛, ␜, ␝, ␞, ␟, ␠, ␡, ∇, ⏨, ⌦, ⌧ and ⌫ - Added ➜ -v1.2.16 -------- +## v1.2.16 + - Added ⧻, ␢, №, Ё and ъ -v1.2.15 -------- +## v1.2.15 + - Added ⏻, ⏼, ⭘, ⏽, ⏾ and ⯒ - Added Ў, ў, Џ, џ, Ћ and ћ - Added Ž, ž, Ơ, Ư, ơ, ư, Š, š, Э, э, ё, м, щ and ы @@ -203,8 +212,8 @@ v1.2.15 - Added Ǝ, и and ˚ - Added ✖ glyph -v1.2.14 -------- +## v1.2.14 + - Added ⚓ glyph - Added ‘ and ’ (quoteleft and quoteright) - Added ✘ (used by Homebrew) @@ -213,52 +222,52 @@ v1.2.14 - Add upped case delta glyph - `make install` now installs on OSX -v1.2.13 -------- +## v1.2.13 + - Corrected codepoint for single beer, added two-beer glyph -v1.2.12 -------- +## v1.2.12 + - Add a beer mug (used by Homebrew) - Fix regex in Makefile test target - Make the powerline up arrow taller -v1.2.11 -------- +## v1.2.11 + - Add missing dotted Irish alphabet chars - Add shorter f and t for easier accent composition - Use wider traces for ✎ - Added a SemiNarrow variant 492 units wide -v1.2.10 -------- +## v1.2.10 + - Small fixes to a and e - Remove StdHW and StemSnapH PostScript private dicts -- Redo and simplify 0-9, maybe fix #6 +- Redo and simplify 0-9, maybe fix \#6 - Added a lambda, ⬇, ⬇, ✔, ✼, ✎, u1F394 and uni21AF -- Adjustments to , ?, | and ¦ +- Adjustments to \, ?, | and ¦ + +## v1.2.9 -v1.2.9 ------- - No longer remove Debian logo on font generation - Add Debian logo copyright and license terms to LICENSE.txt -v1.2.8 ------- +## v1.2.8 + - Resized various glyphs so that they have more consistent widths - Simplified multiple accented chars, adjusted borders -v1.2.7 ------- -Add more border drawing chars -Add hints/counterhints -Redo $ -Simplify @ -Realign vertexes on apl_topsolid -Realign vertexes on CR glyph - -v1.2.6 ------- +## v1.2.7 + +- Add more border drawing chars +- Add hints/counterhints +- Redo $ +- Simplify @ +- Realign vertexes on apl\_topsolid +- Realign vertexes on CR glyph + +## v1.2.6 + - Get the S3 URL from the README file - Added a check to make sure the zip file was uploaded and is accessible - Add a simple programn to show some "Unicode art" @@ -268,22 +277,22 @@ v1.2.6 - Added travis support - Added ⌘ and ⏎ glyphs -v1.2.5 ------- +## v1.2.5 + - Changing the Windows font viewer screencap to a more recent Windows - Attempting to fix hinting issues on C, Q and S observed on Windows - ● glyph (used by systemctl) -v1.2.4 ------- +## v1.2.4 + - Updated download link, added Windows XP screenshot, removed Windows compatibility message - Removed uniFFFF, which caused the Windows compatibility issues - Add an  at U+f8ff - Add note about anti-aliasing -v1.2.3 ------- +## v1.2.3 + - Make the T in ™ symmetrical - Make ™ skinnier - Make … more boldface-friendly @@ -291,22 +300,22 @@ v1.2.3 - Added double-line box-drawing glyphs used in Midnight Commander - Add missing line drawing chars, (┬ and ┴), solve alingment issues with others -- Added << and >> +- Added \<\< and \>\> - Added you-should-reboot glyph -v1.2.1 ------- +## v1.2.1 + - Fix self-intersect on composite Ccedilla (caused problems with ttf) -v1.2 ----- +## v1.2 + - Merge branch 'kilobyte-master' -v1.1 ----- +## v1.1 + - Adjusting a, e, p, w for smaller point sizes - Added uninstall target -v1 - Initial release --------------------- +## v1 - Initial release + - Added "zip" target to Makefile diff --git a/Dockerfile b/Dockerfile index 2a57b4f..26bbe39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ -FROM registry.fedoraproject.org/fedora-minimal:latest +FROM alpine:latest -WORKDIR /opt +RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repositories && \ + echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories +RUN apk update && apk add make fontforge py3-pillow -RUN microdnf install -y fontforge make \ No newline at end of file +WORKDIR /opt \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 1de1d8a..b8f248a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,6 @@ -Copyright (c) 2011-2021, Ricardo Banffy. +Copyright 2022 The 3270font Authors (https://github.com/rbanffy/3270font) + +Copyright (c) 2011-2022, Ricardo Banffy. Copyright (c) 1993-2011, Paul Mattes. Copyright (c) 2004-2005, Don Russell. Copyright (c) 2004, Dick Altenbern. diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index a48ab9d..b8e7ad5 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ export PRINT_HELP_PYSCRIPT help: ## Displays this message. @echo "Please use \`make ' where is one of:" - @python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST) + @python3 -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST) all: font sample ## Generates the TrueType, OpenType, Type-1, WebFont files and sample image." @@ -38,15 +38,35 @@ font: 3270_HQ.sfd fonts-3270.metainfo.xml ## Generates the font files from the S @./generate_derived.pe 2> /dev/null >&2 @cp fonts-3270.metainfo.xml ${BUILD_DIR} -sample: font ## Generate sample images +sample: font build/3270_sample.gif + +build/3270_sample.gif: @./generate_sample_image.py + +build/urxvt.png: font ifeq ($(UNAME),Linux) @urxvt -fn "xft:IBM3270:size=12" --geometry 80x25 -fg white \ -bg black -e ./test_font_rendering.sh urxvt - @terminator -e './test_font_rendering.sh terminator' +endif + +build/terminator.png: font +ifeq ($(UNAME),Linux) + @terminator -p 3270font -e './test_font_rendering.sh terminator' +endif + +build/xterm.png: font +ifeq ($(UNAME),Linux) @xterm -fa 'IBM3270' -fs 12 -geometry 80x25 -e \ './test_font_rendering.sh xterm' - @konsole -geometry 820x520 -e './test_font_rendering.sh konsole' +endif + +build/konsole.png: font +ifeq ($(UNAME),Linux) + @konsole -p font='IBM3270, 12' -e './test_font_rendering.sh konsole' +endif + +build/gnome-terminal.png: font +ifeq ($(UNAME),Linux) @gnome-terminal --profile='3270font-test' -q --geometry=80x25 \ -- sh -c './test_font_rendering.sh gnome-terminal' endif @@ -74,41 +94,54 @@ zip: font ## Creates the ZIP archive to be sent to S3 (the 'binary build') fbchecks: font ## Runs the Font Bakery set of tests required by Google Fonts @./fontbakery_checks.sh -skimpytest: font ## Runs the minimal tests and verifies the ZIP file mentioned in the README is present. +ttftest: font ## Runs the minimal tests and verifies the ZIP file mentioned in the README is present. @flake8 *.py @isort --check-only *.py @black --check -l79 *.py - @fontlint ${BUILD_DIR}/3270-Regular.otf - @fontlint ${BUILD_DIR}/3270-Regular.ttf - @fontlint ${BUILD_DIR}/3270-Regular.woff - @fontlint ${BUILD_DIR}/3270SemiCondensed-Regular.ttf - @fontlint ${BUILD_DIR}/3270Condensed-Regular.ttf +# Checks we may need to ignore +# 2 Self-intersecting glyph +# 5 Missing points at extrema +# 23 Overlapping hints in a glyph +# 34 Bad 'CFF ' table +# 98 Self-intersecting glyph (issue #2) when FontForge is able to correct this + fontlint ${BUILD_DIR}/3270-Regular.ttf + fontlint -w 2 -w 5 ${BUILD_DIR}/3270SemiCondensed-Regular.ttf + fontlint -w 2 ${BUILD_DIR}/3270Condensed-Regular.ttf + fontlint -w 2 -w 5 ${BUILD_DIR}/3270SemiCondensed-Regular.ttf + fontlint -w 2 ${BUILD_DIR}/3270Condensed-Regular.ttf + +# Verify if the README points to an existing ZIP file @wget --spider $(shell grep -Eo \ 'https://3270font.s3.amazonaws.com/3270_fonts_[^/"]+\.zip' \ README.md) -test: skimpytest ## Generates and checks font files -# These are tests that fail on Travis (because their fontlint can't ignore -# stuff). -# Yes. This is "works on my computer". - @fontlint -i 98 ${BUILD_DIR}/3270SemiCondensed-Regular.otf - @fontlint -i 98 ${BUILD_DIR}/3270SemiCondensed-Regular.ttf - @fontlint -i 98 ${BUILD_DIR}/3270SemiCondensed-Regular.woff - @fontlint -i 98 ${BUILD_DIR}/3270Condensed-Regular.otf - @fontlint -i 98 ${BUILD_DIR}/3270Condensed-Regular.ttf - @fontlint -i 98 ${BUILD_DIR}/3270Condensed-Regular.woff - -travistest: zip skimpytest ## Runs the Travis CI set of tests - -fulltest: zip test fbchecks ## Runs the full set of tests +travistest: help zip ttftest ## Runs the Travis CI set of tests + +test: zip ttftest ## Runs more extensive tests +# Checks we may need to ignore +# 2 Self-intersecting glyph +# 5 Missing points at extrema +# 23 Overlapping hints in a glyph +# 34 Bad 'CFF ' table +# 98 Self-intersecting glyph (issue #2) when FontForge is able to correct this + fontlint -w 2 -w 98 ${BUILD_DIR}/3270-Regular.otf + fontlint -w 2 -w 98 ${BUILD_DIR}/3270-Regular.woff + fontlint -w 2 -w 5 -w 98 ${BUILD_DIR}/3270SemiCondensed-Regular.otf + fontlint -w 2 -w 5 -w 98 ${BUILD_DIR}/3270SemiCondensed-Regular.woff + fontlint -w 2 -w 98 ${BUILD_DIR}/3270Condensed-Regular.otf + fontlint -w 2 -w 98 ${BUILD_DIR}/3270Condensed-Regular.woff + +fulltest: test fbchecks ## Runs the full set of tests @zip -T ${BUILD_DIR}/3270_fonts_*.zip -upload: zip sample ## Uploads the generated .zip and sample files to S3 +upload: zip build/3270_sample.gif build/urxvt.png build/terminator.png build/xterm.png build/konsole.png build/gnome-terminal.png ## Uploads the generated .zip and sample files to S3 @aws s3 cp ${BUILD_DIR}/3270_fonts_$(shell \ git rev-parse --short HEAD).zip \ s3://3270font/ \ --acl public-read \ --storage-class REDUCED_REDUNDANCY + @aws s3 cp ${BUILD_DIR}/3270_sample.gif s3://3270font/ --acl public-read \ + --storage-class REDUCED_REDUNDANCY ifeq ($(UNAME),Linux) @aws s3 cp ${BUILD_DIR}/gnome-terminal.png s3://3270font/ --acl public-read \ --storage-class REDUCED_REDUNDANCY @@ -121,15 +154,14 @@ ifeq ($(UNAME),Linux) @aws s3 cp ${BUILD_DIR}/urxvt.png s3://3270font/ --acl public-read \ --storage-class REDUCED_REDUNDANCY endif - @aws s3 cp ${BUILD_DIR}/3270_sample.png s3://3270font/ --acl public-read \ - --storage-class REDUCED_REDUNDANCY @./clean_camo_cache.sh clean: ## Deletes all automatically generated files - @$(RM) -rf ${BUILD_DIR} - @$(RM) -rf gfonts_files/3270/*.ttf - @$(RM) -rf gfonts_files/3270condensed/*.ttf - @$(RM) -rf gfonts_files/3270semicondensed/*.ttf + @$(RM) -rfv ${BUILD_DIR} + @$(RM) -rfv gfonts_files/3270/*.ttf gfonts_files/3270/*.html \ + gfonts_files/3270/*.txt + @$(RM) -rfv gfonts_files/3270condensed/* + @$(RM) -rfv gfonts_files/3270semicondensed/* cask: zip ## Generate the font cask file (requires Homebrew) ifeq ($(UNAME),Darwin) @@ -140,4 +172,4 @@ image: ## Builds the container image docker build -t 3270font:latest . generate: ## Generates the fonts using the container image - docker run --rm -v ${PWD}:/opt 3270font:latest make font + docker run --rm -v ${PWD}:/opt:Z 3270font:latest make font diff --git a/README.md b/README.md index a910dc7..f9ab313 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ![Screenshot]( https://raw.githubusercontent.com/wiki/rbanffy/3270font/emacs.png) -![Sample](https://3270font.s3.amazonaws.com/3270_sample.png) +![Sample](https://3270font.s3.amazonaws.com/3270_sample.gif) A little bit of history ----------------------- @@ -39,8 +39,8 @@ On FreeBSD the font can be installed with `pkg install 3270font`. For those who don't have the luxury of a proper system-managed package, Adobe Type 1, TTF, OTF and WOFF versions are available for download on -https://3270font.s3.amazonaws.com/3270_fonts_3b8f2fb.zip (although this -URL may not always reflect the latest version). +https://3270font.s3.amazonaws.com/3270_fonts_49eab4b.zip (although this +URL may not always reflect the latest build or release). ![ASCII is so 60's]( https://raw.githubusercontent.com/wiki/rbanffy/3270font/cyrillic.png) @@ -103,6 +103,15 @@ a container runtime, Docker, Podman, and etc, and use these make targets: - ```make generate``` - uses the local container image to run ```make font``` +Build Requirements +------------------ + +On Debian derived distros, you'll need Fontforge and python3-dev. On Red +Hat ans similar distros, you'll need Fontforge and python3-devel. Since +some packages will need to be compiled, you'll need a build system (GNU +Make, a C compiler, etc). + + Screenshots ----------- diff --git a/clean_camo_cache.sh b/clean_camo_cache.sh index 011e82d..a9d3dd8 100755 --- a/clean_camo_cache.sh +++ b/clean_camo_cache.sh @@ -7,7 +7,7 @@ curl -s https://github.com/rbanffy/3270font/blob/\ "$(git rev-parse --abbrev-ref HEAD)"\ /README.md \ | grep -F 'camo.githubusercontent.com/' \ - | sed 's/\(^

.*href="\)//' \ + | sed 's/\(.*href="\)//' \ | sed 's/\(">.*\)//' \ | while read -r i do diff --git a/generate_derived.pe b/generate_derived.pe index 08d7683..1076bcb 100755 --- a/generate_derived.pe +++ b/generate_derived.pe @@ -1,43 +1,69 @@ #!/usr/bin/env fontforge +build = "build/" +type_sample = "Aa0123 🮘🮘 🮙🮙 🮕🮕 🮖🮖 ◢◤◢◤┌─┬┐╔═╦╗" + Open("3270_HQ.sfd") # Force fixed width SelectAll() SetWidth(1080) + # Remove IP encumbered characters Select("uniE0FF") SelectMore("uniF0FF") DetachAndRemoveGlyphs() + # Generate unencumbered version for distribution -Save("build/3270_HQ.sfd") +Save(build + "3270_HQ_unencumbered.sfd") + # Remove UC 13 running man and pointing finger building helpers that are too wide Select("full_running_man") SelectMore("full_pointing_finger") DetachAndRemoveGlyphs() Reencode("compacted") -Generate("build/3270-Regular.otf") -Generate("build/3270-Regular.ttf") -Generate("build/3270-Regular.pfm") -Generate("build/3270-Regular.woff") -Generate("build/3270-Regular.svg") + +# From https://fontforge.org/docs/scripting/scripting-alpha.html#Generate +# fmflags&2 => generate a pfm file +# fmflags&0x80 => generate tables so the font will work on both Apple and MS platforms. +# fmflags&0x100 => generate a glyph map file (GID=>glyph name, unicode map). The map file will have extension “.g2n”. +# fmflags&0x200000 => round postscript coordinates + +otf_flags = 0x80 | 0x100 | 0x200000 +pfm_flags = 0x2 + +Generate(build + "3270-Regular.otf", "", otf_flags) +Generate(build + "3270-Regular.ttf") +Generate(build + "3270-Regular.pfm", "", pfm_flags) +Generate(build + "3270-Regular.woff") +Generate(build + "3270-Regular.svg") +# Make an image with the TTF version +FontImage(build + "3270-Regular.png", [20, type_sample]) SelectAll() -SetWidth(984) +Scale(90, 100) # Scales the glyphs to 90% of 1080 = 972 +SetWidth(972) +RoundToInt() +AddExtrema() SetFontNames("3270SemiCondensed", "IBM 3270 Semi-Condensed", "IBM 3270 Semi-Condensed") -Generate("build/3270SemiCondensed-Regular.otf", "", 0x200180) -Generate("build/3270SemiCondensed-Regular.ttf") -Generate("build/3270SemiCondensed-Regular.pfm") -Generate("build/3270SemiCondensed-Regular.woff") -Generate("build/3270SemiCondensed-Regular.svg") -Save("build/3270_HQ_SemiCondensed.sfd") +Generate(build + "3270SemiCondensed-Regular.otf", "", otf_flags) +Generate(build + "3270SemiCondensed-Regular.ttf") +Generate(build + "3270SemiCondensed-Regular.pfm", "", pfm_flags) +Generate(build + "3270SemiCondensed-Regular.woff") +Generate(build + "3270SemiCondensed-Regular.svg") +Save(build + "3270_HQ_SemiCondensed.sfd") +FontImage(build + "3270-SemiCondensed.png", [20, type_sample]) SelectAll() -SetWidth(976) +Scale(90, 100) # 90% of 972 = 874 +SetWidth(874) +RoundToInt() +AddExtrema(1) # Force extrema to be added even if close to other points SetFontNames("3270Condensed", "IBM 3270 Condensed", "IBM 3270 Condensed") SetMacStyle("Condensed") -Generate("build/3270Condensed-Regular.otf", "", 0x200180) -Generate("build/3270Condensed-Regular.ttf") -Generate("build/3270Condensed-Regular.pfm") -Generate("build/3270Condensed-Regular.woff") -Generate("build/3270Condensed-Regular.svg") -Save("build/3270_HQ_Condensed.sfd") +Generate(build + "3270Condensed-Regular.otf", "", otf_flags) +Generate(build + "3270Condensed-Regular.ttf") +Generate(build + "3270Condensed-Regular.pfm", "", pfm_flags) +Generate(build + "3270Condensed-Regular.woff") +Generate(build + "3270Condensed-Regular.svg") +Save(build + "3270_HQ_Condensed.sfd") +FontImage(build + "3270-Condensed.png", [20, type_sample]) diff --git a/generate_sample_image.py b/generate_sample_image.py index 7a4d027..42e0961 100755 --- a/generate_sample_image.py +++ b/generate_sample_image.py @@ -3,7 +3,7 @@ Generate a sample rendering of the base font. """ -from PIL import Image, ImageColor, ImageDraw, ImageFilter, ImageFont +from PIL import Image, ImageColor, ImageDraw, ImageFont SAMPLE_TEXT = ( "ABCDEFHIJKLMNOP1234567890abcdefghijklmnop\"'$#!@{}[]()<>çéáÁÑÃÏ¡²³¤€¼½¾¥×" @@ -13,21 +13,25 @@ LINE_COLOR = ImageColor.getrgb("#88f") TEXT_COLOR = ImageColor.getrgb("black") -FONT_FILE = "./build/3270-Regular.ttf" +FONT_FILES = ( + "./build/3270-Regular.ttf", + "./build/3270-Regular.otf", + "./build/3270-Regular.woff", +) -def draw_sample(): +def draw_sample(font_file): HEIGHT = 500 WIDTH = 800 background = Image.new("RGBA", (WIDTH, HEIGHT), ImageColor.getrgb("white")) foreground = Image.new("RGBA", (WIDTH, HEIGHT), (255, 255, 255, 0)) draw_b = ImageDraw.Draw(background) draw_f = ImageDraw.Draw(foreground) - label_font = ImageFont.truetype(FONT_FILE, size=15) + label_font = ImageFont.truetype(font_file, size=15) y = 0 for size in range(15, 55, 5): - sample_font = ImageFont.truetype(FONT_FILE, size=size) + sample_font = ImageFont.truetype(font_file, size=size) offset = size * 0.7 y += offset # Draw the background reference lines. Upper for the alpha ascender @@ -41,11 +45,12 @@ def draw_sample(): # Draw the text itself draw_f.text((20, y), SAMPLE_TEXT, TEXT_COLOR, font=sample_font) + draw_f.text((20, 480), font_file, TEXT_COLOR, font=label_font) return Image.alpha_composite(background, foreground) -def draw_readability_test(blur_radius): - sample_font = ImageFont.truetype(FONT_FILE, size=30) +def draw_readability_test(font_file, factor): + sample_font = ImageFont.truetype(font_file, size=30) img = Image.new("RGB", (800, 35), ImageColor.getrgb("white")) draw = ImageDraw.Draw(img) @@ -55,13 +60,25 @@ def draw_readability_test(blur_radius): TEXT_COLOR, font=sample_font, ) - img = img.filter(ImageFilter.GaussianBlur(blur_radius)) + img = img.resize((800 // factor, 35 // factor)) + img = img.resize((800, 35), Image.NEAREST) + return img if __name__ == "__main__": - sample = draw_sample() - for radius in range(6): - rt = draw_readability_test(radius) - sample.paste(rt, (0, 250 + 35 * radius)) - sample.save("build/3270_sample.png") + samples = [] + for font in FONT_FILES: + sample = draw_sample(font) + for factor in range(1, 6): + rt = draw_readability_test(font, factor) + sample.paste(rt, (0, 250 + 35 * factor)) + samples.append(sample) + sample.save( + "build/3270_sample.gif", + format="GIF", + append_images=samples, + save_all=True, + duration=500, + loop=0, + ) diff --git a/grid.octant.txt b/grid.octant.txt new file mode 100644 index 0000000..ca89a4d --- /dev/null +++ b/grid.octant.txt @@ -0,0 +1,12 @@ +# ./generate_grid.py 0 -400 -400 1600 0 1080 540 400 +Grid +0 -600 m 0 0 1800 l 1024 Named: "Origin X" +-200 -400 m 0 1280 -400 l 1024 Named: "Origin Y" +-200 0 m 0 1280 0 l 1024 Named: "0" +-200 400 m 0 1280 400 l 1024 Named: "400" +-200 800 m 0 1280 800 l 1024 Named: "800" +-200 1200 m 0 1280 1200 l 1024 Named: "1200" +-200 1600 m 0 1280 1600 l 1024 Named: "1600" +540 -600 m 0 540 1800 l 1024 Named: "540" +1080 -600 m 0 1080 1800 l 1024 Named: "1080" +EndSplineSet diff --git a/requirements.txt b/requirements.txt index 9e60baa..9d107da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,10 @@ -git+https://github.com/googlefonts/fontbakery -git+https://github.com/googlefonts/gftools +awscli black +compreffor flake8 +fontbakery +fontpens +gftools ipdb isort -pillow==7.0.0 #Remove when googlefonts/gftools merges #249 +pip-chill diff --git a/social_preview.xcf b/social_preview.xcf new file mode 100644 index 0000000..a74d731 Binary files /dev/null and b/social_preview.xcf differ diff --git a/test_font_rendering.py b/test_font_rendering.py index fe87822..46c95b9 100755 --- a/test_font_rendering.py +++ b/test_font_rendering.py @@ -13,11 +13,14 @@ misc_glyphs = "Misc glyphs: ™●⌘⏎⬇⬆✔✼✎✘‘’◢◣◤◥▮◆▒░▓ ▏▎▍▌▋▊▉█" -composed_glyphs = "Composed glyphs: ÀÉI͂o̓N̈́AͅB̊͆Ȍ͇U͈D̈ẢB̊A̋ĎA̍J̎Ȁ\n" +composed_glyphs = ( + "Composed glyphs: ÀÉI͂o̓N̈́AͅB̊͆Ȍ͇U͈D̈ẢB̊A̋ĎA̍J̎Ȁ" + "1⃜2⃜3⃜4⃜5⃜6⃜7⃜8⃜9⃜0⃜\n" +) apl_set = ( "The APL set: ⌶⌷⌸⌹⌺⌻⌼⌽⌾⌿⍀⍁⍂⍃⍄⍅⍆⍇⍈⍉⍊⍋⍌⍍⍎⍏⍐⍑⍒⍓⍔⍕⍖⍗⍘⍙⍚⍛⍜⍝⍞⍟⍠⍡⍢⍣⍤⍥⍦⍧⍨⍩⍪⍫⍬⍭⍮⍯⍰⍱" - "⍲⍳⍴⍵⍶⍷⍸⍹⍺⊂⊃⊆⊇⊏⊐⊑⊒⊔⊓⊕⊖⊗⊘⊙⌾⊝⋆⌈⌉⌊⌋⁼⇐⇒⊸⟜⟨⟩⋄∧∨⊢⊣⊤⊥≢⚇⎉⎊◴◵◶◷⥊⥋∾‿↩↪≍𝕩𝕨𝕤𝕣𝕘𝕗𝕏𝕎𝕊𝔾𝔽\n" + "⍲⍳⍴⍵⍶⍷⍸⍹⍺⊂⊃⊆⊇⊏⊐⊑⊒⊔⊓⊕⊖⊗⊘⊙⌾⊝⋆⌈⌉⌊⌋⁼⇐⇒⊸⟜⟨⟩⋄∧∨⊢⊣⊤⊥≢⚇⎉⎊◴◵◶◷⥊⥋∾‿↩↪≍𝕩𝕨𝕤𝕣𝕘𝕗𝕏𝕎𝕊𝔾𝔽" ) confusables = ( @@ -41,7 +44,8 @@ if __name__ == "__main__": print("ASCII:", printable) print(boxes) - print(misc_glyphs, composed_glyphs) + print(misc_glyphs) + print(composed_glyphs) print(apl_set) print(confusables) print(ladder)