aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-08-11 20:38:23 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-08-11 20:38:23 -0700
commit4c88e64894af56a71a15289a70b2ae7950157f86 (patch)
tree4a9f2b07c691c2af7ffa119c56b1ec8478b0c4f4 /src/Text
parent86d4da994a2e8a091aea325d9738f3b99ab4dbca (diff)
parent45ec035e93ec0c32f9fb7d7f2f99ca17de73ebf9 (diff)
downloadpandoc-4c88e64894af56a71a15289a70b2ae7950157f86.tar.gz
Merge pull request #1522 from jkr/dropCap
Drop cap
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Readers/Docx.hs26
-rw-r--r--src/Text/Pandoc/Readers/Docx/Parse.hs14
2 files changed, 29 insertions, 11 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index 085ee01fc..c856ca30a 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -105,11 +105,15 @@ readDocx opts bytes =
Left _ -> error $ "couldn't parse docx file"
data DState = DState { docxAnchorMap :: M.Map String String
- , docxMediaBag :: MediaBag }
+ , docxMediaBag :: MediaBag
+ , docxDropCap :: [Inline]
+ }
instance Default DState where
def = DState { docxAnchorMap = M.empty
- , docxMediaBag = mempty }
+ , docxMediaBag = mempty
+ , docxDropCap = []
+ }
data DEnv = DEnv { docxOptions :: ReaderOptions
, docxInHeaderBlock :: Bool }
@@ -457,13 +461,17 @@ bodyPartToBlocks (Paragraph pPr parparts)
return [hdr]
bodyPartToBlocks (Paragraph pPr parparts) = do
ils <- parPartsToInlines parparts >>= (return . normalizeSpaces)
- case ils of
- [] -> return []
- _ -> do
- return $
- rebuild
- (parStyleToContainers pPr)
- [Para ils]
+ dropIls <- gets docxDropCap
+ let ils' = reduceList $ dropIls ++ ils
+ if dropCap pPr
+ then do modify $ \s -> s { docxDropCap = ils' }
+ return []
+ else do modify $ \s -> s { docxDropCap = [] }
+ return $ case ils' of
+ [] -> []
+ _ -> rebuild
+ (parStyleToContainers pPr)
+ [Para $ ils']
bodyPartToBlocks (ListItem pPr numId lvl levelInfo parparts) = do
let
kvs = case levelInfo of
diff --git a/src/Text/Pandoc/Readers/Docx/Parse.hs b/src/Text/Pandoc/Readers/Docx/Parse.hs
index 1abd4bc6b..175bf2784 100644
--- a/src/Text/Pandoc/Readers/Docx/Parse.hs
+++ b/src/Text/Pandoc/Readers/Docx/Parse.hs
@@ -146,12 +146,14 @@ data ParIndentation = ParIndentation { leftParIndent :: Maybe Integer
data ParagraphStyle = ParagraphStyle { pStyle :: [String]
, indentation :: Maybe ParIndentation
+ , dropCap :: Bool
}
deriving Show
defaultParagraphStyle :: ParagraphStyle
defaultParagraphStyle = ParagraphStyle { pStyle = []
, indentation = Nothing
+ , dropCap = False
}
@@ -637,8 +639,16 @@ elemToParagraphStyle ns element
(findAttr (elemName ns "w" "val"))
(findChildren (elemName ns "w" "pStyle") pPr)
, indentation =
- findChild (elemName ns "w" "ind") pPr >>=
- elemToParIndentation ns
+ findChild (elemName ns "w" "ind") pPr >>=
+ elemToParIndentation ns
+ , dropCap =
+ case
+ findChild (elemName ns "w" "framePr") pPr >>=
+ findAttr (elemName ns "w" "dropCap")
+ of
+ Just "none" -> False
+ Just _ -> True
+ Nothing -> False
}
elemToParagraphStyle _ _ = defaultParagraphStyle