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

Docx Style parser: Basic one now just takes a parent style.

Browse source 
This will make it easier to build the style map from the bottom up (to
avoid any infinite references).
This commit is contained in:
Jesse Rosenthal 2014-08-17 10:19:48 -04:00
parent 75eec0a6b8
commit c4871ac790
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Text/Pandoc/Readers/Docx/Parse.hs
View file

@ -279,7 +279,7 @@ elemToCharStyle ns element
, Just "character" <- findAttr (elemName ns "w" "type") element
, Just styleId <- findAttr (elemName ns "w" "styleId") element
, isJust $ findChild (elemName ns "w" "rPr") element =
Just (styleId, elemToRunStyle ns element M.empty)
Just (styleId, elemToRunStyle ns element Nothing)
| otherwise = Nothing
@ -695,12 +695,20 @@ checkOnOff ns rPr tag
checkOnOff _ _ _ = Nothing
elemToRunStyleD :: NameSpaces -> Element -> D RunStyle
elemToRunStyleD ns element = do
charStyles <- asks envCharStyles
return $ elemToRunStyle ns element charStyles
elemToRunStyleD ns element
| Just rPr <- findChild (elemName ns "w" "rPr") element = do
charStyles <- asks envCharStyles
let parentSty = case
findChild (elemName ns "w" "rStyle") rPr >>=
findAttr (elemName ns "w" "val")
of
Just styName -> Just $ (styName, M.lookup styName charStyles)
_ -> Nothing
return $ elemToRunStyle ns element parentSty
elemToRunStyleD _ _ = return defaultRunStyle
elemToRunStyle :: NameSpaces -> Element -> CharStyles -> RunStyle
elemToRunStyle ns element charStyles
elemToRunStyle :: NameSpaces -> Element -> Maybe (String, Maybe RunStyle) -> RunStyle
elemToRunStyle ns element parentStyle
| Just rPr <- findChild (elemName ns "w" "rPr") element =
RunStyle
{
@ -718,13 +726,7 @@ elemToRunStyle ns element charStyles
, rUnderline =
findChild (elemName ns "w" "u") rPr >>=
findAttr (elemName ns "w" "val")
, rStyle =
case
findChild (elemName ns "w" "rStyle") rPr >>=
findAttr (elemName ns "w" "val")
of
Just styName -> Just $ (styName, M.lookup styName charStyles)
_ -> Nothing
, rStyle = parentStyle
}
elemToRunStyle _ _ _ = defaultRunStyle