@@ -94,9 +94,9 @@ pandocToFB2 :: PandocMonad m
9494pandocToFB2 opts (Pandoc meta blocks) = do
9595 modify (\s -> s { writerOptions = opts })
9696 desc <- description meta
97− fp <- frontpage meta
97+ title <- cMapM toXml . docTitle $ meta
9898 secs <- renderSections 1 blocks
99− let body = el "body" $ fp ++ secs
99+ let body = el "body" $ el "title" (el "p" title) : secs
100100 notes <- renderFootnotes
101101 (imgs,missing) <- fmap imagesToFetch get >>= \s -> lift (fetchImages s)
102102 let body' = replaceImagesWithAlt missing body
@@ -110,15 +110,6 @@ pandocToFB2 opts (Pandoc meta blocks) = do
110110 in [ uattr "xmlns" xmlns
111111 , attr ("xmlns", "l") xlink ]
112112
113−frontpage :: PandocMonad m => Meta -> FBM m [Content]
114−frontpage meta' = do
115− t <- cMapM toXml . docTitle $ meta'
116− return
117− [ el "title" (el "p" t)
118− , el "annotation" (map (el "p" . cMap plain)
119− (docAuthors meta' ++ [docDate meta']))
120− ]
121−
122113description :: PandocMonad m => Meta -> FBM m Content
123114description meta' = do
124115 bt <- booktitle meta'