summaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorJesse Rosenthal <jrosenthal@jhu.edu>2014-06-29 22:50:29 -0400
committerJesse Rosenthal <jrosenthal@jhu.edu>2014-06-29 23:20:10 -0400
commit0f59196e0ef2f0977d404699ae16a48009fa7632 (patch)
tree16b4fbfe79dd7e0fdbaf67c5d9790d5cf2100bc8 /src/Text
parentc0fcc8a7891892357854cf498ce262b256fac1ca (diff)
Docx reader: Make use of new ParIndentation info.
Here, when hanging indents are greater than or equal to left indents, we don't set it to block quote. Such indents are frequently used in academic bibliographies. (Thanks to Caleb McDaniel.)
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Readers/Docx.hs35
1 files changed, 25 insertions, 10 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index 71baa5dde..8357b4cca 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -94,6 +94,7 @@ import System.FilePath (combine)
import qualified Data.Map as M
import Control.Monad.Reader
import Control.Monad.State
+import Control.Applicative (liftA2)
readDocx :: ReaderOptions
-> B.ByteString
@@ -148,7 +149,6 @@ runStyleToContainers rPr =
in
classContainers ++ formatters
-
divAttrToContainers :: [String] -> [(String, String)] -> [Container Block]
divAttrToContainers (c:cs) _ | Just n <- isHeaderClass c =
[Container $ \_ ->
@@ -166,22 +166,37 @@ divAttrToContainers (c:cs) kvs | c `elem` listParagraphDivs =
divAttrToContainers (c:cs) kvs | c `elem` blockQuoteDivs =
(Container BlockQuote) : (divAttrToContainers (cs \\ blockQuoteDivs) kvs)
divAttrToContainers (_:cs) kvs = divAttrToContainers cs kvs
-divAttrToContainers [] kvs | Just numString <- lookup "indent" kvs =
- let kvs' = filter (\(k,_) -> k /= "indent") kvs
+divAttrToContainers [] kvs | Just _ <- lookup "indent" kvs
+ , Just flInd <- lookup "first-line-indent" kvs =
+ let
+ kvs' = filter (\(k,_) -> notElem k ["indent", "first-line-indent"]) kvs
in
- case numString of
- "0" -> divAttrToContainers [] kvs'
- ('-' : _) -> divAttrToContainers [] kvs'
- _ -> (Container BlockQuote) : divAttrToContainers [] kvs'
+ case flInd of
+ "0" -> divAttrToContainers [] kvs'
+ ('-':_) -> divAttrToContainers [] kvs'
+ _ -> (Container BlockQuote) : divAttrToContainers [] kvs'
+divAttrToContainers [] kvs | Just ind <- lookup "indent" kvs =
+ let
+ kvs' = filter (\(k,_) -> notElem k ["indent"]) kvs
+ in
+ case ind of
+ "0" -> divAttrToContainers [] kvs'
+ ('-':_) -> divAttrToContainers [] kvs'
+ _ -> (Container BlockQuote) : divAttrToContainers [] kvs'
+
divAttrToContainers _ _ = []
parStyleToContainers :: ParagraphStyle -> [Container Block]
parStyleToContainers pPr =
let classes = pStyle pPr
- kvs = case indent pPr of
- Just n -> [("indent", show n)]
- Nothing -> []
+ indent = indentation pPr >>= leftParIndent
+ hanging = indentation pPr >>= hangingParIndent
+ firstLineIndent = liftA2 (-) indent hanging
+ kvs = mapMaybe id
+ [ indent >>= (\n -> Just ("indent", show n)),
+ firstLineIndent >>= (\n -> Just ("first-line-indent", show n))
+ ]
in
divAttrToContainers classes kvs