Update tex2lyx tests after the 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 ec3de9576a0426caf2ca6d2d4b2bd2c07a652dbf..92d0facf379bb6e764bcecdaa7a2c77d3246e61f 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 566
+\lyxformat 599
 \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,11 @@
 \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
 \end_header
 
 \begin_body
@@ -868,7 +873,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 +893,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 +908,7 @@ Spreadsheets:
 
 \begin_inset External
        template GnumericSpreadsheet
-       filename ../../../lib/examples/longsheet.gnumeric
+       filename ../../../lib/examples/External_Material/longsheet.gnumeric
 
 \end_inset
 
@@ -933,7 +938,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
@@ -1384,9 +1389,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
 
@@ -4651,75 +4656,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 +4709,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 +4718,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 +4727,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
@@ -6888,7 +6829,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