Fix failing test caused by 89b2c54c00.

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

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index 65ee7a35bfb6acbb4fbc42610a063e7bff35db18..e7de51d1cd8f3ba937de863b982f7e9675f0f549 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,5 +1,5 @@
-#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+#LyX file created by tex2lyx 2.1
+\lyxformat 474
 \begin_document
 \begin_header
 \textclass article
@@ -46,7 +46,7 @@ logicalmkup
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding default
 \font_roman default
 \font_sans default
@@ -71,6 +71,7 @@ logicalmkup
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 0
+\use_package cancel 0
 \use_package esint 1
 \use_package mathdots 0
 \use_package mathtools 0
@@ -79,7 +80,7 @@ logicalmkup
 \use_package stmaryrd 0
 \use_package undertilde 0
 \cite_engine basic
-\cite_engine_type numerical
+\cite_engine_type default
 \biblio_style plain
 \use_bibtopic false
 \use_indices false
@@ -118,14 +119,10 @@ Title
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 % this should be recognized as empty date:
 \end_layout
 
-\begin_layout Standard
-
-\end_layout
-
 \end_inset
 
 
@@ -162,7 +159,7 @@ An environment...
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 begin{foo}
@@ -174,7 +171,7 @@ begin{foo}
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 end{foo}
@@ -244,7 +241,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
  
@@ -278,7 +275,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 
@@ -322,7 +319,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 rotated table, spanning all columns
@@ -338,7 +335,7 @@ rotated table, spanning all columns
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 centering
@@ -350,7 +347,7 @@ centering
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 {}
 \end_layout
 
@@ -431,7 +428,7 @@ fdgsdfdh
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 test1
@@ -468,7 +465,7 @@ fdgs
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 test2
@@ -500,7 +497,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 fdg
@@ -516,7 +513,7 @@ fdg
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 centering
@@ -528,7 +525,7 @@ centering
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 {}
 \end_layout
 
@@ -556,7 +553,7 @@ status open
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 lkälöä
@@ -580,7 +577,7 @@ klöä
 \end_layout
 
 \begin_layout Plain Layout
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 ölkälö
@@ -627,7 +624,7 @@ u%re 1
 \end_layout
 
 \begin_layout Plain Layout
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 te%st
@@ -662,7 +659,7 @@ subfigure 2ö
 \end_layout
 
 \begin_layout Plain Layout
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 
@@ -698,7 +695,7 @@ subfigure 3
 
 \begin_layout Standard
 
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Standard
 figure caption
@@ -896,7 +893,7 @@ BCD second one
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 x y z
 \end_layout
 
@@ -910,11 +907,11 @@ x y z
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 x y % bla
 \end_layout
 
-\begin_layout Standard
+\begin_layout Plain Layout
 z
 \end_layout
 
@@ -951,7 +948,7 @@ label
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 $
 \backslash
 left[
@@ -970,41 +967,56 @@ right]^{x}$
 verbatim: 
 \end_layout
 
-\begin_layout Verbatim
-
-\end_layout
 \begin_layout Verbatim
 verbat  im % $ 02/19/12
 \end_layout
+
 \begin_layout Verbatim
 hjkh
 \end_layout
+
 \begin_layout Verbatim
-jkh \backslash  blah
+jkh 
+\backslash
+ blah
 \end_layout
+
 \begin_layout Verbatim
-\backslash begin{centering}
+
+\backslash
+begin{centering}
 \end_layout
+
 \begin_layout Verbatim
 
 \end_layout
+
 \begin_layout Verbatim
 
 \end_layout
+
 \begin_layout Verbatim
-zzz \backslash section{
+zzz 
+\backslash
+section{
 \end_layout
+
 \begin_layout Verbatim
-\backslash end{raggedleft}
+
+\backslash
+end{raggedleft}
 \end_layout
 
+\begin_layout Verbatim
+
+\end_layout
 
 \begin_layout Standard
 
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 verb~
@@ -1018,7 +1030,7 @@ verb~
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 verb+
@@ -1032,7 +1044,7 @@ item[ABC] first item+
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 verb+something
@@ -1087,14 +1099,10 @@ The Müller Book
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 %dummy comment inserted by tex2lyx to ensure that this paragraph is not empty
 \end_layout
 
-\begin_layout Standard
-
-\end_layout
-
 \end_inset