From 0910e9218728c85feb562745ed5eb44d586e824d Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 16 Aug 2018 21:06:49 -0700
Subject: [PATCH] TEI improvements.

- Ensure that title element is always present, even if empty.
- Put author tags in the template, rather than adding them in
  the writer.

Closes #4839.
---
 data/templates/default.tei     |  4 +---
 src/Text/Pandoc/Writers/TEI.hs | 15 +--------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/data/templates/default.tei b/data/templates/default.tei
index 3778dccd5..824c9f0e7 100644
--- a/data/templates/default.tei
+++ b/data/templates/default.tei
@@ -3,11 +3,9 @@
 <teiHeader>
   <fileDesc>
     <titleStmt>
-$if(title)$
       <title>$title$</title>
-$endif$
 $for(author)$
-      $author$
+      <author>$author$</author>
 $endfor$
     </titleStmt>
     <publicationStmt>
diff --git a/src/Text/Pandoc/Writers/TEI.hs b/src/Text/Pandoc/Writers/TEI.hs
index e461f5715..9169c8515 100644
--- a/src/Text/Pandoc/Writers/TEI.hs
+++ b/src/Text/Pandoc/Writers/TEI.hs
@@ -35,7 +35,6 @@ import Prelude
 import Data.Char (toLower)
 import Data.List (isPrefixOf, stripPrefix)
 import Data.Text (Text)
-import qualified Text.Pandoc.Builder as B
 import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Definition
 import Text.Pandoc.Highlighting (languages, languagesByExtension)
@@ -48,16 +47,6 @@ import Text.Pandoc.Templates (renderTemplate')
 import Text.Pandoc.Writers.Shared
 import Text.Pandoc.XML
 
--- | Convert list of authors to a docbook <author> section
-authorToTEI :: PandocMonad m => WriterOptions -> [Inline] -> m B.Inlines
-authorToTEI opts name' = do
-  name <- render Nothing <$> inlinesToTEI opts name'
-  let colwidth = if writerWrapText opts == WrapAuto
-                    then Just $ writerColumns opts
-                    else Nothing
-  return $ B.rawInline "tei" $ render colwidth $
-      inTagsSimple "author" (text $ escapeStringForXML name)
-
 -- | Convert Pandoc document to string in Docbook format.
 writeTEI :: PandocMonad m => WriterOptions -> Pandoc -> m Text
 writeTEI opts (Pandoc meta blocks) = do
@@ -72,13 +61,11 @@ writeTEI opts (Pandoc meta blocks) = do
                    TopLevelChapter -> 0
                    TopLevelSection -> 1
                    TopLevelDefault -> 1
-  auths'      <- mapM (authorToTEI opts) $ docAuthors meta
-  let meta'    = B.setMeta "author" auths' meta
   metadata <- metaToJSON opts
                  (fmap (render' . vcat) .
                    mapM (elementToTEI opts startLvl) . hierarchicalize)
                  (fmap render' . inlinesToTEI opts)
-                 meta'
+                 meta
   main    <- (render' . vcat) <$> mapM (elementToTEI opts startLvl) elements
   let context = defField "body" main
               $