The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 45fd75fe967208d3be614375dcf527d79cf367a2 Author: Georg Baum <[email protected]> Date: Sun Jul 8 20:09:02 2012 +0200 Manually update test results to current format. Now you can see the regressions without differences caused by real fixes or file format updates. diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index 02d8bd4..60bf6fa 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -1,11 +1,11 @@ #LyX file created by tex2lyx 2.1.0svn -\lyxformat 430 +\lyxformat 433 \begin_document \begin_header \textclass article \begin_preamble -\usepackage{CJK}\usepackage{babel} +\usepackage{babel} % It is impossible to get the document language because the document could start with a command, @@ -15,6 +15,7 @@ \end_preamble \use_default_options false +\maintain_unincluded_children false \language english \language_package default \inputencoding utf8 @@ -29,12 +30,17 @@ \font_sf_scale 100 \font_tt_scale 100 \graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize default \spacing single \use_hyperref 0 \papersize default \use_geometry false \use_package amsmath 1 +\use_package amssymb 0 \use_package esint 1 \use_package mathdots 0 \use_package mathtools 0 @@ -68,295 +74,48 @@ \begin_layout Standard - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{CJK} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ -\end_layout - -\end_inset - -EUC-JP -\begin_inset ERT -status collapsed - -\begin_layout Standard - -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{} -\end_layout - -\end_inset +\lang japanese-cjk Japanese -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{CJK} \end_layout -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{CJK} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ -\end_layout - -\end_inset - -UTF8 -\begin_inset ERT -status collapsed - -\begin_layout Standard - -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - \begin_layout Standard -{} -\end_layout - -\end_inset +\lang chinese-traditional Chinese traditional -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{CJK} \end_layout -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{CJK} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ -\end_layout - -\end_inset - -EUC-JP -\begin_inset ERT -status collapsed - -\begin_layout Standard - -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - \begin_layout Standard -{} -\end_layout - -\end_inset +\lang japanese-cjk Japanese -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{CJK} \end_layout -\end_inset - - hello -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{CJK} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - \begin_layout Standard -{ +hello \end_layout -\end_inset - -GB -\begin_inset ERT -status collapsed - \begin_layout Standard -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{} -\end_layout - -\end_inset +\lang chinese-simplified Chinese simplified -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{CJK} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{CJK} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ \end_layout -\end_inset - -EUC-JP -\begin_inset ERT -status collapsed - \begin_layout Standard -} -\end_layout - -\end_inset - \begin_inset ERT status collapsed \begin_layout Standard -{ -\end_layout - -\end_inset - -hei -\begin_inset ERT -status collapsed - -\begin_layout Standard -} +\backslash +begin{CJK}{EUC-JP}{hei} \end_layout \end_inset @@ -374,66 +133,14 @@ end{CJK} \end_inset - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{CJK} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ -\end_layout - -\end_inset - -GB -\begin_inset ERT -status collapsed - -\begin_layout Standard -} \end_layout -\end_inset - - -\begin_inset ERT -status collapsed - \begin_layout Standard -{} -\end_layout - -\end_inset +\lang chinese-simplified Chinese simplified -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{CJK} -\end_layout - -\end_inset - - \end_layout \begin_layout Standard @@ -446,45 +153,14 @@ status collapsed \backslash -begin{CJK} +begin{CJK}{Bg5}{} \end_layout \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ -\end_layout - -\end_inset +Big5 æé¼æ¥·æ¸ -Bg5 -\begin_inset ERT -status collapsed - -\begin_layout Standard - -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{} -\end_layout - -\end_inset - - Big5 æé¼æ¥·æ¸ \begin_inset ERT status collapsed @@ -517,45 +193,14 @@ status collapsed \backslash -begin{CJK} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ -\end_layout - -\end_inset - -SJIS -\begin_inset ERT -status collapsed - -\begin_layout Standard - -} +begin{CJK}{SJIS}{} \end_layout \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{} -\end_layout - -\end_inset +Shift_JIS æ¥æ¬èªã®æç« - ShiftJIS æÂ¥æ¬èªÂã®æÂÂç« \begin_inset ERT status collapsed @@ -586,66 +231,48 @@ status collapsed \backslash -begin{CJK} +begin{CJK}{JIS}{} \end_layout \end_inset +JIS-code \begin_inset ERT status collapsed \begin_layout Standard -{ +$ \end_layout \end_inset -JIS +BF|K \begin_inset ERT status collapsed \begin_layout Standard -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed -\begin_layout Standard +\backslash -{} \end_layout \end_inset - JIS-code -\begin_inset Formula $BF|K\8l$ -\end_inset - -NJ8>O(B +8l \begin_inset ERT status collapsed \begin_layout Standard - -\backslash -end{CJK} +$ \end_layout \end_inset - -\end_layout - -\begin_layout Standard - +NJ8>O(B \begin_inset ERT status collapsed @@ -654,58 +281,19 @@ status collapsed \backslash -begin{CJK} +end{CJK} \end_layout \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ \end_layout -\end_inset - -KS -\begin_inset ERT -status collapsed - \begin_layout Standard -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{} -\end_layout - -\end_inset +\lang korean Korean -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{CJK} -\end_layout - -\end_inset - - \end_layout \end_body diff --git a/src/tex2lyx/test/DummyDocument.lyx b/src/tex2lyx/test/DummyDocument.lyx index 2278035..2625ebc 100644 --- a/src/tex2lyx/test/DummyDocument.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx @@ -1,9 +1,10 @@ #LyX file created by tex2lyx 2.1.0svn -\lyxformat 430 +\lyxformat 433 \begin_document \begin_header \textclass article \use_default_options false +\maintain_unincluded_children false \language english \language_package none \inputencoding latin9 @@ -18,12 +19,17 @@ \font_sf_scale 100 \font_tt_scale 100 \graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize 12 \spacing onehalf \use_hyperref 0 \papersize a4paper \use_geometry false \use_package amsmath 2 +\use_package amssymb 0 \use_package esint 1 \use_package mathdots 0 \use_package mathtools 0 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 23b0750..c17dd9d 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0svn -\lyxformat 430 +\lyxformat 433 \begin_document \begin_header \textclass article @@ -39,6 +39,7 @@ \end_preamble \options b4paper \use_default_options false +\maintain_unincluded_children false \language english \language_package none \inputencoding latin9 @@ -53,12 +54,17 @@ \font_sf_scale 100 \font_tt_scale 100 \graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize 12 \spacing other 1.2 \use_hyperref 0 \papersize b4paper \use_geometry true \use_package amsmath 2 +\use_package amssymb 0 \use_package esint 1 \use_package mathdots 0 \use_package mathtools 0 @@ -740,7 +746,18 @@ fr \color blue ame \color inherit -box 1 blabla +box 1 +\begin_inset ERT +status collapsed + +\begin_layout Standard + +} +\end_layout + +\end_inset + + blabla \end_layout \begin_layout Standard @@ -800,7 +817,20 @@ framebox 3 \begin_layout Standard This is an example text. -\begin_inset Box Boxed +\begin_inset ERT +status collapsed + +\begin_layout Standard + + +\backslash +framebox{ +\end_layout + +\end_inset + + +\begin_inset Box Frameless position "c" hor_pos "c" has_inner_box 1 @@ -840,6 +870,17 @@ box height. \end_inset + +\begin_inset ERT +status collapsed + +\begin_layout Standard + +} +\end_layout + +\end_inset + This is an example text. \end_layout diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx index 08d9030..755e592 100644 --- 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.1.0svn -\lyxformat 430 +\lyxformat 433 \begin_document \begin_header \textclass article @@ -10,6 +10,7 @@ \end_preamble \use_default_options false +\maintain_unincluded_children false \language english \language_package none \inputencoding latin9 @@ -24,12 +25,17 @@ \font_sf_scale 100 \font_tt_scale 100 \graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize 12 \spacing onehalf \use_hyperref 0 \papersize a4paper \use_geometry false \use_package amsmath 2 +\use_package amssymb 0 \use_package esint 1 \use_package mathdots 0 \use_package mathtools 0 @@ -66,6 +72,27 @@ Title \end_layout +\begin_layout Standard + + +\begin_inset ERT +status collapsed + +\begin_layout Standard + +%stupid stuff +\end_layout + +\begin_layout Standard + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Date two days ago @@ -4582,96 +4609,22 @@ two </cell> </row> <row> -<cell alignment="left" valignment="top" usebox="none"> +<cell alignment="left" valignment="top" rotate="-50" usebox="none"> \begin_inset Text \begin_layout Standard - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{turn} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - -{ -\end_layout - -\end_inset - --50 -\begin_inset ERT -status collapsed - -\begin_layout Standard - -} -\end_layout - -\end_inset - lonely -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{turn} -\end_layout - -\end_inset - - \end_layout \end_inset </cell> -<cell alignment="right" valignment="top" usebox="none"> +<cell alignment="right" valignment="top" rotate="90" usebox="none"> \begin_inset Text \begin_layout Standard - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{sideways} -\end_layout - -\end_inset - lines -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{sideways} -\end_layout - -\end_inset - - \end_layout \end_inset @@ -6642,7 +6595,10 @@ Mathematics \begin_layout Standard Let -\begin_inset Formula $f:\left[ a,b\right] \rightarrow\mathbb{R} +\begin_inset Formula $f:\left[ a,b\right] \rightarrow%TCIMACRO{\U{211d} }% +%BeginExpansion +\mathbb{R} +%EndExpansion $ \end_inset diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx index 6afafcb..27761e8 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.0svn -\lyxformat 430 +\lyxformat 433 \begin_document \begin_header \textclass article @@ -13,7 +13,7 @@ \expandafter\SF@gobble@opt \fi } -\expandafter\def\csname SF@gobble@opt endcsname{\@ifnextchar[%] +\expandafter\def\csname SF@gobble@opt \endcsname{\@ifnextchar[%] \SF@gobble@twobracket \@gobble } @@ -43,6 +43,7 @@ \begin_modules logicalmkup \end_modules +\maintain_unincluded_children false \language english \language_package default \inputencoding latin9 @@ -57,12 +58,18 @@ logicalmkup \font_sf_scale 100 \font_tt_scale 100 \graphics default +\default_output_format default +\output_sync 1 +\output_sync_macro "\synctex=-1" +\bibtex_command default +\index_command default \paperfontsize default \spacing single \use_hyperref 0 \papersize legalpaper \use_geometry false \use_package amsmath 1 +\use_package amssymb 0 \use_package esint 1 \use_package mathdots 0 \use_package mathtools 0 diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx index caa79e2..6327f5f 100644 --- a/src/tex2lyx/test/test.lyx.lyx +++ b/src/tex2lyx/test/test.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0svn -\lyxformat 430 +\lyxformat 433 \begin_document \begin_header \textclass article @@ -15,6 +15,7 @@ \end_preamble \use_default_options false +\maintain_unincluded_children false \language english \language_package none \inputencoding auto @@ -29,12 +30,17 @@ \font_sf_scale 100 \font_tt_scale 100 \graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize 11 \spacing single \use_hyperref 0 \papersize default \use_geometry false \use_package amsmath 1 +\use_package amssymb 0 \use_package esint 1 \use_package mathdots 0 \use_package mathtools 0 ----------------------------------------------------------------------- Summary of changes: src/tex2lyx/test/CJK.lyx.lyx | 472 ++------------------ src/tex2lyx/test/DummyDocument.lyx | 8 +- .../test/box-color-size-space-align.lyx.lyx | 47 ++- src/tex2lyx/test/test-insets.lyx.lyx | 112 ++---- src/tex2lyx/test/test-structure.lyx.lyx | 11 +- src/tex2lyx/test/test.lyx.lyx | 8 +- 6 files changed, 131 insertions(+), 527 deletions(-) hooks/post-receive -- The LyX Source Repository
