aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-07-31 16:40:20 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-07-31 16:40:20 -0700
commit1b9371cfdf279301ecc50910664d7335508ade71 (patch)
tree0bc8598af96e9eac2121d38dde35b27639b76f5a /src
parentf075b0e5d956a655bd8ebc5aa9fd6e34e7b2ef3f (diff)
parent43ca784d1c4c56635a4c1dae3dab947ab90d6cc0 (diff)
downloadpandoc-1b9371cfdf279301ecc50910664d7335508ade71.tar.gz
Merge branch 'underline-option' of https://github.com/jkr/pandoc
Diffstat (limited to 'src')
-rw-r--r--src/Text/Pandoc/Readers/Docx.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index 7a89c0b04..86ce62ced 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -219,7 +219,8 @@ runStyleToContainers rPr =
, if isStrike rPr then (Just Strikeout) else Nothing
, if isSuperScript rPr then (Just Superscript) else Nothing
, if isSubScript rPr then (Just Subscript) else Nothing
- , rUnderline rPr >>= (\f -> Just $ Span ("", [], [("underline", f)]))
+ , rUnderline rPr >>=
+ (\f -> if f == "single" then (Just Emph) else Nothing)
]
in
classContainers ++ formatters