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

fix arabtex-related problems (bug 1225 and bug 1404)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8692 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-04-22 13:59:39 +00:00
parent 1fa0fb5c67
commit de3c8e5b80
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/output_latex.C
View File

@ -145,7 +145,13 @@ TeXEnvironment(Buffer const & buf,
do { do {
par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams); par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
if (par != const_cast<ParagraphList&>(paragraphs).end() && par->params().depth() > pit->params().depth()) { if (par == const_cast<ParagraphList&>(paragraphs).end()) {
// Make sure that the last paragraph is
// correctly terminated (because TeXOnePar does
// not add a \n in this case)
os << '\n';
texrow.newline();
} else if (par->params().depth() > pit->params().depth()) {
if (par->layout()->isParagraph()) { if (par->layout()->isParagraph()) {
// Thinko! // Thinko!
@ -381,6 +387,25 @@ paragraphs);
} }
} }
if (boost::next(pit) == const_cast<ParagraphList&>(paragraphs).end()
&& language->babel() != doc_language->babel()) {
// Since \selectlanguage write the language to the aux file,
// we need to reset the language at the end of footnote or
// float.
if (lyxrc.language_command_end.empty())
os << subst(lyxrc.language_command_begin,
"$$lang",
doc_language->babel())
<< endl;
else
os << subst(lyxrc.language_command_end,
"$$lang",
language->babel())
<< endl;
texrow.newline();
}
if (!pit->forceDefaultParagraphs()) { if (!pit->forceDefaultParagraphs()) {
further_blank_line = false; further_blank_line = false;
@ -399,27 +424,11 @@ paragraphs);
} }
// we don't need it for the last paragraph!!! // we don't need it for the last paragraph!!!
// Note from JMarc: we will re-add a \n explicitely in
// TeXEnvironment, because it is needed in this case
if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) { if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
os << '\n'; os << '\n';
texrow.newline(); texrow.newline();
} else {
// Since \selectlanguage write the language to the aux file,
// we need to reset the language at the end of footnote or
// float.
if (language->babel() != doc_language->babel()) {
if (lyxrc.language_command_end.empty())
os << subst(lyxrc.language_command_begin,
"$$lang",
doc_language->babel())
<< endl;
else
os << subst(lyxrc.language_command_end,
"$$lang",
language->babel())
<< endl;
texrow.newline();
}
} }
lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl; lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl;