From abd3a039b9adcafa8aa1df6e0753a725f90c78fc Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 3 May 2014 20:45:05 -0700
Subject: 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.
---
 src/Text/Pandoc/Writers/Docbook.hs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/Text/Pandoc/Writers/Docbook.hs')

diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs
index e1b62f02d..1a8e58354 100644
--- a/src/Text/Pandoc/Writers/Docbook.hs
+++ b/src/Text/Pandoc/Writers/Docbook.hs
@@ -185,9 +185,7 @@ blockToDocbook _ (CodeBlock (_,classes,_) str) =
                            else languagesByExtension . map toLower $ s
           langs       = concatMap langsFrom classes
 blockToDocbook opts (BulletList lst) =
-  let attribs = case lst of
-                      ((Plain _:_):_) -> [("spacing", "compact")]
-                      _               -> []
+  let attribs = [("spacing", "compact") | isTightList lst]
   in  inTags True "itemizedlist" attribs $ listItemsToDocbook opts lst
 blockToDocbook _ (OrderedList _ []) = empty
 blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =
@@ -199,9 +197,7 @@ blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =
                        LowerAlpha   -> [("numeration", "loweralpha")]
                        UpperRoman   -> [("numeration", "upperroman")]
                        LowerRoman   -> [("numeration", "lowerroman")]
-      spacing    = case first of
-                       (Plain _:_)  -> [("spacing", "compact")]
-                       _            -> []
+      spacing    = [("spacing", "compact") | isTightList (first:rest)]
       attribs    = numeration ++ spacing
       items      = if start == 1
                       then listItemsToDocbook opts (first:rest)
@@ -210,9 +206,7 @@ blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =
                            listItemsToDocbook opts rest
   in  inTags True "orderedlist" attribs items
 blockToDocbook opts (DefinitionList lst) =
-  let attribs = case lst of
-                  ((_, (Plain _:_):_):_) -> [("spacing", "compact")]
-                  _                      -> []
+  let attribs = [("spacing", "compact") | isTightList $ concatMap snd lst]
   in  inTags True "variablelist" attribs $ deflistItemsToDocbook opts lst
 blockToDocbook _ (RawBlock f str)
   | f == "docbook" = text str -- raw XML block
-- 
cgit v1.2.3