git.iko.soy/typeable/pandoc
on master help sign in
RST reader: don't insert paragraphs where docutils doesn't.
b04dfdeJohn MacFarlane
src/Text/Pandoc/Readers/RST.hs+6−1
compare with master
unifiedsplit
@@ -441,7 +441,12 @@ listItem start = try $ do
441 -- parse the extracted block, which may itself contain block elements
441 -- parse the extracted block, which may itself contain block elements
442 parsed <- parseFromString parseBlocks $ concat (first:rest) ++ blanks
442 parsed <- parseFromString parseBlocks $ concat (first:rest) ++ blanks
443 updateState (\st -> st {stateParserContext = oldContext})
443 updateState (\st -> st {stateParserContext = oldContext})
444+ return $ case B.toList parsed of
445+ [Para xs] -> B.singleton $ Plain xs
446+ [Para xs, BulletList ys] -> B.fromList [Plain xs, BulletList ys]
447+ [Para xs, OrderedList s ys] -> B.fromList [Plain xs, OrderedList s ys]
448+ [Para xs, DefinitionList ys] -> B.fromList [Plain xs, DefinitionList ys]
444− return parsed
449+ _ -> parsed
445
450
446orderedList :: RSTParser Blocks
451orderedList :: RSTParser Blocks
447orderedList = try $ do
452orderedList = try $ do
tests/rst-reader.native+26−26
@@ -51,9 +51,9 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":
51 ,[Plain [Str "asterisk",Space,Str "3"]]]
51 ,[Plain [Str "asterisk",Space,Str "3"]]]
52,Para [Str "Asterisks",Space,Str "loose:"]
52,Para [Str "Asterisks",Space,Str "loose:"]
53,BulletList
53,BulletList
54− [[Para [Str "asterisk",Space,Str "1"]]
54+ [[Plain [Str "asterisk",Space,Str "1"]]
55− ,[Para [Str "asterisk",Space,Str "2"]]
55+ ,[Plain [Str "asterisk",Space,Str "2"]]
56− ,[Para [Str "asterisk",Space,Str "3"]]]
56+ ,[Plain [Str "asterisk",Space,Str "3"]]]
57,Para [Str "Pluses",Space,Str "tight:"]
57,Para [Str "Pluses",Space,Str "tight:"]
58,BulletList
58,BulletList
59 [[Plain [Str "Plus",Space,Str "1"]]
59 [[Plain [Str "Plus",Space,Str "1"]]
@@ -61,9 +61,9 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":
61 ,[Plain [Str "Plus",Space,Str "3"]]]
61 ,[Plain [Str "Plus",Space,Str "3"]]]
62,Para [Str "Pluses",Space,Str "loose:"]
62,Para [Str "Pluses",Space,Str "loose:"]
63,BulletList
63,BulletList
64− [[Para [Str "Plus",Space,Str "1"]]
64+ [[Plain [Str "Plus",Space,Str "1"]]
65− ,[Para [Str "Plus",Space,Str "2"]]
65+ ,[Plain [Str "Plus",Space,Str "2"]]
66− ,[Para [Str "Plus",Space,Str "3"]]]
66+ ,[Plain [Str "Plus",Space,Str "3"]]]
67,Para [Str "Minuses",Space,Str "tight:"]
67,Para [Str "Minuses",Space,Str "tight:"]
68,BulletList
68,BulletList
69 [[Plain [Str "Minus",Space,Str "1"]]
69 [[Plain [Str "Minus",Space,Str "1"]]
@@ -71,9 +71,9 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":
71 ,[Plain [Str "Minus",Space,Str "3"]]]
71 ,[Plain [Str "Minus",Space,Str "3"]]]
72,Para [Str "Minuses",Space,Str "loose:"]
72,Para [Str "Minuses",Space,Str "loose:"]
73,BulletList
73,BulletList
74− [[Para [Str "Minus",Space,Str "1"]]
74+ [[Plain [Str "Minus",Space,Str "1"]]
75− ,[Para [Str "Minus",Space,Str "2"]]
75+ ,[Plain [Str "Minus",Space,Str "2"]]
76− ,[Para [Str "Minus",Space,Str "3"]]]
76+ ,[Plain [Str "Minus",Space,Str "3"]]]
77,Header 2 ("",[],[]) [Str "Ordered"]
77,Header 2 ("",[],[]) [Str "Ordered"]
78,Para [Str "Tight:"]
78,Para [Str "Tight:"]
79,OrderedList (1,Decimal,Period)
79,OrderedList (1,Decimal,Period)
@@ -87,37 +87,37 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":
87 ,[Plain [Str "Three"]]]
87 ,[Plain [Str "Three"]]]
88,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
88,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
89,OrderedList (1,Decimal,Period)
89,OrderedList (1,Decimal,Period)
90− [[Para [Str "First"]]
90+ [[Plain [Str "First"]]
91− ,[Para [Str "Second"]]
91+ ,[Plain [Str "Second"]]
92− ,[Para [Str "Third"]]]
92+ ,[Plain [Str "Third"]]]
93,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
93,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
94,OrderedList (1,Decimal,Period)
94,OrderedList (1,Decimal,Period)
95− [[Para [Str "One"]]
95+ [[Plain [Str "One"]]
96− ,[Para [Str "Two"]]
96+ ,[Plain [Str "Two"]]
97− ,[Para [Str "Three"]]]
97+ ,[Plain [Str "Three"]]]
98,Para [Str "Multiple",Space,Str "paragraphs:"]
98,Para [Str "Multiple",Space,Str "paragraphs:"]
99,OrderedList (1,Decimal,Period)
99,OrderedList (1,Decimal,Period)
100 [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
100 [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
101 ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",Space,Str "back."]]
101 ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",Space,Str "back."]]
102− ,[Para [Str "Item",Space,Str "2."]]
102+ ,[Plain [Str "Item",Space,Str "2."]]
103− ,[Para [Str "Item",Space,Str "3."]]]
103+ ,[Plain [Str "Item",Space,Str "3."]]]
104,Para [Str "Nested:"]
104,Para [Str "Nested:"]
105,BulletList
105,BulletList
106− [[Para [Str "Tab"]
106+ [[Plain [Str "Tab"]
107 ,BulletList
107 ,BulletList
108− [[Para [Str "Tab"]
108+ [[Plain [Str "Tab"]
109 ,BulletList
109 ,BulletList
110 [[Plain [Str "Tab"]]]]]]]
110 [[Plain [Str "Tab"]]]]]]]
111,Para [Str "Here\8217s",Space,Str "another:"]
111,Para [Str "Here\8217s",Space,Str "another:"]
112,OrderedList (1,Decimal,Period)
112,OrderedList (1,Decimal,Period)
113− [[Para [Str "First"]]
113+ [[Plain [Str "First"]]
114 ,[Para [Str "Second:"]
114 ,[Para [Str "Second:"]
115 ,BlockQuote
115 ,BlockQuote
116 [BulletList
116 [BulletList
117 [[Plain [Str "Fee"]]
117 [[Plain [Str "Fee"]]
118 ,[Plain [Str "Fie"]]
118 ,[Plain [Str "Fie"]]
119 ,[Plain [Str "Foe"]]]]]
119 ,[Plain [Str "Foe"]]]]]
120− ,[Para [Str "Third"]]]
120+ ,[Plain [Str "Third"]]]
121,Header 2 ("",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
121,Header 2 ("",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
122,OrderedList (2,Decimal,TwoParens)
122,OrderedList (2,Decimal,TwoParens)
123 [[Plain [Str "begins",Space,Str "with",Space,Str "2"]]
123 [[Plain [Str "begins",Space,Str "with",Space,Str "2"]]
@@ -125,23 +125,23 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":
125 ,Para [Str "with",Space,Str "a",Space,Str "continuation"]
125 ,Para [Str "with",Space,Str "a",Space,Str "continuation"]
126 ,OrderedList (4,LowerRoman,Period)
126 ,OrderedList (4,LowerRoman,Period)
127 [[Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"]]
127 [[Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"]]
128− ,[Para [Str "more",Space,Str "items"]
128+ ,[Plain [Str "more",Space,Str "items"]
129 ,OrderedList (1,UpperAlpha,TwoParens)
129 ,OrderedList (1,UpperAlpha,TwoParens)
130 [[Plain [Str "a",Space,Str "subsublist"]]
130 [[Plain [Str "a",Space,Str "subsublist"]]
131 ,[Plain [Str "a",Space,Str "subsublist"]]]]]]]
131 ,[Plain [Str "a",Space,Str "subsublist"]]]]]]]
132,Para [Str "Nesting:"]
132,Para [Str "Nesting:"]
133,OrderedList (1,UpperAlpha,Period)
133,OrderedList (1,UpperAlpha,Period)
134− [[Para [Str "Upper",Space,Str "Alpha"]
134+ [[Plain [Str "Upper",Space,Str "Alpha"]
135 ,OrderedList (1,UpperRoman,Period)
135 ,OrderedList (1,UpperRoman,Period)
136− [[Para [Str "Upper",Space,Str "Roman."]
136+ [[Plain [Str "Upper",Space,Str "Roman."]
137 ,OrderedList (6,Decimal,TwoParens)
137 ,OrderedList (6,Decimal,TwoParens)
138− [[Para [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
138+ [[Plain [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
139 ,OrderedList (3,LowerAlpha,OneParen)
139 ,OrderedList (3,LowerAlpha,OneParen)
140 [[Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
140 [[Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
141,Para [Str "Autonumbering:"]
141,Para [Str "Autonumbering:"]
142,OrderedList (1,DefaultStyle,DefaultDelim)
142,OrderedList (1,DefaultStyle,DefaultDelim)
143 [[Plain [Str "Autonumber."]]
143 [[Plain [Str "Autonumber."]]
144− ,[Para [Str "More."]
144+ ,[Plain [Str "More."]
145 ,OrderedList (1,DefaultStyle,DefaultDelim)
145 ,OrderedList (1,DefaultStyle,DefaultDelim)
146 [[Plain [Str "Nested."]]]]]
146 [[Plain [Str "Nested."]]]]]
147,Para [Str "Autonumbering",Space,Str "with",Space,Str "explicit",Space,Str "start:"]
147,Para [Str "Autonumbering",Space,Str "with",Space,Str "explicit",Space,Str "start:"]