@@ -37,7 +37,6 @@ import Control.Monad.Reader
3737import Control.Monad.State
3838import Codec.Archive.Zip
3939import Data.List (intercalate, stripPrefix, isPrefixOf, nub)
40−-- import Control.Monad (mplus)
4140import Data.Default
4241import Data.Time.Clock (UTCTime)
4342import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds, posixSecondsToUTCTime)
@@ -53,8 +52,6 @@ import Text.Pandoc.Options
5352import Text.Pandoc.MIME
5453import Text.Pandoc.Logging
5554import qualified Data.ByteString.Lazy as BL
56−-- import qualified Data.ByteString.Lazy.Char8 as BL8
57−-- import qualified Text.Pandoc.UTF8 as UTF8
5855import Text.Pandoc.Walk
5956import Text.Pandoc.Writers.Shared (fixDisplayMath)
6057import Text.Pandoc.Writers.OOXML
@@ -229,20 +226,6 @@ data Paragraph = Paragraph { paraProps :: ParaProps
229226data HeaderType = TitleHeader | SlideHeader | InternalHeader Int
230227 deriving (Show, Eq)
231228
232−-- type StartingAt = Int
233−
234−-- data AutoNumType = ArabicNum
235−-- | AlphaUpperNum
236−-- | AlphaLowerNum
237−-- | RomanUpperNum
238−-- | RomanLowerNum
239−-- deriving (Show, Eq)
240−
241−-- data AutoNumDelim = PeriodDelim
242−-- | OneParenDelim
243−-- | TwoParensDelim
244−-- deriving (Show, Eq)
245−
246229autoNumberingToType :: ListAttributes -> String
247230autoNumberingToType (_, numStyle, numDelim) =
248231 typeString ++ delimString
@@ -420,10 +403,6 @@ blockToParagraphs (BlockQuote blks) =
420403 concatMapM blockToParagraphs blks
421404-- TODO: work out the format
422405blockToParagraphs (RawBlock _ _) = return []
423− -- parElems <- inlinesToParElems [Str str]
424− -- paraProps <- asks envParaProps
425− -- return [Paragraph paraProps parElems]
426−-- TODO: work out the format
427406blockToParagraphs (Header n _ ils) = do
428407 slideLevel <- asks envSlideLevel
429408 parElems <- inlinesToParElems ils
@@ -462,7 +441,6 @@ blockToParagraphs (DefinitionList entries) = do
462441 return $ term ++ definition
463442 concatMapM go entries
464443blockToParagraphs (Div _ blks) = concatMapM blockToParagraphs blks
465−-- TODO
466444blockToParagraphs blk = do
467445 P.report $ BlockNotRendered blk
468446 return []
@@ -827,12 +805,6 @@ getLayout slide = do
827805 PandocSomeError $
828806 layoutpath ++ " missing in reference file"
829807 return root
830− -- let ns = elemToNameSpaces root
831− -- case findChild (elemName ns "p" "cSld") root of
832− -- Just element' -> return element'
833− -- Nothing -> throwError $
834− -- PandocSomeError $
835− -- layoutpath ++ " not correctly formed layout file"
836808
837809shapeHasName :: NameSpaces -> String -> Element -> Bool
838810shapeHasName ns name element
@@ -842,55 +814,12 @@ shapeHasName ns name element
842814 nm == name
843815 | otherwise = False
844816
845−-- getContentTitleShape :: NameSpaces -> Element -> Maybe Element
846−-- getContentTitleShape ns spTreeElem
847−-- | isElem ns "p" "spTree" spTreeElem =
848−-- filterChild (\e -> (isElem ns "p" "sp" e) && (shapeHasName ns "Title 1" e)) spTreeElem
849−-- | otherwise = Nothing
850−
851−-- getSubtitleShape :: NameSpaces -> Element -> Maybe Element
852−-- getSubtitleShape ns spTreeElem
853−-- | isElem ns "p" "spTree" spTreeElem =
854−-- filterChild (\e -> (isElem ns "p" "sp" e) && (shapeHasName ns "Subtitle 2" e)) spTreeElem
855−-- | otherwise = Nothing
856−
857−-- getDateShape :: NameSpaces -> Element -> Maybe Element
858−-- getDateShape ns spTreeElem
859−-- | isElem ns "p" "spTree" spTreeElem =
860−-- filterChild (\e -> (isElem ns "p" "sp" e) && (shapeHasName ns "Date Placeholder 3" e)) spTreeElem
861−-- | otherwise = Nothing
862−
863817getContentShape :: NameSpaces -> Element -> Maybe Element
864818getContentShape ns spTreeElem
865819 | isElem ns "p" "spTree" spTreeElem =
866820 filterChild (\e -> (isElem ns "p" "sp" e) && (shapeHasName ns "Content Placeholder 2" e)) spTreeElem
867821 | otherwise = Nothing
868822
869−
870−-- cursorHasName :: QName -> XMLC.Cursor -> Bool
871−-- cursorHasName nm cur = case XMLC.current cur of
872−-- Elem element -> case XMLC.tagName $ XMLC.getTag element of
873−-- nm -> True
874−-- _ -> False
875−-- _ -> False
876−
877−-- fillInTxBody :: NameSpaces -> [Paragraph] -> Element -> Element
878−-- fillInTxBody ns paras txBodyElem
879−-- | isElem ns "p" "txBody" txBodyElem =
880−-- replaceNamedChildren ns "a" "p" (map paragraphToElement paras) txBodyElem
881−-- | otherwise = txBodyElem
882−
883−-- fillInShape :: NameSpaces -> Shape -> Element -> Element
884−-- fillInShape ns shape spElem
885−-- | TextBox paras <- shape
886−-- , isElemn ns "p" "sp" spElem =
887−-- replaceNamedChildren ns "p" "txBody" (fillInTxBody ns paras sp
888−
889−
890−-- fillInShape :: NameSpaces -> Element -> Shape -> Element
891−-- fillInShape ns spElem (TextBox paras) = fillInParagraphs ns spElem paras
892−-- fillInShape _ spElem pic = spElem
893−
894823contentIsElem :: NameSpaces -> String -> String -> Content -> Bool
895824contentIsElem ns prefix name (Elem element) = isElem ns prefix name element
896825contentIsElem _ _ _ _ = False
@@ -902,7 +831,6 @@ replaceNamedChildren ns prefix name newKids element =
902831 in
903832 element{elContent = content' ++ map Elem newKids}
904833
905−
906834----------------------------------------------------------------
907835
908836registerLink :: PandocMonad m => (URL, String) -> P m Int
@@ -1129,7 +1057,6 @@ makePicElement picProps mInfo attr = do
11291057 xoff' = if hasHeader then xoff + hXoff else xoff
11301058 xoff'' = if hasCaption then xoff' + capX else xoff'
11311059 yoff' = if hasHeader then hYoff + hYext else yoff
1132− -- let (xemu,yemu)=((floor $ xpt * 12700), (floor $ ypt * 12700))
11331060 let cNvPicPr = mknode "p:cNvPicPr" [] $
11341061 mknode "a:picLocks" [("noGrp","1")
11351062 ,("noChangeAspect","1")] ()
@@ -1353,9 +1280,6 @@ graphicToElement (Tbl tblPr colWidths hdrCells rows) = do
13531280 then emptyCell
13541281 else contents) ++ [ borderProps | border ]
13551282 let mkrow border cells = mknode "a:tr" [("h", "0")] $ map (mkcell border) cells
1356− -- let textwidth = 14400 -- 5.5 in in twips, 1/20 pt
1357− -- let fullrow = 14400 -- 100% specified in pct
1358− -- let rowwidth = fullrow * sum colWidths
13591283
13601284 let mkgridcol w = mknode "a:gridCol"
13611285 [("w", show ((12700 * w) :: Integer))] ()
@@ -1395,24 +1319,6 @@ nonBodyTextToElement layout shapeName paraElements
13951319 -- XXX: TODO
13961320 | otherwise = return $ mknode "p:sp" [] ()
13971321
1398−
1399−-- hdrToElement :: Element -> [ParaElem] -> Element
1400−-- hdrToElement layout paraElems
1401−-- | ns <- elemToNameSpaces layout
1402−-- , Just cSld <- findChild (elemName ns "p" "cSld") layout
1403−-- , Just spTree <- findChild (elemName ns "p" "spTree") cSld
1404−-- , Just sp <- getContentTitleShape ns spTree =
1405−-- let hdrPara = Paragraph def paraElems
1406−-- txBody = mknode "p:txBody" [] $
1407−-- [mknode "a:bodyPr" [] (), mknode "a:lstStyle" [] ()] ++
1408−-- [paragraphToElement hdrPara]
1409−-- in
1410−-- replaceNamedChildren ns "p" "txBody" [txBody] sp
1411−-- -- XXX: TODO
1412−-- | otherwise = mknode "p:sp" [] ()
1413−-- -- XXX: TODO
1414−-- hdrToElement _ _ = mknode "p:sp" [] ()
1415−
14161322contentToElement :: PandocMonad m => Element -> [ParaElem] -> [Shape] -> P m Element
14171323contentToElement layout hdrShape shapes
14181324 | ns <- elemToNameSpaces layout
@@ -1704,11 +1610,6 @@ slideToSlideRelElement slide idNum = do
17041610 , ("Target", target)] ()
17051611 ] ++ linkRels ++ mediaRels)
17061612
1707−-- slideToSlideRelEntry :: PandocMonad m => Slide -> Int -> P m Entry
1708−-- slideToSlideRelEntry slide idNum = do
1709−-- let fp = "ppt/slides/_rels/slide" ++ (show idNum) ++ ".xml.rels"
1710−-- elemToEntry fp $ slideToSlideRelElement slide
1711−
17121613slideToSldIdElement :: PandocMonad m => Slide -> Int -> P m Element
17131614slideToSldIdElement slide idNum = do
17141615 let id' = show $ idNum + 255
@@ -1819,10 +1720,6 @@ presentationToContentTypes (Presentation _ slides) = do
18191720 (defaults ++ mediaDefaults)
18201721 (inheritedOverrides ++ presOverride ++ slideOverrides)
18211722
1822−-- slideToElement :: Element -> Slide -> Element
1823−-- slideToElement layout (ContentSlide _ shapes) =
1824−-- let sps = map (shapeToElement layout) shapes
1825−
18261723presML :: String
18271724presML = "application/vnd.openxmlformats-officedocument.presentationml"
18281725