From f78c69b5543d1c3d82aaffdedd2f0b289f574399 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Fri, 15 Feb 2013 19:07:26 +0100 Subject: [PATCH] Adapt to corrected tex2lyx --- development/expectedTestFailures | 2 ++ src/tex2lyx/test/test-structure.lyx.lyx | 15 ++++++++------- src/tex2lyx/test/verbatim.lyx.lyx | 9 ++------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/development/expectedTestFailures b/development/expectedTestFailures index a0dd54dc33..e793b458a6 100644 --- a/development/expectedTestFailures +++ b/development/expectedTestFailures @@ -24,3 +24,5 @@ autotests/export/MergedManuals_pdf5 #8517 autotests/export/Math_pdf #8517 autotests/export/Math_pdf2 #8517 autotests/export/Math_pdf5 #8517 +tex2lyx/roundtrip/CJKutf8.tex +tex2lyx2lyx/roundtrip/CJKutf8.tex diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx index baa53d1fb0..870f14160a 100644 --- 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 461 +\lyxformat 462 \begin_document \begin_header \textclass article @@ -968,7 +968,11 @@ verbatim: \end_layout \begin_layout Verbatim -verbat im % $ 02/19/12 +v +\end_layout + +\begin_layout Verbatim +erbat im % $ 02/19/12 \end_layout \begin_layout Verbatim @@ -1013,7 +1017,6 @@ end{raggedleft} \begin_layout Standard - \begin_inset ERT status collapsed @@ -1027,8 +1030,7 @@ verb~ \end_inset - - + \begin_inset ERT status collapsed @@ -1042,8 +1044,7 @@ item[ABC] first item+ \end_inset - - + \begin_inset ERT status collapsed diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx index 224f793d26..38aa195679 100644 --- a/src/tex2lyx/test/verbatim.lyx.lyx +++ b/src/tex2lyx/test/verbatim.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 461 +\lyxformat 462 \begin_document \begin_header \textclass article @@ -69,12 +69,7 @@ \begin_body \begin_layout Verbatim - $src set packetSize_ 100000 -\end_layout - -\begin_layout Standard - - +$ src set packetSize_ 100000 \end_layout \end_body