diff options
| author | Nils Carlson <nils@nilscarlson.se> | 2020-10-17 06:52:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-16 23:52:19 -0700 |
| commit | 2332a08f1e192de24f9ff425ed31f8dd20d1fa82 (patch) | |
| tree | 47b9bf1960d60af580b300bb63ad0b7cdee2d69e /src/Text/Pandoc | |
| parent | ae4e9d3b38301b794299f228a9666ed0ab6a19bc (diff) | |
| download | pandoc-2332a08f1e192de24f9ff425ed31f8dd20d1fa82.tar.gz | |
DocBook reader: bibliomisc and anchor support (#6754)
Also do some minor refactoring - bibliodiv without
a title no longer results in an empty Header.
Diffstat (limited to 'src/Text/Pandoc')
| -rw-r--r-- | src/Text/Pandoc/Readers/DocBook.hs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/DocBook.hs b/src/Text/Pandoc/Readers/DocBook.hs index 01d50d5c4..26de68f5f 100644 --- a/src/Text/Pandoc/Readers/DocBook.hs +++ b/src/Text/Pandoc/Readers/DocBook.hs @@ -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 |