diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-11-27 14:58:23 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-11-27 14:58:23 -0800 |
| commit | f64983f8791f8c1bcd33bae02cdaaa3f369421e1 (patch) | |
| tree | 47d32ea4a1dfdaffbaa243f893ab7edd2c83852a /src | |
| parent | f15965e205a5c11adca6b08c14c8fffccdcc9cc5 (diff) | |
| parent | e9cfbd5adc7a2f19be24904b6fb4d200ddbaa9ce (diff) | |
| download | pandoc-f64983f8791f8c1bcd33bae02cdaaa3f369421e1.tar.gz | |
Merge branch 'master' into citeproc
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Writers/OpenDocument.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs index 4e3979c07..0e8a8bf8b 100644 --- a/src/Text/Pandoc/Writers/OpenDocument.hs +++ b/src/Text/Pandoc/Writers/OpenDocument.hs @@ -112,7 +112,9 @@ setInDefinitionList :: Bool -> State WriterState () setInDefinitionList b = modify $ \s -> s { stInDefinition = b } inParagraphTags :: Doc -> Doc -inParagraphTags = inTags False "text:p" [("text:style-name", "Text_20_body")] +inParagraphTags d | isEmpty d = empty +inParagraphTags d = + inTags False "text:p" [("text:style-name", "Text_20_body")] d inParagraphTagsWithStyle :: String -> Doc -> Doc inParagraphTagsWithStyle sty = inTags False "text:p" [("text:style-name", sty)] @@ -359,7 +361,7 @@ inlineToOpenDocument o ils | Code s <- ils = preformatted s | Math _ s <- ils = inlinesToOpenDocument o (readTeXMath s) | Cite _ l <- ils = inlinesToOpenDocument o l - | TeX s <- ils = preformatted s + | TeX _ <- ils = return empty | HtmlInline s <- ils = preformatted s | Link l (s,t) <- ils = mkLink s t <$> inlinesToOpenDocument o l | Image _ (s,_) <- ils = return $ mkImg s |