Updated docbook writer to use new templates.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1728 788f1e2b-df1e-0410-8736-df70ead52e1b

src/Text/Pandoc/Writers/Docbook.hs

@@ -31,6 +31,7 @@ module Text.Pandoc.Writers.Docbook ( writeDocbook) where
 import Text.Pandoc.Definition
 import Text.Pandoc.XML
 import Text.Pandoc.Shared
+import Text.Pandoc.Templates (renderTemplate)
 import Text.Pandoc.Readers.TeXMath
 import Data.List ( isPrefixOf, drop, intercalate )
 import Data.Char ( toLower )
@@ -38,47 +39,46 @@ import Text.PrettyPrint.HughesPJ hiding ( Str )
 import Text.Pandoc.Highlighting (languages, languagesByExtension)
 
 -- | Convert list of authors to a docbook <author> section
-authorToDocbook :: [Char] -> Doc
-authorToDocbook name = inTagsIndented "author" $ 
-  if ',' `elem` name
-    then -- last name first
-         let (lastname, rest) = break (==',') name 
-             firstname = removeLeadingSpace rest in
-         inTagsSimple "firstname" (text $ escapeStringForXML firstname) <> 
-         inTagsSimple "surname" (text $ escapeStringForXML lastname) 
-    else -- last name last
-         let namewords = words name
-             lengthname = length namewords 
-             (firstname, lastname) = case lengthname of
-               0  -> ("","") 
-               1  -> ("", name)
-               n  -> (intercalate " " (take (n-1) namewords), last namewords)
-          in inTagsSimple "firstname" (text $ escapeStringForXML firstname) $$ 
-             inTagsSimple "surname" (text $ escapeStringForXML lastname) 
+authorToDocbook :: WriterOptions -> [Inline] -> Doc
+authorToDocbook opts name' =
+  let name = render $ inlinesToDocbook opts name'
+  in  if ',' `elem` name
+         then -- last name first
+              let (lastname, rest) = break (==',') name 
+                  firstname = removeLeadingSpace rest in
+              inTagsSimple "firstname" (text $ escapeStringForXML firstname) <> 
+              inTagsSimple "surname" (text $ escapeStringForXML lastname) 
+         else -- last name last
+              let namewords = words name
+                  lengthname = length namewords 
+                  (firstname, lastname) = case lengthname of
+                    0  -> ("","") 
+                    1  -> ("", name)
+                    n  -> (intercalate " " (take (n-1) namewords), last namewords)
+               in inTagsSimple "firstname" (text $ escapeStringForXML firstname) $$ 
+                  inTagsSimple "surname" (text $ escapeStringForXML lastname) 
 
 -- | Convert Pandoc document to string in Docbook format.
 writeDocbook :: WriterOptions -> Pandoc -> String
-writeDocbook opts (Pandoc (Meta title authors date) blocks) = 
-  "" -- TODO 
---  let head'    = if writerStandalone opts
---                    then text (writerHeader opts)
---                    else empty
---      meta     = if writerStandalone opts
---                    then inTagsIndented "articleinfo" $
---                         (inTagsSimple "title" (wrap opts title)) $$ 
---                         (vcat (map authorToDocbook authors)) $$ 
---                         (inTagsSimple "date" (text $ escapeStringForXML date)) 
---                    else empty
---      elements = hierarchicalize blocks
---      before   = writerIncludeBefore opts
---      after    = writerIncludeAfter opts
---      body     = (if null before then empty else text before) $$
---                 vcat (map (elementToDocbook opts) elements) $$
---                 (if null after then empty else text after)
---      body'    = if writerStandalone opts
---                   then inTagsIndented "article" (meta $$ body)
---                   else body 
---  in  render $ head' $$ body' $$ text ""
+writeDocbook opts (Pandoc (Meta tit auths dat) blocks) = 
+  let title = wrap opts tit
+      authors = map (authorToDocbook opts) auths
+      date = inlinesToDocbook opts dat
+      elements = hierarchicalize blocks
+      before   = writerIncludeBefore opts
+      after    = writerIncludeAfter opts
+      main     = render $
+                 (if null before then empty else text before) $$
+                 vcat (map (elementToDocbook opts) elements) $$
+                 (if null after then empty else text after)
+      context = writerVariables opts ++
+                [ ("body", main)
+                , ("title", render title)
+                , ("date", render date) ] ++
+                [ ("author", render a) | a <- authors ]
+  in  if writerStandalone opts
+         then renderTemplate context $ writerTemplate opts
+         else main
 
 -- | Convert an Element to Docbook.
 elementToDocbook :: WriterOptions -> Element -> Doc

templates/docbook.template

@@ -1,10 +1,22 @@
 $if(legacy-header)$
+$legacy-header$
+$else$
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 $endif$
 <article>
-$metadata$
+  <articleinfo>
+    <title>$title$</title>
+$for(author)$
+    <author>
+      $author$
+    </author>
+$endfor$
+$if(date)$
+    <date>$date$</date>
+$endif$
+  </articleinfo>
 $body$
 </article>
 

tests/tables.docbook

@@ -284,4 +284,3 @@
     </td>
   </tr>
 </informaltable>
-