@@ -1013,6 +1013,14 @@ getShapeByPlaceHolderType ns spTreeElem phType
10131013 filterChild findPhType spTreeElem
10141014 | otherwise = Nothing
10151015
1016+-- Like the above, but it tries a number of different placeholder types
1017+getShapeByPlaceHolderTypes :: NameSpaces -> Element -> [String] -> Maybe Element
1018+getShapeByPlaceHolderTypes _ _ [] = Nothing
1019+getShapeByPlaceHolderTypes ns spTreeElem (s:ss) =
1020+ case getShapeByPlaceHolderType ns spTreeElem s of
1021+ Just element -> Just element
1022+ Nothing -> getShapeByPlaceHolderTypes ns spTreeElem ss
1023+
10161024getShapeByPlaceHolderIndex :: NameSpaces -> Element -> String -> Maybe Element
10171025getShapeByPlaceHolderIndex ns spTreeElem phIdx
10181026 | isElem ns "p" "spTree" spTreeElem =
@@ -1027,12 +1035,12 @@ getShapeByPlaceHolderIndex ns spTreeElem phIdx
10271035 | otherwise = Nothing
10281036
10291037
1030−nonBodyTextToElement :: PandocMonad m => Element -> String -> [ParaElem] -> P m Element
1031−nonBodyTextToElement layout phType paraElements
1038+nonBodyTextToElement :: PandocMonad m => Element -> [String] -> [ParaElem] -> P m Element
1039+nonBodyTextToElement layout phTypes paraElements
10321040 | ns <- elemToNameSpaces layout
10331041 , Just cSld <- findChild (elemName ns "p" "cSld") layout
10341042 , Just spTree <- findChild (elemName ns "p" "spTree") cSld
1035− , Just sp <- getShapeByPlaceHolderType ns spTree phType = do
1043+ , Just sp <- getShapeByPlaceHolderTypes ns spTree phTypes = do
10361044 let hdrPara = Paragraph def paraElements
10371045 element <- paragraphToElement hdrPara
10381046 let txBody = mknode "p:txBody" [] $
@@ -1047,7 +1055,7 @@ contentToElement layout hdrShape shapes
10471055 | ns <- elemToNameSpaces layout
10481056 , Just cSld <- findChild (elemName ns "p" "cSld") layout
10491057 , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do
1050− element <- nonBodyTextToElement layout "title" hdrShape
1058+ element <- nonBodyTextToElement layout ["title"] hdrShape
10511059 let hdrShapeElements = if null hdrShape
10521060 then []
10531061 else [element]
@@ -1065,7 +1073,7 @@ twoColumnToElement layout hdrShape shapesL shapesR
10651073 | ns <- elemToNameSpaces layout
10661074 , Just cSld <- findChild (elemName ns "p" "cSld") layout
10671075 , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do
1068− element <- nonBodyTextToElement layout "title" hdrShape
1076+ element <- nonBodyTextToElement layout ["title"] hdrShape
10691077 let hdrShapeElements = if null hdrShape
10701078 then []
10711079 else [element]
@@ -1089,7 +1097,7 @@ titleToElement layout titleElems
10891097 | ns <- elemToNameSpaces layout
10901098 , Just cSld <- findChild (elemName ns "p" "cSld") layout
10911099 , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do
1092− element <- nonBodyTextToElement layout "title" titleElems
1100+ element <- nonBodyTextToElement layout ["title", "ctrTitle"] titleElems
10931101 let titleShapeElements = if null titleElems
10941102 then []
10951103 else [element]
@@ -1103,15 +1111,15 @@ metadataToElement layout titleElems subtitleElems authorsElems dateElems
11031111 , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do
11041112 titleShapeElements <- if null titleElems
11051113 then return []
1106− else sequence [nonBodyTextToElement layout "ctrTitle" titleElems]
1114+ else sequence [nonBodyTextToElement layout ["ctrTitle"] titleElems]
11071115 let combinedAuthorElems = intercalate [Break] authorsElems
11081116 subtitleAndAuthorElems = intercalate [Break, Break] [subtitleElems, combinedAuthorElems]
11091117 subtitleShapeElements <- if null subtitleAndAuthorElems
11101118 then return []
1111− else sequence [nonBodyTextToElement layout "subTitle" subtitleAndAuthorElems]
1119+ else sequence [nonBodyTextToElement layout ["subTitle"] subtitleAndAuthorElems]
11121120 dateShapeElements <- if null dateElems
11131121 then return []
1114− else sequence [nonBodyTextToElement layout "dt" dateElems]
1122+ else sequence [nonBodyTextToElement layout ["dt"] dateElems]
11151123 return $ replaceNamedChildren ns "p" "sp"
11161124 (titleShapeElements ++ subtitleShapeElements ++ dateShapeElements)
11171125 spTree