[Checkins] SVN: z3c.rml/trunk/ Update the barCodeFlowable to match the PDF2RML as much as I like.

[Stephen Richter]

Log message for revision 128802:
  Update the barCodeFlowable to match the PDF2RML as much as I like.
  

Changed:
  U   z3c.rml/trunk/RML-DIFFERENCES.txt
  U   z3c.rml/trunk/src/z3c/rml/form.py

-=-
Modified: z3c.rml/trunk/RML-DIFFERENCES.txt
===================================================================
--- z3c.rml/trunk/RML-DIFFERENCES.txt	2012-12-20 06:23:50 UTC (rev 128801)
+++ z3c.rml/trunk/RML-DIFFERENCES.txt	2012-12-20 13:57:51 UTC (rev 128802)
@@ -5,6 +5,23 @@
 This document outlines the differences between ReportLab Inc.'s RML2PDF
 library and z3c.rml.
 
+Incompatibilies
+---------------
+
+- ``<barCodeFlowable>``
+
+  * `widthSize`: This is called `width` in this implementation to match the
+    API.
+
+  * `heightSize`: This is called `height` in this implementation to match the
+    API.
+
+  * `tracking`: This is only used for USPS4S and the API actually uses the
+    `value` argument for this. Thus this attribute is omitted.
+
+To be Done
+----------
+
 Each major bullet represents a missing element. Names after the elements are
 missing attributes. A "-" (minus) sign in front of an element or attribute
 denotes a feature not in RML2PDF. The "->" arrow designates a difference in
@@ -30,8 +47,6 @@
 
 - widget
 
-- a
-
 - evalString
 
 - -keepTogether
@@ -44,9 +59,6 @@
 
 - plugInGraphic (Test 037)
 
-- barCodeFlowable: tracking, routing, width -> widthSize, height -> heightSize,
-  -strokeWidth, -fillColor
-
 - figure
 
 - imageFigure

Modified: z3c.rml/trunk/src/z3c/rml/form.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/form.py	2012-12-20 06:23:50 UTC (rev 128801)
+++ z3c.rml/trunk/src/z3c/rml/form.py	2012-12-20 13:57:51 UTC (rev 128802)
@@ -54,21 +54,6 @@
         description=u'The height of the barcode.',
         required=False)
 
-    strokeColor = attr.Color(
-        title=u'Stroke Color',
-        description=(u'The color of the line strokes in the area.'),
-        required=False)
-
-    strokeWidth = attr.Measurement(
-        title=u'Stroke Width',
-        description=u'The width of the line strokes in the area.',
-        required=False)
-
-    fillColor = attr.Color(
-        title=u'Fill Color',
-        description=(u'The color of the filled shapes in the area.'),
-        required=False)
-
     barStrokeColor = attr.Color(
         title=u'Bar Stroke Color',
         description=(u'The color of the line strokes in the barcode.'),
@@ -196,7 +181,13 @@
         description=(u'The color of human readable text.'),
         required=False)
 
+    # USPS4S
+    routing = attr.String(
+        title=u'Routing',
+        description=u'The routing information string.',
+        required=False)
 
+
 class IBarCode(IBarCodeBase):
     """A barcode graphic."""