@@ -146,12 +146,14 @@ data ParIndentation = ParIndentation { leftParIndent :: Maybe Integer
147data ParagraphStyle = ParagraphStyle { pStyle :: [String]
147data ParagraphStyle = ParagraphStyle { pStyle :: [String]
148 , indentation :: Maybe ParIndentation
148 , indentation :: Maybe ParIndentation
150 deriving Show
151 deriving Show
152defaultParagraphStyle :: ParagraphStyle
153defaultParagraphStyle :: ParagraphStyle
153defaultParagraphStyle = ParagraphStyle { pStyle = []
154defaultParagraphStyle = ParagraphStyle { pStyle = []
154 , indentation = Nothing
155 , indentation = Nothing
@@ -637,8 +639,16 @@ elemToParagraphStyle ns element
637 (findAttr (elemName ns "w" "val"))
639 (findAttr (elemName ns "w" "val"))
638 (findChildren (elemName ns "w" "pStyle") pPr)
640 (findChildren (elemName ns "w" "pStyle") pPr)
639 , indentation =
641 , indentation =
640− findChild (elemName ns "w" "ind") pPr >>=
642+ findChild (elemName ns "w" "ind") pPr >>=
641− elemToParIndentation ns
643+ elemToParIndentation ns
646+ findChild (elemName ns "w" "framePr") pPr >>=
647+ findAttr (elemName ns "w" "dropCap")
649+ Just "none" -> False
643elemToParagraphStyle _ _ = defaultParagraphStyle
653elemToParagraphStyle _ _ = defaultParagraphStyle