|
From: <mi...@us...> - 2021-08-10 14:14:29
|
Revision: 8807
http://sourceforge.net/p/docutils/code/8807
Author: milde
Date: 2021-08-10 14:14:24 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
LaTeX writer: Simpler LaTeX code.
Modified Paths:
--------------
trunk/docutils/docutils/writers/latex2e/__init__.py
trunk/docutils/test/functional/expected/latex_cornercases.tex
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
trunk/docutils/test/test_writers/test_latex2e.py
Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py 2021-08-10 14:14:13 UTC (rev 8806)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py 2021-08-10 14:14:24 UTC (rev 8807)
@@ -835,7 +835,7 @@
def __init__(self, translator, latex_type):
self._translator = translator
self._latex_type = latex_type
-
+
self.close()
self._colwidths = []
self._rowspan = []
@@ -1002,8 +1002,8 @@
a.append('\\endfirsthead\n')
else:
a.append('\\endhead\n')
- a.append(r'\multicolumn{%d}{c}' % len(self._col_specs) +
- r'{\hfill ... continued on next page} \\')
+ a.append(r'\multicolumn{%d}{r}' % len(self._col_specs) +
+ r'{... continued on next page} \\')
a.append('\n\\endfoot\n\\endlastfoot\n')
# for longtable one could add firsthead, foot and lastfoot
self._in_thead -= 1
Modified: trunk/docutils/test/functional/expected/latex_cornercases.tex
===================================================================
--- trunk/docutils/test/functional/expected/latex_cornercases.tex 2021-08-10 14:14:13 UTC (rev 8806)
+++ trunk/docutils/test/functional/expected/latex_cornercases.tex 2021-08-10 14:14:24 UTC (rev 8807)
@@ -296,7 +296,7 @@
& \textbf{Description} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
\multicolumn{2}{|l|}{multicollumn cell} \\
Modified: trunk/docutils/test/functional/expected/latex_memoir.tex
===================================================================
--- trunk/docutils/test/functional/expected/latex_memoir.tex 2021-08-10 14:14:13 UTC (rev 8806)
+++ trunk/docutils/test/functional/expected/latex_memoir.tex 2021-08-10 14:14:24 UTC (rev 8807)
@@ -988,7 +988,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1025,7 +1025,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1062,7 +1062,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1092,7 +1092,7 @@
\textbf{A} & \textbf{B} & \textbf{A or B} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
False & False & False \\
@@ -1577,7 +1577,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1645,7 +1645,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1705,7 +1705,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
\textbf{%
Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex 2021-08-10 14:14:13 UTC (rev 8806)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex 2021-08-10 14:14:24 UTC (rev 8807)
@@ -989,7 +989,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1026,7 +1026,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1063,7 +1063,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1093,7 +1093,7 @@
\textbf{A} & \textbf{B} & \textbf{A or B} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
False & False & False \\
@@ -1599,7 +1599,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1667,7 +1667,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1727,7 +1727,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
\textbf{%
Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex 2021-08-10 14:14:13 UTC (rev 8806)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex 2021-08-10 14:14:24 UTC (rev 8807)
@@ -857,7 +857,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -894,7 +894,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -931,7 +931,7 @@
} \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -961,7 +961,7 @@
\textbf{A} & \textbf{B} & \textbf{A or B} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
False & False & False \\
@@ -1471,7 +1471,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1539,7 +1539,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
@@ -1599,7 +1599,7 @@
} \\
\hline
\endhead
-\multicolumn{3}{c}{\hfill ... continued on next page} \\
+\multicolumn{3}{r}{... continued on next page} \\
\endfoot
\endlastfoot
\textbf{%
Modified: trunk/docutils/test/test_writers/test_latex2e.py
===================================================================
--- trunk/docutils/test/test_writers/test_latex2e.py 2021-08-10 14:14:13 UTC (rev 8806)
+++ trunk/docutils/test/test_writers/test_latex2e.py 2021-08-10 14:14:24 UTC (rev 8807)
@@ -854,7 +854,7 @@
} & \\
\hline
\endhead
-\multicolumn{2}{c}{\hfill ... continued on next page} \\
+\multicolumn{2}{r}{... continued on next page} \\
\endfoot
\endlastfoot
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|