anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a note about ERT environment

Browse Source 
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).
This commit is contained in:
Georg Baum 2013-02-21 22:31:22 +01:00
parent eb53c60a8f
commit 84e176851d
6 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tex2lyx/test/CJK.lyx.lyx
View File

@ -120,7 +120,22 @@ begin{CJK}{EUC-JP}{hei}
\end_inset \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 \begin_inset ERT
status collapsed status collapsed
@ -245,7 +260,7 @@ begin{CJK}{JIS}{}
\end_inset \end_inset
JIS-code  JIS-code 
\begin_inset ERT \begin_inset ERT
status collapsed status collapsed

5
src/tex2lyx/test/CJK.tex
View File

@ -15,7 +15,10 @@ Japanese \end{CJK} \begin{CJK}{UTF8}{}Chinese traditional\end{CJK} \begin{CJK}{E
Japanese \end{CJK} Japanese \end{CJK}
hello hello
\begin{CJK}{GB}{}% \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} \end{CJK}
% The following Bg5 encoded text cannot be processed as is by latex. % The following Bg5 encoded text cannot be processed as is by latex.

4
src/tex2lyx/test/Dummy Document.lyx
View File

@ -1,5 +1,5 @@
#LyX file created by tex2lyx 2.1.0dev #LyX file created by tex2lyx 2.1.0dev
\lyxformat 462 \lyxformat 463
\begin_document \begin_document
\begin_header \begin_header
\textclass article \textclass article
@ -7,7 +7,7 @@
\maintain_unincluded_children false \maintain_unincluded_children false
\language english \language english
\language_package none \language_package none
\inputencoding latin9 \inputencoding iso8859-15
\fontencoding T1 \fontencoding T1
\font_roman default \font_roman default
\font_sans default \font_sans default

4
src/tex2lyx/test/DummyDocument.lyx
View File

@ -1,5 +1,5 @@
#LyX file created by tex2lyx 2.1.0dev #LyX file created by tex2lyx 2.1.0dev
\lyxformat 462 \lyxformat 463
\begin_document \begin_document
\begin_header \begin_header
\textclass article \textclass article
@ -7,7 +7,7 @@
\maintain_unincluded_children false \maintain_unincluded_children false
\language english \language english
\language_package none \language_package none
\inputencoding latin9 \inputencoding iso8859-15
\fontencoding T1 \fontencoding T1
\font_roman default \font_roman default
\font_sans default \font_sans default

4
src/tex2lyx/test/Dummy~Document.lyx
View File

@ -1,5 +1,5 @@
#LyX file created by tex2lyx 2.1.0dev #LyX file created by tex2lyx 2.1.0dev
\lyxformat 462 \lyxformat 463
\begin_document \begin_document
\begin_header \begin_header
\textclass article \textclass article
@ -7,7 +7,7 @@
\maintain_unincluded_children false \maintain_unincluded_children false
\language english \language english
\language_package none \language_package none
\inputencoding latin9 \inputencoding iso8859-15
\fontencoding T1 \fontencoding T1
\font_roman default \font_roman default
\font_sans default \font_sans default

2
src/tex2lyx/text.cpp
View File

@ -1480,6 +1480,8 @@ void parse_environment(Parser & p, ostream & os, bool outer,
output_ert_inset(os, "\\", parent_context); output_ert_inset(os, "\\", parent_context);
else if (*it == '$') else if (*it == '$')
output_ert_inset(os, "$", parent_context); output_ert_inset(os, "$", parent_context);
else if (*it == '\n' && it + 1 != et && s.begin() + 1 != it)
os << "\n ";
else else
os << *it; os << *it;
} }