Author: vfr
Date: Thu Jan 6 14:41:50 2011
New Revision: 37127
URL: http://www.lyx.org/trac/changeset/37127
Log:
Revert r37092. The fix was wrong.
Modified:
lyx-devel/trunk/src/OutputParams.cpp
lyx-devel/trunk/src/OutputParams.h
lyx-devel/trunk/src/output_latex.cpp
Modified: lyx-devel/trunk/src/OutputParams.cpp
==============================================================================
--- lyx-devel/trunk/src/OutputParams.cpp Thu Jan 6 14:11:39 2011
(r37126)
+++ lyx-devel/trunk/src/OutputParams.cpp Thu Jan 6 14:41:50 2011
(r37127)
@@ -20,8 +20,7 @@
OutputParams::OutputParams(Encoding const * enc)
: flavor(LATEX), math_flavor(NotApplicable), nice(false),
moving_arg(false),
- inulemcmd(false), inTitle(false), didTitle(false), local_font(0),
- master_language(0), encoding(enc),
+ inulemcmd(false), local_font(0), master_language(0), encoding(enc),
free_spacing(false), use_babel(false), use_polyglossia(false),
use_indices(false), use_japanese(false), linelen(0), depth(0),
exportdata(new ExportData),
Modified: lyx-devel/trunk/src/OutputParams.h
==============================================================================
--- lyx-devel/trunk/src/OutputParams.h Thu Jan 6 14:11:39 2011 (r37126)
+++ lyx-devel/trunk/src/OutputParams.h Thu Jan 6 14:41:50 2011 (r37127)
@@ -99,14 +99,6 @@
*/
mutable bool inulemcmd;
- /** Whether we are in the process of outputting title information.
- */
- mutable bool inTitle;
-
- /** Whether we have arleady output \maketitle or whatever.
- */
- mutable bool didTitle;
-
/** the font at the point where the inset is
*/
Font const * local_font;
Modified: lyx-devel/trunk/src/output_latex.cpp
==============================================================================
--- lyx-devel/trunk/src/output_latex.cpp Thu Jan 6 14:11:39 2011
(r37126)
+++ lyx-devel/trunk/src/output_latex.cpp Thu Jan 6 14:41:50 2011
(r37127)
@@ -978,6 +978,9 @@
pit_type pit = runparams.par_begin;
// lastpit is for the language check after the loop.
pit_type lastpit = pit;
+ // variables used in the loop:
+ bool was_title = false;
+ bool already_title = false;
DocumentClass const & tclass = bparams.documentClass();
for (; pit < runparams.par_end; ++pit) {
@@ -990,12 +993,12 @@
tclass.plainLayout() : par->layout();
if (layout.intitle) {
- if (runparams.didTitle) {
+ if (already_title) {
LYXERR0("Error in latexParagraphs: You"
" should not mix title layouts"
" with normal ones.");
- } else if (!runparams.inTitle) {
- runparams.inTitle = true;
+ } else if (!was_title) {
+ was_title = true;
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\begin{"
<<
from_ascii(tclass.titlename())
@@ -1003,7 +1006,7 @@
texrow.newline();
}
}
- } else if (runparams.inTitle && !runparams.didTitle) {
+ } else if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
@@ -1013,8 +1016,8 @@
<< "\n";
}
texrow.newline();
- runparams.didTitle = true;
- runparams.inTitle = false;
+ already_title = true;
+ was_title = false;
}
@@ -1040,7 +1043,7 @@
}
// It might be that we only have a title in this document
- if (runparams.inTitle && !runparams.didTitle) {
+ if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
