diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | Text/Pandoc/ODT.hs | 2 | ||||
| -rw-r--r-- | data/odt-styles/META-INF/manifest.xml (renamed from odt-styles/META-INF/manifest.xml) | 0 | ||||
| -rw-r--r-- | data/odt-styles/Thumbnails/thumbnail.png (renamed from odt-styles/Thumbnails/thumbnail.png) | bin | 1943 -> 1943 bytes | |||
| -rw-r--r-- | data/odt-styles/meta.xml (renamed from odt-styles/meta.xml) | 0 | ||||
| -rw-r--r-- | data/odt-styles/mimetype (renamed from odt-styles/mimetype) | 0 | ||||
| -rw-r--r-- | data/odt-styles/settings.xml (renamed from odt-styles/settings.xml) | 0 | ||||
| -rw-r--r-- | data/odt-styles/styles.xml (renamed from odt-styles/styles.xml) | 0 |
8 files changed, 1 insertions, 2 deletions
@@ -11,7 +11,6 @@ BUILDDIR := dist BUILDCONF := $(BUILDDIR)/setup-config BUILDVARS := vars CONFIGURE := configure -ODTSTYLES := odt-styles #------------------------------------------------------------------------------- # Cabal constants diff --git a/Text/Pandoc/ODT.hs b/Text/Pandoc/ODT.hs index 10cf1b7e2..f9e4dd8f1 100644 --- a/Text/Pandoc/ODT.hs +++ b/Text/Pandoc/ODT.hs @@ -46,7 +46,7 @@ saveOpenDocumentAsODT :: FilePath -- ^ Pathname of ODT file to be produced. -> String -- ^ OpenDocument XML contents. -> IO () saveOpenDocumentAsODT destinationODTPath sourceDirRelative xml = do - let refArchive = read $(makeZip "odt-styles") + let refArchive = read $(makeZip $ "data" </> "odt-styles") -- handle pictures let (newContents, pics) = case runParser pPictures [] "OpenDocument XML contents" xml of diff --git a/odt-styles/META-INF/manifest.xml b/data/odt-styles/META-INF/manifest.xml index 5ecd5d892..5ecd5d892 100644 --- a/odt-styles/META-INF/manifest.xml +++ b/data/odt-styles/META-INF/manifest.xml diff --git a/odt-styles/Thumbnails/thumbnail.png b/data/odt-styles/Thumbnails/thumbnail.png Binary files differindex 4e213b6b3..4e213b6b3 100644 --- a/odt-styles/Thumbnails/thumbnail.png +++ b/data/odt-styles/Thumbnails/thumbnail.png diff --git a/odt-styles/meta.xml b/data/odt-styles/meta.xml index 93363b77e..93363b77e 100644 --- a/odt-styles/meta.xml +++ b/data/odt-styles/meta.xml diff --git a/odt-styles/mimetype b/data/odt-styles/mimetype index 2e95b81c9..2e95b81c9 100644 --- a/odt-styles/mimetype +++ b/data/odt-styles/mimetype diff --git a/odt-styles/settings.xml b/data/odt-styles/settings.xml index bb6998b79..bb6998b79 100644 --- a/odt-styles/settings.xml +++ b/data/odt-styles/settings.xml diff --git a/odt-styles/styles.xml b/data/odt-styles/styles.xml index 79a9a6b0f..79a9a6b0f 100644 --- a/odt-styles/styles.xml +++ b/data/odt-styles/styles.xml |
