b80de32 · typeable/pandoc

data/odt-styles/META-INF/manifest.xml → data/odt/META-INF/manifest.xmlrenamed

compare with master

unifiedsplit

The content is the same.

data/odt-styles/Thumbnails/thumbnail.png → data/odt/Thumbnails/thumbnail.pngrenamed

Binary file not shown.

data/odt-styles/meta.xml → data/odt/meta.xmlrenamed

The content is the same.

data/odt-styles/mimetype → data/odt/mimetyperenamed

The content is the same.

data/odt-styles/settings.xml → data/odt/settings.xmlrenamed

The content is the same.

data/odt-styles/styles.xml → data/odt/styles.xmlrenamed

The content is the same.

pandoc.cabal+6−6

@@ -43,12 +43,12 @@ Data-Files:

43 templates/rst.template, templates/s5.template,

44 templates/mediawiki.template, templates/rtf.template,

45 -- data for ODT writer

46− data/odt-styles/meta.xml,

46+ data/odt/meta.xml,

47− data/odt-styles/settings.xml,

47+ data/odt/settings.xml,

48− data/odt-styles/META-INF/manifest.xml,

48+ data/odt/META-INF/manifest.xml,

49− data/odt-styles/Thumbnails/thumbnail.png,

49+ data/odt/Thumbnails/thumbnail.png,

50− data/odt-styles/styles.xml,

50+ data/odt/styles.xml,

51− data/odt-styles/mimetype,

51+ data/odt/mimetype,

52 -- data for LaTeXMathML writer

53 data/LaTeXMathML.js.comment,

54 data/LaTeXMathML.js.packed,

src/Text/Pandoc/ODT.hs+7−1

@@ -39,6 +39,7 @@ import Text.ParserCombinators.Parsec

39import System.Time

40import Text.Pandoc.Shared ( inDirectory )

41import Paths_pandoc ( getDataFileName )

42+import System.Directory

42

43

43-- | Produce an ODT file from OpenDocument XML.

44-- | Produce an ODT file from OpenDocument XML.

44saveOpenDocumentAsODT :: FilePath -- ^ Pathname of ODT file to be produced.

45saveOpenDocumentAsODT :: FilePath -- ^ Pathname of ODT file to be produced.

@@ -46,7 +47,12 @@ saveOpenDocumentAsODT :: FilePath -- ^ Pathname of ODT file to be produced.

46 -> String -- ^ OpenDocument XML contents.

47 -> String -- ^ OpenDocument XML contents.

47 -> IO ()

48 -> IO ()

48saveOpenDocumentAsODT destinationODTPath sourceDirRelative xml = do

49saveOpenDocumentAsODT destinationODTPath sourceDirRelative xml = do

50+ userDir <- getAppUserDataDirectory "pandoc"

51+ userOdtExists <- doesFileExist $

52+ userDir </> "data" </> "odt" </> "styles.xml"

53+ refArchivePath <- if userOdtExists

54+ then return $ userDir </> "data" </> "odt"

49− refArchivePath <- getDataFileName $ "data" </> "odt-styles"

55+ else getDataFileName $ "data" </> "odt"

50 refArchive <- inDirectory refArchivePath $

56 refArchive <- inDirectory refArchivePath $

51 addFilesToArchive [OptRecursive] emptyArchive ["."]

57 addFilesToArchive [OptRecursive] emptyArchive ["."]

52 -- handle pictures

58 -- handle pictures