aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers
diff options
context:
space:
mode:
authorJesse Rosenthal <jrosenthal@jhu.edu>2014-08-17 09:20:57 -0400
committerJesse Rosenthal <jrosenthal@jhu.edu>2014-08-17 09:22:25 -0400
commit75eec0a6b8a4a65ae957fb416c0cdd2704b7739b (patch)
treebd431f58455454a8ad14ef0870175cac6e3c6dc0 /src/Text/Pandoc/Readers
parentea85a797c24fa9f1335257cfb1a98241649f6e30 (diff)
downloadpandoc-75eec0a6b8a4a65ae957fb416c0cdd2704b7739b.tar.gz
Docx reader: work with new rStyle.
Just discards info at the moment, so at least it works the same.
Diffstat (limited to 'src/Text/Pandoc/Readers')
-rw-r--r--src/Text/Pandoc/Readers/Docx.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index 3e4ac9647..e1a493028 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -230,19 +230,19 @@ parPartToString _ = ""
runStyleToTransform :: RunStyle -> (Inlines -> Inlines)
runStyleToTransform rPr
- | Just s <- rStyle rPr
+ | Just (s, _) <- rStyle rPr
, s `elem` spansToKeep =
let rPr' = rPr{rStyle = Nothing}
in
(spanWith ("", [s], [])) . (runStyleToTransform rPr')
- | Just s <- rStyle rPr
+ | Just (s, _) <- rStyle rPr
, s `elem` emphStyles =
let rPr' = rPr{rStyle = Nothing, isItalic = Nothing}
in
case isItalic rPr of
Just False -> runStyleToTransform rPr'
_ -> emph . (runStyleToTransform rPr')
- | Just s <- rStyle rPr
+ | Just (s, _) <- rStyle rPr
, s `elem` strongStyles =
let rPr' = rPr{rStyle = Nothing, isBold = Nothing}
in
@@ -267,7 +267,7 @@ runStyleToTransform rPr
runToInlines :: Run -> DocxContext Inlines
runToInlines (Run rs runElems)
- | Just s <- rStyle rs
+ | Just (s, _) <- rStyle rs
, s `elem` codeStyles =
return $ code $ concatMap runElemToString runElems
| otherwise = do