Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Docx reader: Fix windows error

Browse source 
Try fixing a parsing error on windows by insisting that the parser use
a Posix filepath library for splitting doc paths in a zipfile. (It
might default on Windows to using a backslash as a separator, while
it's always a forward-slash in zip archives.)
This commit is contained in:
Jesse Rosenthal 2019-02-07 14:46:56 -05:00
parent 4ef23623d3
commit 2142bbe572
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Text/Pandoc/Readers/Docx/Parse.hs
View file

@ -73,6 +73,7 @@ import Data.List
import qualified Data.Map as M
import Data.Maybe
import System.FilePath
import qualified System.FilePath.Posix as PSX
import Text.Pandoc.Readers.Docx.Util
import Text.Pandoc.Readers.Docx.Fields
import Text.Pandoc.Shared (filteredFilesFromArchive, safeRead)
@ -505,7 +506,7 @@ filePathToRelType "word/_rels/endnotes.xml.rels" _ = Just InEndnote
-- -- to see if it's a documentPath, we have to check against the dynamic
-- -- docPath specified in "_rels/.rels"
filePathToRelType path docXmlPath =
if path == "word/_rels/" ++ (takeFileName docXmlPath) ++ ".rels"
if path == "word/_rels/" ++ (PSX.takeFileName docXmlPath) ++ ".rels"
then Just InDocument
else Nothing