tex2lyx: use correct LaTeX code for a table

before LyX 2.1 was released the dcolumn support was dropped and another method was used to align at the decimal point. Nevertheless the old LaTeX table was even wrong in terms of dcolumn

Now a table is used that uses the decimal alignment as it is supported by LyX

diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 9649a4a17f05dd0c3e42907e090efcffa3e8551d..f46a26dd0d62c63205d4b123da4655ff16beafda 100644 (file)
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx
@@ -4930,7 +4930,7 @@ in % of pixel size
 \end_layout
 
 \begin_layout Standard
-A table using dcolumn:
+A table using decimal alignment:
 \end_layout
 
 \begin_layout Standard
@@ -4944,19 +4944,22 @@ status open
 \begin_layout Standard
 
 \begin_inset Tabular 
-<lyxtabular version="3" rows="4" columns="5">
+<lyxtabular version="3" rows="4" columns="8">
 <features rotate="0" tabularvalignment="middle" tabularwidth="0pt">
 <column alignment="center" valignment="top">
 <column alignment="center" valignment="top">
-<column alignment="none" valignment="top" special="d">
-<column alignment="none" valignment="top" special="d">
-<column alignment="none" valignment="top" special="d">
+<column alignment="right" valignment="top">
+<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
+<column alignment="right" valignment="top">
+<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
+<column alignment="right" valignment="top">
+<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
 <row>
 <cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-One
+One 
 \end_layout
 
 \end_inset
@@ -4965,7 +4968,7 @@ One
 \begin_inset Text
 
 \begin_layout Standard
-Two
+Two 
 \end_layout
 
 \end_inset
@@ -4974,39 +4977,42 @@ Two
 \begin_inset Text
 
 \begin_layout Standard
-
-\family roman
 Three
-\family default
-
 \end_layout
 
+\end_inset
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
 \end_inset
 </cell>
 <cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
-
-\family roman
 Four
-\family default
-
 \end_layout
 
+\end_inset
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
 \end_inset
 </cell>
 <cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
-
-\family roman
 Five
-\family default
-
 \end_layout
 
+\end_inset
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
 \end_inset
 </cell>
 </row>
@@ -5015,7 +5021,7 @@ Five
 \begin_inset Text
 
 \begin_layout Standard
-one
+one 
 \end_layout
 
 \end_inset
@@ -5024,113 +5030,50 @@ one
 \begin_inset Text
 
 \begin_layout Standard
-two
+two 
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" topline="true" usebox="none">
+<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
-\begin_layout Standard
-
-\begin_inset Box Frameless
-position "c"
-hor_pos "c"
-has_inner_box 1
-inner_pos "c"
-use_parbox 0
-use_makebox 1
-width ""
-special "none"
-height "1in"
-height_special "totalheight"
-thickness "0.4pt"
-separation "3pt"
-shadowsize "4pt"
-framecolor "black"
-backgroundcolor "none"
-status open
-
-
 \begin_layout Standard
 three
 \end_layout
 
 \end_inset
-
-
-\end_layout
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" topline="true" usebox="none">
+<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
-\begin_layout Standard
-
-\begin_inset Box Frameless
-position "c"
-hor_pos "c"
-has_inner_box 1
-inner_pos "c"
-use_parbox 0
-use_makebox 1
-width ""
-special "none"
-height "1in"
-height_special "totalheight"
-thickness "0.4pt"
-separation "3pt"
-shadowsize "4pt"
-framecolor "black"
-backgroundcolor "none"
-status open
-
-
 \begin_layout Standard
 four
 \end_layout
 
 \end_inset
-
-
-\end_layout
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" topline="true" usebox="none">
+<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
-\begin_layout Standard
-
-\begin_inset Box Frameless
-position "c"
-hor_pos "c"
-has_inner_box 1
-inner_pos "c"
-use_parbox 0
-use_makebox 1
-width ""
-special "none"
-height "1in"
-height_special "totalheight"
-thickness "0.4pt"
-separation "3pt"
-shadowsize "4pt"
-framecolor "black"
-backgroundcolor "none"
-status open
-
-
 \begin_layout Standard
 five
 \end_layout
 
 \end_inset
-
-
-\end_layout
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
 
 \end_inset
 </cell>
@@ -5140,7 +5083,7 @@ five
 \begin_inset Text
 
 \begin_layout Standard
-He
+He 
 \end_layout
 
 \end_inset
@@ -5148,6 +5091,15 @@ He
 <cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
+\begin_layout Standard
+2 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
+
 \begin_layout Standard
 2
 \end_layout
@@ -5158,7 +5110,16 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-2.77234 
+77234 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Standard
+45672
 \end_layout
 
 \end_inset
@@ -5166,8 +5127,13 @@ He
 <cell alignment="none" valignment="top" usebox="none">
 \begin_inset Text
 
+\end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
+
 \begin_layout Standard
-45672. 
+0
 \end_layout
 
 \end_inset
@@ -5176,7 +5142,7 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-0.69 
+69 
 \end_layout
 
 \end_inset
@@ -5187,38 +5153,43 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-C
-\begin_inset Foot
-status collapsed
-
-
-\begin_layout Standard
-Some tables require footnotes.
+C 
 \end_layout
 
 \end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
 
- 
+\begin_layout Standard
+C 
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" usebox="none">
+<cell alignment="right" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-C
-\begin_inset Foot
-status collapsed
+12537
+\end_layout
 
+\end_inset
+</cell>
+<cell alignment="none" valignment="top" usebox="none">
+\begin_inset Text
 
 \begin_layout Standard
-Some tables need more than one footnote.
+64 
 \end_layout
 
 \end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
 
- 
+\begin_layout Standard
+37
 \end_layout
 
 \end_inset
@@ -5227,16 +5198,16 @@ Some tables need more than one footnote.
 \begin_inset Text
 
 \begin_layout Standard
-12537.64 
+66345 
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" usebox="none">
+<cell alignment="right" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-37.66345 
+86
 \end_layout
 
 \end_inset
@@ -5245,7 +5216,7 @@ Some tables need more than one footnote.
 \begin_inset Text
 
 \begin_layout Standard
-86.37 
+37 
 \end_layout
 
 \end_inset

diff --git a/src/tex2lyx/test/test-insets-basic.tex b/src/tex2lyx/test/test-insets-basic.tex
index 431d51de9e4bec439e1e990f917685fefb3f5e2f..c9910166dc00a8ab6f7bd1235a89b3431a1bdc6f 100644 (file)
--- a/src/tex2lyx/test/test-insets-basic.tex
+++ b/src/tex2lyx/test/test-insets-basic.tex
@@ -34,7 +34,6 @@
 \usepackage{booktabs}
 \usepackage{multirow}
 \usepackage{hhline}
-\usepackage{dcolumn}
 \usepackage{pdfpages}
 \usepackage{textcomp}
 \usepackage{amssymb}
@@ -436,20 +435,15 @@ in \% of pixel size & 76.3 & 95.9 & 92.3\tabularnewline
 \end{tabular}
 \end{table}
 
-A table using dcolumn:
+A table using decimal alignment:
 
 \begin{table} 
-\begin{tabular}{ccddd} 
-One&Two& 
-\multicolumn{1}{c}{\textrm{Three}}& 
-\multicolumn{1}{c}{\textrm{Four}}& 
-\multicolumn{1}{c}{\textrm{Five}}\\ 
+\begin{tabular}{ccr@{\extracolsep{0pt}.}lr@{\extracolsep{0pt}.}lr@{\extracolsep{0pt}.}l}
+One & Two & \multicolumn{2}{c}{Three} & \multicolumn{2}{c}{Four} & \multicolumn{2}{c}{Five}\tabularnewline
 \hline 
-one&two&\mbox{three}&\mbox{four}&\mbox{five}\\ 
-He&2& 2.77234 & 45672. & 0.69 \\ 
-C\footnote{Some tables require footnotes.} 
-&C\footnote{Some tables need more than one footnote.} 
-& 12537.64 & 37.66345 & 86.37 \\ 
+one & two & \multicolumn{2}{c}{three} & \multicolumn{2}{c}{four} & \multicolumn{2}{c}{five}\tabularnewline
+He & 2 & 2&77234  & 45672&  & 0&69 \tabularnewline
+C & C & 12537&64  & 37&66345  & 86&37 \tabularnewline
 \end{tabular} 
 \end{table}
 

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index ccb0321e23ea49a827ba60c3a1dca854cc886a88..94829af7ec1837c40402f0b50abf062180010d13 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -2,7 +2,7 @@
 \lyxformat 495
 \begin_document
 \begin_header
-\origin roundtrip
+\origin D:/LyXGit/Master/src/tex2lyx/test/
 \textclass article
 \begin_preamble
 
@@ -4983,7 +4983,7 @@ in % of pixel size
 \end_layout
 
 \begin_layout Standard
-A table using dcolumn:
+A table using decimal alignment:
 \end_layout
 
 \begin_layout Standard
@@ -4997,19 +4997,22 @@ status open
 \begin_layout Standard
 
 \begin_inset Tabular 
-<lyxtabular version="3" rows="4" columns="5">
+<lyxtabular version="3" rows="4" columns="8">
 <features rotate="0" tabularvalignment="middle" tabularwidth="0pt">
 <column alignment="center" valignment="top">
 <column alignment="center" valignment="top">
-<column alignment="none" valignment="top" special="d">
-<column alignment="none" valignment="top" special="d">
-<column alignment="none" valignment="top" special="d">
+<column alignment="right" valignment="top">
+<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
+<column alignment="right" valignment="top">
+<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
+<column alignment="right" valignment="top">
+<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
 <row>
 <cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-One
+One 
 \end_layout
 
 \end_inset
@@ -5018,7 +5021,7 @@ One
 \begin_inset Text
 
 \begin_layout Standard
-Two
+Two 
 \end_layout
 
 \end_inset
@@ -5027,39 +5030,42 @@ Two
 \begin_inset Text
 
 \begin_layout Standard
-
-\family roman
 Three
-\family default
-
 \end_layout
 
+\end_inset
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
 \end_inset
 </cell>
 <cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
-
-\family roman
 Four
-\family default
-
 \end_layout
 
+\end_inset
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
 \end_inset
 </cell>
 <cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
-
-\family roman
 Five
-\family default
-
 \end_layout
 
+\end_inset
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
 \end_inset
 </cell>
 </row>
@@ -5068,7 +5074,7 @@ Five
 \begin_inset Text
 
 \begin_layout Standard
-one
+one 
 \end_layout
 
 \end_inset
@@ -5077,113 +5083,50 @@ one
 \begin_inset Text
 
 \begin_layout Standard
-two
+two 
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" topline="true" usebox="none">
+<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
-\begin_layout Standard
-
-\begin_inset Box Frameless
-position "c"
-hor_pos "c"
-has_inner_box 1
-inner_pos "c"
-use_parbox 0
-use_makebox 1
-width ""
-special "none"
-height "1in"
-height_special "totalheight"
-thickness "0.4pt"
-separation "3pt"
-shadowsize "4pt"
-framecolor "black"
-backgroundcolor "none"
-status open
-
-
 \begin_layout Standard
 three
 \end_layout
 
 \end_inset
-
-
-\end_layout
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" topline="true" usebox="none">
+<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
-\begin_layout Standard
-
-\begin_inset Box Frameless
-position "c"
-hor_pos "c"
-has_inner_box 1
-inner_pos "c"
-use_parbox 0
-use_makebox 1
-width ""
-special "none"
-height "1in"
-height_special "totalheight"
-thickness "0.4pt"
-separation "3pt"
-shadowsize "4pt"
-framecolor "black"
-backgroundcolor "none"
-status open
-
-
 \begin_layout Standard
 four
 \end_layout
 
 \end_inset
-
-
-\end_layout
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" topline="true" usebox="none">
+<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
-\begin_layout Standard
-
-\begin_inset Box Frameless
-position "c"
-hor_pos "c"
-has_inner_box 1
-inner_pos "c"
-use_parbox 0
-use_makebox 1
-width ""
-special "none"
-height "1in"
-height_special "totalheight"
-thickness "0.4pt"
-separation "3pt"
-shadowsize "4pt"
-framecolor "black"
-backgroundcolor "none"
-status open
-
-
 \begin_layout Standard
 five
 \end_layout
 
 \end_inset
-
-
-\end_layout
+</cell>
+<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
 
 \end_inset
 </cell>
@@ -5193,7 +5136,7 @@ five
 \begin_inset Text
 
 \begin_layout Standard
-He
+He 
 \end_layout
 
 \end_inset
@@ -5201,6 +5144,15 @@ He
 <cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
+\begin_layout Standard
+2 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
+
 \begin_layout Standard
 2
 \end_layout
@@ -5211,7 +5163,16 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-2.77234 
+77234 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Standard
+45672
 \end_layout
 
 \end_inset
@@ -5219,8 +5180,13 @@ He
 <cell alignment="none" valignment="top" usebox="none">
 \begin_inset Text
 
+\end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
+
 \begin_layout Standard
-45672. 
+0
 \end_layout
 
 \end_inset
@@ -5229,7 +5195,7 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-0.69 
+69 
 \end_layout
 
 \end_inset
@@ -5240,38 +5206,43 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-C
-\begin_inset Foot
-status collapsed
-
-
-\begin_layout Standard
-Some tables require footnotes.
+C 
 \end_layout
 
 \end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
 
- 
+\begin_layout Standard
+C 
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" usebox="none">
+<cell alignment="right" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-C
-\begin_inset Foot
-status collapsed
+12537
+\end_layout
 
+\end_inset
+</cell>
+<cell alignment="none" valignment="top" usebox="none">
+\begin_inset Text
 
 \begin_layout Standard
-Some tables need more than one footnote.
+64 
 \end_layout
 
 \end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
 
- 
+\begin_layout Standard
+37
 \end_layout
 
 \end_inset
@@ -5280,16 +5251,16 @@ Some tables need more than one footnote.
 \begin_inset Text
 
 \begin_layout Standard
-12537.64 
+66345 
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" usebox="none">
+<cell alignment="right" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-37.66345 
+86
 \end_layout
 
 \end_inset
@@ -5298,7 +5269,7 @@ Some tables need more than one footnote.
 \begin_inset Text
 
 \begin_layout Standard
-86.37 
+37 
 \end_layout
 
 \end_inset

diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index ec4e701f7fb432e64e059da9cbbeeddb328b4d4f..440d66060febd4f86e1439bdccd039d5463c7862 100644 (file)
--- a/src/tex2lyx/test/test-insets.tex
+++ b/src/tex2lyx/test/test-insets.tex
@@ -34,7 +34,6 @@
 \usepackage{booktabs}
 \usepackage{multirow}
 \usepackage{hhline}
-\usepackage{dcolumn}
 \usepackage{pdfpages}
 \usepackage{textcomp}
 \usepackage{amssymb}
@@ -455,21 +454,16 @@ in \% of pixel size & 76.3 & 95.9 & 92.3\tabularnewline
 \end{tabular}
 \end{table}
 
-A table using dcolumn:
+A table using decimal alignment:
 
 \begin{table} 
-\begin{tabular}{ccddd} 
-One&Two& 
-\multicolumn{1}{c}{\textrm{Three}}& 
-\multicolumn{1}{c}{\textrm{Four}}& 
-\multicolumn{1}{c}{\textrm{Five}}\\ 
+\begin{tabular}{ccr@{\extracolsep{0pt}.}lr@{\extracolsep{0pt}.}lr@{\extracolsep{0pt}.}l}
+One & Two & \multicolumn{2}{c}{Three} & \multicolumn{2}{c}{Four} & \multicolumn{2}{c}{Five}\tabularnewline
 \hline 
-one&two&\mbox{three}&\mbox{four}&\mbox{five}\\ 
-He&2& 2.77234 & 45672. & 0.69 \\ 
-C\footnote{Some tables require footnotes.} 
-&C\footnote{Some tables need more than one footnote.} 
-& 12537.64 & 37.66345 & 86.37 \\ 
-\end{tabular} 
+one & two & \multicolumn{2}{c}{three} & \multicolumn{2}{c}{four} & \multicolumn{2}{c}{five}\tabularnewline
+He & 2 & 2&77234  & 45672&  & 0&69 \tabularnewline
+C & C & 12537&64  & 37&66345  & 86&37 \tabularnewline
+\end{tabular}
 \end{table}