From 2142bbe572cea00b7bb5ad3e10a3afb26845a1f7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenthal Date: Thu, 7 Feb 2019 14:46:56 -0500 Subject: Docx reader: Fix windows error 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.) --- src/Text/Pandoc/Readers/Docx/Parse.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Text/Pandoc/Readers/Docx/Parse.hs b/src/Text/Pandoc/Readers/Docx/Parse.hs index 3c4791e1a..1153602b3 100644 --- a/src/Text/Pandoc/Readers/Docx/Parse.hs +++ b/src/Text/Pandoc/Readers/Docx/Parse.hs @@ -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 -- cgit v1.2.3