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

Powerpoint writer: simplify code with ParseXml

Browse source 
There were some artifact code blocks around from before
`reference-doc` functionality was implemented. This led to ignoring
the reference-doc in places. Though I fixed this, I kept the old
hacked-up functions instead of replacing them with
`parseXml` (imported from Writers.OOXML) which does this in a
consistent manner. This commit corrects that oversight.
This commit is contained in:
Jesse Rosenthal 2018-03-24 16:07:14 -04:00
parent 6285c047c4
commit 8b533f9c38
1 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Text/Pandoc/Writers/Powerpoint/Output.hs
View file

@ -344,17 +344,7 @@ getLayout layout = do
(TwoColumnSlide _ _ _) -> "ppt/slideLayouts/slideLayout4.xml" (TwoColumnSlide _ _ _) -> "ppt/slideLayouts/slideLayout4.xml"
refArchive <- asks envRefArchive refArchive <- asks envRefArchive
distArchive <- asks envDistArchive distArchive <- asks envDistArchive
root <- case findEntryByPath layoutpath refArchive `mplus` parseXml refArchive distArchive layoutpath
findEntryByPath layoutpath distArchive of
Just e -> case parseXMLDoc $ UTF8.toStringLazy $ fromEntry e of
Just element -> return $ element
Nothing -> throwError $
PandocSomeError $
layoutpath ++ " corrupt in reference file"
Nothing -> throwError $
PandocSomeError $
layoutpath ++ " missing in reference file"
return root
shapeHasId :: NameSpaces -> String -> Element -> Bool shapeHasId :: NameSpaces -> String -> Element -> Bool
shapeHasId ns ident element shapeHasId ns ident element
@ -1171,20 +1161,9 @@ slideToElement (Slide _ l@(MetadataSlide titleElems subtitleElems authorElems da
getNotesMaster :: PandocMonad m => P m Element getNotesMaster :: PandocMonad m => P m Element
getNotesMaster = do getNotesMaster = do
let notesMasterPath = "ppt/notesMasters/notesMaster1.xml"
refArchive <- asks envRefArchive refArchive <- asks envRefArchive
distArchive <- asks envDistArchive distArchive <- asks envDistArchive
root <- case findEntryByPath notesMasterPath refArchive `mplus` parseXml refArchive distArchive "ppt/notesMasters/notesMaster1.xml"
findEntryByPath notesMasterPath distArchive of
Just e -> case parseXMLDoc $ UTF8.toStringLazy $ fromEntry e of
Just element -> return $ element
Nothing -> throwError $
PandocSomeError $
notesMasterPath ++ " corrupt in reference file"
Nothing -> throwError $
PandocSomeError $
notesMasterPath ++ " missing in reference file"
return root
getSlideNumberFieldId :: PandocMonad m => Element -> P m String getSlideNumberFieldId :: PandocMonad m => Element -> P m String
getSlideNumberFieldId notesMaster getSlideNumberFieldId notesMaster