update tex2lyx tests after file format change

[lyx.git] / src / tex2lyx / test / test-insets.lyx.lyx

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 0ebed5d7066abe8f5c181cf7fb0c11814370e0cc..116ea1d2d4c0f6f48970c2b38d23ba2752c12fe6 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 550
+\lyxformat 567
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -1481,7 +1481,7 @@ clearpage}
 
 \begin_inset Tabular 
 <lyxtabular version="3" rows="66" columns="2">
-<features rotate="0" islongtable="true">
+<features islongtable="true" tabularwidth="0pt">
 <column alignment="none" valignment="top" special="@{*}r">
 <column alignment="none" valignment="top" special="|p{1in}@{*}">
 <row endfirsthead="true">
@@ -3538,7 +3538,7 @@ like this.
 From bug 7412 another example with more captions (can currently not produced in LyX): 
 \begin_inset Tabular 
 <lyxtabular version="3" rows="45" columns="2">
-<features rotate="0" islongtable="true" lastFootEmpty="true">
+<features islongtable="true" lastFootEmpty="true" tabularwidth="0pt">
 <column alignment="left" valignment="top">
 <column alignment="left" valignment="top">
 <row endfirsthead="true" caption="true">
@@ -4496,7 +4496,7 @@ status collapsed
 
 \begin_inset Tabular 
 <lyxtabular version="3" rows="2" columns="2">
-<features rotate="0" tabularvalignment="bottom" tabularwidth="80col%">
+<features tabularvalignment="bottom" tabularwidth="80col%">
 <column alignment="left" valignment="top">
 <column alignment="right" valignment="top">
 <row>
@@ -4601,7 +4601,7 @@ status collapsed
 
 \begin_inset Tabular 
 <lyxtabular version="3" rows="8" columns="4">
-<features rotate="0" booktabs="true" tabularvalignment="middle" tabularwidth="0pt">
+<features booktabs="true" tabularvalignment="middle" tabularwidth="0pt">
 <column alignment="center" valignment="top">
 <column alignment="center" valignment="top">
 <column alignment="center" valignment="top">
@@ -5088,7 +5088,7 @@ status open
 
 \begin_inset Tabular 
 <lyxtabular version="3" rows="4" columns="5">
-<features rotate="0" tabularvalignment="middle" tabularwidth="0pt">
+<features tabularvalignment="middle" tabularwidth="0pt">
 <column alignment="center" valignment="top">
 <column alignment="center" valignment="top">
 <column alignment="none" valignment="top" special="d">
@@ -5421,16 +5421,13 @@ status open
 \begin_layout Standard
 
 \begin_inset Tabular 
-<lyxtabular version="3" rows="4" columns="8">
-<features rotate="0" tabularvalignment="middle" tabularwidth="0pt">
+<lyxtabular version="3" rows="4" columns="5">
+<features tabularvalignment="middle" tabularwidth="0pt">
 <column alignment="center" valignment="top">
 <column alignment="center" valignment="top">
-<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">
+<column alignment="decimal" decimal_point="." valignment="top">
+<column alignment="decimal" decimal_point="." valignment="top">
+<column alignment="decimal" decimal_point="." valignment="top">
 <row>
 <cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
@@ -5450,7 +5447,7 @@ Two
 
 \end_inset
 </cell>
-<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
+<cell alignment="none" valignment="top" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
@@ -5459,12 +5456,7 @@ Three
 
 \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">
+<cell alignment="none" valignment="top" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
@@ -5473,23 +5465,13 @@ Four
 
 \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">
+<cell alignment="none" valignment="top" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
 Five
 \end_layout
 
-\end_inset
-</cell>
-<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
-\begin_inset Text
-
 \end_inset
 </cell>
 </row>
@@ -5512,7 +5494,7 @@ two
 
 \end_inset
 </cell>
-<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
+<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
@@ -5521,12 +5503,7 @@ three
 
 \end_inset
 </cell>
-<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
-\end_inset
-</cell>
-<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
+<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
@@ -5535,23 +5512,13 @@ four
 
 \end_inset
 </cell>
-<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
-\end_inset
-</cell>
-<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
+<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
 \begin_inset Text
 
 \begin_layout Standard
 five
 \end_layout
 
-\end_inset
-</cell>
-<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
 \end_inset
 </cell>
 </row>
@@ -5574,52 +5541,29 @@ He
 
 \end_inset
 </cell>
-<cell alignment="right" valignment="top" usebox="none">
+<cell alignment="decimal" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-2
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="none" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-77234 
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="right" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-45672
+2.77234 
 \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">
+<cell alignment="decimal" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-0
+45672.
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" usebox="none">
+<cell alignment="decimal" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-69 
+0.69 
 \end_layout
 
 \end_inset
@@ -5644,56 +5588,29 @@ C
 
 \end_inset
 </cell>
-<cell alignment="right" valignment="top" usebox="none">
+<cell alignment="decimal" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-12537
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="none" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-64 
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="right" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-37
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="none" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-66345 
+12537.64 
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="right" valignment="top" usebox="none">
+<cell alignment="decimal" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-86
+37.66345 
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="none" valignment="top" usebox="none">
+<cell alignment="decimal" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
-37 
+86.37 
 \end_layout
 
 \end_inset
@@ -6971,7 +6888,51 @@ Other symbols
 \end_layout
 
 \begin_layout Standard
-All three should be converted to U+00C5: Å Å Å (not U+212B). All three should be converted to U+00E5: å å å.
+All three should be converted to U+00C5: 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+AA
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+{}
+\end_layout
+
+\end_inset
+
+ Å Å (not U+212B). All three should be converted to U+00E5: 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+aa
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+{}
+\end_layout
+
+\end_inset
+
+ å å.
 \end_layout
 
 \begin_layout Subsection