@@ -342,8 +342,10 @@ getLayout layout = do
342 (TitleSlide _) -> "ppt/slideLayouts/slideLayout3.xml"
342 (TitleSlide _) -> "ppt/slideLayouts/slideLayout3.xml"
343 (ContentSlide _ _) -> "ppt/slideLayouts/slideLayout2.xml"
343 (ContentSlide _ _) -> "ppt/slideLayouts/slideLayout2.xml"
344 (TwoColumnSlide _ _ _) -> "ppt/slideLayouts/slideLayout4.xml"
344 (TwoColumnSlide _ _ _) -> "ppt/slideLayouts/slideLayout4.xml"
345+ refArchive <- asks envRefArchive
345 distArchive <- asks envDistArchive
346 distArchive <- asks envDistArchive
346− root <- case findEntryByPath layoutpath distArchive of
347+ root <- case findEntryByPath layoutpath refArchive `mplus`
348+ findEntryByPath layoutpath distArchive of
347 Just e -> case parseXMLDoc $ UTF8.toStringLazy $ fromEntry e of
349 Just e -> case parseXMLDoc $ UTF8.toStringLazy $ fromEntry e of
348 Just element -> return $ element
350 Just element -> return $ element
349 Nothing -> throwError $
351 Nothing -> throwError $
@@ -1166,8 +1168,10 @@ slideToElement (Slide _ l@(MetadataSlide titleElems subtitleElems authorElems da
1166getNotesMaster :: PandocMonad m => P m Element
1168getNotesMaster :: PandocMonad m => P m Element
1167getNotesMaster = do
1169getNotesMaster = do
1168 let notesMasterPath = "ppt/notesMasters/notesMaster1.xml"
1170 let notesMasterPath = "ppt/notesMasters/notesMaster1.xml"
1171+ refArchive <- asks envRefArchive
1169 distArchive <- asks envDistArchive
1172 distArchive <- asks envDistArchive
1170− root <- case findEntryByPath notesMasterPath distArchive of
1173+ root <- case findEntryByPath notesMasterPath refArchive `mplus`
1174+ findEntryByPath notesMasterPath distArchive of
1171 Just e -> case parseXMLDoc $ UTF8.toStringLazy $ fromEntry e of
1175 Just e -> case parseXMLDoc $ UTF8.toStringLazy $ fromEntry e of
1172 Just element -> return $ element
1176 Just element -> return $ element
1173 Nothing -> throwError $
1177 Nothing -> throwError $