Let reference.docx/odt behave as if they are virtual data files.
Now they are constructed on the fly from their components, but we now allow them to be printed with `--print-default-data-file` and to override the defaults if placed in the user data directory. Shared now exports getDefaultReferenceDocx and getDefaultReferenceODT (API change). These functions have been removed from the Docx and ODT writers. Shared.readDataFile has been modified so that requests to read a reference.odt or reference.docx will use these functions to generate the files.
This commit is contained in:
John MacFarlane
parent
7bbb007359
commit
de184a80ec
3 changed files with 74 additions and 44 deletions
|
|
@ -76,6 +76,8 @@ module Text.Pandoc.Shared (
|
|||
renderTags',
|
||||
-- * File handling
|
||||
inDirectory,
|
||||
getDefaultReferenceDocx,
|
||||
getDefaultReferenceODT,
|
||||
readDataFile,
|
||||
readDataFileUTF8,
|
||||
fetchItem,
|
||||
|
|
@ -119,6 +121,7 @@ import Control.Monad (msum, unless, MonadPlus(..))
|
|||
import Text.Pandoc.Pretty (charWidth)
|
||||
import Text.Pandoc.Compat.Locale (defaultTimeLocale)
|
||||
import Data.Time
|
||||
import Data.Time.Clock.POSIX
|
||||
import System.IO (stderr)
|
||||
import System.IO.Temp
|
||||
import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..),
|
||||
|
|
@ -129,7 +132,8 @@ import Text.Pandoc.Compat.Monoid
|
|||
import Data.ByteString.Base64 (decodeLenient)
|
||||
import Data.Sequence (ViewR(..), ViewL(..), viewl, viewr)
|
||||
import qualified Data.Text as T (toUpper, pack, unpack)
|
||||
import Data.ByteString.Lazy (toChunks)
|
||||
import Data.ByteString.Lazy (toChunks, fromChunks)
|
||||
import qualified Data.ByteString.Lazy as BL
|
||||
|
||||
#ifdef EMBED_DATA_FILES
|
||||
import Text.Pandoc.Data (dataFiles)
|
||||
|
|
@ -145,6 +149,7 @@ import Network.HTTP.Client.TLS (tlsManagerSettings)
|
|||
import System.Environment (getEnv)
|
||||
import Network.HTTP.Types.Header ( hContentType)
|
||||
import Network (withSocketsDo)
|
||||
import Codec.Archive.Zip
|
||||
#else
|
||||
import Network.URI (parseURI)
|
||||
import Network.HTTP (findHeader, rspBody,
|
||||
|
|
@ -742,7 +747,73 @@ inDirectory path action = E.bracket
|
|||
setCurrentDirectory
|
||||
(const $ setCurrentDirectory path >> action)
|
||||
|
||||
getDefaultReferenceDocx :: Maybe FilePath -> IO Archive
|
||||
getDefaultReferenceDocx datadir = do
|
||||
let paths = ["[Content_Types].xml",
|
||||
"_rels/.rels",
|
||||
"docProps/app.xml",
|
||||
"docProps/core.xml",
|
||||
"word/document.xml",
|
||||
"word/fontTable.xml",
|
||||
"word/footnotes.xml",
|
||||
"word/numbering.xml",
|
||||
"word/settings.xml",
|
||||
"word/webSettings.xml",
|
||||
"word/styles.xml",
|
||||
"word/_rels/document.xml.rels",
|
||||
"word/_rels/footnotes.xml.rels",
|
||||
"word/theme/theme1.xml"]
|
||||
let toLazy = fromChunks . (:[])
|
||||
let pathToEntry path = do epochtime <- (floor . utcTimeToPOSIXSeconds) <$>
|
||||
getCurrentTime
|
||||
contents <- toLazy <$> readDataFile datadir
|
||||
("docx/" ++ path)
|
||||
return $ toEntry path epochtime contents
|
||||
mbArchive <- case datadir of
|
||||
Nothing -> return Nothing
|
||||
Just d -> do
|
||||
exists <- doesFileExist (d </> "reference.docx")
|
||||
if exists
|
||||
then return (Just (d </> "reference.docx"))
|
||||
else return Nothing
|
||||
case mbArchive of
|
||||
Just arch -> toArchive <$> BL.readFile arch
|
||||
Nothing -> foldr addEntryToArchive emptyArchive <$>
|
||||
mapM pathToEntry paths
|
||||
|
||||
getDefaultReferenceODT :: Maybe FilePath -> IO Archive
|
||||
getDefaultReferenceODT datadir = do
|
||||
let paths = ["mimetype",
|
||||
"manifest.rdf",
|
||||
"styles.xml",
|
||||
"content.xml",
|
||||
"meta.xml",
|
||||
"settings.xml",
|
||||
"Configurations2/accelerator/current.xml",
|
||||
"Thumbnails/thumbnail.png",
|
||||
"META-INF/manifest.xml"]
|
||||
let pathToEntry path = do epochtime <- floor `fmap` getPOSIXTime
|
||||
contents <- (fromChunks . (:[])) `fmap`
|
||||
readDataFile datadir ("odt/" ++ path)
|
||||
return $ toEntry path epochtime contents
|
||||
mbArchive <- case datadir of
|
||||
Nothing -> return Nothing
|
||||
Just d -> do
|
||||
exists <- doesFileExist (d </> "reference.odt")
|
||||
if exists
|
||||
then return (Just (d </> "reference.odt"))
|
||||
else return Nothing
|
||||
case mbArchive of
|
||||
Just arch -> toArchive <$> BL.readFile arch
|
||||
Nothing -> foldr addEntryToArchive emptyArchive <$>
|
||||
mapM pathToEntry paths
|
||||
|
||||
|
||||
readDefaultDataFile :: FilePath -> IO BS.ByteString
|
||||
readDefaultDataFile "reference.docx" =
|
||||
(BS.concat . toChunks . fromArchive) <$> getDefaultReferenceDocx Nothing
|
||||
readDefaultDataFile "reference.odt" =
|
||||
(BS.concat . toChunks . fromArchive) <$> getDefaultReferenceODT Nothing
|
||||
readDefaultDataFile fname =
|
||||
#ifdef EMBED_DATA_FILES
|
||||
case lookup (makeCanonical fname) dataFiles of
|
||||
|
|
|
|||
|
|
@ -1220,27 +1220,3 @@ fitToPage (x, y) pageWidth
|
|||
((fromIntegral pageWidth) / ((fromIntegral :: Integer -> Double) x)) * (fromIntegral y))
|
||||
| otherwise = (x, y)
|
||||
|
||||
getDefaultReferenceDocx :: Maybe FilePath -> IO Archive
|
||||
getDefaultReferenceDocx datadir = do
|
||||
let paths = ["[Content_Types].xml",
|
||||
"_rels/.rels",
|
||||
"docProps/app.xml",
|
||||
"docProps/core.xml",
|
||||
"word/document.xml",
|
||||
"word/fontTable.xml",
|
||||
"word/footnotes.xml",
|
||||
"word/numbering.xml",
|
||||
"word/settings.xml",
|
||||
"word/webSettings.xml",
|
||||
"word/styles.xml",
|
||||
"word/_rels/document.xml.rels",
|
||||
"word/_rels/footnotes.xml.rels",
|
||||
"word/theme/theme1.xml"]
|
||||
let pathToEntry path = do epochtime <- (floor . utcTimeToPOSIXSeconds) <$>
|
||||
getCurrentTime
|
||||
contents <- toLazy <$> readDataFile datadir
|
||||
("docx/" ++ path)
|
||||
return $ toEntry path epochtime contents
|
||||
entries <- mapM pathToEntry paths
|
||||
let archive = foldr addEntryToArchive emptyArchive entries
|
||||
return archive
|
||||
|
|
|
|||
|
|
@ -39,7 +39,8 @@ import Text.Pandoc.UTF8 ( fromStringLazy )
|
|||
import Codec.Archive.Zip
|
||||
import Control.Applicative ((<$>))
|
||||
import Text.Pandoc.Options ( WriterOptions(..) )
|
||||
import Text.Pandoc.Shared ( stringify, readDataFile, fetchItem', warn )
|
||||
import Text.Pandoc.Shared ( stringify, readDataFile, fetchItem', warn,
|
||||
getDefaultReferenceODT )
|
||||
import Text.Pandoc.ImageSize ( imageSize, sizeInPoints )
|
||||
import Text.Pandoc.MIME ( getMimeType, extensionFromMimeType )
|
||||
import Text.Pandoc.Definition
|
||||
|
|
@ -177,21 +178,3 @@ transformPicMath _ entriesRef (Math t math) = do
|
|||
, ("xlink:actuate", "onLoad")]
|
||||
|
||||
transformPicMath _ _ x = return x
|
||||
|
||||
getDefaultReferenceODT :: Maybe FilePath -> IO Archive
|
||||
getDefaultReferenceODT datadir = do
|
||||
let paths = ["mimetype",
|
||||
"manifest.rdf",
|
||||
"styles.xml",
|
||||
"content.xml",
|
||||
"meta.xml",
|
||||
"settings.xml",
|
||||
"Configurations2/accelerator/current.xml",
|
||||
"Thumbnails/thumbnail.png",
|
||||
"META-INF/manifest.xml"]
|
||||
let pathToEntry path = do epochtime <- floor `fmap` getPOSIXTime
|
||||
contents <- (B.fromChunks . (:[])) `fmap`
|
||||
readDataFile datadir ("odt/" ++ path)
|
||||
return $ toEntry path epochtime contents
|
||||
entries <- mapM pathToEntry paths
|
||||
return $ foldr addEntryToArchive emptyArchive entries
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue