[Docutils-checkins] r6939 - in trunk/docutils: docutils/writers/odf_odt/__init__.py docutils/writers/odf_odt/styles.odt test/functional/expected/odt_basic.odt test/functional/expected/odt_custom_headfoot.odt test/functional/expected/odt_tables1.odt test/test_writers/test_odt.py

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

Author: dkuhlman
Date: 2011-02-23 20:48:20 +0100 (Wed, 23 Feb 2011)
New Revision: 6939

Modified:
   trunk/docutils/docutils/writers/odf_odt/__init__.py
   trunk/docutils/docutils/writers/odf_odt/styles.odt
   trunk/docutils/test/functional/expected/odt_basic.odt
   trunk/docutils/test/functional/expected/odt_custom_headfoot.odt
   trunk/docutils/test/functional/expected/odt_tables1.odt
   trunk/docutils/test/test_writers/test_odt.py
Log:
Fixes in response to validation tests

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2011-02-23 04:05:22 UTC (rev 6938)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2011-02-23 19:48:20 UTC (rev 6939)
@@ -188,7 +188,7 @@
 #   does not support use of nsmap parameter on Element() and SubElement().
 
 CONTENT_NAMESPACE_ATTRIB = {
-    'office:version': '1.0',
+    #'office:version': '1.0',
     'xmlns:chart': 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0',
     'xmlns:dc': 'http://purl.org/dc/elements/1.1/',
     'xmlns:dom': 'http://www.w3.org/2001/xml-events',
@@ -216,7 +216,7 @@
     }
 
 STYLES_NAMESPACE_ATTRIB = {
-    'office:version': '1.0',
+    #'office:version': '1.0',
     'xmlns:chart': 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0',
     'xmlns:dc': 'http://purl.org/dc/elements/1.1/',
     'xmlns:dom': 'http://www.w3.org/2001/xml-events',
@@ -245,7 +245,7 @@
 }
 
 META_NAMESPACE_ATTRIB = {
-    'office:version': '1.0',
+    #'office:version': '1.0',
     'xmlns:dc': 'http://purl.org/dc/elements/1.1/',
     'xmlns:meta': 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0',
     'xmlns:office': NAME_SPACE_1,
@@ -552,9 +552,10 @@
         writers.Writer.assemble_parts(self)
         f = tempfile.NamedTemporaryFile()
         zfile = zipfile.ZipFile(f, 'w', zipfile.ZIP_DEFLATED)
+        self.write_zip_str(zfile, 'mimetype', self.MIME_TYPE,
+            compress_type=zipfile.ZIP_STORED)
         content = self.visitor.content_astext()
         self.write_zip_str(zfile, 'content.xml', content)
-        self.write_zip_str(zfile, 'mimetype', self.MIME_TYPE)
         s1 = self.create_manifest()
         self.write_zip_str(zfile, 'META-INF/manifest.xml', s1)
         s1 = self.create_meta()
@@ -571,12 +572,12 @@
         self.parts['encoding'] = self.document.settings.output_encoding
         self.parts['version'] = docutils.__version__
 
-    def write_zip_str(self, zfile, name, bytes):
+    def write_zip_str(self, zfile, name, bytes, compress_type=zipfile.ZIP_DEFLATED):
         localtime = time.localtime(time.time())
         zinfo = zipfile.ZipInfo(name, localtime)
         # Add some standard UNIX file access permissions (-rw-r--r--).
         zinfo.external_attr = (0x81a4 & 0xFFFF) << 16L
-        zinfo.compress_type = zipfile.ZIP_DEFLATED
+        zinfo.compress_type = compress_type
         zfile.writestr(zinfo, bytes)
 
     def store_embedded_files(self, zfile):
@@ -654,6 +655,10 @@
             }, nsdict=MANNSD)
         SubElement(root, 'manifest:file-entry', attrib={
             'manifest:media-type': 'text/xml',
+            'manifest:full-path': 'settings.xml',
+            }, nsdict=MANNSD)
+        SubElement(root, 'manifest:file-entry', attrib={
+            'manifest:media-type': 'text/xml',
             'manifest:full-path': 'meta.xml',
             }, nsdict=MANNSD)
         s1 = ToString(doc)

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

Modified: trunk/docutils/test/functional/expected/odt_basic.odt
===================================================================
(Binary files differ)

Modified: trunk/docutils/test/functional/expected/odt_custom_headfoot.odt
===================================================================
(Binary files differ)

Modified: trunk/docutils/test/functional/expected/odt_tables1.odt
===================================================================
(Binary files differ)

Modified: trunk/docutils/test/test_writers/test_odt.py
===================================================================
--- trunk/docutils/test/test_writers/test_odt.py	2011-02-23 04:05:22 UTC (rev 6938)
+++ trunk/docutils/test/test_writers/test_odt.py	2011-02-23 19:48:20 UTC (rev 6939)
@@ -164,7 +164,7 @@
             }
         self.process_test('odt_custom_headfoot.txt', 'odt_custom_headfoot.odt',
             settings_overrides=settings_overrides,
-            #save_output_name='odt_tables1.odt'
+            #save_output_name='odt_custom_headfoot.odt'
             )
 
     #