[Checkins] SVN: z3c.rml/trunk/ Updated the tests to work with ReportLab 2.1 and added a test that was

Tue Jun 19 13:24:36 EDT 2007

Log message for revision 76799:
  Updated the tests to work with ReportLab 2.1 and added a test that was 
  supposed to show a failure a user reported, but works fine for me.
  
  

Changed:
  A   z3c.rml/trunk/AUTHORS.txt
  A   z3c.rml/trunk/CHANGES.txt
  U   z3c.rml/trunk/buildout.cfg
  U   z3c.rml/trunk/setup.py
  D   z3c.rml/trunk/src/z3c/rml/TODO.txt
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-000-simple.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-002-paras.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-022-paras-oas.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-029-keepinframe.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/rml-guide-example-01.pdf
  A   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle-2.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-buttonField.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawAlignedString.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawCenteredString.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawRightString.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-fixedSize.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-keepInFrame.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-textField.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/input/rml-examples-002-paras.rml
  U   z3c.rml/trunk/src/z3c/rml/tests/input/rml-examples-022-paras-oas.rml
  A   z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle-2.rml

-=-
Added: z3c.rml/trunk/AUTHORS.txt
===================================================================

--- z3c.rml/trunk/AUTHORS.txt	                        (rev 0)
+++ z3c.rml/trunk/AUTHORS.txt	2007-06-19 17:24:36 UTC (rev 76799)
@@ -0,0 +1,3 @@
+- Stephan Richter (stephan.richter_at_gmail.com)
+
+This package is based on ReportLab Inc.'s ReportLab library.


Property changes on: z3c.rml/trunk/AUTHORS.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: z3c.rml/trunk/CHANGES.txt
===================================================================
--- z3c.rml/trunk/CHANGES.txt	                        (rev 0)
+++ z3c.rml/trunk/CHANGES.txt	2007-06-19 17:24:36 UTC (rev 76799)
@@ -0,0 +1,21 @@
+=======
+CHANGES
+=======
+
+0.6 (06/19/2007)
+----------------
+
+- Fixed setup.py to include all dependencies.
+
+- Added test to show that a blocktable style can be applied multiple times. A
+  user reported that this is not working, but I could not replicate the
+  problem.
+
+- Updated the expected renderings to ReportLab 2.1. There were some good
+  layout fixes that broke the image comparison.
+
+
+0.5 (04/01/2007)
+----------------
+
+- Initial Release


Property changes on: z3c.rml/trunk/CHANGES.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: z3c.rml/trunk/buildout.cfg
===================================================================
--- z3c.rml/trunk/buildout.cfg	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/buildout.cfg	2007-06-19 17:24:36 UTC (rev 76799)
@@ -4,4 +4,4 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = z3c.rml
+eggs = z3c.rml [test]

Modified: z3c.rml/trunk/setup.py
===================================================================
--- z3c.rml/trunk/setup.py	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/setup.py	2007-06-19 17:24:36 UTC (rev 76799)
@@ -3,7 +3,7 @@
 
 setup (
     name='z3c.rml',
-    version='0.5',
+    version='0.6',
     author = "Stephan Richter and the Zope Community",
     author_email = "zope3-dev at zope.org",
     description = "An alternative implementation of RML",
@@ -15,7 +15,7 @@
     package_dir = {'':'src'},
     namespace_packages = ['z3c'],
     extras_require = dict(
-        test = ['zope.testing'],
+        test = ['zope.pagetemplate', 'zope.testing'],
         pagetemplate = ['zope.pagetemplate']
         ),
     install_requires = [
@@ -23,6 +23,7 @@
         # 'reportlab',
         'setuptools',
         'zope.interface',
+        'zope.schema',
         ],
     dependency_links = ['http://download.zope.org/distribution']
     )

Deleted: z3c.rml/trunk/src/z3c/rml/TODO.txt
===================================================================
--- z3c.rml/trunk/src/z3c/rml/TODO.txt	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/TODO.txt	2007-06-19 17:24:36 UTC (rev 76799)
@@ -1,18 +0,0 @@
-* Finish compatibility work.
-
-* Fix <pluginFlowable> tag to the following form::
-
-  <pluginFlowable module="..." function="...">
-    <param name="color" type="Color">#FF0000</param>
-    ...
-  </pluginFlowable>
-
-* Add TOC
-
-* Add chart legends
-
-* Add symbols
-
-* Implement form fields: push button, text field, select field
-
-  See reportlab.pdfbase.pdfform

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-000-simple.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-000-simple.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-000-simple.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -63,7 +63,8 @@
 % 'R6': class PDFInfo 
 6 0 obj
 << /Author (anonymous)
- /CreationDate (20070416001215)
+ /CreationDate (20070619130755)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (unspecified)
  /Title (untitled) >>
@@ -81,11 +82,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 143 >>
+ /Length 137 >>
 stream
-GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi71t=B?
-2cDCb1tON^#g$)nn4:gGa]Abo0?Ql6;fKo2.P=R(85)fZE%+C1ccf&6<!^TD
-#gi^CUVP%V!5#`[;#~>endstream
+GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi7Ygg!5<A6-af/$>2a]6^W8Bo8u<s[,*b"9uZE6Bd^/l;mF9M\Z-.7u/;bY-Pe#g#sMd/k8^^rll]V7ITh~>endstream
 
 endobj
 % 'R9': class PDFStream 
@@ -93,11 +92,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 144 >>
+ /Length 140 >>
 stream
-GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi92UaH@
-1fH(d1"A'Y#g$)nn4:gGa]Abo0?Ql6;[?,mcHf-\#Y7Wb<H'BZ/C2O5f2N$t
-;@(YO)l19m"T[4Y)l3~>endstream
+GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi9ZICZeZVW>61"A'Y#g$)nn4:gGa]Abo0?Ql6;[?,mcHf-\#Y7Wb<H'BZ/C2O5f2N$t;@(YO)l19m"T[6`)lN~>endstream
 
 endobj
 % 'R10': class PDFOutlines 
@@ -114,18 +111,18 @@
 0000000649 00000 n
 0000000926 00000 n
 0000001061 00000 n
-0000001257 00000 n
-0000001370 00000 n
-0000001655 00000 n
-0000001944 00000 n
+0000001272 00000 n
+0000001385 00000 n
+0000001664 00000 n
+0000001949 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\244\212:\037\371\)T\350\225]7\313\320\376\037\243) (\244\212:\037\371\)T\350\225]7\313\320\376\037\243)] 
 
  /Info 6 0 R
  /Root 5 0 R
  /Size 11 >>
 startxref
-1996
+2001
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-002-paras.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-002-paras.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-002-paras.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -204,11 +204,12 @@
 endobj
 % 'R16': class PDFInfo 
 16 0 obj
-<< /Author (anonymous)
- /CreationDate (20070416001215)
+<< /Author (\(anonymous\))
+ /CreationDate (20070619125700)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
- /Subject (unspecified)
- /Title (untitled) >>
+ /Subject (\(unspecified\))
+ /Title (\(anonymous\)) >>
 endobj
 % 'R17': class PDFPages 
 17 0 obj
@@ -227,11 +228,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 175 >>
+ /Length 171 >>
 stream
-GapXM_$\%5&4Gu<r54%$'cOF%R\j06Sgp\p5EHQn>#=PbgI>b/J`4EipaMI%
-g1.&5e-'5o#8/E2"p_Qu at 81>BMDJa_iQii957ND3.Z&u<6[L@;a+dCe)OatW
-g at oGX.)'?1/*J"bcAJqc"%o.8>B1nn<Tuig1SM2\epIJ_<?sO~>endstream
+GapXM_$\%5&4Gu<r54%$'cOF%R\j06Sgp\p5EHQn>#=PbgI>b/J`4EipaMI%g1.&5e-'5o#8/E2"p_Qu at 81>BMDJa_iQii957ND3.Z&u<6[L@;a+dCe)OatWg at oGX.)'?1/*J"bcAJqc"%o.8>B1nn<Tuig1SM2\epIJ_<?sO~>endstream
 
 endobj
 % 'R19': class PDFStream 
@@ -239,31 +238,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 1421 >>
+ /Length 1382 >>
 stream
-Gau`SgMYb8&:HLqIi,+Lb7l\U?!]q!Fb)NOJ,jKG7!pKTZBUY!CPlZDAV9(0
-1V::jU1Glc"V"uZddG>LR<)tY">'H^omaZ-gCUNS":0]8#3)![KQlouG^8iL
-nj:Su+MOA@`:WmdS02)SlM5&Mpu#?lKKCmEs)gj#h^fr3[=D8@$4^/)O.YVD
-#lfVJ<u'`Nj[BZ#.fUKTR#V8T0K2-:.Lmt_hBPQ9a-BTh?(VlMMBIq4Q0I17
-Z8N7e->TSV[07dKdMg[C?U*$O(DX/*"-IONMn2ZYN5N]5&A2>bcRM#/mE4>E
-VZ6=ps,m[KqYOrJX%*-Q7f2b84qqJIq-O>QM'YZ(_amoeq$)UDe@^.H!!u?N
-g2kUW3+>6hE4p@>4V]Qg4fd5D at V#UO!O&5l&P)rN;R.n+!IJm."FL>bq\.&;
-."E"i)C.(j]\,`dJg(CG7$U4N:<HpA(6sn05_Usc9RS3NB=s_t0anV0COu[+
-BJ5,r&N.fFWKs.FM*o/Zj02#?q$(GGPfugG/"fXp-JLf(AR7g5A(fm]0;7Mp
-#(0]5<Jm2S_52Cn*?Ma#!IOPO7U?@VMJVnC`T/ElE33rd at VjeBcg2IZJ@G?/
-k5t'r/@;'NTEdnIlF!k0QlU"p/`.Zp4VVno)0nnUdV)_CWi\&#IRNiX'8SgS
-)<.If3gnp%e\^urPB`CAVAAlu`VXbHBZ4q]q%V?IVM.05Mb7TbiDnR()FGJG
-'@^\?CPeaN)>J8nVB!k_<[Csk\E.t<B_PAZqBcXkqL?WGN;#8B_?N>BQ$]<I
-LNKUfCCDF4\Og93aEbAWJlfAPg.0Y;CP?aZC(b7bB+!\m_Rta\7iePqGuHuC
-RkF+S?'n;k,>2tH/6)lS*Bt6VA_=V-C>pgQR9"P=]M!>&D.?a[O%_f&/WB"`
-?9eU,&8n'aP;b9.RI>41)?k"=c1a:sXK'LKb*198#6oN&4EZCjYqZm^7#4cL
-=u'sHUondANq3E\"P>'G[lQc:HDU[gmRTP9RHnTO?<9jLOJS)I=Wc@>lX at t/
-\Un(6&YqGD;'R\WELm8Flf<_\6UVY2VSj4qN>^`D-H#KDd^),PLb.sIc3[QB
-VS#msMcN at n/j&g/-lt)#KA+oj<b'.L.HU7GPJBF>]_T%(1TfB>@p2(dc>0U%
-r%!A#c;hG+;<Q[<obDGLFO=\cXJ62!4;+ia0$8aTl5dKdV6i1')>K&qH["Xd
-O7>p$Ek?`bQI%O&c?B,_D+T4(Bud&rdm#i8;C*oQ>l9S)ng4&A/)rQZGf7Ol
-k,ZDPH_4=77JXGs4T\uRiQb6)6-ga-T%\)no>Rl7q7bglZfLY[=hamWg7Kk@
-pO740EJbJNX[cAiX&ZWoR,:fih"dWiopNkQAobLHCeIJCE-^sg[R8L*~>endstream
+Gau`SgMYb8&:HLqIi,+Lb7l\U?!]q!Fb)NOJ,jKG7!pK^ZBSB6CPlZDAV9X at 41i-rU1l/g"V"uZddG>LR<)tY">'H^omaZ1gCUNS":0^#$cFb?#k-^GnFGSfjb9.u5^YR^M<T/(3'l7PeFUr#n\M[c#kq_Sr8Wgo^KX%G.fl\3&KIsB+$\+R&H3-tcRQkgbDQek<;nm10c^M3?uC9SPT3^2]gIlNN[q$Yq^sJK(I9#I/(;8NA8NHT9\*+6EX,&N-P`^m^4*.kS!Uq='L^0=aK$eI;@]>a>juJ/5H=&Y[P*)\S*nnomRo%jkc]WdSJqI/*UV!*\kn2+kC;da-'fO=ocln3B,`l'5TST!&G4of%jWi7lbGnik(",A`:_RC<)qurpT.o;Oqf^5"h]]_=s+DJ:;M*Y#OK^W$1J7km8&g/U&YfX.Zh^[Z?dV_'(RV.+j)(1EDle!ii$ru!@j=2 at -T94-0=M^LLG^@3til):O^]XM5X"#8<rh#cQ$Ef%u3#c!8kRcNKT\9mfc[1?De`u\BHHVpFL_2mPRsKaFJ4#\kFf!/@Z8;\AJuh5%*RQ?t?fu-r2c4Y9laWJ88`6F^s17HY1%>"h`/>4;2\S[mCI;"aX"PUL"&WM:obSh=;:)dUNl9Srq&]-&m(nVV3N=lj$LNR6^BJ8095$f'rkjXVS'XS&DZ"1UXH6/NtMn==]-lbbq+_1G.sm>*Ldh%BmnYe`c$)R%Qn^=\B12beTj71Z`QkYU\:o__&pX7D"UAe2M+"d/Q`KB=P]*'@mh#WSA_`4![0V)IjU$a\<Z]5gGQV(VHiFf--m.>:YYB;3Og,3)^[''B[OTF4>cpSi6iFS*Ap-dY5fm26q<^02eVOd.'KnDMGiOVC(.$Q:Zp7_7LuQm5Ch1p;dBtEFE+uoE#q%K5gDpRCnr5b^>cCeKAhKBm/-c[]7IaWuRBW4#/cTiMk;`OH"gQ,9b(BZt.mn8R:La*TmgC#d@$dm<!l'oLo;Xgjsk@$eNpV\?>,^-qbe%Z9G^2f>EU`EWs#K/k at b1UIJL9ju`akf("QXI7+elVSj3&N>^`D-Gsrnd^(uKLihBWS7A^^9R3U$'WmH$>dj'7Sj-]"8%#P at XMTor;p+Jn- at p_[Gk5i-B3M][a0^6RS_%0_pf at U%S?$1-T[(#(l7:e!l(ZFQ==4uF4;G&d0$8aTl8<p5V)1,Q)>KW,4*TjuO7>p$Enc"-QI%I$`qK>-Bh<e$Bud&rdlf]6;C*pd9`0`jnicaa/%4o.n;)o'bu_rj%mI&T?fg<_oa#q:L-$JgK:YL9*SYLno>Rl7pn?ZNZfLY[=halKmE_'\Hf)HJD1WLmX at H8hUK+pkQsWe?h"e*!Fd[0Qc/a%pgm4Bii:>kl'\1\^~>endstream
 
 endobj
 % 'R20': class PDFStream 
@@ -271,34 +248,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 1566 >>
+ /Length 1516 >>
 stream
-Gb!#\gMYb8&:HLqIi,C#<f2^q??hT_]XXql'Q2jI":Fd\Q7.Rr7CaUBec#?i
-mW'aK,"7AgP!Xa/F*GsSR5;02>QP[iM#<epiQd55HNJkP56Jbs%fQS.l<dos
-FaYRV-kK15;.;S4$jT<56QOJmE=Y1T!e1N/cbD]ka7o>dLM6rgRj\YQW;cUL
-^&e6ApchE-:Y/YS\5[jd9h`jK)7cX)_)d5sBjFpSPAE69=_bE:6%THE\+_f5
-_Fa!c,sU]U$kd8OR+'B]=#1tbjA3a at a7Lo%#Q6([r'^n;RlCm68>CZ%Lf-)%
-ZAOereSKu:q)PcW7g)6PC'Zft(c]bSctWC^&?h6W`)..6[Xp=E at BnP'EYE*5
-:d.lI;k1>n3X2COL@>hWKD at QQ=]Fr4"=R?9+Ej3e`Z].11\a%b8Us?10]Z0Y
-0QXJOC9s39Ul[30Rs:rF/%Z^LTY`52kh+3^8L?Fp)8+2M8'1Zh31*Mi:7WNQ
-a>RmN-V7$S/JVNnlU(l#n>KguKFNbsL(DB_9JRl at Vn@:kkCZG$Hmi&2rc"DE
-ARWp+$k:#H!#RL4P)H5IGE9$-(bA%!#=^_f#40@%7!N^A=Sf"k%.B(T-j(F<
-1)ej#UD*!.:\'d)?$>`l]:hqGO,PR"[1'Tm$&6L5NnE]SmJug8Mibhr`C]RR
-HRE/XM"1\oT51fb0!Do5cXP5e+0"^7fl>8BChsrJY9D%>7kiIJ+Na7<AsE6)
-R-?1Wc([2SgDJfL1-42-&ZptIjO=t<4c351:`1aM;![TNDF)4L:D'k6:;s/t
-[B. at hLN)>rHhQ#jHO(DmDkF-4=r1Gc*#9Uf9kV;BJ8 at uHg&rSCA;o1N%0<.s
-*PlD[H!No?gF-96-m$6.Q;9g+lb`T/oA'rWadSa]hIt6gMfoR9>MV>FZsSnX
-!lPo]4TYho)nQ=B\gNm>gQ2uSE_#EG/!/m/Lth8?10070AtN`FWa#"2ec/Yr
-[Rf;WPeP+O#Vbqh3&V^#_TDP=[puI8bCQ67c>Un"G>h=2MYrjQ4)t0K7QT^)
-1K`Cu5\?W4eYsu_Y]<h7c!#[>O+5rENmI_,m,C),e5lRZeQ1?F'OVa$E5m]*
-*/jL&&YSi"*Uga[d+)9P+a?,\6E0R-NpJYf<8[MM`%(=EY]%_mJm%UedjdJ8
-nj"h%qaFGFP85QXJ:Qt]Ago3H]8.dA6k;%86Z.K8RO?;V+;ZHG9aQ-tTICPY
-&&#;&@F.4i#a%bhDPM7C$IWue?fde4I#d?INm]Z9`eeHpYkR2u9%S4KWCRP"
->RMIh>6ESUd%0ioGa3jn,a;X_j_!7>.jpf4-f#sN[5#*0dj&\Y=(ldd^PL][
-I?qag[G"`d]9%/LGCc/jmY,[*^#*PN='pZZ"P0MVUE5k@&m!92.I1(>pY*u7
-DE?Qnq?lPJ44Psg]JeoQQ0"n<]BuCE5:Be(W$MG3M.)OfSTRp??h]8>i$DAr
-kQ_g!X"[7c177"Q)[J4 at .m1"SPs"%^7$oVGG at uu*gi7UXBh_JW0)Qk2O#u<$
-orBlR?i:5'jSf\~>endstream
+Gb!#\gMYb8&:HLqIi,C#<f2^q??hT_]XXql'Q2jI":Fd\Q7.Rr7CaUBec#?imW'aK,"7AgP!Xa/F*GsSR5;02>QP[iM#<epiQd55HNJkP56Jbs%fQS.l<dosFaYRV-kK15;.;S4$jT<56QOJmE=Y1T!e1N/cbD]ka7o>dLM6rgRj\YQW;cUL^&e6ApchE-:Y/YS\5[jd9h`jK)7cX)_)d5sBjFpSPAE69=_bE:6%THE\+_f5_Fa!c,sU]U$kd8OR+'B]=#1tbjA3a at a7Lo%#Q6([r'^n;RlCm68>CZ%Lf-)%ZAOereSKu:q)PcW7g)6PC'Zft(c]bSctWC^&?h6W`)..6[Xp=E at BnP'EYE*5:d.lI;k1>n3X2COL@>hWKD at QQ=]Fr4"=R?9+Ej3e`Z].11\a%b8Us?10]Z0Y0QXJOC9s39Ul[30Rs:rF/%Z^LTY`52kh+3^8L?Fp)8+2M8'1Zh31*Mi:7WNQa>RmN-V7$S/JVNnlU(l#n>KguKFNbsL(DB_9JRl at Vn@:kkCZG$Hmi&2rc"DEARWp+$k:#H!#RL4P)H5IGE9$-(bA%!#=^_f#40@%7!N^A=Sf"k%.B(T-j(F<1)ej#UD*!.:\'d)?$>`l]:hqGO,PR"[1'Tm$&6L5NnE]SmJug8Mibhr`C]RRHRE/XM"1\oT51fb0!Do5cXP5e+0"^7fl>8BChsrJY9D%>7kiIJ+Na7<AsE6)R-?1Wc([2SgDJfL1-42-&ZptIjO=t<4c351:`1aM;![TNDF)4L:D'k6:;s/t[B. at hLN)>rHhQ#jHO(DmDkF-4=r1Gc*#9Uf9kV;BJ8 at uHg&rSCA;o1N%0<.s*PlD[H!No?gF-96-m$6.Q;9g+lb`T/oA'rWadSa]hIt6gMfoR9>MV>FZsSnX!lPo]4TYho)nQ=B\gNm>gQ2uSE_#EG/!/m/Lth8?10070AtN`FWa#"2ec/Yr[Rf;WPeP+O#Vbqh3&V^#_TDP=[puI8bCQ67c>Un"G>h=2MYrjQ4)t0K7QT^)1K`Cu5\?W4eYsu_Y]<h7c!#[>O+5rENmI_,m,C),e5lRZeQ1?F'OVa$E5m]**/jL&&YSi"*Uga[d+)9P+a?,\6E0R-NpJYf<8[MM`%(=EY]%_mJm%UedjdJ8nj"h%qaFGFP85QXJ:Qt]Ago3H]8.dA6k;%86Z.K8RO?;V+;ZHG9aQ-tTICPY&&#;&@F.4i#a%bhDPM7C$IWue?fde4I#d?INm]Z9`eeHpYkR2u9%S4KWCRP">RMIh>6ESUd%0ioGa3jn,a;X_j_!7>.jpf4-f#sN[5#*0dj&\Y=(ldd^PL][I?qag[G"`d]9%/LGCc/jmY,[*^#*PN='pZZ"P0MVUE5k@&m!92.I1(>pY*u7DE?Qnq?lPJ44Psg]JeoQQ0"n<]BuCE5:Be(W$MG3M.)OfSTRp??h]8>i$DArkQ_g!X"[7c177"Q)[J4 at .m1"SPs"%^7$oVGG at uu*gi7UXBh_JW0)Qk2O#u<$orBlR?i:5'jSf\~>endstream
 
 endobj
 % 'R21': class PDFStream 
@@ -306,36 +258,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 1690 >>
+ /Length 1632 >>
 stream
-GauHLD/\Dn&H6"8s'_/h:jQl)Z1D;d^9j`K/$XH5PY-.tIPJd&CdZ&cVB#?r
-DsY+;/K;:$-l!rYSp=r1RIL\"9RK_95+0=]#_'C\5T,NX5]'uJBE8"Yl,c/f
--[LaQp!jtU`3%X1JQ?6Il]]-X_)G(*c(R)o4CDN7mpICJ$2;VF$FhW/IUVCn
-q at 99-[>8b!-Rj:6rS%f.[LI-4&_DeC^qJ<*CJ^KO9.`m#2([Gu_-Eg;_&n1r
-I+'i6%n8&PD?2U0E)XOB)>$Bq>eksSI$X at m"S`P+^nHkU7)2D[`1I3,G`mjo
-%/hcc%0E.I'N);465YX7"B4Pm`-6UoZVmE$l0Eb)(,DK$,1N)d+?_;+iWX:#
-S'RCAO\/_EnK^F0>`&T_'9/qHT#@s7n,",a;XiC"HVNuFZ<dVM)DhS?ljkmL
-Uh:;e=XpuQ7(S+mL8UjB=+WgHZ\[tdm+ZDkgqY(nf`nAJp.guSJEE\>-.?tO
-H=(GA"gHq5 at TRN^7/+k+Q:7=h+;%NYg'8FUa0V^nW)<47kSfRn]Qb>qVQRNc
-HZTYe-Cs\O/tk>a.&<=(/Vd4U>Y0Cp;Tie"f0QK3*G`R\d+;Y">c;W at bnni5
-ZuXB%@6hGR+9/7jSbgN*BrDor=D]b at d(ZJ\^p%eP(0T.mdHLtl4+\i]D,4g`
-id[5&Nc at qL=hlMQ&S>PmG%D,67m&#b9l\lH67PiDrc0P0 at pU8mZEtBa)NX'P
-/n!8Xae7q#XYMb]='e_DXFqW]&=lT+6S>@mK%fB<-O>`-(Zr0?g0p$=OuXIM
-6;qM=F/\P.1>b?j91E'nO$)UhI. at PQmnY<l]n&mh+`?Q*"V%?BSoTigL:>i(
-c.5lVD":o<WANl?3X%ac->L-J5%;P\d+`AG`,qF9kVh]hq,DMaLQJKQFLl4r
- at ihCgD_m2'O5ce?AVWSN9*R90=5.rd,uNp!GIZ(;00#mXgNPf=!d,js,['ho
-L57rkG"J'6fZ#R4[QnY;#&/gWFs<9_FcH?g^m7ige2WBKMB7Z^Y85`d`$0h6
-Su&d=50\7%@TaP)+5:6'\?uI_]!RtXGgIJm9pT>5]R]O`q?Vu1SOg!S#JN]8
-+$nTeAAafEd54F:9AMMf]7'[_J(k.CZ>IG[RiN!T"CqNB>l"XI+,9anQS'Zp
-Y;k.0em"fG`Bupr%j(RQ(i\gcJa)X>?uLX1Ls^n:YA=O>+9-R&ga_uEN-pp/
-'FQY3We9n>6P5Re86hMiT!jmGcTFtf;n6"@\\q"$`+)]9-#g37F0&uqq?#6H
-D8K5:/slp(Pi7C5aE%(.rtCuLZ4mHcSJa^6Q["f`IjuZI*7MAgM_"`<7XS8#
-iMk(g)_C+W]aKa:CFF!<bOC-&ln'#`5Wf9*$GKYk:=N[dL""jNQ4:i74K1m2
-eg*P*mZ,-F!3aCEj;6NN/GK@'C+aW;EQ$-KACD?:;\f%\W$G+Ac5l!\]J4?_
-YdqU*?.%p\&j4*)o6=#<pj#\S`nN)_UHArp).tBo)O[WS`mJ-Z^!M=,FP5#;
-d;595o1E4iF5%'+/M,DN7Ucup#u[5&j['Zj`(N$j[Zs'Po[Jp'gEpXPa1:,(
-^o+406'^iINV#uLC<<2Dj>[=RrQBfd8"jfP%UhJj$C(spA2L-jTcIgs=T]q!
-m8AJ`PQ(Z!bLrQ~>endstream
+GauHLD/\Dn&H6"8s'_/h:jQl)Z1CF7h3YQlG9qENQW!)9e1ZOna>P;KifrJPrJd@,6Hb+d.LMmegZ)pYSf,k-Jr).\5Gq/a*lDo?'I\V(%&cm:(_:%/5!A`)oL."[TRA]<-ul:JS=l\qk4XXMpRuMo0O@(aoQeNlhVQ(NA.n>%:^X]`#/@B`(k7>2Y?JlRdutV2VV\aKM/@n2Hc5;=.c=X*?Cd`)=dGMF/h:&2<e at mI=9X0[2GsM+#hf>p.aY&AV/tj[(L[LuT(70L<suf0(^#OeDB]*s!=SlX@*568"CUG#WGN4A,U$A;Gne%^<:EV)L.*M"eq_r?@D2,T-Grt7!kkm*dF3+O49LUVVXo0a at L;?h3*dX,/k$!+N`spMO2?1DfDQ1K+a at Le]dC5mX&l'M)@_6<jb#s3nX5&E&kfCO&8ts>i%?JXPorr at HpMqGoki;.Y3uqBCqNZ6HH/7m,KiE[Jn!G4]rr0<%%)NYYq*?0dIo>J4:C106t.K/gY`.]E5&7T'rp+)9d<PX(6=)GeP.u7O1$`\o,'^Y!ic?_6E8_q&1H,HQ/l"([@DPmjht'IM,rsQD>f/AKlZA6Ho8N)/LOe8"uPrGiI?11WIFaZ#FY\$ecmo>D4>8E$k$.GaJ,Pk:.s6r&M. at u/YQm7mkVTsj.b$ZK68RY(ljU1Pr8adEK@%7KlLr8WC.K;b;!L#G_T0gi_$Rl4J$bcJ6>AiK1`AVMU^QiGsNIW'RC$NF?J(^\YO*FC7hUJh`j/-R+p8.LH4cqk%l=M9q?^VTmaD7q$%131<R1Fj>f`nP=HI:Il_lA%;[L,EC2,"Y;,FPP]Md?gh%3W)cQ..aa;.,6E((NjSoXXW9JK[L`I^+\(S]Ul*A%`ksFAMq,C<?LQJJbFLlM%@ick=[i%T$8+BC at ZGW@79*Wqs=&X>1,uJ*CGIZ(;cTe?TgNPf=%*sqXLm$g*'bP/QoTHFPY^Tr9A;/Zf"QBP?m8W5XFG'7T^lhR^e2Xf2MOoVQ0./]4`%6I^R`+gC3mDh!@ThoO+7!A7\?lC^]!RtXGgI2e9bJatR_`N5IKd^V:*c5%rOtd/mld,jA':5sd54F:8_k*B]64*dE8(Q4Z>II+RiN!T"CqQ+?2=aJ+%Cn!QS'ZpY;k.0em"fGa[8@!%j)!](hb!S at eTP(YdZpJ`2Hu4=-CK"a$1W"\*A3%5sEHpZB^edf"lg6VML*2,VCVONuL^_B-'OmY#MKc<8s!-iImGB$/FTUMV0Q7>egP>S+9[8$O/pLAb=q"Oq^(ire+o*jWYqF1ErdX'$kU^:IW3`A,+V`EM^FeR*RSE4>lYLK?5+,G at C$/L;MYH7NYT"Dn5WiSc_VkBbfMMe^:jFHM0P.Cb`BZ8P'Q(+pj]Z[gat$GLa\W^JMCU`M_?fF/aSD/TrTeRD#8_b.')m7:@aOmjPd*XaUAAbq8)GMH5@`huRGYa)_<WcbjKPhJNX;jZsI#0St'Sb?Q\eD#G*u$ge3gQ`UonRa%";=e8[Tgu^ph%5YDmQ5G<OJeVt.9Sh\K]Q@)K>Oc[,V]H2P<RQb#;SeuUcW'Ri7lK`mdQ>1k6TnHdR1A at 5#2+I:TP]jkRu9WFc=TCs6QmK#g![c7H]5t_r3_F`:/Cion6FW8~>endstream
 
 endobj
 % 'R22': class PDFStream 
@@ -343,16 +268,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 470 >>
+ /Length 462 >>
 stream
-Gasajh+kg@(qh<M4.KuYe*'n,)8j2sUJ"97&a9[>UQ!=ofS7^j>:9Qbd&^sT
-S^W&NI&@+Mr.s4i*7#W'J:LJc"UK/dp]ReUlE.1[jsZ%h3(b1:E0;?U2Uq>h
-1%XA9/pIm'o6iqi?35)n[$Y^Y<oA.*SC9"X0CWc5 at VYQCN2Tor80#Y-NCT#l
-UDB52FebT>%5em`RW(,]-V$AM0(o)B1UBp>et-d%2D#Pp`>kV/_b([l5,K at 2
-_;ITH8;&[nZL-HY"sC(s16,c6A_J85MKmZZ;:Z#Z%.-rc.[qcE14ck*,FU]!
-BG5QV=8-qreW'CH>(o/1TSZ.1G,UhG2Q`d0i\1&hQ'Ob^p./2$MReE>9Y_\K
-0*/8?^tV0c/45N"-sNKaR&.(=qoqcoZpU3HeGC6BMookm]d:B]+mD#u1\mc%
-bVQ9:GU;&J at 4h207!6$QL!uS*<pp9.Z*mp~>endstream
+Gasaj>>N*i(k!dbIlPhDVpVc815<7CUJ"97&a?&DgF-R;)r'lVgD5ZO9JgORIHRup3Su9:.mKd&36*762]s4WHj7G-#!Tm[[lR0_UH&\@.uk7_1Ro`3V at E3GB?5JqXp^i=IX`Bc\#0421bC&TZk^)W(T6m,r"K!+[hr>?!X#G<lP#%.Gf,*mq5=HD>2:U*6[_\J\L(QUeB+9m[7gI9^s"?/\[BJYZ;$5[@53ILiinTbJWK>`>d(U][jOM0;H`b^#!EN!Bc0FFq)iL*cUGK[0Ippl=b_)P:mFb=7[_%iq at Us]cEmm>bc=t'S*J/oA?A2e%a[V=%ia"l@@L:q6h0?oo1DY!-X3Ar=2e-)+-cGg5BCe!s3&5?b2HnYa-KTD<Ko)`2U'TOli!V+#MUBF+R558mmUeG4h`5V6m:eU%l=$aM+fe,_g!?Y#%9*l\O:SN&B-;$_WlLNHF1/S~>endstream
 
 endobj
 % 'R23': class PDFStream 
@@ -360,42 +278,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 2063 >>
+ /Length 1996 >>
 stream
-GauHKgMYb8&:HLqIi+gh<=2qGFgKR5"d5`L$TMi5$V2B1Z6Ydd-7"r2?.r/i
-^1W`J;3hhF"WAY+XPKH%R@,k+J4B;Ipn(DYcdm3G$7Hb?3h]qBSC77gr`Geb
-I69acG at LsqHoDOioC`Y16)/$S?OW:M"YE1g>3 at _eoAXB[lM6=gdQ4tAP`p2l
-J,!IMK\#U+rKC=QqY[FflS8F1c at Y"s9(V0;E5!G>l.0'W/PN=6rYkgq3m-d3
-BmmZ721_9i?*1KUs3]dZP-]/6*/t_llS+9a8[;SPJnR97O-[u:CanSYp at _k^
-R:0H7f0'eTAs;Y:b<HU$eS<f)2J,bi5!kNm<'Dnn<Mo4RQq9qGUi`fqL.Ym-
-I1ZF0rV?,^B7J7mop!_P`i`>U$:\jEFcclH-/"9\ZC!Q0:6I#?B1Nj"2Nk^a
-n$JE#(mSuDF4_r]OB""\P+;`'*O+_+&`q$\7N+:_2/\IF)SrKg+*td`&11B%
-5`+/l;<=K.Ca/*H71ka$S^[RW-OVSJ1:k>N(QOblU_4t`$F_:N1FfIGPdEbY
-X*GYD(O.BLGn=S/YlF9rMV[F%VgljakT,*K6J)eZ?iEA1Z'cY*]0Jd((aRh.
- at cCK)WQ41NUS:JRT"Wq/TVNKX1-P'@>*lF-9rC#L9KT0Dj!%j2h:ZK8V:lAj
-Mgk3A%uSsX^6+9L-;WN<(;<B"('$OG3MaD'MKEF2UjGZP>r'F:Om#WM0T\lk
-)?CkLATb8D#4G9pD<fWYX\i.WX232d34o15Uc at L[e&$fnq6H7%E*#FH;*\Vr
-)(l.P!NV?i(9SGVcUh5CjeYneYSY"H;&9+nabVTH='JRV1HMZ_ZqmJ*-U5.6
-+:ou,"kLZaWj&=9)N8C2;e@:^3-Ie0"/U49E3)j(4'AdpNC&Q@^/Zp'RN/,s
-4'dZ_L^91/1N9&sdZq+570L"RURMX]`mR=G+XW_Pdpr3Y&f;q15L0@'NK2fu
-$^`b4`fH)Jm1j3dZEWNL4cP]ArfE_Wdh\B`&[f9\lcBbf$Zt5%$I#Y'#=!bH
-5cUjeA7rT;Q+<pN63nbcO;L096'W]<bei`S8K11.8eMjn at qlVg.M"db^N3lO
-eiJm6`'`,DYp9&nastSP5B&?@T+iL-5]ZC$)s+O+6krOb_q,s85-6$H#>e*/
-Uc^'N!M4hQc/f/F9(ShFM^-W:j at C]'<E=-G)5SiVZ*$Do)$6HoD.*9D2'l(>
-\lB2ZP<^E$'En\!"r-q9;\pL+I[3TS028 at LR7eTg8EV9%JR$FSa8KJWUG<l8
-R5A.P80?temZULcn2a&^BZj.ZXprZ4ST<G',I4FOG50^OSrSE]D"N3p,3*'+
-;f"OD/)PUinLi$tHS4Z+qKLdd^:91c)TH;J3sE`/"(c8]Jb$8?jncM>d,KYT
-KI>P\%oEE!a/2]nO`c[VA$fTcN(erqUE%T`>"$If>sf9]`5r_LgQTkc-Ak2%
-Dn0>nLUA!MfVlsS"j'I"Wo,qqB*?Rm9g;K#9.*&k0e4M=k9)q,PA12ul.nT7
-dgj"+]>8M:hE?/YKLtE')*\p8'k1<E[XF/8QA_,;nIDK=h.A$#E!l+-ApXNj
-XjU0(?$.:MT/N;"lkW,JV6mQ:7)Y3t(<6RSaqX&(p(/r=F^Z>O!0h2'T,I7@
-(;(uPL>[tAVceX1*OOP#/A^31bk;>I].aDfRXdTumlHg_l:tl;%Of$F-SSu,
-F2a"44h)WR6\0HtrsZ\\hP0g4B%EcL@$o8?`"VZIE/8t?K2+_5O,Wegg3IeY
-hdV-Qk(M\&_!2NF92%DslUhnVaoX,cZ"Z0p:S+_KI)geHD>RV8;>_hbNu,.]
-A29PnA[G=,crrcl&_^UES]'W-#Q3*k)hd at RroLUZN<bY#)kW2+:8d#i'NtCR
-5Z!8Gr at f3$4TdG]2,kMe5>HK&+a:,POotFC+TFK\dAcK_X0S&1kSr353nE":
-?`1+ES]"][Nbd>6-'6?H_iBrM[oEE3Ab\s3+8nm"mDiW/lZi0iKJ#?Wc-`mG
-1HVZ?3^<KXe)32k~>endstream
+GauHKgMYb8&:HLqIi+gh<=2qGFgKR5"d5`L$TMi5$V2B;Z6Ydd-7"r2?.r/i^1W`J;77+j"WAYkUYVKqR@,k+J4B;Ipn(DY0 at k6M$7Hb?3h]qBSC77kr`GeaHoaF\G at LsqHoDOioC`Y16)/$S?OW:M"YE1g>3 at _epZcMkk2hKOdQ4tBP`p2qJ,!IMN7K(arKC=Qp at P/Rb;'$fc at Y"s9(V0+E5!G>l.T?[/PId`rYiOj*TctU[(]k,RQsVD/lp]es6+D=ak8XVN^erGAJiG1,Zu`85r>1W8'C"-[M8 at 3Hi%aUbcib,bFXPoZUso.jduhM at Pr!G)`&lE+/-hG.\@OI.arScbbQO4;S#eE6_uKRhM_DbrV>QNB7J7mjcn$@`\(:*$:\jEFccms-/"9\ZC!Q0<g"kGB1Nj"2Nk^an$JE#(mSuDF4_r]OB""\P+;`'*O+_+&`q$\7N+:_2/Wpp)SrKg++(ja&11B%5`+/l;<=K.Ca/*H71ka$S^[RW-OVSJ1:k>N(QOblU_4t`$F_:N1FfIGPdEanX*GYD(O.NPq&moD@/o>8't_`NT)L/LU3H+o.q([!J,'Id`+F<Dm/dk;@utAVMMYhCU`Q/?NJ]W:HM2AXK9BsTb4Mn?CL+ZR2*K7D(YUm?*u=ZQmES2-YLRME>P*htrh+MLi at C>+-[GQKZg]5sCB/VZjcKI:.+4BcP3sT4FNG at -8"rB(_E]HICBSa$QIWrX)SA#^[]*3W[ROQQX9M2,ip?LpPN%\Y9a_aUk0$X0_d*jk6ii9eA[i`4"KY)@>. at lM4==QSQ'Y81_OgGS7p5IW-6p5i?#<.JcKMcqcp!RESG__'JO$#M'j)9uX2:1.BeZEd:775liRf/^%$]V+_Qc:=DIpY52$toFqc:g<BQB2hmW9Tn,9f[Y0>NE"86<qp'bSs<N3:HF)G;"eKpZh2:64M78mmk`s#^N;2*,ms/7?om(dBdm[o\f.bJKj#pG>bLqa5\T:0VCt7F^nbXsZl8/C8M].PSK;*;fph!3*+2OIc&2<p$E*$R(>-5[sL*#$$h:0FP??,]+OS.S3UXN2]B:W&t(%rQ^8->O+P#&._pUa,]6D.'"o2IF#l+ITD8T"3JLeD3WfG'3.;'%UXS(qQu+g+$_Q[On(eX%e'VND9b'?<gk+I?Q=pB,Y(1PXg4,Uas^OuMKKZ>aq+R?B`mD9W[WL^e#dA at Rfk3<TI;Lu0qd/8QoagEoWqN^4)$a8c!9hT6oltE#ioIW5406)*L6.3ae[lF5l*0AEhA;2K@`*b6!JL>F)>lfl'0YO)j,!>ZGU0>H9)CfZdJf`M2['I9sO*XXaK;C`4I^mmCBIIl/-b.q<C"]1lTOsp)#&f%@"!f#0Q8SQg:!H5`7Fi&tX&d4[]Ut+.GaY7+O at JNR<4*0esK`O)d?uBb;Z7F:Cqe&gpV"Dbi8-Qm`S1]]G"S+4b&*@&#3<B-]9uX+KYbT+O>T2>oq*/=d&H`iP7=SV-PK:T=ksVON,VVB'i4S&'+oDP#ZH at oBm<`m9?<KilojD-u>TEY7mnh>u0SD0?NpNrcuOC``XqX#-)8<uoBWVi>=K]*6VV.IHI'&TQm!`A)qX1'RN84[_t=?'l-m!6V[Oc]%[0$XT#c6h&'\e#Yj)%U*^LQ=00)B);^`?'p4C9gG?KG9'?jFXo42#F+*47keALF2a"44ZF\*6\0HtrsZ\\hP0g4B%EcL@$o8?`"VZ9E/8t?K2+_57n3Anm6!AfYHbkNo8)?7_!2NF92%DslUhnVaoX,cZ"Z0p:S+_KI)geHD>RV8;1+V>a,AVi17?>r1>8[&BJ#qG#jj;3:?$Z1"9.SF%75,5s6$k$`e2t*lc+SIptL0',"IpKh[BXAW7I$I at 3)RBd$#VO;o?2?oTPQ,(34W1s749r7LuK"bM4gEUSCf>l_bf#d1`L<q at qM[Hjl:R#-+)5=EkJXl3_L2%%iBCV4Vt9S[[duJ[=ltZcRd)kokJ]LQt6)-iX6P3'sb~>endstream
 
 endobj
 % 'R24': class PDFOutlines 
@@ -422,22 +307,22 @@
 0000006426 00000 n
 0000006773 00000 n
 0000006911 00000 n
-0000007109 00000 n
-0000007260 00000 n
-0000007579 00000 n
-0000009145 00000 n
-0000010856 00000 n
-0000012691 00000 n
-0000013305 00000 n
-0000015515 00000 n
+0000007137 00000 n
+0000007288 00000 n
+0000007603 00000 n
+0000009130 00000 n
+0000010791 00000 n
+0000012568 00000 n
+0000013174 00000 n
+0000015317 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\245\320\367\206\314U\033+\335.\001\213\256\021\305\275) (\245\320\367\206\314U\033+\335.\001\213\256\021\305\275)] 
 
  /Info 16 0 R
  /Root 15 0 R
  /Size 25 >>
 startxref
-15567
+15369
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-022-paras-oas.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-022-paras-oas.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-022-paras-oas.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -150,11 +150,12 @@
 endobj
 % 'R13': class PDFInfo 
 13 0 obj
-<< /Author (anonymous)
- /CreationDate (20070416001215)
+<< /Author (\(anonymous\))
+ /CreationDate (20070619125700)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
- /Subject (unspecified)
- /Title (untitled) >>
+ /Subject (\(unspecified\))
+ /Title (\(anonymous\)) >>
 endobj
 % 'R14': class PDFPages 
 14 0 obj
@@ -171,31 +172,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 1421 >>
+ /Length 1377 >>
 stream
-Gb!#[hf#8Z&:T\)s'b3,3)r]*A\hb'&!pTSSWpRn1J_"Wf(NS:@;oYckk`nT
-FohUcp+<PE?BrTp]ef8.1Z-E\&?t\ckg.3dmR+LT&g.n*#RIaRKFdQfG^]8Z
-op%_95^[]DM<2-XGX.]OeFfqoJT'9SY$q+i[g2d)IL;bs--WAW$5h<#I\cT?
-_S75k8Vd(cI?hX9Wdj.DM_X^QZ/tdX#af>u(-rhKqIm.b#IZfE<X1b:-PEq[
-3c-KKYoWi672.3.^cO"@+r3h=D>6GJ6qSaf%@8821'*kDn5B2RFOQrYnHBRf
-fOJrPn+_c*%=:0J5\rla,n%UE:.j1.<=>C"&iaFPH7fQG,N)H8ah5JXohEF-
-1`;jH%Q3&2K$WN0<&=h3`XjD&=eGaurn;Nqn4a=IRUh4R.Sk:)&G%OV(-G<r
-)?]pg)-HAo65erd\qIUj]^fOVe!K$BL/LPWn<^d;&nI"/Dr_4KGi?(?fXa9V
-ZWt at 0:R=j9]q]\b9qlpIA%D<$%J7.^,b;`+Cah+G%jI0+:c:4aU)ioAfN-3#
-[cs)ZLe.8/gt!A/QtXo]QY3n3;InZ6oe@,IIg*-;P at TT]LQbjKg`qj>\//o=
-Cpj&&XC at qAY4)'MI5<IF^025.]qMU_#1_AG+j`T93jQ"EDI=(&FtT#39q&bA
-0;?)j-<0,Q(A#Q4^QO4lpR=)"gOb`[qcn2tUoR"&$lpS#Ua[k!k/gdt;3]4=
-(X_/X'S\?sU&h#*$KJS3]ShlH&_(E at 5i56O\!J^P;)cSEg75"^(;Nlkg`Vnq
-P=qgmS%pj0n4rVKmN2$B1I9J4kQ?6<)V;=.J-O.=>b31)2mE!khi]"&!nUGs
-G.T0NBr79[;=UqTK:NZ>GICSl at 7SHb+c_*kX#Y>S7PDFdN$ii`i6*BMRIEc*
-pV?CUNd0u[F#EC2<E8IL*2YUXI at Fgi<d7Q_$$'I<-Q1c<k<_??Ob(<[o+;kL
-&TrKb'3CbE1W3pp$IcR:cgm_Ld\si=a$N!GeYRSYZps?1Z>i\3r%eQTXS7%b
-94Y,.;QU0m!Wrmfjjoe$UY''k;3tS@>p]7jJlg6#ZGs?e\?A_9$'/7+,6R'M
-0K?ioX9NiF%`HmNFh>,IqM)-ST:k#O3sQ_EZ[CME[X^uDDU+3E`Eh;_r]l_h
-#PG6Jjaam:Bpr]*GI2ua)#VK7d<dG>SBG3+8,KQ85-s;lmGjZ.E4jZMTGJ>q
-*o".#I'IH[Z"l>c/G8csN3@^fpQOi=p79Zj'$T9A*d(5c<m<,!?Bl.sh_V*p
-H%^%3f'Roj^+KrNr]fI at W_pSpg9ppK'ZT$tSN#7Jho\5Jm.<?ae[%O.A=5e6
-E,+rV=BDIq7f(^tdo(,T$$<*5kUPgUM,k9 at b,aN4O2'I8E..C4DqZ6e~>endstream
+Gb!#[hf#8Z&:T\)s'b3,3)r]*A\hb'&!pTSSWpRn1J_"Wf(NS:@;oYckk`nTFohUcp+<PE?BrTp]ef8.1Z-E\&?t\ckg.3dmR+LT&g.n*#RIaRKFdQfG^]8Zop%_95^[]DM<2-XGX.]OeFfqoJT'9SY$q+i[g2d)IL;bs--WAW$5h<#I\cT?_S75k8Vd(cI?hX9Wdj.DM_X^QZ/tdX#af>u(-rhKqIm.b#IZfE<X1b:-PEq[3c-KKYoWi672.3.^cO"@+r3h=D>6GJ6qSaf%@8821'*kDn5B2RFOQrYnHBRffOJrPn+_c*%=:0J5\rla,n%UE:.j1.<=>C"&iaFPH7fQG,N)H8ah5JXohEF-1`;jH%Q3&2K$WN0<&=h3`XjD&=eGaurn;Nqn4a=IRUh4R.Sk:)&G%OV(-G<r)?]pg)-HAo65erd\qIUj]^fOVe!K$BL/LPWn<^d;&nI"/Dr_4KGi?(?fXa9VZWt at 0:R=j9]q]\b9qlpIA%D<$%J7.^,b;`+Cah+G%jI0+:c:4aU)ioAfN-3#[cs)ZLe.8/gt!A/QtXo]QY3n3;InZ6oe@,IIg*-;P at TT]LQbjKg`qj>\//o=Cpj&&XC at qAY4)'MI5<IF^025.]qMU_#1_AG+j`T93jQ"EDI=(&FtT#39q&bA0;?)j-<0,Q(A#Q4^QO4lpR=)"gOb`[qcn2tUoR"&$lpS#Ua[k!k/gdt;3]4=(X_/X'S\?sU&h#*$KJS3]ShlH&_(E at 5i56O\!J^P;)cSEg75"^(;Nlkg`VnqP=qgmS%pj0n4rVKmN2$B1I9J4kQ?6<)V;=.J-O.=>b31)2mE!khi]"&!nUGsG.T0NBr79[;=UqTK:NZ>GICSl at 7SHb+c_*kX#Y>S7PDFdN$ii`i6*BMRIEc*pV?CUNd0u[F#EC2<E8IL*2YUXI at Fgi<d7Q_$$'I<-Q1c<k<_??Ob(<[o+;kL&TrKb'3CbE1W3pp$IcR:cgm_Ld\si=a$N!GeYRSYZps?1Z>i\3r%eQTXS7%b94Y,.;QU0m!Wrmfjjoe$UY''k;3tS@>p]7jJlg6#ZGs?e\?A_9$'/7+,6R'M0K?ioX9NiF%`HmNFh>,IqM)-ST:k#O3sQ_EZ[CME[X^uDDU+3E`Eh;_r]l_h#PG6Jjaam:Bpr]*GI2ua)#VK7d<dG>SBG3+8,KQ85-s;lmGjZ.E4jZMTGJ>q*o".#I'IH[Z"l>c/G8csN3@^fpQOi=p79Zj'$T9A*d(5c<m<,!?Bl.sh_V*pH%^%3f'Roj^+KrNr]fI at W_pSpg9ppK'ZT$tSN#7Jho\5Jm.<?ae[%O.A=5e6E,+rV=BDIq7f(^tdo(,T$$<*5kUPgUM,k9 at b,aN4O2'I8E..C4DqZ6e~>endstream
 
 endobj
 % 'R16': class PDFStream 
@@ -203,33 +182,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 1518 >>
+ /Length 1470 >>
 stream
-Gb!#\9lJcU&A9%PIi,,>."t*25PQNI(H445_@<$&Vqu*DP*f(1.oKBq?f0OB
-/k&C..$7,,fW\fOo'LeqAnHfF@,_ub5:9+6oATD7!28>sJ8g-nrrBh2f2mH/
-?cb/4`"d'P(q*bg"d6c"b;DBlY%`L&K]2)Y+6_b^Hgnp0K;VG.KeQDSr'KXP
-n at sMRX+^7iI?f=M`Ab8^_)^/>A(WE86[4cllP%2`9.ir)El!tJlZn2>#uhJG
-^#qXSWJ(\f_j=AfA>oV/,)#,R*/>EU<_3Km$@`44ZhI<PIh)01UsZrNfO08V
-HB7fu"+#nCQJ"mW<!8U![NbJ`XFp=0GZb#T,N=aB6S]+7/=aSJ at e4g_#LfYk
--sM?h\2rBE"@r':@3XY6Foupt^a]>C)7EZ?V_D)T]>rQQ%$i'LK0_N3"5'_?
-M=BLc1%hG:1;)'[7qLTZ2$\!`D9k8;T(Wk*Ros<[Qof!f0A=M^!mKXPJH4-b
-HQ9m\KLPB+#a58=:1580o`fPZ)\osN&df.l*N7Wth#SpTZNrG,;%faf/lnHd
-W`2RZgNu#3C)H%=S:@]hL:Y%gOuuCN6XJ7!]/"B.4^P8)@PkfRBX:s[<6'M7
-e+8f,hZ#j/DM`'C`Gq_/h>f%ZDiBM'`C,0V7K&/heN-Za$743Wlg^kYZ.rhU
-/@/80WlIl97V%P:!TkNeS>]!"<fi'gAl`,<DW32ca\S2Y<9EH_A/3_ifX"eK
-!I7=?D:Xu<T](ZS=p(:"E2DU!n=X\\$WR@@Ha5IT#knbIR+3r'&DB#SGU(A#
--3Dghf`FP2&C.S/$OU5WoJ=^85Q$hTP,235lpW9,KWQ=:/ikZ,)$+1TKO031
-ZWa72Mm+GKq_]WeXWL(qbmL7p"QHS.&KC&[;nJ)!#5_]!cX:^e&mM/M<_D9/
-Ba?Ec_`0PX,N:[IhqjBg6DFb^=E4=B%D at OK7T%b&eD68Q?RaD`=5(JcI0jH@
-0i=Kr!X(#L"[?f;3;<9iDKL.'(LS'J!74jDk>kgSHr,?!0Z0=G(rS=8ci48I
-CTO]55;l&T(1 at K+`V+sqj:i*RDC?;8>i^T8hjP8_Zf4?L?$Hk at Kj7%?Mj>JE
-/^VW?!S?qf;H2 at n&PX$s*b9MN]F!S2Sh0Jk>bDM^Pb<4&RQ:MMd(Alq%._;f
-&@j([[QA,B_fHjHf/\0dT;24VRs!5(:E`SR*=arsK7;uDgI8^Bi`aDOhAYkl
-"l7j-M-"I at 5sb<2PO`3Z[8q0'8gKrO#)tA"e8P`cqASa[iA]/Tf&o&0g8CHI
-n$$Xg[(F.j?rTHQOmI95o^u;E.>'K-f;SSe[Mc,hm@:T/6 at 2XEM/+"f2sn?!
-]&QPn9/o/tpj-S`+b">kq9&F=<tdFp+>]+G7.0EBHLQ:3=:&;SFbefl-`d;c
-41s`<1<sjqLs^3k[AU6#`H<j&"\J_ at mj.1ZipP1X-h$k9=t=6P<[]o?@Te;]
-rG(fCesW_`E-U1["p1s2rW=[X`\@~>endstream
+Gb!#\9lJcU&A9%PIi,,>."t*25PQNI(H445_@<$&Vqu*DP*f(1.oKBq?f0OB/k&C..$7,,fW\fOo'LeqAnHfF@,_ub5:9+6oATD7!28>sJ8g-nrrBh2f2mH/?cb/4`"d'P(q*bg"d6c"b;DBlY%`L&K]2)Y+6_b^Hgnp0K;VG.KeQDSr'KXPn at sMRX+^7iI?f=M`Ab8^_)^/>A(WE86[4cllP%2`9.ir)El!tJlZn2>#uhJG^#qXSWJ(\f_j=AfA>oV/,)#,R*/>EU<_3Km$@`44ZhI<PIh)01UsZrNfO08VHB7fu"+#nCQJ"mW<!8U![NbJ`XFp=0GZb#T,N=aB6S]+7/=aSJ at e4g_#LfYk-sM?h\2rBE"@r':@3XY6Foupt^a]>C)7EZ?V_D)T]>rQQ%$i'LK0_N3"5'_?M=BLc1%hG:1;)'[7qLTZ2$\!`D9k8;T(Wk*Ros<[Qof!f0A=M^!mKXPJH4-bHQ9m\KLPB+#a58=:1580o`fPZ)\osN&df.l*N7Wth#SpTZNrG,;%faf/lnHdW`2RZgNu#3C)H%=S:@]hL:Y%gOuuCN6XJ7!]/"B.4^P8)@PkfRBX:s[<6'M7e+8f,hZ#j/DM`'C`Gq_/h>f%ZDiBM'`C,0V7K&/heN-Za$743Wlg^kYZ.rhU/@/80WlIl97V%P:!TkNeS>]!"<fi'gAl`,<DW32ca\S2Y<9EH_A/3_ifX"eK!I7=?D:Xu<T](ZS=p(:"E2DU!n=X\\$WR@@Ha5IT#knbIR+3r'&DB#SGU(A#-3Dghf`FP2&C.S/$OU5WoJ=^85Q$hTP,235lpW9,KWQ=:/ikZ,)$+1TKO031ZWa72Mm+GKq_]WeXWL(qbmL7p"QHS.&KC&[;nJ)!#5_]!cX:^e&mM/M<_D9/Ba?Ec_`0PX,N:[IhqjBg6DFb^=E4=B%D at OK7T%b&eD68Q?RaD`=5(JcI0jH at 0i=Kr!X(#L"[?f;3;<9iDKL.'(LS'J!74jDk>kgSHr,?!0Z0=G(rS=8ci48ICTO]55;l&T(1 at K+`V+sqj:i*RDC?;8>i^T8hjP8_Zf4?L?$Hk at Kj7%?Mj>JE/^VW?!S?qf;H2 at n&PX$s*b9MN]F!S2Sh0Jk>bDM^Pb<4&RQ:MMd(Alq%._;f&@j([[QA,B_fHjHf/\0dT;24VRs!5(:E`SR*=arsK7;uDgI8^Bi`aDOhAYkl"l7j-M-"I at 5sb<2PO`3Z[8q0'8gKrO#)tA"e8P`cqASa[iA]/Tf&o&0g8CHIn$$Xg[(F.j?rTHQOmI95o^u;E.>'K-f;SSe[Mc,hm@:T/6 at 2XEM/+"f2sn?!]&QPn9/o/tpj-S`+b">kq9&F=<tdFp+>]+G7.0EBHLQ:3=:&;SFbefl-`d;c41s`<1<sjqLs^3k[AU6#`H<j&"\J_ at mj.1ZipP1X-h$k9=t=6P<[]o?@Te;]rG(fCesW_`E-U1["p1s2rW=[X`\@~>endstream
 
 endobj
 % 'R17': class PDFStream 
@@ -237,32 +192,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 1453 >>
+ /Length 1407 >>
 stream
-Gaua?D/\-!&BEZub'+]uhU#2?GLqmTlC0W+3JmI``&ZYEnn,]G\2?0WYEO"!
-rasbX&E"O3Op4=Yf/*#jfq1DP-kLc'rAe#rGlY$$.8U5b'W>m&&<(!6S=]Y"
-HD9".:g^=ZC:a'V0$q`MF*r%:K22aU$g:lG(pQjQQOnsX_G(V6!WDTI(WKcI
-n-+DN[>WA/-OG#k]krOn[LMZ?1L2(X!B3&c*C3tA4)/K8W+ at j6n\\CY?XGkP
-.%+6`dB@?j]gTn?!UFeGp6O1[gH^Uu!E1%c_*#j at haT5"Z(R+s#3-nfL!8L!
-P&oOmMl?h#8$c_L&o#3'g5+mc.&jQ?8``RV!KPimGqMESPM.lKmTr&Vbic)0
-W9QTg!N_7^-kpL1,RC)Fk&d"<nfqKIGRMOKHo\lrP1c5GgjjSH-MgfI48$_Q
-Oq<NRDsIP*6Rnu<,DN at 0I0g`+RPb7K-aIDDQUYiHVf"#"?_o60?4[k6[Zu/,
-NOqoE:2(0,IFM*NXaD1?:S1M8>p7O?@?s$>Z/_V?YldOci.$ls.!^G7e)!.=
-K,5kkP."2J8Fj2\.T:Wp8qZRUM%[;06L=LibF9b3PISh\4:!!gaqE)3T*!H-
-,+$]!ATU)??1RnhlqMe"k#)'*R674ahkm<q,=2Br4QEc,0B[Z_.][WD2Wf8M
-&*KMJOo5_lj;9n;+\pLiR"i[KQ'I"kMW;ZRUe=Z&VN at VKI%A=[03pkp2H!ao
-Q$LiCa'uod`Du.W:Z3HiPF:*l"jSV.l-+c:!40'i51S0fbN`<W)n=-)=Ep1P
-Bp%L2?<(>u1#8g^;Nn]1g4:+BVW*q>f8A6hV at esMRtQ0\(3'Ui!BOP6ch4Gr
-(L7Yi)`s)Gfh[r"!38Tp/j2J at qs351A![l;)k2VXiZV4Li_r:9O)B`D)Mhl9
-T=R80L>038*Geu;Dt"!mMbZ%[^tR0*'?FQF4]"JUFAsTS4#g?\Z'f!EM[YD[
-r?r>3^.if*EW,n7M+h#^6c[M\K),^EGRc'>ZoM+(Z'h9As6YNR/trB at fo3\o
-!cG/i^E$UYn9g1C:Ss4,`<7P%R'^P*DM\f4(4moNlf7_%MJK7d/CR;PTc$@1
-;qYcn$1Ea&_gs1AS\YYc9mEDD.e_'*M4uWIi+i$7gai/?e*Ln at e@&)tEp.`'
-#U>@8^:>3>kcYQe=UmP#gBG5GE%FapQPR?#_KKgI6hXB]L11<O[JOjTqcKf^
-<,L6>3PWU_8lgK#T^$pH-N\E`]fEXaR=o[n`K;(K[TpdK,2`s_dUG+Aqh[Vs
-8Cf!\fX3c-$Qe<&j6i0=f,mKT`AlSKBZe4HP#7\;\FKAKO/1-#cZG!Y#\t#%
-I\phfW1oPE=$'2eL:OU)4N>cM@=jq&oc4_mTP)EeT[]I3Toqb[9rC<D=Jh%N
-g),f>6eNA#q6$\+:/Cik"Al[f~>endstream
+Gaua?D/\-!&BEZub'+]uhU#2?GLqmTlC0W+3JmI``&ZYEnn,]G\2?0WYEO"!rasbX&E"O3Op4=Yf/*#jfq1DP-kLc'rAe#rGlY$$.8U5b'W>m&&<(!6S=]Y"HD9".:g^=ZC:a'V0$q`MF*r%:K22aU$g:lG(pQjQQOnsX_G(V6!WDTI(WKcIn-+DN[>WA/-OG#k]krOn[LMZ?1L2(X!B3&c*C3tA4)/K8W+ at j6n\\CY?XGkP.%+6`dB@?j]gTn?!UFeGp6O1[gH^Uu!E1%c_*#j at haT5"Z(R+s#3-nfL!8L!P&oOmMl?h#8$c_L&o#3'g5+mc.&jQ?8``RV!KPimGqMESPM.lKmTr&Vbic)0W9QTg!N_7^-kpL1,RC)Fk&d"<nfqKIGRMOKHo\lrP1c5GgjjSH-MgfI48$_QOq<NRDsIP*6Rnu<,DN at 0I0g`+RPb7K-aIDDQUYiHVf"#"?_o60?4[k6[Zu/,NOqoE:2(0,IFM*NXaD1?:S1M8>p7O?@?s$>Z/_V?YldOci.$ls.!^G7e)!.=K,5kkP."2J8Fj2\.T:Wp8qZRUM%[;06L=LibF9b3PISh\4:!!gaqE)3T*!H-,+$]!ATU)??1RnhlqMe"k#)'*R674ahkm<q,=2Br4QEc,0B[Z_.][WD2Wf8M&*KMJOo5_lj;9n;+\pLiR"i[KQ'I"kMW;ZRUe=Z&VN at VKI%A=[03pkp2H!aoQ$LiCa'uod`Du.W:Z3HiPF:*l"jSV.l-+c:!40'i51S0fbN`<W)n=-)=Ep1PBp%L2?<(>u1#8g^;Nn]1g4:+BVW*q>f8A6hV at esMRtQ0\(3'Ui!BOP6ch4Gr(L7Yi)`s)Gfh[r"!38Tp/j2J at qs351A![l;)k2VXiZV4Li_r:9O)B`D)Mhl9T=R80L>038*Geu;Dt"!mMbZ%[^tR0*'?FQF4]"JUFAsTS4#g?\Z'f!EM[YD[r?r>3^.if*EW,n7M+h#^6c[M\K),^EGRc'>ZoM+(Z'h9As6YNR/trB at fo3\o!cG/i^E$UYn9g1C:Ss4,`<7P%R'^P*DM\f4(4moNlf7_%MJK7d/CR;PTc$@1;qYcn$1Ea&_gs1AS\YYc9mEDD.e_'*M4uWIi+i$7gai/?e*Ln at e@&)tEp.`'#U>@8^:>3>kcYQe=UmP#gBG5GE%FapQPR?#_KKgI6hXB]L11<O[JOjTqcKf^<,L6>3PWU_8lgK#T^$pH-N\E`]fEXaR=o[n`K;(K[TpdK,2`s_dUG+Aqh[Vs8Cf!\fX3c-$Qe<&j6i0=f,mKT`AlSKBZe4HP#7\;\FKAKO/1-#cZG!Y#\t#%I\phfW1oPE=$'2eL:OU)4N>cM@=jq&oc4_mTP)EeT[]I3Toqb[9rC<D=Jh%Ng),f>6eNA#q6$\+:/Cik"Al[f~>endstream
 
 endobj
 % 'R18': class PDFStream 
@@ -270,16 +202,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 470 >>
+ /Length 462 >>
 stream
-Gasajh+iSV(qh<U*DSFg1s0K?N;7[+Pf.)ZcLh?kFUZ=JJGK,Oh)`#bTqQ2q
-c=t%7^/G)'Hpm?nJS0^'83eTU!lVE.YR+X(Brk#rE>0[[*$r%s3C/a4)`eDo
-Z%p,7^^=29mh>Qf&q]Y^_ebNZ*4O\^SC/pl0<f6B at VQf-7T;!Y88QV)59AL,
-J;.R2e?slj1fRFP.)JhLP90O]].boE>s/R\DQW0#lEW06<6i>7,cX:Qia^]+
-F56r/,8&p,Q#5tUk^b]k907aEQ<B,Vacf__7F`O'F*('8\n]tNc8jIm%r^oU
-ThJQc;;^D2=#]t'mj.aKJu/m'g7`g"9=GNPP/#eEQWb"^gEUjK.H^d/1BD.d
-^BFI@!cJH$YR!OrZKdNo;4](+ml)mSdLL7S,2_SQ?<lU`r[n,o90kL*P`$>P
-7 at nK4,qIi[L`4!',]9Us0CAb'0T@/XrO,c~>endstream
+Gasaj>>N*i(k#bss)=]h:8;=d$4Lh`7S-9-&a?&DgF-R;)r'lVgD5ZO9JgORIHRup3Su9:-U4@"36*76B1P99p^Dhd%"*_ at DHfcgdMrDs'M"#71Ro`3V at DnsmXQJM4Ra?9qs0'P4Uo4rdpfUT>Cl*_ED#I!pa>j5DDAT%!e%'alOoO=oEK`Q(SDP2BQ^)C%WsWDkF1ls;($]Se1M2PL;'(0._!]J<OQV(+=sB$9cR3>3:JXdP4SVm\NLPAPfgR]B?3>#V.CX_iUaEB4;[O^_5s^MAf9=55ZK^:)J&tCksmQh37B4E0X#A6DlP>ZPI1b24$XI=5&=%OKk":X%E4rXcRUT$S8==f>SU0 at I8K(<J*,Yurg-"@.#4.W**YlU=&HCsgFu91XnS$J*,L9&##VS2HS6kTl1$@q,mm5qH'l]t9k:8$*QAK72 at +*'bpBC5Kd_D<'"7HBC=]k_~>endstream
 
 endobj
 % 'R19': class PDFOutlines 
@@ -303,20 +228,20 @@
 0000002144 00000 n
 0000002425 00000 n
 0000002563 00000 n
-0000002761 00000 n
-0000002894 00000 n
-0000004460 00000 n
-0000006123 00000 n
-0000007721 00000 n
-0000008337 00000 n
+0000002789 00000 n
+0000002922 00000 n
+0000004444 00000 n
+0000006059 00000 n
+0000007611 00000 n
+0000008219 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\245\320\367\206\314U\033+\335.\001\213\256\021\305\275) (\245\320\367\206\314U\033+\335.\001\213\256\021\305\275)] 
 
  /Info 13 0 R
  /Root 12 0 R
  /Size 20 >>
 startxref
-8389
+8271
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-029-keepinframe.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-029-keepinframe.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/rml-examples-029-keepinframe.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -130,11 +130,12 @@
 endobj
 % 'R11': class PDFInfo 
 11 0 obj
-<< /Author (anonymous)
- /CreationDate (20070416001215)
+<< /Author (\(anonymous\))
+ /CreationDate (20070619125700)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
- /Subject (unspecified)
- /Title (untitled) >>
+ /Subject (\(unspecified\))
+ /Title (\(anonymous\)) >>
 endobj
 % 'R12': class PDFPages 
 12 0 obj
@@ -151,59 +152,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 3109 >>
+ /Length 3029 >>
 stream
-Gau`V?'F$O'n,h8s21Dl6g`0fiKkhTd;HW<GFULHGGYmn+!:oR?rJ<[ODCo3
-^?:(^$#(hd]4mdGOqi\/Mh?rbEA"2?I/Fr9s/13iF%8IM"r)`4\"Or<@_-n^
-Dss8^qssZQ*=F;eGUs99q/HfF6)u>g68(pmPk[GumHMTn5J at YXrnB$\8Q4#l
->#g_l2%P3-_^0_sZ@&"rC9a*Yl0]5 at rP^8ajnZ6Q(;?-Zk<Vd][.L)H&*41k
-_B^H[l%;Fc-&Z<E9^LKRci(41o_bQ#^p^=`d-WYpb`?--p.N(^f`WS_N;eUe
-kd]B/p\NlMBct1>#8.c.,N9N+GO`lPb44!(!,bku.Ic^B1b7JNPbG91b at i2G
-ia1'2)FuXV=]-\j7E'uaRB"Vh)\Rn2,2[S5n>lU+F#U*Sh?:bu^?>)P_%Gn1
- at 3U'$%B:K2EAISu:q@<DUm9Hp^CmJ#Q#CGL.[<mYmq"uWDlCNr3daD/19FN<
-"6+l2?Kkp)VfGLGO]V*X<=9q9U8i?KhA9sqWBGD,9bRHpV,gdfAR==58$gVf
-:Nop-@(!YG\nP0,8M)FUri1Jl\'rsJ?KIOsaeV?SXY%.&BsB<Iq2NU,^FD""
-lp/p7pSS)iC1-]m\A9Li[0 at W-d7o6".s4Gb$/=Qq)N3Ok(>cA6:aWJQ)?Wh,
-'Y;q5?mQ35<4YiX*'B at uYZcthSu/fp`(FU at 3coF%]%GJ$-k6(Ae94>(?V#,$
-iQlNn5/-siP,a-%Q+!RHWmqGhB6N,'?925q["h1)bJM=>g(YHp2&2Uah'i3*
-?5_E@#HYE12M4ISY_e%3iFA/lH%6D3VYJ$-TpqbH[4Gn7(5-+R3aWg=ALW<k
-N&3,nQ5P^FE0`SbqnpPV$@CjO-'=DFQ\>XPMUq-E\b.^/h+brnHrFi-eOFlW
-1B>sPZ"hPmXs;kf#G]MB946(n;@#TWQ9b?sblZP''l71+SGSo6,-e3*Mp/bI
-d at B@8<-$;@=2J?<FXI"<OPeKf2S<(7eDCu"_P;TPZAChW>)MtRbKG?A7uqGf
-At9kJO=Go\*/Rlsnen\#$_1Q_dFo>Yfg'(\1.JB$a]Jqa``L60#YC%pR'I7C
-em"!9-qlf/g<j8iO(^%brXRZZ!u%M%iMjlRiBO-BJJ;ZG657_XAJ.LC'k*CZ
-6Y%QK&_bS0ZruT];)hAai[C59bOJt+E&)q/FG/S)]jObaJC.=X?[?]IS'AR(
-)d3Lpl^ud[ZYDS"3*=lq.l+NW3<?]a3g*'V.QSc.MKt3$3CQN7E)gP=XSuC6
-KtaY^<&gE[?8NL"@r_Q'F*6?6>5WJCK$VpfjYt/GTqZejW+FZ[Z<En,cV]'T
-i>YW93[i4^BQ/uB7".nidRE`Pk0M5n4)$PuR(+P6V1E(3B\b at BHEV?L$)<tD
-,rf-$RR&Fa'U#Cp4R!ZQUe&P%_F:A@`$&5<R!"Q.i<@D2h71?B--(E[8GYbF
-]d/t(l7u,b4\ZpCGa0Bc`lhD#1[0"am*pRk;7lhG5mM79dpP)_!*nJS"Dod@
-'+!=IAl-_4lV/Zq;O]0d`^SW-fSEj=Hfc`(,Jd)DI)M:U9ut?"lDp&3A#5Qi
-:DA=[E\lisMb_qnJS8<eJWR":s*4P0h[o_sACpbWku^l6rB'd?32<\$,uDud
-E;/^\hJ?dG1?K-1&hTUcIcs:2G9h?%!d>o/7`*(]iJ2kmk)R[@&JY1m":s<Z
-O>nK_d#ZBkD>_bA7.*V,NjptQ>T:1"E%TudT\ht=Q!rWIm&H-&Khk1.:&(XD
-qQ=3Rnkb7^$bM_>qs][`cBHV9U4sJmT0)9_o_]Sb5N%7Cib?'p[I(ccl\ui=
-4/A"b`q at r!g@#F87QB>BMh8#,D`[-pS_e.Xs/+2X]@1cVJ(&?)]:2:e;J/^:
-*OXXK?L"V+\taH!S93?SR#\c,dWO.5[#Q'_3aL?[e25NDpGWGG4)2 at Z8bXgo
-8OlM4Tp)AF%beJE\_'L&A-^rF_s*u]4*AnlhDmg1WZ(;uksFQ,s$RFJrJcUe
-3/<Yu1,lH,>+/EkZGe3BYU(sMKSVgKmf%P#lEtQh\jaojnA1S-,o_*#f\<n^
-WHDXq=j*pTPACQCD'j!B)=Gk at 1^1m9TbU%^Fk;mpk9?U%c[l+^[Ios!658)$
-Wf#-N3L@=1[D2-/]&UHCT#WqF at JYl-HS*Wq5i(^5\&>EtfDXc:.jE34f<c?d
-J>f`(ZKa-s8[YF[.0/DE$+R+'o"0/_#E<7;rk9lY"Ma+f at tU4+7]BrFRcKl4
-hkmtdR+GtnC9r3S;f,Qb=2Bt'S:L9uge$_6TD0u1WuXkZoq.4R>IRQT,;Abj
-;]2X=ZUuD.\/m9\SU0+n^6Yu1p)ohK#=I)sWBFpW+/mZmgTU at 22L+-oE8P,/
-e>C?6%uQO>^<_]M>CgXOoE-X'FL2*V/-.?h at m`%r@>d#j1Nqu/*#C9Z`tZj4
-^GNtb4T_1c>oR3LZT*j)EPnO)ceYrRnGL(_#?XrqKMQ&SThD%T/6._t_D>#>
-5JEZG;,J&$5eP&e>fQ\c3VPi(*klcR0"c at Q,+BL"MpZ1TCY7-h[hsbfk$5`/
-Nk<?:.$sU#^7Voe7CdmIF;@:im&<p5-&_VjhadUYm"kpKPC$ilZDXu%%m=]K
-2,Cr9\@T,Z?HY3dr`I`.PtM2Y8bq\CbuYu:TrY0$08PfU>m3Sg"S$jn75]aZ
-Skeo]1\IU/.7B5O#bJq=7Yr0LK&@)81/%9'O!Amk9'jhAX@\"fNUo4b">:?L
-H7Z>u5IBb>"f>5o,[s82K[.+?\<bdp(nl"Dd3,]hmnN#E,BD(9IiG(Cbq7o(
-O&!^Cf3 at F\@,fH]FK&V$OMV'K0SPLQP+9]4fDh0'QC?K"RC*'.Ih]ec^#$r]
-hj(!Bc;Ke27jF]5]i'Y,bsD&*_U[muA3>e^0'?O=[6ZO7)kWG4?ZV5a0S!uG
-;d6VO+cnqaa$kF8YO1)Q[9`cV-r,2aZM5pB;2=6EC^&;nrnYOB9g%8(Ps8ch
-MC*M8YFpgGk.hO0.d+,RlVD at p@\O%?/j\#mMBZ9AF^8^plu8$#;&S`MkkVRb
-!BAHi3r~>endstream
+Gb!;f>BAQ1&Ur&bs23.STh`Ye&MK<Ga/"\Vl/\A+F5iTO1jsm&8:jQu$p`NDIso'8.2'4SZBLK?-?1RLMqu?]0Acj%BnX78rBJu^]0#lRegE\T]-[98(X_&/H at L/3lH@^.3u3o"o2sptPMI&[r.^1Q#$r9F-m"B3DF<$js84VHol%<]-V[1).TK)e;a:1o'[5c,b2Pd3X2RQBVRq2dqho%\gXW?`VB[ac9`0^@E9;l'&XZ?a'Z:St8Y<(R?9F3[Ze3FWII<t$JN'$WVHB-1p=ki:e&h%>aM-0)]g[H\_V5$3)t$`Gn63#6Q%nFFH:stXZ.&LEr$m.WPT1-(L>l6S7/k9q5qVnMXUI at l1o7`fMapA5'f8M4K;:itP4Bn*11dVt2^Ag.H+%J<_m=s+R(H=onHMs?1\+$5a58>WDj\o>CTUU7j_ceL1oFk9Zq*fgeUJmP8l`="PUTU!WI0pZICu6dbA$W*16kG1ndI!c8S+aD(KDXqPiPsr^Qt.8k#.G/DU!OAOK$rA2;fb=%ppf_j[Ni.T!:.o/[Amr\HJsEH.bqCo2KI%K(kI\%[im%a>YTd"A'r^$YaJ2c:IM#Oijk<[[VQ6H=R9YG.GBK=BDV*B7h-S,#J`H_^i<tFb6ET.9+0)=\rrIHs"432?M)jRRq"^Ph]>G/=3T(<S3PI9%Y+GO^D3C`[[Q*Z7*[sV5i=ZF-erFcr)8$ql\Ia9qSVc\+9$(2A;]iIst+':6/"O;m4\uNkI77G'ZY!0::H\,Srmej:*\^NQ%?Lc.=K\ITXjSlnjK$n$?"$NauN2#u\[q/2ctuD\>b6Ki:?#6Y-X.aG_\V_rOh+0I2NB$>ino,hH4sfLE_aY,1PE.tpl',B#2kN7=`G20:?__%)i808&J367Uo_ at O8!/d\C0C:pgo,HI(M1!\V#@b3Z_Cf$$40+ at K`H`1PIOJ0eF:``:9Wn(B!"]BZ.^XfLUWDJi/t2`u.6%$jkhZAT1f2+]=9ZJ)G[WXosfrC`;J"<uAo/@H*C]63L'Y-FF<DD4>U&4UXbY!g*Q^qMJ+J*fX>=,=26aNe=TR\u<kc1M.AOS]TP*8`G](QOKa''l8GGo(-UImlPqQ-B"D\9Al=$B`,&GH8Ul;V6g?ALg(aN4i at 6Kma\E*7"[s-X.1OceYsJi.YTYU*<!64HPo)P6JeEr/K/;Je.R,9p#F%;se,X7IbUbBesX7<S3Lb=9f>9m=Z[5B'ZNheLKS^k_aI1j)CWtLC=ph&rmV4j-nr>8lJml2,A:AT'\^]1-dt(FdVpN6%Q;ao+om9Q\,ou^ii5_bkhe`7T5'odq7dr6AsbuMbbaK4mW8@$e%o:+)94k5G;KIC@]4'ch#@bC,JBr]3=i)6\e7XFidJEUWVYj)XW2$_XY"n$rA+&1^P, at K7;3GMPQ:_R'up=*.fX<ED(RX4b)%flZ\^:A\YGDE at 8-F9DhB+0'-'g_8I!,0-UP:B\(N^#G'/:*SPHsCuc+C[,3,e%:h8rJ4i#'6'D]LJ-J_c1FQl+mBVs>WQc_(rM3.#X@^a\*]jef8RR`'+)u#X"1418IGU0.//?(pJHF1p0)HW+g+jTq&@JP\&_ZIGO/l@^#3gV&]AVlL>tt:rn%]1ER%>-fTVA4>DV-,Gn^p%$N$3EkS2qnmd#CH]8E>g+mYL=j"L0c"&)G=Z*>uI6./Ma**nh2jG"28#)jr\@pn8W5h3$&)EGaXG2K2CK>/3!\[skh:X+aoCb<BqMmu9;b)"#'Y\V)QV0c('2[Om"+i><A+ia<IT2(i]/\(#EUNQ+Y at KF>]^bAcEEgOZuW)`M<Y80\Ybp")jjmk\uOD",Q!JrBMEg?ZAAhQ*RSVV]&!j`/q&e$o)-FeaAfZ_iA8g?h&LFk/D);7gZ<3bs%:8)83"4)9.F7h+Q`?C,faFJ=ue:)(ute9&-_mTR?<NgbD^-V]@:Zu`<i[ZdT)%_B!%dn/"!lCdCGF$;Xb3o**NREh6"M'/b.'+nZW%g>T]2mDd<RRF3Nd8)<$9,:B[Lu+'XmWe//fsbqV4QC)Li6<=,,s4t>Ctt3'3k,!fj[uaK<eTEY'/bm\GN__h5fZm-'h4I2f=>_[,,&,bJc?LNopMgJ'\M4ko*=OH93&d]:MZ5s3No^NnI!j753MlN82MGs2rE=8Yq*sc2n at t+#kR73D8\RoWbnC[4%sfqXXRc^L%4((ge(68_`Wj07PYRj0Cpg4D`H.sT]V21BN^3RH"OslWU:A\j]S.CCu4tePLVm^0]X!2@(dk-&j#A,*i+7kL5D`*ZZ0gIQ7?DJ<rM#W`iQ5J<(K*RLC8@)?I[C>&lugeA6n8(kR&ZE)_J?I'fp")FhZ6+&"E^hS$2D*e627=.(SU>YUHakf]G^hd,g"*<oATVBFF^id*,b&72(k647jc+MhQ:.`Uhb9bq;\6M at Q2[oq<cjiF-fbdX5r1`FEhFc8Rk*\i,GZ-pe%*&h"L)-jg\fAQUbD"(h9!l_3X10\R3,P;aKeZ\X+W-6n&Qj850_r*=<-F._E!S*/b1mr4mbBCM-!9:+S:5O,-*#Z%#$Hg&#>\/8$/+-8RolG=JI(Jd&r4Es6`s+.):)[Rlb^B@>\T,S+%Wh&1Fcc8t22\FBV1a`rq2t9Dsmb55Mm!!XZ:-&]:/ppH-]am$EI4Bq'LH<Etkf!=q,g9"rZl1CAb7WaqW3iu00g_\&+ at E^S&\8G,+Yoj[+@>?^JrZc&,!pSn&u>+)YZp<F&u9G4JG]:m/,-UIk=*IQ>/^15-ItV7o]$M?;7V&YdW72 at pHj0Rc^KH(85\iH'88S7fe:J0`Y7Pd3.7fLWjF`.L!(CpJ]:67Ai*G^9n`&gB"H3IMI142>t#DZCPg-bV3+&sSgsr'k32Z:%_0fm63 at Htcg-?]-H1m@[SsErVZ&1ES:MhoPFe4rV/q4+BtoCe=8"gq at E#A[^?abm'IrZ$WHUHUVI424+Rh<HNfW;WEr at a1H#tV#*Z85b,N!?@`OX-9YJoM8WC@<3*'>kTjclka2#t7iQF;h*-*orDr!&[CIrtAKJ)Z1NgA~>endstream
 
 endobj
 % 'R14': class PDFStream 
@@ -211,28 +162,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 1227 >>
+ /Length 1189 >>
 stream
-Gb"/$9on$e&A9a$s'_!q]Rch[P1M3+H79a7"h&9r(s$8AZo")::o'DQG1Z]c
-IAC]$/t-;]"kpl2?a)L0^A$b!-`%\eC&BS&qIrZB="0s`XgaP?P<#a`l.u4,
-ir8KmY%<h5 at 4b-9`Gl=pkoiciB1YrOW0khCh9b5D?Z3:F5HebFcI9g/HDWY"
-T-%[uP.iWZ^Z^pt%:@NZ1Tb$)KHDg"1u6B=@^/Je1s_L[IPX@^Ri,eVS1N.0
-&<UVWag.;sA*A1 at 0HY9DTik72=HJLCZP[*91DVd8(BONi<IUa5"gSf:It(k<
-<T]Em49D+e15BMG88:111Ki!&`p:ND?sPu)(+;XS?oj2\l=$f=da=ghMDi*\
-%nrTW.'2JGVH-epAkR`G2g.D+O9nG"kaLuk4ULK29(.r+_0qO/8XefjoE"Cu
-b&"<g0RIa`fHVd%2,s!s'r>Ons($XY;V.I]?C%D^JJI!9ab/+Df<O>`9;@&[
-&"UBk<EF30V9tm,HmdDT]4Kq_=J0+L)j!B5L*c7LBt7[>nR)&7H=MX]G;u3;
-U,H+2MQQBhr@!4_L[@HNAK%PQJ]X1Sj^-Zh1p,abEr0HYe=^52&H9q)=eB5(
- at 1!pLX8jYfRRU6g.R8M4;@f]!Rc(7cmV2lf$)Q<8WXSWp`HDW;L(,;co<p0E
-&D.g@`%3N-/k^)qfLR=eIalW2L:0EP.(kc:Np\6ae-USi96#/uG6M^E6/"-"
-CUr,kMXE=4W'YTXL2U;VGY21MLCI-C*s=\;L,$<"j(Qkb\lQmo;KUD(Te7%L
-/Zt(0-:i2"D\B$"DHR2J7l](A\oK(MQA'G^EG;LcKn9r;\mnC0![oqs%V6u\
-8N*]U^uhU'<n,N8Tr40+4%2<DTQ?XMHN<=LZ0?$/o*C_)mprWkW2d+r at d$Fk
-RQs54)Zi8b"s1tqMPJil6$nL*Zk#Jle!aB,[s+F5Y]D&ELra`H3V]RQSI9'>
--%D*AOG#ePKpuLeIq;b^Hba#P3j2U:gAAg:\3kq5Tf6c7L0DB9NBeL5lAFUs
-`'egb>gCHNidf_7$BONpfR2oX+DGf^);0O/_KEoMUP"'6"]_l=cf>E-;RE0O
-F,qmB_;4eqGLuSeaSg=85.r:kFpef-MsHirqHoa=kZM1XJN-<2kHcH4k2e_B
-b+8e&5Fs/'gjFR!#5;\n]Sr#?;=ZJ7rb%u/Dn<UV$QCi!df~>endstream
+Gb"/$9on$e&A9a$s'_!q]Rch[P1M3+H79a7"h&9r(s$8AZo")::o'DQG1Z]cIAC]$/t-;]"kpl2?a)L0^A$b!-`%\eC&BS&qIrZB="0s`XgaP?P<#a`l.u4,ir8KmY%<h5 at 4b-9`Gl=pkoiciB1YrOW0khCh9b5D?Z3:F5HebFcI9g/HDWY"T-%[uP.iWZ^Z^pt%:@NZ1Tb$)KHDg"1u6B=@^/Je1s_L[IPX@^Ri,eVS1N.0&<UVWag.;sA*A1 at 0HY9DTik72=HJLCZP[*91DVd8(BONi<IUa5"gSf:It(k<<T]Em49D+e15BMG88:111Ki!&`p:ND?sPu)(+;XS?oj2\l=$f=da=ghMDi*\%nrTW.'2JGVH-epAkR`G2g.D+O9nG"kaLuk4ULK29(.r+_0qO/8XefjoE"Cub&"<g0RIa`fHVd%2,s!s'r>Ons($XY;V.I]?C%D^JJI!9ab/+Df<O>`9;@&[&"UBk<EF30V9tm,HmdDT]4Kq_=J0+L)j!B5L*c7LBt7[>nR)&7H=MX]G;u3;U,H+2MQQBhr@!4_L[@HNAK%PQJ]X1Sj^-Zh1p,abEr0HYe=^52&H9q)=eB5(@1!pLX8jYfRRU6g.R8M4;@f]!Rc(7cmV2lf$)Q<8WXSWp`HDW;L(,;co<p0E&D.g@`%3N-/k^)qfLR=eIalW2L:0EP.(kc:Np\6ae-USi96#/uG6M^E6/"-"CUr,kMXE=4W'YTXL2U;VGY21MLCI-C*s=\;L,$<"j(Qkb\lQmo;KUD(Te7%L/Zt(0-:i2"D\B$"DHR2J7l](A\oK(MQA'G^EG;LcKn9r;\mnC0![oqs%V6u\8N*]U^uhU'<n,N8Tr40+4%2<DTQ?XMHN<=LZ0?$/o*C_)mprWkW2d+r at d$FkRQs54)Zi8b"s1tqMPJil6$nL*Zk#Jle!aB,[s+F5Y]D&ELra`H3V]RQSI9'>-%D*AOG#ePKpuLeIq;b^Hba#P3j2U:gAAg:\3kq5Tf6c7L0DB9NBeL5lAFUs`'egb>gCHNidf_7$BONpfR2oX+DGf^);0O/_KEoMUP"'6"]_l=cf>E-;RE0OF,qmB_;4eqGLuSeaSg=85.r:kFpef-MsHirqHoa=kZM1XJN-<2kHcH4k2e_Bb+8e&5Fs/'gjFR!#5;\n]Sr#?;=ZJ7rb%u/Dn<UV$QCi!df~>endstream
 
 endobj
 % 'R15': class PDFStream 
@@ -240,28 +172,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 1219 >>
+ /Length 1181 >>
 stream
-Gat%!hf%7-&:P.Os5B'RG_=1sqFL^)JIPm=!u\>GHJ'NQ;3i,goLLH,rqkPL
-[d59"QR4t6jc6q at qsM'@LBrBTpq'eKmhL5[k.kK*)W3&;Tt5e>Wlp>#/h]OB
-"th;>F-c9)(uW$Xn0DU4j<10&W\r$"q<KC,qo^irb'Eb?FC)f\n_mafQZ/kP
-AtcE1>cV5)q@;&ZiItVl0/R2cbMj_h+YOIoE at dRp3K)oG"-G>k6n,o$p_L+$
-lVE:nUgun.#p^5uU6&ba:XDQB'?Uj;$1L&2(;sq\)ecX5XaC7iTVmjZdjkZ8
-n-jf<62c*J5q^(h"Ae;0JdR^c2cr6I*`;_r8=3CokJ57UoZB64*4/Vq]co-9
-_Em)8.0A`fmZhpF@;+`M]2m=9:4n5mY\[`b:a at Xk?tBko5PBuN6:5UU_cl='
-X,s!DK@*U:B!kJG[.,Psp3:OiR\5CuGGG<XHu'N5nk.N6L0O77%jq3UWs;F=
-A+6Z>?u+j.&@[@iTla*"5))\9k73l--JE?h6+k^bVXKhAn$*J)n"E*FX[62n
-D.OP`=OGc)fb"oJ[um_J1nIk_(N23Q(cE=EkHOAh<-+(m]f57`21GS]G,s3?
-Vt.!keZH2+>-9%13Qk';nRP/89,;(VRNO3/W?QV%d-4A]7S.lfS?td-T=;iB
-C5WQ2>fYDTL"b+!C<Zm1f:m]bK1'e5%,RbK;8ju(gQB>"1#t;A+#,ms?Ki,W
-)LD7%[F=@);"n;LVDm7*=3=^Q$d:eq+6TP7Os_ie-h=o*^I:0nn6VhdZItl@
-*Z<Pm^n%gD"r90c27gRs35^.1/3,)WYZk<foJKCmPS>P(&6MZ$X_E)h.5f4l
-A5ZNW+]G-Z;%2j(k)in@<=^;6*:49[hAL8O[A62XQ)Cune]Rb!LW)Q3Kpr)P
-+,"h,ra<q#G5;\'gHdKh7jma_5O$[3-Y6/pG`n;Q`!&dY>^ANPSLTfhbUUl4
-i[q:jVd&]>Wqb,):5)UVV0Srn2K[qZ"^Ni3N:&+5r(&F#*5X\lkIJWEb46NL
-*k:Bb-,mE!,gA<,OtqI?/b4jGTH%"YNkr5J7LCNJ`ee)n8+Ftr8Hfc4PcnSf
-cGV\'=e:u[LGaQ#fPqqK\. at hM3ARnXT$"1Tjtq1l;#8gJ'@'@@Zrg+0QUb?W
-$)WJQVU:m#Sg54,b"d_=iJ;,sq at Y5^?Mjd[#]4#~>endstream
+Gat%!hf%7-&:P.Os5B'RG_=1sqFL^)JIPm=!u\>GHJ'NQ;3i,goLLH,rqkPL[d59"QR4t6jc6q at qsM'@LBrBTpq'eKmhL5[k.kK*)W3&;Tt5e>Wlp>#/h]OB"th;>F-c9)(uW$Xn0DU4j<10&W\r$"q<KC,qo^irb'Eb?FC)f\n_mafQZ/kPAtcE1>cV5)q@;&ZiItVl0/R2cbMj_h+YOIoE at dRp3K)oG"-G>k6n,o$p_L+$lVE:nUgun.#p^5uU6&ba:XDQB'?Uj;$1L&2(;sq\)ecX5XaC7iTVmjZdjkZ8n-jf<62c*J5q^(h"Ae;0JdR^c2cr6I*`;_r8=3CokJ57UoZB64*4/Vq]co-9_Em)8.0A`fmZhpF@;+`M]2m=9:4n5mY\[`b:a at Xk?tBko5PBuN6:5UU_cl='X,s!DK@*U:B!kJG[.,Psp3:OiR\5CuGGG<XHu'N5nk.N6L0O77%jq3UWs;F=A+6Z>?u+j.&@[@iTla*"5))\9k73l--JE?h6+k^bVXKhAn$*J)n"E*FX[62nD.OP`=OGc)fb"oJ[um_J1nIk_(N23Q(cE=EkHOAh<-+(m]f57`21GS]G,s3?Vt.!keZH2+>-9%13Qk';nRP/89,;(VRNO3/W?QV%d-4A]7S.lfS?td-T=;iBC5WQ2>fYDTL"b+!C<Zm1f:m]bK1'e5%,RbK;8ju(gQB>"1#t;A+#,ms?Ki,W)LD7%[F=@);"n;LVDm7*=3=^Q$d:eq+6TP7Os_ie-h=o*^I:0nn6VhdZItl@*Z<Pm^n%gD"r90c27gRs35^.1/3,)WYZk<foJKCmPS>P(&6MZ$X_E)h.5f4lA5ZNW+]G-Z;%2j(k)in@<=^;6*:49[hAL8O[A62XQ)Cune]Rb!LW)Q3Kpr)P+,"h,ra<q#G5;\'gHdKh7jma_5O$[3-Y6/pG`n;Q`!&dY>^ANPSLTfhbUUl4i[q:jVd&]>Wqb,):5)UVV0Srn2K[qZ"^Ni3N:&+5r(&F#*5X\lkIJWEb46NL*k:Bb-,mE!,gA<,OtqI?/b4jGTH%"YNkr5J7LCNJ`ee)n8+Ftr8Hfc4PcnSfcGV\'=e:u[LGaQ#fPqqK\. at hM3ARnXT$"1Tjtq1l;#8gJ'@'@@Zrg+0QUb?W$)WJQVU:m#Sg54,b"d_=iJ;,sq at Y5^?Mjd[#]4#~>endstream
 
 endobj
 % 'R16': class PDFStream 
@@ -269,71 +182,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 3863 >>
+ /Length 3739 >>
 stream
-GauHNCQI5[(&]0rs5 at GaTp*?o[JZ8I[_V<S"/JXM]8_ at A7D@+]D)7;BKp63/
-r;,8Cl9X*d--luXNu?WFppcB+%hId>'`\$lB:-J1>PR0b&,m!GHghj.!k*%+
-QgMs4?XCH#pL`=gFDp;gX6Lb_nB5_Iq904u'a2u7C_O>Umsj3>If&;DfQ*P#
-qa0?`^:,3`1nALA1[!G\oX/-7Ig+S&Yl0LEnFr8&;HRhLj_VV8_.l.-Q9Gej
-=KfBjCq>:-iV>dD#s`KTDrt)[?U(ohDnPab)W7>`K;iRX%^"DZ at 7IU$iUn2g
-Q!&)lCV&7A3W(@*c1)nR9,9!gn_*hhmhp;W\7+"npes!8bRFB"6Rj0ChK-(@
-E=<@%5CtA.4/%_No?dDJB`nT79;_0V>q@)srgc5&Oad;tEf):sr0=bFTW)^r
-q>SC'/seQ^`>Zu=bSr'YlX7+cqpI=%l_]<2[p&WtFg\Sg266PIqQdNOV255b
-\7W"28`9"G7#F2oIM<]B?L7EZGpq-T!j]m5mdX$m(3_4N$cQS:.cP1E=cqkk
-4b1V5R7%AjEd"CNCNcH,IktHeFi;thSj&k87)X:Ce],4bSS#S4L]-=?NIr\(
-B<qWrc_oUUJ%(1E6V[0/[0X[C4))>m6a11R;C*k1pDb#.JW'n(%5cC*_`]A'
-EF$$a=UI5#&`8M27t>d27<l`u+4uF]aCX1,,alTd_?]9sjXeY"&fT"7k!J(:
-C#(UXl(MJi:6FbVY8g8k^5BJPPEs[>`n>"-^-?Y8\GEOd(nFQ$T-8BE,9C75
-FmB1.Uj0bO'1M^"=AGE<7R'0k&jE:!nlR.=,D)Bh0od>[4,"j(EjcXdaA7ho
-AHI4c<.':m3#po;*VU$brn;2 at a&a?iTbZKlW4Zflr9b\N40C"'RasbmXZcID
-KW[pj,/r*^&$Y7r at 4e<MP(mW`LA"*c>G'l6Ad($[<#WC.]ZgfQU)=u(PF`(`
-S>'!a_a#r(7\N?GH`hU^\!P-S*$$MkRFp/u0_aK7qYG.rYiV!'Y-f`?)T/A,
-0l.nA&P''l0a9d;B<=`\Xc"G\'<Rk>c+Q+2VF*qkW;(pP(.T_N>lQ[iFSuJ.
-ri97Iq%:pNkI.Pkp`m?^+oY-Ndu^1(%a-UR)<T)>!m;<&;J\-[=*AQ6V(q\'
-lWK0f`2+t%'d:$*rcA(H'j,%);F_Q(?qiuZ5TirO7I-f_cacYAR"8'@#J$b.
-`;[<YkH3qu#LXs:S(V3F^oSLY/`202q=icB]d`pM*slZM-+ZfFC_iWs%S]LK
-njR5YA24,<)"EjWA8G^<jWR)V;^X=rNCs^YOT at 5VF(Q(678'Km<7uXj>=!'U
-3K at 8&)'t,^K\K>'';eJ6$+V&3_NX?-[.qY?-=Mii_/[9?T%HS)UqWd.$."Yf
-P-I,G$=esmcfCK^U5p<3Xja+&_en>Dh("@`5nKIHG3kc/Bm;K)@D^..[$Y?Q
-(f+^g,VqiO:m5?oLGEYV-02/_!S.]$r%(d"Fc<0G`2Ps2b$_$O#U`"oD"1+`
-k]l at 3Z@`iVA4:<?MJgaL(@p&A.7nP[PSf<E+A3ulB1g7^/UBEA80ot\iJhgc
-i#&1T>Paj?k-u)f7j&EgKKPpldFU+<U6sVV3pd3 at Zkg9@di9#H$fm7<fiU:'
-&KB?;O-\reh&6&I4@;uP-A$n_DNQ@=2oBoMI.5>=TEIo-II at Pbr=*8P,T9/6
-K+k/9hY]Co'O_U$Sihf at UWg#h)7bb*@nCZM$*;65"@S3r"&C?odADr)1):MD
-=)59:GR7L>4i)0Mo_eN4K7%J%/Z-VGr>BJ_K)*i'ZcGe+X0lNFj`T%'5P9WI
-Ap)4-rTS%smad;6Zn!nhj9_,MKgsQPA_Nr_RSY_ at CB\`1,*Bt+dQJ+/q/rqm
-*JXA012Y0%GLaXc/J9g&%2 at bQe'1>Ki3kM_/Iig?41"R4K1hYL<+W3;mk?[-
-jj\Y#jZ6KNS?nF#n?H5jLNVA7d,Snd>nD?^M,`7?\M%nfPZMNEY*:aWf<1a=
-DI;rc]PAmmaX1$9j0t`d0P at g]I`lo'nim@!LEijm:<gMI`L1*B=+W&bFE==1
-Rph0\NF()hJ/UaEZ,;^WN]'<_g0bMC0(<c\UKn"q'E$a.1laKd7APXR3c2dH
-M<AmFmgT$GA_BL9RY8fj_rG`Xa-E'&/jEk5L*FO<*f^;;#gS9GQ/W'b1M-he
-lT2 at 6=g1E!LnC2Dd%NfPW5O9O%Q(Pp$W`gkE.pu99-S''BZF3l!hdF4Mi>ol
-Lu/THLhh"XBfq.Z4IZp)Pp#I7eD<mk'18](@7Tj at MkW3;2]"Sp.gZCJO`h]8
-+^g5 at TVQ?!-7%Jt]_gUIh]H3"gpDh+l!3B3(D=KO%4lt at B<b$:q1Ph5Vf^bJ
-Cn\P[$i1b2p:Nk#;KA_8\B?ur.!])9\i+4U at Umt):Z/ftEkX=K7UR1 at eA[G?
-[+Spiru/n2VEr at MU'CfrIuqjt2 at FH2neVe&=U!Z0*OruAE]O^hV(cPclfW9^
-jWV2)4/e*&,Xh@"eeQUA"(W;G8TIc%NVQ?eE("Rs*=rh3^i5;P9WTY^o9>)4
-)<sLK=65!1l4-OKkn[@P4;$auai%_rbL9AN<K8=(qd^gE?IRlk9Ri6dDj*C9
-W=Fh!Fi(ZtDAZ!l=o-s83/0P'Y*dJ. at BnTQjY,jA-4L0c5,TCO<kRAELpsl2
-",lqc`&!E<E2a'g&WYST#n:4P>1.X/+kDE=7[t!1qATIL6WPbAIJYkq9aI(&
-I7#okfs`E.*TGiS)=blpKZ>PtS"MR at IuYtM:,WdA3Frh%\alm(26%fTV$6SX
-0lX,01icnq>Sn^KFips*17g#6DN>&*:ZL.P9. at rdF>:0:Li;QX'rpHI>.P+5
-#B%#!4%7tGiZb?jfKHj5[6lL9EofJ/>seSap0q*q&C;VY'KLOhp7e'<Z+-lg
-T<n+U8gQi^>$\kg%gHnSV=A"m'pJUn at MlWt4r7?C5ne#JJaqsO*-66f?:>Hu
-Km(]&J`lp?SS8Q:(P*Cta=&ZTa)^TdAu1)W?J!LJCRHefS[;laUnILhDSc+q
-ps^dam60T+7O.H4<k-G947!DW;GdRD7eA*^"3V+d`KWkbTW`=."r)ns'A-^6
-)hlVo.4`[f&YEgTJ%I-(LmYS-gI:KWea=cWa-Mad\kLr9Dm[ncfWGRE>L]X0
-3kC5sRaP%,e3bBd'8EDSc7A#00)g3CC4"'PHOA:OU\/VcjjOnSJ'krT\2j=F
-<<,P^mnj0>d\M61l#=0F-#7:RPZ9[]#cP,b-JNFgE-lQ;"][_KfJaD>;<QOQ
-X=d;tM\.`<Qn"=hmO8 at MV\a"=ak`cBC3E.g7B("X-jQ'NW'm76[(<i_.G7Tl
-nhN43!^CQk&6!\gJT)c`O($L,q,(>V[?i$VFi6SGCEgb`.+K?PZd20`\9BcJ
-2O#u:QtkWNrUoT_];iu/R-QtWK;#%uE/rS*oSl^9A%GnL--n93c-mVM]d?V;
-0f5X1U$<*YUH#4d67sd;1+.5%IMb&F)2;8fKqU<$]iK\FPaD5S\uAHl"7#Eg
-n0&fm/E<d'J<LpbV#[WM\RBJ*45s1qYcl=ua8h7ncEQ"_29FQtS-hF"W')VL
-ZOab)E/rAP0>aRaqTd>UHd*^%,<ub[7L[K2_Kh]O?i(\b_4/p9h at 7[N6=1e3
-3T'Zk=3mp3i4ed210q4"*jptF-fERH5!m=2ce,D51'"FX"eJ)&kiF^Pi(gFB
-b\[m=Wilm,\?F\Hc+sc"`rX._b^"eRmd*M7*=lK>F3TH=Qe.3W$G at hfI;&K0
-3mckAnFFQu!HhCfCB~>endstream
+GauHNCQI5[(&]0rs5 at GaTp*?o[JZ8I[_V<S"/JXM]8_ at A7D@+]D)7;BKp63/r;,8Cl9X*d--luXNu?WFppcB+%hId>'`\$lB:-J1>PR0b&,m!GHghj.!k*%+QgMs4?XCH#pL`=gFDp;gX6Lb_nB5_Iq904u'a2u7C_O>Umsj3>If&;DfQ*P#qa0?`^:,3`1nALA1[!G\oX/-7Ig+S&Yl0LEnFr8&;HRhLj_VV8_.l.-Q9Gej=KfBjCq>:-iV>dD#s`KTDrt)[?U(ohDnPab)W7>`K;iRX%^"DZ at 7IU$iUn2gQ!&)lCV&7A3W(@*c1)nR9,9!gn_*hhmhp;W\7+"npes!8bRFB"6Rj0ChK-(@E=<@%5CtA.4/%_No?dDJB`nT79;_0V>q@)srgc5&Oad;tEf):sr0=bFTW)^rq>SC'/seQ^`>Zu=bSr'YlX7+cqpI=%l_]<2[p&WtFg\Sg266PIqQdNOV255b\7W"28`9"G7#F2oIM<]B?L7EZGpq-T!j]m5mdX$m(3_4N$cQS:.cP1E=cqkk4b1V5R7%AjEd"CNCNcH,IktHeFi;thSj&k87)X:Ce],4bSS#S4L]-=?NIr\(B<qWrc_oUUJ%(1E6V[0/[0X[C4))>m6a11R;C*k1pDb#.JW'n(%5cC*_`]A'EF$$a=UI5#&`8M27t>d27<l`u+4uF]aCX1,,alTd_?]9sjXeY"&fT"7k!J(:C#(UXl(MJi:6FbVY8g8k^5BJPPEs[>`n>"-^-?Y8\GEOd(nFQ$T-8BE,9C75FmB1.Uj0bO'1M^"=AGE<7R'0k&jE:!nlR.=,D)Bh0od>[4,"j(EjcXdaA7hoAHI4c<.':m3#po;*VU$brn;2 at a&a?iTbZKlW4Zflr9b\N40C"'RasbmXZcIDKW[pj,/r*^&$Y7r at 4e<MP(mW`LA"*c>G'l6Ad($[<#WC.]ZgfQU)=u(PF`(`S>'!a_a#r(7\N?GH`hU^\!P-S*$$MkRFp/u0_aK7qYG.rYiV!'Y-f`?)T/A,0l.nA&P''l0a9d;B<=`\Xc"G\'<Rk>c+Q+2VF*qkW;(pP(.T_N>lQ[iFSuJ.ri97Iq%:pNkI.Pkp`m?^+oY-Ndu^1(%a-UR)<T)>!m;<&;J\-[=*AQ6V(q\'lWK0f`2+t%'d:$*rcA(H'j,%);F_Q(?qiuZ5TirO7I-f_cacYAR"8'@#J$b.`;[<YkH3qu#LXs:S(V3F^oSLY/`202q=icB]d`pM*slZM-+ZfFC_iWs%S]LKnjR5YA24,<)"EjWA8G^<jWR)V;^X=rNCs^YOT at 5VF(Q(678'Km<7uXj>=!'U3K at 8&)'t,^K\K>'';eJ6$+V&3_NX?-[.qY?-=Mii_/[9?T%HS)UqWd.$."YfP-I,G$=esmcfCK^U5p<3Xja+&_en>Dh("@`5nKIHG3kc/Bm;K)@D^..[$Y?Q(f+^g,VqiO:m5?oLGEYV-02/_!S.]$r%(d"Fc<0G`2Ps2b$_$O#U`"oD"1+`k]l at 3Z@`iVA4:<?MJgaL(@p&A.7nP[PSf<E+A3ulB1g7^/UBEA80ot\iJhgci#&1T>Paj?k-u)f7j&EgKKPpldFU+<U6sVV3pd3 at Zkg9@di9#H$fm7<fiU:'&KB?;O-\reh&6&I4@;uP-A$n_DNQ@=2oBoMI.5>=TEIo-II at Pbr=*8P,T9/6K+k/9hY]Co'O_U$Sihf at UWg#h)7bb*@nCZM$*;65"@S3r"&C?odADr)1):MD=)59:GR7L>4i)0Mo_eN4K7%J%/Z-VGr>BJ_K)*i'ZcGe+X0lNFj`T%'5P9WIAp)4-rTS%smad;6Zn!nhj9_,MKgsQPA_Nr_RSY_ at CB\`1,*Bt+dQJ+/q/rqm*JXA012Y0%GLaXc/J9g&%2 at bQe'1>Ki3kM_/Iig?41"R4K1hYL<+W3;mk?[-jj\Y#jZ6KNS?nF#n?H5jLNVA7d,Snd>nD?^M,`7?\M%nfPZMNEY*:aWf<1a=DI;rc]PAmmaX1$9j0t`d0P at g]I`lo'nim@!LEijm:<gMI`L1*B=+W&bFE==1Rph0\NF()hJ/UaEZ,;^WN]'<_g0bMC0(<c\UKn"q'E$a.1laKd7APXR3c2dHM<AmFmgT$GA_BL9RY8fj_rG`Xa-E'&/jEk5L*FO<*f^;;#gS9GQ/W'b1M-helT2 at 6=g1E!LnC2Dd%NfPW5O9O%Q(Pp$W`gkE.pu99-S''BZF3l!hdF4Mi>olLu/THLhh"XBfq.Z4IZp)Pp#I7eD<mk'18](@7Tj at MkW3;2]"Sp.gZCJO`h]8+^g5 at TVQ?!-7%Jt]_gUIh]H3"gpDh+l!3B3(D=KO%4lt at B<b$:q1Ph5Vf^bJCn\P[$i1b2p:Nk#;KA_8\B?ur.!])9\i+4U at Umt):Z/ftEkX=K7UR1 at eA[G?[+Spiru/n2VEr at MU'CfrIuqjt2 at FH2neVe&=U!Z0*OruAE]O^hV(cPclfW9^jWV2)4/e*&,Xh@"eeQUA"(W;G8TIc%NVQ?eE("Rs*=rh3^i5;P9WTY^o9>)4)<sLK=65!1l4-OKkn[@P4;$auai%_rbL9AN<K8=(qd^gE?IRlk9Ri6dDj*C9W=Fh!Fi(ZtDAZ!l=o-s83/0P'Y*dJ. at BnTQjY,jA-4L0c5,TCO<kRAELpsl2",lqc`&!E<E2a'g&WYST#n:4P>1.X/+kDE=7[t!1qATIL6WPbAIJYkq9aI(&I7#okfs`E.*TGiS)=blpKZ>PtS"MR at IuYtM:,WdA3Frh%\alm(26%fTV$6SX0lX,01icnq>Sn^KFips*17g#6DN>&*:ZL.P9. at rdF>:0:Li;QX'rpHI>.P+5#B%#!4%7tGiZb?jfKHj5[6lL9EofJ/>seSap0q*q&C;VY'KLOhp7e'<Z+-lgT<n+U8gQi^>$\kg%gHnSV=A"m'pJUn at MlWt4r7?C5ne#JJaqsO*-66f?:>HuKm(]&J`lp?SS8Q:(P*Cta=&ZTa)^TdAu1)W?J!LJCRHefS[;laUnILhDSc+qps^dam60T+7O.H4<k-G947!DW;GdRD7eA*^"3V+d`KWkbTW`=."r)ns'A-^6)hlVo.4`[f&YEgTJ%I-(LmYS-gI:KWea=cWa-Mad\kLr9Dm[ncfWGRE>L]X03kC5sRaP%,e3bBd'8EDSc7A#00)g3CC4"'PHOA:OU\/VcjjOnSJ'krT\2j=F<<,P^mnj0>d\M61l#=0F-#7:RPZ9[]#cP,b-JNFgE-lQ;"][_KfJaD>;<QOQX=d;tM\.`<Qn"=hmO8 at MV\a"=ak`cBC3E.g7B("X-jQ'NW'm76[(<i_.G7TlnhN43!^CQk&6!\gJT)c`O($L,q,(>V[?i$VFi6SGCEgb`.+K?PZd20`\9BcJ2O#u:QtkWNrUoT_];iu/R-QtWK;#%uE/rS*oSl^9A%GnL--n93c-mVM]d?V;0f5X1U$<*YUH#4d67sd;1+.5%IMb&F)2;8fKqU<$]iK\FPaD5S\uAHl"7#Egn0&fm/E<d'J<LpbV#[WM\RBJ*45s1qYcl=ua8h7ncEQ"_29FQtS-hF"W')VLZOab)E/rAP0>aRaqTd>UHd*^%,<ub[7L[K2_Kh]O?i(\b_4/p9h at 7[N6=1e33T'Zk=3mp3i4ed210q4"*jptF-fERH5!m=2ce,D51'"FX"eJ)&kiF^Pi(gFBb\[m=Wilm,\?F\Hc+sc"`rX._b^"eRmd*M7*=lK>F3TH=Qe.3W$G at hfI;&K03mckAnFFQu!HhCfCB~>endstream
 
 endobj
 % 'R17': class PDFOutlines 
@@ -355,20 +206,20 @@
 0000001770 00000 n
 0000002050 00000 n
 0000002188 00000 n
-0000002386 00000 n
-0000002517 00000 n
-0000005771 00000 n
-0000007143 00000 n
-0000008507 00000 n
-0000012517 00000 n
+0000002414 00000 n
+0000002545 00000 n
+0000005719 00000 n
+0000007053 00000 n
+0000008379 00000 n
+0000012265 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\245\320\367\206\314U\033+\335.\001\213\256\021\305\275) (\245\320\367\206\314U\033+\335.\001\213\256\021\305\275)] 
 
  /Info 11 0 R
  /Root 10 0 R
  /Size 18 >>
 startxref
-12569
+12317
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/rml-guide-example-01.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/rml-guide-example-01.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/rml-guide-example-01.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -44,7 +44,8 @@
 % 'R5': class PDFInfo 
 5 0 obj
 << /Author (anonymous)
- /CreationDate (20070416001215)
+ /CreationDate (20070619131316)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (unspecified)
  /Title (untitled) >>
@@ -61,10 +62,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 117 >>
+ /Length 114 >>
 stream
-GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi71Y+?>
-[SSY41tON^#g$)nn4:gGa]Abo0?Ql6do6Up;@(YOCJs*P!W^,-'Vb~>endstream
+GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi71X\':<\Q6bf/$>2a]6^W8Bo8u<s[,*b":"0<!^TD#gi_>;;gO;!3^&MC&~>endstream
 
 endobj
 % 'R8': class PDFOutlines 
@@ -80,17 +80,17 @@
 0000000372 00000 n
 0000000649 00000 n
 0000000783 00000 n
-0000000979 00000 n
-0000001084 00000 n
-0000001345 00000 n
+0000000994 00000 n
+0000001099 00000 n
+0000001357 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\341\031\003O\340\230\236\375;\366j\313\323\257@|) (\341\031\003O\340\230\236\375;\366j\313\323\257@|)] 
 
  /Info 5 0 R
  /Root 4 0 R
  /Size 9 >>
 startxref
-1396
+1408
 %%EOF

Added: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle-2.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle-2.pdf	                        (rev 0)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle-2.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -0,0 +1,129 @@
+%PDF-1.3
+%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
+% 'BasicFonts': class PDFDictionary 
+1 0 obj
+% The standard fonts dictionary
+<< /F1 2 0 R
+ /F2 3 0 R
+ /F3 4 0 R
+ /F4 5 0 R >>
+endobj
+% 'F1': class PDFType1Font 
+2 0 obj
+% Font Helvetica
+<< /BaseFont /Helvetica
+ /Encoding /WinAnsiEncoding
+ /Name /F1
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F2': class PDFType1Font 
+3 0 obj
+% Font Courier-Bold
+<< /BaseFont /Courier-Bold
+ /Encoding /WinAnsiEncoding
+ /Name /F2
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F3': class PDFType1Font 
+4 0 obj
+% Font Times-Bold
+<< /BaseFont /Times-Bold
+ /Encoding /WinAnsiEncoding
+ /Name /F3
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'F4': class PDFType1Font 
+5 0 obj
+% Font Times-Roman
+<< /BaseFont /Times-Roman
+ /Encoding /WinAnsiEncoding
+ /Name /F4
+ /Subtype /Type1
+ /Type /Font >>
+endobj
+% 'Page1': class PDFPage 
+6 0 obj
+% Page dictionary
+<< /Contents 10 0 R
+ /MediaBox [ 0
+ 0
+ 595.2756
+ 841.8898 ]
+ /Parent 9 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
+endobj
+% 'R7': class PDFCatalog 
+7 0 obj
+% Document Root
+<< /Outlines 11 0 R
+ /PageMode /UseNone
+ /Pages 9 0 R
+ /Type /Catalog >>
+endobj
+% 'R8': class PDFInfo 
+8 0 obj
+<< /Author (\(anonymous\))
+ /CreationDate (20070619125543)
+ /Keywords ()
+ /Producer (ReportLab http://www.reportlab.com)
+ /Subject (\(unspecified\))
+ /Title (\(anonymous\)) >>
+endobj
+% 'R9': class PDFPages 
+9 0 obj
+% page tree
+<< /Count 1
+ /Kids [ 6 0 R ]
+ /Type /Pages >>
+endobj
+% 'R10': class PDFStream 
+10 0 obj
+% page stream
+<< /Filter [ /ASCII85Decode
+ /FlateDecode ]
+ /Length 641 >>
+stream
+Gat%`9omag%#455nfN618 at 7FQ8g5Dg#`=;F^s3C/fT3>dd]rot+oXVG:Rn57EO9K29K^XGr)WNL at -E7@H[C at r$$LXu[#i!'qQ5PF!T']^q9_)[U7I"`pI'(e:>h at hn.Son%h6&99Vbe%UQcOucRB<QIbr!)jYKF<YdlbXhL8,L2oihdY<U&p$,5E>DXYSD)bATTnE+\9jGidO?7aRgqEFIo;5JEF%1n0R6KMOVGIR<sL)!n>[u_2ql`uP10ll(R at J^AI$51R9fF!fA`t<;+AFL8l.gY->Dl>?%_S?:(M?Hcj$)/g\6r>4cVF[)c,*,E"7?J^M,!co3JgcKZd1cmc=(E<b:/N9mU.>haOW]N*5r;$I-salDf:&iR>0dpMCUlcF*ENNSi<jV&L#(g<gO(@;$^#Z/rB\Zge%>PS]5>:2b@'62k\OQFiMm#,FqHJ;W,/(J`@64!5m#4f/U4nW>de/'e+B#+p-$I[Z+("YC2iS2IsdK`NRhrVE.OSP_I^D,QORr%JYuZ<3#7t5$F2k8RahbN5/pU'SQ]@+;*ic'<3oFfejm)^UXIV[6\\Tn%'0 at E<p_X>`uUd+>JZAk98iDpii^"_XVk;#]gU1ZbJeIj(<UI<.HfC4Y:3BQD=\Q$bh5G~>endstream
+
+endobj
+% 'R11': class PDFOutlines 
+11 0 obj
+<< /Count 0
+ /Type /Outlines >>
+endobj
+xref
+0 12
+0000000000 65535 f
+0000000113 00000 n
+0000000245 00000 n
+0000000410 00000 n
+0000000581 00000 n
+0000000748 00000 n
+0000000915 00000 n
+0000001193 00000 n
+0000001328 00000 n
+0000001552 00000 n
+0000001658 00000 n
+0000002445 00000 n
+trailer
+<< /ID 
+ % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
+ [({\3731\031T\033\345\213{\331\023\036\026zx\307) ({\3731\031T\033\345\213{\331\023\036\026zx\307)] 
+
+ /Info 8 0 R
+ /Root 7 0 R
+ /Size 12 >>
+startxref
+2497
+%%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-buttonField.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-buttonField.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-buttonField.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -44,7 +44,8 @@
 % 'R5': class PDFInfo 
 5 0 obj
 << /Author (anonymous)
- /CreationDate (20070416001215)
+ /CreationDate (20070619130755)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (unspecified)
  /Title (untitled) >>
@@ -61,11 +62,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 166 >>
+ /Length 162 >>
 stream
-Gar&u3tB+]&4HCd\\fg1:cMV4]<Ne084C'*i0,8p:7?-O,)ZMrOf"O*O3ju%
-gt.3S;>14!ck5>uLRrJ7Z<.A.U=KLsZlIF")opf$'/nD&]e&d)5DIdlJtDEj
-$u+QbT?uE/K#L9fOW[=E9&Qf7Z2q?4IA&2UUa[SC~>endstream
+Gar&u]afWZ&;5BChI/aI(+X`U]5X'(W@[cIr'@+:Uquel>V(i%A=E>VA(4.2pEcLhCjQ at JfF8fK^lCBV=Y'Z);<J&3**Y6Lj<]%Q_Q#Z3kBVCHO(#\%YgXWi+\cb)'=R^<Llt4D)(J<W>KMaT)o0)C(Wt_>TogVM~>endstream
 
 endobj
 % 'R8': class PDFOutlines 
@@ -81,17 +80,17 @@
 0000000372 00000 n
 0000000649 00000 n
 0000000783 00000 n
-0000000979 00000 n
-0000001084 00000 n
-0000001394 00000 n
+0000000994 00000 n
+0000001099 00000 n
+0000001405 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\244\212:\037\371\)T\350\225]7\313\320\376\037\243) (\244\212:\037\371\)T\350\225]7\313\320\376\037\243)] 
 
  /Info 5 0 R
  /Root 4 0 R
  /Size 9 >>
 startxref
-1445
+1456
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawAlignedString.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawAlignedString.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawAlignedString.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -44,7 +44,8 @@
 % 'R5': class PDFInfo 
 5 0 obj
 << /Author (anonymous)
- /CreationDate (20070416001215)
+ /CreationDate (20070619125700)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (unspecified)
  /Title (untitled) >>
@@ -61,15 +62,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 423 >>
+ /Length 421 >>
 stream
-GasJOYti1j&;KpOI>8aY>%k+RoD._]?'&H'oU)IS+@%Camk<WF->A/d;5>c=
-r;$?L0nChcp$_JU*]"e-$&Bb>!so=q(O4*g<V\lpjiA8^\pt.`!h27o^P2Rh
-q>MJip_spt,ZP5O%3baCR:`Q7Mp<SXlH#okW\r'`7hY2_>+A>QQ+M?glb6Nk
-N\!dV]rmG_WHL_Co/>B>-Q(AR+GPo@=NbI-r2:9cAF?%f,<aYaK[!3GG82OV
-r-R/&Qh^qW(k\9VBFqe,Cc>h0K=-jZ;nH>>8nr+EbMFc#eFn#V3JaA2Sj.c4
-K[9,Ya4nqQ[er&$.4j8k#s;QgUIRl^KOW2J!n0`.8?^Abn1-VOI;L0#_][7V
-F=5^n?hBD(kI9C-OAs#n<$Si(^"j`SBnpEM&T0LWp$*@0K`t3~>endstream
+GasbW4\l/7%#4LKr=9qd>%l_O+&4S56%Xs```pRl"A!+_s%E,jpT=diTTeeu4SRKWP7T^!kk#pVE8SM"OaoQ9Y<W[EFAMDQ/Jk]XMYc\$$=oKbTf^-V"t6RHqge,.(L%!=i3-O!P@\0.!Nq+T,50M?cSR\Hc&<qT4+>_M>Mb3*HTGb1+p,(mP<*uu[:u4GN6,Om<"BCo8TQ,k#r\sO)+QU>aMO+=A(KRQBsg(087iBD4;J*RfANA^VlS6tBW5YX>MAi`>?so^-8r>$e:P7ffWV$/?F7ja0)bWbD(J]YrK$`22SC#4bXhp1XhC*!GlJc??G9TXG.Jd?><8OsdBq%&)m,?I[KDmt5q?<9Hgo@##PN:t(o"NGcj:5eL!]Hfpuo3Fa<u0[77Z^jp3s^HXU=YqHh^G<QA][XRg`<~>endstream
 
 endobj
 % 'R8': class PDFOutlines 
@@ -85,17 +80,17 @@
 0000000372 00000 n
 0000000649 00000 n
 0000000783 00000 n
-0000000979 00000 n
-0000001084 00000 n
-0000001651 00000 n
+0000000994 00000 n
+0000001099 00000 n
+0000001664 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\222~\236\343Wc\242\373~\362\3401"$Q\335) (\222~\236\343Wc\242\373~\362\3401"$Q\335)] 
 
  /Info 5 0 R
  /Root 4 0 R
  /Size 9 >>
 startxref
-1702
+1715
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawCenteredString.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawCenteredString.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawCenteredString.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -44,7 +44,8 @@
 % 'R5': class PDFInfo 
 5 0 obj
 << /Author (anonymous)
- /CreationDate (20070416001215)
+ /CreationDate (20070619125700)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (unspecified)
  /Title (untitled) >>
@@ -61,10 +62,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 117 >>
+ /Length 114 >>
 stream
-GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi71Y+?>
-[SSY41tON^#g$)nn4:gGa]Abo0?Ql6do6Up;@(YOCJs*P!W^,-'Vb~>endstream
+GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi71X\':<\Q6bf/$>2a]6^W8Bo8u<s[,*b":"0<!^TD#gi_>;;gO;!3^&MC&~>endstream
 
 endobj
 % 'R8': class PDFOutlines 
@@ -80,17 +80,17 @@
 0000000372 00000 n
 0000000649 00000 n
 0000000783 00000 n
-0000000979 00000 n
-0000001084 00000 n
-0000001345 00000 n
+0000000994 00000 n
+0000001099 00000 n
+0000001357 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\222~\236\343Wc\242\373~\362\3401"$Q\335) (\222~\236\343Wc\242\373~\362\3401"$Q\335)] 
 
  /Info 5 0 R
  /Root 4 0 R
  /Size 9 >>
 startxref
-1396
+1408
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawRightString.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawRightString.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-drawRightString.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -44,7 +44,8 @@
 % 'R5': class PDFInfo 
 5 0 obj
 << /Author (anonymous)
- /CreationDate (20070416001215)
+ /CreationDate (20070619130755)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (unspecified)
  /Title (untitled) >>
@@ -61,10 +62,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 117 >>
+ /Length 114 >>
 stream
-GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi72Uo&e
-2cDCb1tON^#g$)nn4:gGa]Abo0?Ql6do6Up;@(YOCJs*P!W^+u'Vb~>endstream
+GapQh0E=F,0U\H3i"VoYmq/M+BVZ3&VI4)3B;,ssUYm'-b6=+aKISi7ZIH37;_Tp_f/$>2a]6^W8Bo8u<s[,*b":"0<!^TD#gi_>;;gO;!3jc`Er~>endstream
 
 endobj
 % 'R8': class PDFOutlines 
@@ -80,17 +80,17 @@
 0000000372 00000 n
 0000000649 00000 n
 0000000783 00000 n
-0000000979 00000 n
-0000001084 00000 n
-0000001345 00000 n
+0000000994 00000 n
+0000001099 00000 n
+0000001357 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\244\212:\037\371\)T\350\225]7\313\320\376\037\243) (\244\212:\037\371\)T\350\225]7\313\320\376\037\243)] 
 
  /Info 5 0 R
  /Root 4 0 R
  /Size 9 >>
 startxref
-1396
+1408
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-fixedSize.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-fixedSize.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-fixedSize.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -73,11 +73,12 @@
 endobj
 % 'R8': class PDFInfo 
 8 0 obj
-<< /Author (anonymous)
- /CreationDate (20070416001215)
+<< /Author (\(anonymous\))
+ /CreationDate (20070619125700)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
- /Subject (unspecified)
- /Title (untitled) >>
+ /Subject (\(unspecified\))
+ /Title (\(anonymous\)) >>
 endobj
 % 'R9': class PDFPages 
 9 0 obj
@@ -91,17 +92,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 535 >>
+ /Length 522 >>
 stream
-Gb!#W>t`'h'R_(i5Fa[5@$WXSh*;*3#D+U<r]k>L/_W)2Aq'])DrWaH'G\HF
--8["BS==kDmLeA67/5q$*,,i$![<@O+V[l%B/n<;hG(a4QI'ltUe4U<<(SG2
-PU']<&6Z*j&T`[dDYYJJfl30J3n4E0O!07[IicVs"O[3,oG++K5+(?H5+.c)
-6!+>$\\q"bf`]?-k(5nf@!C(B)sDR7S`,INE*(Z+$XAA+#@dqR6PVotOe182
-T'jq)b2#"d2J-iBg7g;CY!bk%fk"_5fU>QV=-p?R"e'_&)hu8c08TI\;bXMZ
-KA%KP('aN^bepWSe']f0F4UuN3u"hAHsmD7H]Z!OQ$JVEO(?NP1K41p>??HS
-okXg,\/%Z)I\dg"dTMJakI6m<B5\hR-B<,<RTiDTD[bs#r+-FFL36n-JBm=d
-1/sd0i?%$",Z>tY`(0B$^<[a(`Lk7HVLifQN.+$0S$"hWN1*4ael=pXYRgW&
-A!]".Ic"-)s66Li2QU-XgW\7STo"6e);/?6MZ~>endstream
+Gb!;`?#/1K'R^MQ5Ff3/K.5B,56>?AYlt>[.FTAXD)kJZ=D=n=m=,"Oe2V;KduH`8MM5X+SpPSIe\1+$l/CT,0(DqO1?79o\cu506(d,J*fmJE,JJkhS4T!G'Ub+X-;'G2!0B"od?3T)6>ZRFR^%7/8_V]0nI+i6_]OZsArc*H#O"fK[CnBH:]&m//AHjP16Ypi"C97Abq*-Sk`>MG:V@?d*lajX^+Zr[rg@^HPYYlu4:YL"0gp=r4*Wg$BGu*LiQ at OQD/"jPGdnYLD&4"Jl!R`L/R;T8el:j67;3T69>;h*Hi1[Rpgqf5Pg.q?G#<MZSt)Zq]iqt,*5+`$)T#Ra,.ImJ<INq*dGC(t>VAh;$ZB;Y)V259n9Q_8/GkoALib<eB?m,kS!^n"o9_UsH!tS=aQ"+\3B<sm+i@(-, at L"eR*:gfdua;&4&8s0V_UW&-#BUPh,QV;e6'B6H at ku\,a'7Bp%G?ib:Q2dhQ!eI1u#&o&0m27m2,9l'\9m1Pa=<p"67cN\HTpr~>endstream
 
 endobj
 % 'R11': class PDFOutlines 
@@ -120,17 +113,17 @@
 0000000915 00000 n
 0000001193 00000 n
 0000001328 00000 n
-0000001524 00000 n
-0000001630 00000 n
-0000002311 00000 n
+0000001552 00000 n
+0000001658 00000 n
+0000002326 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\245\320\367\206\314U\033+\335.\001\213\256\021\305\275) (\245\320\367\206\314U\033+\335.\001\213\256\021\305\275)] 
 
  /Info 8 0 R
  /Root 7 0 R
  /Size 12 >>
 startxref
-2363
+2378
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-keepInFrame.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-keepInFrame.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-keepInFrame.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -92,11 +92,12 @@
 endobj
 % 'R9': class PDFInfo 
 9 0 obj
-<< /Author (anonymous)
- /CreationDate (20070416123613)
+<< /Author (\(anonymous\))
+ /CreationDate (20070619130755)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
- /Subject (unspecified)
- /Title (untitled) >>
+ /Subject (\(unspecified\))
+ /Title (\(anonymous\)) >>
 endobj
 % 'R10': class PDFPages 
 10 0 obj
@@ -111,16 +112,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 446 >>
+ /Length 431 >>
 stream
-Gb!<J>t`'h'Sc&]q[`.d<EPQjVCdT?U'4sa6N07+d]L*hF"QV%pG?d:8T>s<
-Zj at 1)?[\+/7Y&r!r]MiQBe`?dKS7Sn1t/ZB>he5qEB"N!:`2'cNAcU"@Oflb
-&q'a+Md8?c/0SSk0>`P8,Z80\1TE)OiiYK>@m*>$IL:F_i5)tS9pMlfd_-PO
-r%_$t-6n&ck.#GCm2bm/U]'0mlE-\l^bX[Ih?&'iQQ>o^eI^LXKAT()(I`tB
-I\/3Yoi$JQ[]&C'NGDDSaN9t./R="',3uV=ntL.\1okHXfG=7'65(_R+uHuh
-PI`nk3gA2Y\!Yd#Z>aU"E#coAbJ>nVqA_T$[t*?/0]c*#Q8iD[,q=N*F=Bc3
-S,U(L]0(0EPi5;NPPiKZfIu)316RXrF3<Y_EQ5WROQM8r&"<M]a%jS1c?sC5
-9ah7[Ph;X0~>endstream
+Gb!<JgIf at K&;KW]I>@jJ.(J)32CXFuU&grH_S/:hDVAcfe0^iLmpp9=Wkj!+[I!$41]QOjSK.`+6hpP[^n&Fm&J,R5K@!<0:@MYHK at f'ICdVdXPW%5<dYb##.h_[Y&rU$V;APA"eVc+jHlOT at g,\8]&9423qls9H\@I9 at 7e#EmqQW^PC#M5b\,J*Se5d0sV at 21kU@Je at L$QY;/aAOl]tcBc!:Bj$TZ\+!P\:?j\%s^AYfj[K6bcDuX6QfV$_*LTM:shc11XojV^kgn0?H8Uat,4%*;)@`3S"629PEGUY6[iUihU<Al5$49mgU$ITe,$>0q?82/NGd:7%[ro[L_RR%oY1t`;"3<hW'];2-(;U'/?1Ifp-;Z*?k*\QB7deEMWW1,n?.5*]Ua at q0-\k&^)Cq6D)0;5DNS@?4!&;%R'k[c(WM~>endstream
 
 endobj
 % 'R12': class PDFStream 
@@ -128,12 +122,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 206 >>
+ /Length 200 >>
 stream
-GappW_$\%5%#45)^;GG"%s;#:odo=KMpN9=Z^oXKRs*`U)iI6R+?s3s6E%Dm
-b]^eY at XTLu%3%Q%);#T4<f3dhoL%r8dUluIfJZpt`b7Oe5ZN>9-O";L04rhO
-<Wf at Z[Ji3'p(fGrf>7.Yps+,/5K1PkZC`iU"HM<7pDG]*g5[W#jKHXgCV<og
-hI0LI[rZ7SnGt_P0u!~>endstream
+GappW_$\%5%#45)^;GG"%s;#:odo=KMpN9=Z^oXKRs*`U)iI6R+?s3s6E%Dmb]^eY at XTLu%3%Q%);#T4<f3dhoL%r8dUluIfJZpt`b7Oe5ZN>9-O";L04rhO<Wf at Z[Ji3'p(fGrf>7.Yps+,/5K1PkZC`iU"HM<7pDG]*g5[W#jKHXgCV<oghI0LI[rZ7SnGt_P0u!~>endstream
 
 endobj
 % 'R13': class PDFOutlines 
@@ -153,18 +144,18 @@
 0000001194 00000 n
 0000001473 00000 n
 0000001609 00000 n
-0000001806 00000 n
-0000001921 00000 n
-0000002511 00000 n
-0000002863 00000 n
+0000001834 00000 n
+0000001949 00000 n
+0000002524 00000 n
+0000002870 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\205\361h\012C\)\307\311\330I#\315\365\2700\015) (\205\361h\012C\)\307\311\330I#\315\365\2700\015)] 
+ [(b\222%KaH+R\313mxw\301\247m\265) (b\222%KaH+R\313mxw\301\247m\265)] 
 
  /Info 9 0 R
  /Root 8 0 R
  /Size 14 >>
 startxref
-2915
+2922
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-textField.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-textField.pdf	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-textField.pdf	2007-06-19 17:24:36 UTC (rev 76799)
@@ -16,7 +16,7 @@
 endobj
 % 'Annot.NUMBER1': class PDFPattern 
 3 0 obj
-<< /DA (/Time 12 Tf 0 0 0 rg) /DV ()
+<< /DA (/Helv 12 Tf 0 0 0 rg) /DV ()
  /F 4 /FT /Tx/MK << /BC [ 0 0 0 ] >> /MaxLen 1000000
  /P 5 0 R
  /Rect     [99.2125984252 649.133858268 240.94488189 663.133858268 ]/Subtype /Widget /T (input1)
@@ -26,7 +26,7 @@
 endobj
 % 'Annot.NUMBER2': class PDFPattern 
 4 0 obj
-<< /DA (/Time 12 Tf 0 0 0 rg) /DV (Default Value)
+<< /DA (/Helv 12 Tf 0 0 0 rg) /DV (Default Value)
  /F 4 /FT /Tx/MK << /BC [ 0 0 0 ] >> /MaxLen 30
  /P 5 0 R
  /Rect     [99.2125984252 521.57480315 240.94488189 606.614173228 ]/Subtype /Widget /T (input2)
@@ -67,7 +67,8 @@
 % 'R7': class PDFInfo 
 7 0 obj
 << /Author (anonymous)
- /CreationDate (20070416001215)
+ /CreationDate (20070619130755)
+ /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (unspecified)
  /Title (untitled) >>
@@ -84,11 +85,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 180 >>
+ /Length 176 >>
 stream
-GasJHYmS?5&4HC\raA?o(8lMih;g+U"+oY6JESFS/m=e'kBd=>[?6"hB''P2
-O[Z#e,$'SH7j&1&JXg`,*B%(:\Y/]H\ssGABS9+)Y(fD>WYD&(]7g/c62,#n
-6bH-e=6T#FJAm>RSfg_H9?ZA3G.9aLB_`0Jcc.jo+-?GQ:_k^g(b[<~>endstream
+GasJHYmS?5&4HC\raA?o(2%f3H^D&Q%1&9s"/6T/4LI/bcSkt7[?6#SB&4c^6YPh7_GW,W#fP(2A;u:\Z.?2t#'sY0P,[-Dn4lY%[Xfc!WZ7YA42oC:K'nY$`H7S9cd:@K5b)hF"2P;3i*%!%S*U$86&U5S">T8^I6d]6Te'NS"YV;~>endstream
 
 endobj
 % 'R10': class PDFOutlines 
@@ -235,35 +234,35 @@
 0000000979 00000 n
 0000001284 00000 n
 0000001438 00000 n
-0000001634 00000 n
-0000001739 00000 n
-0000002064 00000 n
-0000002142 00000 n
-0000002286 00000 n
-0000002372 00000 n
-0000002452 00000 n
-0000002698 00000 n
-0000004061 00000 n
-0000004211 00000 n
-0000004354 00000 n
-0000004500 00000 n
-0000004638 00000 n
-0000004790 00000 n
-0000004935 00000 n
-0000005083 00000 n
-0000005223 00000 n
-0000005370 00000 n
-0000005511 00000 n
-0000005654 00000 n
-0000005796 00000 n
+0000001649 00000 n
+0000001754 00000 n
+0000002075 00000 n
+0000002153 00000 n
+0000002297 00000 n
+0000002383 00000 n
+0000002463 00000 n
+0000002709 00000 n
+0000004072 00000 n
+0000004222 00000 n
+0000004365 00000 n
+0000004511 00000 n
+0000004649 00000 n
+0000004801 00000 n
+0000004946 00000 n
+0000005094 00000 n
+0000005234 00000 n
+0000005381 00000 n
+0000005522 00000 n
+0000005665 00000 n
+0000005807 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\222O\002\327&P\025\006\226\366\032\331WM\225\375) (\222O\002\327&P\025\006\226\366\032\331WM\225\375)] 
+ [(\244\212:\037\371\)T\350\225]7\313\320\376\037\243) (\244\212:\037\371\)T\350\225]7\313\320\376\037\243)] 
 
  /Info 7 0 R
  /Root 6 0 R
  /Size 29 >>
 startxref
-5897
+5908
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/input/rml-examples-002-paras.rml
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/input/rml-examples-002-paras.rml	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/input/rml-examples-002-paras.rml	2007-06-19 17:24:36 UTC (rev 76799)
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no" ?> 
-<!DOCTYPE document SYSTEM "rml_1_0.dtd"> 
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+]>
 <document filename="test_002_paras.pdf"> 
 
 

Modified: z3c.rml/trunk/src/z3c/rml/tests/input/rml-examples-022-paras-oas.rml
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/input/rml-examples-022-paras-oas.rml	2007-06-19 16:41:23 UTC (rev 76798)
+++ z3c.rml/trunk/src/z3c/rml/tests/input/rml-examples-022-paras-oas.rml	2007-06-19 17:24:36 UTC (rev 76799)
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no" ?> 
-<!DOCTYPE document SYSTEM "rml_1_0.dtd"> 
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+]>
 <document filename="test_022_paras_oas.pdf"> 
 
 

Added: z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle-2.rml
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle-2.rml	                        (rev 0)
+++ z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle-2.rml	2007-06-19 17:24:36 UTC (rev 76799)
@@ -0,0 +1,97 @@
+<!DOCTYPE document SYSTEM "rml.dtd">
+<document
+    filename="tag-blockTableStyle-2.pdf"
+    xmlns:doc="http://namespaces.zope.org/rml/doc">
+
+  <template>
+    <pageTemplate id="main">
+      <frame id="first" x1="72" y1="72" width="451" height="698"/>
+    </pageTemplate>
+  </template>
+
+  <stylesheet>
+    <blockTableStyle id="custom">
+      <blockAlignment value="CENTER" />
+      <lineStyle kind="BOX" colorName="black" />
+      <lineStyle kind="LINEBELOW" colorName="red" start="0,0" stop="-1,0" />
+      <lineStyle kind="LINEAFTER" colorName="blue" start="2,0" />
+    </blockTableStyle>
+  </stylesheet>
+
+  <story>
+    <title><font face="Courier">&lt;blockTableStyle&gt;</font> Tag Demo</title>
+
+    <p>This demo ensures that a table style can be applied multiple times.</p>
+
+    <blockTable style="custom">
+      <tr>
+        <td>00</td>
+        <td>01</td>
+        <td>02</td>
+        <td>03</td>
+        <td>04</td>
+        <td>05</td>
+      </tr>
+      <tr>
+        <td>10</td>
+        <td>11</td>
+        <td>12</td>
+        <td>13</td>
+        <td>14</td>
+        <td>15</td>
+      </tr>
+      <tr>
+        <td>20</td>
+        <td>21</td>
+        <td>22</td>
+        <td>23</td>
+        <td>24</td>
+        <td>25</td>
+      </tr>
+      <tr>
+        <td>30</td>
+        <td>31</td>
+        <td>32</td>
+        <td>33</td>
+        <td>34</td>
+        <td>35</td>
+      </tr>
+      <tr>
+        <td>40</td>
+        <td>41</td>
+        <td>42</td>
+        <td>43</td>
+        <td>44</td>
+        <td>45</td>
+      </tr>
+    </blockTable>
+
+    <spacer length="1cm" />
+
+    <blockTable style="custom">
+      <tr>
+        <td>00</td>
+        <td>01</td>
+        <td>02</td>
+        <td>03</td>
+        <td>04</td>
+      </tr>
+      <tr>
+        <td>10</td>
+        <td>11</td>
+        <td>12</td>
+        <td>13</td>
+        <td>14</td>
+      </tr>
+      <tr>
+        <td>20</td>
+        <td>21</td>
+        <td>22</td>
+        <td>23</td>
+        <td>24</td>
+      </tr>
+    </blockTable>
+
+  </story>
+
+</document>

