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

Alias string and runStyle to CharStyle type.

Browse source
This commit is contained in:
Jesse Rosenthal 2014-08-17 11:30:22 -04:00
parent c4871ac790
commit b8f1658c36
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@ data ReaderEnv = ReaderEnv { envNotes :: Notes
, envRelationships :: [Relationship]
, envMedia :: Media
, envFont :: Maybe Font
, envCharStyles :: CharStyles
, envCharStyles :: CharStyleMap
}
deriving Show
@ -120,7 +120,9 @@ data Body = Body [BodyPart]
type Media = [(FilePath, B.ByteString)]
type CharStyles = M.Map String RunStyle
type CharStyle = (String, RunStyle)
type CharStyleMap = M.Map String RunStyle
data Numbering = Numbering NameSpaces [Numb] [AbstractNumb]
deriving Show
@ -208,7 +210,7 @@ data RunStyle = RunStyle { isBold :: Maybe Bool
, isStrike :: Maybe Bool
, rVertAlign :: Maybe VertAlign
, rUnderline :: Maybe String
, rStyle :: Maybe (String, Maybe RunStyle)}
, rStyle :: Maybe CharStyle}
deriving Show
defaultRunStyle :: RunStyle
@ -261,7 +263,7 @@ elemToBody ns element | isElem ns "w" "body" element =
(\bps -> return $ Body bps)
elemToBody _ _ = throwError WrongElem
archiveToStyles :: Archive -> CharStyles
archiveToStyles :: Archive -> CharStyleMap
archiveToStyles zf =
let stylesElem = findEntryByPath "word/styles.xml" zf >>=
(parseXMLDoc . UTF8.toStringLazy . fromEntry)
@ -273,7 +275,7 @@ archiveToStyles zf =
in
M.fromList $ mapMaybe (elemToCharStyle namespaces) (elChildren styElem)
elemToCharStyle :: NameSpaces -> Element -> Maybe (String, RunStyle)
elemToCharStyle :: NameSpaces -> Element -> Maybe CharStyle
elemToCharStyle ns element
| isElem ns "w" "style" element
, Just "character" <- findAttr (elemName ns "w" "type") element
@ -702,12 +704,13 @@ elemToRunStyleD ns element
findChild (elemName ns "w" "rStyle") rPr >>=
findAttr (elemName ns "w" "val")
of
Just styName -> Just $ (styName, M.lookup styName charStyles)
Just styName | Just style <- M.lookup styName charStyles ->
Just (styName, style)
_ -> Nothing
return $ elemToRunStyle ns element parentSty
elemToRunStyleD _ _ = return defaultRunStyle
elemToRunStyle :: NameSpaces -> Element -> Maybe (String, Maybe RunStyle) -> RunStyle
elemToRunStyle :: NameSpaces -> Element -> Maybe CharStyle -> RunStyle
elemToRunStyle ns element parentStyle
| Just rPr <- findChild (elemName ns "w" "rPr") element =
RunStyle