Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into citeproc

Browse source
This commit is contained in:
John MacFarlane 2010-11-27 14:58:23 -08:00
commit f64983f879
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Text/Pandoc/Writers/OpenDocument.hs
View file

@ -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

7
tests/writer.opendocument
View file

@ -1301,7 +1301,7 @@
<text:h text:style-name="Heading_20_1" text:outline-level="1">LaTeX</text:h>
<text:list text:style-name="L26">
<text:list-item>
<text:p text:style-name="P51"><text:span text:style-name="Teletype">\cite[22-23]{smith.1899}</text:span></text:p>
<text:p text:style-name="P51"></text:p>
</text:list-item>
<text:list-item>
<text:p text:style-name="P51">2 + 2 = 4</text:p>
@ -1341,11 +1341,6 @@
</text:list-item>
</text:list>
<text:p text:style-name="Text_20_body">Here&#8217;s a LaTeX table:</text:p>
<text:p text:style-name="Text_20_body"><text:span text:style-name="Teletype">\begin{tabular}{|l|l|}\hline
Animal &amp; Number \\ \hline
Dog <text:s text:c="3" />&amp; 2 <text:s text:c="5" />\\
Cat <text:s text:c="3" />&amp; 1 <text:s text:c="5" />\\ \hline
\end{tabular}</text:span></text:p>
<text:p text:style-name="Horizontal_20_Line" />
<text:h text:style-name="Heading_20_1" text:outline-level="1">Special Characters</text:h>
<text:p text:style-name="Text_20_body">Here is some unicode:</text:p>