anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx: use correct LaTeX code for a table

Browse Source 
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
This commit is contained in:
Uwe Stöhr 2015-05-25 00:17:18 +02:00
parent 0863b7e0fc
commit 1a8b74f5e1
4 changed files with 218 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
src/tex2lyx/test/test-insets-basic.lyx.lyx
View File

@ -4930,7 +4930,7 @@ in % of pixel size
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
A table using dcolumn: A table using decimal alignment:
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -4944,13 +4944,16 @@ status open
\begin_layout Standard \begin_layout Standard
\begin_inset Tabular \begin_inset Tabular
<lyxtabular version="3" rows="4" columns="5"> <lyxtabular version="3" rows="4" columns="8">
<features rotate="0" tabularvalignment="middle" tabularwidth="0pt"> <features rotate="0" tabularvalignment="middle" tabularwidth="0pt">
<column alignment="center" valignment="top"> <column alignment="center" valignment="top">
<column alignment="center" valignment="top"> <column alignment="center" valignment="top">
<column alignment="none" valignment="top" special="d"> <column alignment="right" valignment="top">
<column alignment="none" valignment="top" special="d"> <column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
<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">
<row> <row>
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="center" valignment="top" usebox="none">
\begin_inset Text \begin_inset Text
@ -4974,39 +4977,42 @@ Two
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
\family roman
Three Three
\family default
\end_layout \end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset \end_inset
</cell> </cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c"> <cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
\family roman
Four Four
\family default
\end_layout \end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset \end_inset
</cell> </cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c"> <cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
\family roman
Five Five
\family default
\end_layout \end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset \end_inset
</cell> </cell>
</row> </row>
@ -5029,108 +5035,45 @@ two
\end_inset \end_inset
</cell> </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_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 \begin_layout Standard
three three
\end_layout \end_layout
\end_inset \end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\end_layout \begin_inset Text
\end_inset \end_inset
</cell> </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_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 \begin_layout Standard
four four
\end_layout \end_layout
\end_inset \end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\end_layout \begin_inset Text
\end_inset \end_inset
</cell> </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_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 \begin_layout Standard
five five
\end_layout \end_layout
\end_inset \end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\end_layout \begin_inset Text
\end_inset \end_inset
</cell> </cell>
@ -5154,11 +5097,11 @@ He
\end_inset \end_inset
</cell> </cell>
<cell alignment="none" valignment="top" usebox="none"> <cell alignment="right" valignment="top" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
2.77234 2
\end_layout \end_layout
\end_inset \end_inset
@ -5167,7 +5110,30 @@ He
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
45672. 77234
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
45672
\end_layout
\end_inset
</cell>
<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
0
\end_layout \end_layout
\end_inset \end_inset
@ -5176,7 +5142,7 @@ He
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
0.69 69
\end_layout \end_layout
\end_inset \end_inset
@ -5188,17 +5154,6 @@ He
\begin_layout Standard \begin_layout Standard
C C
\begin_inset Foot
status collapsed
\begin_layout Standard
Some tables require footnotes.
\end_layout
\end_inset
\end_layout \end_layout
\end_inset \end_inset
@ -5208,17 +5163,15 @@ Some tables require footnotes.
\begin_layout Standard \begin_layout Standard
C C
\begin_inset Foot
status collapsed
\begin_layout Standard
Some tables need more than one footnote.
\end_layout \end_layout
\end_inset \end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
12537
\end_layout \end_layout
\end_inset \end_inset
@ -5227,7 +5180,16 @@ Some tables need more than one footnote.
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
12537.64 64
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
37
\end_layout \end_layout
\end_inset \end_inset
@ -5236,7 +5198,16 @@ Some tables need more than one footnote.
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
37.66345 66345
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
86
\end_layout \end_layout
\end_inset \end_inset
@ -5245,7 +5216,7 @@ Some tables need more than one footnote.
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
86.37 37
\end_layout \end_layout
\end_inset \end_inset

18
src/tex2lyx/test/test-insets-basic.tex
View File

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

207
src/tex2lyx/test/test-insets.lyx.lyx
View File

@ -2,7 +2,7 @@
\lyxformat 495 \lyxformat 495
\begin_document \begin_document
\begin_header \begin_header
\origin roundtrip \origin D:/LyXGit/Master/src/tex2lyx/test/
\textclass article \textclass article
\begin_preamble \begin_preamble
@ -4983,7 +4983,7 @@ in % of pixel size
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
A table using dcolumn: A table using decimal alignment:
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -4997,13 +4997,16 @@ status open
\begin_layout Standard \begin_layout Standard
\begin_inset Tabular \begin_inset Tabular
<lyxtabular version="3" rows="4" columns="5"> <lyxtabular version="3" rows="4" columns="8">
<features rotate="0" tabularvalignment="middle" tabularwidth="0pt"> <features rotate="0" tabularvalignment="middle" tabularwidth="0pt">
<column alignment="center" valignment="top"> <column alignment="center" valignment="top">
<column alignment="center" valignment="top"> <column alignment="center" valignment="top">
<column alignment="none" valignment="top" special="d"> <column alignment="right" valignment="top">
<column alignment="none" valignment="top" special="d"> <column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
<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">
<row> <row>
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="center" valignment="top" usebox="none">
\begin_inset Text \begin_inset Text
@ -5027,39 +5030,42 @@ Two
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
\family roman
Three Three
\family default
\end_layout \end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset \end_inset
</cell> </cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c"> <cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
\family roman
Four Four
\family default
\end_layout \end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset \end_inset
</cell> </cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c"> <cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
\family roman
Five Five
\family default
\end_layout \end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset \end_inset
</cell> </cell>
</row> </row>
@ -5082,108 +5088,45 @@ two
\end_inset \end_inset
</cell> </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_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 \begin_layout Standard
three three
\end_layout \end_layout
\end_inset \end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\end_layout \begin_inset Text
\end_inset \end_inset
</cell> </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_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 \begin_layout Standard
four four
\end_layout \end_layout
\end_inset \end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\end_layout \begin_inset Text
\end_inset \end_inset
</cell> </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_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 \begin_layout Standard
five five
\end_layout \end_layout
\end_inset \end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\end_layout \begin_inset Text
\end_inset \end_inset
</cell> </cell>
@ -5207,11 +5150,11 @@ He
\end_inset \end_inset
</cell> </cell>
<cell alignment="none" valignment="top" usebox="none"> <cell alignment="right" valignment="top" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
2.77234 2
\end_layout \end_layout
\end_inset \end_inset
@ -5220,7 +5163,30 @@ He
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
45672. 77234
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
45672
\end_layout
\end_inset
</cell>
<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
0
\end_layout \end_layout
\end_inset \end_inset
@ -5229,7 +5195,7 @@ He
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
0.69 69
\end_layout \end_layout
\end_inset \end_inset
@ -5241,17 +5207,6 @@ He
\begin_layout Standard \begin_layout Standard
C C
\begin_inset Foot
status collapsed
\begin_layout Standard
Some tables require footnotes.
\end_layout
\end_inset
\end_layout \end_layout
\end_inset \end_inset
@ -5261,17 +5216,15 @@ Some tables require footnotes.
\begin_layout Standard \begin_layout Standard
C C
\begin_inset Foot
status collapsed
\begin_layout Standard
Some tables need more than one footnote.
\end_layout \end_layout
\end_inset \end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
12537
\end_layout \end_layout
\end_inset \end_inset
@ -5280,7 +5233,16 @@ Some tables need more than one footnote.
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
12537.64 64
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
37
\end_layout \end_layout
\end_inset \end_inset
@ -5289,7 +5251,16 @@ Some tables need more than one footnote.
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
37.66345 66345
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
86
\end_layout \end_layout
\end_inset \end_inset
@ -5298,7 +5269,7 @@ Some tables need more than one footnote.
\begin_inset Text \begin_inset Text
\begin_layout Standard \begin_layout Standard
86.37 37
\end_layout \end_layout
\end_inset \end_inset

18
src/tex2lyx/test/test-insets.tex
View File

@ -34,7 +34,6 @@
\usepackage{booktabs} \usepackage{booktabs}
\usepackage{multirow} \usepackage{multirow}
\usepackage{hhline} \usepackage{hhline}
\usepackage{dcolumn}
\usepackage{pdfpages} \usepackage{pdfpages}
\usepackage{textcomp} \usepackage{textcomp}
\usepackage{amssymb} \usepackage{amssymb}
@ -455,20 +454,15 @@ in \% of pixel size & 76.3 & 95.9 & 92.3\tabularnewline
\end{tabular} \end{tabular}
\end{table} \end{table}
A table using dcolumn: A table using decimal alignment:
\begin{table} \begin{table}
\begin{tabular}{ccddd} \begin{tabular}{ccr@{\extracolsep{0pt}.}lr@{\extracolsep{0pt}.}lr@{\extracolsep{0pt}.}l}
One&Two& One & Two & \multicolumn{2}{c}{Three} & \multicolumn{2}{c}{Four} & \multicolumn{2}{c}{Five}\tabularnewline
\multicolumn{1}{c}{\textrm{Three}}&
\multicolumn{1}{c}{\textrm{Four}}&
\multicolumn{1}{c}{\textrm{Five}}\\
\hline \hline
one&two&\mbox{three}&\mbox{four}&\mbox{five}\\ one & two & \multicolumn{2}{c}{three} & \multicolumn{2}{c}{four} & \multicolumn{2}{c}{five}\tabularnewline
He&2& 2.77234 & 45672. & 0.69 \\ He & 2 & 2&77234 & 45672& & 0&69 \tabularnewline
C\footnote{Some tables require footnotes.} C & C & 12537&64 & 37&66345 & 86&37 \tabularnewline
&C\footnote{Some tables need more than one footnote.}
& 12537.64 & 37.66345 & 86.37 \\
\end{tabular} \end{tabular}
\end{table} \end{table}