From 72ba85b54033fcc29f98bf8e88480ea367873a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=9D?= Date: Fri, 14 May 2021 21:47:16 +0800 Subject: [PATCH 1/9] fix: use svg2ttf-new@5.3.0-beta.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 13f5ce8..a0b9f60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "font-carrier", - "version": "0.3.1", + "version": "0.4.0-beta.2", "description": "字体搬运工，中文字体解决方案，iconfont", "main": "./lib/index.js", "scripts": { @@ -15,7 +15,7 @@ "lodash": "^4.17.21", "multiline": "^2.0.0", "opentype.js": "^1.1.0", - "svg2ttf": "^5.2.0", + "svg2ttf-new": "^5.3.0-beta.1", "svg_pathify": "^0.0.8", "svgpath": "^2.3.1", "ttf2eot": "^2.0.0", From 1676c3f2d12b58df67a862293ded3c8f38c7c739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=9D?= Date: Thu, 20 May 2021 16:20:18 +0800 Subject: [PATCH 2/9] feat: update svg2ttf to 5.3.0-beta.2 --- lib/helper/engine.js | 2 +- package.json | 4 ++-- test/font-out/arrow-up.ttf | Bin 1644 -> 1600 bytes test/font-out/font1.ttf | Bin 2444 -> 2424 bytes test/font-out/font2.eot | Bin 6276 -> 6256 bytes test/font-out/font2.ttf | Bin 6108 -> 6088 bytes test/font-out/font2.woff | Bin 4232 -> 4228 bytes test/font-out/font2.woff2 | Bin 3652 -> 3680 bytes test/font-out/font3.eot | Bin 13592 -> 13572 bytes test/font-out/font3.ttf | Bin 13408 -> 13388 bytes test/font-out/font3.woff | Bin 8384 -> 8380 bytes test/font-out/font3.woff2 | Bin 7632 -> 7664 bytes 12 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/helper/engine.js b/lib/helper/engine.js index 5eb5bc3..6583da5 100644 --- a/lib/helper/engine.js +++ b/lib/helper/engine.js @@ -6,7 +6,7 @@ var opentype = require('opentype.js') var DOMParser = require('xmldom').DOMParser -var svg2ttf = require('svg2ttf') +var svg2ttf = require('svg2ttf-new') var ttf2svg = require('ttf2svg') var ttf2eot = require('ttf2eot') var ttf2woff = require('ttf2woff') diff --git a/package.json b/package.json index a0b9f60..fdfe4d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "font-carrier", - "version": "0.4.0-beta.2", + "version": "0.4.0-beta.3", "description": "字体搬运工，中文字体解决方案，iconfont", "main": "./lib/index.js", "scripts": { @@ -15,7 +15,7 @@ "lodash": "^4.17.21", "multiline": "^2.0.0", "opentype.js": "^1.1.0", - "svg2ttf-new": "^5.3.0-beta.1", + "svg2ttf-new": "^5.3.0-beta.2", "svg_pathify": "^0.0.8", "svgpath": "^2.3.1", "ttf2eot": "^2.0.0", diff --git a/test/font-out/arrow-up.ttf b/test/font-out/arrow-up.ttf index 6f62d26fa251672782037a69b8ceaeb1b1c416c2..9a4dba3e93d50293830ef0435192d41d61ea66ce 100644 GIT binary patch delta 457 zcmYL@y-Nc@5XIl#?p(xI8W2A)h=o{)e}DuLL5_SF!Q?I&LIg=-rGKn#`k-DH8wXx0{8}9M$RfbtQ%1p8KOFpw{q$IJ9$a| zGoURy_HMCsz-WyTtlv(?zdWhXX79o;Op+*CPfh#(?NkJKjcPA6SEXQ-8p1Nd8iKb_ zyZ&H@Ea?7#oKA(GQGW=~`(|Z{#~G7XJXZCpLAS|E$6eyC@gSg>lRBta5DzQXVPZ_N zLHd+pAI34S*hD|l;9#PQwgymE%!rR%UL!+84^EZA$v9Umh#QJ^4B%0*L3&HE4+*pt dn;2zF+etg0vGYawAPTaoM`S^NWsr-;#2<#)O2hyF delta 560 zcmZ9IJuCxZ9LAsb-fQVyQ4wV*IT1pti4b%!)MgeDgG4U<(xmNOv=x;gB#1C*&L|Np ziGldoNLNb-g9ySPmJSv(|7+fo_+Q@le$Vs#-;cbv?y`HYWAMJX39wxNQ{j|ue)L=% zlP=RRwXJK5<6c!cugTvU(v4!2ohGB7es2KWq3&Xm4rvO4tAl2+1MT2DoveXb+Q zOMqmWMkc$k#$;*@6|Vb(g@>z~*@n?CsAN$+-Mr`j{@*JymiI~5Lb6>dMngiIrLjwy zqV@Afw#Az58&LAS!Vk#w0ggsbqm|=9dFf@N(>mpWRj*iVH`c;i*~s3i2JM15`CWo# z;(%ZWR167rk{=SRz>jgkDw>c12a{cNP9HV}Gk9=j^C|@r>QNK{r=TQQCVmy{psRff zcEZD)f)z|LuV5A3EU9Rs5@919Gt$|LQ56%>crK~WS7jn>-O1B_1=_zafiMiD5v$Bu Z{B~FajyG5J(G_b17@;%oNSJ~?l#Rf z48OxNXe@Alb(8vDLQh zS_|R<;&&8aQ~k4mkGel=@S=^aQ|_=0vdi|s!Vp_hKEn2+4`XZ#A(Wv*7$)s;vGLK delta 449 zcmXxdze@sP7zgn0dv~6vM`oHLlyF)GVPZus;SvS*3tYmbAuc^rD3!~_2&AFSK)E64 zuZU_e3TkUM(QDu=cfA*i7ze0$;H{XE~7_j$fNb#G&6A`h@SfOKYCFQ1+~EK~nO zb+fru&3zoregoniAbjQxJsW&?Ei_kG0u3dv0`e8*2j$XErRVZu32@9eTjPU!a_eoq zH_?GA(OBU5x?TOhEs5Q;*x3_Xlf1p~A%HLsXG| z=%)uSV1E|VZBUWmmMKqiI}t^STZI?95Wyq|?U}(L zYTbsxja&X8z=cO{k@7aTMDB3g;Ab{&8E!Vf?L?YIxmAp?eW#|)nTB35vf4&f%aw|i hSVlL^f??82Aycx>?M0gt8Z;}U#JN(+s}*-F{sL&fN^SrE diff --git a/test/font-out/font2.eot b/test/font-out/font2.eot index c371b3b4bbf2eb73b4f26d95d04aae6889bac719..93a8196ec5d336db01c6cff9a5444f14564fa6a0 100644 GIT binary patch delta 409 zcmXxfze_?<6bJC{eZPA8A{AfvYG_f$qX@*7T;fq<&=3xdm0-}Op@U0QP!xg0<3?+L zKtC4o4`>jIqQ$|bA&d4Pnri48r!(C1;e6p-&cWUAx2S3XRckM6^xMzS?t(2>^-iYM`!j>B>m+Jb3#(HG_3yy() zJwH6{{C9c9I_$W)r(K$E6dXxp-~nuW!WxdbqfGktq@JAOvSd%|+!OND&NN&0`QWZl zD_DPxdTj`@h5?L`bv5_MhH{o{!oeKbQu9S}7&BNRJBXtO9n1)+AF?LX?HbVXU$w*@4H(GR=j|^KE&@DLcWWO EUs(M@!~g&Q delta 432 zcmXxdKS%;m90&04d){5wUHAv}lse(GKN1#c6hUYO4J|_85HywLi4A344*eM_vLy(* zE^uxxaIig^T7rg%7MCLT7Pp3;^m@a4AHHAS@AsXoro?I(XxieG5I1ufd+waBzS+-u zpysPD1ELOi_DW{H5czT++CSOwrCd^hz%@Y6w#&Pfk6vj82!jA*EK!k3#VHy|Q1YSIK zyvYg*H{N;SVnvHvU~Y4Z(1^$_!AttM6)ceiw~8Thq8P@!W#%hp!C2cjish}!=z89= aHcX2(PDp~qk4wMRz) diff --git a/test/font-out/font2.ttf b/test/font-out/font2.ttf index 2c4dc5364ecdf84d245de7e83090f82a07766fee..e7c81c74929604a9d4b4a718688facda9e014500 100644 GIT binary patch delta 422 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 literal 3652 zcmV-K4!iMpPew8T0RR9101iX|3jhEB02kZ<01fs40RR9100000000000000000000 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 MPR1`M>zcd<08kY{NB{r; delta 391 zcmZq4nvumSVamXeFp<@qr8GhJ)LOSZmdU@$J3T)=1`b4xd&G@jq)D+4$43kD##v;S!`jGnxQ@iJrL<_S!n_3CAT zf{Y*uAj!iZ3uQAgurp{v*~~z311OsX$hLv9SsAz)JfLhgpm;Ep&BdV25D#T@GYB(u zF)%YQvTy=zuws}CWiv8JFkA<*>wywX415glp%TnMiN8=b3xfosD3s00AjYT*WwQar zouOjd3HFf`W5VYGO%hib7JQLRx-aiEeUYQBh`U5m3f0D#}aO$IHdd p-!CL6HN7+^adNd$J}Vc40)xWjmqz+fmaVbmWCP=ulf_Nm0s#I(M~DCb diff --git a/test/font-out/font3.ttf b/test/font-out/font3.ttf index 1676b9d5571c9008da0e61eab25457c9b46b976a..59a277b56533fe70b615b99b55041873a0f25ac7 100644 GIT binary patch delta 330 zcmaEmaVBGeGUMfmD!R<`9&DNz;v*5rBj&`wV6caQfoX9;esRgBC0k!JFc>FH++iS7 zbNG{CJipCX25#mT3_x(_^toCXJ(-2^GUJiWHyA(b)r$iK89@?2l7~SY%4T9C$1okrW@M0H zI0|A10410h_!#a&C76K{uc2%f1_?%HD4Uf*j8PiOW&?^FLfKplVT_(oHaCMBHq)$ delta 353 zcmX?;@gQS@GGoC+6mYV6P=bkpkKsL3f*C0B7s_T~kYE&rvRN6#7 za4t$sEJ;mKNUBsw%g-y(O-?K-%1kW+%1qv9*vQJopunIo+0aNI!rB~f#Kbr`-uNv5 DF*G}F diff --git a/test/font-out/font3.woff b/test/font-out/font3.woff index c35cbb96dc6330e17c620c22fda21f41a791e829..791692da61658aafacd8a6a41e80579884cf7b9e 100644 GIT binary patch delta 620 zcmX@$xW`eX+~3WOfsp|S6!tK1gJ=_40$PvxHx{i4_Gvu@ykRJP<1|YB6!- zCFZ6A#ZE9VFs3swFf9(`5pycYFD?N}8vxaG0`cojOD3~17W4KS)G%`yH$7n}SjFYI zxs7qMjP|U<^LZZs%-v^HV7#B9%ixY>?K&~X|MO4%X}ZaG;%PzxQzsKc+eBWFjguYZ z+UqBt&SEkYY5V^%Y}L|kv8aW!9Ts+r9Y4K@dwQswR+yv93Ts*8IEi!>Vb<@p?RvjW zYJ0x1{u25t8@!=O_}Pc2*6QkYdlGPZqeO0tINPoVd{bw6KILIM>$Ezu-0E#yxL?@65A$z5-xqRG zhsWin-rLu0JWGCM%dS-yU2FSrWr3p1JLOt?5pU6ROIN>LdF^!8#ut+LyB{){YIyK0 zlsqmVk$CupqD#F)c*E&Ak7gLIe~@tC;*xyBYnJa9^vdlznk< z%0)FkJ9@dVmR`g6NVI)<--c(JT3cqB-?-v$sNeo-+OgJ_e4i6Zul1rtMz>kWWhGnsb2eHj_4i3|*K4nV#% z5Ua3zGjn9*mQ(=6VxVFnK1K`-Ir+&TbwF_j9S{zEmhdY#v7!JdwgkwR2VwMxY$iR;B#K4F&ndB|vEtpqfq~e!XeQWH!cPUSY|7jIEN6MGQHaocA`j zF;13IkG3-1_VJHdyyT9V@eHmK@7~nk>RIsLKeg^)4*QcL1A|5v#@tQ3>XTjM+UqBs z&N}2E()PbX`|2fE@9x=$)^IJA(D#1ncTs6k!qL{)DH7^&9i2XI2g6@je^LBpa`&s~ zFP7GSYQX{rWsGW`+h12?ENIP-@R(=4k28A5g6RcZ=@kZZmc<#)QM8vlx2Pfgu;nZL zw$BwuW$iUk>7lIpi!nz#JstM6^hmbZWOSxw=qR0-X} z!5p|%yS*ryE$DA~|F+GuuFd-pvO`F>Z_+;buB}|tFJ1i>^SX3z%(tGr-4DB7b44+8 z3Gtbn*Zf=0S!QF~!m(oN1EXab+{dP_%uMuoZE)-9%_aBU`JH)Y7$0V}`MLqEXZ>rncAtHtu+HM1?V)MWS5{=*ORg6`+PAvm{gbds(!Wv~OJ$;i3Rm8q taXd8ppG@kk@+tYo-E;pjWGyers+f~|){^Ovf(T21n$+TBv6CGXY5)S>_6z_3 diff --git a/test/font-out/font3.woff2 b/test/font-out/font3.woff2 index 714033cdb6adaf81d5e01dd672c368f6c72c166d..011d179e7a25170570ff3d29eec2681c3d63b936 100644 GIT binary patch literal 7664 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 From b7be33599493d72769358545a509a970f2a98936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=9D?= Date: Thu, 20 May 2021 16:31:57 +0800 Subject: [PATCH 3/9] test: update ttx file --- test/font-out/font1.ttx | 21 +++++++++------------ test/font-out/font2.ttx | 21 +++++++++------------ test/font-out/font3.ttx | 16 ++++++---------- 3 files changed, 24 insertions(+), 34 deletions(-) diff --git a/test/font-out/font1.ttx b/test/font-out/font1.ttx index 3c1c8bf..8d17ed0 100644 --- a/test/font-out/font1.ttx +++ b/test/font-out/font1.ttx @@ -15,12 +15,12 @@ - + - - + + @@ -113,7 +113,7 @@ - + @@ -387,8 +387,9 @@ - - + + + @@ -444,9 +445,7 @@ - - Created by font-carrier - + Created by font-carrier iconfont @@ -473,9 +472,7 @@ http://fontello.com - - Created by font-carrier - + Created by font-carrier iconfont diff --git a/test/font-out/font2.ttx b/test/font-out/font2.ttx index 60692bc..8a2556d 100644 --- a/test/font-out/font2.ttx +++ b/test/font-out/font2.ttx @@ -27,12 +27,12 @@ - + - - + + @@ -125,7 +125,7 @@ - + @@ -1727,8 +1727,9 @@ - - + + + @@ -1840,9 +1841,7 @@ - - Created by font-carrier - + Created by font-carrier iconfont @@ -1869,9 +1868,7 @@ http://fontello.com - - Created by font-carrier - + Created by font-carrier iconfont diff --git a/test/font-out/font3.ttx b/test/font-out/font3.ttx index 3a80184..708ec1d 100644 --- a/test/font-out/font3.ttx +++ b/test/font-out/font3.ttx @@ -30,12 +30,12 @@ - + - - + + @@ -128,7 +128,7 @@ - + @@ -4937,9 +4937,7 @@ - - Created by font-carrier - + Created by font-carrier FZZJ-LJDFONT @@ -4966,9 +4964,7 @@ http://fontello.com - - Created by font-carrier - + Created by font-carrier FZZJ-LJDFONT From b1e4a416b2463cc3d3c68ebbd2199f00b1041327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=9D?= Date: Wed, 26 May 2021 17:46:25 +0800 Subject: [PATCH 4/9] feat: update svg2ttf to 5.3.0-beta.3 --- package.json | 4 ++-- test/font-out/arrow-up.ttf | Bin 1600 -> 1652 bytes test/font-out/arrow-up.ttx | 24 +++++++++++++++--------- test/font-out/font1.ttf | Bin 2424 -> 2456 bytes test/font-out/font1.ttx | 23 +++++++++++++++++------ test/font-out/font2.eot | Bin 6256 -> 6288 bytes test/font-out/font2.ttf | Bin 6088 -> 6120 bytes test/font-out/font2.ttx | 23 +++++++++++++++++------ test/font-out/font2.woff | Bin 4228 -> 4240 bytes test/font-out/font2.woff2 | Bin 3680 -> 3700 bytes test/font-out/font3.eot | Bin 13572 -> 13604 bytes test/font-out/font3.ttf | Bin 13388 -> 13420 bytes test/font-out/font3.ttx | 23 +++++++++++++++++------ test/font-out/font3.woff | Bin 8380 -> 8392 bytes test/font-out/font3.woff2 | Bin 7664 -> 7632 bytes 15 files changed, 68 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index fdfe4d0..58171fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "font-carrier", - "version": "0.4.0-beta.3", + "version": "0.4.0-beta.4", "description": "字体搬运工，中文字体解决方案，iconfont", "main": "./lib/index.js", "scripts": { @@ -15,7 +15,7 @@ "lodash": "^4.17.21", "multiline": "^2.0.0", "opentype.js": "^1.1.0", - "svg2ttf-new": "^5.3.0-beta.2", + "svg2ttf-new": "^5.3.0-beta.3", "svg_pathify": "^0.0.8", "svgpath": "^2.3.1", "ttf2eot": "^2.0.0", diff --git a/test/font-out/arrow-up.ttf b/test/font-out/arrow-up.ttf index 9a4dba3e93d50293830ef0435192d41d61ea66ce..7c5bee45e4f23372f5b77f09698e77e5fcf7fb5e 100644 GIT binary patch delta 532 zcmZ9J%S!@L6vn?ZGfp~VB?Q{S!iYksAbRXt^;1?w24j204+HmzL3$`x8d zyI71Tiy33RU8YUvPFWe#5c=2BFkvBwL@O82nc+;i-aY($tUng8G*kad$bW?0bH_+#eml1H70@y`Q%j^^!L zYUfs6a$f^{i=Mkx+}qN?cybznqQ*?1zTxH<6$ D7}iDl diff --git a/test/font-out/arrow-up.ttx b/test/font-out/arrow-up.ttx index 429c619..b2c56d4 100644 --- a/test/font-out/arrow-up.ttx +++ b/test/font-out/arrow-up.ttx @@ -11,16 +11,16 @@ - + - - + + - + @@ -52,7 +52,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -109,10 +109,17 @@ - + + + + + + + + @@ -149,11 +156,10 @@ - + - diff --git a/test/font-out/font1.ttf b/test/font-out/font1.ttf index a671c6f33a58f09d700056b6429e53adbdaba5d7..af3cf2aef70ecaadce20125ea92af5eb1af1506e 100644 GIT binary patch delta 453 zcmXxdze@sP7zgn0dq4EN>xU$UP|AtaVqsuYxI}|ggAL&n#HD8jp4xRown#%mQK8(@ zpV5z{XlV#?52>LkiiR3oj5d3cx9R;n-|zGA{*0Uj8qwru`W|4%0P;D@s9v78mjOYc z>~6DED}<73F+hB#tWz|Nd_-%bxf+}A&_SqF$r-{C`=W&w%|n*4TV+Ai={Q8QUN$VV zp%gX1L%ncNt?W31w>L|GZ>4!XGahligX_boE;NbOftSZt`~P(%cF1J+lw}9{9o+-H z-qjoXkm_NISU+Y^5at%(#RRuV`4qQAp5>OIA;s;XJk6~ljtsYk0QMk)Nj~~x4kz3U zemwlyqC&tBo_HZr@y;!gyWBEHnau5hpN(;=$g()MhDo-s>iU9h8jhLQH)?vJQg)_u chHY<|HZ|^rcUxAWLwBP}f-9rEx(VOnFQ(^CLI3~& delta 446 zcmbOs{6lDhqVY5L!wd|JJq!#CVad6P1)DZp^#=0)0P%tJoXRu_;}~TI2Ieyi3``#~ zQWH~Te?Ksp7^3X>1gJqGCqFrnsf+OqP{AG`pD#DDqJUA9p&qDN0?1d$OUz9biE9;R zU|<8vGZh!)7nktv-s#1_z-cgXhk=afr)ARd{5D@1xLJV885r)IK9>)pC$lhiGBQr? zV+`B;f$=#@y*N;U5hMvDIT*yDY$gVF26-r(87Qs>WwQX;dQdhi12=;il+6YdcZ9OJ z7_=EYp=@pjVTKY0W(GzUPM{5X4DC=hBZC0LRuH=$D8anR3}v$b*^i-Y zRt7PK&rmiSg8(BZl+DEu#wZD8b2F$h<~tXqCYGe8C?r)Xq~+(8=q4u?6=kLtWhUq6 gf%rkG>7_Y|aBk-0+w75(tvK{1=W#ro9LVVo0Gu#ZtpET3 diff --git a/test/font-out/font1.ttx b/test/font-out/font1.ttx index 8d17ed0..63d3168 100644 --- a/test/font-out/font1.ttx +++ b/test/font-out/font1.ttx @@ -15,12 +15,12 @@ - + - - + + @@ -74,7 +74,7 @@ - + @@ -117,6 +117,13 @@ + + + + + + + @@ -445,7 +452,9 @@ - Created by font-carrier + + Created by font-carrier + iconfont @@ -472,7 +481,9 @@ http://fontello.com - Created by font-carrier + + Created by font-carrier + iconfont diff --git a/test/font-out/font2.eot b/test/font-out/font2.eot index 93a8196ec5d336db01c6cff9a5444f14564fa6a0..fb7a2381ce68c6f7f5d78454fe84cbc38d1744c9 100644 GIT binary patch delta 450 zcmXxdPfG$p7zXfX)*Z9mNV8a_GB&~xOj3%9kP14~t((`{{F8yEZ62~iVbDP^Q1%Oy zUW*QWfb0<2sY68`u}ZQkUXKrj1cPS zbZi08ZeJIK8~c%qMWhoGSm5Fo&;>WQiRBaABJ(sig^VD#ndK|o61-UBmeG#`m_WpC z_QyOWArpPa-~e;;$|NZf`EHxQ&ZA|-_LsOXT*Dbmj@B24soLsLvG9a=AiGJ4(|R~5s^ hYDQMo^W8bAZEWY1|1oPVOH0FD`>@NDLZ+isZ(Y z{(+{JwrYrMu4oCOCMzf2ejbKKydElukHf4JcA;AJ6yo=l`!Mv3(|+M=aje z?r0xqHqYPLrMu##h_zz|JG{acbRZyXrF=|SB2Nm-P!JQgQNAGTKp4xy3VN^&E11+t z|Cq+1FoO%XEmx?ppc_x3uu}0MERh?+GWwV-Y=esp2|EyHVPOTMtm;tJc|+$VJ*lph v)l?y0ifG(0)^&rLb*+$ZMJsxGGs_Jc%@a>Tc0h${{(7Q9!M-=MqyPF3Tqag+ delta 407 zcmXxd&r1S96bJC{=xXXhnm=|cj1p-h3=M)#{lHt@I>a7}MXe6nZfIbK3WJCsBAIUe z4V@zB=1DMuAPTy4D2nJ9WS6@1gx6taKJR^J-h5yfxT1@ zty`r+bZI{VL{Dj8*|E!&mwxXIp!@1qrM` zpP~`o)hQ62kaiz*whLVtWV@+vuoZHe?SYC(wwL-@b^s~NvsFY;fg3{c(+_DJumwW6 z?0A6!7rN2pz)itDTOq%)J<#yQ_97(w>;O#B$5vqoTh?N_Jd16}u$Gp2EhJ6tPLAr0 EKkdIp5&!@I diff --git a/test/font-out/font2.ttx b/test/font-out/font2.ttx index 8a2556d..dd54b54 100644 --- a/test/font-out/font2.ttx +++ b/test/font-out/font2.ttx @@ -27,12 +27,12 @@ - + - - + + @@ -86,7 +86,7 @@ - + @@ -129,6 +129,13 @@ + + + + + + + @@ -1841,7 +1848,9 @@ - Created by font-carrier + + Created by font-carrier + iconfont @@ -1868,7 +1877,9 @@ http://fontello.com - Created by font-carrier + + Created by font-carrier + iconfont diff --git a/test/font-out/font2.woff b/test/font-out/font2.woff index 8cbd4ec2d823a2ef6594ba0310e3a9bea5fabc03..20f28ca6ef14fb1809a3d9add2f25a723e5732a2 100644 GIT binary patch delta 627 zcmZosoS-OD?(gQtz{mgu0uvaxLA3abi6Z9p9za$~*y}{0Rsa9z-d3)(IRL+y(i?B|z6pO#I`+m^#^$(TulaQAcOv!~gXRS3CGtZ0=xe z<)7KNY^T^tAet z^9k#uk88i5XKh?wtIE9Nn7PcHdDZ*W%L)#@I$}EKvEvTEzn(iB>%{UF^@=|JqI&mHc35pzTwC||Bz|SL+>4a^?%)WIQ|pOdvq<6YyQH=cR06iDA;u< z*T(9-?ou_k>ag`!J}qc6*=T#;SnW!i-;3oZ182Sds`tq!a@upJ*)~4HrX}o4O)htu zJNPpwTngbm{8F8lf{ix8K_S?%1uIJMY;S?XHt5wmE9r*x1H?y7p*QC-Zj( zO`$B?A76OF!aeSL_?(gQtz{mgu0xb;OAX@yyL=p3PXCNyq>{+5*yN!W?zvAfHlZ_dvi75;Wd@Mk9hCpm4`};wD22cRsa9zqr_AgtPCqxo@-yEQTJP<1|Dl@9* zCFZ6A#r6Ol-Lku6A+5`=T#^bzCCtLD$)labXJM19R za{LMVBo7THPM4!$nE`X=Hz~<>P3bUmtvVk0+`aF5RKC(vmN^~D1x!^^eFs=2tj~)a z)Ly@TW@Y~090v0rP3@OU&;LFmw{C@BO{2FBSNMzamencoJKDtNwZ8rm-!i-6(CPy2 z?FBXmSDUS<*~3|#@i_Je)Ab($>n_y)7g;xHe{1%R!~F%ax$7109Jy01khk#h%#BwY zFMDsbSam{Woiy9Eye)TI)J}f&S^ur@gZk;`F}HJ)g-k#EUTS)^bKBFvn~A0+dO;IS ztxXeGJ-)Hx%B;0~bN83&$$qVx_@gePOyaPU@`K~qItw=(m{`ry+!80QXncBW;=K2X z6Q}t7?0LskeZ=)@W!1XpMjUqg$E{!3seFCH;DSO diff --git a/test/font-out/font2.woff2 b/test/font-out/font2.woff2 index 31dc98751c7c297f0e4b8dc484d2d1af4bb4b651..4c538525a09de1cfdc038197ee03f4633152978b 100644 GIT binary patch literal 3700 zcmV-)4vX=3Pew8T0RR9101k8j3jhEB02k;001hPp0RR9100000000000000000000 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 S5!F4pdsMJi*RDOf0001^sRrEu literal 3680 zcmV-m4xjONPew8T0RR9101jXP3jhEB02jyr01goV0RR9100000000000000000000 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 diff --git a/test/font-out/font3.eot b/test/font-out/font3.eot index 517e9a5a068d112eb4aa9f9032312f6b6f7aebc4..b6a0748026266359f16e23958537132b23709a5b 100644 GIT binary patch delta 473 zcmXxdUnoOS90&04xp#NVwg};>t!_w3cVUXL-@-c2FS~0`zLN&G_ zg4oK~A3ZqWCXjLa>vdKLD90-=L{@xp+aQw~ZV9!-$8Bf%0JjqpWSZNBW^(LQl!26? zr;V60n^EHCQrZ{QQ>l3)#hT#MRLD0J3Is=n!=pxGC8^WZ4pVYMfkK};+PQkQda7zq Iw662z2Mm&6WdHyG delta 405 zcmXZVJxGF46b9h;d_PJmMFsjnZbCzXm|wrpAQC}fQBXote%PO3DAZ77MBowxA$N$D zf^ulK+N8;*pe1lBXo!ArZm6jvo#oz#_r2%b%6e(tGzNiW*&H^qje4;hKeg}DPXHYO zNM$yh!cRHj2DA}C?^@06tlYSd_W*Mn2#>EVJ4?Z{*Q)YSsPl~{=5qOrGyk6c_8^P}u@~JaK?fOa{6hpMVuFSH zmS?!o(2f@=bS|1=0~YCG6MpIuyEyL`dyt|@u@}8`uAEpv?Zyt2W=GV8ZK-MdON|aR F{{Y}lN{Ijf diff --git a/test/font-out/font3.ttf b/test/font-out/font3.ttf index 59a277b56533fe70b615b99b55041873a0f25ac7..7492ad8e9bf44000d197023b06c89089d93ccce3 100644 GIT binary patch delta 454 zcmXxdJxD@P6bJDCeIHsX1x4YY@G1z(EI+nzDIMA~2^#dJ&kTGj=8!{V&{9MtZ)j?& zIWQC2TO6ADAOgpzprn?Dg0N%V?s9+Uf6hJkGWD9;AMjtqZUD9eAQ9Kq+-G^(3{&_|lV|3=H9+13T%nYvCLAZXxpH`D>YW~h)7iK>_Za)4fqAOObageyMuiSqXs24q zsJb?oJt_g7IxVf`vMYttE=Yk#Y~WL=JGvuwsVWMENYY1ujInt?0!zL@=q7 z{+PreH-jB_ZR^w!(1kbN5UKIaEy2$ExMlP+H@AuMAh!h(w!m%0FsoP;C79RLf|gJg mi%K$^DY)ZmKEJHxsbf^U8?pro6vOMA_)|6N6POY8H-7+ys8*K% delta 450 zcmaEpaVBGeqVc|j%M1*RJq!#CVad6P1wSV`u`@6*Suij#3#I2&rfp&GuVr9htzcl# zcF9OhOp%%QVAI49WydE#4Iw%C$%&!Q5`F;{_yGAjxrr48j9N?_Km#R!e1*Kk+|)oG zF((EFgFQe)7Z>CgmuyC$1okrW@M0HI0|Cd10|Rk_!#a&C76K{uc2%f z1_?%HD4Uf*j8PiOW&?^FLfKplVT_(oHaCMB<9z3$)Wnk16osTpg|z&<65Zs)qN2>y uBDbh0FI^um7dL;ukf7A`(wszy(B#{OnUlSY^d>Jcl9)Wr=;h=_ diff --git a/test/font-out/font3.ttx b/test/font-out/font3.ttx index 708ec1d..8bd9344 100644 --- a/test/font-out/font3.ttx +++ b/test/font-out/font3.ttx @@ -30,12 +30,12 @@ - + - - + + @@ -89,7 +89,7 @@ - + @@ -132,6 +132,13 @@ + + + + + + + @@ -4937,7 +4944,9 @@ - Created by font-carrier + + Created by font-carrier + FZZJ-LJDFONT @@ -4964,7 +4973,9 @@ http://fontello.com - Created by font-carrier + + Created by font-carrier + FZZJ-LJDFONT diff --git a/test/font-out/font3.woff b/test/font-out/font3.woff index 791692da61658aafacd8a6a41e80579884cf7b9e..47eaf12c22561da1a2148f93c2b7ca7404521f94 100644 GIT binary patch delta 668 zcmdnvc*0Sn+~3WOfsp|S6izU3gJ_eSi6Z9p9za$~_~C>r$+?LI3=E7tK+MCyz%2B0 zq7!?1PGuSc1Jeu!2I(pW25pxu?ESSFsfj5J400kseTG16CbRBpK?YC|COa!V?JVnDTEu@E0428NvcWRSWBpqLH_hdwh(_?4Sj0kl|d4NyQHh!q&Mm^kth zb5nt0XMm0Y$}w$K%3s`2kY8K^l(w1p$A>X>vL~Y%?;?$)q=X;;_cm~mP+V*zx2DPv?$?dYwQ#W^|+2sAGd?yFRZ^P{xZ4yRrD82 z>p!(%frBzeHP7v@D>4?e=0|wUv);!Uy<@@j0vP;E+3@=IbTQAL9e)HA$HfGD)Kl-eu@KvgWZsA}K z+^XGP6wMa&x4eJb=2_R~eF)hhq}w-XpM2L=uIZPqev5fsx;N%qPu}i_U9Y*Kn7M@b zOwMcmt>-MWv2Ed4G4+AbvJCEHQ&(mt`n)!{_4MYF`|kYCJTr_Bv(?2EYrURg*QM?< zXUlxufY!7AwOYH+zEN0banJV9wCF1XxvL~Y%XVVjgf>m6O3=Erl7$?eT%sM=u z=kd?neMSYw`x&|n?pW5Y6Lb7O|J0wRn|vppCL}O*GBLDG+SY_WGaloQFM|Wz`Fsq7Qrisy?jwY4Jmoq6(uq3+oN%9A%E< zeO}OMUbZ1<`J9^-<~fS}{)ai|)IUC5FzMg%0<{VqP-LN-YH_&zBVe1v!Baiy+ OuQo2qVwh~B&;tP86ZwSz diff --git a/test/font-out/font3.woff2 b/test/font-out/font3.woff2 index 011d179e7a25170570ff3d29eec2681c3d63b936..42f8970348be39f77e4e1816b3bdffcbf0670490 100644 GIT binary patch literal 7632 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 literal 7664 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 Date: Wed, 9 Jun 2021 11:55:31 +0800 Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=20ES=20Template?= =?UTF-8?q?=20strings=20=E4=BB=A3=E6=9B=BF=20multiline=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=20SVG=20=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E7=BC=A9=E8=BF=9B=E5=92=8C=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/config.js | 62 +++++++------------ package.json | 1 - test/export.svg | 6 +- test/export2.svg | 6 +- test/font-out/arrow-up.ttf | Bin 1652 -> 1652 bytes test/font-out/font1.ttf | Bin 2456 -> 2436 bytes test/font-out/font2.eot | Bin 6288 -> 6268 bytes test/font-out/font2.svg | 107 ++++++++++----------------------- test/font-out/font2.ttf | Bin 6120 -> 6100 bytes test/font-out/font2.woff | Bin 4240 -> 4232 bytes test/font-out/font2.woff2 | Bin 3700 -> 3664 bytes test/font-out/font3.eot | Bin 13604 -> 13584 bytes test/font-out/font3.svg | 119 ++++++++++--------------------------- test/font-out/font3.ttf | Bin 13420 -> 13400 bytes test/font-out/font3.woff | Bin 8392 -> 8384 bytes test/font-out/font3.woff2 | Bin 7632 -> 7628 bytes 16 files changed, 89 insertions(+), 212 deletions(-) diff --git a/lib/config.js b/lib/config.js index fcfd3bb..1773577 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,5 +1,3 @@ -var multiline = require('multiline') - //导出svg的配置 exports.DEFAULT_EXPORT_OPTIONS = { width: '100px', @@ -11,7 +9,6 @@ exports.PATH_DECIMAL = 4 exports.FONT_FAMILY = 'iconfont' - //默认的配置参数 exports.DEFAULT_OPTIONS = { font: { @@ -40,48 +37,29 @@ exports.DEFAULT_OPTIONS = { } } - - -exports.FONT_TMPL = multiline(function() {/*! - - - - - Created by font-carrier - +exports.FONT_TMPL = +` + + + Created by font-carrier - - - <% print(v + '="' + fontface[v] + '"') %> - <%} %> - /> + + <% print(v + '="' + fontface[v] + '"') %> + <%} %>/> - <% if(!hasX){ %> - - <% } %> - - <% for(var i in glyphs){ - var glyph = glyphs[i].options; - %> - <% if (glyph['vertAdvY']) print('vert-adv-y="'+ glyph['vertAdvY']+'"') %> /> - - <% } %> - - + <% } %> + <% for(var i in glyphs){ var glyph = glyphs[i].options; + %> <% if (glyph['vertAdvY']) print('vert-adv-y="'+ glyph['vertAdvY']+'"') %> /> + <% } + %> - -*/ -}) - +` -exports.SVG_TMPL = multiline(function() {/*! - - - x="0" y="0" width="<%= options['width'] %>" height="<%= options['height'] %>" <% } %> viewBox="0 0 <%= glyph['horizAdvX'] %> <%= glyph['vertAdvY'] %>"> +exports.SVG_TMPL = +` + + x="0" y="0" width="<%= options['width'] %>" height="<%= options['height'] %>" <% } %> viewBox="0 0 <%= glyph['horizAdvX'] %> <%= glyph['vertAdvY'] %>"> - -*/ -}) +` diff --git a/package.json b/package.json index 58171fa..80eca20 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ ], "dependencies": { "lodash": "^4.17.21", - "multiline": "^2.0.0", "opentype.js": "^1.1.0", "svg2ttf-new": "^5.3.0-beta.3", "svg_pathify": "^0.0.8", diff --git a/test/export.svg b/test/export.svg index a59ae4e..f19c071 100644 --- a/test/export.svg +++ b/test/export.svg @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + \ No newline at end of file diff --git a/test/export2.svg b/test/export2.svg index 66ee9d6..14fadd0 100644 --- a/test/export2.svg +++ b/test/export2.svg @@ -1,5 +1,5 @@ - - + + - \ No newline at end of file + \ No newline at end of file diff --git a/test/font-out/arrow-up.ttf b/test/font-out/arrow-up.ttf index 7c5bee45e4f23372f5b77f09698e77e5fcf7fb5e..a97094b57b65c4f82324c53b4b097553601c0926 100644 GIT binary patch delta 47 ucmeyu^Mz+ZAoFYK*oh%iWMpnIwZ`+?d}ZKfVE}{g#iTaTt0CXMsH?eEMNry#itSM diff --git a/test/font-out/font1.ttf b/test/font-out/font1.ttf index af3cf2aef70ecaadce20125ea92af5eb1af1506e..5f61ded4cfc7b0f795a8d5998c45cb9f21d2b095 100644 GIT binary patch delta 347 zcmbOs+#)<7kl8?L$HWjH36Z!~VFm`a6ATPY#Rd7rCA_S&Z3a&$o0~zHp@e~%fsut1XoDU@JCx1HAi%H{#I6TQFfs5k9ED0S z10^m)*(^ZzVqP5d*oy*4!y~F91kZ4a=HTmceXmO delta 359 zcmZn>o*_ITkeT}`!^99Di3uDT+zbqCCm0x*S_|@vOL%wh^kQJ(44AmXKt`_Qn`k`0 z%~u9)76uTwbNR$o7`>T=@iJ?@ERf3x5(1JO46;x*69YSgDwNF(6xV^WS%7R4D4Ugm zo52RkW&?`5L)lym+6?|sHaCMXLlpxv10xG3&;~1pUMQQ9L4e^nh+PkqU}E57xDJ(I z21-1IvRQ!auTVBCgBT+#l+DH=+otMJ6XO8pvEbeb+Ib-{va=Hwyy@+k+xUVQ8^wOL}I5%^0v{>ZiU1EBZ--$h( Id{KNq065%4Q~&?~ delta 375 zcmexkFu{;@f&>G@i;1k}EQ=Q%xIfWhCo}g|-HCsEBqnfVa5FH7EMQ<@YAwhwE_o=$ zX2-xFt}!`*(Lm<@fklhs`E9;3aI-Lgz@5t{?!f5HYZzAx*UJLAj36N($-y8CWiv6b zGpIt@%s_D+D4PYyHi5EP8Mqm2plmjvxI2{1#h}gL4`p*R2s2bMFf%Z+Z~|?xV(5jk z85sl^j)U0sKnW%WK8EX131*jtvoeS=vO?Kx3<8YOP&OAs7^60n&CQ_3 z*vO@z;9QiNSdyBekW{IVmY-Lmo19owl$lxtl*vra&jSesrKXqWBo+a=ll{fwS-BV# U7!)S271M{ZZi_vdyj%Pr06q>v<^TWy diff --git a/test/font-out/font2.svg b/test/font-out/font2.svg index 752314f..7feddf4 100644 --- a/test/font-out/font2.svg +++ b/test/font-out/font2.svg @@ -1,83 +1,36 @@ - - - - Created by font-carrier - + + + Created by font-carrier - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/font-out/font2.ttf b/test/font-out/font2.ttf index 7bf281c2c525e9ac46b43a699081b0f3f9a94ca5..5d744a9aed3e07f9c241a676d007b80b65f9bff2 100644 GIT binary patch delta 308 zcmaE%e?@;nAhUtg%ZVXA5+ZS}!VC-|3m6!fiVO0KOCCzG*)cGPi%i^MAam_>D{DNz z%~u9)76uTw^YryD7`>T=akX&0IFQQ-5(1JO4B}8W69YSgJe1806jy_?S%7RkD4Ugm zo52jqW&?^lLfKpl+6-H9PS5)(KwxEUBk7BDa{wHD+TmpqhWvtwWo*O<7&K<54duk?6+ zo39MqEDRuU=kkd=FnTi!<7(l0Ss<4YBm^Wm7-XSrCI)r}RVbSoD6Ru#vjEv9P&O+A zH-in7%?1>AhqAdCv>E)NY;Fc&hAIYT21XW6pbb_Gy-+qIg8;*E5IYzs!NkDFa2+ba z43u~ZWwQX;U!iPP1~EofD4UHzfKeLC=3)qA)P}OT8PpgXxfB#8*NKWVgXpQEg{)i* h3JeO9S;h3BEMu`pz|dj>`yR_zA|vLFo3|Fr>}Rx=>Px!>#({p`vAEd3``(V0ErzA zb(1*`ihqzjPQySHgvaCul1L~52}H$KX;7S>f+8J?l!!J(ddFGkM~>H8ZzAOcoQNZE z0(u&bzy%mP&lJHcufLgjZ~bflH~4~w({<1L#2&7wPJDq&JPKFncZ92CU$}-Ao`vi5 zUxb@@!mDr#w{Sect2U^7ya{_~<6Zay*Z2^w(0~6Fu9ClnYq-OYa2;*0A>72=dk}7+ zU>Jeo*ii-y_%E6 jWQDZIwsb=JKGsE7iV=ET(OJD;%&_|f34L+ElNS(q=5f({ delta 449 zcmV;y0Y3hSA&?;ycTYw}00961000n>01E&B000;0kra6Y3)L-=kXsQ~0007okO*iC zaBp*T000mevHTScDEkMz(&PDUzA|vLFo3|F%O~!@=>Px!>#({p`vAEd3``(V0E;FL zbdxy_ihq&2Zo)tmM8`bx04YL=lqQO_P0|p|L#a?YBq$?M&>OP`Bfqp>kVuyg$am!v z(xuBMq|ack8^N4X)P_#zr^!*8>-8@3Oj(xaLYq8H6E$=Pr8LutHsx*k zem$}_P=QHfHKnVgC{>wBx7xSv#@cM$?+2p0ej0N;#WjI}h6l@i#d?VY_W&spYCZV$ z3|3c2-$+kL_2`$WIlVP@h>C30t=5a;rkwh*Rv5y?;9qLSR8l0Xv*pEo=1 rJuzu2y_%CmWQDBowp4uTE;dD1#-H8i3MzTGm?8cH*qw60lMfJi&63kg diff --git a/test/font-out/font2.woff2 b/test/font-out/font2.woff2 index 4c538525a09de1cfdc038197ee03f4633152978b..11d772282d4b58064a60dfc6cc626a353fe6edfb 100644 GIT binary patch delta 3653 zcmV-L4!ZI59MBvXcTYw#00961000h901E&B000-%000gEkr*(4gmVXhKO40aBN29# zv{FI#mkFF)g>^*QI4nbig&`DOgwPXU*P9SthR}K=Y^i?22wxT9l`2s|~E0XC;%3Q+}w*UfqAV4no z)SM6JEZG6uov+?3Fgxay2fj7heehjO+l7R<&d#8gs3w)Ih-H!&1oo`a!<(ohULDA!^r zq3QyL6;$`YP(e);hCMV?U|7TGUKk>**^VK>7cgXhmQer#woV3eH-EWGy*0I%-t%OU@1&TZLob2BnR| z_x6#VL2k-0nO}rlu98KnncQB`{GTAq`+z7H_+kBUNPGky09-q&;cW4xiB`ae{g}>3 z?-S2|6J3@rPaE&0pP@|?l-DZO73H>Iu<*ee+YbLh{b1_6JmtG-|z3=g%A7#%uiBxK1@jvypgf(5U&8{#!Xu zMBe{|#4m(X)-Y74A(=R&)-hV`Y z#OUPu3yXgiVKE}pM*+{ zt?-gWGs;C_0w*rqwd0VvhgzX-Uvjlr3}e#*MIuDXnrJ-(xw2ltqjDkROSjc(mZR*x zL*nx4y_)MgVL(!7Lwt3XR&> zh%{&*XSIvxlzCH)5O|;p0txgpei>0NkLgH*o>;sUdLxC6- zQ3aG$KFn#!7t0h!#x9BBDpcj#!zK%lj2KXftOJPthT|`8+ypuf`Y|1 zn(+f8RK0@^H3=T`_=s_!WM;2_ae2V#K_*mFvJB!62p=BG5l|zLCjx1dWfY)ie7zV= ztVz;HorrN61}G!cy#wo#fyraBO95(82}Zq46+dao&Uvuavf%bF1p~|*Vi_V%aX1lZ z5GAOri#(`yz-Rz|PW}W-3as7per;jyivPEssEhu{(GNE_q2-iv$Y_3lIX2ESXkkqo zzM3%nf9n9ruE!%DCHr52n#Cwq!q}RX({C_8^HBF=h;7OwtjAOrlQ616$ANH%G+SMz z7n^6qZjO>d3S%Z4>IFmx(PS*c?p$1j6>Zwvy2{w0s5)~Aqa0-#vmL-#*7|icx>mPusnJ?$?&gmXBn4*wv##mua`|g!4wSd(M$w>SKM($D`C}#6Tm~ zKG|MSpX}ZVCTOT3FI{i_gnU0)shwyo*kYZ7ozTZ8j6vn^lq^q9vv+^_(bCx?{O=xF z7~T-p=-Kn*u08Dr)0gMhrJE>^4@>MjfSQGy$2Xg&>VKYry1~_dkfa%Mar{7!)!mD2 za+i-A?6a`t`+@IOZ#*_=_t(um&s=;yOgG@|*5k7-gpF8yyz`|;{|lZ0|LeNm`>ETk zw!eQfdkG5;O}&!U5b2L)(h7qc{yPG5UFME+ z*=_$81mp(pFhyJXTZ|9Xe|yr3F09@ft&3ehVqV|q=+r!Z-jb4j6!l_e$P)Fg21dwe zP%3LsPM)k}xg@PeJsa1|7+#ySRfAmyH$>f}Y}sKVjXraK$@lG#fBd-g4Xk!b8I+%( zoQEM@xt86(Ohuk4-}pUZM;n{+eOd{QsBdG-NMAm(F?__ll3|2qPS{y$M}OC>uLw%^ zKN=NHv1-#)GIKqvd6?4>8$gaK=Wi~-87l0LsR=?h6N=~aW6-hj70f;9t~+lbX?{M;5y`Yk>=M!&h_ zc#Fdb zOrKF?46WkfX0ju*x}hlNWEb_GJ8+6;r5kpQGbwm~MVzb2mK}4LAuzv{eRY(t#4S$d zLy?9rJe%;H!7qK$JCdyZ2m3O%%dhR9@{eW>Tc)unB$|Odni|qbt6_Yj8k9J`g zbWC<9-)SDtZJ8!e5K}&of;AK#XSRDCU)8YmAWh4t7^ToZ*@5{pTpWoMwFd$SuqL$1 zj`f3oDE=QjVF!n9(e{#k9Qq7z8E;RaszrLuiRt@Tv5Rke5xWOd4}OT(Hlyfqma!-3 z>a-z_IA#CuBF0g#WzH3z%Tbpw@S{o`|Hq+D@@GgIJq_GV;_7wWG6=ars?z92v^GYC z&m7D>DD=BsJa$-4shslmwWPN5+qca4oUBrRwEi5K%oQ~|FB7tW)2m489d6>2ovhY! zdkp)Z1Yl)HK`awpnV-qY*{r=z=hvsX)U}I*YpwM0F=Ok*>7^Ho>csc(I!fOm6ZT5u zt(iX+*H`R&63(eItd8_eT8qugWbSpxsTWbl(d;wv{st<)C05TUXf-fs@@9ne7xlh> z%vX{>A6JNp#J7a0v9zwnqc^5hPU@Ir*n+dfj*)bp;PZGHGlEE-R7a0zd|OUtcH|e% zvov$)h8OoU5?_?Q!SJ7*?Gzk;-doiw zY4s(N7X_LPsPe@-kJII!2p^98^`3NP;gwC>;-Z~Q*H4c){B!JLw}hZrgJVdlgMQeu zVZkj)4ayaB$m(gj+dZb07YS2hvJJ!AxG=#~!Q3&!52f~zr!vY4_YvTMuMPH|Bu-l` zuJv7Z+;5Jw3MW5hQ67Q|qEy(HYz(!XtgZQG<<5^Ee{ zj5C%`+N?WZ+LISJxyO=2zNRp@Fk`~oF>Yg+Zs`Cl-_aWXbUM{JPnrZIeudBvgdB4k+{Nj^wE6j})lTA!{PtPgdhdY!PHuKzH8+3E2C8K_a$XLlX9WU1gqs zNREqtq`h3K`&6dQ(0y0Bi*usUKWBTxzCzKnwuG7_3X zhMCkrphcoKtNR0gsw{eeA+JLQ>05cjeBfa1z@jq+T(5K#8d9Rhvv(EyAPFU*3R;r^ zxReu7&+G(D$y>EhLFnod@+4-^sgx+y+cym>fHDV%eID&l6eK|=$OVO<6jXxMn=tp< zy05KZC)n3^=x9Ab!g}>y4mW4tG%YtP?s74Y@xEzFgoV+YHfT)S|fF`mVQ4&x~nUwYUXIIRdL<6A%vfM-~E5s zL-!A}J47uM(~t;BToRR#Dlrj>RC;7tTa2p&GiL(Yugk|E0BR!WhZvujoQ+Fmp}iV^ zWIQJd;58O1t!0I%4#~(e8VaZoP$V2Km+lHnk%Kr-`~g^hV$~2{5+$erQpe_brS#H- z5*iun&@wm-43*|`slIM-xCjmhAO|GCAYH2P3L`y1a*PIxs*_sEXaHKGrwa=uQH-I6+DHr$R&K$N;0X+wWfA~G4i0S_TmW!44rvX9 zfqV@p_VP?zI1XGy+W5*5sL~RcBqA*I50XoLyJ?+&b%K{pA*m(LN)N3{e%{Mn>!R>z zwN~lu{@SfmKxKzrFgG>i@a?8;d`=&Q+C)B9vvUxAmya;s)0(x7Zeay|l_4 z)`~`1*+Ash*HT4&`a}lCWba&Be?aqp$nY#T8~i!L+eDrJdcIS`r`n9)Ds{>( zwf{EW6It*-BJ&H0DeG7|p&^+xReiTcIj8wYkmXVSsPJYUgciJ#7p@BK>=Ch$WIJop zW%M7Au)6sE{L-IUCLWRLt$?nVknn^g0%b5!#fwsLO_T;;Mba__MSCA{=5vE#9h^~r z;JPG3;fg3rbc1{hlz4IB)`Lccd#LB@_BnS;r7)b9CAy89JDhBxlv9^?Gy8_MgK_;$$RUWE*8ig;^cB=&Nprj^L@3c}DboERHj17KW z-Yso8a66Ezbb_;7!pVxJgzB3)5!U(iXatAznr>OqKtK+uz9GtTfYVw49LIuLF=QIG z;)pV6AZMvh1yOkV8S)zoiq~wA_oJ0G!ggO_-e!5JBvv@vlKTLEq-mDH zqcW+1vMPo-Bl&EF?5G!)#B>d*^X*}a#b>++R1#~FzzjjRhE++*E~~0-^!0`Ta<-s} zVjY9xz=%!fphHb!z%f2N4U|kCRV@z~J;;P=^0q8f+>#_i<9Yiz&Kc#qq7a7033m$Cq-IJbfzi>GYFgS)0<~m+IR6eL>dO6lCb7W@S z)$qln5&!K2HOo7l5saF}lkx0M376-yy}O)Yllh)Uq-#i5bGK%Cr+hhoPU$fep=oai zmpr#vV-#9orDj`$Au{788|npt_G0N+!QN}~6E0<&ujUoEt}?dBxun+!8Z@XiXcdlo zY6SJA?99Uf@mF$(Dm9Aym~}NcqrF_1{$Q|L%tzFDn50(dJXeS03z|b=c?TmkhdbvS zF=)`@KqG3O>?UZAg>`~|30i6#lx|QzA>Vga;3}#G7u0#U3Y~-7)3fN4{3R*rZhqJ9 zEt=84#SaJPb*N}x84z*5d1r&s{PfJ~3^PTE?UTB6r)=JaG1WPf;@(e1Q{iJw*7iO( zricHEu;I=FmyGTeJkR#J$7iMM4)@&gygK6Kxhs8Ry5HV(Wct~E_Wc(exp~dM+u4AY z|Bq?@>|N;e`oDjVfx_JVlfKNZ=+pwo`b!|4XAE?`w?e?LyiP!=V;i zTMhJ{HQIZJ{aes~a$u{i=4eMZ$CW#pzc-{0JG)|2bWHr3{obo`VM{XJgDzu42cBNyxM0>s})^*0X+au$?v?%j?;HSQElMXX8C)=l7*u*4S+Y zu5|Osen#t*7KaSc3|Fn6MApE7Qhv#+h;K=rD(`PDw#iiCc34CEx;nZpo=9iE>Eyq* zvZE+yJKx2`{)W+2;<>wx!rZ>!GIU7Ts2l8Y$(Tn7}9a-6fS(P|F;(dJ^ zGA{7oFkNSVkrxmrb5iD@)iO2zBDQ#{y0YrLbJv)0L|>;q<|BJ-+qkg#x%#iO(s+;Z zXxe$;u3@!>kO_1iNoF4lzic44Q+6ndB91k4Dq<_1i7fNQwQ?Fmu9M(nc46yGrV7ll zv)fA1GJF$c!3@*#B%q3rseI@{oChhoe{lYV?oT^^GO?T=Qi%SU(Kdo^&=CqHYBEH2 zJX_8LE#cNne3_ZdOKP%75ShSC-#T1WJ#9iD<&Lg}% z=p^d)wxp$+b{1FG^kn$|(Tv^7{tMJ!V>kOB5hUaGaa1FaZg6zUZkBH6WhC)CF^BUe zQCE$BBK#Dij?#S7nFR79`~P-gJ>qoC{E{njH2L(nSAxg?$ta;|&moLF>j zm{t6Yz(aKDJ$9EgM$Mc__*`fA#SR=V#OYv{n2LA%?`=W8i>Nqih5 z!EU7IgbfH8SIa|~qa=Smz9hC2A^A*-$G!spD9mXbi(#g5BVH0)Yq)uo$B8ngwkBnN zyp{0FyeuLsx6>1^>DpPYnC00brds|kV~0P3QbMU2js7(uzcPI=Mklt-BsdoDVA@Y% z^tzoKk7S(&r8B8Zac*qOyXK}VRxY&J%OZFFr{mXa{JWi1W4ZM!TZi!5aSpU$*CJH; z7R+`HtDIvakvLnntgvHvqI$&aKuCZS|XUCe0nN`ks~fIO7&T(&QE5s*uG;^fRU9cqQ%gUp8iSp0jqp}2 zy_tCPx8&b0CSF{s9NFEisY9G&-*gn$$2^?0J>8{r?5&qwQ=B5M+>RNOVCrp(Ul_BY z)!7?y)8lU2>(|FDj5qZ*C76oFZ;07z-Z`k%gz$y?L(J`c+nWa5uJf&bV~V2@aJ(W4 zPjC$NulOH0N;HYTgX3$dOx)veI1KVcDHI&`778jWw%!aWF7~8BQh34N62(uW4Wz;1 z326O7u56QwQf!j>8f2Z9lK(+$#?OuBvV7M*%__~WisD-r zn{H8)LypGDfC}-$R{ei}p$76qhXbRxn*{E4m`Z+q=rjS@BRF8Ht~K6W2tX-|fSQd1 zM?2}d9J?Sn8u}mwDvU@?C(@4A;K6t#1ep`ii$w$p zxbZC#ap5YGaO1J9%&{5C@fPGrftwJ3)Z_}C?y8}!Fiox3$JJVY3hkB>ebG35sjb=` zT3lFLYqiuS=39$x)#1jOma`y3u7(c6+J5 zwANOoPt3TQrLxkduc@__TZ-*rBkcB?Ug6=TNiD*PZB?kzv$Moei-kh$SSUeH5#wO5 zQfyRXCzN6esReF-#bRjil9l2t9inX}7Rne!C9ctz?6X@Vj`<0%|wTj%$KEgCi5`*NCfhTIWaI8oM2#JT3nD{T(W7& z*4GRS#yOJ<7!715 zU}sQKLKyhCvn~Oo4Ari{wW)Nm*VPIxpWZ?wbpvN#B z%4TGcU^oh52LL6Q82A|OLM51i60f0b76u7MW+Hq)$ delta 360 zcmXxgu}i~16bA6`<#H8sMF-JFunSVaNlbr>X zZvFukrxHX8{R0#Shtg5-MV>d@``z~q$K7qS+te#tz*(lZ-SHqFX1g!y{w=j-I`o%Y zcWof-15Ph(onJh5dtX4@wkd^6!+bDq%q9~U^#NX^yg&M%PtTOsuBv>bBI3P_s@TC4 z*2IeQQ0%f3v4+8cxWsu~>|q@ZvB4Z}pg`_4->`#@nBe2RaGeVWGx(N5aq%N|;nTcW zV}UlrCC>N69**c(Y_LiXUJ%%msG^E_8C`1+0RlUTYNFG4(I)Yy;qUr;HDGL}Dt3SK F^%tewJRAT3 diff --git a/test/font-out/font3.svg b/test/font-out/font3.svg index 6a7ed1c..e7159f2 100644 --- a/test/font-out/font3.svg +++ b/test/font-out/font3.svg @@ -1,92 +1,39 @@ - - - - Created by font-carrier - + + + Created by font-carrier - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/font-out/font3.ttf b/test/font-out/font3.ttf index 7492ad8e9bf44000d197023b06c89089d93ccce3..a26a130fb23650fe843bf2b7354c5586e7307ada 100644 GIT binary patch delta 351 zcmaEpaU)|wAoFEuorxhn5`jEoP7DkNCm0x*78m3fmuyUOFh)-(o0~z6alUg=YGO%hib7JQLRx-a ziEeUYQBh`Uky})hm#&YOi<`e+NKk5eX-*4wb_Pu-n;9r>0A;fP*)~u% zD+4!!2b9eQ6c2{7xfrw=;-PGA24RLS24)6E7EYiIRt$5YY(@qNhU*}9Jy3#)fsf%m zRDu~O@fXTwVUS=Hg|b;0#29sd5iP;f3vO)N=GQAny( zNXySF(M?V)D#}bP0?N2WMS1D^c)7Uw`-KFhrkCaLBK&2cTYw}00961001Ds01E&B001;tkra6Y(;F<2kXsRF0007`Q4AJB zaBp*T001B~vHT$&D4M{UgYo<}Um3WWUjRiI?mT_H3qk*%%KU=a4#?$TU;>E(0E_7k zIFm&lihq&IY63A7hX3(as-=q-TA`ajp^FyB%c2XHRYodSK}4uK9W!1SXCxB^_kD*h z`!s!w_67P9{T)-Vf)nQO&9?~zHB&) zzV&Q4hdb+|rsPn|u^4TH7Y4fE4wafoxK-Z`fDAnCl#$d;i+&T9PT51KNL$9&ZVpEsn*MCvFI6ZyWs*gC`b&U8OIP9VZ-Pl zL}x%(fXkfXm@%*5V8GF&Z!y+6@1Ttyy39_nf*)5Ot2*ZUaqozGYXxw=s=ZEm1|0!#k+AS;bDjdoyxs I0Fyi*jLyK+mjD0& delta 490 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⪻AMIychAV@kzQ4 zK6UDUnPg=uPF=_uL*E=KD+)I*Q2&kwiyN6)Z(Jo3sm^ZT(Gqtc}hUwPkIaENVB?P7jzB?YFcGCw`eUuEOQT8F@c6N^|{X z&;LJderMN#761sG2s{PgeQ*o_f?I-*0EC8r1uKE*YdeEK1JM!PgMR>oVuOzY(P~XY z9f0U9%|l5*w87j^TOfK#eyAouC>XpPh&HJeY6L_tY9Fc(MDLg#N&uoiLzTfdfoQRA zq254r%&6eM0A2-ce@T2hV2CPXLAv5EYeoLMW(0u08)^W5 z5Duq<_#`_NXT0TMAhZSO#O<^#W$q>$@-NK)=+uO5GZ1x~Gr$`(Dy#jwO%K36Bu8=( z0$UE*O=d0%54z+SDJRFu+;W1&#=aA^WFQ<%+9-8oOzy}=;g_w+vgC~#l6}LPY7jQ4 zy_|SnRHuFgdUpp9O2!R*{X?ln)(S~~)F6q^&r9w4G81>V&yQGr_wxA=|4m+z=0=TR zX$jtKTjPk7Z8!5zWiyvhk{Upiac9`~3MNu57OdCIQ*3C5hrK|(P{Sfcki^gi2=Nbu zQ$|c9A<=ft1|q_zdgcvJvK<k{_j*VR$#swk5bWDNHX{MWp{)pTgFFYrK+X;7q zE3lgo2}I))FPP!mLSf=zkad9{Z=~mq5cw05(Bx^7)(S)G#MPp*jL5RhOAx|L7YhJ} CLy0013;kr*+5H3xxf8$K;X284|R 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 From 91817b7cb102de2d5bb3e9e3de4f624808b39f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=9D?= Date: Thu, 17 Jun 2021 14:30:34 +0800 Subject: [PATCH 6/9] test: update ttx file --- test/font-out/font1.ttx | 14 +++++--------- test/font-out/font2.ttx | 14 +++++--------- test/font-out/font3.ttx | 14 +++++--------- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/test/font-out/font1.ttx b/test/font-out/font1.ttx index 63d3168..b2ef750 100644 --- a/test/font-out/font1.ttx +++ b/test/font-out/font1.ttx @@ -15,12 +15,12 @@ - + - - + + @@ -452,9 +452,7 @@ - - Created by font-carrier - + Created by font-carrier iconfont @@ -481,9 +479,7 @@ http://fontello.com - - Created by font-carrier - + Created by font-carrier iconfont diff --git a/test/font-out/font2.ttx b/test/font-out/font2.ttx index dd54b54..2dbb3fd 100644 --- a/test/font-out/font2.ttx +++ b/test/font-out/font2.ttx @@ -27,12 +27,12 @@ - + - - + + @@ -1848,9 +1848,7 @@ - - Created by font-carrier - + Created by font-carrier iconfont @@ -1877,9 +1875,7 @@ http://fontello.com - - Created by font-carrier - + Created by font-carrier iconfont diff --git a/test/font-out/font3.ttx b/test/font-out/font3.ttx index 8bd9344..4cbb8e4 100644 --- a/test/font-out/font3.ttx +++ b/test/font-out/font3.ttx @@ -30,12 +30,12 @@ - + - - + + @@ -4944,9 +4944,7 @@ - - Created by font-carrier - + Created by font-carrier FZZJ-LJDFONT @@ -4973,9 +4971,7 @@ http://fontello.com - - Created by font-carrier - + Created by font-carrier FZZJ-LJDFONT From bdc441f7b2a0f2ac58207f88cc5a9dca56e1effd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=9D?= Date: Thu, 17 Jun 2021 14:32:13 +0800 Subject: [PATCH 7/9] feat: 0.4.0-beta.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 80eca20..123d81f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "font-carrier", - "version": "0.4.0-beta.4", + "version": "0.4.0-beta.5", "description": "字体搬运工，中文字体解决方案，iconfont", "main": "./lib/index.js", "scripts": { From 8b85fef9cf9b82a48466a1b4075a8b277950828b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=9D?= Date: Thu, 17 Jun 2021 15:01:31 +0800 Subject: [PATCH 8/9] feat: use svg2ttf-new@6.1.0-beta.1 --- package.json | 4 ++-- test/font-out/arrow-up.ttf | Bin 1652 -> 1648 bytes test/font-out/font1.ttf | Bin 2436 -> 2432 bytes test/font-out/font1.ttx | 10 ++++------ test/font-out/font2.eot | Bin 6268 -> 6264 bytes test/font-out/font2.ttf | Bin 6100 -> 6096 bytes test/font-out/font2.ttx | 10 ++++------ test/font-out/font2.woff | Bin 4232 -> 4224 bytes test/font-out/font2.woff2 | Bin 3664 -> 3704 bytes test/font-out/font3.eot | Bin 13584 -> 13580 bytes test/font-out/font3.ttf | Bin 13400 -> 13396 bytes test/font-out/font3.ttx | 10 ++++------ test/font-out/font3.woff | Bin 8384 -> 8380 bytes test/font-out/font3.woff2 | Bin 7628 -> 7620 bytes 14 files changed, 14 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 123d81f..352f201 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "font-carrier", - "version": "0.4.0-beta.5", + "version": "0.4.0-beta.6", "description": "字体搬运工，中文字体解决方案，iconfont", "main": "./lib/index.js", "scripts": { @@ -14,7 +14,7 @@ "dependencies": { "lodash": "^4.17.21", "opentype.js": "^1.1.0", - "svg2ttf-new": "^5.3.0-beta.3", + "svg2ttf-new": "^6.1.0-beta.1", "svg_pathify": "^0.0.8", "svgpath": "^2.3.1", "ttf2eot": "^2.0.0", diff --git a/test/font-out/arrow-up.ttf b/test/font-out/arrow-up.ttf index a97094b57b65c4f82324c53b4b097553601c0926..26298b1bd3d30653e247ae7c8ad4f9c6788f4c90 100644 GIT binary patch delta 146 zcmeyu^MPlAqVaW)3k(d5Jq!#C3CX#M1#(Am50t9zHEdBwbC$lhiGO|qWV~pGUfw6@J0NHOX0ssI2 delta 151 zcmeys^Mz-EqVY|S^9&4(Jq!#CDapBs1U`HYOz z#1xs=(y50t9!SzTOCJ00000 diff --git a/test/font-out/font1.ttf b/test/font-out/font1.ttf index 5f61ded4cfc7b0f795a8d5998c45cb9f21d2b095..267d67d7f0588395dc2476f448f49a2a76405fa9 100644 GIT binary patch delta 146 zcmZn>ZV;ZJX#CRsC<6my4+8^3LUL|m!KMvYy%`voSb$;&(sL@)B#dK}85o$a0L4CJ zq$Z}wxpuov3{e(*1Jodqlb@W()Wry7Gas4QAuo6YsH(Uizqo{V_f9Vc22P8KI}D{G m{ddOm+k9o<2AT;3cRnos0i!3gFm^JsOzvZh+x&rX3OfLPD=m!x delta 151 zcmZn=ZV{fKX#Cp!2m=FS4+8^3N^)*u!KMvYy%`voIDldY(sL@)B#dK}85o#v0L4CJ zq$Z}w8A$Dz7@{or0jNPDCqFrnsf+OqP{E0b9rA)FfU1fM@{3D&cklFKVBoZwxWiDo s!C-ehzs*+$ZWf>x28KINUvGrblUW!$8CfUyF~$Mq{{P?nhH(lz0A}JZivR!s diff --git a/test/font-out/font1.ttx b/test/font-out/font1.ttx index b2ef750..f26186d 100644 --- a/test/font-out/font1.ttx +++ b/test/font-out/font1.ttx @@ -15,12 +15,12 @@ - + - - + + @@ -74,7 +74,7 @@ - + @@ -122,8 +122,6 @@ - - diff --git a/test/font-out/font2.eot b/test/font-out/font2.eot index 41f1df04b670caeea70cf7c069eaa111b8dea329..d2db95292c6a2122f3b5865d8a1667f7a884c91a 100644 GIT binary patch delta 162 zcmexk@WX($LV|(e!bDbcX6HXkCfauyzf2TnU|{TFU|>i{&P^<+)Ba-5z`$ez#3#~o zD$|axJ=w^>z^cN)z+aJ(nwTQz+Fd&FkFww!pazee{NzN{CdDfZ3@m>p8!*ZX&H-vG zF32w~c__tZ$G{*iFgbzIPi|&P^<+)Ba-5z`$ey#3#~o zD$|axJ=w^>z^cK(z+aJ(nwTPIAoX(MA7#N0Kn)%_`N@f@O^R253K%9EFv<%q0BS2P z$S*E=D8**Sz#uL%If2no`t)7Lcz&C&4BRY0O$-cop1$4%qbILn>||t}Y{nD^l>7gG J^Ax5hq5vvFH7)=E diff --git a/test/font-out/font2.ttf b/test/font-out/font2.ttf index 5d744a9aed3e07f9c241a676d007b80b65f9bff2..005302d119fe25c56dacd0d927a6861d8228a7c8 100644 GIT binary patch delta 146 zcmcbje?fnOqVdZ_VFm`q9tH-6gyh`Bf;#Ol_6!V6CO~{5J*P75=-QKw3=FI)3=I4g z8L5dWa<1K_6GM~*-vBjuJ(-2ElaXa|A7k9+4~$Pl0lalAkN^Mx delta 151 zcmcbhe?@ - + - - + + @@ -86,7 +86,7 @@ - + @@ -134,8 +134,6 @@ - - diff --git a/test/font-out/font2.woff b/test/font-out/font2.woff index 5445738d1d1ea4b522160a02b800661cf1190f8a..3959d3e676b3a66f135fd7a3c763fcac07576eca 100644 GIT binary patch delta 272 zcmeBBY)}*__jhw+U}OLSfd&R{5G{UTqKJ9D3y_r%_A*g8IXAI@fq}6D$p6g1z;vQc z`-^>gPGuU9UBke@-NwMcUvYHp$;OP-#1sYwJ{F)l10Xh&bL}q8015)dOn`h@AXech zW@*jHEvW#Cg#h_dKi_?o{A7?ipgjy~AgtPCqvT-Hv=dj55x+L%8crH ziMgpju^m7M`2!tLEE3l$T##Q}0(3pc#6LcaiIY7UE!j93=C|;y+}y+1#-rvvjpO*| s+cl{V(h?aOt>vd3c=`YT|JNIK8UAM2DZ}HV5XcZ4#nZpphR=ry0KKJ0`)Xb_jhw+U}OLSfer?45G{UXqKJ9D2auH#_Bv50IXAI@fq}6H$p6g1z;vQc z`-^>gPGuU9-N3-W-NwMcUvYHp$;OP-#1sYwJ`SKdLm)PjGmv_j0Tcv^*#P;nK&--1 z%+i{XTT%fOivjYbfY`%z)&KuF`N<%4Kyd~&5LRt6QoNFzSOK({Zvjw19*7kfl^NCZ z5_405Vh4Z@@&`JgSR}4hxFEl{1n7E!iGO?;Qzv^eT5@$ZKKx(LaJ7SP#pVviHXg0z z(UFgT=I%2p*lf^nVD9quhFylg8FtF>_$UN2bjtFT0xj8W!so*T0NapF AumAu6 diff --git a/test/font-out/font2.woff2 b/test/font-out/font2.woff2 index 11d772282d4b58064a60dfc6cc626a353fe6edfb..91ff35ffb8a4446e54b7a29b0b06ce4171a66d9e 100644 GIT binary patch literal 3704 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 literal 3664 zcmV-W4zKZdPew8T0RR9101i+93jhEB02kB%01f~E0RR9100000000000000000000 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 diff --git a/test/font-out/font3.eot b/test/font-out/font3.eot index 951b59783bef45898a7a6df5be2ac0894ebddac8..3c42bb3158f66204ffd35cb05e2db1d9dca71443 100644 GIT binary patch delta 163 zcmbP`)sw}_W6Hn~GLhAsS-wGgqWvu6g9%p|7#MpP7#I?ga}x`GPIO{tU|@1!U|<$X zq?!rouYz`)wTz@Y7tk(!ty^P+plWFAIk!8Z&*b8_;N6GNXR`~s>7ne4zQFL(r~ zcX2^}aml77TVFFU7-vi_U^JB0Zjg`XxB1Gz&HMtWi{Z|PB_Ik+Pu|1W$;dL0rZ^S` NhX4OJFJa0s0st$HG{XP@ diff --git a/test/font-out/font3.ttf b/test/font-out/font3.ttf index a26a130fb23650fe843bf2b7354c5586e7307ada..6ca7f8ac13ef4e587672107b30877c8667d1e2b3 100644 GIT binary patch delta 146 zcmcbSaV2AdqVd6ms|*Z`Jq!#C3CX#M1wSV`u`@6*IWRCV3#I2&rfp&GuVr9hZD3%~ zcF9OhOp$rfy<=jCvfvvA28NKF{N%*YX9>T63PL7!$O|3;>ReoqUtF?j$=25l48|D~ scNj`*%|0K`Z}XLboB0J$55t`gOF$Hup3K77$;dLfk1=lZ2gVE|0MRNi#sB~S delta 151 zcmcbTaU)}bqVeH`D+~;bJq!#CDapBs1wSV`u`@6*xiBy=3#I2&rfp&GuVr9hZDC;0 zcF9OhOp&=Pturx1S?~i;Lr6}3a$@MSgkL}f5feM)1y2BVE-uI~F4?qX>uUxE*PMhI2Hzm|Nl3?VazZB0Gv!Sw*UYD diff --git a/test/font-out/font3.ttx b/test/font-out/font3.ttx index 4cbb8e4..d0ea079 100644 --- a/test/font-out/font3.ttx +++ b/test/font-out/font3.ttx @@ -30,12 +30,12 @@ - + - - + + @@ -89,7 +89,7 @@ - + @@ -137,8 +137,6 @@ - - diff --git a/test/font-out/font3.woff b/test/font-out/font3.woff index 959113a865b9f527e1d604bd594836ef1071f0e8..7b53a44eaa174d33cfa30617c929a8e534f33f1f 100644 GIT binary patch delta 274 zcmX@$xW`eX+~3WOfsp|S6!tK1gJ_eGi6Z9pEOa!V?JVhK>O5FaB3hMfFlkh&V6m<|YsJ~K-Am77=rv{-HhP(U7t6&SUcIPwy6 zQ-NY9fR0HAI$&`ikC;V_cL@E-1)hoh0*c<{8N9LZt|UYkdVOC$;6PL#uK#JRj!%|06xn{aR2}S delta 278 zcmdnvc)(Gl+~3WOfsp|S6b>+OgJ_e8i6Z9p9za$~_~C>r$+?LI3=E7tK+MCyz%2B0 zq7!?1PGuSc1Jeu!2I(pW25pxu?ESSFsfj5J400kseTG16CUaR@Cj%%56a$$h4a6$! z-pm{sxg`}qF`!zoScs1i14B-JGDuwmP)rAeL!TKX{K`$N09q`!1}Gp8#0rdBOdNTM zxv4<0GeF0r10Aq9kVnj^AiuZ-C~Y$Fj}K$&WKTv*uB3z?|K%B2Zt=Ko?qHlKqcQ8i xtmcn@%;F_?%#3Gnm3U`UyO-PX|NK*bnr`x)c$$#F)XBuq{gTgOv!h%!69CbaNTL7$ diff --git a/test/font-out/font3.woff2 b/test/font-out/font3.woff2 index 468e0f0a9111f416335ff48c8857cc04e09a2878..128d95729ac8c1833b5b9e8d53a9567b46caec01 100644 GIT binary patch literal 7620 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 literal 7628 zcmV;-9W&y0Pew8T0RR9103FN#3jhEB05n(t03Ch+0RR9100000000000000000000 z0000SR0d=Kh7t4BL{(N8!Rm&19g)2V#xl>fwqRo^=P(< z^wb%8>J>4;_Ib72_+Y^y+$JuGMTk|((^vnBc}i+7ios8TBSR^90N{T1KB}L%2Dr(A z1K8bUTsuJe@K4?PZ@2pb?xx1q(-`v@8iZ{Qlq@}h$`7Jku3#qG82vP`^NAOIr1t&W z>_-}p^xA)0`OGbyCMm(~oir>a9O+Z!?d!-u?~_%^fr6d_2)I(!fEH};ZVxyx*t`Jf zq>MmHattM@(0%GW{f8vAc1vbugCJ>s3W342&Af61<3R0oZBZU!YzM*DemZL}mbpNn zBKt1j`fCi{JGJled%P2P@X!JLA+Tvor$`!?6iMSm+08FWoGq<*^M7-t&0PU8#gv4v z75iuQAT!y6nWJp>C@E%3nQS4OA_>Dr_4&Z@-j&gvs<0KV!m`tSl?u?AqB@Nz`-g|I zsj*5|X@H4>O4Q$vBR~?IEI{+c_4DF%j^uH1M&9P!0Nr*C%xNmQ*dKFV%+3K31R=f0 zgucLWQE=7Pf#mdQsbDsP1k{1ZGuzzJ;P8U!x&i-xQfNvvfkf_6-|{=i?L7!Y|1-n@ zLV#At)dVv@tUwaEi`wc$(P3VB698xdSe}Y@UrnYUIB?s*&jt+}_QUX$G0EdbO--NK zcG;F?udm*)=KdYm?A&(nxoDREaRWOJo68Zfe*2jZ2!N6!4+aha2?Y%U3kQ#Y2uOeo zD1Zt;AeQ@u1UO%VAm`MiM%82isz5tA09Y|A2((iO0R!{E&47Wku0jkj$Xg*681`Nv z4j7JChyY`73h}@=e}x2KDoG&`n5nIh1T2$POFn61u0jg1TB?u=thuR>2EdL6g>(RR z<|$+VaPWyjCIC?^ZmL1{p_di_7y>}L2au6!Q+a8-8xYVP+9J+%Lct)&9neXK!?>?A zr2fj9DfRX@xUcj?S)G01xF|j|A!laHoXn(1%tP53Nhz_JRqYd^)YycK$ZPd8>m@~< zNr{QIW2&F1xgxD@()P66lzO8t4yVN=HGL;7H8(M)-Y6Bs%o`1YOwXsEQDE3>8?rYB zpI8Q_y!-6KHx3B2P$E*@Pc(mTf*d?ZTAtg?O{ncZ?49&$)AYZqWfk3h)WfFV`n78# zEjb#M*FQ7rzJ?A1$`EXt8&q$fZpiMdDMbg6+S~;^TI#*w&~toYr2$caCCLWP6eCmZ zp!bqm#`o4I<4FC5Z#3KRskdI?rnPmp4gNNP6tJg1;Wp#Ix~Qe6-vB4fk?8)L9Osy= zgAM|1%-VV|T;;OLboRl9lQn=y8ri0yprkx3t<-%8Z6^pk1O__LX5Lit9+(tKT}Y*J@G!thk@HTon-jhidJ;n1C!s*P$om0l ziQ!JByoe%(%q&1{oR?BQFkZu*Btv&^MpUYhU_0|lGKkT#VGY*%>iewK#7Y+#c-}GO zjf?8oBo7PZfkJwulprKJ-OToLnLW3e9iQGAN{aaj&IsaQS(xyCG=7p#(o6)=m@+ zH2f4WDg+uSxAHQ~*gomN0A-Jw9M3GytMgorGkcB+YO|rJuaO5R=bIsq0k_(qj?kpY zTM|7%C>z{x?s*$Qh?NjPG-l~Ka_-6m>|!THNY)gKv zPWOeoc-ZHq@HP^ECNp{L9;BC)$DI=y-|R?9wnZIIg3!Z6K~ zb<1ra$7;7pcvJ3pWF#U|W(zPNINU=W#O(*dgRLxx0qBsP%b8;+&M>@7xyLQVt4RT4 zqP+Yr3wx6?{DoVNrF>TMsAM{8|Ce((F2R3@`DBBBJg*#EE_D$96|Q2`E9*Ntc)FyU ztoj1?y~d`|@WIB@+mYmaeSYKG%lyRM{-TTahtO(VR``3&r@aowL42{2_F)#-51FmM z_>a797Wy%{&wN0XWq0$x&>QKdjxTS*$uj2j#cT^{kB6qp?5~nSlXIv}O8h5b25MZf z5XnF7-z0RjZf`PujvcRye^*g@QQW2^!?=Ytf+|^ok*mEFAr2C3_NHTx&qgbg_3y`cc>`L-rQ;ZU_oCu>vqrq{MwG&e99+P%g>u^lGN#xci}F z+w=i%aep&8l5ZB#>*8 z;*%)T#Z>444tNIkevt!ie_@(aOEJ=B+j};1NHKozDFu^q>zfnuN@WQVe|JtO99!>SO1YbBPt~A?BTccN||7 z8KFG(vK}CyqE1Chm}X=54m_B-moVcT697eZN5BrHpo;g1M;}*pu6aqGQbwJvl@iy( z^VGiyA0Tr<5FJ=XeiaFITVe2#tPQYAQ*c87bPJ%CfkWUDqzpvm z^Cr_`wnW}J;D}` zRRv{X&=wF{qkYEZ$x%z*2vwmiD6KSm84#high~kkKE#5^YMi_!<IC4o_qKb&VI!W~I$X&3Torahj`Rrz`lSkH-GaT$mhh(_O!!r|?> z{}Da;tgs4A1>@rO7f);aTb=OT&sNxI3GX}VTtrW3#5u(jFkona334V`>c}8iXrqGRWl@9 z6jmEf0{j7>s`b!pC$vz9^U=%Av@^;GsY{r|$g~s(^+Se%xtw)Q(j-V~f0GmSLTHjx znE%yBkS0Z=dWcJeX*pvUF6hSW(LJ{H$pI?DsoRs8wcq)XU+pEB9Vl@Y;IL%!-R-6Z z_K0PI@m)(q8KHosutKEFb=38QrEivx6_ta$E;2gdKDNoF9@~^;l$~N)VKwXARAG2T zIQ01{po<=^FidM1GfuuL{2@S-Nw-j9W*Pwei$31*1ZzeHxVkZ)uv}zAd!Mf6ZspR_ z7N7%2)_E<#r<5rzC7G7CBu5`ii4h5yfd(gy83rf@&VKu&^3YSKu0HyJP%Q{ufgTbD zRlc@X5>rcx1Z&0|_Z9a!Q5R7GFF=nFRXcP}AZ&dQCR}x;bWb-F32*l5;%o-*sex^Q zIe4mRglaK{DWX1ca??7O6|W5ggfWV~E2$#Y&Zaf{=c{y(41`&+xC1L#t=tQ9pl;G( z`e71${s(!fAb~*gSLCls%OBBl`w9m~BF%&GwF801!Mp|?Kr^xe{XqJM16g#U3n~L0 zhk`Y)*DxIFI=ZSUH3ZnmtbwD^JR7GE=oXK|fSz<7?B&-^Mb2gcp)Q9?ia3#XkDf(O z7Y$gzDpwXfa@(?ah&GE!QUBhXA%K^X*rtMuP6o_9hvJebOKN4r9uZV@ag)U-gQ-hX zp{FIG+)EdEd|Lau6PoXWEV<49KxQtkb=>LCD2f|hk=vh36M<*#dq(6z_1`zKMw!wG zHwN9udoIT-sOy#Q=OZst3{g1HUuQ`U`=*NUS^UIkGs*yXY2V{!Zj7~S5oAE10J9l1 z5A!N+Gaky40kJmzT$LuC_G2stWF{azG%w@YcDoi!Lf_USVO|*S^Q5-~Uby+?xfVy%^E~|)n%TxBPhxaY z8dDWXZK7zlo>Z{u?$xg#u9IA-#{W&u*7|EG+MD_4F_&-RvzJ^-wobn<3o1yd z9chO+zSEU8;{kCUqDP<>%Je|agQy4$MTmnc8bdIH?vj0U2R*VwiTlJI#0AV@x89H6c$D zSA8B3qvGmpRqgI4(u|=J+IT9tO&In>pU=DWnzBpUP+Lg!=8=WgcuOT~S72t>vch(@ z4G_yeL@vv&6TVoi?7N|Oj_1+xoO6E4`arM!K{nJ{nA%bO0*S$}a^7%%loqaha@S|@ z&pF)0L1EuqY2tA=>nPYD0H_W(ygaXyv9gVF6e5n626l)}-=Pn+wQjr7K;2d; zT%aL>2b^tnpz}OLu+GHd(s^siX0uz37=ut9XTxnCyFOV`3S}2&m zmWN?p!&7hTrDO1L?XvEzA%YG*lmMnBQ{qYIyFCIR6Q6a6e1x*6agjwr_dm-TIdEL| zP-7G4F(a;J<&Gch+-1R0kNRUNgzGs_Oi6NViHlCZCX9PqGIweH5f%L41hD+kDg89~ zcMhrB^;8WVRZ{rK6~VduMKks|A}xe zfqLRX>_aQ*C@$juYK+3b+6O(b?DsN5RLC>RL>@jpZ?}14>p3r|#t&LSEN(X)bjWPX z!fIqjQa3|=YO*Yg#{)xW>B-nD^$W+xjqnFc>h_30U9lWRJ;{SAS>9JB_(ViwpISV=8XRBC}Oq%K# zL|&@mjY6^^@fx|5wHM zAv-XllXGkU;K3caHc>Vk!`ltO80*QMZ7Sl@B6-bB3;qt5i#y6IA-3ZqRqRH3ePN1H24Dto_jj}ov^+9|n_`|tvX?^D{koMr zVuAkYzK)%gIdyIo{IR2+XMYy|Mlo5GuJdPZB5qoX!G}(T+T!kcN!fnxluwrkXU&s( zI5hhFoc3*)2e$6}MzY^WY*40BFA9B_b)uM4bv%6!b(g$OSLwp1*_`d%OTIDlBp?>Y zyOD5|>Q_*kQtZwIy9}Ezdmi7xPvp9B4?fY%Lt7cMo+R`Cii34x|7tT^`TJsKFmDU&Y4)|Jy| zs#U-VGzzZ~kwMb=TX05Y6uER>r7z^~MKBA*dKgi#g*?2;zoRzvR94sD?J=AcAA~A~ z=CQbu<8%s1h~vW^9+7FLxJyJaX99I^If-Ng^?gygYEu`e_F^>c_&-qFzXT{lWYV@v9}s=rPK&x}d` zn{CQvy;tdgfF$N=yyciysN9bC)@`d8FbM!B8DIR~OUdL@0Rv`*~~1RBEN zlQG|GkRcH!3|Z8#gU?ESCOZ;9SDtNluAzM3EGVhHSI&r<%#SaY4#k;9$T7B0B%Ksm3%KClucDt$boK>dO)hgC;(ft zFjk=7=59Np8)2GC+^n%3MEU1<3_#fjMXX1pZehByrSr)iy6_XbrA9IlRH;Zaa$vp3 zBSM$$g=^)H0r}^;>^ZQ&CM|j0y7;a^G?XihWn4tEpg@MnQFz?tOS+>}Gxe!(%0Djj zqY&LX!3*1reljxZNBeKu)v0BYx@~5O3(RkB<)N6YaMZd)(HFv~Vh1=w?q zU1a`nQ#obx;4;!L@##T~+8OLulv;NpeZ8FT{PU`we{0c$A2JUC_=mRk*~rInus2Ft zm|uTmup*e^+UxCwUC;lPL(vvT3z0gCiqx}AwcfBDN&Dx7XKcQ)^TErdP(s$mb8q9B zZF39o2&jAI955a80q<6bjPK|os%+IIo(dtV{QSz?-~BdsYD0`lB#=d`vCL$vhgT`x zlh;l`U4+q`{}UUCL=+T!vf|~e=h3xX*Ok}74^!dM%ISQzQz~t0yNd6p_r9NY7&X{`3JqflRRHuDwu*??b$@ju%Bbqt@W!s!kY7MH zH1LXRw6I*vy};e6VNwq*aj#c}*mE~VRFRlmyHuU5_uwFInzXQnX7grvp9_^pn=1X~ z_S6?1@d1s!jf<0mj02Hg_E{6c`jY7Kzue&|YuDEKurJ(ha+E823xUcEM1MoKp$m%f zg(_70Hd=gafJ>LDXR`ALX=k^k_U+1VS`26WS#rE^TAG4zOqxb1KiX{```UxRxvlh% z)T@NjoK2;9Pf}Ec9Z^EC8LsI<$wJc;wj5GjcF>(Fr;Fep_Hs@&YX!Tt*{TmYqsx)% zR(m_0_rKF`>+D^K>Rb6dHIVzNoa82CQbu7g3(Il!$A|6-Qa)zOy*ga?>YadC44Nq< zh%dyu$@^=B-`R-pzuO7oSz1o|B*VEQ-j?UF7z(-)q-@Q)7K%j0+VlmHQloOw0Xx&l z_JLiBP{Vh5qdokhpoR*Lw-`+eE`*RBak*yrC3^XZXd;KF5NZB;=(eL-j!S2>U@uI) z2`|^ps<%M)MVq+-5rUncI=g(S?qTQFP^QZjO;jgJ_ZX+$#nyGO^Td83**aCS%bx2L_B`YC zH$r{W(f-%nWm^8|i{(GEGuO&ILxBGI#5=!lOT1S=lhAQR0W=vN80$K2p7xD%G_e>4 z0Q>nG?YZ(R>C=UU@Y;8T8oRlnHc3W~@V4hUF+q!mb-=(*&WysG(j7&jKci?qsT}4N z-t!@uR6WIbP<3<6*w(KY(!v>*rAn0qmqB1-pwP{uyw1^|_tV0G&?;WBPA1zF*xj%0 z2Q;Cvw2|l}}X;C@biVA}gnhOy|58@viYnx(+^d z>X~F^Do$O<8AIP3Dk};%E>QoD28$b+S#Mk=5~9u8Tn=EQK(@qbV745gQ3nzY=G_Jzs#Tj`&G)i;*WzYXV zZGLChfffJ=oCrJx;C*lm0D@bBj{t;*1uKE*YdeEK1JM!PgMR>oVuOzY(P~XY9f0U9 z%|l5*w87j^TOfK#eyAouC>XpPh&HJeY6L_tY9Fc(MDLg#N&uoiLzTfdfoQRAq254r z%&6eM0A2-ce@T2hV2CPXLAv5EYeoLMW(0u08)^U$4yS|o zBs&ymyyamav<2wI?X)dr?j{@ZFUrm#xXNYXOB?jTMu|t07vD~*L;mxQ{t5aLRtiXMQb_&9~NO}iXRnw zY_PHc3G Date: Fri, 20 Aug 2021 20:41:57 +0800 Subject: [PATCH 9/9] feat: use svg2ttf-new@6.1.0-beta.3 --- package.json | 4 ++-- test/font-out/arrow-up.ttf | Bin 1648 -> 1648 bytes test/font-out/font1.ttf | Bin 2432 -> 2432 bytes test/font-out/font1.ttx | 16 +++++++--------- test/font-out/font2.eot | Bin 6264 -> 6264 bytes test/font-out/font2.ttf | Bin 6096 -> 6096 bytes test/font-out/font2.ttx | 16 +++++++--------- test/font-out/font2.woff | Bin 4224 -> 4228 bytes test/font-out/font2.woff2 | Bin 3704 -> 3648 bytes test/font-out/font3.eot | Bin 13580 -> 13580 bytes test/font-out/font3.ttf | Bin 13396 -> 13396 bytes test/font-out/font3.ttx | 16 +++++++--------- test/font-out/font3.woff | Bin 8380 -> 8380 bytes test/font-out/font3.woff2 | Bin 7620 -> 7628 bytes 14 files changed, 23 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 352f201..e4d79e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "font-carrier", - "version": "0.4.0-beta.6", + "version": "0.4.0-beta.8", "description": "字体搬运工，中文字体解决方案，iconfont", "main": "./lib/index.js", "scripts": { @@ -14,7 +14,7 @@ "dependencies": { "lodash": "^4.17.21", "opentype.js": "^1.1.0", - "svg2ttf-new": "^6.1.0-beta.1", + "svg2ttf-new": "^6.1.0-beta.3", "svg_pathify": "^0.0.8", "svgpath": "^2.3.1", "ttf2eot": "^2.0.0", diff --git a/test/font-out/arrow-up.ttf b/test/font-out/arrow-up.ttf index 26298b1bd3d30653e247ae7c8ad4f9c6788f4c90..1cd1c6991c065d5f8c16f841bbc180cb05a38588 100644 GIT binary patch delta 77 zcmeys^MPlAB4hPLC4Iq_FTEKU7#;wzSw==`BKy6GNy&^c6OSp$NXMlej_0@e%D~M6 Zlx1MJ>l(BIMo(s8yvWF~`5NOa768SG7wG^1 delta 77 zcmeys^MPlABIEUmO8SBf-LDxK7#;wzSw==`B74)sq+~{hiN};=WHu@`$Mf5KW#DE3 Z$}%wA`LOs0jGoNGc#$z?^EJjmWtq-4gJiN};=MA)YMjOVxc%D~M6 Zlx1MJ>l(BIMo(s8yvWF~`5NOYb^x(V7t#O# delta 77 zcmZn=ZV;ZJ$oO)ilD?p8w;KZk!vi2T%g9Jg - + @@ -15,12 +15,12 @@ - + - - + + @@ -36,7 +36,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -534,8 +534,6 @@ - - @@ -582,7 +580,7 @@ - + diff --git a/test/font-out/font2.eot b/test/font-out/font2.eot index d2db95292c6a2122f3b5865d8a1667f7a884c91a..1e0ea825732d1e6f61ee320bb487d1919a4b642e 100644 GIT binary patch delta 87 zcmexi@WWt&4NJ3Q(A9|!os7K`Pw5N3dvTS4f#CrVn`LCACUTsg%*B|@7&AGKQAy@% kkYjT^zs*+$ZWf?C1H)a{pbap3@*2jAj0~IWn0|=@0B&O)kN^Mx delta 87 zcmexi@WWt&4U6-iCD$f8bTYo2cuHT;wY!vof#CrVn`LCACUO){=3-1{WSE@Cs3dc3 j$sgx - + @@ -27,12 +27,12 @@ - + - - + + @@ -48,7 +48,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -1943,8 +1943,6 @@ - - @@ -1991,7 +1989,7 @@ - + diff --git a/test/font-out/font2.woff b/test/font-out/font2.woff index 3959d3e676b3a66f135fd7a3c763fcac07576eca..34da0ffe49106088c5990c238915f0272f4561bb 100644 GIT binary patch delta 261 zcmZorY*FMX_jhw+U}OLSftHCpu8h4CgG}oUfm}1WcQ3AHWTYlCFz{Ib`3gX+!f~FZ zH6ypA0w@*%d`T&r+Felbv=01r@284&M(C^ealu~6{9fjb8aST)XcEb8E7nC`&i zySan0mB)K^qki+_pSk;t3N{-w9EiQXfY;#H|NsB3*5sYBbI@aF7WNQf2(jnU0Gd=W pCpjS{A>rE3^@jxxzxwvyo|$>IG;;t8D+eP(UOr3w<`6y|CIE4!OX~mt delta 257 zcmZosY*6GW_jhw+U}OLSfrg1Zu8c1y2AS3y0J&yzuHB^>8L5d3416X)zAO-{a1^t& zX5^Ms0L4Opd?_IIa9#EPe@=cfNL>MtuLi=ZO^R1?6Dxpxz8OHiJP<1|Dl@9*CFZ6A z#da_-F#0nvFcpi$wF(#H7ncBS=K!iH1LFM;r6#j6777X+zH_jERpU&@q7F`m`7Jyv zH+L|$^0;SvPvbcL`F2g}gS143Mr-+L2VVaF|Nr%dU539IcFOShC>9!vkY);dm3q7JmaN%x3ox7r#O7hP+aRZ>f zFFP?K5zi{psJu>phAQsOeW%ClJV%f-;`$>1*3?`9z?dpPdT14}!V&7l4gl3yRj5q` zj^;L#rg?R7af<>TPY^A6i3%yv`b$TBZSzsG!Z0QFFF*Z_SJ=Ju3JFJZYJu_H3n6-G zQ}{1^hG|BWbU-W=u&@&f7}RWqp0bl_QcX_I&dV)pi*c2IU?%23`*ryc1VBY^Mj}SX zCS+jMP}<&v8#10#1@Kx54Yk#!C=cn#GFl2K5wH+FQ2IbvjvT}V;vHa__3^?t^c9pK zBA0kxDy1r>f-c6JHByAx3DSI?)Yk_#76CaR0TGgA3g2c+pCdVj2#czc+RNw!{P3Zl zbCK~$@kyP3X`UH3GG~_rm)TaHuj*ADQD5HHXZ5zv1+&I%Cfl81JZCT9$7lfkm#IOG z77J{#Mu80wl$Aw~VAtz)(Y)Cx#X>ZeUnI z=4=dGC<(@}hB8|W1yr8Lu!O2!7)q#)z_5Y(atsxJwDrLdVf8i)2|kA*vy1{@$ib}X zgcSgG#sL99Pmr$zi~T$;i^o9}kv73{1gfw&CW#0O{hj2}h=Cfdt>9>DA*m#X278TC ze$mlRV`X9Qzh0rW`_3lZJ-|f~BJ&B8%ayWlHIq6Ao`I15yF--K4i4`P4T)yzJ$Vao zZF|mtxLx^Xb3u5ue~lY|&wR<8InDyvtk?O^Y}IbwH9vxn#?#jBX8eCrrfYbt5l7Nr zI2vR8gPf#)U5zgOg@2$wV@Y@qK2jekPrEa}DEp7o-!S!wvz$>;N(5;cW_P7xb8tf{ zv9`oqbA5PK*e~Oavh+isFnge;4}+;{MNw{Zcq(HA{mUl8LwK+m#wsaJQ#$NasHxWc6|U#YI0WG&v&EYZ3J*4#^3~N5wea%FZIb21E&1fhq$iN;W*09J0>cxKDgOI;{4Q^0F5AjM525xLc9AMTsmJ|G6?GAWRq{Af++|Xn#Noe zQh=&6a5?lcQWZ$ll*3r7wjfp)0p@cwF9%|A9cobFP$_(_YFI8o_6w^#E}Mlo>FTLc zoYXlr$*`zpC%b`Ml@pTjz{$KRuKG4X#MM3{8sXuha#$Q2AQUOlHv}&SIIRYM#JU8t zAb4)nh9h{;K+Z}BU{`oUorGLe1%XHU8S)!air05b#?eX|5xcKQ*=$zIDlunUs1HDz zHf3@Yu~bl2LEzPsPnW7RzPmK_*DQ@=j~n%uiUF1Q8br((;f}BhMQq}V+6G5&=qYCl zDi&Kaf`Jjr!9jJfS(Xt(|FnAI{4bTU!wp1n#6ME=q8pcdw=xX?oNa0i*svJO_ark#P=UW^@2^~nlh*8f0~ZE-r10Upc!^y++ep=J&UwC z%f=4%TG0I6;PPI16nJ8`egP_OYfc8=LWZ?^>)QRnKvSS>1j^sPU$<4yer~}?{@zjr#WMt zcGXLq}(`#^c?pp9%R=?`;o28{+m-^ni89%YC=YjX28ytnl<7&1^GS4ykehK>H-pr`&1*Q*5j!UWA$L>G+_BDKXn9>dXtZjGGGqb z?s}P}A`^{<>BWy}j;3({Yc6UB=q3>Pk`CQ3#F}?-bMtd`+fYl_htx$9Y>%CqwUu~J zqF*a%!z+2PiLCI99$1ud;y0?jx8o4Y3Ky&!W|04Xk{D-`729VsU0_~2duu6MflG|c zi$V>byEo!JouB)ow1A<{NV ziPvm0dr{zXt7y!K>=HR;ooh($L>(k9V-j zmRqCQ_t+0hYx1L+;LN;qPRwG>HM+k##l_!t5_h$oeqNbaIdE#pg~D3#Jv@%kf7tjv z(l{0Krr`XNy^ljVS&HT1{t0W)zDVS5PaOIXaSY8~6YsC5;v1s%v_iXqA(J*Cq&}~I z^Jboc{Q0;{R5;$nOo^s_6>fboC38Z@Y{O<8CAPQFeVor?WlRqsabhjKp7Ko@=~>~Q zJI>V1vBo6N5HYs#cQw1*$W81)%UFEA!}}pK^DtPlV>VttFmewNtryDbl2@b6B4){N)%L$>Gh=p=^%*|P*?aV4g9HES&KE9KE1 zK9VtGCZ4EP0TxS&uSLy!|Lu{;}{u%P)7O%L^`V+!_<ugblI`>( zmW~K)PN-KbpG`(@)197C?L3d09F=7l*}?horgG+t9(gdipFEjXOI$~R8{S%M+=-vM zN?hZ;^q9|VX(bLm2GUXPJ9XBuC9aWPuVLQW1{va5eU{BO%Bvfu77GNWg}F(@4aMt4P9z$IdeM zPmmlZenA%42$o1imf(65H9^8MDTOmc@)xn}RtBd!f!l)Y!B%e!$Lh9PE9no-Q#rL& z6Rvq-hgP#oK8MbXiB&dw9xsP=6-p{If>ong>g$@5PF)4rikre2BKgbMjb*noIAziV zpdnG4)%lI#SOo@uybc(o|MG@>;9&XGR*iu3i|#@LN>o3eLwAsjB~(Fk+2~nL#LDbK zDS5pa!K$%@ocfwh#G&{eFgY zS65z5P9Wk(bDG$H#NPdfIt-RkZ4)MBt7pvoEHFEEB{-T>3ykkx2+>QM!hh*AOf#aS z17e|og`H5qpk^!dl$}(QYI1URUT#@ijH?7QF$dbO%ZDHUb|f$cNkLJW9*6EmOE2C? zc}^9;YbkVhv^AnQq$AB}DWE{WM)W}O17QO)kgSxv2&}h%K3@2SBtZcZWFpT?Rkaqj zFw9J=N{q3_FhN|w!}|Kb#u7jVh(L^FnZmc((&vbdA;zM1N$sWF1cK1e&$)z|6{Qt7 zYy9*hh9y(No7AQot?_L!UCsT8TlRl0SXEXlWVjUR?R=tnSYz_0{E4O7A~ z9HB{#AqUe93|nZ8$523942BbQHDlO8em91sG; zfowb2oZx9$GY+BzaT6>hRSq^T z!8_#k&fhsj`-FJPBcz%rnM@&#Rx)@q?J9(%jN)5UxrFRmF(kfM-vV6Q%KCl7w@8Ws zUhQ8dt?v8SFSV!8Qz~wJo%cCxXh+1Q`4K)Uk5iSU;{S?RUhXc5IFkG#l;<}-@CVx8 zNS@h$_+os}eijb!3h%@_;jte3+!+6&F8Y}v@@ZYXF80_Md8m&*GQ`J)(&f?x7l>DE zlKy=8lvz9w8fDSd0)_E~#uyD+rH{PgVCJeXY=qlSK5O-_AlLs`E?1ESm%f(mS3~gr z>KCF1O=kmbTaN-l+W_OJM%!@|19^~V=sP@r@=z!6mnu65k$IBIk7|_%DSa;{$`4~1 zUuD|kTD%b;KTee#mNC2#mf=|bekh!>{Ky+>NG1tY-!45i$_yf~QMy>mpDG9~J?lZ9 z=Oa_Wt<%{@VLWxWM>49zZ0=DD;~29g3bKe+WGR0aKyO$e_qz6z*7#3IB&G7P@`LVIi-9ZX=1}gmgxX zvXCny9kaxRa3Ze@KAwKr0}_NS@9CS z$Rn~wOtk`PS5Fl-aG6OG%JPk(@H!$_xsED0^q!G6J z3g`8UOIbPP?27aONYlo~R|!!BdlQ6XK9h&}-ZC?n+31M3uq$z$G60UA;XM!iJhduhqe z0J&;eFlCp5fy^5c8X`_{I1$YtQcyW3%zEvB(LneKVM{64J{s%4#(AGI@IQV_F{A)T zpJT2;Q3{gRhs62iSU<)Q?G7z`KFs+Zp9&9E;~GTp@XaRM8I58^wDCcIIem}$mP?xp z{eV^%K&%=E6+^KS$acaB%e=1UVVP>B{;@Gpw;F<7G}%xuAli+kH-!1gLRsIU)y=l9 zGB)X#H6g?R1EfK#aNHF`Biy_ z0KK@=PB7g?=r=XXekhuAfL&fh|4ROb+T`U3dSzW76y zO&(2n?aYHy97*%ge@RGr;MtfQCMkB!rMBLul~?P!3WBIp)cwta&>96!=afVY43N5R z4#{4NnEYJ_hnxHk@qBLH>l8bReC2GW(Kz}!CXA1p_BO{Is#j7zIk62%br*j5QEbUz zX*af?^3za%DAo7*_#CNAsq@K~+R6>6R4kbM0CNF7scgMxpPD<1oVOUt{e|P^gWTWz zT)lU8F#I8%IfT35tYn*sfI*U{QZvfLtGh8q>tnHL;^J>yO*nvS5gR>m>|V(Dw6`p)&F4sD(PQDF{hIk%gK3#>1O=i zCJGuw`l=-y{&Ew8Dmwe!84bgOUW{{H#$yNO35?Hc%3%B!CY)!nR|j9VvGycA>u8>8 zlmFlVhEH*KAzGq75k!z3;U-76XEN!3lrs-->OMnna*R`-;wR<3ODNhA-{!*nV{ACY zH;EK~96=Y)_eJVnY~rsn?E=5OV^1OZk^O&&JePbmOP=Df4CQ1pK5W6|f9jNFfn-;a zP|S;EJpC-5HH1A!rCjStjyg|){}K%GOwc?(Y1-(zDKeUFZl&@jzkb7l&(Kdn9mttM zo>Fq~Ny1iec@t$xkvcv;$YwRq4{-cJ5Vnqgj4xo82g_@@xR|Za^3GS6x%b;4N}jQh z>~FxqmCI{yP3(}|#rG^J*)xxdGwfJC7mv3%_8^i=jo6+^Dcg$uo8`O|hif7+=TRNg z@x%^VzM&wWsbDE4b8t68^&6c5ESHl%A5W1NO~7R47GT+ocM`fvF6OeNcn@wO2l{w_ z=K`M~qI--;5C20HkyN$!%G?d5EHyzD)1iZ$gaTMEf za0&i-xcd_^pXob~a4C_UO62xbY`}gvj30mFaR>K9Pq5aR-_^YKCjTB{>rCE#jRWI( z{Sv1`Il30bWD`1zlC8D`HS+pVK9aJ3a1nlo^Ghu@W()^S?^r8d>K@1Va>F|@IY%Y- zxA3dg##O|$=cHe(ZMZN!SKFbWP_mTV15&m2=@pweEHUTw_0I`;UG z@3!J8k&{xj6iuw&QT(5y!yKINZnB8#{K=v(<5fFQjFY_ZdbR9h;e)wTKUwj zeT6x$x@RwsJ^fR`YR{68f?}7jO6UC1>qdu~%ev$nmY`42y%?8g;f<0xdB)-~L)@6D zYi8-dm{XO>vP!1f;x!h$39!e>htheQC0hg5o!2Z8H{q%&_G%$zxqNG`LXxv`({S1F z2gM)!@v8RKzyB`jDhd7jYwg#6f9&_^O`X!{^m2^Hq(J?IPmh!yL7Q8&;bz&*^+gq} zzbJ@r+-kMP$cn^Ruv%IpD6Hfmi^crpD;mW3 zlD`#6K8@B9$4M@Ob-#DAlJ|H<)XF=Z5sPVZbuwnz_j(}aC7IrYynABV|A&ou_Q(;J z$&RCbQz(B^6ukT65o)x5%F(h6P$2oRRsUP4hpfnI#Te)&fpZBKsVxx4a)Jb$xPl}&@C*`h;(@c&{Szd^onMd*PJ%76!zg%v-9$;4V9xJ1HCjw9 znxr7 DvlS5g diff --git a/test/font-out/font3.eot b/test/font-out/font3.eot index 3c42bb3158f66204ffd35cb05e2db1d9dca71443..e85751aad13f578e0dc0262897b8a5a48f3f0b9a 100644 GIT binary patch delta 88 zcmeCl>dBg5!xDe=M%6@znT&B0Z|MoiPJAiBz`*bTh|MxGQWM$NO_pLzW=x)3$EYMz lb>nD!JipCX25#mTKm`nUU4u5j=*fE+FETQ0?qjMm0sv^=9pnH2 delta 88 zcmeCl>dBg5!y@0HT{F>PCgZ`0xAcT$UUctZU|@Iv#AX>8sfp~~lcgAw85t(mF)GQ_ lXgA2m^V@u7;AVaSRKRfO!x9h$rYG-VyvUfmxsR#N2mlKU9JBxc diff --git a/test/font-out/font3.ttf b/test/font-out/font3.ttf index 6ca7f8ac13ef4e587672107b30877c8667d1e2b3..fac68c971d4381e4b0067232208678b317fd78fb 100644 GIT binary patch delta 78 zcmcbTaV2AdB4gY{B|Rb8i7zD>7#JP^u~|k&Y9jl(iAl+f$rFz$$y8l`$RE#d^Ob>{ a`2|p#;jU}Y1{gh=h4CUI!{%#@bw&UOWf`3S delta 78 zcmcbTaV2AdBICh{N_s*vFS>UyFfcp-VzZ2l)I@ggiAl+f3=@wj$<%1gJ|E9-^Ob>{ b`2|p#;m(I8APP)RW?{U@n7sKKW1SHID>fRO diff --git a/test/font-out/font3.ttx b/test/font-out/font3.ttx index d0ea079..24015e5 100644 --- a/test/font-out/font3.ttx +++ b/test/font-out/font3.ttx @@ -1,5 +1,5 @@ - + @@ -30,12 +30,12 @@ - + - - + + @@ -51,7 +51,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -5040,8 +5040,6 @@ - - @@ -5088,7 +5086,7 @@ - + diff --git a/test/font-out/font3.woff b/test/font-out/font3.woff index 7b53a44eaa174d33cfa30617c929a8e534f33f1f..8f481994a1597c0216357c1d6c17461d2e2264cf 100644 GIT binary patch delta 141 zcmV;80CNAlLA*hbQ2}0&QZ*Ye0000s9g*o6XlP|&001690000T0000a2d04@2!JFb11b;&0A6bYz5oETUmjfoX*V*M delta 141 zcmdnvxW{oqAmhP_L8j7%3=9lrGB3J!WMrf!GBC)w0Qu5DtitX+anV)5Ni+KmYM8l< z7ilChG295|a@*X&I8nw;YVFPEkALRwGb%9N&(LLX=jVnNM#um2PyK1S$#>#GLIP7K t6GMU;PY}?ciaE&%DG3RFf6lY2#2Xkic)GELC~z?Z|6-2b94{Bk1OTLyGBp4I diff --git a/test/font-out/font3.woff2 b/test/font-out/font3.woff2 index 128d95729ac8c1833b5b9e8d53a9567b46caec01..d3ce607e95f28146c69d2bc0034e252cad1df9ab 100644 GIT binary patch literal 7628 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