git.iko.soy/typeable/pandoc
on master help sign in
DocBook writer: Small tweaks to last commit.

* Use isTightList from Shared. * Adjust writer test, since isTightList is a bit different from what was used before. Closes #1250.

commitabd3a039b9adcafa8aa1df6e0753a725f90c78fc authorJohn MacFarlane <jgm@berkeley.edu> dateSat 3 May 2014, 20:45 (12 years ago) parentccbf4fc
2 files changed+4−10
src/Text/Pandoc/Writers/Docbook.hs+3−9 tests/writer.docbook+1−1
src/Text/Pandoc/Writers/Docbook.hs+3−9
@@ -185,9 +185,7 @@ blockToDocbook _ (CodeBlock (_,classes,_) str) =
185185 else languagesByExtension . map toLower $ s
186186 langs = concatMap langsFrom classes
187187blockToDocbook opts (BulletList lst) =
188− let attribs = case lst of
189− ((Plain _:_):_) -> [("spacing", "compact")]
190− _ -> []
188+ let attribs = [("spacing", "compact") | isTightList lst]
191189 in inTags True "itemizedlist" attribs $ listItemsToDocbook opts lst
192190blockToDocbook _ (OrderedList _ []) = empty
193191blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =
@@ -199,9 +197,7 @@ blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =
199197 LowerAlpha -> [("numeration", "loweralpha")]
200198 UpperRoman -> [("numeration", "upperroman")]
201199 LowerRoman -> [("numeration", "lowerroman")]
202− spacing = case first of
203− (Plain _:_) -> [("spacing", "compact")]
204− _ -> []
200+ spacing = [("spacing", "compact") | isTightList (first:rest)]
205201 attribs = numeration ++ spacing
206202 items = if start == 1
207203 then listItemsToDocbook opts (first:rest)
@@ -210,9 +206,7 @@ blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =
210206 listItemsToDocbook opts rest
211207 in inTags True "orderedlist" attribs items
212208blockToDocbook opts (DefinitionList lst) =
213− let attribs = case lst of
214− ((_, (Plain _:_):_):_) -> [("spacing", "compact")]
215− _ -> []
209+ let attribs = [("spacing", "compact") | isTightList $ concatMap snd lst]
216210 in inTags True "variablelist" attribs $ deflistItemsToDocbook opts lst
217211blockToDocbook _ (RawBlock f str)
218212 | f == "docbook" = text str -- raw XML block
tests/writer.docbook+1−1
@@ -508,7 +508,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{
508508 </sect2>
509509 <sect2 id="fancy-list-markers">
510510 <title>Fancy list markers</title>
511− <orderedlist numeration="arabic" spacing="compact">
511+ <orderedlist numeration="arabic">
512512 <listitem override="2">
513513 <para>
514514 begins with 2