diff --git a/dblatex/asciidoc-dblatex.sty b/dblatex/asciidoc-dblatex.sty index 309459f..648b95f 100644 --- a/dblatex/asciidoc-dblatex.sty +++ b/dblatex/asciidoc-dblatex.sty @@ -16,7 +16,5 @@ \end{minipage}\end{Sbox}\doublebox{\TheSbox}% } -% For DocBook literallayout elements, see `./dblatex/dblatex-readme.txt`. -\usepackage{alltt} % To preserve simple quotes in the blocs of code \usepackage{upquote} diff --git a/dblatex/asciidoc-dblatex.xsl b/dblatex/asciidoc-dblatex.xsl index 3df2d2e..b1980da 100644 --- a/dblatex/asciidoc-dblatex.xsl +++ b/dblatex/asciidoc-dblatex.xsl @@ -15,6 +15,7 @@ See dblatex(1) -p option. 0 0 1 + normal 1 - - - \begin{alltt} - \normalfont{} - - \end{alltt} - - \pagebreak[4] diff --git a/dblatex/dblatex-readme.txt b/dblatex/dblatex-readme.txt index 39bb437..94cd0df 100644 --- a/dblatex/dblatex-readme.txt +++ b/dblatex/dblatex-readme.txt @@ -20,19 +20,6 @@ Limitations ----------- Observed in dblatex 0.2.8. -- dblatex doesn't seem to process the DocBook 'literallayout' element - correctly: it is rendered in a monospaced font and no inline - elements are processed. By default the normal font should be used - and almost all DocBook inline elements should be processed - (http://www.docbook.org/tdg/en/html/literallayout.html). I almost - fixed this by overriding the default dblatex literallayout template - (in `./dblatex/asciidoc-dblatex.xsl`) and using the LaTeX 'alltt' - package, but there are remaining problems: - - * Blank lines are replaced by a single space. - * The 'literallayout' element incorrectly wraps text when rendered - inside a table. - - Callouts do not work inside DocBook 'literallayout' elements which means callouts are not displayed inside AsciiDoc literal blocks. A workaround is to change the AsciiDoc literal block to a listing diff --git a/docbook45.conf b/docbook45.conf index a61c2e9..fbba2cc 100644 --- a/docbook45.conf +++ b/docbook45.conf @@ -373,7 +373,7 @@ template::[quote-close] [verseblock] template::[quote-open] -| +| template::[quote-close] [quoteparagraph] @@ -428,7 +428,7 @@ paragraph=| paragraph=| [tabletags-verse] -bodydata=| +bodydata=| paragraph= [tabletags-literal]