[Checkins] SVN: z3c.rml/trunk/ - I found a more complete paragraph border patch from Yuan Hong. Now the DTD

Thu Jul 22 15:22:10 EDT 2010

Log message for revision 114942:
  - I found a more complete paragraph border patch from Yuan Hong. Now the DTD
    is updated, the border supports a border radius and the tag-para.rml sample
    has been updated.
  
  - Get ready for release.
  
  

Changed:
  U   z3c.rml/trunk/CHANGES.txt
  U   z3c.rml/trunk/setup.py
  U   z3c.rml/trunk/src/z3c/rml/rml.dtd
  U   z3c.rml/trunk/src/z3c/rml/stylesheet.py
  U   z3c.rml/trunk/src/z3c/rml/tests/expected/tag-para.pdf
  U   z3c.rml/trunk/src/z3c/rml/tests/input/tag-para.rml

-=-
Modified: z3c.rml/trunk/CHANGES.txt
===================================================================

--- z3c.rml/trunk/CHANGES.txt	2010-07-22 19:06:32 UTC (rev 114941)
+++ z3c.rml/trunk/CHANGES.txt	2010-07-22 19:22:10 UTC (rev 114942)
@@ -2,10 +2,12 @@
 CHANGES
 =======
 
-1.0.0 (unreleased)
+0.9.1 (2010-06-22)
 ------------------
 
-- No changes yet.
+- I found a more complete paragraph border patch from Yuan Hong. Now the DTD
+  is updated, the border supports a border radius and the tag-para.rml sample
+  has been updated.
 
 0.9.0 (2010-06-22)
 ------------------

Modified: z3c.rml/trunk/setup.py
===================================================================
--- z3c.rml/trunk/setup.py	2010-07-22 19:06:32 UTC (rev 114941)
+++ z3c.rml/trunk/setup.py	2010-07-22 19:22:10 UTC (rev 114942)
@@ -21,7 +21,7 @@
 
 setup (
     name='z3c.rml',
-    version='1.0.0dev',
+    version='0.9.1',
     author = "Stephan Richter and the Zope Community",
     author_email = "zope-dev at zope.org",
     description = "An alternative implementation of RML",

Modified: z3c.rml/trunk/src/z3c/rml/rml.dtd
===================================================================
--- z3c.rml/trunk/src/z3c/rml/rml.dtd	2010-07-22 19:06:32 UTC (rev 114941)
+++ z3c.rml/trunk/src/z3c/rml/rml.dtd	2010-07-22 19:22:10 UTC (rev 114942)
@@ -62,6 +62,10 @@
 <!ATTLIST paraStyle backColor CDATA #IMPLIED>
 <!ATTLIST paraStyle keepWithNext CDATA #IMPLIED>
 <!ATTLIST paraStyle wordWrap CDATA #IMPLIED>
+<!ATTLIST paraStyle borderWidth CDATA #IMPLIED>
+<!ATTLIST paraStyle borderStyle CDATA #IMPLIED>
+<!ATTLIST paraStyle borderPadding CDATA #IMPLIED>
+<!ATTLIST paraStyle borderRadius CDATA #IMPLIED>
 <!ATTLIST paraStyle name CDATA #REQUIRED>
 <!ATTLIST paraStyle alias CDATA #IMPLIED>
 <!ATTLIST paraStyle parent CDATA #IMPLIED>
@@ -347,6 +351,10 @@
 <!ATTLIST para backColor CDATA #IMPLIED>
 <!ATTLIST para keepWithNext CDATA #IMPLIED>
 <!ATTLIST para wordWrap CDATA #IMPLIED>
+<!ATTLIST para borderWidth CDATA #IMPLIED>
+<!ATTLIST para borderStyle CDATA #IMPLIED>
+<!ATTLIST para borderPadding CDATA #IMPLIED>
+<!ATTLIST para borderRadius CDATA #IMPLIED>
 <!ATTLIST para style CDATA #REQUIRED>
 <!ATTLIST para bulletText CDATA #IMPLIED>
 <!ATTLIST para dedent CDATA #IMPLIED>

Modified: z3c.rml/trunk/src/z3c/rml/stylesheet.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/stylesheet.py	2010-07-22 19:06:32 UTC (rev 114941)
+++ z3c.rml/trunk/src/z3c/rml/stylesheet.py	2010-07-22 19:22:10 UTC (rev 114942)
@@ -141,7 +141,12 @@
         max_length=4,
         required=False)
 
+    borderRadius = attr.Measurement(
+        title=u'Paragraph Border Radius',
+        description=u'The radius of the paragraph border.',
+        required=False)
 
+
 class IParagraphStyle(IBaseParagraphStyle):
     """Defines a paragraph style and gives it a name."""
 

Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-para.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-para.pdf	2010-07-22 19:06:32 UTC (rev 114941)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-para.pdf	2010-07-22 19:22:10 UTC (rev 114942)
@@ -374,7 +374,7 @@
 % 'R12': class PDFInfo 
 12 0 obj
 << /Author (\(anonymous\))
- /CreationDate (D:20100721214022+05'00')
+ /CreationDate (D:20100722151756+05'00')
  /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (\(unspecified\))
@@ -392,9 +392,9 @@
 % page stream
 << /Filter [ /ASCII85Decode
  /FlateDecode ]
- /Length 414 >>
+ /Length 652 >>
 stream
-Gat=gbAP0N&4Q=ar53>#V6-1sr5bX"/1MBW_1G;YJYY#OQ2n=EgAZL at 6bl*mPZ5)sY\3C7UKf$sHD1/K<<,erJf+V&&5,:N1D"VP(?<f?fm#!u2],I[JVHA/1eMns.FA$<QII+DOd^&_!Z3hiTinAuDip:tn.rr(LcY]aD7>3CM,.9m,)@-0.;-"V[6bl^CS6?WIS at +#N at ZoVhWr@\_%U>!'C0rh>P,gUq8J3>#4gV/*8hX$'iMT^G/9n`0T;DaQe4"?'?8Kb0QMiOF%C*]m>5:3!7aR%(aY^lQ'EiRYBmL12:g#=alQ8t=^B4F&K8g#g0p.?C\_73Jp[p;mH2IX(im4(phK at c&&s?RXm6]=?ngW=;Qn6ma'jHYD$@STYJ7/mr;Y?:\%Fk'\Q"WmE5Qqm$b.eWJH~>endstream
+Gat=hgMYb"%#43Qj;iJ$+R<(K3r)Sd]bmtk(Ic^\IK:a\'5r_u\LP2(rCBN*SA<%4_2`#/,em\1,mH)1bWXR)J.Df7mhmeh70Q at S&rHqh=NkDBgs(F4Nj)K%!@!O<bEEouSHHm<@nKG#GGuW;.0gVedb%j]"r:!\@t;7HiYrS5%e?I2#:Q0467+I=</O3p.=+sckR8pIb%2Wj*+^;!7(@JsK,NXYPHuZP]/)VHqUGJ)P#3)j9pRL8rbQ[j]!5t1_34.oQunV:L+ke'VXc/imU>\=,X[f`Lm%*+<8TaNQ*>0f^$5/t4- at JedsCW8RB#ZJg0.EQU.a0lE4B30=nC,!/m!8D2S3>DR at mD7/3TEs72ohEJ$&)R*,p2,K'QmL]C.D.n?l&r37mg>BduhPUj7a!TB7p>Y at OrC:(8V](,;JO&gC3k:S#0D4/$KI<[%p(4H7cW%R2 at DPBX6"ie)S6$go1+A8h\14%7R^L at C"/X<_@#.&LNj.P!f.rl*p2ZW$"XkdAA:>kKU&W!0=D:]>KaKf8S"d'.7Hg&ei7d5^?qXIG2VH<P[i$[[!J;3.h:2fN*/@VbfSY-gMrQ!)jSYVa]jf=#Q9BId_Bn9\hPlc5(/W'.%ZTBH73QunKM0Dh%!DT7\pR*U3`rL at BV~>endstream
 endobj
 % 'R15': class PDFOutlines 
 15 0 obj
@@ -418,15 +418,15 @@
 0000022218 00000 n
 0000022453 00000 n
 0000022560 00000 n
-0000023118 00000 n
+0000023356 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\177q%A\212@\210x\371\224\330j\033\023\3735) (\177q%A\212@\210x\371\224\330j\033\023\3735)] 
+ [(aJ\241\033\177\256\301\355\245\337!\030\030G\335f) (aJ\241\033\177\256\301\355\245\337!\030\030G\335f)] 
 
  /Info 12 0 R
  /Root 11 0 R
  /Size 16 >>
 startxref
-23170
+23408
 %%EOF

Modified: z3c.rml/trunk/src/z3c/rml/tests/input/tag-para.rml
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/input/tag-para.rml	2010-07-22 19:06:32 UTC (rev 114941)
+++ z3c.rml/trunk/src/z3c/rml/tests/input/tag-para.rml	2010-07-22 19:22:10 UTC (rev 114942)
@@ -24,6 +24,13 @@
     <para doc:example="">Paragraph</para>
     <pre doc:example="">Preformatted <b>text</b> only.</pre>
     <xpre doc:example="">Preformatted with <i>markup</i>.</xpre>
+    <para borderColor="red" borderWidth="2" borderPadding="5 10 30"
+          borderRadius="5" backColor="yellow"
+	  spaceBefore="5" spaceAfter="35" leftIndent="10" rightIndent="10">
+        Paragraph with a border and a padding. <br/><br/>
+        <b>Note:</b> The padding only affects the position of the border, not 
+        the paragraph text.
+    </para>
     <para>Page number: <pageNumber/> </para>
   </story>
 </document>

