[Docutils-checkins] SF.net SVN: docutils:[8590] trunk/docutils

[<mi...@us...>]

Revision: 8590
          http://sourceforge.net/p/docutils/code/8590
Author:   milde
Date:     2020-12-14 22:44:30 +0000 (Mon, 14 Dec 2020)
Log Message:
-----------
Fix LaTeX code for system messages.

System messages are admonitions, don't use
"alltt" inside them with "legacy class functions".
Thanks to Jerome Carretero for the report.

Fix spurious vspace after DUTitle (move hypertarget code inside).

Modified Paths:
--------------
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/docutils/writers/latex2e/docutils.sty
    trunk/docutils/test/functional/expected/latex_memoir.tex
    trunk/docutils/test/functional/expected/standalone_rst_latex.tex
    trunk/docutils/test/functional/expected/standalone_rst_xetex.tex

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2020-12-09 15:52:16 UTC (rev 8589)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2020-12-14 22:44:30 UTC (rev 8590)
@@ -2470,7 +2470,7 @@
         #       Check parent node instead?
         _autowidth_table = _in_table and self.active_table.colwidths_auto
         _use_env = _plaintext and not isinstance(node.parent,
-                                        (nodes.footnote, nodes.admonition))
+                    (nodes.footnote, nodes.admonition, nodes.system_message))
         _use_listings = (literal_env == 'lstlisting') and _use_env
 
         # Labels and classes:
@@ -2862,13 +2862,16 @@
             self.fallbacks['title'] = PreambleCmds.title_legacy
         node['classes'] = ['system-message']
         self.visit_admonition(node)
-        self.out.append('\n\\DUtitle[system-message]{system-message}\n')
+        if self.settings.legacy_class_functions:
+            self.out.append('\n\\DUtitle[system-message]{system-message\n')
+        else:
+            self.out.append('\n\\DUtitle{system-message\n')
         self.append_hypertargets(node)
         try:
             line = ', line~%s' % node['line']
         except KeyError:
             line = ''
-        self.out.append('\n\n{\\color{red}%s/%s} in \\texttt{%s}%s\n' %
+        self.out.append('}\n\n{\\color{red}%s/%s} in \\texttt{%s}%s\n' %
                          (node['type'], node['level'],
                           self.encode(node['source']), line))
         if len(node['backrefs']) == 1:

Modified: trunk/docutils/docutils/writers/latex2e/docutils.sty
===================================================================
--- trunk/docutils/docutils/writers/latex2e/docutils.sty	2020-12-09 15:52:16 UTC (rev 8589)
+++ trunk/docutils/docutils/writers/latex2e/docutils.sty	2020-12-14 22:44:30 UTC (rev 8590)
@@ -8,7 +8,7 @@
 %%      notice and this notice are preserved.
 %%      This file is offered as-is, without any warranty.
 
-% .. include:: README
+% .. include:: README.md
 %
 % Implementation
 % ==============

Modified: trunk/docutils/test/functional/expected/latex_memoir.tex
===================================================================
--- trunk/docutils/test/functional/expected/latex_memoir.tex	2020-12-09 15:52:16 UTC (rev 8589)
+++ trunk/docutils/test/functional/expected/latex_memoir.tex	2020-12-14 22:44:30 UTC (rev 8590)
@@ -2863,8 +2863,8 @@
 }
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-1}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-1}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~104
 
@@ -2873,8 +2873,8 @@
 }}
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-2}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-2}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~392
 
@@ -2883,8 +2883,8 @@
 }}
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-3}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-3}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~401
 
@@ -2893,8 +2893,8 @@
 }}
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-4}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-4}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~428
 
@@ -2903,8 +2903,8 @@
 }}
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-5}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-5}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~441
 

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2020-12-09 15:52:16 UTC (rev 8589)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2020-12-14 22:44:30 UTC (rev 8590)
@@ -2867,8 +2867,8 @@
 }
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-1}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-1}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~104
 
@@ -2877,8 +2877,8 @@
 }}
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-2}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-2}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~392
 
@@ -2887,8 +2887,8 @@
 }}
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-3}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-3}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~401
 
@@ -2897,8 +2897,8 @@
 }}
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-4}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-4}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~428
 
@@ -2907,8 +2907,8 @@
 }}
 
 \DUadmonition[system-message]{
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-5}{}}
+\DUtitle[system-message]{system-message
+\raisebox{1em}{\hypertarget{system-message-5}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~441
 

Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2020-12-09 15:52:16 UTC (rev 8589)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2020-12-14 22:44:30 UTC (rev 8590)
@@ -2770,8 +2770,8 @@
 
 \begin{DUclass}{system-message}
 \begin{DUadmonition}
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-1}{}}
+\DUtitle{system-message
+\raisebox{1em}{\hypertarget{system-message-1}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~104
 
@@ -2782,8 +2782,8 @@
 
 \begin{DUclass}{system-message}
 \begin{DUadmonition}
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-2}{}}
+\DUtitle{system-message
+\raisebox{1em}{\hypertarget{system-message-2}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~392
 
@@ -2794,8 +2794,8 @@
 
 \begin{DUclass}{system-message}
 \begin{DUadmonition}
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-3}{}}
+\DUtitle{system-message
+\raisebox{1em}{\hypertarget{system-message-3}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~401
 
@@ -2806,8 +2806,8 @@
 
 \begin{DUclass}{system-message}
 \begin{DUadmonition}
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-4}{}}
+\DUtitle{system-message
+\raisebox{1em}{\hypertarget{system-message-4}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~428
 
@@ -2818,8 +2818,8 @@
 
 \begin{DUclass}{system-message}
 \begin{DUadmonition}
-\DUtitle[system-message]{system-message}
-\raisebox{1em}{\hypertarget{system-message-5}{}}
+\DUtitle{system-message
+\raisebox{1em}{\hypertarget{system-message-5}{}}}
 
 {\color{red}ERROR/3} in \texttt{functional/input/data/standard.txt}, line~441
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.