The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 84e176851d5e7dde94f4ef4cf0f96f94b2cb5e30 Author: Georg Baum <[email protected]> Date: Thu Feb 21 22:31:22 2013 +0100 Add a note about ERT environment The LyX file format only supports one CJK font mapping per document. Therefore all CJK environments which use a different mapping than the main one are output in ERT. THis is now explained in the test case, and also the converion to ERT is improved (although it is still wrong e.g. for paragraphs). diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index 806e30a..ef1fae2 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -120,7 +120,22 @@ begin{CJK}{EUC-JP}{hei} \end_inset - Japanese + Japanese + (this CJK environment will be put in ERT because LyX supports only one CJK + font mapping per document, this environment uses the +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +\backslash + +\end_layout + +\end_inset + +texttt{hei} mapping, + and the first mapping is empty. \begin_inset ERT status collapsed @@ -245,7 +260,7 @@ begin{CJK}{JIS}{} \end_inset -JIS-code + JIS-code \begin_inset ERT status collapsed diff --git a/src/tex2lyx/test/CJK.tex b/src/tex2lyx/test/CJK.tex index 434477b..a9fae3b 100644 --- a/src/tex2lyx/test/CJK.tex +++ b/src/tex2lyx/test/CJK.tex @@ -15,7 +15,10 @@ Japanese \end{CJK} \begin{CJK}{UTF8}{}Chinese traditional\end{CJK} \begin{CJK}{E Japanese \end{CJK} hello \begin{CJK}{GB}{}% -Chinese simplified \end{CJK}\begin{CJK}{EUC-JP}{hei} Japanese \end{CJK} \begin{CJK}{GB}{}Chinese simplified +Chinese simplified \end{CJK}\begin{CJK}{EUC-JP}{hei} Japanese +(this CJK environment will be put in ERT because LyX supports only one CJK +font mapping per document, this environment uses the \texttt{hei} mapping, +and the first mapping is empty.\end{CJK} \begin{CJK}{GB}{}Chinese simplified \end{CJK} % The following Bg5 encoded text cannot be processed as is by latex. diff --git a/src/tex2lyx/test/Dummy Document.lyx b/src/tex2lyx/test/Dummy Document.lyx index f9a4d91..52daa2e 100644 --- a/src/tex2lyx/test/Dummy Document.lyx +++ b/src/tex2lyx/test/Dummy Document.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 462 +\lyxformat 463 \begin_document \begin_header \textclass article @@ -7,7 +7,7 @@ \maintain_unincluded_children false \language english \language_package none -\inputencoding latin9 +\inputencoding iso8859-15 \fontencoding T1 \font_roman default \font_sans default diff --git a/src/tex2lyx/test/DummyDocument.lyx b/src/tex2lyx/test/DummyDocument.lyx index 92ec53c..310e9a7 100644 --- a/src/tex2lyx/test/DummyDocument.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 462 +\lyxformat 463 \begin_document \begin_header \textclass article @@ -7,7 +7,7 @@ \maintain_unincluded_children false \language english \language_package none -\inputencoding latin9 +\inputencoding iso8859-15 \fontencoding T1 \font_roman default \font_sans default diff --git a/src/tex2lyx/test/Dummy~Document.lyx b/src/tex2lyx/test/Dummy~Document.lyx index da5ab72..03ab7be 100644 --- a/src/tex2lyx/test/Dummy~Document.lyx +++ b/src/tex2lyx/test/Dummy~Document.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 462 +\lyxformat 463 \begin_document \begin_header \textclass article @@ -7,7 +7,7 @@ \maintain_unincluded_children false \language english \language_package none -\inputencoding latin9 +\inputencoding iso8859-15 \fontencoding T1 \font_roman default \font_sans default diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index 855ac28..f8c42d1 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -1480,6 +1480,8 @@ void parse_environment(Parser & p, ostream & os, bool outer, output_ert_inset(os, "\\", parent_context); else if (*it == '$') output_ert_inset(os, "$", parent_context); + else if (*it == '\n' && it + 1 != et && s.begin() + 1 != it) + os << "\n "; else os << *it; } ----------------------------------------------------------------------- Summary of changes: src/tex2lyx/test/CJK.lyx.lyx | 19 +++++++++++++++++-- src/tex2lyx/test/CJK.tex | 5 ++++- src/tex2lyx/test/Dummy Document.lyx | 4 ++-- src/tex2lyx/test/DummyDocument.lyx | 4 ++-- src/tex2lyx/test/Dummy~Document.lyx | 4 ++-- src/tex2lyx/text.cpp | 2 ++ 6 files changed, 29 insertions(+), 9 deletions(-) hooks/post-receive -- The LyX Source Repository
