diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 9649a4a17f..f46a26dd0d 100644
--- 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,30 @@ 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
+</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_inset
@@ -5167,16 +5142,7 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-45672. 
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="none" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-0.69 
+69 
 \end_layout
 
 \end_inset
@@ -5187,18 +5153,7 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-C
-\begin_inset Foot
-status collapsed
-
-
-\begin_layout Standard
-Some tables require footnotes.
-\end_layout
-
-\end_inset
-
- 
+C 
 \end_layout
 
 \end_inset
@@ -5207,18 +5162,16 @@ Some tables require footnotes.
 \begin_inset Text
 
 \begin_layout Standard
-C
-\begin_inset Foot
-status collapsed
-
-
-\begin_layout Standard
-Some tables need more than one footnote.
+C 
 \end_layout
 
 \end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
 
- 
+\begin_layout Standard
+12537
 \end_layout
 
 \end_inset
@@ -5227,7 +5180,16 @@ Some tables need more than one footnote.
 \begin_inset Text
 
 \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_inset
@@ -5236,7 +5198,16 @@ Some tables need more than one footnote.
 \begin_inset Text
 
 \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_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 431d51de9e..c9910166dc 100644
--- 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 ccb0321e23..94829af7ec 100644
--- 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,30 @@ 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
+</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_inset
@@ -5220,16 +5195,7 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-45672. 
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="none" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-0.69 
+69 
 \end_layout
 
 \end_inset
@@ -5240,18 +5206,7 @@ He
 \begin_inset Text
 
 \begin_layout Standard
-C
-\begin_inset Foot
-status collapsed
-
-
-\begin_layout Standard
-Some tables require footnotes.
-\end_layout
-
-\end_inset
-
- 
+C 
 \end_layout
 
 \end_inset
@@ -5260,18 +5215,16 @@ Some tables require footnotes.
 \begin_inset Text
 
 \begin_layout Standard
-C
-\begin_inset Foot
-status collapsed
-
-
-\begin_layout Standard
-Some tables need more than one footnote.
+C 
 \end_layout
 
 \end_inset
+</cell>
+<cell alignment="right" valignment="top" usebox="none">
+\begin_inset Text
 
- 
+\begin_layout Standard
+12537
 \end_layout
 
 \end_inset
@@ -5280,7 +5233,16 @@ Some tables need more than one footnote.
 \begin_inset Text
 
 \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_inset
@@ -5289,7 +5251,16 @@ Some tables need more than one footnote.
 \begin_inset Text
 
 \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_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 ec4e701f7f..440d66060f 100644
--- 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}