aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers
diff options
context:
space:
mode:
authorJesse Rosenthal <jrosenthal@jhu.edu>2018-02-22 13:39:19 -0500
committerJesse Rosenthal <jrosenthal@jhu.edu>2018-02-22 13:41:02 -0500
commit8b7df2d915fb4cedb99e60188b0899de9b8b7024 (patch)
treef15d990a8b1f3658506c86be4fc37f25d6f166a4 /src/Text/Pandoc/Readers
parent87e0728b87846cdacb8866e19b9a8e127490b4bf (diff)
downloadpandoc-8b7df2d915fb4cedb99e60188b0899de9b8b7024.tar.gz
Docx reader: Move pandoc inline styling inside custom-style span
Previously Emph, Strong, etc were outside the custom-style span. This moves them inside in order to make it easier to write filters that act on the formatting in these contents. Tests and MANUAL example are changed to match.
Diffstat (limited to 'src/Text/Pandoc/Readers')
-rw-r--r--src/Text/Pandoc/Readers/Docx.hs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index 775fa1cdd..5f2ca0fff 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -301,37 +301,37 @@ runStyleToTransform rPr
extraInfo <- extraRunStyleInfo rPr
transform <- local (\e -> e{docxCustomStyleAlready = True}) $
runStyleToTransform rPr {isItalic = Nothing}
- return $ emph . extraInfo . transform
+ return $ extraInfo . emph . transform
| Just True <- isBold rPr = do
extraInfo <- extraRunStyleInfo rPr
transform <- local (\e -> e{docxCustomStyleAlready = True}) $
runStyleToTransform rPr {isBold = Nothing}
- return $ strong . extraInfo . transform
+ return $ extraInfo . strong . transform
| Just True <- isSmallCaps rPr = do
extraInfo <- extraRunStyleInfo rPr
transform <- local (\e -> e{docxCustomStyleAlready = True}) $
runStyleToTransform rPr {isSmallCaps = Nothing}
- return $ smallcaps . extraInfo .transform
+ return $ extraInfo . smallcaps . transform
| Just True <- isStrike rPr = do
extraInfo <- extraRunStyleInfo rPr
transform <- local (\e -> e{docxCustomStyleAlready = True}) $
runStyleToTransform rPr {isStrike = Nothing}
- return $ strikeout . extraInfo . transform
+ return $ extraInfo . strikeout . transform
| Just SupScrpt <- rVertAlign rPr = do
extraInfo <- extraRunStyleInfo rPr
transform <- local (\e -> e{docxCustomStyleAlready = True}) $
runStyleToTransform rPr {rVertAlign = Nothing}
- return $ superscript . extraInfo . transform
+ return $ extraInfo . superscript . transform
| Just SubScrpt <- rVertAlign rPr = do
extraInfo <- extraRunStyleInfo rPr
transform <- local (\e -> e{docxCustomStyleAlready = True}) $
runStyleToTransform rPr {rVertAlign = Nothing}
- return $ subscript . extraInfo . transform
+ return $ extraInfo . subscript . transform
| Just "single" <- rUnderline rPr = do
extraInfo <- extraRunStyleInfo rPr
transform <- local (\e -> e{docxCustomStyleAlready = True}) $
runStyleToTransform rPr {rUnderline = Nothing}
- return $ underlineSpan . extraInfo . transform
+ return $ extraInfo . underlineSpan . transform
| otherwise = extraRunStyleInfo rPr
runToInlines :: PandocMonad m => Run -> DocxContext m Inlines