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

DocBook reader: bibliomisc and anchor support (#6754)

Browse source 
Also do some minor refactoring - bibliodiv without
a title no longer results in an empty Header.
This commit is contained in:
Nils Carlson 2020-10-17 06:52:19 +00:00 committed by GitHub
parent ae4e9d3b38
commit 2332a08f1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ List of all DocBook tags, with [x] indicating implemented,
[o] address - A real-world address, generally a postal address
[ ] affiliation - The institutional affiliation of an individual
[ ] alt - Text representation for a graphical element
[o] anchor - A spot in the document
[x] anchor - A spot in the document
[x] answer - An answer to a question posed in a QandASet
[x] appendix - An appendix in a Book or Article
[x] appendixinfo - Meta-information for an Appendix
@ -72,7 +72,7 @@ List of all DocBook tags, with [x] indicating implemented,
[ ] bibliographyinfo - Meta-information for a Bibliography
[ ] biblioid - An identifier for a document
[o] bibliolist - A wrapper for a set of bibliography entries
[ ] bibliomisc - Untyped bibliographic information
[x] bibliomisc - Untyped bibliographic information
[x] bibliomixed - An entry in a Bibliography
[ ] bibliomset - A cooked container for related bibliographic information
[ ] biblioref - A cross reference to a bibliographic entry
@ -644,6 +644,7 @@ blockTags =
, "bibliodiv"
, "biblioentry"
, "bibliography"
, "bibliomisc"
, "bibliomixed"
, "blockquote"
, "book"
@ -793,8 +794,13 @@ parseBlock (Elem e) =
"titleabbrev" -> skip
"authorinitials" -> skip
"bibliography" -> sect 0
"bibliodiv" -> sect 1
"bibliodiv" -> do
tit <- case filterChild (named "title") e of
Just _ -> sect 1
Nothing -> return mempty
(tit <>) <$> parseMixed para (elContent e)
"biblioentry" -> parseMixed para (elContent e)
"bibliomisc" -> parseMixed para (elContent e)
"bibliomixed" -> parseMixed para (elContent e)
"equation" -> para <$> equation e displayMath
"informalequation" -> para <$> equation e displayMath
@ -1061,6 +1067,8 @@ parseInline (CRef ref) =
return $ text $ maybe (T.toUpper $ T.pack ref) T.pack $ lookupEntity ref
parseInline (Elem e) =
case qName (elName e) of
"anchor" -> do
return $ spanWith (attrValue "id" e, [], []) mempty
"phrase" -> do
let ident = attrValue "id" e
let classes = T.words $ attrValue "class" e