[Checkins] SVN: z3c.rml/trunk/src/z3c/rml/ Some improvements.

Stephan Richter srichter at cosmos.phy.tufts.edu
Fri Mar 16 04:41:44 EDT 2007


Log message for revision 73214:
  Some improvements.
  

Changed:
  U   z3c.rml/trunk/src/z3c/rml/special.py
  U   z3c.rml/trunk/src/z3c/rml/stylesheet.py
  U   z3c.rml/trunk/src/z3c/rml/template.py

-=-
Modified: z3c.rml/trunk/src/z3c/rml/special.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/special.py	2007-03-16 08:14:11 UTC (rev 73213)
+++ z3c.rml/trunk/src/z3c/rml/special.py	2007-03-16 08:41:43 UTC (rev 73214)
@@ -51,8 +51,8 @@
 
 class Alias(element.FunctionElement):
     args = (
-        attr.Style('id'),
-        attr.Text('value'), )
+        attr.Text('id'),
+        attr.Style('value'), )
 
     def process(self):
         id, value = self.getPositionalArguments()
@@ -60,4 +60,5 @@
         while (not interfaces.IStylesManager.providedBy(elem) and
                elem is not None):
             elem = elem.parent
-        elem.styles[value] = id
+        styles = elem.styles.setdefault('para', {})
+        styles[id] = value

Modified: z3c.rml/trunk/src/z3c/rml/stylesheet.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/stylesheet.py	2007-03-16 08:14:11 UTC (rev 73213)
+++ z3c.rml/trunk/src/z3c/rml/stylesheet.py	2007-03-16 08:41:43 UTC (rev 73214)
@@ -230,4 +230,4 @@
         'blockTableStyle': BlockTableStyle,
         # TODO: 'boxStyle': BoxStyle,
         }
-    order = ('paraStyle', 'blockTableStyle', 'initialize')
+    order = ('initialize', 'paraStyle', 'blockTableStyle')

Modified: z3c.rml/trunk/src/z3c/rml/template.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/template.py	2007-03-16 08:14:11 UTC (rev 73213)
+++ z3c.rml/trunk/src/z3c/rml/template.py	2007-03-16 08:41:43 UTC (rev 73214)
@@ -35,8 +35,10 @@
 
 class Frame(element.FunctionElement):
     args = (
-        attr.Measurement('x1'), attr.Measurement('y1'),
-        attr.Measurement('width'), attr.Measurement('height'),
+        attr.Measurement('x1'),
+        attr.Measurement('y1'),
+        attr.Measurement('width'),
+        attr.Measurement('height'),
         )
     kw = (
         ('id', attr.Text('id')),



More information about the Checkins mailing list