Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Added recognition of authorgroup element and releaseinfo element to DocBook reader.

Browse source 
Closes #1214
This commit is contained in:
Matthew Pickering 2014-04-04 16:21:24 +01:00 committed by John MacFarlane
parent b1c865ccc6
commit 1b930a9670
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Text/Pandoc/Readers/DocBook.hs
View file

@ -45,7 +45,7 @@ List of all DocBook tags, with [x] indicating implemented,
[ ] audioobject - A wrapper for audio data and its associated meta-information [ ] audioobject - A wrapper for audio data and its associated meta-information
[x] author - The name of an individual author [x] author - The name of an individual author
[ ] authorblurb - A short description or note about an author [ ] authorblurb - A short description or note about an author
[ ] authorgroup - Wrapper for author information when a document has [x] authorgroup - Wrapper for author information when a document has
multiple authors or collabarators multiple authors or collabarators
[x] authorinitials - The initials or other short identifier for an author [x] authorinitials - The initials or other short identifier for an author
[o] beginpage - The location of a page break in a print version of the document [o] beginpage - The location of a page break in a print version of the document
@ -341,7 +341,7 @@ List of all DocBook tags, with [x] indicating implemented,
[x] refsectioninfo - Meta-information for a refsection [x] refsectioninfo - Meta-information for a refsection
[ ] refsynopsisdiv - A syntactic synopsis of the subject of the reference page [ ] refsynopsisdiv - A syntactic synopsis of the subject of the reference page
[ ] refsynopsisdivinfo - Meta-information for a RefSynopsisDiv [ ] refsynopsisdivinfo - Meta-information for a RefSynopsisDiv
[ ] releaseinfo - Information about a particular release of a document [x] releaseinfo - Information about a particular release of a document
[ ] remark - A remark (or comment) intended for presentation in a draft [ ] remark - A remark (or comment) intended for presentation in a draft
manuscript manuscript
[ ] replaceable - Content that may or must be replaced by the user [ ] replaceable - Content that may or must be replaced by the user
@ -564,10 +564,11 @@ acceptingMetadata p = do
modify (\s -> s { dbAcceptsMeta = False }) modify (\s -> s { dbAcceptsMeta = False })
return res return res
checkInMeta :: Monoid a => DB a -> DB a checkInMeta :: Monoid a => DB () -> DB a
checkInMeta p = do checkInMeta p = do
accepts <- dbAcceptsMeta <$> get accepts <- dbAcceptsMeta <$> get
if accepts then p else return mempty when accepts p
return mempty
@ -649,9 +650,11 @@ parseBlock (Elem e) =
"attribution" -> return mempty "attribution" -> return mempty
"titleabbrev" -> return mempty "titleabbrev" -> return mempty
"authorinitials" -> return mempty "authorinitials" -> return mempty
"title" -> checkInMeta getTitle >> return mempty -- handled by getTitle or sect or figure "title" -> checkInMeta getTitle
"author" -> checkInMeta getAuthor >> return mempty "author" -> checkInMeta getAuthor
"date" -> checkInMeta getDate >> return mempty "authorgroup" -> checkInMeta getAuthorGroup
"releaseinfo" -> checkInMeta (getInlines e >>= addMeta "release")
"date" -> checkInMeta getDate
"bibliography" -> sect 0 "bibliography" -> sect 0
"bibliodiv" -> sect 1 "bibliodiv" -> sect 1
"biblioentry" -> parseMixed para (elContent e) "biblioentry" -> parseMixed para (elContent e)
@ -786,7 +789,10 @@ parseBlock (Elem e) =
Nothing -> return mempty Nothing -> return mempty
addMeta "title" (tit <> subtit) addMeta "title" (tit <> subtit)
getAuthor = getInlines e >>= addMeta "author" getAuthor = (:[]) <$> getInlines e >>= addMeta "authors"
getAuthorGroup = do
let terms = filterChildren (named "author") e
mapM getInlines terms >>= addMeta "authors"
getDate = getInlines e >>= addMeta "date" getDate = getInlines e >>= addMeta "date"
parseTable = do parseTable = do
let isCaption x = named "title" x || named "caption" x let isCaption x = named "title" x || named "caption" x
@ -849,7 +855,7 @@ parseBlock (Elem e) =
b <- getBlocks e b <- getBlocks e
modify $ \st -> st{ dbSectionLevel = n - 1 } modify $ \st -> st{ dbSectionLevel = n - 1 }
return $ header n' headerText <> b return $ header n' headerText <> b
metaBlock = acceptingMetadata (getBlocks e) metaBlock = acceptingMetadata (getBlocks e) >> return mempty
getInlines :: Element -> DB Inlines getInlines :: Element -> DB Inlines
getInlines e' = (trimInlines . mconcat) <$> (mapM parseInline $ elContent e') getInlines e' = (trimInlines . mconcat) <$> (mapM parseInline $ elContent e')
@ -913,6 +919,7 @@ parseInline (Elem e) =
_ -> emph <$> innerInlines _ -> emph <$> innerInlines
"footnote" -> (note . mconcat) <$> (mapM parseBlock $ elContent e) "footnote" -> (note . mconcat) <$> (mapM parseBlock $ elContent e)
"title" -> return mempty "title" -> return mempty
"affiliation" -> return mempty
_ -> innerInlines _ -> innerInlines
where innerInlines = (trimInlines . mconcat) <$> where innerInlines = (trimInlines . mconcat) <$>
(mapM parseInline $ elContent e) (mapM parseInline $ elContent e)