anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Now fix the cosmetics.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24455 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-04-22 18:33:07 +00:00
parent 4b33a37c97
commit 2b77c5d4af
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/output_latex.cpp
View File

@ -778,52 +778,53 @@ void latexParagraphs(Buffer const & buf,
// if only_body
while (par != endpar) {
lastpar = par;
Layout const & layout = par->forceEmptyLayout() ?
tclass.emptyLayout() :
par->layout();
Layout const & layout = par->forceEmptyLayout() ?
tclass.emptyLayout() :
par->layout();
if (layout.intitle) {
if (already_title) {
lyxerr << "Error in latexParagraphs: You"
" should not mix title layouts"
" with normal ones." << endl;
} else if (!was_title) {
was_title = true;
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\begin{"
<< from_ascii(tclass.titlename())
<< "}\n";
texrow.newline();
}
}
} else if (was_title && !already_title) {
if (layout.intitle) {
if (already_title) {
lyxerr << "Error in latexParagraphs: You"
" should not mix title layouts"
" with normal ones." << endl;
} else if (!was_title) {
was_title = true;
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
os << "\\begin{"
<< from_ascii(tclass.titlename())
<< "}\n";
texrow.newline();
}
else {
os << "\\" << from_ascii(tclass.titlename())
<< "\n";
}
texrow.newline();
already_title = true;
was_title = false;
}
} else if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
}
else {
os << "\\" << from_ascii(tclass.titlename())
<< "\n";
}
texrow.newline();
already_title = true;
was_title = false;
}
if (layout.is_environment) {
par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
} else if (layout.isEnvironment() ||
!par->params().leftIndent().zero()) {
par = TeXEnvironment(buf, text, par, os,
texrow, runparams);
} else {
par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
if (layout.is_environment) {
par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
} else if (layout.isEnvironment() ||
!par->params().leftIndent().zero()) {
par = TeXEnvironment(buf, text, par, os,
texrow, runparams);
} else {
par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
}
if (distance(lastpar, par) >= distance(lastpar, endpar))
break;
}
// It might be that we only have a title in this document
if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
@ -836,6 +837,7 @@ 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() &&
@ -846,6 +848,7 @@ void latexParagraphs(Buffer const & buf,
<< '\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 (maintext && open_encoding_ == CJK) {
@ -853,6 +856,7 @@ void latexParagraphs(Buffer const & buf,
texrow.newline();
open_encoding_ = none;
}
// reset inherited encoding
if (cjk_inherited_) {
open_encoding_ = CJK;