Index: lib/build/qdox-1.6.3.jar =================================================================== --- lib/build/qdox-1.6.3.jar (revision 1575872) +++ lib/build/qdox-1.6.3.jar (working copy) @@ -1,881 +0,0 @@ -PK -[6 META-INF/PK -[6.tf|META-INF/MANIFEST.MFMLK-. -K-*ϳR03r,J,K-BV+$xRKRSt* 3R|RxJ3sJ⹉E]lz\\PK -[6com/PK -[6com/thoughtworks/PK -[6com/thoughtworks/qdox/PK -[6com/thoughtworks/qdox/ant/PK -[6&com/thoughtworks/qdox/directorywalker/PK -[6com/thoughtworks/qdox/junit/PK -[6com/thoughtworks/qdox/model/PK -[6!com/thoughtworks/qdox/model/util/PK -[6com/thoughtworks/qdox/parser/PK -[6"com/thoughtworks/qdox/parser/impl/PK -[6%com/thoughtworks/qdox/parser/structs/PK -[6com/thoughtworks/qdox/tools/PK -[6R-0com/thoughtworks/qdox/ant/AbstractQdoxTask.classW_}+,,  16dˀݦvBq@`Z2BWݺI$=3ݤEZǽcofWB>|}z܀o -q^؇ -G:eN -˃ (׫x7Mތhx+&zohzI;4!<,|S K4Vx>=ދix?|P~HL|X>Zq^yOc8>!O{Yg9*P+E_Re2 FtΉ'̘c] -T1?`*ؔ3}HMqH [sv̤n6)3I0*;OƝ -S -=ָ?4fL{K3 ;.޽3H̚:SeOǭtc)6bIi|O=5fؔu,+뜅Y3fæ%Rcs"MoͮmpH&MuyʎI$KeHNF;!ٸ%t1v1 -*3TyQUsތ9Y1m;WbvB) ήfG+]Ɉ9:3gmI 1&̽5]M3=iz -m AMrGy1mHEm1p* ,Š`5E(UcVB,y-sfi:ƼxQԀ9zHy)XΡ648&JrV$*wDtWU_u|O)hWo[*긆Eu`Iq 13?;::MIvΎR,^%|O?#XOtϩx^sktø59a%[W0[{A 9Aǟ :xQ?OqR)O,4Ns4RN4+=bR*(h(ޝhœ1Lu{~9J;_4eb0]nmE#ٖff3P4oTA3Z7&3IyaQлJYCU|+#'d,17n{.Vĕ%ʂ(5O͐L1sۊΑ;衈B)}픽de -Q"|]y"I=m5k -X 0,C~4\NqyTx˫wspEnWEٴ o p/~u+GY]Ԡ9dp!)_URDY,3"A&Fl5-hJ"q䲛-R%/tj~b=V]dσA]|o/"|_Cu]n9נ-w+"f[<@-ԡoqݎns܃>Q/p7W]E P$Ի;^ }4.CӨH(ilܝK-C*ۭB3 -- b;J[%} ؀-#kqFǀ<}C|z=a-ѺpdK"*T6~_(=HH|;!&$0_ʲ0g!\$> QZ Khi[y\w54‹hP$[ -^I>.F۩Pٍ!%ph"(38fu되%R;F.]9,ħ -)Ncu DMNHM€D]b1H7C`Gd7^1Tuc`L3{ fK8m5pS 1hİ4(!TOC궗=΍Q'x{I@V:gLLU#ɚĔIO*/(@㧤ϡ W᫔$24DL'~Fbԑ,C:/4}4e4I|A2+^/mywIT-}t#oNˡN3<@]C~YY -,nPK -[6=}{>com/thoughtworks/qdox/directorywalker/DirectoryScanner$1.classR[o0=NJC۬*qg@ހ!^6!!"xT$Ĭ޲X8N~~? -- Rz|?;|<@*pvX p3S( >42bY-87adP5Y1<u*&H"Q*HG<;:B^̥y(Y#ʶJC+x]"X%<q-?V0/-vƋBP邜z慴'g,l`K5OgCUD;gKh qwB=Ģ|i؎Fx fV<= -4%5k甭wXXm]]mѷ&-ӿ5687+\B:EAw:١j >1.%;X".ˮ -..FPK -[6 &/ <com/thoughtworks/qdox/directorywalker/DirectoryScanner.classU[WWN20a2@-m.Z -P#V,(C2!:3ҾOǾZתeQ>Wߙ `e\o9DCE \UqMCW[>*khbBp"/1bJ_iqS8na:ZwT܍3qìͩG˖m -VFr܏ -Ĥ7]Osl,S7W_8iPƜ9]]_2{ƒJa%P.z/;Օq׼%idDugO {t3ER1]Qj(%QTOm,ϧR]xF{ -0: Ei6gyE{#,[YĚkI<88$E7Jekl!ڇTZRi"$:t|H2PƗmƩEs"8%1(FB& -:@GC*H<) -3=bAG*xE~$t|G: /ᬊaTP,+( &:Rc -'uXgޏ% kU*)y 7z{vwJo;eN؜T؝b,8Z`t6\rW^*%JɬlxSILw;&IfНN}O퓐q;XX=8ɱY><ΝM+D7} %}) ([9h/vB]5c|> Xl#!sLj0Lv-д -k跲[8_]4A#@HS5!|#E>hH#D Kh}~NmSɽL6ש Ox.v f]NvvvFβ̜TFA -IJD|}f#Wp~iQr*D -i/)ed0L//M()/./LɯO,JM,ON-G4lKNb^RP##00b1I&6PK -[6KED2com/thoughtworks/qdox/directorywalker/Filter.class;o>f]NvvvF̜"FA -IJD|}̜Tk(FҢT -RA'9?W$#4=<(X0%B?%(5$<1';H -jļt},6FF&`dab`L lPK -[683[O8com/thoughtworks/qdox/directorywalker/SuffixFilter.classR]OA=+ `ժiDc_,;0TҤ?xw"6i3{{;s}sy$PtRSx``sk6fNv[Wofz_<[7Z -CjW|`X(= 5a!EHierSkkj3{sK-E({B $?jF>&KT0apjHidlxW6^s[͐A/d13f5_,r"h ->Ikc>K -N36iZ9yU;` $G13fہ,PN]4f"+O1'1ǘo,@bۘ5c [!_PK -[6N',com/thoughtworks/qdox/JavaDocBuilder$1.classTkOP~VA1Љc -76P(=lgt-_g# ~GM:mi{ a -oT C7U0`RQ򜖢I=Pю -fx1(ST3tl6w%i6 -ז:3,2A[ufJFʉZČ|`WmoŖz]mKFqoW*²+-r6Gqua˝zkW0wM^] -5<5 -&@d8xv7/KKwyk|>^jx% -d%e$kf ^ߡ^RM[C%]nz 3m-%pwn -ʨ-)h%* -aY0=2Mn)TFJ;dGCOy0LWii[]C0D=QM5AJiI3(2G,=qCI/D ~YK:KM|A$йA - I*nbroS S8EOȮ}3(SĤ+TNqk'ӮKI*FqFg;\t*̃|m:1J;d( $=! dH PK -[6`"'7*com/thoughtworks/qdox/JavaDocBuilder.classY `T>$o%` I&!@4$l!y 83KŪUF[VZQ[S׶nfb[׮V[70P1w߽g?sx خ#evGed(4$7-2Ufe }Rfo&߉>|O]m*GpT ~nr9Y dvH}LZϡ~o4 v ʇ?*/ ! d8dMP]ȇe&p= }盄/ _O)59./U2{Af/%^6k&˩oM̾mwL~ke=}_ - <*{_G IO f -"unKyy_tPLj$ÿ-ehoŤO t7M,e?L_>m 4_|K`ǻ1&=H(L#w. Uu%ÑP&K[bUɝ=DŭUV;RUgD+"pGe'85CdL=.YgG[bh;S!W5%Xw^oL@/4 -'3yJ63ykGdڍ];Ў-c-P<,73 fAZPWu#v/=9"3ZMa>i̜ETZuV{/DU8c6Z&NtEMvr)a_ v ;ۇM/%߉qN FIj_c,)=JʆM7;L,Zv(ioD]Gt9O1 -2OkaT5ĹNmUd%p\pE*nCߪpWEv-wd#%a N;)ܡ* ێHp -mjEjcq왖'nEdU6nI67ؗ#mbmQ;2 -54^ĂF&lm?'!pRSgc˚2!ymq{NƲj}8xژN-q$1v+u3*4`q WX.BoSЄT&R7<)5N⓫c guÎ&4ecK2Xn7ax)96$t9#[m]R1yC)OvacUVDɐ0 iT Z+-}I\wVmAo;R-/ -NgdI ΈCZ<~m8b ޶#;ibC,Q;YiC`t#i$@SiJetҲ_ifl}h:/ٕfiN1+_X0!d]t%9q5",qcܖ ;t6KCPDN*"aSMIdZ0'Mz( #}06c_*QTDI4IP(=MgU#DHti%׀+u]ή$"u!۱ Bs -әfdGX6m S61PE3Ph:)I:xK5B8M3*Į咷tΡS˩ ͛wb7Ui_4Nq7f0/ѓLBzʢg9^ -١Nn2(ɽ MCy,=Aek @YCʧ!1| K⊥LU`TFXje@~AZczf&cBXܭ'UX#zRjCj -X\,5QMx Jxx&[jjij:!]LXj@IXj*)jk*T̂o-KUJ [j<2_-0ԩK6BK,RZ -v*K@ʣ%WuFI֨ZAgS,VczUDB^æsmiִnӆ5I'N"ұF̬qH<6,z -fb32ۊZ/VDؿŘ nՁSP-jx -iک( -mϢҫe*23noe!RQTDCܛ= [*.ddǜ&G2eM<.ѸXW5:'9Mi2z̓2d3nP$iE뎨 !Jqb2蛜)g*l_"iw8xӎ'U -3Tcr[9bXR6DfݞEl$cRF(8YRc -EŻ.ȫ-l:y70wJ&X9ȅ4ҧl -xڅ9-v{8ռ2(|v4՝+D] -<HNF0-A)ĺҲ\ɂp" -C&}22I3rY)tJuۤ%ew~6\\;ZҊHgPt`r7OnHO'>> -EJu%ϧ҃d,-.;CX67ؚ걝b9+SX <Ⱥ6)$];.-Oe:`ѺM7c)v!i8N|uvरN3I Id;;\;>PR -SxNµvtƢy=\Z[c&B : -kN5۔27lK6m)rY01\pT0>}p^D.CR{D2% -Ejc}Ijlvmܹ?N*7s@,n.J{I9N%"CIJ3F5k] )DFUxE#BJ/e:'/ ENwF5=pN%p9oGf(jM3exl:?H!z}HGϣԧOP~~OTU~N% /㭚<+'K^>w'V*frE{R`M>LTP^dn`7p~J6+z1$4&lѳ[|^*,.+^>ہFP+"RHk@mZAaMr ^)PAS &MJ}  h2}t\6D/C}T-<@l#@j4R*N,1@s9 a`7T@ʃ4yx2pw9b0I ^l{>@RM4cf=cq5Pi -qq?Mo߈^O3Y0S**{hvE_i72;(Gh6]Mt -Fצ|i~ -huQ9i>^/\ʡr*L5X+\΄zYzhnu>ƪ@^ѼnYd|X@~;B :*rz1[`Q01,#\NdžŽtFe ϑwuY+ S0} *{iV<|=*,/z_~" fg:W0e3=RTmLGU?FA#?Ht '۠;;LTOA>0{aXA<=?@ߣŏ!~} _#Ϸa(8"zK0A_RzOLz0_G_&7ӷxGe8 -#%CLЯG̿ƚs|"tg&MZ -xh6pPy6v* -dcds Ǿ41k&j6Pbu$VAo:'sSֳB -;gп@w.Y/DsvV#lx uݴxz=iF 1aH"+m._M\ӳ:`L!<ܧvB#~Z*mDtހP4XV^CiSyڌ- <#,mWz9 mmyd{u39ڨ ^p&VzCE&|'iӁwdǑW8: S VZj+Fix;"wf"s|}+-\(Np <Ff&X [ht@B~)~5q };+zK}G_b~>z> von"G9y7Pĭn%Q -}k/PN)ւ5Z8 ؂ӻBK&;Q~p|)7ӃFmx/z$-| -Tf7$@\+tx!2,hc3s)ȅ -K0!xY|EH-y(O Ä?Mbx #?E? D\0D:]OX d&lfZw35ל,4:p  VHԦcjMaS9kbG_5+:C\K\b;pN0hr}*>K7MxY*[z"GB(/3%] N72"#tP?w~:kxS>ɸ6\T ۻCg݉#GRjUt]m?/2崔@{%Ң,%Y|dN}^LJ6Zպ>_k ?|O{!Jdf^5φhӢP ^{;D/*B;C3=K?3*pJȍi߂t+v3b^yԴk fv^Zysj bq"@ -RFoUąK8 (xU .3o罙ٝ?~C;Kû~t=i8Up~߇Ʒuvwm:u-Z֬S8'|^84DCp"'Fbr -x0#3:6(gptC8=Im$j;}mй=9djYe$SƅI#j鏴;r5l1#:e]GsHҌ~;e(^(6D=FBa!9;WƻWXt;>>>5GP~{uܤ6m"Xҧ`V *5*p vD)JXfI,ɣin]LL[ -=iUĈ8PD&YdIdҋd2c[BSHlˊ^o2vt}ɚuVY{c1#i.Mtf.Lٓ -wv 5IWUZW - ):ǠԵm`,ܗ{Uj*hn 9fΡŕVi:R8t观v'P3uKHEن١qy0'M -31zMA]RP/i13)#ޟU+Թty%hAS!Gr'.k0M:.tը({V ;7}dD{BB{J#N#u{!tZ2grr>J-M<2]gp?~ggGźZ"43,yX0db>'3kf9:FWǪ&zdȧ}j)&yEtu:^W-L+p/:'ˀ3OBUW+U% Y Xwwbk7Pzi:׸%]2WV&e\ٽ&ym+x\&:\oÒp[vYɼ9wǡJ<XրԞ^9QZg+ ,O;MK"ޞBRJcj|6|3EϞd<k5cŋiu5yTCJx((M)XƩ7OwL|}',jyCt]!HreBaĜ[o@XNmu>7"{Q7b*k -K6im͛eKx7fӿ[LJ^fgs O;>Ka3tȵ旒gQ.xAʯp@ft᷄%}/)lڇ -T7>ќꝹ!-씏ga3 Zi] - -1Q-쵢 -+MY'c f/ž2mEχ{I!U?I3)s0 -wlcag5 k؏rFŞ -53*<01<՛CN"$LXS3h9GͅCI -NpTT0@ޓyQ9>zlX :zԩrUuèL;sNySOe`)iOQ}FS1Mx)MPH뽐HLV!ʾʽ'E\:|ĠҒo75Mfok*,)0kfn܍ -fcC[:> 77Ȇ].#ռaFw F, ٴuc<@3]Ms_Y"Yvz|}Lu"TBS+Ol%.&^0wf QS4ZF{ Nm[Nx+tw/fGr=p}fn!$P۱iɐ 'n=}&L˩{]kFP/#*DF-}F@K$%#AM!AAmB7ځrlvS|!<[ -PiT )?&RLSeUc@1ǫ8AFMĀ¥KM4]w~^IՊZ*oךPk)G~ -EꡢLKy}f#NBGVCX3pR,T{FdsI="е>&p>lX]|*o1x]eE4c&EuT1CuQ:-vEf=n &fiܢ~ PzMwLpVircx _c._PK -[6R͂ -?com/thoughtworks/qdox/model/AbstractInheritableJavaEntity.classMO@ߵJEQo/z 4f@? -"ҔƲ^~?8[PBafv3o}xACk&t,T/X1+ _]-1AaHT:VyݣNܫP˦h3vвd3Mym[-by^-CnB*)G[dHrw[-b2+zmyw3 --gN8 l/bM#J7!.;WK3#ӧ^_fw4;:< : ͍*A #@ ^:Ca@__Fz40偢A'2<{{b cQ@b&&)@|9sk/{絭GeRV OUHF3Ҙ,6hB -st6M]xPK -[6_ݶw -r4com/thoughtworks/qdox/model/AbstractJavaEntity.classW TUΝ  ,&0;"B (+;;{qYJ4 Jd2-ϲ~Usgv={|:gw#V3E>PXG]oDMi%qcw"IFIoߋ-2Nqx qk M;aH톖5gFh©^B]S5ҜF\4`"pVq^kc+jS!zs@V6Vk0+Q>\ ^-ߦ{װ4𯚳sJyRИjJAgT?*z5U =olq^액SEۑvÓhav -yM`֐v[ƫ7eG26cc.XL<4c>byT0A fUbI|3E #\E|m0W?M)s;[+׶ZCOkeGP`"řH 4.4ﳸK8xq!bfjd@\/NqK%5vcg}Tkb;tjW`UI -['^ - -XjyުZ_uD'FʮMExg:1appk1Ø -Ӊ#7PBpoC Ӊ̲ٗfO'73U:čKmƑҐeo:1/n3X4&0'223w2{0 -0N{V=gd [莋i+he;Mu3cpo - Ls|G0Jayх ;9Gf%D3hz8(W -61z7VEE:?r2ssDžhyYEq&_PA=pXDnܮG'Kw!V捹[{Qg]YD 6\K}h*};fĨ;.E mVKSu9}f?}iC8:皔J*O2:btѕ W,1)Xb> K|Wի^EWGu>qMTbn$k+y$[Tf|~ -R+P - -J'U&%| -ުߢ_VoU/Va%S*|~ -~~~ ->WP_S>ĠN24;>]&l ]*zWg|f6OJ5\yƒmt&3ע!*G{nόG1!ǹ'yx*Sy5sA]I`g(YJ|(w @%Ė'%P|Yw+z^({kTzxjz%PXIW}W}CyW"x - oV0Qz0^W~ -ZտL)q\!%Zr]j˰PK -[6Ȋ/> ,com/thoughtworks/qdox/model/Annotation.classV[WU "^*T֪̍HPAɐ Lf`rĵ|?З>Zv-_]˟E$rԗ}g_79_~S!\LFqŬC0^}a2}˰X cxX|ȷ x: - -k_VLL-dѭ-AM;F6!rJiIJcCãE^4k#UZ1I˹4g*KHKV9pr,9#`F÷A]S;de4+]3lD2nΰ -sCE~69q!-nL:~9{jK&uRYYNa:vJ`kIrUa-p#.Ec i!^;v1S)1bOPu8&RXtu -2413<\ h|e{dP֭x9sY - -{:.%aJ?ɳdT;|U\2^/H:aKG7ab[GE -juXejHx=qC1J`}1T$ַuRәQ!%MX -u%V3hsr\:DJn&Ϡu[p*/dUUFdAӑ^5uT-+ "Z[4ʫ[;ji%oG3VN6, -EÛ"һ!0FoE J\V7M2yA'OoC~R&I!@r\d xRG)ts1@P;ңv Χv Oq$R}ogLP D4P;!kN&@H#u&042_ś]ü0|kqy34rs=EBl -7PU\1~b}?(p!1D^58#ağESI &Y b0OQ{T8w喊|PK -[6ZK).com/thoughtworks/qdox/model/BeanProperty.classn@&8?!--CU^ 5ʽ.[BҮw=g曳럿@G84aVl -z#Pi]x=w}\AP|'I3-?b!&^E=>t_XxB4quIjC*Yaѡd/)alT,Ao9Y@V:SU5iuB9Mg[q~ PF%MI4ԛĝ4@ܧi:]mVUkav*>Nt 1ig@)ړ^H~d'd3ڼx/SY]h]HS yh^&Ha)̃+9PPK -[6dE -.com/thoughtworks/qdox/model/ClassLibrary.classViWW~& **j HXVDQAAC2ѐDvw/~9#ϝl,;y_;؁؂a` aDƅX.x>2Ge4(bAhe t\q%&Hˤ)tp]TU^ˋ+2^񚌛фJZJBEeI[z"үY{%TgN=NQ@1mLM',[PcŴiX͓KX~DkZzDĊu0"WcTdˆi1fSt -mVOO~ yq_'o/zRMOj:LjANÏdqGM՜q^5FkC 59L=9neC+(H(לxvCZۄ%mҨT=Z2f4C,9QOgnܐPYN"^2ᩨ6iFMyJN54L -IšŨJuK3UˠRM^uRITBӫ&2"}鈌7$.F/WB GԝL[N0=)a# - g<i3uh+ U(؉Sy9`j{]Vl+8ln!lWF3A4iѻ -ZCA+"2P4nxS^S@wmb&]xO -> ->Ǭ̢U :|X+UO I -¯|2(*NWN)8)"Zi39Lk2)8U -gTg}yv*‹A4Wjp︀Z z_8%J^_U-JjW6>Ԅ%Lc%)b ---K')} 3`P*6;3ꗪeU^ ň`¢iԒV\+G*4g!۲CMY"lgpJOv>|n|Q'vqmE~x)+<;~nK y.幌9(?و6B>~T` -a-6 -ks8$읰1<{\KQGh)k^*r,n؜d/Fax+>RJjdع>̝jﺸkc5QP#8fGo,17R8Dp߃njEI>n[8:.&c"d7>e*OX.,?-ZXz[px -ht>6Σ=c9:gg -ΰghu=n?W&S~҈ylk<>*@ދXmdnr6e}m=g?hǖvn$% PK -[6C8e>2com/thoughtworks/qdox/model/DefaultDocletTag.classURP]QQ@"\30ODAgoQ{C9g/k?F?Vp e0qDCS'QKu-Vc8\NƘ5Yf8UP㚂&4u-h\ )6XP*cQ%\&2jbX12Ԇ Pf@[E$P5g\3]k]1% 6 曓b3NՁ*4X}Ԣ=Zd;II{p$%7GioW!Bj_a) Y`oEG?F om褛"ew'L'-$NEX8ψȦf.1ށjJuKb`1/nx|U DZ%P):xE 8w{s"o$T&d$dzL -HWжhʴ,~Zhv(6>vP5PBZ#YR A@=DiF[7Gx<<$PK -[620{H9com/thoughtworks/qdox/model/DefaultDocletTagFactory.classS[OANwۥk+P@EQp). TbB@ '2]vaS./&|D?pfė9g93?~yLቃ1Z0_#0|t$sgV2g.1:(Y,(M,7d#9+EIn`Zh(!26gx;{ -Ɨ+Uh)a4|| PK -[6U>%+com/thoughtworks/qdox/model/DocletTag.class}PN1oY+'OA4x]Jy|(NJxxh7_??P!0ҴtDZ;33 26~A)*՛20x -= -\G -l@-I_Dw ;PK -[6R2com/thoughtworks/qdox/model/DocletTagFactory.classMJA_o4twPPbp1^SL:vS]x0C q#2+WMܠ8A7 E}qǩ]ZlYL/dft"b+/s:ɘӇ*5(&7qF -u3YDCpq 7;3ẖ'C8O)|omC 4ih-T8PK -[6:+B.com/thoughtworks/qdox/model/IndentBuffer.classNQNO -v8)M4/0rځ2өx DWԵ6f}ֿ~ e<*#r -i,rX), -n :{{+0YZKڶZvcY ] is"l<ԛf`+[7ZXo+ P0@~ -`D(2 -n#>px` -n@M\\o֩~tdچ ߆|\9L -@/(M -)hN -9B9T -,Oq1TBpq\bSQIaA 3$^]DKSOwG0C<ΐ7Cܱ>Fh^2 US.Ts3as!q`jZ=ALz󏕲_L:03gbU[zx z@OEҧ>b>^Q&|Rl!>şǴqz(H>I.Z bXtזPK -[6&ToG8+com/thoughtworks/qdox/model/JavaClass.classZ |TչB $!a a&hĨlH H"p$C2ę H[.-Zh"]*A]mkk7Ūw;7@&}?=o /C~Kp@/iȣR99W:i>_z /䋼̕y/^y."4ȾŲ(%:/Xs{+<ܒV=|xMsY>=N>u pJYJ>W51(;tp㐌7rw>}{/yzidWz}+"uPz1OpкEm6Jv/p@Nݠ]{s|'XnBy|2EV? V&nއһS>w|oyYWz),4>/x)ĻeGz{1}\ =(>!e?,GtWO)+}2~T)/UPbEU#R0MJ/AQ jFumϨdžC3\ձ)ԙ\; 8`qvf0oR<Yp 8`P| m.nt⁍C1%MI6X019B5M# yRJe -\WzaOǬңst^+I?kH3:-rف(#r;*WA(4`SUrv:@LͽuYVvjPx; -vePfسlwۥ0RAW.H+n\)(e쑐m21-Djca -ЅI~u,1R -M -dg׶WfGwGm!ULbѾ6{!2$5UAJOY)A!:Y\RA; [>᲏A{c:Q>NBF1 d65z̠ҭ}3~|A2Gz>~h꤬L'i(lB`Tȋ@ sVN΃ӧD(0)z~TV- ~AK:380~6 U 2ns0+Udw'4-eMކXPtkg SE*Πܹ,F+PªI: G >' - }_dQsMϠWe/u}zM~ WG~an'[cK]ğA.{Pg";i_:ܠCI1{cS[3yjrEJ&$҄je `~&ξ~xmTJh y#B{ޮZMjNբQEjwYclբtTVZTEQtaz)=abQCJusS]/E|'YT@eO4TEĊaBO>Q =oD}AKL: TGՊEPg-bVc*_ i4:m4H&\C|"z@ת1' -έ&9kǤ^0n -Y|]8A;_&q*<(24P!?q,Ţi^F - |i+!V.hȇsQZ4Z)'(_A*9)4/ZBq7fW L͕eٖ ǏQiKPau:]]ݰv]-ba s.Mc~ aO5] '$3DSp|^p45 ]?I:G8BJJ7d.w{ -e r=| M/9B?/nY|`/ o[hiQ:ԗP'Phg^'U\~.:OϨ^nr3_c4g%\QCtVˠdz?_ 4فv¶*,'sJH(mmUЪ@ ^|V 4M!^*b&h:غ7ހMhruVPOTSB`k@7WQܲ4,7rAjΩ׋27LxRX;=; =35(sKͥ4'r“iO@ȘIV)?k@9ne]\Q< 5$FȨ|Y!9bMQ1Kr]Ů8(v σt*s2"0㨚{:;]H5Zt_\sGF8\|F -x"ŵX%6Kl(^;T2QOa_=HPI"na)P/u-KW(z(KlVeVe]FvNw mAZ?UB%-se -^Eyƍs6RcQzb9@+{k{ii\IݖX}fծAb^2]Y׭*{=e:$=L/YLyG2y2ėu47P _U\M3T˝tw2Kk9BARc8fުDJK - -T/!d*=h)Wqp(Wk {-콶aEge,&dV͵xGS/CYm}ZPY^ۛ2ۿYo%J(dL:fi L4o |MFHvbeSi&nۿ?TUiw!lC| -'_ji^id[b)*䶔T -Be(KJWP#P'G3)iJj> !>%=%vk ș9}N -w$4V(ǯJyA&Uv!$ -~y&n?>* -M-, -WAפm݆ -PwPѧ ˀ>`:8d -ƒ"< boa;'SE]b#QBd7j>~ -5밆SMtqS9^P5(iyK -7qzP!6Sڮ M܇OD&:HZFȸ7ګ@( -D6Jw`ES=eğ3:+u)@Ja!8XU^#88:{ÞLYXv[mAA}J"".4|~(1.J NRQ ->LV5:C;.ܮ(_sSS桩Z~f*z„.* -.!"7YVl+ZZG7 Orp l@ Q9U'YI3maJJA[wS!:Kj ?ڪ$/E41lm:yTUmMfS 0^Rh)gabC+Ug;N;Aur!vZ(CczO3)Sꂣɯ#KGNqM17;{]iE]Ӎ+sWQXti%dU1"=s^O%:4摮-4N[De-xm]KfjG~;Y_eY|skKғ#GDy -W}MA,{IЍrIW~ڠvO^lYz\F!LǍͅ33msq -p3)RT,J> @gT/-iW:f]nvNv.FbF- -h\b” -}IJDjkF>NJTFk -,~Nb^~pIQf^&q%e8'&g:(:nOJM.acd`d`b&F`(00iV6#;HPK -[6a1com/thoughtworks/qdox/model/JavaClassParent.classQN0~NCPA3SK.̢$Vǰ[+C.cNM?^P%N<< ]- -%~$C?\5g ({E%\K^a:\o ~F*cfV¼(XXmXb!o582噘hn߰ "7Sґy#ƚT\+o8vQn1GЩƩ]I8ˮ?/EdZB -i6LDˡtvqh#;k8PK -[6vL +com/thoughtworks/qdox/model/JavaField.classT]SU~ R(lK>X[ -R>RDz$Kغf#o:tz?9m1M3;s9?Ø1\c^˒\c܏!FyVbXzxSx(? cKޕ0Nt魊}Gvv7u۪T=i(0aXkhu hiY5uu F=,01T`-wSL]:C~Ȩ M!Yecξ.]S1\}ծ>dUu]m,Ė6LW ?SJe8QZh^:^qs%a'ֿĎ<+xB5j6]B=ȩmU* $RL},;Mk -RTm0 - QP0K ->L) -v. -qY.=|IYg2 -X`Y -3]9Vq%.E7a[̎7IO+APM*v!YRצn#_@i-5]4zp SC$Bo&w=gw 2»pS> _hb e?d0@(F<񖵏$(/+xܧϞN\N2Pϴqv0C|k~]y{u?uo Dp!i""i5q'$ )Eh(9+.ϞّgIި\{_d9YG7Eo"Wv6/@7k+ - -9cM^"έ/] -wv22VBr9Rg:uo+/:claԫJnP&{ti,tHCm'F?e4nѶ[,[wzć=IrjOy:Tul >|PK -[6a& ,com/thoughtworks/qdox/model/JavaMethod.classX |Syq%Lmp veㄬ$5b%4keYJdɑK[,]5)&+Ytڤ$('[K֮m>tkwvi߹W׊f{|ϽYУ tq<F; -1]IIG0rBG|!B/FЊ?0Ϟ -K'<—CS!3s! _iY(RhWk"ZoOan+>w2?=<ޤJi+] Geّ|[rW\xwSV&/\QW"UNY:@!t!$B[7̍ -8y3կۧI#ӓhV3Sd!#ΡߚкNE5B -\\gu񴵻uWyvy">buծxIbUl{c!2‡ -+5?vX~ʍsix7XHB-Eab䴺Ckb8?9SYR.Vux#›tx.ɜaԚ4Z G%@d6!]J)zc/.+$mY7:મ'uԂۧbEy8zk:emGo@G&Bh򰶐jDP~k(}8Ri][c>wK(+4,N؈aʹ&Xs5&;FW|X;ebZCl&EJ@*.%DKs(bXh% -B{2m Ҷ|*^_~^z N! -,^]8c>`9BqSNz,; [{Zr{Yi+ݙ)J2,qܛ@-0TvOkG3ei]/M L;M; -`İ,?.7b?&5*w㨉7bې75GL#)[WTTA03ڬBP `*q|obo3UXE@s n5Um7qV&SթzwCZj[duj42\E -d2zGx?&l1PͦjQZV+,KB!yXrĽP1QkdYc X&:TCg -(;쒐N=ge,N0 -w6ɢ;m2{~YkAcw -R76eF3YUH>Wt+_дEL@A(}XKr\f -`ĢGc=G" S^`d'S1^*{,Dt#(;[k0΍ A05AY⾡u4f3,:8-A4F\`bũ=cTrYILSm -"1J1`lߜP+A6W3r~~aJfd%Ǥ_3 +ڮTQ<F'[~'~/Y\o^`eP] || G Ӛ6Q ~QЀ<5m)8 -ov4F^PCWМrmP \j9dHeWGHsEi^C˟y/D{-վV]-;;z];* -8TaT2UeNaa~|vvvޏݭJ|9uԧw՜tk)uO.J5Њ4jOtt`ZJ -'1Q2FeW *uU0o0utqN6"k<v$r#8"-iJ $ e3X`DC[ `~ͷ1!e@v3N"h2$bl!]1#_/)|=`I4!{gOuuQ![ʲx C1K3C1lRt;XwtG(RO>$s%[UZzl awp;ؕ xV̻w{L @T ;Y}[ZLņDGkx?6s'6;o -{V6j5w׫]]sW)~|u>LY7:=B⼅ijJ'j>I?y+pZʭ_7[N{xVC[zbD4HI -;pYD|g5ou@V?5gF7oy΄N&O3a;{% aQfY -pؽҰeG :槜Zc[ntgPlwY>j7~'ydGu͑,oeGi()] _@3_S=%Tf<3_@6>u6ǖ֟`,+gʉ[aڗ=pM3F9W͔3}[0_=v^~! -jդ# -: -RUyvo^~k\>0t}^A6`~eٖ_2rM;,8ťoF'Ⓜ9 m5? 2s5]53n:dQf'834 J̬%ߧ4/H`l(k4S >vg*ZEA:bnu*BgLzb%SΚ!Ypqb'bb6h~ 5?'-hFخ)VaWqLxExK=§!i}}jn4He'EzI%zQ?$ȋzev -h_!}nEpPPuG$[M{Bs"ɟSweJ=fjd7qT&N1n*NohE`@!0T­ݥv7q/y\n}')`诣-:N - v1FB^rLPL :У|ֻPK -[6To ,com/thoughtworks/qdox/model/JavaSource.classW t\Unf2eڤi'%V3Y@ ՒHҔ̼$C'3KXٴ(ȢU(B -mj -в (&*&"fIx''_<Ac!6k%\,7hsEď~f -?㧸ŏQUC[q`*c 4  -?}w`P԰Kc6[{dWt/!+A<$r@N1"/ -( %Gxty>&JaUb(L5F\(^cJ -JS+uC)v,T [ -5ZUR1e|ESU$k-5V3T@U2^1h_~(ɡF#C -|:`XX9iJG*ŤXoHvG/GLig"{d.Tuin58KbryHPtcFl2+MD\gF\mZ){n_ܝNuxI/m53{s4V/rи/vdt$jV"ﲌAGp8v/.]qkO-ie71ԇtb5AM%H<9Ť.ɦ)V >[} -Xj5WEd"f2&p$#7uteƭOx=,O/:<5wFH’6e> =#,PWܗ0]Y9Xa5& -pN"VoV{gwW{_~;s ;')\;uP`JpTp%vpZ"9ER%h{M04ʷu`Tܵ&QN&j2f8l@D$23i[5">Kq0uUzbĆف+ee_c83ņbQ;<*-iHrZ]^c7㘢A<Ѷ҉wcrs.ked؋ɲ{wZaS|N B iu<0L)S/ҖTLm(-vxΤ5g!@=U,m_E,u-*u-:RSr(JbȤE]E-CH4e$:<4,][ -&ЀCX63C#-/3av#γeyމKKY1/di3.ቇ-`nr]OԨܦnh.t{Qt$+Uv܍[ -~'B,\KoaāULq$GEE@'3Y<_?Y -TA4* -Ax #G7\89z ->LcT c3ݦu y3",| -fN pN$܊N0oewƚκ` :Ū 2o=><*#Ux@}jU1 -OxRSjVWu=Us^Pz/GzzofI9޶ a ng|z(†t(=,4;32Xzr;ʤxF)\.ķm XK;.W̖6XG+f"^ ܹ3 hH'n9}LɹIq-s׻c$8|ƼW@Yksޡ2 ̼QQ5'NIVJSBc-9>Aoww@sDBv-bBI!kf#a-مQjIkZ. nbŔ .6r&ډ*f:)ndnt&HwsR;md@ mI @SZmxM2_itfҧ"jEP/BD\lBXuUuwQub?2d/s=֛< j~-G3p? (^+cڼn!3ޯ~Dw7:_VmB~ w!*{ 57up6ҋDЦTK \BRmj uzTX2\TmJ]ko2C,Y2[I#$V]=?(sBX"`.QʰgrY uBKBبnEe!DZhojw*bKaβhoiMrR_˴\{ӵYT:KVccJwNf/W++-YmUr -N'חa/XRBJͲW6UђrdjmљM4!$ZKXՒvkG,ٔhI҇Ml{={0ޗOLŝuy+TwT؁X 鴓ni+s9%_ͬs$od2ýr;ݔ(rgץ:;lS\X)N$HRm&Tk -lJ\p$@7Iy Aק7dtptr5jm48JI8ij0 -M8d܃&ԚvbYG,/ -5xjf$/݁״P:zzI}2ȺY>=f]^`qBs뼍Glj.Oiq۠%r2*I|{jEI~eACNWօ8HƝC#c5B~/R!F+"9p9x<ƾ 7㘋!);ݻL4^cnbj<8%HNw4/\XGAXz Ի_!t&u2/A5ƺ*Ck[:Ycn&,ݖ,yY _8%lٲMx'ūd$ka͍6ރmفlܯ{qGWrwITҝr`AQ/:1Kvٲ[--7͖bK w҂hDmOBKz[a;N[ڴZG.{l{m'tj/lEߏï5_m»aXNmI-A9da9b1nGmyqƕm6S r\:\|2,m |ҖO1d4Eyd02u*pZe|xA%rnKEnKڟ5n;,fsa 1gvtD&5n{0FG\IȸX,X>0<}uF^\I1pRiʹl6U?i>5Z TR\8XM*P)2|A?t_ԞQ"E9o -KT=CՌ8t*rq{2dRqP8,E#s9o: fZVΝҍZZub.y>1BN i'۝Gn`PʲPkXIfZ?Y숥ט"ù4U}4dSp+u-a/ǭ\uu@t+Y&& 3uѱ3&{nMj2=vvUC˼F7dgW'IoNAF^+e'`礬P^q -:x8fXykB61E_0hc(̗e^1;1+$~+ȇr~iӐ]҇ꃿ'ͮن{=*{=~w?HJ#է`E$2r -By$ʫ{aGs -4KNbTO 1"*\j#0O)8bzn }pk8VE<&p159e(dnRpvS[BvKG`x]#uQ -T2TArqE9֓,2?{{ڔtzu?RÅ]rh8>i8~ -KPR~'A9ç0B/fi$f<^)s8s{1ό xan|{Qu'XԃdAxOT(`8jKb_j{m9F!%E~\,5%u~߲@e a,R찿2ǴX@zX̖y<7a%bz>\}#ce )3abIb+i4FzDQOSm&\p -f<&6x;S}ć7,"jtRd5d#l1>i'(ϋ<o\orD#h -W+\'}3G= 3M0E%;wh_]=J:q*Xİ0XsK8aj9R &恠7Xc?eɝvW -r@LoAӺBո7GQ75o2i1x!1`<362n$ ݌{IyO}{m_}? 3:ŏJ&uc.zCe?iJd>Jk: -ך<@YڧVEF 􁠄 j%|͋WO4b;b{k^:>k{meo(@#fWz3emcfT"Amўvjj[7L3ﯸ )NE?څ6_'}WCuk3.=O]z?^N&'5湟1:/_b57TF+(*8A !Sw -!6΢s}&G%UTn'2VKjl> -U|cԕK7t^^Nu[āF׏>f9lTDZZWA!q{xsgFbWM4"am0o+ ƩjG\ưZ?3T^g&ncֿ_hb^K) A2/bDb_—JxE*drH{5Uo&)ҷDzK[XlˢH? -gA<5>584:~q - Da)N;sBbΙ҉ŬuP>v:IY"d"L'F -9;3ͽ`{:Aվt2JLT1>,'9+L^֯؅NwΕr5ƐaÀN&hr"tRX2goQ/DW̃ndE6+lzC*g% L;ykRd=L[2E -{V4͌%E2D -U~pή5#K N3&f`h'bU\rQC}+.Qp\ߴa3ũ) -w@底r_L3\1qYZQc&q,%RCz) - 0So%s0zOS}%gi-@b4l%=M[$p V=ʳkXw(\kr]zޭ;?LѓJ{d#N1Cn7qi2|M|{e Gd`~&/M|ǃlZ&t3/x61&L Ygdx -O -[{&>$&L2qMN_ǟY)ł=d4g\A(%ꩴtE5O -M$ħwGyזTwl;w_ھ.ՙZU~҅Vrːf $.~o`}oi²\Y -}.X6uнo7l^k]7"y>xj5i+3]63i-wwc ?O7NԠM̂\%ͪfyٿIrΉ\1 --h&GnB7Q}]3l"xcZk&T8DϚSE@IOWhxhNӂ9iݫYsV@ruBrQ$qP.z.NPOX`vѡ -PMOS>)7FW^B60(7+1zQ%.pn)*UZ-+W}*]uw xF%2Wߌ -!N++9ldV+qRqʏfGLoץH :& -˕ULͰ\e6C!EXWxPl]FC,ҰT]c+ ײע:8ne| Lnhƈ\{=DOt5y=lYlB?(%D(5q靻dz,.6.`vֆTN'bgx PXRu3gn^~f^zYu K7-.ְsV+5eFVW -;"¦vWh< -fdGL^yEԓ*~ѼΤYrɲ{V=oH[啶\Riaϖȷka* )WnKH*7r5 gpeNPK -[6Jy!7com/thoughtworks/qdox/model/util/OrderedMap$Entry.classS[OQNeXnU[A%K[[xA/'qv)(9sfo期>^LЌ~sqYDN\aWv;\q/\ y0.n%6sy]}^SYSyveMMC -E+ 9&COQKdp4EsyAicE5)+3)E[TF\yӠj|^54XT<07d32YnʹBޠ\2sJΉ".Y.ۚ+8chq(PK -[6w911com/thoughtworks/qdox/model/util/OrderedMap.classT]W[Eݓ{nJi,*h[hBB[kZm " - {+|p-k|c-Dss%P|9s9{93# `Bd8#7UCeni(6(oJOn2tPÌY݆l -ӍtJW 1T#e ğJS3ϬuzIMa{™@dYjݐʒt[KuFf>o9WI4W -^Zy5na(& Z;Ng$W[ȴu\[z&+HxR%]-*O -rpWOahUG͖;FM-K-^q.K_kړ5CrM.o+sbU*u"#a.^lx5.)7[NE޳՝:lӣ9&ryP0g3<29 XE<1 -o |G0 %s_4;[ժVۭKxK:)hLV݃Z;h+P; -h5- -,(/'1(sre]/wK]6}6 -[(8/^EDb,iOqXAΌv - -U.jH*_ŠF.b>Ι;^B_̍"D b;H~t@2."a2m9d}km]y ߻D/ k2C*,!)0;S/0H'%5~xh~{럿QyJ(HqR\e/$ sOp!!D?A !is>t3?u+ݮ!+>N=ED3զ ‰qmq -GO -sLCPK -[6ė 0com/thoughtworks/qdox/model/util/TagParser.classVVW&&@Bm?P"CrLFLL|7ZmeZ}>@M_L(۲V>g|? bXp*.H1)U)&u74cB1ܔ[aD;n㎊i -ݘƔ] -0"} -ݘW *MX%˽ W2egUjqU8is@KwΘyӱ7y`4q7oWsywv*Y{#^dBZx͚NE8 -:Hkd=X$|b f)s,[Yl3>䚹yPP }_%YYbrC6' -ǣ2m\ -b8"1s}##ʮe$̲LJoY75ġf'.7buI6rN:)͒t -z&쪓7,FgƤ *8h=a{ -GF-K0sL*WdDsHfYVH":aDE^GdԤ/{Kc -E%:x@+WUW-VQW8 CD7.*0,*(`OG"#lx{"Wڳ;"ܹ͒kn -ʛrv[#?ڮF^҈gZ[͌ -a9+WZJ%/$6\{!'fWwaʨ S2]w1T/=͌+rzAd -tfߨ3M{*3؝sZGɗY@umD"M26a-P -<]Znن-laxCr?i -P "l5-jLK5Q4zq1#ccƘjE0jGfh0:֠Ei -rz8B(,0m,y vxC{Tt0j;6~!`}qzr9:Gk4^|[ߡ+.=C}A= _Iɸ`ZRi2T|`d:0 A`p1u+أu}%6{Wh9" j;1Y|'$&wM=lsgNGWR~k#?侫} )v.v_Xp$5JхX7^fCIb'l -"I|6S'qӴ_YVn:||ﷶQXBw~ -&GkPK -[6E -%^*com/thoughtworks/qdox/parser/Builder.classN1OA񂾀qt -F2b> 2v;3]Ks4*Np@q)A7L; \i(POEg T3j*CiJ߸sSijtpO:?Q,o%.44E, \4.+5c_re?˵0+Ip^RwVL'v3,NЧ~YzMx5;.ˍ -4=h9帍v`PK -[6ԟ8,)X2com/thoughtworks/qdox/parser/impl/JFlexLexer.class{|T̝{w޽[fHRB -$ ! !( -PT ((bZ1{v}gYsf ->?sf̙3gνL^|ΦqfpAENuaM7 -'w#=("!Ax5$xIɂqp` -Bx;GHG`:c *nN:c#=z^87B&A?,AqGCc(6p@H]<r\|u\lC0\|O9],S]ŋ|Ow9JJr q8󌩮ZR[ZU;riD@XR2;gڸqSf -FdQ^1'Cqf/hPRPPX]WXg0[$ reVO_b1?L=+{jnAN~I(qpBec&dOv"S867:@91{z1T8Sǚa3\ΔY+.H9gfVV,? c -)c`+fT/>5UK`;дIgΝ:p%? @eSAc&XΚV4!'{̤ra3h%jL] ~Ιf/66RZ֤̩$).x@/T+#+J+E8yyp E5ӳa^% I]&RUKm\SkYT[ -geEUrr*ˤڜ|ؙM -`7ꨞ7eK,]UEԂz*W-clA[j(a'蔱eedTr1,).TmsMxUUչGj1Uea8jŢK+RtUM(]jD -YP|Lڥ5&y`I6Nf>p'K͍έ`\WN/-TkTQ/^Y _P%W/\\Z$RYhqeqG6Z -  |^Yg;Gj-/PcTdŜqlkqb -JMSwaU#-c'(HۦKkH"cҪ&jFw}94Aެ<ܼVVG-iL2B(E֘mVvǼáb]y%:+ǾN+AB*^ZMu4fjs#GpuY:\y1jWFӕ#JrkjAE˳kjJWUG.-(_tn'Z\Yt~DcZs( -Wo ً#&Hꪢ}x({.,>?Uу24L6>h -kDs -̦Mw4_be?Z*iA!oSQF-+]2'evEKk"*.nho<ɶ->gMl -lvam¿C&n3y {fpcɮel+߁ -nF؉p -[YR+ɺ8/K+< '6-OJt-;̻5=8ޠ7}qz>`P&ȳԁ|P@>֨^>4ˇ.G𑀣|49p\1cu 0/냡<$?!M.,1Bʋx2zS47֦j3x < gs<>^i+.ub5('Vj!h<5w k+|é,tva,NUzsLvbD@(v N'tz_/kq.OHraJ @S[/Cg&C JU feJe~ -ʥYUT9_;*WbWQ_5(up6J!!P^@Uae==V6y -ӍtbBh -4qv)~S”f] lNAorB$yػDö&ٷjC;FŞ7qX(կE"^h. -G^cGfm -M/ -dw -玟YwQhߥk.J~1.oZ)3@WRc?LfߊUt)VAwV9>/=Xx-a -2 ]((zSԢg8(QsT!uv}L[kј -a< -=d]%@ɦGeR&<ZfeiXǏ -kq -XJ6pOֵ9 [owܵmhu|+pY){+ -7W&6w4MfChb90؜SxÍ<&_[69l`s|h9lMh}y/.5l7j#~f;OՊ[ZK٭  - -{Z|s{ ޖ-l C_}Ζ ARǛfLv*xj?~ wͽ;/?{Zby>oӣE|sxZq@uGq4<ϙ N!se;U="Qv촱=A4}L ;v3qrM|2?yy;ɵs:Wh ӧt4&@z9yMuqmn8;N^r: ƄKtzWnp7q7)>7; -%V'mSZI 'oO hZ -d'& ,n7'?O|&%!lDl&g76-?'n^f+ؕepkJr_&loVw7 -#\Ů6+U]hqL NǶq -e`#g)aL݊#="8dwZ#NQY=Lp漍~ tC\ -U -[CP@mࣸr;y_>@  \WI8U -;w;Oq -J]雊.D,8CC!&sՄw6@{N3pobpF& lmDѺ BO*_U50Vqb?n  -!A pŪr)hzP %^ t=,Tf™$*Tr.^>hdOlճ,?DhhW -tYH%ֺlOw%BED\֥H#iSb@=KM؞i+ӣgBh+gjthfs]tm~٦U緝;q*֔h)Vz.ܨBuGMnܶqF4э& -NS,v|>7z-;֞I{OvM Nόe,EpY3 Z`k1nQ7*5WMZem6}PEG9hQ(sf@!IK-um`?xA 4"$x3Ei55o?`g7M E/KLzX= -3ۅVR -d,DktPLX Ps@0`y}3.tM?: -fNO oT=}њ+=v llLb&tƒ^7'8KVu~HMUieҪHMz--CӗV__Rs-q0^U]lAW'עt1}Yͯ^' .:Ϩ0U[mrh%с?5f6s]63R˪,˨e˰VDXc&1kLۨ%߁[yR2gkO7u`tlKb3X g߬Y,>ϋiφv)ƴˠ]ӎ@{^L{>Ĵ+0}>+cڋ]ӮЮi/vmL{)> -@=-g+h_lo KlMfcڗA{M1І?>>oZGZmlM6oy[6lnfwڼ[h -~"mvv{wؼ:$Nx7F\ -fD K{𯪬Q^vuP|"cl]fL aQUoHi -pvQ-'-&ɇO@f#Ʋ/Q!sZ*9F3jVkoe`:S2LwK1Lua* azLS,䨗 -~"kpt|&,һz:@EZѡ[1m #̝~%29̌77Yq1Dň18]W?++eް8\a93_X=(go3q6ŔS~YTf];l%S=>qѹ T(K<ڴo:31*=QP/])o -QK?fLmS&`Ytg% ~JϨ~lIJ. -w#STHYZZHKrDkεS=CZkB];rHm0gJSALS32Ie(KQ.p`Cl2 -˧v0 {jN4=af5 y PS -`0<$zL#T6UhWjikS!uש֝z-&2y̩Lb̒Y)d e -mk$, !:C?^{[2<&7>" v(Ǜm5C#nc耍v#ԄC}k W 9*q -˷a췟,H.&!2|6+Kdž*xe+V*XEjV,f e)۩,g6b_YE>MTAF^7g'܀)@o2t;Cb900|֥&))W)_<5 -AɈq Zmг2uMXK[ՎP:XM -JL@Te̫d .z*an6ZTI%ToF^MPxܴxt)ww^ZyQ,5Y#,$&=ʺx9P1.)j[h;qR hgc3]ۼ~`5c1ZhN7P&?z",} }5cxacqeRzHtS7xOF7>_8>޸$8}>P/) V>o|K,dwfx> u`}~CP0Vea tDn$=Hr -vo8IXb|jg}+Z\(ng:wl_J -;5 /i!mM3 - -^Dt& IF-!vxK!#NIˎ@/eiZ`֫c¶ -6PgwjMmԝت*#4(%#~, :a6r-u^ut\ -074|hL|Z6>2hB4QiycP$Wʀ9Hrco,ȯ]AOh񫗨Yy3zn8"-K K.;5²1'C;4:# -⨴U!&cE7_ac KX -c:j3d8! x~<a.Mٶ\?r({P΂2/a̓{1lhwުSF(coZ'l[llT(MA/>.b҇Iߘ8AnC@%o t @%Z%y; 3P 2R;NFȳuyUlNMB$솏d9yCR'~z[OV=G>Fϫi>׉5n~Eդggvc -:1]D@øؾޒgnqK4toNE$9!c;,5N=a̓z,fm@lxMCD)& -tB0'RL\D"GNcIO1m8ijZb\#iEɓ7b67;g;~{G$RrNjn@%% -P]|z̺<'Vf;TP+HI[;Xg+N4{s6ŀl-V_Վ[.nr< LFذ `NŬh˝s784^gw3Q6YtYO>>2HO,Qt`)#KXz'[+DI `[@] bN1-{pvP`QAfO!r?Ec|\-p)6bQLl>D b";E#^1-/뢒%DTTo"(XbbJXt(jeXW)yjX\szeبDqLlV.[5brئ\'nR6vCYܬ"nQ=QqrBܮ<)P^7DKNܭ$+{C/tqHaGDxx8Mw%ӹx\D'uS^O}P&>K'93}\/_k}F_-׊z~Y)~o鷋}O.~ -oZ*׏B^UTSu#?UMKգ_T0j^jGM6Qjv4R;EjcXv7֪a*qأ5}@:xXb<5POkjouk3~Q'y)u[nZ6BGTwP-vUSԳ,wwoff'IjY>iP2U6Ϛ *EK:sI}ܥܭeU1ԏ̻Տ{ i+9[{egu_o'__(hjtҜ3Az&k>Mz-9_K\ђ<[dv-s_Kߵ^M -h o6I -FzGi9ZHNzkޅo]M^x -hSbVmw6ݻW;{6V=}\+>yʽk]y_>%i_R}]o|o}C|}ck?&j|y?}U)_C-u+o]0|[|,mc>ֺDke/Cϖz̧Lqse,w@S^`P{d7(c}}[to~}ӳ}G?e1%s1/۷@9|7WDӷ.bN&}Wb5,ŷ -52|%Tx?Ow.go龫[|;Q"Da -ES KZaQXw8.`MhCc%ao&nalxe -d}ᅪ0ȿ,($`"]WeߍIZ'.hT梁R-[hIhHb)ŋhT=hT'R -MF&ZF'J%Im$P.Jڃ@R(M:jұ(uE],jQ72sV+lQzZˢ(S:ˀX¾ҹt -_X}l, 4h%jY4ܢFYe[cZk8[4A^t)22W29 m!LL -L #?(S#?$S"?l{2ddȏve,dM'dkȏ˴rL+DniOʴgOvcV#?-=l dZe.E~Kt%{YmC{ds_#!;O1_7edz-;^,۲i,eNǑߗ~G@v#y)DzOdo?]z"&T .CBvK{dtײȮ;]@^v "Wv-Qv'9m/2ÅmCf")3 %3C>%3Lv̭\/DAdUvY^^ǻdYᏐ -٣7m!{e}/{Y g9({NEDs#rt=GN쬃QQ"SJԢ-PTTda|pF1hPPP\PcOM@p#U~JBB!D݉mP! !!!! -B{tҁ#a'΄]v#Iݩ&AؓaoЇ}p b5 aAP#N8p$vhl1c s 'S&"L"a>V'Sg!L!T!#L#t³Q0%3 gCx.y8p6U`sZPNV!c_ -#T",BBFXpB -Z",CXJW`m%E~*^B6\*˺^.תWPJfYn ]G6^O7PFMI[i,ɢԵfV.jBx+n=N}uw.» Cx/}dZ"aQ "|5>Jx16$|I§&|Y';?_ |%— _!|5 '$7[oC.{~@!G~B)g~A%"o #?HτJI)D9B(UBA$t$z }~BI L  %~ -WbUl#z___#OPK -[60com/thoughtworks/qdox/parser/impl/Parser$1.classK -0jc\AgW -=Aۦ&J ?ޏ'<,10ĪՉ${B\ͤ0OTm4WOƛn)o>]@u-HCuwB&01?aPK -[6n4com/thoughtworks/qdox/parser/impl/Parser$Value.classRMo@}|o:MJ܊BRHqdc?ā@ȱؙs5uo"KX%th9M>%ٔ_) O(}kN;:3 -濁̲ȗ\w=7Ol>-#OpPK -[6>h -H7.com/thoughtworks/qdox/parser/impl/Parser.classͼg`6,z0ƀ` -8P IH!^^)!{=ɽ7w|6&!xIͬViOy}B~dyskss{Ĺv;`G!bv""ٹ[; O;#`CyX;@(DiDDv)ӀgC/Dz9"w^AՈٹ;ݝFD2̛a筈c;0"ba;DP|1hg)/I` -2|}!,?9ϸKo?T)ί!_8 -ߑ)VB+*Dj$@ -P Rp#U*4@VV1k%nҪ56`jN;hViUgp]]VA{zjKHf"Gl 50QqPp2?"NR#(Fk5FZkHS9ZM"ϣ)Zj5UiZi5R堖d>*_bV@2%ӸA~j>︷@BjD@b-oE{${@-EoeQX*;U B堀U0\VbrhUauVUZ>3Z> Z+ZZ;ZZ~'Z~Z~7Z~ZZ[_kvvIҎND;QiN\;-J;mN;I;额n顝^N_@ P ѪVuZjV:DC:Lõ:B#:J:FcڤqZ ZmDNdNjVjuVkuVgjuVgkuVjuVkuV[PXKT˴\+RZkZznFnfnVnvjV۵ڡNjVwiuVhuViuVhViVhViVOhVOiVhViV/hV/iVhViVohVoiVhViVhViVhViV_hV_iVhViV?hV?i/~Uj?h`Zn -J:UunvMnD)ڍj7UiM׮ݘvB-*mn[)܊Ҫj)BE嵥R7n,)]^R -9TEe7&mXJ9s]#EjveEuMQE -$)Y-(_[k6$_SFxAEU0bhvuER +\3fUeU5+VW8rÀEUեU֬-0X\p9?D: -ZzəNMsV)?IEI?Ο>= fF:D̚E$Iɚ1#ٹ3&C&@=TМ9S$SA31=waRfRdMJr̟ͺ7sބlpissL -ȚzkrǨI3ġ5+ ) YhGI3Q7pF3hp]rz|Ɯܜ\Dkz ? -Bn\n -ssfO93MG= -?Q\p>?ߑZ`nΌv"cUrS,Ɲ73-A'Lʚǚu'PKsg̀ =΂9\[W̡ӍƸ$2uI0>Oz,=y9s̝9zQ)gP̮Rsf%3IYrfCS-KFU51?#eB+1HkPs&gO`` o".wRbfPiCǘg0)'dXK4k8ћsfSGOϚ } sfφv嫪u 85,.()ɪJ$777k -\?]S8UK…܁NZ -gSQitK7kn)ڲ<`# +V6{(cP>U\NVTTP2t[SossK)K}:=UQQi ѝ5餲r[aʒeq5e -䜻qm>+̦hK*,]C.q5mj)_+V*VUC2rԡ\Fs-Gae=WR'$fԮY^Z5 x^eqQyAQUx+tkVQ׫ktmm5 -W.WTRQޤ4R5E455hUUU1.&ńڊ -ŴN(@ۖ'ۺ*Rz&j/bQqEMBBXTՔ2R*j&\ --{RJj׬MBŤ$AKg-!:(^(=Wa-LB!^VZڵ%s+]͋=M&bw&-[͹rSk>ơҪKk&bЛsBZ/s-@Qr@n~pTyy[YPuӉ 0+K6R@ZAcmW.OFfmު ͤ5kuIeQ1TrkȜڪbR7X?T;䶰.w;ݎQ:*;yuE܌sscF9w;9v,Oo u;]\r32֍'HsU|dΟǑN6?礨#*D$glԙ ̉=Cn/w͌}ܾ_u8=QL:sy18OaYz0,tIkASWQ ::i7NSuJ33әumQ:а;0fCCQwKեh Mshg*+iI)Elh`|C} w:䎰;"Q7u8KX3p -K9Y!誓SN| -ܣZ[d5UK9&\ 373oLwΩiQ7Ɲ90aV ^ÝNƈusݩ3uRڠua,ѨsR]^^VLz)-ڪu6*,2ɝIx ]BĶOQw;T`uaw~]F݅"焨{ [ZQ&.v`I"u:22[Y-%:R]J*,usAY+<303bEU;6AQ'Cg<^/O5ZKZ5}4iԯrElnEI2 $fy[Amog@O4yVRbYeӌШڎHO%Uw[ Ke%4x{du5S62\MsGgouM*).*c^/)ZYB.M؄=ЈG'd64~'E ۠ڷmnN>EԠTmF|F5y F -@Y3pI70u@ >D01nz-)za鸗ɍ![Hh -2h*1V&EĠM&͐Fb~y3.id#QRxٸWMl)'HܐOQl> ` -ȂJpK4=NFs6y)yףam5+E~MLl5Y'ېi5,og'-K-̟{78^{A[RbA^nF~ -9tiy9n|y, 7FFOB&HȘtbs|i`ƻ=3R"s{r-ri\OJkRMESFBf&YF|s> -(Jʴ -%.#:! TdL_M4P:Us%!5D:#qLtlZ컇lMo[Z429qsMhxk_lJ:A sR2 V>gNMUiњс_b FEM9Y!_\v#iT^Z'_V9]o]V.kxU_UVSZTq{eJ{"{W%v -ʔʺ! }>)#n5QQUt'MɔʶZ7[Ce8TSߢ'(ٷ3Y%%YM^#SFy)36qn5HpKm_{d>I*C#_oɵT{"յ]e0`f,یKCs}=¿sSbeխN>DU49cV?pnGDI> -GZk -Ag?VλEk1+=5l4(3f-|܈fZ>"Q&WjQVYӅKqZ*teY0Jsf}X*pКnwl"Ѻ5Ұa%6erYu'wRсE>X":˛BB rӝɴETʻ(ȻI~go>(b|飖>&gk+O%}g?'"/%JkuoVwĿ'!$Jgs_Uo'#?sk/ {?n -C>WĻ>D|R|2B|4Ӊ|xo[*&MoK|ߞ#~gw ]#$WM|fC|ߏ~ ! -È'~DI?Z -waz-ͲtٖNlN8Gi{|J\6ң -ΚqLXc:әt3\gg>N!Ӆ":.q2]~q,]~8LN}1]i*K؏Aj!r "=sC۸5iaя -ZGJg- -T4i@$B"mum.Um_'Mw߸Uݖ=QRmC"63n҅h!ZSF"p$DwmxIdb-01Q9d{=Itj ruqj)R: -!*훔h$g#P۾є:XIq[BctIa*W5mقIT…G -֏DOIhn5;98MdfJ&J:GҎv]/$*/VPz~AațQPHAzI^01qxH$&'UFcC"1q4aЋļ>q/i!l_i/iic*liiob"7p8HFL\Cכ77[LIן+{yGVf}b"}cb'~,%M'8ȫ$lEgܟqHQ0exx, ٌE91 -I1 (SVTo%4nT^LKijD -YY#ael0<; -+&>+Hփr_LzQӛ|FGRG!O!O=M>isR1z0/-^1Zjx{ݐ7 y3&>}˘mӨww5=S>@>2~LfS#p_.p_}핁|c!`L-Ɍ^+_La5?ѠF%F?LL(:28(C\CB$6DlHĐCrewH:ELz"!qnY) -H)ƔږcLRWxʎ&W'28~Fa ] Mn= iH/CziHCϐ 0d! lC2̶c[:ґtc,k8Kt<,K'XmDKs,ddKXkTKyC@ M#f"&&t7dV19ې9\CR`7d! \EgL>J1 -S}6OҒ)Z>-yc4aT>Gq'ٰySEҤ6[ԏ햆Mha; qg4/4y$`7:v3Pv ->&( gdGg(aCcf/Ԃ|[Қ5oikkJig`@ -׉|24p l–B4ͮ jLY=̽F^FېL -+foslƔٟ%v7C1: @~|!CyaGlqaGR|&#v9͡}Glt(GA|lb*Y}=dOk^~2Xgo@kA~X -fn;;;;;;;{w-7˖;m˝hͱNNNrrY;~n7oƱi2Xζ9f˹fyf+o ЖEv<h]l[Rۯl"rVbRێܕUV^f=>>Wn;(sk[T8Z+_gmm!vmaHoG~;1vk&;x[ Ͷm'zObb={t[}gey9<|Gig컕W|Yz/^fVN;U&j8Y->ɿn[yYyu,6q|6nOOH>(kfD%;RsKvvSdly;DH!D\ "V޹Ptq.}K0OE99umsDp7XV Fo蒇!i1v)UwB -K<|[7чd(|O'(qh^Ow]d/J.2)ه}~O@Jb%Rrv2l"fbD&=5p¹Ex'~)bEd;iS+*Ds9+S8P/N1-g -~M~hun!疀&9ml /kTӲn.JX؟AC*npUήOɩ8 qU%4TFcWm|ѭRl(=1vq@Q4oYO0mfc -o#ݠ2Q$&ZMG~DOAyH,uEcbx"b> -Kּ^\¥$tib~6[1O$&KSL X}yUTYv GnSm(9ds|Ho3|هeŬ~}X> -9tod]b#CL7v-z;λ"yOLr3XLLBYR,.jU"W;fb1Mp -qH0xFER|ތ9/~l(ϥ,D?tqa}/lh/Hw&h|+:8߉%f!UgPRZj~жz$4TŁ8dץ;2w9/"3oqK1⭪?,3R^ -^Rhg!D\ND9鬥TFTqNw dB^(6ANJqa{Xmר_=goP^hXqX| Ra1,VcؚJNk䨄+9(vQVg+w(@:+wIm½Hdv# L] -SߒZӒb|vcdZ) - M' -6 -ä4!Y<0;I˄ŊH'|cr>< ]W9{ȡ .G{? dhՠ:ѕC|*TO]_o!\ۥn;z5qtMtU4K9tѵ.*^G ҕK<"H)tB׽t=۸]I)tJ"躃 -Qt -J ZMzItnе.J56}߾[t}K9'k$]zW+?![G>ݳDoR64wlfb]_3]%rDhȞmFe;1ı˄{@bS;v uzKzdzw -3C*x%Nq.E۶TZ鉐ؙ[,E?SM޲4yN*o-bK]d`wr]QVt2:n,~*u5O>[8}Y.ٜ^s8=r:qz$4VfCۿK\@붺p '5$=$/ň[t C\Wx1N qs.N_ٜӓ8}9Gq -NȻPzxPr~]R:YB6uuxhoa9ꘓat.t=nlkwCt{vMe. q$qd](j9/.4 -F {cF%_a&l=E&Fٹn ΣŽqOGs-ڣV@zoA:s= T1xCճ7߲]jA]6G^ԩ{P{I:RtW;U_qNrzǚz7^Fe/wkY`;a^A;lf͉V9WdZKn.ׇ-;ŝuUMZg`+rf6.Xp׻VKa61=K=TN*CYw0z'Zs 7/!n4X -HKf6dw | LECK<5y)B?XGJDwlyl*"caxFȗ(-?RcW &USMvRgd<`59\pS59MrT TKwPcj:yV-v^RKWU*qSΧjZ*S 5Q\J-PkՁ`TUժFRN='R%ժÓ6NTG'6%]KLmNMMmIzP:+uNꂤwՅIKU& PW[k=uLmoU;Wתûԃ{#Gգ'ՓW3wճ /Ջo+_ԫ_Z7ѩ]t[>էBR_=V}ǫl~%RשwYOvJ}ܐ~Ѝi#7q}"Y69KNw;&q;%w;'ws$t't{$q{'q3p%Oq'Os'/r&/qG$W#pG'K>= 4wBEnv)Sv'H~ם?wvH-H/wqd$2]Eƻ%4R變Te*Դ!?mbEڒP˴PMigڤ]jvicڶPiτ=agڿBcA>cB -L>544}vhXЈBׇH?24>}s(+ЄBׇrw&`hJBuhFB3 dh*ƅxC "Ё١EޥewE zԧ"EsS>pWFC;7y9sBL\NAp30I˲4$FxFOqR]eLi81p&֋38-`lӱ^+ZZ@[>v%o:0vN΀.n^SoL>e؟q@A==8qpG07qzqXlwx'x8#^2NP2N$sz=px뉳ӽ(NN&$4g&Ĥ8J9qkW8' 2.KGyE=|-f,px[_d\S^A=,g\^c%Zƃ=>Ho$C22ylo=md< C$*;|Ps!6'cȱl28C7C6r$CN&MSqr0QiY{G!nq! |C.l5Bo*E\K<>u!y|rCŕDy$jF|KMD0RQ T@n%Rsvw;G2]]==PJo@&Y_@?@?OGPh<C#_` $&# v*nLC*L<;y 5B @]R!Ur*AV@U(O+] -k @w\Dku(f=2nYPpȎH>:zϛ11&g<9f<$sؘĎNe4fi3ݘ;99\.<.|_,"_^w/eeKWhvbvQ7dgsrs;ɩjB^:u 17 Q; - B8-Fr `)i "r H=ј|VY __2{#Y\ѷV%f)`(ćq=TU⪻F8Ai3)%lef21ȵ<_GZ3V1aC;q2v>OXe<gU&:r;_,Dơ&23q8D!kBU\m5cٵ[똹w71sLܭ#w36fìvÝXE.,pb.xY:̽1As3>(cFoE,|+y?gO{ xsy7E LbaRw_g|M[3?6 ߱{Yx̧gCsQ|ҏgƟ0)g4d@?g /Mm_ٯ6\o.˽^҅0-< -_/4gQ8l>q/,?q36{{m~Ia -7֒]W+^8fgֆm1sfϝʞ{#scݓ=w!{]fe+W, ỼEˈbh Z2&%R -Jfq 8PXcg@eO|67yP5VCP0t1灿J濚r~,>u5G_fv :&33oڦGDdz7[gw" Ob<gv'Cb1M*u:g9`fΊtq6svl*98(cg{w;aq1]:3ڥ3ݼ(3s -cV/e:/^Ma73s \V ͐۹( -smF`x'.ƻ_si -ϐ<`,|Ϻ1QC,3>at~f|Yy_!%7^f+2P/n2M[w{3[?`CƏlQ32ZE>cF}K~57\AM]rUI?Uz`wh9U3N`6Cݽ` ^H5f?4 M(+h%UFf'=)cKq -M}C]삱ؙo 8nSv`vC Ávk7|_a,?*ဍn Y˔=\&.Tfbf ޣ~Yh7@8Wz^F%?j -]{+݃n7{i26afu.W3{\q#zb{V탻U{zݭ=}/Vgk c7;=9jUӪ=)Ye7h79Ynv7ꡠzDֻ{s1?"&0/cf`|!Ƈa|1`|)Ƨa|9_`|%Ɨ_a|5`|-Ʒa|=?`#Ə?a3`+Ưa;`'1 +0ɸ(_QA+ I@At - [ )Aw@RI???2)Hg 㟃6%HW _t1-Hw ſɈ9#HO ]{WWd'H  2 d/ _aK:ԗ.0_@2 t_AGRϹCddPte -G_F)B2b/%}8Kҗ1J_-}#^"/["f/[#n -"/"v/#~"/;"/Ce"/;# /""/#/{""/{#2՗}_}֗c}Q֗g}9֗k}9֗Co}9חs}9Qח#r"/G"r/G#r "/"r/@xDb_f!r/}9ٗ9ɾɈ˾\f_NEt4g_!Br:b/g J2qڗ3}9 ڗix˹ؾDm_GDn_"vr!/!~@Dp_.F Dq_.E2Dr_!r9/}YRt_@TJu_Bdeb/Btjw_#r -b/+}Y8˵<ޗUFe -"/k}Qߗ}ߗ}y/EaXp|yV<_/Z`5c&|y<_u/7?AIdc}y -&_n=Η@O頛}y艾<$_z/=ŗn幠<|y>龼 _n=ӗˋ@Šs}y)y |_^z/+A/UjЋ}y -%ԗׂ^@/W+}y##҅ϫ/GI2=ٶJ9rzea폕tD/f>| 9p-&JiZ$oPK -[6b,(com/thoughtworks/qdox/parser/Lexer.classEON@ iR 8Rib[ll`5|F CbppIKB ->xcVaJH<O/]:o*4=AU30TG[w0l!׶s?ZliƁ]\E)^կ -fDž%crvL k3HEp"D1Is&}#PK -[6c[1com/thoughtworks/qdox/parser/ParseException.classSnQ=B+|XZa֏6cS45Mc ..AI&>e{AZ?3sΜ9g_~ e$.ᆌֹ)EQ^EF榄[6B=2X!Ҵ{þŠc;O -;tl?ZO:ھV>?0-{Ȑ)c}A -B? @ti2uMh}Nh;\}>ݣ1L"RMcx -!&X*wCiԭͰCS3E2̖\*A>16xefH>ۆV귓s oR+qIWkK \|^MUo'`w^ X# ɏIJx`aA-|iBB_&ߢ)Nfrą R6”FWc,|dJ@+)4efe9ۼyOlNW:L+*EeP5=霩ҫX!'#KPK -[6H2com/thoughtworks/qdox/parser/structs/AnnoDef.classTmsU~nf͖B!(ͮ+PE,o$d7l*OpƆ8~8%48:r=9y6˯HU4M1ƻ#H=3&, 71L\d3ydbl\ -|U,e>fޕ4Vy6 -|*te[ 䖷wnIaiq~+0!GZvgu=׶u M۵ԽvG]]5ݵ9ڤ 9DN ^]1ՠ]U -Ymy5Z2URw٢DaOת[g(Wl*v -2*hn3Z-/]Hx#!:|Wݠ&=ln*1׼E{bN8xA`U*X"^p -*rk -(aڦ\ϰfn▅/𥁯,|o ܶ ՉYP "OlchnDtK_GMpW}/T(\[STSEt5R%'r9z dG`28}C;2AoHT~6&蔢SsFP&! c,8!xWB@ - -ўv&<-XO{˧"2%J-{(GylϜ?`1vqX`#8[sń@Gs(C=O{8AY! -9+>Ghq'hyb$j4iNx#~[>[ԝawPK -[6g3com/thoughtworks/qdox/parser/structs/ClassDef.classoSUƟKBv -" `񿂵i -MCK }c,&F·3:>wwtF'===$<{ǟŪO8>5Ǫ7RTM%eoiX3 lee5|n`jBGE::6{G]RX +7fk{ZފXɱ=ߴHdZ_Z/tl תx!/VbYsufO=sZVےǸ0B|i0^+{)w}>Xl˿..4[rZRbٲ:JnvwfafXY4^8~Gz-x;h^5=l)!.Uesw_6qvO,:Л=t; _.U+AA-]5g6庥q{IŧłRxs' - E\JZpU__p/H]'0s6s -R@dÁȄ=2q=ذ:VPemMuizҍ -{>jr*)mRu])ӂ&zmơfʘYivk=Q twmM+A7E_9o5qLx_"'+x!u;cӘQĤ6ࠍxS`tw6VpEJp/ۨZqh-9'jб' -3S:ؐn|vK Ϲ?g[ӈ䗷@B͇P#JNN$9d_PrSd)_'?{B.Dwa$zeP߂ʬÀ9rLAmK -e8INxwbL_&Dz=D{nHՠj`o@4D4t ~vg&\BP$2EA[:7Oj'e7wUXMshf!2>MMm٪OGzyyq_8b*NtO?!FỌmn4{xG -)8=2;.ɥs-ƒI2a$ F}TGe.c1oUcPK -[6b5com/thoughtworks/qdox/parser/structs/LocatedDef.classON0פ BK -b"@4.i G!^B՝|wwB#L3>)&)v Ym}. tMHLc9!? [j8_eQ3ͭL:xIRʶ*Zsiēt^;kUk;:L?:^9B YKtӢ\ 01+DIoFGl1Ʒ/PK -[6Z(4com/thoughtworks/qdox/parser/structs/MethodDef.classTkSe~.- -* -`kI뭭Bm -B/^$ YLt|?ؙBggy]nJL9{Ξ9_ghx_Y„p40e\13W&Ŵ> - %ܐ'3J8k`B/&TϤļ2 pҥU[Xw+0+FjUosGvՋnȸ5'ptJ^K,w⮅/$+TaЮ~ ]nu) -5𒀖-tʯjζe7늷_q NIacӥ(5R 7^$ۖ#"ːwYVo;u>۟א[ sՃ݊G;̚ӪEY2C?j@_6wXծl//l*UOVڽK~L>`#lǰ1,г7ild0"лΆ7pIx_ -ܶqc-dm|]ܓ )Hܣ03a-26rs8/PO<2n4# ѽ[D:5"M', -DIBljl"4S4S`菡k?Ҷ]LD#(wIvyui&#=͞`z)v@'cބǨSeװ݆qz9R!lb!ʢvqH^=R<.!۾0MRlEir -_Uވy2^S'q0p&Åʍpq&l$=,k̂|gødmnPK -[601com/thoughtworks/qdox/parser/structs/TagDef.classT]OQ=meCdjE Olۥ-.lʟ/>h"%2νh0Mggs̶?~~ XBf2B%F77Ø"7w`Z=f&YaX ¶4fbNQ;wBF͝gHOV2TlmPkXO[;EY3udxnd(íڭJ}m;/^7vMi9FuZ%i; -r~!ke xɳUrg2/$,%պR5UoP)!|ŵ= d:s!j$`RkkrXv)Yj\oIs*S"Fʅ1b 0p: XCPR q5~:3aVYGj'IswjFuʝWzʒǸ GⒽ@Q2dz&`YlRv'Q?Hv2#ǧD&^$XTcI}gwu$:ą3T=q) -Yf#Qp" g]'‹2t@eN~mROLvXT TZo`9WJY0_c-QSUa**3 HoPK -[6w$com/thoughtworks/qdox/Searcher.class;o>f]NvvvFԲF- -\b” -}IJDbk(FҢT̜TFĢ","F9T12$'e&120201# #y, +db`PK -[6DA.com/thoughtworks/qdox/tools/QDoxTester$1.classR]o0= -͚(( Lm0HC m+JSxbpܭE42JeEN&F&,si6 -ަ B/sfr0z7f4*A=@Ϛ$nЛY\5k,y)N?>#" 8Ox/bF{G[EvD'h_6/"!Pq'*Sm8ߋ"1#Gq6Y+PPؖWK%HƯUA -?ϳa=%\-t/(%^-XGМ)2gz_QK_BLn3'bry\pFj6KSeg -kX ĭPK -[6¼`<com/thoughtworks/qdox/tools/QDoxTester$ConsoleReporter.classVkse~6IM\hMJB,%"bAP -@BC mmݍO^fQˌVgͨx - &% cfzss{_'F)a/yANI&83L -r6ᤌ8 r^hd( 2.ʘ.q3˸"cVU/ɘq-+Vŕ9fu+;m;ښZ:&!T -q$H9JKnTlMBfۖ-!hU[w]ugJ7m={B®tӸ""MۄDžJiAĔUPYօ\F\e:]ʖjLS' q4*X[*EwͲWkͬkYtں:5bVC5А(@mӱN Kڎ6٣&sI"߸eTJ&ɱdr/֚h%n6XTJ%~CB|ƪmR>moS)WAAX -T,((EIjy$F]ÒeG -KK5N49(V␂>JNHSX댿)A=T>=_( GHh}qaE+1e2V=\gM [YHܓt -G˒Qq\\LnP5vφ ##ݎ{ҹ'lW y[-z?X=-H/8zg+q4Mi!=H -~lHw{ d(uq"+YAL~*pd~aE"6i(d">REk=ce[؍XDZ4(3 2$ȄI$2w, V|\AH/$SAX@6!x -eUbVMoVўxL`d#uc$)lS<>|;#?/#l&F3AoR#tboX)v6"HƷpp8xmT{M0>FDɦn_T;+}f=dB&`B,~G'Ϝ/[vg=(>g=z} ^zW[cPK -[6G15com/thoughtworks/qdox/tools/QDoxTester$Reporter.classMN0!вQ$X*EBB{7C{6B8لEߓg{?!ViJ -\\?mԗZ\:.~*o[BWL$FlXঃwZSEKSqJBiG_uw5b* S!]n,w;V~th+[rA[Z'eI=mPkPG V!FC|qsF8fNpPK -[6-94B -+,com/thoughtworks/qdox/tools/QDoxTester.classW |UOٝLvKKQ4-fۦ@HIZ6I )-)PNiwwl (P?EZ`mQTo/7fn5߼yJDvPqw&5l-aŻT[Cj܎bx -T_C-nЎ;0_ܭQ4|RqEUhpPQQ -1{5,LаO -qP2/T(hh˜&A>!TG4bt<gQnCxT#T<&= -_T`/ nW7Bfov;bsvݼge&wLPZ{cY b: - H55ӵ(P)ͷcULTetu|t ϲs֍a 8~DE1S-4FU2Ka#l+g&Z˫˒f"sZ$f(͟ -ײc9f1#+vFxHOL Y&G\%(xw sngY:ް2y eYUxڐJjwVRNM{ %L!k~2] #hdiA/&-=w!nYʔEu,gky T "4 - TP9^zU5=<{~k~q&vr+J)M:{Bs<Gi xZOaT+: Ø -io s -W@$2:Uaa]U'TPGG_u#F/o qf)+Un!*)%=lC|m\y k`bUŸi b>G v#Cϳp/ǟ]I4ͥX$bR)}SpZs)xIѩDx8je[iV41*朂+tnшxNH\2%ˆ3c"q7.cgQ0בB&-] -H6qw#hVWyK-)Fkey;'yaޖq,%{DZohch(q{M({䪹8%#YŝډXYH$g;{#~rNN^ҷۉfv35}݃1FGT*JW715Or}%`~\z-U泀8NDd -+ ~sܾq(**9FtufV፬;Y -!#g,^]hy\MבO2ŵ"{Jב]]ڐOU |EbTPuT^db·,v {&IЋt"Ƿ`V{kR\0Q( PK -[6META-INF/maven/PK -[6%META-INF/maven/com.thoughtworks.qdox/PK -[6*META-INF/maven/com.thoughtworks.qdox/qdox/PK -Z6@o 6+1META-INF/maven/com.thoughtworks.qdox/qdox/pom.xml]o6}*1nC&9lm} -hKJRv"ۉ^ s8 E - iCd0S88# ь\$5~y Y\.;wtppŒ,UKQ 0` |`acF#C`0~>CljX"xY\ģg2%skjZؔD -v0>|7 og`N'{"x5ԓHGNZM7)wƊ+#1ddAi-IS4\ -DH* }PmQ)1SPQ=F1-$ -!KQ4e)fSPSREђ$ r#" х,iGJ 'H＠H SA_1ʌʘ ĸ%97ao4Z"K*UVˌƨИOՒ, :VTYY|,MO,vgL*&GЂ>r=v끴1)KzMrP/B>JE=dM[=0,<|))+#Ý-4TFň9 ."?H77жa=﾿[Q$c)/8ݛv&^@Vϩl^1G㦹]r>4ePєyLOQk)%qÎ*pn -'dJ#Ma)lr B}Vmlݐ2EI\u*`of Y2Orq7$]K` I=s -cKm-LϞq I@$w&r ?uH|g2?hnx6TLt&ԚK;3?}\Glgda{#G}Ew\8fk혔,ut9N -jw5SdDxIm^ZVx tE;IuثT PEFjEk1Kn3& q8 t',E!=BKjyF>DKHKȡW~تb("Q -ߔ% q$e"҇Lh邨`7tӔ>65n@pDM-HZ’  ᛿\NK JOO%4)Hl M$˞|ó hhlRp1ZSLI݇YSR99zHrNn [%N~Ӑ'oh5>Z -G& `Pq]hnH(E{e2(%4D7æ;v8'Aj6q[F8wЊf}wßN{FO=vGlFO=矣)ؔA1_J7ڜWn#r -N`5pMH勱r] -B=!/j|-%nkp jOuױs -T_-#eºKG=lZmהIp= bMҁi׶w:߅- -7qp_l3cEMpب 󎹑 o̪w"Y\_{V'7vS<5 -ARt[yɢ~M#]mm{6_CB Wp6c~=ύ7>׭rCaHˇIxOIѕ]Fk'|nHᢿ[GUNc5VЧS"U-24jjHrM/%cZ>W˿fiO% %Q a.g.;X>eAnN,Ҙ6K:G~PulnF8$H~Kٌk(T6li64᱂y}Œ- /[ RwrՁm,\Q'#k_^Ba[*e9= -)tTV㪩>\ U !–sPla i.E. `|Ⓛi05[k -=V%䝧3'T<^P -y_BgWoۋyܦWvH9PK -[6kn8META-INF/maven/com.thoughtworks.qdox/qdox/pom.propertiesSvOK-J,IMQHTM,KRv+T*S04U042224Rp -Q0200*K-*ϳ533J//-LM+/M()/.+LɯJ,*LKL.*PK -[6 AMETA-INF/PK -[6.tf|'META-INF/MANIFEST.MFPK -[6Acom/PK -[6Acom/thoughtworks/PK -[6Acom/thoughtworks/qdox/PK -[6ADcom/thoughtworks/qdox/ant/PK -[6&A|com/thoughtworks/qdox/directorywalker/PK -[6Acom/thoughtworks/qdox/junit/PK -[6Acom/thoughtworks/qdox/model/PK -[6!A4com/thoughtworks/qdox/model/util/PK -[6Ascom/thoughtworks/qdox/parser/PK -[6"Acom/thoughtworks/qdox/parser/impl/PK -[6%Acom/thoughtworks/qdox/parser/structs/PK -[6A1com/thoughtworks/qdox/tools/PK -[6R-0kcom/thoughtworks/qdox/ant/AbstractQdoxTask.classPK -[6=}{> com/thoughtworks/qdox/directorywalker/DirectoryScanner$1.classPK -[6 &/ < com/thoughtworks/qdox/directorywalker/DirectoryScanner.classPK -[6?7com/thoughtworks/qdox/directorywalker/FileVisitor.classPK -[6KED2~com/thoughtworks/qdox/directorywalker/Filter.classPK -[683[O8acom/thoughtworks/qdox/directorywalker/SuffixFilter.classPK -[6N',]com/thoughtworks/qdox/JavaDocBuilder$1.classPK -[6`"'7*xcom/thoughtworks/qdox/JavaDocBuilder.classPK -[6(Ģ9/s2com/thoughtworks/qdox/junit/APITestCase$1.classPK -[6讗 --4com/thoughtworks/qdox/junit/APITestCase.classPK -[6R͂ -?Bcom/thoughtworks/qdox/model/AbstractInheritableJavaEntity.classPK -[6_ݶw -r4Ccom/thoughtworks/qdox/model/AbstractJavaEntity.classPK -[6Ȋ/> ,Ncom/thoughtworks/qdox/model/Annotation.classPK -[6ZK).!Scom/thoughtworks/qdox/model/BeanProperty.classPK -[6dE -.Ucom/thoughtworks/qdox/model/ClassLibrary.classPK -[6C8e>2[com/thoughtworks/qdox/model/DefaultDocletTag.classPK -[620{H9x_com/thoughtworks/qdox/model/DefaultDocletTagFactory.classPK -[6U>%+acom/thoughtworks/qdox/model/DocletTag.classPK -[6R2ccom/thoughtworks/qdox/model/DocletTagFactory.classPK -[6:+B.+dcom/thoughtworks/qdox/model/IndentBuffer.classPK -[6&ToG8+gcom/thoughtworks/qdox/model/JavaClass.classPK -[6$'"0~com/thoughtworks/qdox/model/JavaClassCache.classPK -[6a1com/thoughtworks/qdox/model/JavaClassParent.classPK -[6vL +܀com/thoughtworks/qdox/model/JavaField.classPK -[6a& ,(com/thoughtworks/qdox/model/JavaMethod.classPK -[6_j )/com/thoughtworks/qdox/model/JavaParameter.classPK -[6To ,ߖcom/thoughtworks/qdox/model/JavaSource.classPK -[6(΢com/thoughtworks/qdox/model/Member.classPK -[67/%.ģcom/thoughtworks/qdox/model/ModelBuilder.classPK -[6Pt&com/thoughtworks/qdox/model/Type.classPK -[6Jy!7com/thoughtworks/qdox/model/util/OrderedMap$Entry.classPK -[6l<|com/thoughtworks/qdox/model/util/OrderedMap$OrderedSet.classPK -[6w911com/thoughtworks/qdox/model/util/OrderedMap.classPK -[6ė 0com/thoughtworks/qdox/model/util/TagParser.classPK -[6E -%^*com/thoughtworks/qdox/parser/Builder.classPK -[6ԟ8,)X2com/thoughtworks/qdox/parser/impl/JFlexLexer.classPK -[60com/thoughtworks/qdox/parser/impl/Parser$1.classPK -[6n4com/thoughtworks/qdox/parser/impl/Parser$Value.classPK -[6>h -H7.com/thoughtworks/qdox/parser/impl/Parser.classPK -[6b,(Dcom/thoughtworks/qdox/parser/Lexer.classPK -[6c[1Fcom/thoughtworks/qdox/parser/ParseException.classPK -[6H2Hcom/thoughtworks/qdox/parser/structs/AnnoDef.classPK -[6g3Lcom/thoughtworks/qdox/parser/structs/ClassDef.classPK -[6~c{<3Pcom/thoughtworks/qdox/parser/structs/FieldDef.classPK -[6b5_Tcom/thoughtworks/qdox/parser/structs/LocatedDef.classPK -[6Z(4Ucom/thoughtworks/qdox/parser/structs/MethodDef.classPK -[601Ycom/thoughtworks/qdox/parser/structs/TagDef.classPK -[6UoI2]com/thoughtworks/qdox/parser/structs/TypeDef.classPK -[6w$^com/thoughtworks/qdox/Searcher.classPK -[6DA.p_com/thoughtworks/qdox/tools/QDoxTester$1.classPK -[6¼`<acom/thoughtworks/qdox/tools/QDoxTester$ConsoleReporter.classPK -[6G15Efcom/thoughtworks/qdox/tools/QDoxTester$Reporter.classPK -[6-94B -+,gcom/thoughtworks/qdox/tools/QDoxTester.classPK -[6ArMETA-INF/maven/PK -[6%A@rMETA-INF/maven/com.thoughtworks.qdox/PK -[6*ArMETA-INF/maven/com.thoughtworks.qdox/qdox/PK -Z6@o 6+1rMETA-INF/maven/com.thoughtworks.qdox/qdox/pom.xmlPK -[6kn8|META-INF/maven/com.thoughtworks.qdox/qdox/pom.propertiesPKHH.J} \ No newline at end of file Index: src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java =================================================================== --- src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java (revision 1575872) +++ src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java (working copy) @@ -33,6 +33,7 @@ import org.apache.fop.apps.FOUserAgent; import org.apache.fop.events.EventBroadcaster; +import org.apache.fop.fonts.FontInfo; import org.apache.fop.pdf.PDFDocument; import org.apache.fop.pdf.PDFFormXObject; import org.apache.fop.pdf.PDFPage; @@ -64,7 +65,7 @@ = Collections.synchronizedMap(new WeakHashMap>>()); protected PDFFormXObject createFormForPDF(ImagePDF image, - PDFPage targetPage, FOUserAgent userAgent, AffineTransform at) throws IOException { + PDFPage targetPage, FOUserAgent userAgent, AffineTransform at, FontInfo fontinfo) throws IOException { EventBroadcaster eventBroadcaster = userAgent.getEventBroadcaster(); String originalImageUri = image.getInfo().getOriginalURI(); @@ -105,7 +106,7 @@ PDFBoxAdapter adapter = new PDFBoxAdapter(targetPage, objectCache); PDFFormXObject form = adapter.createFormFromPDFBoxPage(pddoc, page, originalImageUri, - eventBroadcaster, at); + eventBroadcaster, at, fontinfo); return form; } Index: src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java =================================================================== --- src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java (revision 1575872) +++ src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java (working copy) @@ -26,11 +26,12 @@ import java.io.IOException; import java.util.Map; -import org.apache.pdfbox.pdfviewer.PageDrawer; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.common.PDRectangle; +import org.apache.pdfbox.rendering.PageDrawer; import org.apache.xmlgraphics.image.loader.Image; import org.apache.xmlgraphics.image.loader.ImageException; import org.apache.xmlgraphics.image.loader.ImageFlavor; @@ -129,8 +130,8 @@ area.getHeight() / pageDimension.height); g2d.transform(at); - PageDrawer drawer = new PageDrawer(); - drawer.drawPage(g2d, page, pageDimension); + PageDrawer drawer = new PageDrawer(null); + drawer.drawPage(g2d, page, mediaBox); } catch (IOException ioe) { //TODO Better exception handling throw new RuntimeException("I/O error while painting PDF page", ioe); Index: src/java/org/apache/fop/render/pdf/pdfbox/MergeCFFFonts.java =================================================================== --- src/java/org/apache/fop/render/pdf/pdfbox/MergeCFFFonts.java (revision 0) +++ src/java/org/apache/fop/render/pdf/pdfbox/MergeCFFFonts.java (working copy) @@ -0,0 +1,422 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.fop.render.pdf.pdfbox; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.fontbox.cff.CFFFont; +import org.apache.fontbox.cff.CFFParser; +import org.apache.fontbox.cff.charset.CFFCharset; +import org.apache.fontbox.cff.charset.CFFISOAdobeCharset; +import org.apache.fontbox.cff.encoding.CFFEncoding; +import org.apache.fontbox.cff.encoding.CFFStandardEncoding; + +import org.apache.fop.fonts.cff.CFFDataReader; +import org.apache.fop.fonts.truetype.FontFileReader; +import org.apache.fop.fonts.truetype.OTFSubSetFile; + +public class MergeCFFFonts extends OTFSubSetFile { + + protected List cffReaderList = new ArrayList(); + protected List> subsetGlyphsList = new ArrayList>(); + private boolean fallbackIndex; + private int charsetOffset; + + static class FontContainer { + final CFFFont font; + final FontFileReader fontFile; + FontContainer(CFFFont f, FontFileReader r) { + font = f; + fontFile = r; + } + } + + public MergeCFFFonts() throws IOException { + } + + public void readType1CFont(List streams, String embeddedName) throws IOException { + this.embeddedName = embeddedName; + int fontFileSize = 0; + Map fontMap = new HashMap(); + for (InputStream is : streams) { + fontFile = new FontFileReader(is); + CFFParser p = new CFFParser(); + CFFFont ff = p.parse(fontFile.getAllBytes()).get(0); + fontFileSize += fontFile.getFileSize(); + FontContainer fc = new FontContainer(ff, fontFile); + fontMap.put(ff.getCharStringsDict().keySet(), fc); + } + Set used = new HashSet(); + for (Map.Entry ff : fontMap.entrySet()) { + if (used.containsAll(ff.getKey())) { + continue; + } + used.addAll(ff.getKey()); + fileFonts.add(ff.getValue().font); + LinkedHashMap sg = new LinkedHashMap(); + for (int i = 0; i < ff.getValue().font.getCharset().getEntries().size() + 1; i++) { + sg.put(i, i); + } + subsetGlyphsList.add(sg); + cffReaderList.add(new CFFDataReader(ff.getValue().fontFile)); + } + output = new byte[fontFileSize]; + if (fileFonts.size() == 1) { + writeBytes(fontFile.getAllBytes()); + return; + } + cffReader = cffReaderList.get(0); + subsetGlyphs = subsetGlyphsList.get(0); + createCFF(); + } + + @Override + protected void createCFF() throws IOException { + //Header + writeBytes(cffReader.getHeader()); + + //Name Index + writeIndex(Arrays.asList(fileFonts.get(0).getName().getBytes("UTF-8"))); + + //Keep offset of the topDICT so it can be updated once all data has been written + int topDictOffset = currentPos; + //Top DICT Index and Data + byte[] topDictIndex = cffReader.getTopDictIndex().getByteData(); + int offSize = topDictIndex[2]; + writeBytes(topDictIndex, 0, 3 + (offSize * 2)); + writeTopDICT(); + createCharStringData(); + + //String index + writeStringIndex(); + + Map topDICT = cffReader.getTopDictEntries(); + final CFFDataReader.DICTEntry charString = topDICT.get("CharStrings"); + final CFFDataReader.DICTEntry encodingEntry = topDICT.get("Encoding"); + + int encodingOffset; + if (encodingEntry != null && charString.getOffset() > encodingEntry.getOffset()) { + charsetOffset = currentPos; + if (!fallbackIndex) { + charsetOffset += 2; + } + writeCharsetTable(cffReader.getFDSelect() != null, !fallbackIndex); + encodingOffset = currentPos; + writeEncoding(); + } else { + writeCard16(0); + encodingOffset = currentPos; + writeEncoding(); + charsetOffset = currentPos; + writeCharsetTable(cffReader.getFDSelect() != null, false); + } + + //Char Strings Index + int charStringOffset = currentPos; + writeIndex(subsetCharStringsIndex); + + //Keep offset to modify later with the local subroutine index offset + int privateDictOffset = currentPos; + writePrivateDict(); + + //Local subroutine index + int localIndexOffset = currentPos; + if (!subsetLocalIndexSubr.isEmpty()) { + writeIndex(subsetLocalIndexSubr); + } + + //Update the offsets + updateOffsets(topDictOffset, charsetOffset, charStringOffset, privateDictOffset, localIndexOffset, encodingOffset); + } + + protected void writeEncoding() throws IOException { + List chars = new ArrayList(); + for (CFFFont ff : fileFonts) { + CFFEncoding encoding = ff.getEncoding(); + if (encoding instanceof CFFStandardEncoding) { + LinkedHashMap topDICT = cffReader.getTopDictEntries(); + final CFFDataReader.DICTEntry encodingEntry = topDICT.get("Encoding"); + if (encodingEntry != null && encodingEntry.getOperands().get(0).intValue() != 0 + && encodingEntry.getOperands().get(0).intValue() != 1) { + int len = encoding.getEntries().size(); + if (len != gidToSID.size() - 1) { + return; + } + writeByte(0); + writeByte(len); + for (Map.Entry gid : gidToSID.entrySet()) { + if (gid.getKey() == 0) { + continue; + } + int code = encoding.getCode(gid.getValue()); + writeByte(code); + } + } + } else { + for (CFFEncoding.Entry e : encoding.getEntries()) { + int c = e.getCode(); + if (!chars.contains(c)) { + chars.add(c); + } + } + } + } + if (!chars.isEmpty()) { + writeCard16(chars.size()); + for (int i : chars) { + writeByte(i); + } + } + } + + protected void writeStringIndex() throws IOException { + gidToSID = new LinkedHashMap(); + List strings = new ArrayList(); + int listIndex = 0; + for (LinkedHashMap subsetglyph : subsetGlyphsList) { + CFFFont cffFont = fileFonts.get(listIndex); + cffReader = cffReaderList.get(listIndex); + int subsetGlyphIndex = 0; + for (CFFCharset.Entry e : cffFont.getCharset().getEntries()) { + int sid = e.getSID(); + int gid = subsetglyph.get(subsetGlyphIndex); + + //Check whether the SID falls into the standard string set + if (sid < NUM_STANDARD_STRINGS) { + gidToSID.put(subsetglyph.get(gid), sid); + } else { + int index = sid - NUM_STANDARD_STRINGS; + if (index <= cffReader.getStringIndex().getNumObjects()) { + gidToSID.put(subsetglyph.get(gid), stringIndexData.size() + NUM_STANDARD_STRINGS - 1); + String data = new String(cffReader.getStringIndex().getValue(index), "US-ASCII"); + if (!strings.contains(data)) { + strings.add(data); + } + } else { + gidToSID.put(subsetglyph.get(gid), index); + } + } + subsetGlyphIndex++; + } + listIndex++; + } + + for (String s : strings) { + stringIndexData.add(s.getBytes("US-ASCII")); + } + + //Write the String Index + if (!stringIndexData.isEmpty()) { + if (!strings.isEmpty() && !new String(stringIndexData.get(0), "UTF-8").equals(strings.get(0))) { + //Move copyright string to end + stringIndexData.add(stringIndexData.remove(0)); + } else { + CFFFont f = fileFonts.get(0); + String notice = (String)f.getProperty("Notice"); + if (notice != null) { + stringIndexData.add(notice.getBytes("ISO-8859-1")); + } + } + stringIndexData.add(embeddedName.getBytes("UTF-8")); + writeIndex(stringIndexData); + } else { + CFFFont f = fileFonts.get(0); + String notice = (String)f.getProperty("Notice"); + if (notice != null) { + writeIndex(Arrays.asList(notice.getBytes("ISO-8859-1"), embeddedName.getBytes("UTF-8"))); + } else { + List sindex = new ArrayList(); + sindex.add(cffReader.getStringIndex().getData()); + if (sindex.size() > 1) { + fallbackIndex = true; + writeIndex(sindex); + } else if (sindex.size() == 1) { + writeIndex(Arrays.asList(embeddedName.getBytes("UTF-8"))); + } else { + writeCard16(0); + } + } + } + cffReader = cffReaderList.get(0); + } + + protected void createCharStringData() throws IOException { + //Create the new char string index + List added = new ArrayList(); + subsetCharStringsIndex = new ArrayList(); + for (int i = 0; i < subsetGlyphsList.size(); i++) { + cffReader = cffReaderList.get(i); + Map topDICT = cffReader.getTopDictEntries(); + final CFFDataReader.DICTEntry privateEntry = topDICT.get("Private"); + if (privateEntry != null) { + int privateOffset = privateEntry.getOperands().get(1).intValue(); + Map privateDICT = cffReader.getPrivateDict(privateEntry); + + if (privateDICT.containsKey("Subrs")) { + int localSubrOffset = privateOffset + privateDICT.get("Subrs").getOperands().get(0).intValue(); + localIndexSubr = cffReader.readIndex(localSubrOffset); + } + } + + globalIndexSubr = cffReader.getGlobalIndexSubr(); + + for (Map.Entry s : fileFonts.get(i).getCharStringsDict().entrySet()) { + if (!added.contains(s.getKey())) { + subsetCharStringsIndex.add(s.getValue()); + added.add(s.getKey()); + } + } + } + //Create the two lists which are to store the local and global subroutines + subsetLocalIndexSubr = new ArrayList(); + subsetGlobalIndexSubr = new ArrayList(); + + localUniques = new ArrayList(); + globalUniques = new ArrayList(); + + //Store the size of each subset index and clear the unique arrays + subsetLocalSubrCount = localUniques.size(); + subsetGlobalSubrCount = globalUniques.size(); + localUniques.clear(); + globalUniques.clear(); + + cffReader = cffReaderList.get(0); + } + + protected void writeCharsetTable(boolean cidFont, boolean afterstringindex) throws IOException { + Map range = new LinkedHashMap(); + Set strings = new HashSet(); + for (CFFFont ff : fileFonts) { + CFFCharset cSet = ff.getCharset(); + String cClass = cSet.getClass().getName(); + if (cClass.equals("org.apache.fontbox.cff.CFFParser$Format1Charset") + || cClass.equals("org.apache.fontbox.cff.CFFParser$Format0Charset")) { + for (CFFCharset.Entry m : cSet.getEntries()) { + if (!strings.contains(m.getName())) { + range.put(m.getSID(), 0); + strings.add(m.getName()); + } + } + } else { + writeByte(0); + for (Map.Entry gid : gidToSID.entrySet()) { + if (cidFont && gid.getKey() == 0) { + continue; + } + writeCard16((cidFont) ? gid.getKey() : gid.getValue()); + } + break; + } + } + if (!range.isEmpty()) { + writeFormat1CS(range, afterstringindex); + } + } + + private void writeFormat1CS(Map range, boolean afterstringindex) { + if (!afterstringindex) { + charsetOffset += 2; + } + writeByte(0); + writeCard16(1); + updateStandardRange(range); + for (Map.Entry i : range.entrySet()) { + writeCard16(i.getKey()); + writeByte(i.getValue()); + } + writeByte(1); + } + + private void updateStandardRange(Map range) { + if (range.containsKey(NUM_STANDARD_STRINGS) && range.containsKey(NUM_STANDARD_STRINGS + 1)) { + boolean mixedCS = false; + for (int i : range.keySet()) { + if (i < NUM_STANDARD_STRINGS && i > 1) { + mixedCS = true; + break; + } + } + if (!mixedCS) { + if (range.containsKey(1)) { + range.clear(); + range.put(1, 0); + } + int last = -1; + boolean simpleRange = false; + for (int i : range.keySet()) { + simpleRange = (last + 1 == i); + last = i; + } + if (simpleRange) { + for (int i = NUM_STANDARD_STRINGS; i < NUM_STANDARD_STRINGS + subsetCharStringsIndex.size(); i++) { + range.put(i, 0); + } + } else { + range.put(NUM_STANDARD_STRINGS, subsetCharStringsIndex.size()); + } + } + } + } + + @Override + protected void updateFixedOffsets(Map topDICT, int dataTopDictOffset, + int charsetOffset, int charStringOffset, int encodingOffset) { + //Charset offset in the top dict + final CFFDataReader.DICTEntry charset = topDICT.get("charset"); + if (charset != null) { + int oldCharsetOffset = dataTopDictOffset + charset.getOffset(); + int oldCharset = Integer.parseInt(String.format("%02x", output[oldCharsetOffset] & 0xff), 16); + if (oldCharset >= 32 && oldCharset <= 246) { + charsetOffset += 139; + } + output = updateOffset(output, oldCharsetOffset, charset.getOperandLength(), charsetOffset); + } + + //Char string index offset in the private dict + final CFFDataReader.DICTEntry charString = topDICT.get("CharStrings"); + int oldCharStringOffset = dataTopDictOffset + charString.getOffset(); + int oldString = Integer.parseInt(String.format("%02x", output[oldCharStringOffset] & 0xff), 16); + if (oldString >= 32 && oldString <= 246) { + charStringOffset += 139; + } + if (!(fileFonts.get(0).getCharset() instanceof CFFISOAdobeCharset)) { + output = updateOffset(output, oldCharStringOffset, charString.getOperandLength(), charStringOffset); + } + + final CFFDataReader.DICTEntry encodingEntry = topDICT.get("Encoding"); + if (encodingEntry != null && encodingEntry.getOperands().get(0).intValue() != 0 + && encodingEntry.getOperands().get(0).intValue() != 1) { + int oldEncodingOffset = dataTopDictOffset + encodingEntry.getOffset(); + int oldEnc = Integer.parseInt(String.format("%02x", output[oldEncodingOffset] & 0xff), 16); + if (oldEnc >= 32 && oldEnc <= 246) { + encodingOffset += 139; + } else { + encodingOffset--; + } + output = updateOffset(output, oldEncodingOffset, encodingEntry.getOperandLength(), encodingOffset); + } + } +} Property changes on: src/java/org/apache/fop/render/pdf/pdfbox/MergeCFFFonts.java ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: src/java/org/apache/fop/render/pdf/pdfbox/MergeTTFonts.java =================================================================== --- src/java/org/apache/fop/render/pdf/pdfbox/MergeTTFonts.java (revision 0) +++ src/java/org/apache/fop/render/pdf/pdfbox/MergeTTFonts.java (working copy) @@ -0,0 +1,376 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.fop.render.pdf.pdfbox; + +import java.io.IOException; +import java.util.Map; +import java.util.TreeMap; + +import org.apache.fontbox.ttf.MaximumProfileTable; + +import org.apache.fop.fonts.truetype.FontFileReader; +import org.apache.fop.fonts.truetype.OFDirTabEntry; +import org.apache.fop.fonts.truetype.OFMtxEntry; +import org.apache.fop.fonts.truetype.OFTableName; +import org.apache.fop.fonts.truetype.TTFSubSetFile; + +public class MergeTTFonts extends TTFSubSetFile { + private Map added = new TreeMap(); + private int origIndexesLen = 0; + private byte[] lastbytes = null; + private int size = 0; + protected MaximumProfileTable maxp = new MaximumProfileTable(); + + static class Glyph { + final byte[] data; + final OFMtxEntry mtx; + Glyph(byte[] d, OFMtxEntry m) { + data = d; + mtx = m; + } + } + + /** + * Create the glyf table and fill in loca table + */ + private void readGlyf(Map glyphs, FontFileReader in) throws IOException { + OFDirTabEntry entry = dirTabs.get(OFTableName.GLYF); + if (entry != null) { + int[] origIndexes = buildSubsetIndexToOrigIndexMap(glyphs); + for (int i = 0; i < origIndexes.length; i++) { + int nextOffset = 0; + int origGlyphIndex = origIndexes[i]; + if (origGlyphIndex >= (mtxTab.length - 1)) { + nextOffset = (int)lastLoca; + } else { + nextOffset = (int)mtxTab[origGlyphIndex + 1].getOffset(); + } + int glyphOffset = (int)mtxTab[origGlyphIndex].getOffset(); + int glyphLength = nextOffset - glyphOffset; + if (glyphLength < 0) { + continue; + } + byte[] glyphData = in.getBytes( + (int)entry.getOffset() + glyphOffset, + glyphLength); + + Glyph g = new Glyph(glyphData, mtxTab[origGlyphIndex]); + if (!cid && (origIndexesLen == 0 || (glyphLength > 0 && i > 0))) { + added.put(i, g); + } else if (cid) { + added.put(i + origIndexesLen, g); + } + } + if (!cid) { + origIndexesLen = origIndexes.length; + } else { + origIndexesLen += origIndexes.length; + } + } else { + throw new IOException("Can't find glyf table"); + } + } + + private void createGlyf() throws IOException { + OFDirTabEntry entry = dirTabs.get(OFTableName.GLYF); + int size = 0; + int startPos = 0; + int endOffset = 0; // Store this as the last loca + + if (entry != null) { + pad4(); + startPos = currentPos; + /* Loca table must be in order by glyph index, so build + * an array first and then write the glyph info and + * location offset. + */ + glyphOffsets = new int[origIndexesLen]; + for (Map.Entry gly : added.entrySet()) { + byte[] glyphData = gly.getValue().data; + int glyphLength = glyphData.length; + int i = gly.getKey(); + int endOffset1 = endOffset; + // Copy glyph + writeBytes(glyphData); + // Update loca table + if (cid) { + writeULong(locaOffset + i * 4, currentPos - startPos); + } + if ((currentPos - startPos + glyphLength) > endOffset1) { + endOffset1 = (currentPos - startPos + glyphLength); + } + + // Store the glyph boundary positions relative to the start of the font + glyphOffsets[i] = currentPos; + currentPos += glyphLength; + realSize += glyphLength; + + endOffset = endOffset1; + } + + size = currentPos - startPos; + + currentPos += 12; + realSize += 12; + updateCheckSum(startPos, size + 12, OFTableName.GLYF); + + // Update loca checksum and last loca index + writeULong(locaOffset + added.size() * 4, endOffset); + int locaSize = added.size() * 4 + 4; + int checksum = getCheckSum(output, locaOffset, locaSize); + writeULong(offsets.get(OFTableName.LOCA), checksum); + int padSize = (locaOffset + locaSize) % 4; + newDirTabs.put(OFTableName.LOCA, + new OFDirTabEntry(locaOffset, locaSize + padSize)); + + if (!cid) { + int i = 0; + int offset = 0; + for (Glyph e : added.values()) { + writeUShort(locaOffset + i * 2, offset / 2); + offset += e.data.length; + i++; + } + writeUShort(locaOffset + i * 2, offset / 2); + } + } else { + throw new IOException("Can't find glyf table"); + } + } + + /** + * Create the hmtx table by copying metrics from original + * font to subset font. The glyphs Map contains an + * Integer key and Integer value that maps the original + * metric (key) to the subset metric (value) + */ + protected void createHmtx() throws IOException { + OFTableName hmtx = OFTableName.HMTX; + OFDirTabEntry entry = dirTabs.get(hmtx); + if (entry != null) { + pad4(); + // int offset = (int)entry.offset; + + int longHorMetricSize = added.size() * 4; + int leftSideBearingSize = added.size() * 4; + int hmtxSize = longHorMetricSize + leftSideBearingSize; + + for (Map.Entry e : added.entrySet()) { + Integer subsetIndex = e.getKey(); + OFMtxEntry mtx = e.getValue().mtx; + writeUShort(currentPos + subsetIndex * 4, + mtx.getWx()); + writeUShort(currentPos + subsetIndex * 4 + 2, + mtx.getLsb()); + } + + updateCheckSum(currentPos, hmtxSize, hmtx); + currentPos += hmtxSize; + realSize += hmtxSize; + } else { + throw new IOException("Can't find hmtx table"); + } + } + + /** + * Returns a subset of the original font. + * + * + * @param subsetGlyphs Map of glyphs (glyphs has old index as (Integer) key and + * new index as (Integer) value) + * @throws IOException in case of an I/O problem + */ + public void readFont(FontFileReader fontFile, Map subsetGlyphs, boolean cid) throws IOException { + this.cid = cid; + if (subsetGlyphs.isEmpty()) { + return; + } + this.fontFile = fontFile; + lastbytes = fontFile.getAllBytes(); + size += lastbytes.length; + + readDirTabs(); + readFontHeader(); + getNumGlyphs(); + readHorizontalHeader(); + readHorizontalMetrics(); + readIndexToLocation(); + if (!cid && subsetGlyphs.size() <= 1) { + for (int i = 0; i < mtxTab.length; i++) { + subsetGlyphs.put(i, i); + } + } + scanGlyphs(fontFile, subsetGlyphs); + readGlyf(subsetGlyphs, fontFile); + } + + public void writeFont(PDFBoxAdapter.Cmap cmap) throws IOException { + output = new byte[size * 2]; + createDirectory(); // Create the TrueType header and directory + int sgsize = added.size(); + if (!cid) { + writeCMAP(cmap); +// copyTable(fontFile, OFTableName.CMAP); + } + createHmtx(); // Create hmtx table + if (cid) { + createLoca(sgsize); // create empty loca table + } else { + createLoca(numberOfGlyphs / 2); // create empty loca table + } + createHead(fontFile); + createOS2(fontFile); // copy the OS/2 table + if (!cid) { + createHhea(fontFile, sgsize - 2); // Create the hhea table + } else { + createHhea(fontFile, sgsize); // Create the hhea table + } + if (maxp.getVersion() == 0) { + createMaxp(fontFile, sgsize); // copy the maxp table + } else { + writeMaxp(); + } + boolean optionalTableFound; + optionalTableFound = createCvt(fontFile); // copy the cvt table + if (!optionalTableFound) { + // cvt is optional (used in TrueType fonts only) + log.debug("TrueType: ctv table not present. Skipped."); + } + optionalTableFound = createFpgm(fontFile); // copy fpgm table + if (!optionalTableFound) { + // fpgm is optional (used in TrueType fonts only) + log.debug("TrueType: fpgm table not present. Skipped."); + } + createPost(fontFile); // copy the post table + optionalTableFound = createPrep(fontFile); // copy prep table + if (!optionalTableFound) { + // prep is optional (used in TrueType fonts only) + log.debug("TrueType: prep table not present. Skipped."); + } + createName(fontFile); // copy the name table + createGlyf(); //create glyf table and update loca table + pad4(); + createCheckSumAdjustment(); + } + + private void writeMaxp() { + int checksum = currentPos; + pad4(); + int startPos = currentPos; + writeUShort((int) maxp.getVersion()); //version + writeUShort(0); + writeUShort(maxp.getNumGlyphs()); //numGlyphs + writeUShort(maxp.getMaxPoints()); //maxPoints + writeUShort(maxp.getMaxContours()); //maxContours + writeUShort(maxp.getMaxCompositePoints()); //maxCompositePoints + writeUShort(maxp.getMaxCompositeContours()); //maxCompositeContours + writeUShort(maxp.getMaxZones()); //maxZones + writeUShort(maxp.getMaxTwilightPoints()); //maxTwilightPoints + writeUShort(maxp.getMaxStorage()); //maxStorage + writeUShort(maxp.getMaxFunctionDefs()); //maxFunctionDefs + writeUShort(maxp.getMaxInstructionDefs()); //maxInstructionDefs + writeUShort(maxp.getMaxStackElements()); //maxStackElements + writeUShort(maxp.getMaxSizeOfInstructions()); //maxSizeOfInstructions + writeUShort(maxp.getMaxComponentElements()); //maxComponentElements + writeUShort(maxp.getMaxComponentDepth()); //maxComponentDepth + updateCheckSum(checksum, currentPos - startPos, OFTableName.MAXP); + realSize += currentPos - startPos; + } + + private void writeCMAP(PDFBoxAdapter.Cmap cmap) { + int checksum = currentPos; + pad4(); + int cmapPos = currentPos; + writeUShort(0); //version + writeUShort(1); //number of tables + + Map glyphIdToCharacterCode = cmap.glyphIdToCharacterCode; + writeUShort(cmap.platformId); //platformid + writeUShort(cmap.platformEncodingId); //platformEncodingId + writeULong(currentPos, currentPos - cmapPos + 12); //subTableOffset + currentPos += 12; + + writeUShort(12); //subtableFormat + writeUShort(0); + writeULong(currentPos, (glyphIdToCharacterCode.size() * 12) + 16); + currentPos += 4; + writeULong(currentPos, 0); + currentPos += 4; + writeULong(currentPos, glyphIdToCharacterCode.size()); + currentPos += 4; + + for (Map.Entry g : glyphIdToCharacterCode.entrySet()) { + writeULong(currentPos, g.getKey()); + currentPos += 4; + writeULong(currentPos, g.getKey()); + currentPos += 4; + writeULong(currentPos, g.getValue()); + currentPos += 4; + } + +// writeUShort(6); //subtableFormat +// int firstCode = -1; +// int lastCode = -1; +// List codes = new ArrayList(); +// for (Map.Entry g : glyphIdToCharacterCode.entrySet()) { +// if (firstCode < 0) { +// firstCode = g.getKey(); +// } +// while (lastCode > 0 && lastCode + 1 < g.getKey()) { +// codes.add(0); +// lastCode++; +// } +// codes.add(g.getValue()); +// +// lastCode = g.getKey(); +// } +// +// writeUShort((codes.size() * 2) + 6); //length +// writeUShort(0); //version +// +// writeUShort(firstCode); //firstCode +// writeUShort(codes.size()); //entryCount +// +// for (int i : codes) { +// writeUShort(i); +// } + + updateCheckSum(checksum, currentPos - cmapPos, OFTableName.CMAP); + realSize += currentPos - cmapPos; + } + + /** + * Get index from starting at lowest glyph position + * @param glyphs map + * @return index map + */ + protected int[] buildSubsetIndexToOrigIndexMap(Map glyphs) { + int[] origIndexes = new int[glyphs.size()]; + int minIndex = Integer.MAX_VALUE; + for (int glyph : glyphs.values()) { + if (minIndex > glyph) { + minIndex = glyph; + } + } + for (Map.Entry glyph : glyphs.entrySet()) { + int origIndex = glyph.getKey(); + int subsetIndex = glyph.getValue() - minIndex; + origIndexes[subsetIndex] = origIndex; + } + return origIndexes; + } +} Property changes on: src/java/org/apache/fop/render/pdf/pdfbox/MergeTTFonts.java ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java =================================================================== --- src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java (revision 1575872) +++ src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java (working copy) @@ -21,22 +21,42 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.Serializable; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.regex.Pattern; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.fontbox.cff.CFFFont; +import org.apache.fontbox.cff.CFFParser; +import org.apache.fontbox.cff.charset.CFFCharset; +import org.apache.fontbox.cff.encoding.CFFEncoding; +import org.apache.fontbox.cmap.CMap; + +import org.apache.fontbox.ttf.CMAPEncodingEntry; +import org.apache.fontbox.ttf.GlyphData; +import org.apache.fontbox.ttf.MaximumProfileTable; +import org.apache.fontbox.ttf.TrueTypeFont; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSBoolean; @@ -45,9 +65,14 @@ import org.apache.pdfbox.cos.COSInteger; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.cos.COSNull; +import org.apache.pdfbox.cos.COSNumber; import org.apache.pdfbox.cos.COSObject; import org.apache.pdfbox.cos.COSStream; import org.apache.pdfbox.cos.COSString; +import org.apache.pdfbox.encoding.DictionaryEncoding; +import org.apache.pdfbox.encoding.Encoding; +import org.apache.pdfbox.encoding.EncodingManager; +import org.apache.pdfbox.pdfparser.PDFStreamParser; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentCatalog; import org.apache.pdfbox.pdmodel.PDPage; @@ -57,10 +82,31 @@ import org.apache.pdfbox.pdmodel.common.COSStreamArray; import org.apache.pdfbox.pdmodel.common.PDRectangle; import org.apache.pdfbox.pdmodel.common.PDStream; +import org.apache.pdfbox.pdmodel.font.PDCIDFont; +import org.apache.pdfbox.pdmodel.font.PDCIDFontType2Font; +import org.apache.pdfbox.pdmodel.font.PDFont; +import org.apache.pdfbox.pdmodel.font.PDFontDescriptorDictionary; +import org.apache.pdfbox.pdmodel.font.PDFontFactory; +import org.apache.pdfbox.pdmodel.font.PDSimpleFont; +import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont; +import org.apache.pdfbox.pdmodel.font.PDType0Font; +import org.apache.pdfbox.pdmodel.font.PDType1Font; + import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation; import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; + import org.apache.fop.events.EventBroadcaster; +import org.apache.fop.fonts.CustomFont; +import org.apache.fop.fonts.EmbeddingMode; +import org.apache.fop.fonts.FontInfo; +import org.apache.fop.fonts.FontType; +import org.apache.fop.fonts.MultiByteFont; +import org.apache.fop.fonts.SingleByteEncoding; +import org.apache.fop.fonts.SingleByteFont; +import org.apache.fop.fonts.Typeface; +import org.apache.fop.fonts.truetype.FontFileReader; +import org.apache.fop.fonts.truetype.OTFSubSetFile; import org.apache.fop.pdf.PDFArray; import org.apache.fop.pdf.PDFDictionary; import org.apache.fop.pdf.PDFDocument; @@ -71,13 +117,16 @@ import org.apache.fop.pdf.PDFPage; import org.apache.fop.pdf.PDFRoot; import org.apache.fop.pdf.PDFStream; +import org.apache.fop.pdf.RefPDFFont; +import org.apache.fop.util.CharUtilities; +import org.apache.pdfbox.util.operator.PDFOperator; /** * This class provides an adapter for transferring content from a PDFBox PDDocument to * FOP's PDFDocument. It is used to parse PDF using PDFBox and write content using * FOP's PDF library. */ -class PDFBoxAdapter { +public class PDFBoxAdapter { /** logging instance */ protected static Log log = LogFactory.getLog(PDFBoxAdapter.class); @@ -86,12 +135,15 @@ Arrays.asList(new String[] {"Filter", "DecodeParms"})); private static final Set page2form = new java.util.HashSet( Arrays.asList(new String[] {"Group", "LastModified", "Metadata"})); + private static final Pattern SUBSET_PATTERN = Pattern.compile("[A-Z][A-Z][A-Z][A-Z][A-Z][A-Z]\\+.+"); private final PDFPage targetPage; private final PDFDocument pdfDoc; private final Map clonedVersion; + private final Map fontMap = new HashMap(); + /** * Creates a new PDFBoxAdapter. * @param targetPage The target FOP PDF page object @@ -294,6 +346,976 @@ } } + private String getUniqueFontName(COSDictionary fontData) throws IOException { + PDSimpleFont font = getFont(fontData); + String extra = ""; + if (font instanceof PDType0Font + && font.getToUnicode() != null + && ((PDType0Font) font).getDescendantFont() instanceof PDCIDFontType2Font) { + if (!isSubsetFont(font.getBaseFont())) { + extra = "f3"; + } + try { + ((PDCIDFontType2Font) ((PDType0Font) font).getDescendantFont()).getTTFFont(); + } catch (IOException e) { + log.error(e); + return null; + } + return getName(font.getBaseFont()) + "_" + ((COSName)fontData.getItem(COSName.SUBTYPE)).getName() + extra; + } + if (font instanceof PDTrueTypeFont && isSubsetFont(font.getBaseFont())) { + TrueTypeFont tt = ((PDTrueTypeFont) font).getTTFFont(); + for (CMAPEncodingEntry c : tt.getCMAP().getCmaps()) { + if (c.getGlyphId(1) > 0) { + extra = "cid"; + } + } + return getName(font.getBaseFont()) + "_" + ((COSName)fontData.getItem(COSName.SUBTYPE)).getName() + extra; + } +// if (!isSubsetFont(font.getBaseFont())) { +// return font.getBaseFont() + "_" + ((COSName)fontData.getItem(COSName.SUBTYPE)).getName(); +// } + if (font instanceof PDType1Font) { + if (((PDType1Font) font).getType1CFont() == null + || ((PDType1Font) font).getType1CFont().getCFFFont() == null) { + return null; + } + CFFEncoding encoding = ((PDType1Font)font).getType1CFont().getCFFFont().getEncoding(); + String eClass = encoding.getClass().getName(); + if (eClass.equals("org.apache.fontbox.cff.CFFParser$Format1Encoding")) { + extra = "f1enc"; + } else if (eClass.equals("org.apache.fontbox.cff.CFFParser$Format0Encoding")) { + extra = "f0enc"; + } + CFFCharset cs = ((PDType1Font)font).getType1CFont().getCFFFont().getCharset(); + for (CFFCharset.Entry e : cs.getEntries()) { + if (e.getSID() < OTFSubSetFile.NUM_STANDARD_STRINGS) { + extra += "stdcs"; + } + break; + } + if (cs.getClass().getName().equals("org.apache.fontbox.cff.CFFParser$Format1Charset")) { + extra += "f1cs"; + } + return getName(font.getBaseFont()) + "_" + ((COSName)fontData.getItem(COSName.SUBTYPE)).getName() + extra; + } + return null; + } + + private static boolean isSubsetFont(String s) { + return SUBSET_PATTERN.matcher(s).matches(); + } + + private static String getName(String name) { + if (isSubsetFont(name)) { + return name.split("\\+")[1].replace(" ", ""); + } + return name; + } + + interface FOPPDFFont extends RefPDFFont { + String getFontName(); + void setRef(PDFDictionary d); + String addFont(COSDictionary fontdata) throws IOException; + int size(); + } + + public class FOPPDFMultiByteFont extends MultiByteFont implements FOPPDFFont { + protected PDFDictionary ref; + private Map newWidth = new TreeMap(); + private Map charMapGlobal = new LinkedHashMap(); + private MergeTTFonts mergeFonts = new MergeTTFonts(); + private Map glyphs = new HashMap(); + + public FOPPDFMultiByteFont(COSDictionary fontData, String name) { + super(null, EmbeddingMode.SUBSET); + //this stops fop modifying font later on + setEmbeddingMode(EmbeddingMode.FULL); + try { + readFontBBox(fontData); + setFontName(name); + addFont(fontData); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public String addFont(COSDictionary fontData) throws IOException { + PDSimpleFont font = getFont(fontData); + setProperties(this, font); + PDSimpleFont mainFont = font; + TrueTypeFont ttf; + if (font instanceof PDType0Font) { + PDCIDFont cidFont = (PDCIDFont) ((PDType0Font) font).getDescendantFont(); + setDefaultWidth((int) cidFont.getDefaultWidth()); + mainFont = cidFont; + ttf = ((PDCIDFontType2Font) cidFont).getTTFFont(); + } else { + ttf = ((PDTrueTypeFont) font).getTTFFont(); + setDefaultWidth(1000); + } + GlyphData[] glyphData = ttf.getGlyph().getGlyphs(); + Map oldToNewGIMap = new HashMap(); + if (charMapGlobal.isEmpty()) { + oldToNewGIMap.put(0, 0); // .notdef glyph + } + CMap c = font.getToUnicodeCMap(); + Map mapping = getMapping(mainFont, c, glyphData.length); +// if (differentGlyphData(glyphData, mapping)) { +// return null; +// } + Map gidToGlyph = new TreeMap(mapping); + if (mainFont instanceof PDTrueTypeFont) { + CMAPEncodingEntry cmap = ttf.getCMAP().getCmaps()[0]; + gidToGlyph.clear(); + int[] gidToCode = cmap.getGlyphIdToCharacterCode(); + for (int i = 1; i < glyphData.length; i++) { + String mappedChar = mapping.get(gidToCode[i]); + gidToGlyph.put(i, mappedChar); + } + } + int widthPos = font.getFirstChar() + 1; + for (Map.Entry i : gidToGlyph.entrySet()) { + String mappedChar = i.getValue(); + int key = i.getKey(); + boolean skipWidth = mappedChar == null; + if (skipWidth) { + mappedChar = (char)charMapGlobal.size() + "tmp"; + } else if (mappedChar.length() > 1) { + mappedChar = "" + (char)mappedChar.hashCode(); + } + if (!charMapGlobal.containsKey(mappedChar)) { + if (glyphData[key] == null + && !CharUtilities.isAdjustableSpace(mappedChar.charAt(0))) { + continue; + } + boolean addToEnd = charMapGlobal.containsValue(key); + if (addToEnd) { + addPrivateUseMapping(mappedChar.charAt(0), charMapGlobal.size() + 1); + charMapGlobal.put(mappedChar, charMapGlobal.size() + 1); + } else { + addPrivateUseMapping(mappedChar.charAt(0), key); + charMapGlobal.put(mappedChar, key); + } + int glyph = (int) mapChar(mappedChar.charAt(0)); + oldToNewGIMap.put(key, glyph); + if (!skipWidth) { + if (!(mainFont instanceof PDTrueTypeFont)) { + widthPos = key; + } + float w = font.getFontWidth(widthPos); + if (w >= 0) { + newWidth.put(glyph, (int)w); + } + } + } + if (!skipWidth) { + widthPos++; + } + } + FontFileReader ffr = readFontFile(mainFont); + mergeMaxp(ttf); + mergeFonts.readFont(ffr, oldToNewGIMap, true); + return getFontName(); + } + + private Map getMapping(PDSimpleFont font, CMap c, int len) { + Map mapping = new HashMap(); + int last = font.getLastChar(); + if (last == -1) { + last = len; + } + int size = 1; + if (c.hasTwoByteMappings()) { + size = 2; + } + for (int i = font.getFirstChar(); i <= last; i++) { + String l = c.lookup(i, size); + if (l != null) { + mapping.put(i, l); + } + } + return mapping; + } + + private void mergeMaxp(TrueTypeFont ttf) { + MaximumProfileTable mp = ttf.getMaximumProfile(); + MaximumProfileTable outMaxp = mergeFonts.maxp; + outMaxp.setVersion(mp.getVersion()); + outMaxp.setNumGlyphs(outMaxp.getNumGlyphs() + mp.getNumGlyphs()); + outMaxp.setMaxPoints(outMaxp.getMaxPoints() + mp.getMaxPoints()); + outMaxp.setMaxContours(outMaxp.getMaxContours() + mp.getMaxContours()); + outMaxp.setMaxCompositePoints(outMaxp.getMaxCompositePoints() + mp.getMaxCompositePoints()); + outMaxp.setMaxCompositeContours(outMaxp.getMaxCompositeContours() + mp.getMaxCompositeContours()); + outMaxp.setMaxZones(outMaxp.getMaxZones() + mp.getMaxZones()); + outMaxp.setMaxTwilightPoints(outMaxp.getMaxTwilightPoints() + mp.getMaxTwilightPoints()); + outMaxp.setMaxStorage(outMaxp.getMaxStorage() + mp.getMaxStorage()); + outMaxp.setMaxFunctionDefs(outMaxp.getMaxFunctionDefs() + mp.getMaxFunctionDefs()); + outMaxp.setMaxInstructionDefs(outMaxp.getMaxInstructionDefs() + mp.getMaxInstructionDefs()); + outMaxp.setMaxStackElements(outMaxp.getMaxStackElements() + mp.getMaxStackElements()); + outMaxp.setMaxSizeOfInstructions(outMaxp.getMaxSizeOfInstructions() + mp.getMaxSizeOfInstructions()); + outMaxp.setMaxComponentElements(outMaxp.getMaxComponentElements() + mp.getMaxComponentElements()); + outMaxp.setMaxComponentDepth(outMaxp.getMaxComponentDepth() + mp.getMaxComponentDepth()); + } + + private boolean differentGlyphData(GlyphData[] data, Map mapping) throws IOException { + Map tmpMap = new HashMap(); + for (Map.Entry entry : mapping.entrySet()) { + if (!tmpMap.containsKey(entry.getValue())) { + tmpMap.put(entry.getValue(), entry.getKey()); + } + } + mapping.clear(); + for (Map.Entry entry : tmpMap.entrySet()) { + mapping.put(entry.getValue(), entry.getKey()); + } + + for (Map.Entry n : mapping.entrySet()) { + if (data[n.getKey()] != null) { + if (glyphs.containsKey(n.getValue()) && !glyphs.get(n.getValue()).equals(data[n.getKey()])) { + return true; + } + glyphs.put(n.getValue(), data[n.getKey()]); + } + } + return false; + } + + private FontFileReader readFontFile(PDFont font) throws IOException { + InputStream is = ((PDFontDescriptorDictionary)font.getFontDescriptor()).getFontFile2().createInputStream(); + return new FontFileReader(new ByteArrayInputStream(IOUtils.toByteArray(is))); + } + + public Map getWidthsMap() { + return newWidth; + } + + public PDFDictionary getRef() { + return ref; + } + + public void setRef(PDFDictionary d) { + ref = d; + } + + public int size() { + return 0; + } + + private void readFontBBox(COSBase b) throws IOException { + if (b instanceof COSDictionary) { + COSDictionary dict = (COSDictionary)b; + for (Map.Entry n : dict.entrySet()) { + readFontBBox(n.getValue()); + if (n.getKey() == COSName.FONT_BBOX) { + COSArray w = (COSArray)n.getValue(); + float[] bboxf = w.toFloatArray(); + int[] bbox = new int[bboxf.length]; + for (int i = 0; i < bbox.length; i++) { + bbox[i] = (int)bboxf[i]; + } + setFontBBox(bbox); + } + } + } else if (b instanceof COSObject) { + COSObject o = (COSObject)b; + readFontBBox(o.getObject()); + } else if (b instanceof COSArray) { + COSArray o = (COSArray)b; + for (int i = 0; i < o.size(); i++) { + readFontBBox(o.get(i)); + } + } + } + + public boolean isEmbeddable() { + return true; + } + + public InputStream getInputStream() throws IOException { + mergeFonts.writeFont(null); + return new ByteArrayInputStream(mergeFonts.getFontSubset()); + } + } + + public static class Cmap { + int platformId; + int platformEncodingId; + Map glyphIdToCharacterCode = new TreeMap(); + } + + public class FOPPDFSingleByteFont extends SingleByteFont implements FOPPDFFont { + private Map fontFiles = new TreeMap(); + private List fonts = new ArrayList(); + protected PDFDictionary ref; + private Map charMapGlobal = new LinkedHashMap(); + private Map newWidth = new HashMap(); + private Map charStringsDict; + private Cmap newCmap = new Cmap(); + private byte[] fontCache; + + public FOPPDFSingleByteFont(COSDictionary fontData, String name) { + super(null); + if (fontData.getItem(COSName.SUBTYPE) == COSName.TRUE_TYPE) { + setFontType(FontType.TRUETYPE); + } + width = new int[0]; + try { + PDSimpleFont font = getFont(fontData); + if (font instanceof PDType1Font) { + fontCache = ((PDFontDescriptorDictionary)font.getFontDescriptor()).getFontFile3().getByteArray(); + } + fonts.add(font); + setFirstChar(font.getFirstChar()); + setLastChar(font.getLastChar()); + readFontFile(font); + float[] bBoxF = font.getFontBoundingBox().getCOSArray().toFloatArray(); + int[] bBox = new int[bBoxF.length]; + for (int i = 0; i < bBox.length; i++) { + bBox[i] = (int)bBoxF[i]; + } + setFontBBox(bBox); + + setFontName(name); + Object cmap = getCmap(font); + for (int i = font.getFirstChar(); i <= font.getLastChar(); i++) { + String mappedChar = getChar(cmap, i); + if (mappedChar != null && (!mappedChar.equals(" ") || i == 32)) { + charMapGlobal.put(mappedChar, i); + } + } + //mark font as used + notifyMapOperation(); + setProperties(this, font); + if (font.getWidths() != null) { + //if width contains 0 we cant rely on codeToNameMap + boolean usesZero = font.getWidths().contains(0f); + Set codeToName = getCodeToName(font).keySet(); + for (int i = getFirstChar(); i <= Math.min(getLastChar(), getFirstChar() + font.getWidths().size()); i++) { + if (usesZero || codeToName.contains(i)) { + int w = font.getWidths().get(i - getFirstChar()).intValue(); + newWidth.put(i, w); + } else { + newWidth.put(i, 0); + } + } + } + mapping = new FOPPDFEncoding(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + private Map getCodeToName(PDFont font) { + Map codeToName = new HashMap(); + if (font.getFontEncoding() != null) { + COSBase cos = font.getFontEncoding().getCOSObject(); + if (cos instanceof COSDictionary) { + COSDictionary enc = (COSDictionary) cos; + COSName baseEncodingName = (COSName) enc.getDictionaryObject(COSName.BASE_ENCODING); + if (baseEncodingName != null) { + try { + Encoding baseEncoding = EncodingManager.INSTANCE.getEncoding(baseEncodingName); + codeToName.putAll(baseEncoding.getCodeToNameMap()); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + COSArray differences = (COSArray)enc.getDictionaryObject(COSName.DIFFERENCES); + int currentIndex = -1; + for (int i = 0; differences != null && i < differences.size(); i++) { + COSBase next = differences.getObject(i); + if (next instanceof COSNumber) { + currentIndex = ((COSNumber)next).intValue(); + } else if (next instanceof COSName) { + COSName name = (COSName)next; + codeToName.put(currentIndex++, name.getName()); + } + } + } else { + return font.getFontEncoding().getCodeToNameMap(); + } + } + return codeToName; + } + + private Object getCmap(PDSimpleFont font) throws IOException { + COSStream stream = (COSStream)font.getToUnicode(); + if (stream == null) { + return font.getFontEncoding(); + } + return font.getToUnicodeCMap(); + } + + private void readFontFile(PDSimpleFont font) throws IOException { + PDFontDescriptorDictionary fd = (PDFontDescriptorDictionary) font.getFontDescriptor(); + setFlags(fd.getFlags()); + PDStream ff = fd.getFontFile3(); + if (ff == null) { + ff = fd.getFontFile2(); + if (ff == null) { + ff = fd.getFontFile(); + } + } else { + setFontType(FontType.TYPE1C); + } + fontFiles.put(getFirstChar() + "_" + fontFiles.size(), new ByteArrayInputStream(IOUtils.toByteArray(ff.createInputStream()))); + if (font instanceof PDTrueTypeFont) { + TrueTypeFont ttfont = ((PDTrueTypeFont) font).getTTFFont(); + CMAPEncodingEntry[] cmapList = ttfont.getCMAP().getCmaps(); + CMAPEncodingEntry c = cmapList[0]; + if (cmapList.length > 1) { + c = cmapList[1]; + } + newCmap.platformId = c.getPlatformId(); + newCmap.platformEncodingId = c.getPlatformEncodingId(); + for (int i = 0; i < 256 * 256; i++) { + if (c.getGlyphId(i) != 0) { + newCmap.glyphIdToCharacterCode.put(i, c.getGlyphId(i)); + } + } + } + } + + @Override + public boolean hasChar(char c) { + return charMapGlobal.containsKey(String.valueOf(c)); + } + + @Override + public char mapChar(char c) { + return mapping.mapChar(c); + } + + public String getEmbedFontName() { + return getName(fonts.get(0).getBaseFont()); + } + + public int[] getWidths() { + width = new int[getLastChar() - getFirstChar() + 1]; + for (int i = getFirstChar(); i <= getLastChar(); i++) { + if (newWidth.containsKey(i)) { + width[i - getFirstChar()] = newWidth.get(i); + } else { + width[i - getFirstChar()] = 0; + } + } + return width.clone(); + } + + public String addFont(COSDictionary fontData) throws IOException { + PDSimpleFont font = getFont(fontData); + if (font instanceof PDType1Font && differentGlyphData(font)) { + return null; + } + fonts.add(font); + mergeWidths(font); + if (font.getFirstChar() < getFirstChar()) { + setFirstChar(font.getFirstChar()); + } + for (int w : newWidth.keySet()) { + if (w > getLastChar()) { + setLastChar(w); + } + } + readFontFile(font); + return getFontName(); + } + + public int size() { + return fontFiles.size(); + } + + private Map getCharStringsDict(PDSimpleFont font, boolean cache) throws IOException { + if (font.getFontDescriptor() instanceof PDFontDescriptorDictionary) { + PDStream ff3Stream = ((PDFontDescriptorDictionary)font.getFontDescriptor()).getFontFile3(); + if (ff3Stream != null) { + byte[] data = fontCache; + if (!cache) { + data = ff3Stream.getByteArray(); + } + CFFFont ff = new CFFParser().parse(data).get(0); + return ff.getCharStringsDict(); + } + } + return new HashMap(); + } + + private boolean differentGlyphData(PDSimpleFont font) throws IOException { + if (charStringsDict == null && fonts.get(0) instanceof PDType1Font) { + charStringsDict = getCharStringsDict(fonts.get(0), true); + } + for (Map.Entry s : getCharStringsDict(font, false).entrySet()) { + if (charStringsDict.containsKey(s.getKey())) { + int numberDiff = 0; + byte[] b1 = charStringsDict.get(s.getKey()); + byte[] b2 = s.getValue(); + int b1Index = b1.length - 1; + int b2Index = b2.length - 1; + while (b1Index >= 0 && b2Index >= 0) { + if (b1[b1Index] != b2[b2Index]) { + numberDiff++; + if (numberDiff > 2) { + break; + } + } + b1Index--; + b2Index--; + } + if (numberDiff > 2) { +// log.info(getFontName() + " " + s.getKey() + " not equal " + numberdiff); + return true; + } + } + } + return false; + } + + private void mergeWidths(PDSimpleFont font) throws IOException { + int w = 0; + int skipGlyphIndex = getLastChar() + 1; + Object cmap = getCmap(font); + for (int i = font.getFirstChar(); i <= font.getLastChar(); i++) { + boolean addedWidth = false; + int glyphIndexPos = skipGlyphIndex; + if (font instanceof PDTrueTypeFont) { + glyphIndexPos = i; + } + int neww = 0; + if (font.getWidths() != null) { + neww = font.getWidths().get(i - font.getFirstChar()).intValue(); + if (!newWidth.containsKey(i) || newWidth.get(i) == 0) { + if (font instanceof PDTrueTypeFont || (font.getFontEncoding() != null && getCodeToName(font).keySet().contains(i))) { + newWidth.put(i, neww); + glyphIndexPos = i; + } else { + newWidth.put(i, 0); + } + addedWidth = true; + } + } + String mappedChar = getChar(cmap, i); + if (mappedChar != null && !charMapGlobal.containsKey(mappedChar)) { + charMapGlobal.put(mappedChar, glyphIndexPos); + if (!addedWidth && w < font.getWidths().size()) { + newWidth.put(newWidth.size() + getFirstChar(), neww); + } + skipGlyphIndex++; + } + w++; + } + } + + private String getChar(Object cmap, int i) throws IOException { + if (cmap instanceof CMap) { + CMap c = (CMap)cmap; + int size = 1; + if (c.hasTwoByteMappings()) { + size = 2; + } + return c.lookup(i, size); + } + Encoding enc = (Encoding)cmap; + if (enc instanceof DictionaryEncoding) { + return enc.getName(i); + } + return enc.getCharacter(i); + } + + public String getEncodingName() { + if (fonts.get(0).getFontEncoding() != null) { + COSBase cosObject = fonts.get(0).getFontEncoding().getCOSObject(); + if (cosObject != null) { + if (cosObject instanceof COSDictionary) { + COSBase item = ((COSDictionary) cosObject).getItem(COSName.BASE_ENCODING); + if (item != null) { + return ((COSName)item).getName(); + } + } else if (cosObject instanceof COSName) { + return ((COSName) cosObject).getName(); + } else { + throw new RuntimeException(cosObject.toString() + " not supported"); + } + } + } + return null; + } + + class FOPPDFEncoding implements SingleByteEncoding { + private boolean cmap = false; + + public String getName() { + return "FOPPDFEncoding"; + } + + public char mapChar(char c) { + if (charMapGlobal.containsKey(String.valueOf(c))) { + return (char)charMapGlobal.get(String.valueOf(c)).intValue(); + } + return 0; + } + + private Map getEncodingMap() { + Map v = new TreeMap(); + List added = new ArrayList(); + int skip = fonts.get(0).getLastChar() + 1; + for (PDFont font : fonts) { + if (font.getFontEncoding() == null) { + continue; + } + Map codeToName = getCodeToName(font); + for (int i = font.getFirstChar(); i <= font.getLastChar(); i++) { + if (codeToName.keySet().contains(i)) { + String s = codeToName.get(i); + if (!added.contains(s)) { + if (!v.containsKey(i)) { + v.put(i, s); + } else { + v.put(skip, s); + skip++; + } + } + } + } + added.addAll(v.values()); + } + return v; + } + + public String[] getCharNameMap() { + Collection v = getEncodingMap().values(); + return v.toArray(new String[v.size()]); + } + + public char[] getUnicodeCharMap() { + if (cmap) { + if (fonts.get(0).getToUnicode() == null) { + return new char[0]; + } + List cmapStrings = new ArrayList(); + Map cm = new HashMap(); + for (Map.Entry o : charMapGlobal.entrySet()) { + cm.put(o.getValue(), o.getKey()); + } + for (int i = 0; i < getLastChar() + 1; i++) { + if (cm.containsKey(i)) { + cmapStrings.add(cm.get(i)); + } else { + cmapStrings.add(" "); + } + } + return fromStringToCharArray(cmapStrings); + } + cmap = true; + return toCharArray(getEncodingMap().keySet()); + } + + private char[] fromStringToCharArray(Collection list) { + char[] ret = new char[list.size()]; + int i = 0; + for (String e : list) { + ret[i++] = e.charAt(0); + } + return ret; + } + + private char[] toCharArray(Collection list) { + char[] ret = new char[list.size()]; + int i = 0; + for (int e : list) { + ret[i++] = (char)e; + } + return ret; + } + } + + public PDFDictionary getRef() { + return ref; + } + + public void setRef(PDFDictionary d) { + ref = d; + } + + public boolean isEmbeddable() { + return true; + } + + public boolean isSymbolicFont() { + return false; + } + + public InputStream getInputStream() throws IOException { + if (fontFiles.size() > 1 && getFontType() == FontType.TYPE1C) { + MergeCFFFonts s = new MergeCFFFonts(); + s.readType1CFont(new ArrayList(fontFiles.values()), getEmbedFontName()); + return new ByteArrayInputStream(s.getFontSubset()); + } + if (fontFiles.size() > 1 && getFontType() == FontType.TRUETYPE) { + MergeTTFonts mergeFonts = new MergeTTFonts(); + Map chars = new HashMap(); + chars.put(0, 0); + for (InputStream ff : fontFiles.values()) { + mergeFonts.readFont(new FontFileReader(ff), chars, false); + } + mergeFonts.writeFont(newCmap); + return new ByteArrayInputStream(mergeFonts.getFontSubset()); + } + if (fontFiles.isEmpty()) { + return null; + } + return fontFiles.values().iterator().next(); + } + } + + private void setProperties(CustomFont cFont, PDSimpleFont font) { + if (font.getFontDescriptor() != null) { + cFont.setCapHeight((int) font.getFontDescriptor().getCapHeight()); + cFont.setAscender((int)font.getFontDescriptor().getAscent()); + cFont.setDescender((int)font.getFontDescriptor().getDescent()); + cFont.setXHeight((int)font.getFontDescriptor().getXHeight()); + cFont.setStemV((int)font.getFontDescriptor().getStemV()); + } + } + + public class PDFWriter { + protected StringBuilder s = new StringBuilder(); + private String key; + private List resourceNames; + + public PDFWriter(String key, List resourceNames) { + this.key = key; + this.resourceNames = resourceNames; + } + + public String writeText(PDStream pdStream) throws IOException { + Iterator it = new PDFStreamParser(pdStream).getTokenIterator(); + List arguments = new ArrayList(); + while (it.hasNext()) { + Object o = it.next(); + if (o instanceof PDFOperator) { + PDFOperator op = (PDFOperator)o; + readPDFArguments(op, arguments); + s.append(op.getOperation() + "\n"); + arguments.clear(); + if (op.getImageParameters() != null) { + for (Map.Entry cn : op.getImageParameters().entrySet()) { + arguments.add(cn.getKey()); + arguments.add(cn.getValue()); + } + readPDFArguments(op, arguments); + s.append("ID " + new String(op.getImageData(), "ISO-8859-1")); + arguments.clear(); + } + } else { + arguments.add((COSBase)o); + } + } + return s.toString(); + } + + protected void readPDFArguments(PDFOperator op, Collection arguments) throws IOException { + for (COSBase c : arguments) { + processArg(op, c); + } + } + + protected void processArg(PDFOperator op, COSBase c) throws IOException { + if (c instanceof COSInteger) { + s.append(((COSInteger) c).intValue()); + s.append(" "); + } else if (c instanceof COSFloat) { + float f = ((COSFloat) c).floatValue(); + s.append(new DecimalFormat("#.####").format(f)); + s.append(" "); + } else if (c instanceof COSName) { + COSName cn = (COSName)c; + s.append("/" + cn.getName()); + addKey(cn); + s.append(" "); + } else if (c instanceof COSString) { + s.append("<" + ((COSString) c).getHexString() + ">"); + } else if (c instanceof COSArray) { + s.append("["); + readPDFArguments(op, (Collection) ((COSArray) c).toList()); + s.append("] "); + } else if (c instanceof COSDictionary) { + Collection dictArgs = new ArrayList(); + for (Map.Entry cn : ((COSDictionary)c).entrySet()) { + dictArgs.add(cn.getKey()); + dictArgs.add(cn.getValue()); + } + s.append("<<"); + readPDFArguments(op, dictArgs); + s.append(">>"); + } else { + throw new IOException(c + " not supported"); + } + } + + protected void addKey(COSName cn) { + if (resourceNames.contains(cn)) { + s.append(key); + } + } + } + + public class MergeFontsPDFWriter extends PDFWriter { + private COSDictionary fonts; + private FontInfo fontInfo; + private Typeface font; + private PDSimpleFont oldFont = null; + private Map fontsToRemove = new HashMap(); + + public MergeFontsPDFWriter(COSDictionary fonts, FontInfo fontInfo, String key, List resourceNames) { + super(key, resourceNames); + this.fonts = fonts; + this.fontInfo = fontInfo; + } + + public String writeText(PDStream pdStream) throws IOException { + String txt = super.writeText(pdStream); + if (fontsToRemove.isEmpty()) { + return null; + } + for (COSName cn : fontsToRemove.keySet()) { + fonts.removeItem(cn); + } + return txt; + } + + protected void readPDFArguments(PDFOperator op, Collection arguments) throws IOException { + for (COSBase c : arguments) { + if (c instanceof COSName) { + COSName cn = (COSName)c; + COSDictionary fontData = (COSDictionary)fonts.getDictionaryObject(cn.getName()); + String internalName = fontsToRemove.get(cn); + if (internalName == null && fontData != null) { + internalName = getNewFont(fontData, fontInfo); + } + if (fontData == null || internalName == null) { + s.append("/" + cn.getName()); + addKey(cn); + if (op.getOperation().equals("Tf")) { + font = null; + oldFont = null; + } + } else { + s.append("/" + internalName); + fontsToRemove.put(cn, internalName); + font = fontInfo.getUsedFonts().get(internalName); + oldFont = getFont(fontData); + } + s.append(" "); + } else if (c instanceof COSString && font != null && ((FOPPDFFont)font).size() != 1) { + List word = readCOSString((COSString)c, oldFont); +// String str = ((COSString) c).getString(); +// if (font instanceof SingleByteFont && str.charAt(0) > 31) { +// s.append("<" + ((COSString) c).getHexString() + ">"); +// } else + if (word == null) { + s.append("(" + ((COSString) c).getString() + ")"); + } else { + String x = getMappedWord(word, font); + if (x == null) { + s.append("(" + ((COSString) c).getString() + ")"); + } else { + s.append(x); + } + } + } else { + processArg(op, c); + } + } + } + + private String getMappedWord(List word, Typeface font) throws IOException { + StringBuilder newOct = new StringBuilder(); + StringBuilder newHex = new StringBuilder(); + for (String str : word) { + char c = str.charAt(0); + if (str.length() > 1) { + c = (char) str.hashCode(); + } + if (font.hasChar(c)) { + char mapped = font.mapChar(c); + newHex.append(String.format("%1$04x", (mapped & 0xFFFF)).toUpperCase(Locale.getDefault())); + switch(mapped) { + case '(': + newOct.append("\\("); + break; + case ')': + newOct.append("\\)"); + break; + case '\n': + newOct.append("\\n"); + break; + case '\r': + newOct.append("\\r"); + break; + case '\t': + newOct.append("\\t"); + break; + default: + if (mapped > 31) { + newOct.append(mapped); + } else { + newOct.append(String.format("\\%03o", (int)mapped)); + } + } + } else { + String s = null; + if (oldFont.getFontEncoding() != null) { + s = oldFont.getFontEncoding().getName(c); + } + if (s != null && font instanceof FOPPDFSingleByteFont && ((FOPPDFSingleByteFont)font).charMapGlobal.containsKey(s)) { + int mapped = ((FOPPDFSingleByteFont)font).charMapGlobal.get(s); + newOct.append(String.format("\\%03o", mapped)); + } else { + return null; + } + } + } + if (font instanceof SingleByteFont) { + return "(" + newOct.toString() + ")"; + } + return "<" + newHex.toString() + ">"; + } + + private List readCOSString(COSString s, PDSimpleFont oldFont) throws IOException { + List word = new ArrayList(); + byte[] string = s.getBytes(); + int codeLength; +// String t1Str = new String(string, "UTF-8"); + for (int i = 0; i < string.length; i += codeLength) { + codeLength = 1; + String c = oldFont.encode(string, i, codeLength); +// if (oldFont instanceof PDType1Font && i < t1Str.length()) { +// c = ((PDType1Font)oldFont).encodetype1(string, i, codeLength); +// } + if (c == null && i + 1 < string.length) { + codeLength++; + c = oldFont.encode(string, i, codeLength); + } + if (c == null) { + return null; + } + word.add(c); + } + return word; + } + } + + private PDSimpleFont getFont(COSDictionary fontData) throws IOException { + if (!fontMap.containsKey(fontData)) { + if (fontMap.size() > 10) { + fontMap.clear(); + } + fontMap.put(fontData, (PDSimpleFont)PDFontFactory.createFont(fontData)); + } + return fontMap.get(fontData); + } + /** * Creates a PDFFormXObject (from FOP's PDF library) from a PDF page parsed with PDFBox. * @param sourceDoc the source PDF the given page to be copied belongs to @@ -304,19 +1326,51 @@ * @throws IOException if an I/O error occurs */ public PDFFormXObject createFormFromPDFBoxPage(PDDocument sourceDoc, PDPage page, String key, - EventBroadcaster eventBroadcaster, AffineTransform atdoc) throws IOException { + EventBroadcaster eventBroadcaster, AffineTransform atdoc, FontInfo fontinfo) throws IOException { handleAcroForm(sourceDoc, page, eventBroadcaster, atdoc); PDResources sourcePageResources = page.findResources(); PDFDictionary pageResources = null; - if (sourcePageResources != null) { - pageResources = (PDFDictionary)cloneForNewDocument( - sourcePageResources.getCOSDictionary()); - pdfDoc.registerObject(pageResources); + PDStream pdStream = page.getContents(); + COSDictionary fonts = (COSDictionary)sourcePageResources.getCOSDictionary().getDictionaryObject(COSName.FONT); + COSDictionary fontsBackup = null; + if (fonts != null && pdfDoc.isMergeFontsEnabled()) { + fontsBackup = new COSDictionary(fonts); + String newStream = new MergeFontsPDFWriter(fonts, fontinfo, "", new ArrayList()).writeText(pdStream); + if (newStream != null) { +// for (Object f : fonts.keySet().toArray()) { +// COSDictionary fontdata = (COSDictionary)fonts.getDictionaryObject((COSName)f); +// if (getUniqueFontName(fontdata) != null) { +// fonts.removeItem((COSName)f); +// } +// } + pdStream = new PDStream(sourceDoc, new ByteArrayInputStream(newStream.getBytes("ISO-8859-1"))); + pdStream.addCompression(); + } } + pageResources = (PDFDictionary)cloneForNewDocument( + sourcePageResources.getCOSDictionary()); + pdfDoc.registerObject(pageResources); + PDFDictionary fontDict = (PDFDictionary)pageResources.get("Font"); + if (fontDict != null && pdfDoc.isMergeFontsEnabled()) { + for (Map.Entry fontEntry : fontinfo.getUsedFonts().entrySet()) { + Typeface font = fontEntry.getValue(); + if (font instanceof FOPPDFFont) { + FOPPDFFont pdfFont = (FOPPDFFont)font; + if (pdfFont.getRef() == null) { + pdfFont.setRef(new PDFDictionary()); + pdfDoc.assignObjectNumber(pdfFont.getRef()); + } + fontDict.put(fontEntry.getKey(), pdfFont.getRef()); + } + } + } + if (fontsBackup != null) { + sourcePageResources.getCOSDictionary().setItem(COSName.FONT, fontsBackup); + } + COSStream originalPageContents = null; - PDStream pdStream = page.getContents(); if (pdStream != null) { originalPageContents = (COSStream)pdStream.getCOSObject(); } @@ -385,6 +1439,25 @@ return form; } + private String getNewFont(COSDictionary fontData, FontInfo fontinfo) throws IOException { + String base = getUniqueFontName(fontData); + if (base == null) { + return null; + } + for (Typeface t : fontinfo.getUsedFonts().values()) { + if (t instanceof FOPPDFFont && base.equals(t.getFontName())) { + return ((FOPPDFFont)t).addFont(fontData); + } + } + if (base.endsWith("cid") || fontData.getItem(COSName.SUBTYPE) != COSName.TYPE1 && fontData.getItem(COSName.SUBTYPE) != COSName.TRUE_TYPE) { + fontinfo.addMetrics(base, new FOPPDFMultiByteFont(fontData, base)); + } else { + fontinfo.addMetrics(base, new FOPPDFSingleByteFont(fontData, base)); + } + fontinfo.useFont(base); + return base; + } + private List getWidgets(PDPage page) throws IOException { List annots = page.getAnnotations(); List widgets = new java.util.ArrayList(); Index: src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxImageHandler.java =================================================================== --- src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxImageHandler.java (revision 1575872) +++ src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxImageHandler.java (working copy) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.fop.fonts.FontInfo; import org.apache.xmlgraphics.image.loader.Image; import org.apache.xmlgraphics.image.loader.ImageFlavor; @@ -67,9 +68,9 @@ (float) at.getTranslateX(), (float) (generator.getState().getTransform().getTranslateY() - h - y)); } - + FontInfo fontinfo = (FontInfo)context.getHint("fontinfo"); PDFFormXObject form = createFormForPDF(pdfImage, pdfContext.getPage(), - pdfContext.getUserAgent(), formadjust); + pdfContext.getUserAgent(), formadjust, fontinfo); if (form == null) { return; } Index: test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java =================================================================== --- test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java (revision 0) +++ test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java (working copy) @@ -0,0 +1,186 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.fop.render.pdf; + +import junit.framework.Assert; +import org.apache.commons.io.IOUtils; +import org.apache.fontbox.cff.CFFFont; +import org.apache.fontbox.cff.CFFParser; +import org.apache.fop.fonts.FontInfo; +import org.apache.fop.pdf.PDFDocument; +import org.apache.fop.pdf.PDFPage; +import org.apache.fop.pdf.PDFResources; +import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter; +import org.apache.pdfbox.cos.COSDictionary; +import org.apache.pdfbox.cos.COSName; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.PDPage; +import org.apache.pdfbox.pdmodel.PDResources; +import org.junit.Test; + +import java.awt.Rectangle; +import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; + +public class PDFBoxAdapterTestCase { + private Rectangle2D r = new Rectangle2D.Double(); + private PDFPage pdfpage = new PDFPage(new PDFResources(0), 0, r, r, r, r); + private PDFBoxAdapter adapter = new PDFBoxAdapter(pdfpage, null); + private static final String CFF1 = "test/resources/2fonts.pdf"; + private static final String CFF2 = "test/resources/2fonts2.pdf"; + private static final String CFF3 = "test/resources/simpleh.pdf"; + private static final String CFF4 = "test/resources/simpleh2.pdf"; + private static final String TTCID1 = "test/resources/ttcid1.pdf"; + private static final String TTCID2 = "test/resources/ttcid2.pdf"; + private static final String TTSubset1 = "test/resources/ttsubset.pdf"; + private static final String TTSubset2 = "test/resources/ttsubset2.pdf"; + private static final String ROTATE = "test/resources/rotate.pdf"; + @Test + public void testPDFWriter() throws Exception { + FontInfo fi = new FontInfo(); + PDDocument doc = PDDocument.load(CFF3); + PDPage page = (PDPage) doc.getDocumentCatalog().getAllPages().get(0); + PDResources sourcePageResources = page.findResources(); + COSDictionary fonts = (COSDictionary)sourcePageResources.getCOSDictionary().getDictionaryObject(COSName.FONT); + PDFBoxAdapter.PDFWriter w = adapter. new MergeFontsPDFWriter(fonts, fi, "", new ArrayList()); + String msg = w.writeText(page.getContents()); + Assert.assertTrue(msg, msg.contains("/Myriad_Pro")); + + Assert.assertEquals(fi.getUsedFonts().size(), 1); + + PDDocument doc2 = PDDocument.load(CFF4); + page = (PDPage) doc2.getDocumentCatalog().getAllPages().get(0); + sourcePageResources = page.findResources(); + fonts = (COSDictionary)sourcePageResources.getCOSDictionary().getDictionaryObject(COSName.FONT); + w = adapter. new MergeFontsPDFWriter(fonts, fi, "", new ArrayList()); + msg = w.writeText(page.getContents()); + Assert.assertTrue(msg, msg.contains("(\\t\\003\\n\\n\\003\\013\\013\\003\\003)Tj")); + doc2.close(); + doc.close(); + } + + private COSDictionary getFont(PDDocument doc, String internalname) throws IOException { + PDPage page = (PDPage) doc.getDocumentCatalog().getAllPages().get(0); + PDResources sourcePageResources = page.findResources(); + COSDictionary fonts = (COSDictionary)sourcePageResources.getCOSDictionary().getDictionaryObject(COSName.FONT); + return (COSDictionary) fonts.getDictionaryObject(internalname); + } + + @Test + public void testCFF() throws Exception { + PDDocument doc = PDDocument.load(CFF1); + PDFBoxAdapter.FOPPDFSingleByteFont sbfont = adapter.new FOPPDFSingleByteFont(getFont(doc, "R11"), "MyriadPro-Regular_Type1f0encstdcs"); + + Assert.assertTrue(Arrays.asList(sbfont.getEncoding().getCharNameMap()).contains("bracketright")); + Assert.assertTrue(!Arrays.asList(sbfont.getEncoding().getCharNameMap()).contains("A")); + Assert.assertTrue(!Arrays.toString(sbfont.getEncoding().getUnicodeCharMap()).contains("A")); + Assert.assertEquals(sbfont.mapChar('A'), 0); + Assert.assertEquals(sbfont.getWidths().length, 28); + Assert.assertEquals(sbfont.getFirstChar(), 87); + Assert.assertEquals(sbfont.getLastChar(), 114); + + PDDocument doc2 = PDDocument.load(CFF2); + String name = sbfont.addFont(getFont(doc2, "R11")); + Assert.assertTrue(name.contains("MyriadPro")); + + Assert.assertEquals(sbfont.getFontName(), "MyriadPro-Regular_Type1f0encstdcs"); + Assert.assertEquals(sbfont.getEncodingName(), "WinAnsiEncoding"); + Assert.assertEquals(sbfont.mapChar('W'), 'W'); + String x = IOUtils.toString(sbfont.getInputStream()); + Assert.assertTrue(x, x.contains("Adobe Systems")); + Assert.assertEquals(sbfont.getEncoding().getName(), "FOPPDFEncoding"); + Assert.assertTrue(Arrays.asList(sbfont.getEncoding().getCharNameMap()).contains("A")); + Assert.assertEquals(sbfont.getWidths().length, 65); + Assert.assertEquals(sbfont.getFirstChar(), 50); + Assert.assertEquals(sbfont.getLastChar(), 114); + + Assert.assertEquals(sbfont.addFont(getFont(doc2, "R13")), null); + + doc.close(); + doc2.close(); + } + + @Test + public void testCFF2() throws Exception { + PDDocument doc = PDDocument.load(CFF3); + PDFBoxAdapter.FOPPDFSingleByteFont sbfont = adapter.new FOPPDFSingleByteFont(getFont(doc, "T1_0"), "Myriad_Pro_Type1f0encf1cs"); + Assert.assertTrue(Arrays.asList(sbfont.getEncoding().getCharNameMap()).contains("uni004E")); + Assert.assertEquals(sbfont.mapChar('N'), 2); + + PDDocument doc2 = PDDocument.load(CFF4); + String name = sbfont.addFont(getFont(doc2, "T1_1")); + Assert.assertTrue(name.contains("Myriad_Pro")); + Assert.assertEquals(sbfont.getFontName(), "Myriad_Pro_Type1f0encf1cs"); + Assert.assertEquals(sbfont.getEncodingName(), null); + Assert.assertEquals(sbfont.mapChar('s'), 11); + byte[] is = IOUtils.toByteArray(sbfont.getInputStream()); + + CFFParser p = new CFFParser(); + CFFFont ff = p.parse(is).get(0); + Assert.assertEquals(ff.getName(), "MLJOGA+Myriad_Pro"); + Assert.assertEquals(ff.getCharset().getEntries().get(0).getSID(), 391); + Assert.assertEquals(ff.getCharset().getEntries().size(), 10); + Assert.assertTrue(ff.getCharStringsDict().keySet().contains("uni0073")); + + Assert.assertEquals(sbfont.getEncoding().getCharNameMap().length, 10); + Assert.assertEquals(sbfont.getEncoding().getUnicodeCharMap().length, 10); + Assert.assertEquals(sbfont.getEncoding().getUnicodeCharMap()[11], 's'); + + doc.close(); + doc2.close(); + } + + @Test + public void testTTCID() throws Exception { + PDDocument doc = PDDocument.load(TTCID1); + PDFBoxAdapter.FOPPDFMultiByteFont mbfont = adapter.new FOPPDFMultiByteFont(getFont(doc, "C2_0"), "ArialMT_Type0"); + mbfont.addFont(getFont(doc, "C2_0")); +// Assert.assertEquals(mbfont.mapChar('t'), 62); + + PDDocument doc2 = PDDocument.load(TTCID2); + String name = mbfont.addFont(getFont(doc2, "C2_0")); + Assert.assertEquals(name, "ArialMT_Type0"); + Assert.assertEquals(mbfont.getFontName(), "ArialMT_Type0"); + byte[] is = IOUtils.toByteArray(mbfont.getInputStream()); + Assert.assertEquals(is.length, 38940); + doc.close(); + doc2.close(); + } + + @Test + public void testTTSubset() throws Exception { + PDDocument doc = PDDocument.load(TTSubset1); + PDFBoxAdapter.FOPPDFSingleByteFont mbfont = adapter.new FOPPDFSingleByteFont(getFont(doc, "R9"), "TimesNewRomanPSMT_TrueType"); + mbfont.addFont(getFont(doc, "R9")); + Assert.assertEquals(mbfont.mapChar('t'), 116); + + PDDocument doc2 = PDDocument.load(TTSubset2); + String name = mbfont.addFont(getFont(doc2, "R9")); + Assert.assertEquals(name, "TimesNewRomanPSMT_TrueType"); + Assert.assertEquals(mbfont.getFontName(), "TimesNewRomanPSMT_TrueType"); + byte[] is = IOUtils.toByteArray(mbfont.getInputStream()); + Assert.assertEquals(is.length, 47888); + doc.close(); + doc2.close(); + } + +} Property changes on: test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java =================================================================== --- test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java (revision 1575872) +++ test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java (working copy) @@ -52,6 +52,6 @@ GraphicContext gc = new GraphicContext(); g2d.setGraphicContext(gc); ig.getGraphics2DImagePainter().paint(g2d, rect); - Assert.assertTrue(g2d.getTransform().getShearX() == -0.12626262626262627); + Assert.assertEquals(g2d.getTransform().getShearX(), 0.12626262626262627); } }