[Docutils-checkins] r6325 - in trunk/docutils: docs/user/odt.txt docutils/writers/odf_odt/__init__.py docutils/writers/odf_odt/styles.odt

[<dku...@us...>]

Author: dkuhlman
Date: 2010-05-14 23:40:15 +0200 (Fri, 14 May 2010)
New Revision: 6325

Modified:
   trunk/docutils/docs/user/odt.txt
   trunk/docutils/docutils/writers/odf_odt/__init__.py
   trunk/docutils/docutils/writers/odf_odt/styles.odt
Log:
Added styles rststyle-image and rststyle-figureframe for images and figures

Modified: trunk/docutils/docs/user/odt.txt
===================================================================
--- trunk/docutils/docs/user/odt.txt	2010-05-07 21:25:18 UTC (rev 6324)
+++ trunk/docutils/docs/user/odt.txt	2010-05-14 21:40:15 UTC (rev 6325)
@@ -565,8 +565,19 @@
     The style for the document sub-title.
 
 
+Image and figure styles
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
+rststyle-image
+    The style applied to an image, either an image by itself or an
+    image in a figure.
 
+rststyle-figureframe
+    The style applied to a figure (actually to the frame that
+    surrounds a figure).
+
+
+
 Defining and using a custom stylesheet
 ---------------------------------------
 

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2010-05-07 21:25:18 UTC (rev 6324)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2010-05-14 21:40:15 UTC (rev 6325)
@@ -746,6 +746,7 @@
         'lineblock4',
         'lineblock5',
         'lineblock6',
+        'image', 'figureframe',
         )
 
     def __init__(self, document):
@@ -1914,32 +1915,7 @@
         if isinstance(node.parent, docutils.nodes.figure):
             el3, el4, el5, caption = self.generate_figure(node, source,
                 destination, el2)
-            attrib = {
-                'draw:blue': '0%',
-                'draw:color-inversion': 'false',
-                'draw:color-mode': 'standard',
-                'draw:contrast': '0%',
-                'draw:gamma': '100%',
-                'draw:green': '0%',
-                'draw:image-opacity': '100%',
-                'draw:luminance': '0%',
-                'draw:red': '0%',
-                'fo:border': 'none',
-                'fo:clip': 'rect(0in 0in 0in 0in)',
-                'fo:margin-bottom': '0in',
-                'fo:margin-left': '0in',
-                'fo:margin-right': '0in',
-                'fo:margin-top': '0in',
-                'fo:padding': '0in',
-                'style:horizontal-pos': 'from-left',
-                'style:horizontal-rel': 'paragraph-content',
-                'style:mirror': 'none',
-                'style:run-through': 'foreground',
-                'style:shadow': 'none',
-                'style:vertical-pos': 'from-top',
-                'style:vertical-rel': 'paragraph-content',
-                'style:wrap': 'none',
-                 }
+            attrib = {}
             el6, width = self.generate_image(node, source, destination,
                 el5, attrib)
             if caption is not None:
@@ -2060,7 +2036,7 @@
         attrib = {
             'style:name': style_name,
             'style:family': 'graphic',
-            'style:parent-style-name': 'Frame',
+            'style:parent-style-name': self.rststyle('figureframe'),
             }
         el1 = SubElement(self.automatic_styles, 
             'style:style', attrib=attrib, nsdict=SNSD)
@@ -2073,20 +2049,7 @@
                     halign = val
                 elif val in ('top', 'middle', 'bottom'):
                     valign = val
-        attrib = {
-            'fo:margin-left': '0cm',
-            'fo:margin-right': '0cm',
-            'fo:margin-top': '0cm',
-            'fo:margin-bottom': '0cm',
-#           'style:wrap': 'dynamic', #vds
-            'style:number-wrapped-paragraphs': 'no-limit',
-            'style:vertical-pos': valign,
-            'style:vertical-rel': 'paragraph',
-            'style:horizontal-pos': halign,
-            'style:horizontal-rel': 'paragraph',
-            'fo:padding': '0cm',
-            'fo:border': 'none',
-            }
+        attrib = {}
         wrap = False
         classes = node.parent.attributes.get('classes')
         if classes and 'wrap' in classes:
@@ -2101,7 +2064,7 @@
             'draw:style-name': style_name,
             'draw:name': 'Frame1',
             'text:anchor-type': 'paragraph',
-            'draw:z-index': '1',
+            'draw:z-index': '0',
             }
         attrib['svg:width'] = width
         # dbg
@@ -2124,7 +2087,7 @@
         attrib = {
             'style:name': style_name,
             'style:family': 'graphic',
-            'style:parent-style-name': 'Graphics',
+            'style:parent-style-name': self.rststyle('image'),
             }
         el1 = SubElement(self.automatic_styles, 
             'style:style', attrib=attrib, nsdict=SNSD)

Modified: trunk/docutils/docutils/writers/odf_odt/styles.odt
===================================================================
(Binary files differ)