From c61c4620b9d02be690da7d87f304466cddc882d5 Mon Sep 17 00:00:00 2001 From: Mark Hansen Date: Sat, 16 May 2020 14:38:46 +1000 Subject: [PATCH] Replace usages of sdlshapes.jpg with sdlshapes.png There were a lot of compression artifacts in the .jpg, which the .png doesn't have. It's rendering black lines and text on a white background, JPEG's compression wasn't really made for this. As a bonus, this cuts a dep on the GMT library. --- doc/info/Makefile.am | 2 +- doc/info/sdlshapes.jpg | Bin 38961 -> 0 bytes doc/info/shapes.html | 2 +- doc/infosrc/Makefile | 13 ++----------- doc/infosrc/shapes.3 | 2 +- 5 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 doc/info/sdlshapes.jpg diff --git a/doc/info/Makefile.am b/doc/info/Makefile.am index b1733fff4..7e98680e5 100644 --- a/doc/info/Makefile.am +++ b/doc/info/Makefile.am @@ -26,7 +26,7 @@ html_DATA = attrs.html colors.html command.html \ invtriangle.gif mrecord.gif nohead.gif none.gif plain.gif note.gif octagon.gif \ oval.gif parallelogram.gif pentagon.gif plaintext.gif point.gif polygon.gif \ record.gif record2.gif rect.gif rectangle.gif round.gif septagon.gif tab.gif \ - trapezium.gif triangle.gif tripleoctagon.gif sdlshapes.jpg sdlshapes.png \ + trapezium.gif triangle.gif tripleoctagon.gif sdlshapes.png \ square.gif html2.gv html3.gv html4.gv plugins.png \ c_bold.png c_dashed.png c_dotted.png c_filled.png c_rounded.png c_solid.png c_striped.png \ e_bold.png e_dashed.png e_dotted.png e_solid.png \ diff --git a/doc/info/sdlshapes.jpg b/doc/info/sdlshapes.jpg deleted file mode 100644 index b893d03d94e19eb7cc8d6325bf21a25be349996c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38961 zcmb@u1zeQd+BW_S-HmjQf;31sA}!sGbVxTSDcv9-NOyNP(%l`>B`u*+|KaTIdAFYP zeec=l|Bb)LHEUQi^V}=%>$SCC^)Dn$jB%JSlH+|B!pz7B!tAoa!PtCVqzN3r}WG$Y;0^~)ZF}BtbB~m z*jOJv1cZo)h=PoQkBW-VN8&_!UREMg6_KjGRS?xg8uOU z{(OL-pkZL);1Lj!kRc6fFaRhJG&B?pG%PF(45am2$ln1NOjs-m7GXGSg;(&Db~vm) z(HRI-&nr4`6~|A&&kXE+5s@C@;S&%(enL(2l$MR1gOiJ!N92X5n7D+bl#;TFs+zin zrlFCsiK&^ng@dD$vx}>nyWczifWV;OkeJx_aq$Ts5|c8svU76t@(T(ptEy{i>*^aC zKXrC>_w@Gl4@^u>P0!5E%`dF2Z)|RD@9ggFpPqd^zqq{m_Wj3$T_6DZ53?Zu|6$l~ zc40#7f`Wm8hJk;u3k2l?xu7v&U@2JOu!I%hU)f<(vicz4Jde((=s=`;rg(yDU_XxZ z2+X$j`1HZFe^~aP8Rq+6S@uuE{>QEb00kNZ89ZoAKoGe4L6hl?^vhLvbv3hK{O)Qt zCa5G`1YC(BAxa!$x8O~$pz>;p!I~+rGDLf6F;kM>LxQ%f$$TfDSL>`u8Bh=vb#TB< zDXx1~+h?G7G)HX_krx8QhZre>$H5gTeftD*`TS4MA? zeY+bJ??>^;BUVFfZpd{p?tu(L@q3`1<{tQzdun>)?R9uGc@IcYl{5l7ZEH{`fw#zn zf_EVCI~=c1uxsc)95_e91D$wMnqr(|;YnFNc}QMUD?K;R4F#j{ z(KWc8*r_zB{9Nukx@*E+o54LWVOC`SYoF3_FnGL7Ea`Hwkm>Gc)tZfK60~!4jg+k%RH;04{JD02~ET07qUHPDZ6_%F5>IZIYO6hL&>= z$PdLgJB*pCzAqhF`Ju_fr7XYHZ97SC92_9WaQ5z1IXVIHi8xh=@$g|wcKqq+lb-t6 zfglXooer)WA3=XWJu`#`_<5B+7ew84pABK(tC6AXxm1qFQLFbcqHUE*h7yctQ{(Arc@15YT`uII?f+Tp7^=lXFpyGf=e;KW( zG2h5KqF$U0uC+Yk8kc@nldVrfBFR-6pke4s9j~UoAxb~e3liFwEJnzT?fUw7c!15F zmD!A8Nq-r0LY!>rsL=g_-ybm8TR}RxEX(gG6kl8B8I`T`Vx7hs$2=mc4)1yH<>Ucr z!0!rTrfi_Wg5~FY(Sru>cYbC7h zr;NsRiYu?BidQoLxDjSMzp?W@A*}JAlUhYA%fiO956r+J6_wvD46wjfc-snhaQ|b0 zKqkIQ+3{iZ;8PnW@L9>a&V;~(bEGcqFo2_?cSxk$5!eDz<=h*FoH73`CvxU~kx^ILS;>IO*+`f@Ew z=KhWjXnwk}FYmvF-UF0x?tzOL!5twIonJ;wK?r|^yrHc|%Z)zWGDmTkzgjV9%MrTR z=tKhiCOd4W%&^xrQiJfbFP{-=R{=@w2h@5&ig<1YzhI=a<449Fd*vJO?7I_-odSHj zhOq=a7w`l>rj*Pt)v$`I<`)MkpQ^Y7tLO6zfgRIPP{9G;{7a*R;a`?_kR5AJM-t-c zp~g!Z1>KfTJqjO4$z5j_6Mv1JG@bN`b7_pFCb1l4jM9eOdGP6aR^&@CkIu@d2XcXG zz!oKqXNJ6qH}|2qjv3Rk6;oK6=`;gixq*dFuD=`JoO9ULXAq+yjftd3W!{wVZyfI{x)7pukM8K98=pi)*~Q zSW&IGU#stbHU-J4a8gM(ToXt4+RFzeiTI*auklJ0ohK%Zxa| zzg%b;*H-zuh8NVqaK~jmu1ZF6^9eAJL5KGj9c*@k?5MEPxO!`I9IH)!eYZ#-PH^kQi`{!*sEFbWeu3{ zdC?1Z^44A^$ksWD5SznP6iDPouzkkhcizMhqy=OYT+G!B9hi>v;<)%x?KNGSVirHu zVpt@oj_K?%p1EluTPp`zLJio3_b#T!O^N3YkX`+Vn;v?BF*X$a+AiXoke6mq2`8MwgKoNO+f@20BK^P%%NYdTPy0^L+o)gry=gUt2YPqVwfKn!sBBVrn3+YOmrn zb-*Wcc4^-USKp(Ko~h2~Wjy&kE9sP9XCobS`fBR16T2`GBQ-csd+Rjy%PT=b)!wjg z_xUP1-6MFe$KbpIO;asBcJorUIj*XnM|@kZCib?QCFos~|01@pV~qr5Mp(JH#Y%0eLjK6{>f^-)>@*u z!8rmxuT+*L)j?~aHK6WtH@?lt`}-#iMN0*Gr4um{d&DnM4jsVPiL~6^M}%*99}RS? zw|!7unKlR$U};cGCVR8(&8_6%@T4X~g#V&5o9AM=b>qoIA49G&Y8Z3`Fq-3Xp}u$d zvPmYTfz&GM|iOe)twj<#8sMg^*WbQT{bW$J7aMTyld*b2Qn4C zId(Hc02;`(?IeD!7s60|sP3j|NZV3)55O*Ug0oV)Z4uX7g7S?M$A;qrRt^zdNm^%tVz?qT^Ngr(ut8{T$n zueYVG7VOlb*l}ZdX}Kf(DqCw=GraIk0nzAk1ovosi^D`?Kij-?8nseWUF0`|V2XvT zF=NDA3zbPLDdr^n9T)jZNqP&-mtGzK^mlo9ilY6bxcH1R4UvME1vaE9eD)ar?}wjd z`^EJj2rq^uE4%mP6zvgqPdB@K?Ki5^)S{p8A0Q}wY2Td;2n*#+*?gHK5va=$FEpQ6 z6k<5sipykp`i?_|M9Ulqi%cMKEn4pxTVOBJY}dE@+PxJXenCP59pdr*xJK)Xn~gEE z=C=rZO2j7|8MWb;F+AZ1y~$tCaaT|^*QN!sByr`X(n zUroY_0n3&8ZAPmD1ydAMxnhQ`7@&~6!#+mB)0dS|RY!Z+;uCB;yzja>6{ER0BtHlv zt8^4E?y-#0ai6^bt>`{^~Nb5h{K{k%=&t$spT#$qhm{3 zJ)Vjcd6I_O)7yhNSP#~BBuC@1yC_MhtclJxXUK4lc5X21pyx-=&)=F{xBGxTZ?b?R zgJRxHb4Qja(Yq!@AixXpKGC)BfiiBvIF+|jN7u?z`hf}oBRT>3%f2J&JOAXuuzYY;!Q2tBM)~yOyS(yt&(Kn@y_Np6o+d>-dTWJUba@(R->JB@ zarQ*YhI%nl%9`h@iULaf_4;qiCD?a^03i?u!6sH zS}?7GL+g!$0>A_EP`}Q2gZ+i-d%%KFHU>*ZRupAqgJq$|Yb!go<+4nbsvO1}i8Za< zwFlqPD^)sc+d{STR@>Y!IQR|^Y)IBSdL@mPnQzYXl2EiD0P9SWihw#*De+0vg){%? z?gRG3_58yV+!CO?2l~DBcsrt-ZU zm{q8XnYdh_`)Dpk`ZS8Qe8dgjPrdCA;Pmzb`*4AlNa2I*)4A%DU+q#u8Uak%IIfN?ZXI@ot2D`3bBm}@&v zqFpM~G>ObLE9WEBO|vvcuDz6Yjb}G$Cm=_whdwK+{^?)*tx}aV`W~Rd3-bEXEcoLw zoqfdxI+Cl0YLjJ)xX5Jbkvd?UI!_Wr0w*yHyjIZu>F@s2%%2FT^(V*#9NE-&2SgOl`A`eRBg5%Nt_7|cG%E(;GSsMsO5^GhfF{$}L7eLNnWb9aG? zr_tG5m96?f19VE{oD}?OyO9fYdNINc>Kd1^q`}EdObivAxE5E3A~y`Nt>vGS=oi5M zI|1nu)Ins$zCDPV9?atJ|6k6}&NJuoOKs8ci@bO54UiOtd4dz4F)xEUkHD#w?{ zDnqe<@YYM{Vd@sTq@taSWI)#Cap3u2Xrio9lBKeX;be@MjL2_x{;!h(IwP~;C#L^r zcmIj$|1vc#|3DA#{y-0^f3O5Ur`NY;%r%L}8m~@PVu?e?V@8<8H$s4wpJ@1Rl~py% zQaaR*X8cS($PXfc089i(0|~a z+uRUKLRRtA+om3}bEe(T-?(BSyIekWW@f|ZI@iuS|68Ja03OThjGfH-6hd$O;JibF zEPzc5U^l_(xfp$ULPnqnJNi^lk>+>gWJ(vfm2z5OrhSrf6V&VrOl(=n5sdZp&mp+ac>i;FH{ z`bMPG{Kt)^Q){Rp7!Ua_+{rG#nvU)&66#T>3y>-<`wl?M4B0pz#d6J3iBQ4|bj;87 z8FE-0F6sjZx8Nf?OxYuVF@#~JkAJlta8y>~{iP4HeluN&1Q&PY_Sa6lb_o;Q)f;a+ zv7?5pX?b{2QTti zLeDA~kJMKLQx-=Z{gra{iiDL0IybYD@0o{PzL|oyj^y@B<3waDXbNK|Vl*C*;>wqJ zXP$RFZ+zVtxBYh_XfjOcgOpkN@K+nJj)e%7Rlx#u6Gx(T^GVwdb_l8L5ev_qt&t@0 zSAA`TH(hcj*_)(8X*B5?%8Zgcf;NVlb~zv#t7jg_q7iHKGP}A=Tv-ZdP{B z2A>S*;33Ki7u`Blrc3*3$D4o(W7ZGR9&)Gzei%oKdW6K zJd=Zf-+3pshR>5`(nQ)2u|B#~Q#pdoC)7G9&WTSSLzwu7JlrsDr1AROXYxraL>gc> zYsw_`$wBhFy=kygTI0YF2p(ryu&cJQWI04bls^6{{`n=ZFNg0tZ!W&8^Ya^kBR_v9 zq2Fg~ZnQ#jp+&}ifh>gY5Knrl2ENIyMjG4@F+*pyCKpfg373Fs8y{vT1o&cBJbHL5 zh{+xO4omLRIJvBU`-rZJKVnramD4WyRAu8-H{ogMs|GrTsd%${!1N74RJqaKEX~T2 zM+mT(SvY5bVIj{~ZbJk%OEFR`F3p3%RIniIE={Co9-($KMKh3iWsZDEK(6o9YXM=l z4CcSY+gx5=Yfs{rsZRBryf)i3dS2n7U#nveO+cc!KE;+;1i6#ddmAC@v2VA&Yz$UL67-M4_H8m* z=Y>H5mV{m5YzxjQe0I`UHq9+>+?*9QxVcvwi2Ve z8SHq-VF&t40^M@CFPgG*T{%rctrhGzwV=e@n+&^8iyMu8~T$^{0x$bnR@ntSkGluJ7Yq%>A6neW~M;)37q-5ppvUzw472Ji0NaB4H`qXRq7FX-gU>H2r=7KR zIxcbJtQoVaT^=1&1X9P5uQF5lqUwIstga1Fb)XNm!5ZeJG#z}72;*~r*xrAcj!H}S zxLL&Dign@BES7|iG#|&&zR&y0TA>aYv=-XZ#C4j|wkmSJL%af~Jml#n8tfsx_t14= z*iBsRy=TBKP2nTRT*$F9wtKCU)f_g6N#|E>7=uogkI(08YoR0NR6EI-=az~a@x+i; zyd@U;7`9`CX9LcgK|#IpTg;~k{z~?tk$8i{0j(-*ysLWr16P~`$jU#=X$bq6s5!I3 zThRQ`)V4z4u&jOaP531B!<4MdK7Eu%jHmQHVq7z5K}@A@VS~1F3PW7VGp+bZMxjOg zQyW?m0b~E=iU31G$zFj7K}}#Hv+_oyKr(xGVp)`kH{b<6aJbarFq&)8%(GRKbI@qj z-M!qs^y*2hQ^oC+{WBPPmFI^<>ZawyKgQs;a6hnrAsL5bO;3H43N@a#lIbm}`@I7a zHX|uS;8V)eA$kQsmU@Zjtaaw2q475j#y_le+g3=cA-j-Td28)7+ZW4gZkXCx7WxV< z{H0=6^i4~S4W*dLu3?l}qStD2mH~=cTl%Y}T%)p6koPz&lm)NVP1aCZ;IGVQKKs;e z3>|~{V>JSO9igClS!GeTX*>r{aS(=OnIKnL9!o5W_NFye%OO&(1h9HQ4=R?|$X2og z(!71|qWZWAIv`k^DoXgF7}m)2=5kwYE1%YnkoMP65l=A8mtY~eF-)r(jfmhTkGx9w z7T*|7r531K=dA3?_{xTHeL=1b`3KoH!fF_%(&srXi+Dwil^5Uu;l7cFPbKz6gA`(x zQK`t+sHzB?^(xcKZjg=L5A$;m_ZfAsIB}Ht_27-P5J@*~TDHZ>{>;%pBUw z)tZ;cO$RZiFWvKhoR-WtIuLgDAnoGR>K@42C>iKHb-4+x^qTFiyNisd`=8*#FYZ*K zjs>&k%ktLkxJ)-+^1;_Ht+|fF2itd&`c9wJUuwQCGdSMvbg_Ynp??)8-4~*~bDOZw zV>b+O1XM}=^OtokAy})>VVuS`-H>9Wh6h||lNg#nFWyuD$QFfHggUd7;9zL~#lWT`OirL^hq>}D!}n|$K1QQhhMz?*F$zI9u|_0P&Lm_n>|wAu@4t-U_@3v`D4Ev8 z>mt}^%M5F}C%EVNWY&g6oyd){A}qFNI@}nHHg7H=&?KH-vj0y!msemOpHx#&*A!{L zW6u*)M&xY#YM}fAS6Z~CQ9Ahit&|AEVPT-gMiPvNQfM&~y-QzJW!}KXZ)98{jl#R*3lK+%026w&T z!+;vs+WU7q@Vs&_PiMx3h!67u^QvbUY*ZyaATpXH8~HUF_*UKZP1FCZ(QzCS}rm{2vxjQj)bv1qM+mH@i#R! zQNYy8yxXw^hIu&{tXODV9f!wt)NM;gCvkGPooKxF(If_*P_%45TVLXiHM&7#P^;v#>vkB(2qA_U9-k)Pes;Gi3$U>|JTzo&?_n@`D;Xh2 zN7c6|P9mNdcI`2%A_^F2KxeYAHfk7Mt4t*zUb=!4fDOMIS3bplqWz@Ol(*K!(HhOE z2BX+r!wnoa8ShPM^V89&R4VRzLlu&aEJX=ZD{!Y+WvIl7=_`8R_JHr`N3Q&Xu)XXi zGoOx?b$ImSF+=%ZtTe}8F|cZza4H4R2)u5q#|Ow{8zD69WasRu?!q#-wmV~*x|v2= zKRde7kn6hBRv-|6qr~aYa1nkg{XGzce%rF(wfDlQPW{*FA8|l?_mz-Za}PG>GMDVn zSPS7{ZYxBQpSvSmP@t6U?c%-%5EVlr$t`%AW~mE3KlT{28gv#sGwbJ_>qlmKq2zfY z!r;VhTOQlH&xF)IbztKtbIM+-OY|@#b?KQOO@re`LmyJMmso1!T&c+XB7?oC{#obo zlnY&x+>{y-<1E3#+^Q73!nk+e5e{_rpW7vLMDvMu0?X2E(i**{RV<&vBQxEtCz7g) z$*}#;iELJuN686w#5)O7^A`>#2F-Dja??6;4JyhMweQxL)dPiF*( z5J&0S=n@T9#mx!~;lX&!Qd?Q@iF$14Fle$^df4G8Ju;}IWY4B()wZ>Z9%1(UPBH#_GY^ay`0VeDO+VM8cU7P}=; zP-VNZ4eNZ`yZmL81QOr%%id)*M|UEId-mE&zs?(v*E<|3e92{4ar~U93|(utjD5ID zIM-b8RfD~{5o2eI>ph^qNt(ECHwu~14!WcPGYkA8O4W&_Z1dZ!^FdjRPyz%4umlv@ z^j<%v-H#60rHMWwyB;ZO1?jSzml%hGXvL&)+e_SOpg;1!?wRr)o-Ig}U-uq={pz?k zY-E0U^>hPOPsaZ+tW%`iXFfS9o4v0O|9j&OvGaCQ<4cqs;xTwC&UdAmRV|YTPwJ$3 zL$zEnbCz@kX<&)b5XjN&S&lV1W-50ZTg$vSjO(UMBlIbPHy!Pe#DrCpdXK)Qy-~fu z0r?m1=uK=_RB0GSRogUfuSg^y?JrB6xn{=-$L#1%+c1&{4CkAVt5;Hy43-Z_j_`i3 zhX@m{Pg@`+8+Ohrb>uK?miIFzUiEl;MuG7#Uz|Ig zLVhLDk9tWSA55;p->&)L=ySn}!-Xt$XjE$y$ZGcRk1yxxm#AmohmA=dZXzBaUZb6WMM5JBN(y!xvD zR@}@(5Wk{bo+ri(`27{j$f>fnnw15&!&I$jG*+B)J*1Z^+!}g<&g@*T(oFdM88h-p zRML|y-N2O)CTv|V@9k`>U0;ll=YdEm`qU+EOOCmmB{-q3lA$M$3ra)iQ|4tjyb)O< zU#c01Eu4IQnE!U8_(#r|0^a~LRH<{1UnQd~Z;T{g()6Fa=&#-i9eVfYGsgaVK=0A# z9|Al}|CR+o(ZewFT2#pN4yKnHh8^e|AGD#yH#R=p=OGOY8EQD0DZH$^#MIGjsTn?S z38v5R%Rncp#3ja%!a@^!7DjB+xIhC9)iZt0FRszjuuN&8X34|Q%tY~0gxHlr`5qYM z+xd+9_(pYws`{E}fiEf$m2#<*9^TtlA;cG-1A!`9%TXSleuZqtK+RG|26l4KWJqTS zx!E47n+(76_Q)Y3afe;i3u)hB(1Yz$K`8u$zwJdR`RN ztRqlfh8eKlL#Kfe+kj$21;w>V#uhQx`(~#50f_zU1&0>YgX-1AVb2rK$+Fy&l^?z? z3OOj+*JIC0_Pb_Eju>nhE}Cc-G_0n29iULE$4F(zm*0DL&Tf-+YsS08UtLBoYrc#X zCSQukBM$*mf6`11ZTP~sSyr#IY2!T>ebEH{6*=sC7iqKhKh+&sr&rd*Z|@rgAiQsm zkyunwb^<4Lk7p$)Pi4;@WwWZdA=7v+P5LtB_35@o*aSkLMRItulEWo33DN7(NKocLlhBslQ=F8m(w3l{uN z*hotQo$@QeqwoujRT>fk{6+;%`!R;DyHPiWnQ78Y+OU3|zXvP_{Xdci8@{qeu}YQY zT?;^yJV&B|ChC+f6VG)MAlFiIBEpqq*k*MLo@<~<<23Z~n+;oiJ^phY{=E`+z}0uO z%jHM4C0ttWvN=rfX<*t)=F!N%hP2V1hB73uUgnf+U5HqVw70Ox`TsBAZ7IT z?ake-GbHY_+47FPJAVJ|9%v1J_8TFogNpLT)~C{?*q`q|6B7|fh#ag74?LxJEU@M4g6$@bB?Yk((IT>rDW32IV$d_4$2}eQR zhmo=szut;$G1&7&K56M`C@a1rnb^Wy7Ax4+q_ToT=!d47iv2bQZxg*w(|3V83en`j zLL^5&aI0-@KoHFxS=SxnNl9%8*ss(5rQ+MtX_v>z7Ph8gm{GjG;u}IF!?^EOaLPkb zb0r;e2C@)l9B_p%!nU7%E6AyyW}+|4nsllOebZ}IvME&TkZfuW&r4QDK)ykK0YKaT z+&2DpNyn=-^-+2u&)=Z`3~>D?4HY@P-;gW&pNzx=67x9+6}PVXM7`~P0K1HSPIklzJp4DgT21sg ziGk1B=jV2AOOfgtW7{cfA%elbsQ3QP^S+C0$e{IUxN3F&Xe}yTw$OZ%;%0Yw)@s#V zDKUpB?i2GYr0xHgor<&nhzXu(aHFw@GsOkd5n8npFvY9!}YM zHqgYl%7INu4c&vX46B2Dp!`;tB!~~g4X*fqP9v4vw%WSJfCV*5^SC5-1liRrYJ6Nj zw}Smggy)~sv+JwepcW;qzn^^`7>%WM+PvxL@jQXY-wsG~PYTFdBM~lpv&VS&B)aE- zjwKxN(>;KOCMGCg23=O!QaANFqq+LMv<+)ucsn`s#dcn)SNrEPDzncQ`)LCoJ*^q} z6zSn|?5wO8JO*ni{ZNQe=gCt+KOO=LwwnBRb@?yT%%`YXd$SgG-Iz1U<8{t9H>`zh zL!%e@3_j+63sk8%*^VqRZ?(FqQ&k+a18Mt;Hc1dOsdN_R!U^1=bETu*g>05xxE2>1 zOj)s4*qPf}MJFa|P^rbj>9oIT@&oO%M8Tobe%4;FxO8_K$&Xpo)sdibgiZMQ8cX$!|JN7Umz=Ft)hyTJr9 z0a8`q`ZVoR_9Ro;g~i04L&}x!7JGUWL8G>4?wgL9!Eug*wZ4vZAD(YLi83~{%0m&iMP~zOBH5O)vf zuZKKHOQF?IdJ^(^TCX3CvrUkR%1hpz8^uDunQ|x$zdi z_0)U-mJRBj3=o`&00~kL%H7gLcyrR`=H+SaFF4Mqk$<;GZ_Yyr<5pFg_W}Iod{iNx zSR1EW0Jt`$uj`sl(QD7C)RH;|zCaOa>QiN2vC?b4jMU8iqpvbpb z;onrN54*prY#U<+YD?8#UzG&)Q2dH%{1swNW&ZL)xKg5LWFAAy_PoMuN-q( ziX(H>fD;!kY-^sWlYQ;UaHFcfHPitWOPyFhZofb^yOxaV{83&2m!nZC6C1*&!Mf1M zas(16!h5GwRC_E@OSh7?-7iDf7ya7An`eMFzI2u@NA`6pxRD$otfWR73s4l|8hyFC z!9K+By>0qjj!#!(5cm9K*oN)1T^DRcJuz2DpFm(8WMrjyX3=k}*oP0RZ7t9lYPRC8 z6P9p4WTig`u0Ozfcl7UzS?~)gBw5M`iU%raJ^umbI^z676 z^#v2TpqfveQ78HLfXg8K_xNkz3X-7T!_(`jf2=cu}lQIT|bUNZ9Ot3_igX1J;Yyz$P_-b1=nPye{oUce6n&Rh%DlTRCtJN z|Khtbe5#cAS@I?R&c~$X+u^u`P$y)q?*>hNQod#%xb*Xk0x4w0SkY}Xfpc2A;915C z656wG!Ub}V>+9;0tKx=GOp)AxH^oi$e5iT&g?ALKFLs(d$vnA_RA>_jVF8$ zM7B8GeS!q7MMbq#LeuYo-j#-X;1xDR!IxQ5_)q$`y|toYg6Z*e^@p$mie(RjwzI{% zB=J3Rl1Ap$uYQ`B4^tyq%{eCcL8R@O9??aLz~`q*7uRG?&!=3mOH-w-4b7NgHe3tF z=QXAW&24%!gO*tB&Ncz3pVFwIq~Nsm^iO30=!l zcUsa&1I1zkB#%&py%a}GIWBx}0zyF{;?!S)pbPEw5g}-Cx zB)^(LvPR~~(=9p1JqO$&y{{uGYqNV%wjN=m7dh%`KdiP=vlm*!aC4(TE+&UHj6$o- zf}P~V&|?wkLdww2<>xk#bd$)tHi#B%!nIIK5Nj{N0ok1Tn&gPpim^A2rdJ#KDzI_W zV~U6F>1?x@J*ZRtPE=U?WC%`LRWyiM0E{gFSv0w`H)wWj=B(VbcBq|U3!$G zUa~3zj$vt6fd(h#<-7VxP4sCM&Als0iK6&Sw^7;CU?R{?m>yr(O3@JUR&2S1txsDL zHTfOE6Mg$KMlOK#xx)zJIq-<@8O&Y|`|^?rZ_!@rk$PW;Oz)=1Q9hCP~I z-HCNM*J3cd|19IDd``T&K5J;xfa=wUr-0ZeBW>?Nht z7UgxjS@#-l;#w2n6SI~dwEH4l;M&+;-~iQ%)})!?ol_8fp=7;#$m^J194l}PEv4_! zkS#zWnT{fd3ER{-e%|u&=6b5$F0C=j^U7t?y+?5Md0i2_h}zU~-t4y6i$uPUICj3} z&?$G_BSg1jDQK4NzX)9@ADtkEeZs$)aA-4Io+R;%BQ&33X=-+M-W`!NsGy;jQ*?z$ zjMI@=&HuW{#oK5sL@R>2g6%zL`XteLp1w*;hdwV-mWRRCSXh#%l(9mIC{)oH!vgJt z_`^-U1qy{~j~yRSGB3)xSj@DUGY8VVbL?XrZ~LGA+Oa?+Hs+sSfnDi!mEy237N3T=C3EtGZ#Hd{O5 zhxDO({O|SK#R@{WPbyY|;%8asGflVZl!2XD`?SfK7!qzwKkb)S5qUJT2=DT)o0JVo z6@&=fOT(B-5*fl0YOe@6uVd<}+E)w!0Lwai53S@og7%!t58t2OoBO`zz%WH01Y7ov*piJ!C&r;4U(Yt2e+XI;WqAp z;L-pHZ}*@j^twe_V7dc(?}4s~G9Nz52!c0ES#U~GqG4|EXQjR&01qT*=C8Qq?>q;E zdO*Gv)j};s=d-JqbVI{?->))e5r;k8V51XQh@bG2hVX*W5O+@=k`w=-vHgRBXoFA? z_W<@o_SUamzY7TuJm_`d?}4$BOh~39ir0;d#a^RqN|qMUTh>nt15k@$&g1kJa;3l* zwf{y5`13uq+&du)h}5YsLhz@mnv!9m3#iM}q1@JMeI<9IDFfK)k9Hms`3~sPbWFR{ zIu8kT{f#c=h7|SmTACx;R^}+)Ku;O%kO<}YBEFI1b4iG9)_n1rbYZ%Oa5dsZCG@yQ zAz8r=;OGcp+Uk1r&Vg~k6FVk|)=%N`GlAC_^os{wWZO;nA6(r3)*>>)qHZB9=^bHs zcuUUk`!CoGE&Yl3_~RWY3h3fJEDN=C=#USLx(fFCa>;c2B;@}jZTJrund0jfRo=JH zKg)%1)Hi(yV9B@#)JWZ;BVX+;rNX}vE!?lv8cOm^BOEOlYItGOfOY;AOqCfaTkJ~G z_fcvhYm&m=$oweR>I#qb?RTxIAD}T%I}XSbLWiO3)wmuy1vy@SNX4z!J9k?odhF>y z>cIgg#4lzyHWRMeR$e=GkX_XrB#Gh|M-4-o?#m5B3ekhmJ^6IEBh?ZqF}=m=7HIX5 z(cyF3d+-?gM4y${8`SnU_l2MP!#_%8_7dr9DvA0Q%wQv-M>L^_UyTfKvAMXGx=>ax ziZ1+$Os>1!#gd+FJ=eVR1i?@b5~dZ^zq$vshXK)F2U7ai>VGz_zs(I5=@PH*N1Pn; zOOPdH()7NYu%l4oFe+?wbQs{xLLc2295=uS&I&{jNOG!*`} zN{HzE&qQ0b<`&;ipGWK8=Ic)0{Jjt>Uvd$vL|9 zh?S8{#(Q6THRv*Tz-cG={7`@(r`cQ|Q<))Dn0kMP3^cy+L+{Mq# z0p_{Y)ml|pVb)^cr!c3}vL2_CIZD&bOm<~^hc@}zVlk*Z>s^uv)C{aJtorBeWG<;K zuK7%SECm*r`wZ;E*-AQl<_3j6i3-!n0pJbt<2@n51c?6fAg{?+{b*>$dC$Q%dhywZ z4XZh8IP@iJI5}K!D%E7n%KpZXbI7z|jJRmu+=G4$b59+UsNlw{bg^fq$nHs`Nn`?; zf>rwrj&*KS_F3=CsY%!8+eAdeoN}ql^riHxwIVbIr{ATkZMn$9T<{^n++kh~8F8iQ z*D)*VBPl%XN8dUt!oeHx#dDYZi$=AF*whJ;`)!O5tm-f-39C=m1`o* zXVI4t-WP_k3mFZkl%FMYx^wwjb+)?3An8p_8)oBIj6~iY3H4Nw?!I~``*7=8bJVpE zbZJ5KZ6i*as^~c-OB(^PJ;JVC$8ip0oEt|*_VP0=rn&7H4NQ>2SFwKojoO3Fi^~HL zhhJfe=7<{0%iI+=hQuu-lyIW=CZCc~;;2tcGzZ42`_J=_Uqx@YZZ)TFb7=2i^^FLV zl&eR+Q7!o+S^dwoB+hrLB@F)B7cD{<@8aN{?gYNX^?||qmg;)UMCDo?G{;|46vo~` z9Bc%id8I6R2juZ$k!>Xm;6*}@B1d~Oy7vX zwi6$Cev%i2gQltnh^GGhLL5l>YB%kS^pxq=v-=*%9#`G^z5dG`;-XGZsj60L%Pty( z8HdZL93S4z8ZtCQ5U2{*WF^{1NP-M59skYz`1lv>}zyF=1A z`#8rnRH-pmm{l9A&b=qYl(kw4SsZVH!!!cnESBr4D1HUEdD5nYiQc+1RO5+y3FBjz z7rrWyEJbIouAL};-ck`P0rTH9&$_Gojp_r04GUH*&?|`OslT?$b8otRj`-{jd`a|u zYC=v!06vGR($cLEWq2CTH6-B9D`vYF#me%TUO+dGD&+N5ZKHp4tqkf}$tV0!B1tt+ zz_XZo68D+cNpMB^-^})S;ttCa341q}M2Ox@hz;x>WS@Q|AMhLH8-oiU4JxMh?`vf3 zd|U~R5i_J;#6MIea)^!+C*fUBO*)JvdM98Z4HJwlb{f^4M#Rj!BbYJ5Y{{#3axqhO z8N8exu`O*}D~ckO{}sA|ns^5QMX=1K66Cu&-+fW4Z}VM8$o+bl=gqMV(}T}iCyURE z5|Kst1i;>n?e}*0zjS%~Xp{>km)~F!$Y} zatMR+S{0#A9|h}A>7B&veKt39U|w{lUml{zH73W%PSa_JKH?Wus6XjSAoQ%rk)*fE z+mB_7j1lQ6h5wK>3ub|*B5EYI?{DUGqtwoi2W@}B*rx)Y#SnxcNf8(pNXnflSe(sN-Y%BKtorlFP^*@bWi znm^g-&^jfO*c-V~HI6h9IhIP!>6uM^L+tUuO5PZnHyTiaRFJ!`x=<6dtl2;#sj5n( z$w7>(?}ma7Ls<6*kNJP}8)%1F&9mzKx06I8XnwkQ6W+`ROh=AIbLZi@O4J{m=k=J| z>&cdWu0o=V5pn2mnXaWr>rb;qCPLofSzPMvf zmu99oi`W5VrcGi`>8YKyqOab2Hz;-VvM2E|9AJjLxxWr8~ zB-#ykpQSx}TY7keeQ?UxB#gvt+w7PLt;xfmh zAUjdBee0wYN2Svc_&CX@aTlAn zxVr&cqvcS?3Kv5bnQ50{)ZGagiQGIPI*csnhklaN1%RB5Hf( z<&dk}n{9EHNGKA@yN!aK?F*>tB%$iem%^f5(wykev-uNs%xIDz8)^k z+wdSFdrJp}Z*6z;|vd5S?_^#w7>^_kk@xYZyp}H z#U6lJ&H-F(T9fs?y5 zhgW%mi(yu89rzOP;5e2t5-V|tp`Mpc!}vsH*8I<}2mBog!TOjm(BVq147H@hIS?4`C9vJ|3(>&~y~u>WdI znTLl>-XhV*yr)P}$W{!#vhc$DqL80UDq8%kr33lht4<1Ys}J-8%Hi2z5m~8du0;@< zNBqtIO^Bl)M7%l5>3?KYZxUmLrpCm$u2K9UIsSqLyZ>%Suj$JDv9Tjs7=gMGhCM zzB;||aiY$o`%f90xnD25&E`P8qzlFEPWgoL;a2$WENvaWOt+pKie(Lz*639Mc%i73 zv*!P6?ycjZ+}gI`K~h8z=>{2E6cCW^M!FjXq`S)@B&Ay#q|*Tgq(K^_dnoDdl=8dW zd*9E!-M4o<&-c9V@BPEyz+8)Q=2~mkI?v-gj^n(}Q(QPeJbF5;icZk_hTM-WLEBi{ zosPHa$T~%!HY~I<$70vxXj;D=$TIBsE}lgRZ$6?}5}i8RuoKrBJLUCe939MX#5ar< zC+zE8&o0<~Sn+JKN{Dxrt;WKsw|M7*`sc@bg> z95K%|BoX4{Rvvgfu%v!5N*A+zrJ+7Gxs&@UL|%Cu>)>fI#gYwh03eHIQ;j(5%wgPN zRudmj%_OAC*QuOZh7Z;tgFjkBGlRDR6tnaz(q;ze8P^9 z`){^A)Rdll^F)2hN#pv9H_kn8<|1Li%p{SFf{AS1rCp<>V;NI$zyJ&%fO7Q!PliYh zwamYkD36J*B*@zLqY%T5yd3!aGONy4^`F8 zm;>ST&K;Y6{Vtxb8Hj2(TlV$q|DFHAdV`!R#Q4>xYK`OxE)&Zn!zggCfUeB@#cIcR zu&Jv9h%0%bAUPqtoV`X4yQj#97>O-s-ll&jEc1wzEVKT&M zY0I%B>uBmLat4{TT6w(oVPk)V71AIfjO0G#1eh=|X>fEkMs#4NQ+xU|E)gX59mhFz zlTa|UfW28e9o1<+O3n`PYIpZ1#vls~?ntAuPgULI++?p=!uau>MG#I2mHI&rcZ)a% zn)Bydp0qblotGrkV5&8YCDTl`kUk_~icUT3St|JsGB@C84%#azTYJwzqD8zBgE>U? zga#BD7li(a)ayC|*}2)Ih8c(O(Hz$0hmR%#=@|i%%yAO;-ugZYl#cUTVjVl@>V)us zRvQGJ3wpg+9pGV;qKczlGoM!A5?)m=DO(7?MJ$Nck7<}_C1XY;(}tVA!cdmBwIzMZ zZtwoarUMadeCd%q`p+XQKLjM~C{HEb)493MX4fb0^IjZGi*-D;{lEo|fQmsHZ`N+f z0p@rn>FQkj1i^EBV%=lOMYGjuPv-|~-N#K_DcsYkHk1@k=_qzwtJTk{6BK8rB}rYn zeZ-(QLyb^bOH*4DQ?lGD2D}DYD7BIgYOWz31g%>S@p;hHYLtW3-95q0$bws}^EVr) zvf_^_>QE&xO4!i2k(7TO3+PG|mT!6R@l;hx9I=TzGN*l^`w}vaHRrTdPT0L12$y%T zF^W29A9CZ?lC^B8kkgS0*J zT-$fh>*+2>TdU9<{AnsmAGVfVRH8vV4XqgIs(0^_V6aaWDLb~Lb~4fi3k9af2v;Q~ zDDxQ%T^_rXRiRi(^zOlJUwX3^wuEp)UYe3V6iSGC%x2v1iUqH7lA4emp=ax|YC_2^ zT=^ynURtlSCa+<)UalMEaW&4bp)^h)ceuKv4f|r7LnN1+DOY?OKCInoMOFr;cpdZ*QbMlz?Y5~3!8b>5t~~5%)wd_B>9ghuH8K^3 z@zL`puUJr#9vzNGdTbVftNpn7+Wk1Z>s=W^_L~_p3BOGHSYhN|3fU-#h6EVTZf-KM zhG13`6d@ykX^pd)(n{=$PXv!cQmZ_*z=RZTJ1&&2jEuWyP;;aF+-2@~8aSoYo7ZV6 zdqtQlfB^)cA);2V{*gkuctedN0{nq&c*cr*L{-FOqUX>4`Saa&Eqw9?hDSEMxZkF8qb z?rDOO)^sHV9Jl71!$FQXvxDS0bt+r?IC@$s1+UYE@*(Imb|@m(rBy3l>wHFd9M*5v zMrQeVlKY))9rIeBF@CeZJ<}XNE0f>tT{#}Y_K&ixjOiUQTaM5%)1&4VH)}=r7TOi7 z=8Uc9tNtjpm!*}?A`5arIO_-5OBa!`_Il?8?{iF-<|msc1y34PV63n9At^%OAeXXY zF`c(ir%%nYYg#!ojAbmjA*ys2p?(DXhlAY3)<$MahG!pHQpn9%{nw20_6<67BiKVZ zBG^^M3Dto8>0>79FKU7a|G@L<7=kSC19nFrfi!MdNqzjk@JPH~FQAMXEdaUPrZ_Gu zt5pbYKB61^4$?EabwU{b*@@^su00|Q>dnnso;z&TSq@cWd~YM?#vpTgDvVhe}bvfs(OU zdQaNn(&k;h7IX#HSR?^qp-05OW$@B-v~s#Avofp!l&uyONx4j^Y+^aafr!XS)}82k zT+{_sReqlbNMtn==&2Ng-wh$C{OgqAXMfUv97}4QN=_B4KB*%&?o@9HsmYj|-Q0h+ z-Wy40_a22Gs?pT9OmRubPH~M300%uB7U!+EL}TUP`lf@kcxOi{;IMR1 zfgn)OcD+Hbqq_wG3#@$zQQ)UPX7^6)6g*)u6TF~L{0@pS2mD-p-FR;U^nlU<2;d(r znf=CpUpQgh$hbfND(W~w7*|ijARC55kOL*4E(;z$GXRSJL#;r(_%++$RyzMT(ZK#C zo|D2g2p|H4{BSoyg$xyEL%t#zT+4x;?KA=0fGmGuppq-rd>yO1A8vR^?B*ab=IqV5 zH1kDncxH1%Y(1T&(*-fZViWT72N+#EkPKj6)iOL7h{Sz2JkrS`xr7X|{l&NM*Qw;6 zEB9LPyeqH=3f#6VPxRW}m590!q7NI6hi5<^~ zWgp$|2BB(~1#60#?qu@&G~u zWG~2BfPE8y&}3ppgs%VP)BG=tDDvbj$K{7JpGD`0S~)gJIdg;Uy9ib8_z&<#ZVHja z{dIa&2{i1rIwKjb_Mn+$S|KfXNXc=MR`iwbdtq02C@X4Qj~%=8(;F*=2nx!m+XSe_ zP8qzwHf4xq`Ps7W4q3Q}j7cmKs1(~I5ot`7>29Ugfci*0f-tVWo)lS;O*-=~eaXbc zu916;=H4r_k>_on-x%(w*?Aa8hdGlPV~pQd(KaG0)_O5qXAw0$o23S}d0DHV{{>Tc zAMi873s}4n**aD^#B2Q0^h(R(5gJ=2o+#4O2vosmFq>b--9KBy0RENT$DV);cm{Gq z!a@Eg<+hV3!0+hazwx&QbT(FFfQ`x@tU=8;lt82%6a?9!`wpt2{ozA_di|CUNKju2 z-ehrri0Q6_8h|~}01DY;SF6?Z`1$u=;2X*h@nms)P^1BLsPe9MU!>l@FrI0V^uggdv~acZKDF|cTlMnMLs*ioRYYa)AK~}(4d^Y*wiuCKC#kqiyHNu^WCujqX$B^_E;(u5bz$(ED$$@ltEKywU0~xr? z%+H3PiYRk`U^k?5c`4RKZKXQ8#YR`+@5wMH!#~p!DZD0!naYioS??1_P7uAB_Osp- zf+w2sMoLn&HwQ0&IH5Sb?7Ddi5Q~IlY75P);iV}*UVtikXxDAl$%H@2V+gsI3Fn`` zLf+i(yNsG=%2a7iAT7qo7pZUpA}fsarg8tJ!3X?70UX7R961CDE?9P?5@;dS_;RgH zsS$QOfHm7@K?&J2#rl*Ec;nkjf@;5k5woZQ5^Yfy8=;^rTxhBMqS2PXCmJD^h%A^U3km`c?4>xK-|@h@`3`A zY;CH&@~&tIh6g9}}PB z)mIi?hmPv#u#7q`q@$~H>?zH6zAm(ZfK#GrSf?zmQ5DNfl!Ti=+F`U1@rfEQv;4j7 zcPVZYs>xFY(O{8$47MCkiVcgzkW+UjJ(69;_JMszTN}>h)#KMv$Afvd{2Pd`L)(IM zt1A*bnF{yTk{2EhKK=-z3O{E{FhOwf$uXTtKjllOg8D2$c9uZ@8joIYqPr9!Seb7I|AuJsDPSId18%ZM#^S)RvPKBB>K}vZyV*U zgbxj1jJNyVy1}S$dUh7!B}$sLU8t&8IXIT86_JjY0C93#ahseuVnN}3$%p8&tR`4x zG8>A~aZb3abL%$)%CN8l4`QIOTH;Non5?ti&!bxF0)xLeMr*bHX86fK*f-VD|CIN) zsQJGUk^k!4R35jY9@`1e84|Wf{CNB*$*V-5F_??;N}V=iaZXmIp{CaF#s+G0R#7_h z?0Mqav#y}64n(~5gs(C8opAy4*$-~|>muajF*?EPawM`b9oGdjPW531ETkt#b*^)} z17&%JlU2oybk?WMGgNL~`;|O9vuJZMtX+-PfG0WuzW$@S;TKp1+M*uBPt%bMW0381 zNmI*Ck=?H9Lwc49^8;;_%0Mwg;JPa9(6<=%B1LzSx{937%gRDQ-NPsEt9C`TYZIiV zo$s|eWI4v&pB2;V_9^*?k^!H^aAMj&~yZoUmqj>Ly_ zqu$Q%3Z7*10Qq+G+WBp3HJ}ycv;d5u{&=+#!3U6T(YEF@Aew~Z0CbEC|639A9~zd7 z+o5Ei`#-EdfmrDe>(3JYpMU>H{3*H(*D(Kn#NAUsOTdkP@b&q zS`yn%*@8nJS#`@bDduGQ6X^@S^_kw1BKwr%FFP&>JL#9%^3nRvo{Cd}ASp&H(+|exCMVEzvTk%N1AU?(W`hI-TWv z9V7Q{HnuJ(^&!X91jW1N6}{NoCg$c7FX!6d4of2KwP^B6n}p*wQs@)Shr1-57vJ>A z+|@~s_$@PP58f2g#+GjO6?X7!bIRWDXx|Vm`HX!}3iLG)J)hKYz06*(6eyx1hr#vh zA;q&4oV>-BmUdAR11;^w+%2g7Yi|h8^R^W;ur~ucr{s`&_!~!H9rf8bxIMHZQu{R& z5uO^t;vhpUbK>yy4=$fApI6mp?1HLH`$K|B;#?@Br0DWIh@G@KRs<;J^tqR{Xw^f{ z9;a1M3f9eZVWb`}IC>hngo4^eCgf0Ggnr&MPU_S#ni1MV-vgT>`VY!PERF14Y51#+ zezCx(tx3PPLG~OYP+cX=k9*fYed-6Xw`IJFsZrc|MK&qB9%`I0p!n(DQ_088bBr=Z z!;##Sq44s+a%b8x8QoTdT2IU1q(aCOGcC{r$j0|V2)*~KiKZcNd-DK8uy0;u z?oN}hw^fe8pGJ1AZbvlMj}2Yz8OSiTj%#KX-f4FQ?s3F&d?`h8ef#pban+V z*NV4v5%L}Dao{3^MM>vdKEI6H8YF{%4vmr+VT-$;`qhcIS;k+d#`fVR@Mgs7|Q<@!v3h@a)r@RQ}nnhY0lEr)>Pw!nMkYi{o!FD zqJ(M!{L9_bMYk{lX^OsqRTCtmp@`IpwBIAieGVgXckHL=jU4bsgvoMIIjO*?0D8=D^*TR5zF%+1x zYkt!rVS!@TVo`IX$r>ic4olt_Ma2*49(MS*r$k9p!|ImZv0WhZDMe{{6XyF*= zYWv&p8r}KiaS7I6FaH3c098dY-R-@lAD9v%dU-VmOae;Du^!~}p)g#gCX^z@e2hX>SJ_ux$&?8}9QJahymh^=it z;c}MH=Sie#y^NhnJO9WI)TO=olS=bH_Fc$JRJ7AX+%q4KEx0gfyKJ0|}hSHOiPX z8>$oFYlLflY7AgydJ|{92f|YrE1%wa=KL9wLVR6z2IZBVZi0J|J z866dbFr|q2t|%2Bbd`+AUnGuy0D^WW3t+c@S+Akx_brFAB-bJ-1^77@JzTQF5Zxc zv8B;TLqD>8m9n-TVZIo6R)w)lcU)o{9M-dVw-<`~B{B;DeSLU}20l%)Z>!g8<(qK! z6Zc=`^U9_^wYi1$$}W*fDpX+4?@K4k8cr768b53W_lC2bi^6J=UOJ$4?504 z;edYnnQr*uxV4igO+wz}`H)^^E3Q$lt-uk)5E|lV)j{f^1J(j(xT>*_^~nmRW->C~Xriq6k46LT$6F-D zNjs%9wJDJJhXmHqmDQ-(1>g)rrtqrf=HrreZ<)nD%X9n}VH%cV7?}(p7kECu+xA4} z_-Vg-UmNi^*Mxgl-cLOHbN~%1##Uy$Gm=*rTdgwdAkvZ#?`?MIiVX)-?Ls>g)(4l% z7m3mOXoH?qa~J(P=)u!QI|l*z*>R>)S=B3na#xy_139zDD^dsuMz7VLW)W_rs*P|l-lI^xt$W8ee$0A4w9(e znI@kHCQ?;{l{As!Aa;J^oFI|GDuKb#_L+2`scDpy0|<$hx@F_JV`^x3uBWt`ONN-WPL%8imp+Nt!P)xofd!g?Qa9QEV6myKU*H znZ@ZWb)TRIZ;D;b?Iw=ftd77%sJ%Zt$kppYY^kewucxWa39zBM44_r0&zqO6+Ung>!dl+!p$fNae;=( zc9l78HyzcQh|84^7q4`pufE_$>!L8)xX(!m&Nt#|c^SY&YEC5jf=5!VEXq!hssl(X1o0J%|V^&6DFy<^L zaI9PntAEc-P3+nAblz-UCzdpN&(HxKWItwej(a1qb=L1CF}(Gh?n*$4#^;%TjYFXc zpF@5+R$(Vs3#zra9X$RvGsZ1hY^?0TlmWc7u2A<;g@~3^7v;W9?Y8p5HqItb+GMf^2~fXPDD2aXQiSqpr4g8yrdymXRAb+gpZC|>22vXo)a z9xz*Eihr2vTCrJ8tii%Yh5lUcF5X1G4Pmb;SExhCr#lF|8inVl><9~LQXEV=#R+}{ zriLVIXfp!p@HQ9Ls9EgP@$BaesC;2|_PQt$$D)h7V4Vd8v`-UzFXM{$=9`?Zy{5Z_ zM}e+5L-b|D+e%|!NBA^WXLY^nC6-zQX-ytbXBl#N@9BBCw6x+{5C>*MF9IPov!XQd z9nb*WvZ-^hNn$?b9`H#4w<)#eF>9yphn78FpXOEHa*jxx8y0bqngmmXo0_YCZUlHoPD-=Mc5x%CQ)2Ump%HvVul{Fz!;v?ZZ7QcisDZFQW` zD&2n>^8lS6wM+JQ`}sbSdm7K)#3p6j*q(dXPnOH96X-WYY%6?h^0T~4+l+tinR|>4 zu^VX8ZFH%mC*tCZ_K_<3Smo{%0eNm4($ZtsZpTFn96j`9oD16N`)%dLT6$IR5=Gs_ zQGfp?6ZLj+NRTCnjYR=yZN?W?9rlz)Z3l`>%U#uKCYu z8?tfOZui%|8hbCRE*}b%+U9J)6XD=woqdeKf`I^6EN&zuwt|ym3g5|4&`Hs=2v~>3 z^F+H%*P3dcBUz+EtDzDkDI;1%qMFo$MW0T=x64h8mZS2KuI4nSZK5c!JX~7kT+u%K z)$Xpov9BkCqabo$HSn1AhXz^Y0h8Bv--ahKP=3S^`h0+;>vD=`ZVz=yEdxwUAjHSJ z`b*xNZA)Y~@nb`C+W9FsL37Z6B9_Gpo-0MvEG6BghMpzWk-UaF7P;5wto71<`=3xi zK3s~zh&PoRtU%qFxa@=bOIuG*p1V$cg@m1IUZbQN(S1=|vq7$;UchcMH>~?K&^b+H zZ~L?ItX@Mi98Q|(N!$SE1X5d+>SY{EO5JDr(=@7!=fHWmfdu2s;!vB91SQ6J3%sf)cMJ)>NBZ&0|Dz zNQLB4P=tEd$=6bH;pHQLQMk9netkZJv%YkfuMQl)G){ucsSZNO&YGu7546q`NNF9fNnS>>skTLJC zhOCO4=oJX@r79wi!)nBwbll=~U&c`)1ZAD(y}QTpt`|QF?cy7f5vkJ>U>JZ)As?R> zx}_1Ev-0Sho59PYlVXZj)l8Ib)KR@zCZ<9!e4OUGIQVf99_k1a3Pp8hv%*+1t;zjI zk|sDiS>7Sp@6tp^6VSJNuP*zm(`TZyZXR_#svRpQWf+)X@ZYh6@n~sFloeW{7gw*} zVL_x&*|GraCkU#lqq_CyY1zUnY=m4RMYkoVnHyG8b`IU4Wn$ zS8#F?x0|WO#y3^o5tBxA(^>EZH!DIx?etJkFnk6YR)vj2fhL2MxVb4c;ZmmCSoPSr z^E#6kIw}AI;2z_G(bVO#pd36dHZMpq0O~976Mk;y- z#{Q&GM}#nQa+0-cz2f5PNBdf@qyqu$L1B>)3M!^~``AYex!xCM5`xPXDIDciFe>-0 z8RE)6=Dn0krE-Cc2Ur;ty1vBguYz{nMm`f8?y`Sac2U6^54Mxk9vE%lzF+l@c}&|W zrYK&c8u}n6$LRhsCq#I6q=r5dO+4)*0N480n9fqTj&AM(Bok5Mu7`||!Wau$5T{fM z{y=)~f{atqZQoM>IV8ZRkvpcoy}WgD2ar)9=>s|AF0cs#IjQ77x!y4>2v~X43JEE}$3Tt#GhE1FO>mob|a#0%0qtV#6ynxPZ(XmBpW zP<97dMoNT`?I=cV`a4)q_%{KC>8zv5v=o%t%cZ~ynDtd@7Vlv*Yh(&}6AV~q2o+US zzOc7Jlpleo$ezhq?WTO`Z=m}^Vn8qOa>Lugg8mM+xm7XoJ2$_M+Y%%~h5TIhDR>-u z^&#!Ve1M`?_|0M$>imzDjUykgrv+o`0<9FgyV)86EBj985Mu$%-y*G-59;GB*$CL< zNSqz?F!mmFjy#=n$c#Q=@2rG*1MkR|W%bBsPvG{)J5skqTj9-esgAnYq*TLb8;Zfg zojO@1BEac$$tTqD3B$b%qc4tAL^3d`A)qijdURa9d(3%%>SRz?6)zqIjSdr2ON|n9Wh4bFdUeq@7{Y9Q6$wp_*J;j@-N+nYs9Gxo85d*+5N=m5GH}< z5YD(NUhSyBECZCGD3+H|!sKK4_s)YURD|w{vrE1G%Co*L|NCNzj@Of^2vjGe4D(|! z%S6*27|%2#hU47x-srubzr`TXWeL;R8QN8;l}up4Dkub8W)S6)9zbBWk<~vuAs9z= zgh>b4M2Y+87MvA{n(`ZE#R21r>Mig++XoN54<2|e7-$QdT5vAGv0*NeQFi3|8=1UF^K@SClQJE%j76GOcFX4IxLHTFXC!24mwMbO$|hO6#m z^3@{TQ_D#8d%Ph%JqV7mQ%iN|^mp(ot3?8s7gfkz9{5-f=I06!zN!h6#E>Qi`doo1 zeDa6?R9jcZSG#J*Dg;XE$z*q1oaug>BHQ1vowx^Wlz#jL2$rdb9RU-$i|?&V7R~e6 zsL&eiusDW+zx#qZHgfktDys6EsvpwGU$RC275MPzpCeS)KkPp809np&2-U{#1{s2= zKVTvtrT+~lio6i|KROCs+vZ0zJ9c9IG;<@MnO(#LUWgVnEGpB{hx@F!>K~b3|Be~< z+jZ7g;be2zYB}64h{zGFvD+<(2f%#b!kDRFOc-i%$nlI^;#zN$jWIC>wh|%ut|J}q zt6F=JEP9d@?3MCy=Lp;5*hFZSd{7tNLeupJ9B>gdRW9g0CqC=pyCoXVO;&#jjx@q~ z2IU6FG{ksL?BXJ*$d3RB{v^#315*?4{s`#aCz6eouc6XFUAMUfR^pi1~Jr6WJb zyg!d+jL6S6*B-O)D%wnN?IC*n&iPI+?xj!5QaMm3ozTZVm`HIYn~MypD%MFlQZ{?M zEU6nt%0fi?km+?OJt6|oKaauK9DL9ey4PO$OjAsnu8_{!Qq%lQTQ6JN{LD^UhgPP| zmN1-vjt-rRH1&rWTHv4l!%ZR@{4L}-27aK+r|ND4(V{1Bz$e(jd^A!|T7|d?@yG7g z)_duJ)f@jL7FWD4kB<(|f@o8t4ly;FsrG&=^U^Po4Mfa9T4n?^qkbs{FVp!(DRh%kU&WW@2bG z9llItHRI8U{SK1j(7=k!^og8EpQpipTBAL>$38Y7Fw!nc?Q2g2u-Lxg&nG;p!0V)o^IaMEYbwYHHDbI&|63e&p{bz%MfW ze=XF*d*{4l$t$N@H+X+RP#omfP=ee+2L>v{vR_;1Vt z;PFllJd9;7MVI%>1F2r0heh%T0@JAZxyBZkGgweE0clRoT(XjwqGD>VD?K*%Wh7%) z!T}3!OX1sz+EDunhOg+>d(okCh&FwOkqtS>z3G_T{ia=u;Uf3Ub{^H&a7JytzI`4| z*o2X%LIm<155AwCwB*CVey{#r!6||xYh0W6V|p1M5e7n11dY9?Ml}gsb|VV(uccy1 zlAf@+QyLmOcuSVPo|3qvuP3+*Znmh8S$s2yBQVr%XUBN2PqtK46FPp<#iC$NT74w$ zj#wm%8*sNvgpl1rc>U9U6oNgUunD_>@jbpAozgGSC1TP5DHvbH?=F1SNRVNvNMV_u zm~f9qD>s?MlWTt^f$$w=jrUY6KiX&3<#Zmv3G& z;PnZm{|5JV>eCA$?fXnBqt;KNbmq)h&4$^166E}p);M|A`!`t6y)Qr;Pa5R%r~8~@ z+*hN-Vy$;cRwU#CSs#s_P@>wWN;e@IT9QhA4>ft<&Y%hXLArEsc4ihKA~i zY#gB=rK-R=1-h3)EwNpKo+rgFJOWuJ-Y!UIrAGF4llPJaQ?PBc5H=)sqTD*|{X;>? z>+R}8+Kr!u?b+Xm#kLRU_c3PnwBh)sPj`BRjV?|;iXl8k%KHkeyC_gCh-s1ydJx8#wwpjd7g)=C+R{!~*$qRo=+66^AVs5-sNnw23x;91F~;(1EpA zvue#sCfvQs?jVzYc5NFS;lNF}a_0*<{pgdu?3zmRvSiJdpVR~KO^$NG)O($*@!Tg} z9F@9z0gL%Vr+6{k39`ncSrwo#Zq}+W-LsW$x82CT>|bv57=q}uyJY)Gfr*Nr5;jvY zjGsO5KL~pSNbD>fpnTv~FMhnTkx~si44RA_f@~?AyycD4lX7U-dP-cdx{!dOJ^dQBz`ur6^?$q>PIKp)O z-g@K9E$x#oje`{zHYw((ADcXR z^{Rr<7kSB$%h@)`@MJE!8!yFVQT9s8OVG@g89pOgYffby-lTb5NUdh$W>|rd?ilvf zDf9kQv@HVd^uXhJ*|jeU`bGt~R7QgU@ z@Yjg@W@`Mh%GD!Q@U_*5*#I%&+7+W=Ro7P@=%Aj+4(zEm=BBFb`!XOw=LgJZC84wcgLo;(i&`71V`cxigo%oLjOd%@z90s@Fn(gSMW}5$;;rBT%_` z0!>gd@n$a?z?ONDO<*X@O&yQq1i0DruLpI^e@c#;#@J|aKY(h)kbPq1BIW9N^=y>S zQI&n+-WKPB3y-n68UCg~nf4hHuiH1Egi zZEFJN-k35^*-ylm=8kdf3aSPZE>?w_X>)%tc42cjrNkbxx^~v^uln9DNF>D#jP$JXjPvVrl- zs#NGzR!OL35?>uWmPyrr9eJ2+6LXD;Y2Y7wCn{Ca7b_+3k?TKSHQ_;knC*r+Eg? z_x&^}R#N60@6UwchbfHv0FBZ|cbbE1gK>W)%r zUAQ^Xw{$mDkGB}d8ed}UG3(J~sPlJFz`iq%&9PhHu1QUlECzJubJ<(x)|sIQw7vT} zlcmmDPuRB`Y435b!Q!Vs)PFKlEvC{ZQu?+&QtbUxRIZ3BmKlH$AOVNucOxA zZ8`pBVCzHoQDQUj+@Eg2UWwoJ>>aJ6-82Ic6qbL*G<`V@c;4c%Oa1p zs{2w`oS3i~B~BEzB9dyN=+Z+(SGY_ELWuuMJYE)4+wZ6_k<#v=U!EiU(*Dd+C&m3y zeXSd0g8eZX6UjQc(lTNx$YQ}<{d`ir=7l~}vBn(kFe&F~c(=EjPb=!wfzYE<$A6jM zD56S=|JxBi%kiN>4YI&fr?)EqFBj%T-fyFpI`SZd~!7h~|i#`IWiYNxxl<8Q2*iQwZGPimG z>OYDDzaQSba=?>6xH}v}fPu<)(0?*&GN5XknF){|<)xY0np)LB;{)eu!Vx$RaRNY? zu#t&>!WsD6GWvh)QOjd{LDKy0XuGXos-WFbQo|`ICUkkP8bz{fmJ~60EKeHO@yWE2 zhN5F25zq{S?Y`@k{LgI}X2zaR{(%foRHVohz7=IRwGr9D`xQJN z1xQ{zaGYn{(I0^;5ys5ZVc+z3V=m<9a_VsDJ`AObwHZ&~Kp6A5BMwqIB+sIaU%aZ{ z=vG1Z8vwi^W)TIik);I#jC*U?%rD==CgZO=!gsD?bla%D-kE7~cC1+iJ9F`c*@_w- z%8-?pWO82h*J*-4u)g3E7pnktrA4;+j_ZpzY}p;XmY3! zl$~X#RyO1r=KeGD0W9kBa*nJsGrmabp2(if)g2NDBWN*0aXdvAI+}dB#QS_=y;54W zY%>$z_Q|ubRbynw$(41wEtD`SG70L)VajGyv5c&sZ5S?)hMd^??D2 z!p>0>au5gK&7Uz0Fk}gb zD3Qm=jt&%V*excH0k%#$Ko9apzcB3(JbJ!u04P=jZ^JBlGO?QZHk#M7AqygrJWs!E zWSkF``)vHPXFpYO-Y>g|Dn#
- +
diff --git a/doc/infosrc/Makefile b/doc/infosrc/Makefile index 01ce342f4..d915bc489 100644 --- a/doc/infosrc/Makefile +++ b/doc/infosrc/Makefile @@ -3,8 +3,7 @@ # # Required tools: cc, dot, awk, ksh, yacc, gs, python. # dot is used in mkarrows.sh, mkshapes.sh, mkstyles.sh, mktapers.sh, mksplines.sh -# ps_to_png.sh and other make rules rely on netpbm tools -# and psconvert, which is part of the GMT library. +# ps_to_png.sh and other make rules rely on netpbm tools. # # Install python modules with: # $ pip install --user -r requirements.txt @@ -37,8 +36,6 @@ XGIF = forward.gif back.gif both.gif nohead.gif MGIF = constraint.gif record.gif html1.gif html2.gif fill.gif round.gif \ mrecord.gif html3.gif html4.gif colorlist.gif record2.gif fixed.gif tee.gif -MJPG = sdlshapes.jpg - GRADPNG = g_lin0.png g_wlin0.png g_rad0.png g_lin45.png g_wlin45.png g_rad45.png g_lin90.png g_wlin90.png g_rad90.png \ g_lin180.png g_wlin180.png g_rad180.png g_lin270.png g_wlin270.png g_rad270.png g_lin360.png g_wlin360.png g_rad360.png @@ -93,7 +90,7 @@ DOTS = html2.gv html3.gv html4.gv tee.gv HTML = attrs.html colors.html command.html lang.html output.html shapes.html \ arrows.html schema.html MISC = graphviz_json_schema.json w3data.js -INSTALL_FILES = $(HTML) $(DOTS) $(SGIF) $(AGIF) $(A2GIF) $(MGIF) $(XGIF) $(MJPG) $(MPNG) $(MISC) +INSTALL_FILES = $(HTML) $(DOTS) $(SGIF) $(AGIF) $(A2GIF) $(MGIF) $(XGIF) $(MPNG) $(MISC) .SUFFIXES: .gv .gif .dot .png @@ -119,12 +116,6 @@ record2.gif : record.dot sdlshapes.ps : sdlshapes.dot dot -Tps -lsdl.ps sdlshapes.dot > sdlshapes.ps -sdlshapes.ppm: sdlshapes.ps - gmt psconvert sdlshapes.ps -Tm -A -E800 - -sdlshapes.jpg : sdlshapes.ppm - cat sdlshapes.ppm | pamscale .1 | pnmtojpeg >sdlshapes.jpg - sdlshapes.png : sdlshapes.ps ./ps_to_png.sh sdlshapes.ps sdlshapes.png diff --git a/doc/infosrc/shapes.3 b/doc/infosrc/shapes.3 index 06cde6eec..d9636d2f4 100644 --- a/doc/infosrc/shapes.3 +++ b/doc/infosrc/shapes.3 @@ -22,7 +22,7 @@ The table below gives the shape names and the corresponding node shapes.

- +
-- 2.50.1