diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-06-05 14:16:44 +0200 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-06-05 08:02:21 -0600 |
| commit | af9de925de4a441f4c45a977363f9a56589f57bc (patch) | |
| tree | f5c703dfb48842c5592f4ee968eb226a09611914 | |
| parent | b6c04383e403b0962db09e6748760d3ec376f2ed (diff) | |
| download | pandoc-af9de925de4a441f4c45a977363f9a56589f57bc.tar.gz | |
DocBook writer: Remove non-existent admonitions
attention, error and hint are actually just reStructuredText specific.
danger was too until introduced in DocBook 5.2: https://github.com/docbook/docbook/issues/55
| -rw-r--r-- | src/Text/Pandoc/Writers/Docbook.hs | 3 | ||||
| -rw-r--r-- | test/Tests/Writers/Docbook.hs | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs index 25bd308bf..33a6f5f0c 100644 --- a/src/Text/Pandoc/Writers/Docbook.hs +++ b/src/Text/Pandoc/Writers/Docbook.hs @@ -198,8 +198,7 @@ blockToDocbook opts (Div (id',"section":_,_) (Header lvl (_,_,attrs) ils : xs)) blockToDocbook opts (Div (ident,classes,_) bs) = do version <- ask let identAttribs = [(idName version, ident) | not (T.null ident)] - admonitions = ["attention","caution","danger","error","hint", - "important","note","tip","warning"] + admonitions = ["caution","danger","important","note","tip","warning"] case classes of (l:_) | l `elem` admonitions -> do let (mTitleBs, bodyBs) = diff --git a/test/Tests/Writers/Docbook.hs b/test/Tests/Writers/Docbook.hs index 46203eeae..f517f803a 100644 --- a/test/Tests/Writers/Docbook.hs +++ b/test/Tests/Writers/Docbook.hs @@ -83,32 +83,32 @@ tests = [ testGroup "line blocks" , "</warning>" ] , "admonition-with-title" =: - divWith ("foo", ["attention"], []) ( + divWith ("foo", ["note"], []) ( divWith ("foo", ["title"], []) (plain (text "This is title")) <> para "This is a test" ) =?> unlines - [ "<attention id=\"foo\">" + [ "<note id=\"foo\">" , " <title>This is title</title>" , " <para>" , " This is a test" , " </para>" - , "</attention>" + , "</note>" ] , "admonition-with-title-in-para" =: - divWith ("foo", ["attention"], []) ( + divWith ("foo", ["note"], []) ( divWith ("foo", ["title"], []) (para "This is title") <> para "This is a test" ) =?> unlines - [ "<attention id=\"foo\">" + [ "<note id=\"foo\">" , " <title>This is title</title>" , " <para>" , " This is a test" , " </para>" - , "</attention>" + , "</note>" ] , "single-child" =: divWith ("foo", [], []) (para "This is a test") |