Merge pull request #1522 from jkr/dropCap

Drop cap

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