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

** Fix language switch issue introduced by the CJK patch **

Browse Source 
(no status.15x entry needed, bug was introduced in the 1.5.4 cycle)

* src/output_latex.{cpp,h}:
	- (latexParagraphs, TeXEnvironment, TeXOnePar, TeXDeeper): pass Text element 
	   instead of ParagraphList. This is necessary to detect whether we are in the main text.
	- check if we are in the main text for language switches, if needed.
* src/Buffer.cpp:
* src/insets/InsetEnvironment.cpp:
* src/insets/InsetText.cpp:
* src/mathed/InsetMathMBox.cpp:
	- adapt to new latexParagraphs definition.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@22667 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-01-25 13:31:50 +00:00
parent a4b56a4463
commit 85a10af54e
6 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Buffer.cpp
View File

@ -1073,7 +1073,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
}
// the real stuff
latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
latexParagraphs(*this, text(), os, texrow(), runparams);
// Restore the parenthood if needed
if (output_preamble)
@ -1826,7 +1826,7 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
// output paragraphs
if (isLatex()) {
texrow().reset();
latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
latexParagraphs(*this, text(), os, texrow(), runparams);
} else {
// DocBook
docbookParagraphs(paragraphs(), *this, os, runparams);

2
src/insets/InsetEnvironment.cpp
View File

@ -71,7 +71,7 @@ int InsetEnvironment::latex(Buffer const & buf, odocstream & os,
// FIXME UNICODE
os << from_utf8(layout_->latexheader);
TexRow texrow;
latexParagraphs(buf, paragraphs(), os, texrow, runparams,
latexParagraphs(buf, text_, os, texrow, runparams,
layout_->latexparagraph);
// FIXME UNICODE
os << from_utf8(layout_->latexfooter);

2
src/insets/InsetText.cpp
View File

@ -287,7 +287,7 @@ int InsetText::latex(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
TexRow texrow;
latexParagraphs(buf, paragraphs(), os, texrow, runparams);
latexParagraphs(buf, text_, os, texrow, runparams);
return texrow.rows();
}

2
src/mathed/InsetMathMBox.cpp
View File

@ -98,7 +98,7 @@ int InsetMathMBox::latex(Buffer const & buf, odocstream & os,
{
os << "\\mbox{\n";
TexRow texrow;
latexParagraphs(buf, text_.paragraphs(), os, texrow, runparams);
latexParagraphs(buf, text_, os, texrow, runparams);
os << "}";
return texrow.rows();
}

121
src/output_latex.cpp
View File

@ -56,14 +56,14 @@ static bool cjk_inherited_ = false;
ParagraphList::const_iterator
TeXEnvironment(Buffer const & buf,
ParagraphList const & paragraphs,
Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams);
ParagraphList::const_iterator
TeXOnePar(Buffer const & buf,
ParagraphList const & paragraphs,
Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams,
@ -72,7 +72,7 @@ TeXOnePar(Buffer const & buf,
ParagraphList::const_iterator
TeXDeeper(Buffer const & buf,
ParagraphList const & paragraphs,
Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams)
@ -80,13 +80,15 @@ TeXDeeper(Buffer const & buf,
LYXERR(Debug::LATEX) << "TeXDeeper... " << &*pit << endl;
ParagraphList::const_iterator par = pit;
ParagraphList const & paragraphs = text.paragraphs();
while (par != paragraphs.end() &&
par->params().depth() == pit->params().depth()) {
if (par->layout()->isEnvironment()) {
par = TeXEnvironment(buf, paragraphs, par,
par = TeXEnvironment(buf, text, par,
os, texrow, runparams);
} else {
par = TeXOnePar(buf, paragraphs, par,
par = TeXOnePar(buf, text, par,
os, texrow, runparams);
}
}
@ -98,7 +100,7 @@ TeXDeeper(Buffer const & buf,
ParagraphList::const_iterator
TeXEnvironment(Buffer const & buf,
ParagraphList const & paragraphs,
Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams)
@ -109,6 +111,8 @@ TeXEnvironment(Buffer const & buf,
Layout_ptr const & style = pit->layout();
ParagraphList const & paragraphs = text.paragraphs();
Language const * const par_language = pit->getParLanguage(bparams);
Language const * const doc_language = bparams.language;
Language const * const prev_par_language =
@ -186,7 +190,7 @@ TeXEnvironment(Buffer const & buf,
ParagraphList::const_iterator par = pit;
do {
par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
par = TeXOnePar(buf, text, par, os, texrow, runparams);
if (par == paragraphs.end()) {
// Make sure that the last paragraph is
@ -214,7 +218,7 @@ TeXEnvironment(Buffer const & buf,
os << '\n';
texrow.newline();
}
par = TeXDeeper(buf, paragraphs, par, os, texrow,
par = TeXDeeper(buf, text, par, os, texrow,
runparams);
}
} while (par != paragraphs.end()
@ -271,7 +275,7 @@ namespace {
ParagraphList::const_iterator
TeXOnePar(Buffer const & buf,
ParagraphList const & paragraphs,
Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams_in,
@ -281,6 +285,9 @@ TeXOnePar(Buffer const & buf,
<< everypar << "'" << endl;
BufferParams const & bparams = buf.params();
Layout_ptr style;
ParagraphList const & paragraphs = text.paragraphs();
bool const maintext = text.isMainText(buf);
// In an inset with unlimited length (all in one row),
// force layout to default
@ -293,31 +300,11 @@ TeXOnePar(Buffer const & buf,
runparams.moving_arg |= style->needprotect;
// we are at the beginning of an inset and CJK is already open.
if (pit == paragraphs.begin() && runparams.local_font != 0 &&
open_encoding_ == CJK) {
if (pit == paragraphs.begin() && !maintext && open_encoding_ == CJK) {
cjk_inherited_ = true;
open_encoding_ = none;
}
if (pit == paragraphs.begin() && runparams.local_font == 0) {
// Open a CJK environment at the beginning of the main buffer
// if the document's language is a CJK language
if (bparams.encoding().package() == Encoding::CJK) {
os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
<< "}{}%\n";
texrow.newline();
open_encoding_ = CJK;
}
if (!lyxrc.language_auto_begin && !bparams.language->babel().empty()) {
// FIXME UNICODE
os << from_utf8(subst(lyxrc.language_command_begin,
"$$lang",
bparams.language->babel()))
<< '\n';
texrow.newline();
}
}
// This paragraph's language
Language const * const par_language = pit->getParLanguage(bparams);
// The document's language
@ -423,17 +410,18 @@ TeXOnePar(Buffer const & buf,
// sections.
for (pos_type i = 0; i < pit->size(); ++i) {
char_type const c = pit->getChar(i);
if (runparams.encoding->package() == Encoding::inputenc && c < 0x80)
Encoding const * const encoding =
pit->getFontSettings(bparams, i).language()->encoding();
if (encoding->package() != Encoding::CJK &&
runparams.encoding->package() == Encoding::inputenc &&
c < 0x80)
continue;
if (pit->isInset(i))
break;
// All characters before c are in the ASCII range, and
// c is non-ASCII (but no inset), so change the
// encoding to that required by the language of c.
Encoding const * const encoding =
pit->getFontSettings(bparams, i).language()->encoding();
// with CJK, only add switch if we have CJK content at the beginning
// With CJK, only add switch if we have CJK content at the beginning
// of the paragraph
if (encoding->package() != Encoding::CJK || i == 0) {
OutputParams tmp_rp = runparams;
@ -672,7 +660,7 @@ TeXOnePar(Buffer const & buf,
switch (open_encoding_) {
case CJK: {
// end of main text
if (runparams.local_font == 0) {
if (maintext) {
os << '\n';
texrow.newline();
os << "\\end{CJK}\n";
@ -693,16 +681,6 @@ TeXOnePar(Buffer const & buf,
// do nothing
break;
}
// auto_end tag only if the last par is in a babel language
if (runparams.local_font == 0 && !lyxrc.language_auto_end &&
!bparams.language->babel().empty() &&
font.language()->encoding()->package() != Encoding::CJK) {
os << from_utf8(subst(lyxrc.language_command_end,
"$$lang",
bparams.language->babel()))
<< '\n';
texrow.newline();
}
}
// If this is the last paragraph, and a local_font was set upon entering
@ -742,7 +720,7 @@ TeXOnePar(Buffer const & buf,
// LaTeX all paragraphs
void latexParagraphs(Buffer const & buf,
ParagraphList const & paragraphs,
Text const & text,
odocstream & os,
TexRow & texrow,
OutputParams const & runparams,
@ -750,7 +728,9 @@ void latexParagraphs(Buffer const & buf,
{
bool was_title = false;
bool already_title = false;
TextClass const & tclass = buf.params().getTextClass();
BufferParams const & bparams = buf.params();
TextClass const & tclass = bparams.getTextClass();
ParagraphList const & paragraphs = text.paragraphs();
ParagraphList::const_iterator par = paragraphs.begin();
ParagraphList::const_iterator endpar = paragraphs.end();
@ -765,9 +745,32 @@ void latexParagraphs(Buffer const & buf,
const_cast<OutputParams&>(runparams).par_end = 0;
}
bool const maintext = text.isMainText(buf);
// Open a CJK environment at the beginning of the main buffer
// if the document's language is a CJK language
if (maintext && bparams.encoding().package() == Encoding::CJK) {
os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
<< "}{}%\n";
texrow.newline();
open_encoding_ = CJK;
}
// if "auto begin" is switched off, explicitely switch the
// language on at start
if (maintext && !lyxrc.language_auto_begin &&
!bparams.language->babel().empty()) {
// FIXME UNICODE
os << from_utf8(subst(lyxrc.language_command_begin,
"$$lang",
bparams.language->babel()))
<< '\n';
texrow.newline();
}
ParagraphList::const_iterator lastpar;
// if only_body
while (par != endpar) {
ParagraphList::const_iterator lastpar = par;
lastpar = par;
// well we have to check if we are in an inset with unlimited
// length (all in one row) if that is true then we don't allow
// any special options in the paragraph and also we don't allow
@ -805,18 +808,18 @@ void latexParagraphs(Buffer const & buf,
}
if (layout->is_environment) {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
} else if (layout->isEnvironment() ||
!par->params().leftIndent().zero()) {
par = TeXEnvironment(buf, paragraphs, par, os,
par = TeXEnvironment(buf, text, par, os,
texrow, runparams);
} else {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
}
} else {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
}
if (std::distance(lastpar, par) >= std::distance(lastpar, endpar))
@ -834,9 +837,19 @@ void latexParagraphs(Buffer const & buf,
}
texrow.newline();
}
// if "auto end" is switched off, explicitely close the language at the end
// but only if the last par is in a babel language
if (maintext && !lyxrc.language_auto_end && !bparams.language->babel().empty() &&
lastpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {
os << from_utf8(subst(lyxrc.language_command_end,
"$$lang",
bparams.language->babel()))
<< '\n';
texrow.newline();
}
// If the last paragraph is an environment, we'll have to close
// CJK at the very end to do proper nesting.
if (open_encoding_ == CJK) {
if (maintext && open_encoding_ == CJK) {
os << "\\end{CJK}\n";
texrow.newline();
open_encoding_ = none;

4
src/output_latex.h
View File

@ -23,9 +23,9 @@ class Buffer;
class BufferParams;
class Encoding;
class Paragraph;
class ParagraphList;
class OutputParams;
class TexRow;
class Text;
/// Export up to \p number optarg insets
int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
@ -38,7 +38,7 @@ int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
\sa Buffer::writeLaTeXSource for the reason.
*/
void latexParagraphs(Buffer const & buf,
ParagraphList const & paragraphs,
Text const & text,
odocstream & ofs,
TexRow & texrow,
OutputParams const &,