tex2lyx tests:

1.) Remove empty layout 'Plain'
2.) Adapt to changed look of layout 'Verbatim'

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 9e617407f037e0f1b5223ba2b499004b74e45f2b..281de98d68f0081940445ea18bd4679c1e96e0bc 100644 (file)
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -150,10 +150,6 @@ status collapsed
 % The following Bg5 encoded text cannot be processed as is by latex.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -164,10 +160,6 @@ status collapsed
 % It needs to be preprocessed by bg5conv or bg5latex needs to be used.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -178,10 +170,6 @@ status collapsed
 % See the documentation of CJK.sty for details.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -208,10 +196,6 @@ status collapsed
 % The following SJIS encoded text cannot be processed as is by latex.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -222,10 +206,6 @@ status collapsed
 % It needs to be preprocessed by sjisconv or sjislatex needs to be used.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -236,10 +216,6 @@ status collapsed
 % See the documentation of CJK.sty for details.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index d58b59b6261ea1acb64688a6831524d859e4776a..bd44fc9d4184ac12636df7e4c6fa797c9f9de9b2 100644 (file)
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -174,10 +174,6 @@ status collapsed
 %empty language paragraph
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 

diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index a5143451ad266fca943d40cf1cd6807a09dd2ac5..cdd1dadafdcfd1689d81edbd1e2b01eb9bcf733f 100644 (file)
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1641,10 +1641,6 @@ status collapsed
 %set back to justified
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index 65b90a4fb4a901d999a764f5f5f51185bdff2fa5..decd8b9434009094df9a2c000193a54fe993a784 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -122,10 +122,6 @@ status collapsed
 % this should be recognized as empty date:
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -970,37 +966,53 @@ 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
 
@@ -1014,7 +1026,8 @@ verb~
 
 \end_inset
 
- 
+
+
 \begin_inset ERT
 status collapsed
 
@@ -1028,7 +1041,8 @@ item[ABC] first item+
 
 \end_inset
 
- 
+
+
 \begin_inset ERT
 status collapsed
 
@@ -1091,10 +1105,6 @@ status collapsed
 %dummy comment inserted by tex2lyx to ensure that this paragraph is not empty
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index c7c0ad7b734f7177c892c2f8bc1aa33bb5ec8927..a72db1cc2a6264ed30a9d777e1c72a564750e199 100644 (file)
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -118,10 +118,6 @@ status collapsed
 %Midline comment
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -279,10 +275,6 @@ status collapsed
 % This line won't print!
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset