git.iko.soy/typeable/pandoc
on master help sign in
OpenDocument writer: Use "First paragraph" style after most non-para blocks.

(Not just headers, as in the last patch.) Patch from Andrea Rossato, slightly modified by JM.

commitd1304e835670a3e025e0f1b5ca3d38dca1ee6d62 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 16 Mar 2011, 12:34 (16 years ago) parentf5cbb68
3 files changed+62−50
compare with master
unifiedsplit
src/Text/Pandoc/Writers/OpenDocument.hs+14−10 tests/tables.opendocument+9−6 tests/writer.opendocument+39−34
src/Text/Pandoc/Writers/OpenDocument.hs+14−10
@@ -113,6 +113,9 @@ inTightList f = modify (\s -> s { stTight = True }) >> f >>= \r ->
113113setInDefinitionList :: Bool -> State WriterState ()
114114setInDefinitionList b = modify $ \s -> s { stInDefinition = b }
115115
116+setFirstPara :: State WriterState ()
117+setFirstPara = modify $ \s -> s { stFirstPara = True }
118+
116119inParagraphTags :: Doc -> State WriterState Doc
117120inParagraphTags d | isEmpty d = return empty
118121inParagraphTags d = do
@@ -146,8 +149,7 @@ inTextStyle d = do
146149 return $ inTags False "text:span" [("text:style-name","T" ++ show tn)] d
147150
148151inHeaderTags :: Int -> Doc -> State WriterState Doc
149−inHeaderTags i d = do
150− modify $ \st -> st { stFirstPara = True }
152+inHeaderTags i d =
151153 return $ inTags False "text:h" [ ("text:style-name", "Heading_20_" ++ show i)
152154 , ("text:outline-level", show i)] d
153155
@@ -285,16 +287,18 @@ blockToOpenDocument :: WriterOptions -> Block -> State WriterState Doc
285287blockToOpenDocument o bs
286288 | Plain b <- bs = inParagraphTags =<< inlinesToOpenDocument o b
287289 | Para b <- bs = inParagraphTags =<< inlinesToOpenDocument o b
288− | Header i b <- bs = inHeaderTags i =<< inlinesToOpenDocument o b
289− | BlockQuote b <- bs = mkBlockQuote b
290− | CodeBlock _ s <- bs = preformatted s
290+ | Header i b <- bs = setFirstPara >>
291+ (inHeaderTags i =<< inlinesToOpenDocument o b)
292+ | BlockQuote b <- bs = setFirstPara >> mkBlockQuote b
293+ | DefinitionList b <- bs = setFirstPara >> defList b
294+ | BulletList b <- bs = setFirstPara >> bulletListToOpenDocument o b
295+ | OrderedList a b <- bs = setFirstPara >> orderedList a b
296+ | CodeBlock _ s <- bs = setFirstPara >> preformatted s
297+ | Table c a w h r <- bs = setFirstPara >> table c a w h r
298+ | HorizontalRule <- bs = setFirstPara >> return (selfClosingTag "text:p"
299+ [ ("text:style-name", "Horizontal_20_Line") ])
291300 | RawBlock _ _ <- bs = return empty
292− | DefinitionList b <- bs = defList b
293− | BulletList b <- bs = bulletListToOpenDocument o b
294− | OrderedList a b <- bs = orderedList a b
295− | Table c a w h r <- bs = table c a w h r
296301 | Null <- bs = return empty
297− | HorizontalRule <- bs = return $ selfClosingTag "text:p" [ ("text:style-name", "Horizontal_20_Line") ]
298302 | otherwise = return empty
299303 where
300304 defList b = do setInDefinitionList True
tests/tables.opendocument+9−6
@@ -65,7 +65,8 @@
6565</table:table>
6666<text:p text:style-name="Caption">Demonstration of simple table
6767syntax.</text:p>
68−<text:p text:style-name="Text_20_body">Simple table without caption:</text:p>
68+<text:p text:style-name="First_20_paragraph">Simple table without
69+caption:</text:p>
6970<table:table table:name="Table2" table:style-name="Table2">
7071 <table:table-column table:style-name="Table2.A" />
7172 <table:table-column table:style-name="Table2.B" />
@@ -130,7 +131,7 @@ syntax.</text:p>
130131 </table:table-cell>
131132 </table:table-row>
132133</table:table>
133−<text:p text:style-name="Text_20_body">Simple table indented two
134+<text:p text:style-name="First_20_paragraph">Simple table indented two
134135spaces:</text:p>
135136<table:table table:name="Table3" table:style-name="Table3">
136137 <table:table-column table:style-name="Table3.A" />
@@ -198,7 +199,8 @@ spaces:</text:p>
198199</table:table>
199200<text:p text:style-name="Caption">Demonstration of simple table
200201syntax.</text:p>
201−<text:p text:style-name="Text_20_body">Multiline table with caption:</text:p>
202+<text:p text:style-name="First_20_paragraph">Multiline table with
203+caption:</text:p>
202204<table:table table:name="Table4" table:style-name="Table4">
203205 <table:table-column table:style-name="Table4.A" />
204206 <table:table-column table:style-name="Table4.B" />
@@ -253,7 +255,7 @@ syntax.</text:p>
253255</table:table>
254256<text:p text:style-name="Caption">Here's the caption. It may span multiple
255257lines.</text:p>
256−<text:p text:style-name="Text_20_body">Multiline table without
258+<text:p text:style-name="First_20_paragraph">Multiline table without
257259caption:</text:p>
258260<table:table table:name="Table5" table:style-name="Table5">
259261 <table:table-column table:style-name="Table5.A" />
@@ -307,7 +309,8 @@ caption:</text:p>
307309 </table:table-cell>
308310 </table:table-row>
309311</table:table>
310−<text:p text:style-name="Text_20_body">Table without column headers:</text:p>
312+<text:p text:style-name="First_20_paragraph">Table without column
313+headers:</text:p>
311314<table:table table:name="Table6" table:style-name="Table6">
312315 <table:table-column table:style-name="Table6.A" />
313316 <table:table-column table:style-name="Table6.B" />
@@ -356,7 +359,7 @@ caption:</text:p>
356359 </table:table-cell>
357360 </table:table-row>
358361</table:table>
359−<text:p text:style-name="Text_20_body">Multiline table without column
362+<text:p text:style-name="First_20_paragraph">Multiline table without column
360363headers:</text:p>
361364<table:table table:name="Table7" table:style-name="Table7">
362365 <table:table-column table:style-name="Table7.A" />
tests/writer.opendocument+39−34
@@ -910,8 +910,8 @@ short.</text:p>
910910<text:p text:style-name="P2">Nested block quotes:</text:p>
911911<text:p text:style-name="P7">nested</text:p>
912912<text:p text:style-name="P8">nested</text:p>
913−<text:p text:style-name="Text_20_body">This should not be a block quote: 2
914−&gt; 1.</text:p>
913+<text:p text:style-name="First_20_paragraph">This should not be a block quote:
914+2 &gt; 1.</text:p>
915915<text:p text:style-name="Text_20_body">And a following paragraph.</text:p>
916916<text:p text:style-name="Horizontal_20_Line" />
917917<text:h text:style-name="Heading_20_1" text:outline-level="1">Code
@@ -924,7 +924,7 @@ Blocks</text:h>
924924<text:p text:style-name="P13">}</text:p>
925925<text:p text:style-name="P14"></text:p>
926926<text:p text:style-name="P15">this code block is indented by one tab</text:p>
927−<text:p text:style-name="Text_20_body">And:</text:p>
927+<text:p text:style-name="First_20_paragraph">And:</text:p>
928928<text:p text:style-name="P16"><text:s text:c="4" />this code block is indented by two tabs</text:p>
929929<text:p text:style-name="P17"></text:p>
930930<text:p text:style-name="P18">These should not be escaped: <text:s text:c="1" />\$ \\ \&gt; \[ \{</text:p>
@@ -943,7 +943,7 @@ Blocks</text:h>
943943 <text:p text:style-name="P19">asterisk 3</text:p>
944944 </text:list-item>
945945</text:list>
946−<text:p text:style-name="Text_20_body">Asterisks loose:</text:p>
946+<text:p text:style-name="First_20_paragraph">Asterisks loose:</text:p>
947947<text:list text:style-name="L3">
948948 <text:list-item>
949949 <text:p text:style-name="P20">asterisk 1</text:p>
@@ -955,7 +955,7 @@ Blocks</text:h>
955955 <text:p text:style-name="P20">asterisk 3</text:p>
956956 </text:list-item>
957957</text:list>
958−<text:p text:style-name="Text_20_body">Pluses tight:</text:p>
958+<text:p text:style-name="First_20_paragraph">Pluses tight:</text:p>
959959<text:list text:style-name="L4">
960960 <text:list-item>
961961 <text:p text:style-name="P21">Plus 1</text:p>
@@ -967,7 +967,7 @@ Blocks</text:h>
967967 <text:p text:style-name="P21">Plus 3</text:p>
968968 </text:list-item>
969969</text:list>
970−<text:p text:style-name="Text_20_body">Pluses loose:</text:p>
970+<text:p text:style-name="First_20_paragraph">Pluses loose:</text:p>
971971<text:list text:style-name="L5">
972972 <text:list-item>
973973 <text:p text:style-name="P22">Plus 1</text:p>
@@ -979,7 +979,7 @@ Blocks</text:h>
979979 <text:p text:style-name="P22">Plus 3</text:p>
980980 </text:list-item>
981981</text:list>
982−<text:p text:style-name="Text_20_body">Minuses tight:</text:p>
982+<text:p text:style-name="First_20_paragraph">Minuses tight:</text:p>
983983<text:list text:style-name="L6">
984984 <text:list-item>
985985 <text:p text:style-name="P23">Minus 1</text:p>
@@ -991,7 +991,7 @@ Blocks</text:h>
991991 <text:p text:style-name="P23">Minus 3</text:p>
992992 </text:list-item>
993993</text:list>
994−<text:p text:style-name="Text_20_body">Minuses loose:</text:p>
994+<text:p text:style-name="First_20_paragraph">Minuses loose:</text:p>
995995<text:list text:style-name="L7">
996996 <text:list-item>
997997 <text:p text:style-name="P24">Minus 1</text:p>
@@ -1016,7 +1016,7 @@ Blocks</text:h>
10161016 <text:p text:style-name="P25">Third</text:p>
10171017 </text:list-item>
10181018</text:list>
1019−<text:p text:style-name="Text_20_body">and:</text:p>
1019+<text:p text:style-name="First_20_paragraph">and:</text:p>
10201020<text:list text:style-name="L9">
10211021 <text:list-item>
10221022 <text:p text:style-name="P26">One</text:p>
@@ -1028,7 +1028,7 @@ Blocks</text:h>
10281028 <text:p text:style-name="P26">Three</text:p>
10291029 </text:list-item>
10301030</text:list>
1031−<text:p text:style-name="Text_20_body">Loose using tabs:</text:p>
1031+<text:p text:style-name="First_20_paragraph">Loose using tabs:</text:p>
10321032<text:list text:style-name="L10">
10331033 <text:list-item>
10341034 <text:p text:style-name="P27">First</text:p>
@@ -1040,7 +1040,7 @@ Blocks</text:h>
10401040 <text:p text:style-name="P27">Third</text:p>
10411041 </text:list-item>
10421042</text:list>
1043−<text:p text:style-name="Text_20_body">and using spaces:</text:p>
1043+<text:p text:style-name="First_20_paragraph">and using spaces:</text:p>
10441044<text:list text:style-name="L11">
10451045 <text:list-item>
10461046 <text:p text:style-name="P28">One</text:p>
@@ -1052,7 +1052,7 @@ Blocks</text:h>
10521052 <text:p text:style-name="P28">Three</text:p>
10531053 </text:list-item>
10541054</text:list>
1055−<text:p text:style-name="Text_20_body">Multiple paragraphs:</text:p>
1055+<text:p text:style-name="First_20_paragraph">Multiple paragraphs:</text:p>
10561056<text:list text:style-name="L12">
10571057 <text:list-item>
10581058 <text:p text:style-name="P29">Item 1, graf one.</text:p>
@@ -1103,7 +1103,7 @@ Blocks</text:h>
11031103 <text:p text:style-name="P33">Third</text:p>
11041104 </text:list-item>
11051105</text:list>
1106−<text:p text:style-name="Text_20_body">Same thing but with
1106+<text:p text:style-name="First_20_paragraph">Same thing but with
11071107paragraphs:</text:p>
11081108<text:list text:style-name="L18">
11091109 <text:list-item>
@@ -1197,7 +1197,7 @@ markers</text:h>
11971197 </text:list>
11981198 </text:list-item>
11991199</text:list>
1200−<text:p text:style-name="Text_20_body">Autonumbering:</text:p>
1200+<text:p text:style-name="First_20_paragraph">Autonumbering:</text:p>
12011201<text:list text:style-name="L24">
12021202 <text:list-item>
12031203 <text:p text:style-name="P41">Autonumber.</text:p>
@@ -1211,7 +1211,8 @@ markers</text:h>
12111211 </text:list>
12121212 </text:list-item>
12131213</text:list>
1214−<text:p text:style-name="Text_20_body">Should not be a list item:</text:p>
1214+<text:p text:style-name="First_20_paragraph">Should not be a list
1215+item:</text:p>
12151216<text:p text:style-name="Text_20_body">M.A. 2007</text:p>
12161217<text:p text:style-name="Text_20_body">B. Williams</text:p>
12171218<text:p text:style-name="Horizontal_20_Line" />
@@ -1226,7 +1227,7 @@ fruit</text:p>
12261227<text:p text:style-name="Definition_20_Term_20_Tight">banana</text:p>
12271228<text:p text:style-name="Definition_20_Definition_20_Tight">yellow
12281229fruit</text:p>
1229−<text:p text:style-name="Text_20_body">Tight using tabs:</text:p>
1230+<text:p text:style-name="First_20_paragraph">Tight using tabs:</text:p>
12301231<text:p text:style-name="Definition_20_Term_20_Tight">apple</text:p>
12311232<text:p text:style-name="Definition_20_Definition_20_Tight">red fruit</text:p>
12321233<text:p text:style-name="Definition_20_Term_20_Tight">orange</text:p>
@@ -1235,14 +1236,15 @@ fruit</text:p>
12351236<text:p text:style-name="Definition_20_Term_20_Tight">banana</text:p>
12361237<text:p text:style-name="Definition_20_Definition_20_Tight">yellow
12371238fruit</text:p>
1238−<text:p text:style-name="Text_20_body">Loose:</text:p>
1239+<text:p text:style-name="First_20_paragraph">Loose:</text:p>
12391240<text:p text:style-name="Definition_20_Term">apple</text:p>
12401241<text:p text:style-name="Definition_20_Definition">red fruit</text:p>
12411242<text:p text:style-name="Definition_20_Term">orange</text:p>
12421243<text:p text:style-name="Definition_20_Definition">orange fruit</text:p>
12431244<text:p text:style-name="Definition_20_Term">banana</text:p>
12441245<text:p text:style-name="Definition_20_Definition">yellow fruit</text:p>
1245−<text:p text:style-name="Text_20_body">Multiple blocks with italics:</text:p>
1246+<text:p text:style-name="First_20_paragraph">Multiple blocks with
1247+italics:</text:p>
12461248<text:p text:style-name="Definition_20_Term"><text:span text:style-name="T3">apple</text:span></text:p>
12471249<text:p text:style-name="Definition_20_Definition">red
12481250fruit</text:p><text:p text:style-name="Definition_20_Definition">contains
@@ -1250,7 +1252,8 @@ seeds, crisp, pleasant to taste</text:p>
12501252<text:p text:style-name="Definition_20_Term"><text:span text:style-name="T4">orange</text:span></text:p>
12511253<text:p text:style-name="Definition_20_Definition">orange fruit</text:p><text:p text:style-name="P42">{ orange code block }</text:p><text:p text:style-name="P43">orange
12521254block quote</text:p>
1253−<text:p text:style-name="Text_20_body">Multiple definitions, tight:</text:p>
1255+<text:p text:style-name="First_20_paragraph">Multiple definitions,
1256+tight:</text:p>
12541257<text:p text:style-name="Definition_20_Term_20_Tight">apple</text:p>
12551258<text:p text:style-name="Definition_20_Definition_20_Tight">red fruit</text:p>
12561259<text:p text:style-name="Definition_20_Definition_20_Tight">computer</text:p>
@@ -1258,15 +1261,16 @@ block quote</text:p>
12581261<text:p text:style-name="Definition_20_Definition_20_Tight">orange
12591262fruit</text:p>
12601263<text:p text:style-name="Definition_20_Definition_20_Tight">bank</text:p>
1261−<text:p text:style-name="Text_20_body">Multiple definitions, loose:</text:p>
1264+<text:p text:style-name="First_20_paragraph">Multiple definitions,
1265+loose:</text:p>
12621266<text:p text:style-name="Definition_20_Term">apple</text:p>
12631267<text:p text:style-name="Definition_20_Definition">red fruit</text:p>
12641268<text:p text:style-name="Definition_20_Definition">computer</text:p>
12651269<text:p text:style-name="Definition_20_Term">orange</text:p>
12661270<text:p text:style-name="Definition_20_Definition">orange fruit</text:p>
12671271<text:p text:style-name="Definition_20_Definition">bank</text:p>
1268−<text:p text:style-name="Text_20_body">Blank line after term, indented marker,
1269−alternate markers:</text:p>
1272+<text:p text:style-name="First_20_paragraph">Blank line after term, indented
1273+marker, alternate markers:</text:p>
12701274<text:p text:style-name="Definition_20_Term">apple</text:p>
12711275<text:p text:style-name="Definition_20_Definition">red fruit</text:p>
12721276<text:p text:style-name="Definition_20_Definition">computer</text:p>
@@ -1302,20 +1306,20 @@ though:</text:p>
13021306<text:p text:style-name="P45">&lt;div&gt;</text:p>
13031307<text:p text:style-name="P46"><text:s text:c="4" />foo</text:p>
13041308<text:p text:style-name="P47">&lt;/div&gt;</text:p>
1305−<text:p text:style-name="Text_20_body">As should this:</text:p>
1309+<text:p text:style-name="First_20_paragraph">As should this:</text:p>
13061310<text:p text:style-name="P48">&lt;div&gt;foo&lt;/div&gt;</text:p>
1307−<text:p text:style-name="Text_20_body">Now, nested:</text:p>
1311+<text:p text:style-name="First_20_paragraph">Now, nested:</text:p>
13081312<text:p text:style-name="Text_20_body">foo</text:p>
13091313<text:p text:style-name="Text_20_body">This should just be an HTML
13101314comment:</text:p>
13111315<text:p text:style-name="Text_20_body">Multiline:</text:p>
13121316<text:p text:style-name="Text_20_body">Code block:</text:p>
13131317<text:p text:style-name="P49">&lt;!-- Comment --&gt;</text:p>
1314−<text:p text:style-name="Text_20_body">Just plain comment, with trailing
1318+<text:p text:style-name="First_20_paragraph">Just plain comment, with trailing
13151319spaces on the line:</text:p>
13161320<text:p text:style-name="Text_20_body">Code:</text:p>
13171321<text:p text:style-name="P50">&lt;hr /&gt;</text:p>
1318−<text:p text:style-name="Text_20_body">Hr&#8217;s:</text:p>
1322+<text:p text:style-name="First_20_paragraph">Hr&#8217;s:</text:p>
13191323<text:p text:style-name="Horizontal_20_Line" />
13201324<text:h text:style-name="Heading_20_1" text:outline-level="1">Inline
13211325Markup</text:h>
@@ -1439,7 +1443,8 @@ math:</text:p>
14391443 23$.</text:p>
14401444 </text:list-item>
14411445</text:list>
1442−<text:p text:style-name="Text_20_body">Here&#8217;s a LaTeX table:</text:p>
1446+<text:p text:style-name="First_20_paragraph">Here&#8217;s a LaTeX
1447+table:</text:p>
14431448<text:p text:style-name="Horizontal_20_Line" />
14441449<text:h text:style-name="Heading_20_1" text:outline-level="1">Special
14451450Characters</text:h>
@@ -1461,8 +1466,8 @@ Characters</text:h>
14611466 <text:p text:style-name="P53">copyright: ©</text:p>
14621467 </text:list-item>
14631468</text:list>
1464−<text:p text:style-name="Text_20_body">AT&amp;T has an ampersand in their
1465−name.</text:p>
1469+<text:p text:style-name="First_20_paragraph">AT&amp;T has an ampersand in
1470+their name.</text:p>
14661471<text:p text:style-name="Text_20_body">AT&amp;T is another way to write
14671472it.</text:p>
14681473<text:p text:style-name="Text_20_body">This &amp; that.</text:p>
@@ -1523,7 +1528,7 @@ by itself should be a link.</text:p>
15231528<text:a xlink:type="simple" xlink:href="/url" office:name=""><text:span text:style-name="Definition">thrice</text:span></text:a>.</text:p>
15241529<text:p text:style-name="Text_20_body">This should [not][] be a link.</text:p>
15251530<text:p text:style-name="P54">[not]: /url</text:p>
1526−<text:p text:style-name="Text_20_body">Foo
1531+<text:p text:style-name="First_20_paragraph">Foo
15271532<text:a xlink:type="simple" xlink:href="/url/" office:name="Title with &quot;quotes&quot; inside"><text:span text:style-name="Definition">bar</text:span></text:a>.</text:p>
15281533<text:p text:style-name="Text_20_body">Foo
15291534<text:a xlink:type="simple" xlink:href="/url/" office:name="Title with &quot;quote&quot; inside"><text:span text:style-name="Definition">biz</text:span></text:a>.</text:p>
@@ -1555,11 +1560,11 @@ link in pointy braces</text:span></text:a>.</text:p>
15551560 <text:p text:style-name="P55">It should.</text:p>
15561561 </text:list-item>
15571562</text:list>
1558−<text:p text:style-name="Text_20_body">An e-mail address:
1563+<text:p text:style-name="First_20_paragraph">An e-mail address:
15591564<text:a xlink:type="simple" xlink:href="mailto:nobody@nowhere.net" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="Teletype">nobody@nowhere.net</text:span></text:span></text:a></text:p>
15601565<text:p text:style-name="P56">Blockquoted:
15611566<text:a xlink:type="simple" xlink:href="http://example.com/" office:name=""><text:span text:style-name="Definition"><text:span text:style-name="Teletype">http://example.com/</text:span></text:span></text:a></text:p>
1562−<text:p text:style-name="Text_20_body">Auto-links should not occur here:
1567+<text:p text:style-name="First_20_paragraph">Auto-links should not occur here:
15631568<text:span text:style-name="Teletype">&lt;http://example.com/&gt;</text:span></text:p>
15641569<text:p text:style-name="P57">or here: &lt;http://example.com/&gt;</text:p>
15651570<text:p text:style-name="Horizontal_20_Line" />
@@ -1602,8 +1607,8 @@ quote.</text:p></text:note-body></text:note></text:p>
16021607 list.</text:p></text:note-body></text:note></text:p>
16031608 </text:list-item>
16041609</text:list>
1605−<text:p text:style-name="Text_20_body">This paragraph should not be part of
1606−the note, as it is not indented.</text:p>
1610+<text:p text:style-name="First_20_paragraph">This paragraph should not be part
1611+of the note, as it is not indented.</text:p>
16071612</office:text>
16081613</office:body>
16091614</office:document-content>