Update tex2lyx tests

[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 b340878d369d1de15aaf53608ea5fbae8bedb2ec..f3921c3d648d28925a1be77c509b8e39e399397a 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 547
+\lyxformat 612
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -18,7 +18,7 @@
 
 \end_preamble
 \use_default_options false
-\maintain_unincluded_children false
+\maintain_unincluded_children no
 \language english
 \language_package none
 \inputencoding iso8859-15
@@ -30,7 +30,9 @@
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
-\font_osf false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \use_microtype false
@@ -52,7 +54,7 @@
 \pdf_colorlinks 0
 \pdf_backref section
 \pdf_pdfusetitle 0
-\papersize a4paper
+\papersize a4
 \use_geometry false
 \use_package amsmath 2
 \use_package amssymb 2
@@ -74,6 +76,7 @@
 \justification true
 \use_refstyle 0
 \use_minted 0
+\use_lineno false
 \index Index
 \shortcut idx
 \color #008000
@@ -99,9 +102,12 @@
 \paperpagestyle default
 \tracking_changes false
 \output_changes false
+\change_bars false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
 \end_header
 
 \begin_body
@@ -156,6 +162,8 @@ This paragraph is not indented.
 \begin_layout Section
 References
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -335,6 +343,8 @@ status collapsed
 \begin_layout Section
 Cites
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -811,6 +821,8 @@ A. 2004, ApJ, 604, 632
 \begin_layout Section
 Input files
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -868,7 +880,7 @@ literal "false"
 
 \end_inset
 
- File names containg double quotes are not legal on windows, so no test file is provided. Nevertheless, they are legal on unix, so we test at least the parsing. File names containing spaces can not be handled by automake (make dist would fail), so no test file is provided as well. Since the files do not exist, the variants without extension would not work (tex2lyx can't deduce the correct extension of nonexisting files). 
+ File names containing double quotes are not legal on windows, so no test file is provided. Nevertheless, they are legal on unix, so we test at least the parsing. File names containing spaces can not be handled by automake (make dist would fail), so no test file is provided as well. Since the files do not exist, the variants without extension would not work (tex2lyx can't deduce the correct extension of nonexisting files). 
 \begin_inset CommandInset include
 LatexCommand include
 preview false
@@ -888,7 +900,7 @@ We can also import chess diagrams:
 
 \begin_inset External
        template ChessDiagram
-       filename ../../../lib/examples/iecc05.fen
+       filename ../../../lib/examples/Graphics_and_Insets/iecc05.fen
 
 \end_inset
 
@@ -903,7 +915,7 @@ Spreadsheets:
 
 \begin_inset External
        template GnumericSpreadsheet
-       filename ../../../lib/examples/longsheet.gnumeric
+       filename ../../../lib/examples/External_Material/longsheet.gnumeric
 
 \end_inset
 
@@ -933,7 +945,7 @@ and PDF pages:
 
 \begin_inset External
        template PDFPages
-       filename ../../../lib/examples/beamer-icsi-logo.pdf
+       filename ../../../lib/examples/Presentations/beamer-icsi-logo.pdf
        extra LaTeX "pages=-"
        rotateAngle 22
        rotateOrigin baselineleft
@@ -981,6 +993,8 @@ literal "false"
 \begin_layout Section
 URLs and Hyperlinks
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -1144,6 +1158,8 @@ literal "false"
 \begin_layout Section
 Lists
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -1178,7 +1194,7 @@ Inline:
 \begin_inset listings
 lstparams "language={C++},keywordstyle={\color{green}}"
 inline true
-status collapsed
+status open
 
 \begin_layout Plain Layout
 int a=5;
@@ -1198,7 +1214,7 @@ int a=5;
 \begin_inset listings
 lstparams "caption={Example Listing float},label={lst:Example-Listing},language=Python"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 # Example listing float
@@ -1282,7 +1298,7 @@ symbol
 \begin_inset listings
 lstparams "extendedchars=true,firstline=3,language=Python,lastline=8,numbers=left,showspaces=true,stepnumber=3"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 def func(param):
@@ -1330,7 +1346,7 @@ Special cases:
 \begin_inset listings
 lstparams "abovecaptionskip=2em,basicstyle={\large\ttfamily},breaklines=true,extendedchars=true,firstline=2,float=h,language={[R/3 3.1]ABAP},lastline=5,numbers=left,numberstyle={\scriptsize},showspaces=true,showstringspaces=false,stepnumber=3,tabsize=4"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 hello
@@ -1346,7 +1362,7 @@ hello
 \begin_inset listings
 lstparams "language=TeX"
 inline true
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -1362,6 +1378,8 @@ begin{centering} hello
 \begin_layout Section
 Graphics
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -1384,9 +1402,9 @@ There is also some basic support for graphics, in the form
 \begin_inset Graphics 
        filename foo.eps
        width 1cm
-       height 1cm
        clip
        BoundingBox 10bp 0bp 96bp 96bp
+       special height=1cm
 
 \end_inset
 
@@ -1396,6 +1414,8 @@ There is also some basic support for graphics, in the form
 \begin_layout Section
 Tables
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -1481,7 +1501,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 +3558,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 +4516,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 +4621,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">
@@ -4651,75 +4671,11 @@ Chip
 </cell>
 </row>
 <row>
-<cell alignment="center" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" topline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-cmidrule
-\end_layout
-
-\end_inset
-
-(r)
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{
-\end_layout
-
-\end_inset
-
-2-2
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-cmidrule
-\end_layout
-
-\end_inset
-
-(l)
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{
-\end_layout
-
-\end_inset
-
-3-4
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-}
-\end_layout
-
-\end_inset
-
-
 \begin_inset ERT
 status collapsed
 
@@ -4768,7 +4724,7 @@ Detector thickness in µm
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" topline="true" toplinertrim="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
@@ -4777,7 +4733,7 @@ Detector thickness in µm
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" topline="true" toplineltrim="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
@@ -4786,7 +4742,7 @@ Detector thickness in µm
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" topline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Standard
@@ -5088,7 +5044,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 +5377,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 +5403,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 +5412,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 +5421,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 +5450,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 +5459,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 +5468,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 +5497,29 @@ He
 
 \end_inset
 </cell>
-<cell alignment="right" 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">
+<cell alignment="decimal" 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 +5544,29 @@ C
 
 \end_inset
 </cell>
-<cell alignment="right" 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">
+<cell alignment="decimal" 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
@@ -6274,6 +6147,8 @@ macrot{x}
 \begin_layout Section
 Special formattings
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -6971,12 +6846,58 @@ 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
 Line breaks
 \begin_inset Index breaks
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -7065,6 +6986,8 @@ status collapsed
 \begin_layout Subsection
 Page breaks
 \begin_inset Index breaks
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -7103,6 +7026,8 @@ pagebreak[4]
 \begin_layout Section
 Special characters
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout
@@ -7340,6 +7265,8 @@ latex2writer outputs quotes in braces like
 \begin_layout Section
 Mathematics
 \begin_inset Index idx
+range none
+pageformat default
 status collapsed
 
 \begin_layout Plain Layout