[Checkins] SVN: z3c.rml/trunk/src/z3c/rml/ * Normalize indentation for example code.

[Stephan Richter]

Log message for revision 74152:
  * Normalize indentation for example code.
  
  * Make the source of the example less prominent.
  
  * Add a few more examples.
  
  

Changed:
  U   z3c.rml/trunk/src/z3c/rml/canvas.py
  U   z3c.rml/trunk/src/z3c/rml/rml-reference.pt
  U   z3c.rml/trunk/src/z3c/rml/rml-reference.py
  U   z3c.rml/trunk/src/z3c/rml/tests/input/tag-path.rml
  U   z3c.rml/trunk/src/z3c/rml/tests/input/tag-textAnnotation.rml

-=-
Modified: z3c.rml/trunk/src/z3c/rml/canvas.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/canvas.py	2007-04-15 14:07:29 UTC (rev 74151)
+++ z3c.rml/trunk/src/z3c/rml/canvas.py	2007-04-15 15:05:50 UTC (rev 74152)
@@ -464,8 +464,8 @@
 class IPath(IShape):
     """Create a line path."""
     occurence.containing(
-        occurence.ZeroOrMore('moveTo', IMoveTo),
-        occurence.ZeroOrMore('curvesTo', ICurvesTo),
+        occurence.ZeroOrMore('moveto', IMoveTo),
+        occurence.ZeroOrMore('curvesto', ICurvesTo),
         )
 
     points = attr.TextNodeGrid(

Modified: z3c.rml/trunk/src/z3c/rml/rml-reference.pt
===================================================================
--- z3c.rml/trunk/src/z3c/rml/rml-reference.pt	2007-04-15 14:07:29 UTC (rev 74151)
+++ z3c.rml/trunk/src/z3c/rml/rml-reference.pt	2007-04-15 15:05:50 UTC (rev 74152)
@@ -77,7 +77,7 @@
         name="code"
         fontName="Courier"
         fontSize="10"
-        leftIndent="0.8cm"
+        leftIndent="0.5cm"
         />
   </stylesheet>
 
@@ -225,13 +225,14 @@
           <i>Examples</i>
         </para>
         <tal:block repeat="example directive/examples">
-          <para style="example-info">
-            File <i tal:content="example/filename" />,
-            line <tal:block replace="example/line" />:
-          </para>
           <xpre style="code" tal:content="structure example/code">
             Example Code
           </xpre>
+          <para style="example-info">
+            (Extracted from
+             file <i tal:content="example/filename" />,
+             line <tal:block replace="example/line" />)
+          </para>
         </tal:block>
       </tal:block>
 

Modified: z3c.rml/trunk/src/z3c/rml/rml-reference.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/rml-reference.py	2007-04-15 14:07:29 UTC (rev 74151)
+++ z3c.rml/trunk/src/z3c/rml/rml-reference.py	2007-04-15 15:05:50 UTC (rev 74152)
@@ -16,6 +16,7 @@
 $Id$
 """
 __docformat__ = "reStructuredText"
+import re
 import os
 import zope.schema
 import zope.schema.interfaces
@@ -42,6 +43,14 @@
     }
 
 
+def dedent(rml):
+    spaces = re.findall('\n( *)<', rml)
+    if not spaces:
+        return rml
+    least = min([len(s) for s in spaces if s != ''])
+    return rml.replace('\n'+' '*least, '\n')
+
+
 def highlightRML(rml):
     if SilverCity is None:
         return rml
@@ -144,7 +153,7 @@
         for elem in elements:
             demoTag = elem.get(EXAMPLE_ATTR_NAME) or elem.tag
             del elem.attrib[EXAMPLE_ATTR_NAME]
-            xml = highlightRML(etree.tounicode(elem).strip())
+            xml = highlightRML(dedent(etree.tounicode(elem).strip()))
             elemExamples = examples.setdefault(demoTag, [])
             elemExamples.append(
                 {'filename': filename, 'line': elem.sourceline, 'code': xml})

Modified: z3c.rml/trunk/src/z3c/rml/tests/input/tag-path.rml
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/input/tag-path.rml	2007-04-15 14:07:29 UTC (rev 74151)
+++ z3c.rml/trunk/src/z3c/rml/tests/input/tag-path.rml	2007-04-15 15:05:50 UTC (rev 74152)
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE document SYSTEM "rml.dtd">
 
-<document filename="tag-path.pdf">
+<document
+    filename="tag-path.pdf"
+    xmlns:doc="http://namespaces.zope.org/rml/doc">
   <pageDrawing>
 
     <path x="2cm" y="26cm" close="true">
@@ -32,5 +34,17 @@
       3cm 20.5cm
     </path>
 
+    <path x="2cm" y="15cm" fill="true"
+          doc:example="">
+      8cm 15cm
+      <curvesto>
+        10cm 15cm 10cm 12cm 8cm 12cm
+      </curvesto>
+      2cm 12cm
+      <moveto>
+        2cm 15cm
+      </moveto>
+    </path>
+
   </pageDrawing>
 </document>

Modified: z3c.rml/trunk/src/z3c/rml/tests/input/tag-textAnnotation.rml
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/input/tag-textAnnotation.rml	2007-04-15 14:07:29 UTC (rev 74151)
+++ z3c.rml/trunk/src/z3c/rml/tests/input/tag-textAnnotation.rml	2007-04-15 15:05:50 UTC (rev 74152)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE document SYSTEM "rml.dtd">
 
-<document filename="tag-textAnnotation.pdf">
+<document
+    filename="tag-textAnnotation.pdf"
+    xmlns:doc="http://namespaces.zope.org/rml/doc">
   <pageDrawing>
-    <textAnnotation>
+    <textAnnotation doc:example="">
       <param name="Rect">0,0,1,1</param>
       <param name="F">3</param>
       <param name="escape">6</param>