abd3a03 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

DocBook writer: Small tweaks to last commit.

abd3a03John MacFarlane12 years ago

src/Text/Pandoc/Writers/Docbook.hs+3−9

compare with master

unifiedsplit

@@ -185,9 +185,7 @@ blockToDocbook _ (CodeBlock (_,classes,_) str) =

185 else languagesByExtension . map toLower $ s

186 langs = concatMap langsFrom classes

187blockToDocbook opts (BulletList lst) =

188− let attribs = case lst of

189− ((Plain _:_):_) -> [("spacing", "compact")]

188+ let attribs = [("spacing", "compact") | isTightList lst]

190− _ -> []

191 in inTags True "itemizedlist" attribs $ listItemsToDocbook opts lst

189 in inTags True "itemizedlist" attribs $ listItemsToDocbook opts lst

192blockToDocbook _ (OrderedList _ []) = empty

190blockToDocbook _ (OrderedList _ []) = empty

193blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =

191blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =

@@ -199,9 +197,7 @@ blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =

199 LowerAlpha -> [("numeration", "loweralpha")]

197 LowerAlpha -> [("numeration", "loweralpha")]

200 UpperRoman -> [("numeration", "upperroman")]

198 UpperRoman -> [("numeration", "upperroman")]

201 LowerRoman -> [("numeration", "lowerroman")]

199 LowerRoman -> [("numeration", "lowerroman")]

202− spacing = case first of

200+ spacing = [("spacing", "compact") | isTightList (first:rest)]

203− (Plain _:_) -> [("spacing", "compact")]

204− _ -> []

205 attribs = numeration ++ spacing

201 attribs = numeration ++ spacing

206 items = if start == 1

202 items = if start == 1

207 then listItemsToDocbook opts (first:rest)

203 then listItemsToDocbook opts (first:rest)

@@ -210,9 +206,7 @@ blockToDocbook opts (OrderedList (start, numstyle, _) (first:rest)) =

210 listItemsToDocbook opts rest

206 listItemsToDocbook opts rest

211 in inTags True "orderedlist" attribs items

207 in inTags True "orderedlist" attribs items

212blockToDocbook opts (DefinitionList lst) =

208blockToDocbook opts (DefinitionList lst) =

213− let attribs = case lst of

209+ let attribs = [("spacing", "compact") | isTightList $ concatMap snd lst]

214− ((_, (Plain _:_):_):_) -> [("spacing", "compact")]

215− _ -> []

216 in inTags True "variablelist" attribs $ deflistItemsToDocbook opts lst

210 in inTags True "variablelist" attribs $ deflistItemsToDocbook opts lst

217blockToDocbook _ (RawBlock f str)

211blockToDocbook _ (RawBlock f str)

218 | f == "docbook" = text str -- raw XML block

212 | f == "docbook" = text str -- raw XML block

tests/writer.docbook+1−1

@@ -508,7 +508,7 @@ These should not be escaped: \$ \\ \> \[ \{

508 </sect2>

509 <sect2 id="fancy-list-markers">

510 <title>Fancy list markers</title>

511− <orderedlist numeration="arabic" spacing="compact">

511+ <orderedlist numeration="arabic">

512 <listitem override="2">

513 <para>

514 begins with 2