diff --git a/data/odt/META-INF/manifest.xml b/data/odt/META-INF/manifest.xml index 2796993a5..e281fe9b7 100644 --- a/data/odt/META-INF/manifest.xml +++ b/data/odt/META-INF/manifest.xml @@ -1,6 +1,6 @@ - - + + @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/data/odt/content.xml b/data/odt/content.xml index 3bf335bb6..89605edc7 100644 --- a/data/odt/content.xml +++ b/data/odt/content.xml @@ -1,2 +1,2 @@ -Hello World! \ No newline at end of file +Hello World! diff --git a/data/odt/meta.xml b/data/odt/meta.xml index 7fdd4d98c..d378de0aa 100644 --- a/data/odt/meta.xml +++ b/data/odt/meta.xml @@ -6,7 +6,7 @@ xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:grddl="http://www.w3.org/2003/g/data-view#" - office:version="1.2"> + office:version="1.3"> -002174710874truefalseview23041304100217451087300false100falsetruefalsefalse1473719falsetruefalsefalsetruefalsefalsefalsefalsefalsefalsefalsefalsetruefalse0falsefalsefalsefalsefalsefalsefalsefalsefalsefalsetruetruefalsefalsetruetruetruefalsehigh-resolution147371910falsefalsefalsetruefalsefalsetruefalsetruetruefalsefalsefalsefalsetruetruefalsetruetruetruefalsefalsefalse0falsefalsetruetrue \ No newline at end of file +002174710874truefalseview23041304100217451087300false100falsetruefalsefalse1473719falsetruefalsefalsetruefalsefalsefalsefalsefalsefalsefalsefalsetruefalse0falsefalsefalsefalsefalsefalsefalsefalsefalsefalsetruetruefalsefalsetruetruetruefalsehigh-resolution147371910falsefalsefalsetruefalsefalsetruefalsetruetruefalsefalsefalsefalsetruetruefalsetruetruetruefalsefalsefalse0falsefalsetruetrue diff --git a/data/odt/styles.xml b/data/odt/styles.xml index 54459de04..ce98b73a1 100644 --- a/data/odt/styles.xml +++ b/data/odt/styles.xml @@ -27,7 +27,7 @@ xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" -xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2"> +xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.3"> diff --git a/data/templates/default.opendocument b/data/templates/default.opendocument index 2eff86d7b..fceab3501 100644 --- a/data/templates/default.opendocument +++ b/data/templates/default.opendocument @@ -1,5 +1,5 @@ - + diff --git a/src/Text/Pandoc/Writers/ODT.hs b/src/Text/Pandoc/Writers/ODT.hs index 2061c04b4..4d11ee331 100644 --- a/src/Text/Pandoc/Writers/ODT.hs +++ b/src/Text/Pandoc/Writers/ODT.hs @@ -113,7 +113,7 @@ pandocToODT opts doc@(Pandoc meta _) = do Just m -> selfClosingTag "manifest:file-entry" [("manifest:media-type", m) ,("manifest:full-path", T.pack fp) - ,("manifest:version", "1.2") + ,("manifest:version", "1.3") ] let files = [ ent | ent <- filesInArchive archive, not ("META-INF" `isPrefixOf` ent) ] @@ -125,7 +125,7 @@ pandocToODT opts doc@(Pandoc meta _) = do $$ inTags True "manifest:manifest" [("xmlns:manifest","urn:oasis:names:tc:opendocument:xmlns:manifest:1.0") - ,("manifest:version","1.2")] ( selfClosingTag "manifest:file-entry" + ,("manifest:version","1.3")] ( selfClosingTag "manifest:file-entry" [("manifest:media-type","application/vnd.oasis.opendocument.text") ,("manifest:full-path","/")] $$ vcat ( map toFileEntry files ) @@ -157,7 +157,7 @@ pandocToODT opts doc@(Pandoc meta _) = do ,("xmlns:meta","urn:oasis:names:tc:opendocument:xmlns:meta:1.0") ,("xmlns:ooo","http://openoffice.org/2004/office") ,("xmlns:grddl","http://www.w3.org/2003/g/data-view#") - ,("office:version","1.2")] ( inTags True "office:meta" [] + ,("office:version","1.3")] ( inTags True "office:meta" [] ( metaTag "meta:generator" ("Pandoc/" <> pandocVersionText) $$ metaTag "dc:title" (stringify title) @@ -297,7 +297,7 @@ documentSettings isTextMode = fromStringLazy $ render Nothing ,("xmlns:xlink","http://www.w3.org/1999/xlink") ,("xmlns:config","urn:oasis:names:tc:opendocument:xmlns:config:1.0") ,("xmlns:ooo","http://openoffice.org/2004/office") - ,("office:version","1.2")] ( + ,("office:version","1.3")] ( inTagsSimple "office:settings" $ inTags False "config:config-item-set" [("config:name", "ooo:configuration-settings")] $ diff --git a/test/command/6792.md b/test/command/6792.md index 253009d46..d0d284f5d 100644 --- a/test/command/6792.md +++ b/test/command/6792.md @@ -17,7 +17,7 @@ [])] ^D - + diff --git a/test/writer.opendocument b/test/writer.opendocument index 3095cef41..f10f3be2a 100644 --- a/test/writer.opendocument +++ b/test/writer.opendocument @@ -1,5 +1,5 @@ - +