Update tex2lyx tests after the format change

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

diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index b8e5567a70b1ab19717940eb20b922e2979aa918..2e9f919a092bbf21131e4360e2fa70ee1ece7c3e 100644 (file)
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 570
+\lyxformat 599
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -42,7 +42,7 @@
 
 \end_preamble
 \use_default_options false
-\maintain_unincluded_children false
+\maintain_unincluded_children no
 \language english
 \language_package none
 \inputencoding iso8859-15
@@ -54,7 +54,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
@@ -76,7 +78,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
@@ -98,6 +100,7 @@
 \justification true
 \use_refstyle 0
 \use_minted 0
+\use_lineno false
 \index Index
 \shortcut idx
 \color #008000
@@ -123,9 +126,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
@@ -899,7 +904,7 @@ We can also import 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
@@ -1324,9 +1329,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
 
@@ -4591,75 +4596,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
 
@@ -4708,7 +4649,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
@@ -4717,7 +4658,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
@@ -4726,7 +4667,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