diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2022-01-03 14:18:25 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2022-01-03 14:19:53 -0800 |
| commit | 53699f2ab3f9b6dce04ae44a0d0342cb78974bd1 (patch) | |
| tree | e36bd25a9589ec696281a18f085fbb51ddb06761 /test | |
| parent | ca7a3ed5ed31e0c5787926d7b775c8f57c5932a4 (diff) | |
DocBook reader: be sensitive to spacing="compact" in lists.
When spacing="compact" is set, Para elements are turned
into Plain, so we get a "tight" list.
Closes #7799.
Diffstat (limited to 'test')
| -rw-r--r-- | test/docbook-reader.docbook | 28 | ||||
| -rw-r--r-- | test/docbook-reader.native | 23 |
2 files changed, 12 insertions, 39 deletions
diff --git a/test/docbook-reader.docbook b/test/docbook-reader.docbook index 8b0b34c42..f668279ca 100644 --- a/test/docbook-reader.docbook +++ b/test/docbook-reader.docbook @@ -194,9 +194,9 @@ These should not be escaped: \$ \\ \> \[ \{ </listitem> </itemizedlist> <para> - Pluses loose: + Asterisks tight: </para> - <itemizedlist> + <itemizedlist spacing="compact"> <listitem> <para> Plus 1 @@ -213,26 +213,6 @@ These should not be escaped: \$ \\ \> \[ \{ </para> </listitem> </itemizedlist> - <para> - Minuses loose: - </para> - <itemizedlist> - <listitem> - <para> - Minus 1 - </para> - </listitem> - <listitem> - <para> - Minus 2 - </para> - </listitem> - <listitem> - <para> - Minus 3 - </para> - </listitem> - </itemizedlist> </sect2> <sect2 id="ordered"> <title>Ordered</title> @@ -254,9 +234,9 @@ These should not be escaped: \$ \\ \> \[ \{ </listitem> </orderedlist> <para> - and using spaces: + and tight: </para> - <orderedlist numeration="arabic"> + <orderedlist spacing="compact" numeration="arabic"> <listitem> <para> One diff --git a/test/docbook-reader.native b/test/docbook-reader.native index 16eef6632..cad1d17a7 100644 --- a/test/docbook-reader.native +++ b/test/docbook-reader.native @@ -336,17 +336,11 @@ Pandoc , [ Para [ Str "asterisk" , Space , Str "2" ] ] , [ Para [ Str "asterisk" , Space , Str "3" ] ] ] - , Para [ Str "Pluses" , Space , Str "loose:" ] + , Para [ Str "Asterisks" , Space , Str "tight:" ] , BulletList - [ [ Para [ Str "Plus" , Space , Str "1" ] ] - , [ Para [ Str "Plus" , Space , Str "2" ] ] - , [ Para [ Str "Plus" , Space , Str "3" ] ] - ] - , Para [ Str "Minuses" , Space , Str "loose:" ] - , BulletList - [ [ Para [ Str "Minus" , Space , Str "1" ] ] - , [ Para [ Str "Minus" , Space , Str "2" ] ] - , [ Para [ Str "Minus" , Space , Str "3" ] ] + [ [ Plain [ Str "Plus" , Space , Str "1" ] ] + , [ Plain [ Str "Plus" , Space , Str "2" ] ] + , [ Plain [ Str "Plus" , Space , Str "3" ] ] ] , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ] , OrderedList @@ -355,13 +349,12 @@ Pandoc , [ Para [ Str "Second" ] ] , [ Para [ Str "Third" ] ] ] - , Para - [ Str "and" , Space , Str "using" , Space , Str "spaces:" ] + , Para [ Str "and" , Space , Str "tight:" ] , OrderedList ( 1 , Decimal , DefaultDelim ) - [ [ Para [ Str "One" ] ] - , [ Para [ Str "Two" ] ] - , [ Para [ Str "Three" ] ] + [ [ Plain [ Str "One" ] ] + , [ Plain [ Str "Two" ] ] + , [ Plain [ Str "Three" ] ] ] , Para [ Str "Multiple" , Space , Str "paragraphs:" ] , OrderedList |