X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=336133098302a6643a181997a1c06efae3389bff;hb=2d7cf039351fba0d91746dce8cbf1f9e31cdc224;hp=a3962f7235171e00ce2e9ec0fc574b41c705eb61;hpb=1614a64e1518630385c8904bdfde37746ecb8d25;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index a3962f7235..3361330983 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -76,9 +76,11 @@ struct TeXEnvironementData }; -static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & text, - ParagraphList::const_iterator pit, odocstream & os, TexRow & texrow, - OutputParams const & runparams) +static TeXEnvironementData prepareEnvironement(Buffer const & buf, + Text const & text, + ParagraphList::const_iterator pit, + otexstream & os, + OutputParams const & runparams) { TeXEnvironementData data; @@ -131,7 +133,6 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & prev_par_lang)) // the '%' is necessary to prevent unwanted whitespace << "%\n"; - texrow.newline(); } if ((lang_end_command.empty() || @@ -148,7 +149,6 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & << "]"; // the '%' is necessary to prevent unwanted whitespace os << "%\n"; - texrow.newline(); } } @@ -157,19 +157,13 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & os << "\\begin{LyXParagraphLeftIndent}{" << from_ascii(pit->params().leftIndent().asLatexString()) << "}\n"; - texrow.newline(); data.leftindent_open = true; } if (style.isEnvironment()) { os << "\\begin{" << from_ascii(style.latexname()) << '}'; - if (style.optargs != 0 || style.reqargs != 0) { - int ret = latexArgInsets(*pit, os, runparams, style.reqargs, style.optargs); - while (ret > 0) { - texrow.newline(); - --ret; - } - } + if (style.optargs != 0 || style.reqargs != 0) + latexArgInsets(*pit, os, runparams, style.reqargs, style.optargs); if (style.latextype == LATEX_LIST_ENVIRONMENT) { os << '{' << pit->params().labelWidthString() @@ -183,7 +177,6 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & << "}\n"; } else os << from_ascii(style.latexparam()) << '\n'; - texrow.newline(); } data.style = &style; @@ -196,26 +189,23 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; open_encoding_ = CJK; data.cjk_nested = true; - texrow.newline(); } return data; } -static void finishEnvironement(odocstream & os, TexRow & texrow, - OutputParams const & runparams, TeXEnvironementData const & data) +static void finishEnvironement(otexstream & os, OutputParams const & runparams, + TeXEnvironementData const & data) { if (open_encoding_ == CJK && data.cjk_nested) { // We need to close the encoding even if it does not change // to do correct environment nesting os << "\\end{CJK}\n"; - texrow.newline(); open_encoding_ = none; } if (data.style->isEnvironment()) { os << "\\end{" << from_ascii(data.style->latexname()) << "}\n"; - texrow.newline(); prev_env_language_ = data.par_language; if (runparams.encoding != data.prev_encoding) { runparams.encoding = data.prev_encoding; @@ -226,7 +216,6 @@ static void finishEnvironement(odocstream & os, TexRow & texrow, if (data.leftindent_open) { os << "\\end{LyXParagraphLeftIndent}\n"; - texrow.newline(); prev_env_language_ = data.par_language; if (runparams.encoding != data.prev_encoding) { runparams.encoding = data.prev_encoding; @@ -237,9 +226,9 @@ static void finishEnvironement(odocstream & os, TexRow & texrow, } -void TeXEnvironment(Buffer const & buf, - Text const & text, OutputParams const & runparams, - pit_type & pit, odocstream & os, TexRow & texrow) +void TeXEnvironment(Buffer const & buf, Text const & text, + OutputParams const & runparams, + pit_type & pit, otexstream & os) { ParagraphList const & paragraphs = text.paragraphs(); ParagraphList::const_iterator par = paragraphs.constIterator(pit); @@ -272,7 +261,7 @@ void TeXEnvironment(Buffer const & buf, && par->params().depth() == current_depth && par->params().leftIndent() == current_left_indent) { // We are still in the same environment so TeXOnePar and continue; - TeXOnePar(buf, text, pit, os, texrow, runparams); + TeXOnePar(buf, text, pit, os, runparams); continue; } @@ -295,7 +284,6 @@ void TeXEnvironment(Buffer const & buf, // many? i.e. that we sometimes will have // three in a row. os << '\n'; - texrow.newline(); } // FIXME This test should not be necessary. @@ -307,16 +295,16 @@ void TeXEnvironment(Buffer const & buf, if (!style.isEnvironment()) { // This is a standard paragraph, no need to call TeXEnvironment. - TeXOnePar(buf, text, pit, os, texrow, runparams); + TeXOnePar(buf, text, pit, os, runparams); continue; } // This is a new environment. - TeXEnvironementData const data = prepareEnvironement(buf, text, par, - os, texrow, runparams); + TeXEnvironementData const data = + prepareEnvironement(buf, text, par, os, runparams); // Recursive call to TeXEnvironment! - TeXEnvironment(buf, text, runparams, pit, os, texrow); - finishEnvironement(os, texrow, runparams, data); + TeXEnvironment(buf, text, runparams, pit, os); + finishEnvironement(os, runparams, data); } if (pit != runparams.par_end) @@ -326,7 +314,7 @@ void TeXEnvironment(Buffer const & buf, } // namespace anon -int latexArgInsets(Paragraph const & par, odocstream & os, +void latexArgInsets(Paragraph const & par, otexstream & os, OutputParams const & runparams, unsigned int reqargs, unsigned int optargs) { @@ -348,16 +336,15 @@ int latexArgInsets(Paragraph const & par, odocstream & os, } if (!reqargs && ilist.size() == 0) - return 0; + return; - int lines = 0; bool const have_optional_args = ilist.size() > reqargs; if (have_optional_args) { unsigned int todo = ilist.size() - reqargs; for (unsigned int i = 0; i < todo; ++i) { InsetArgument const * ins = ilist.front(); ilist.pop_front(); - lines += ins->latexArgument(os, runparams, true); + ins->latexArgument(os, runparams, true); } } @@ -365,7 +352,7 @@ int latexArgInsets(Paragraph const & par, odocstream & os, // arguments. LASSERT(ilist.size() <= reqargs, /* */); if (!reqargs) - return lines; + return; for (unsigned int i = 0; i < reqargs; ++i) { if (ilist.empty()) @@ -374,23 +361,50 @@ int latexArgInsets(Paragraph const & par, odocstream & os, else { InsetArgument const * ins = ilist.front(); ilist.pop_front(); - lines += ins->latexArgument(os, runparams, false); + ins->latexArgument(os, runparams, false); } } - return lines; } +namespace { + +// output the proper paragraph start according to latextype. +void parStartCommand(Paragraph const & par, otexstream & os, + OutputParams const & runparams, Layout const & style) +{ + switch (style.latextype) { + case LATEX_COMMAND: + os << '\\' << from_ascii(style.latexname()); + + // Separate handling of optional argument inset. + if (style.optargs != 0 || style.reqargs != 0) + latexArgInsets(par, os, runparams, style.reqargs, style.optargs); + else + os << from_ascii(style.latexparam()); + break; + case LATEX_ITEM_ENVIRONMENT: + case LATEX_LIST_ENVIRONMENT: + os << "\\item "; + break; + case LATEX_BIB_ENVIRONMENT: + // ignore this, the inset will write itself + break; + default: + break; + } +} + +} // namespace anon // FIXME: this should be anonymous void TeXOnePar(Buffer const & buf, - Text const & text, - pit_type pit, - odocstream & os, TexRow & texrow, - OutputParams const & runparams_in, - string const & everypar, - int start_pos, int end_pos) + Text const & text, + pit_type pit, + otexstream & os, + OutputParams const & runparams_in, + string const & everypar, + int start_pos, int end_pos) { - BufferParams const & bparams = buf.params(); ParagraphList const & paragraphs = text.paragraphs(); Paragraph const & par = paragraphs.at(pit); @@ -406,7 +420,7 @@ void TeXOnePar(Buffer const & buf, << everypar << "'"); OutputParams runparams = runparams_in; - runparams.isLastPar = (pit == paragraphs.size() - 1); + runparams.isLastPar = (pit == pit_type(paragraphs.size() - 1)); // We reinitialze par begin and end to be on the safe side // with embedded inset as we don't know if they set those // value correctly. @@ -428,15 +442,11 @@ void TeXOnePar(Buffer const & buf, // No newline before first paragraph in this lyxtext if (pit > 0) { os << '\n'; - texrow.newline(); - if (!text.inset().getLayout().parbreakIsNewline()) { + if (!text.inset().getLayout().parbreakIsNewline()) os << '\n'; - texrow.newline(); - } } - par.latex(bparams, outerfont, os, texrow, runparams, start_pos, - end_pos); + par.latex(bparams, outerfont, os, runparams, start_pos, end_pos); return; } @@ -445,20 +455,25 @@ void TeXOnePar(Buffer const & buf, if (style.pass_thru) { Font const outerfont = text.outerFont(pit); - par.latex(bparams, outerfont, os, texrow, runparams, start_pos, - end_pos); - os << '\n'; - texrow.newline(); + parStartCommand(par, os, runparams, style); + + par.latex(bparams, outerfont, os, runparams, start_pos, end_pos); + + // I did not create a parEndCommand for this minuscule + // task because in the other user of parStartCommand + // the code is different (JMarc) + if (style.isCommand()) + os << "}\n"; + else + os << '\n'; if (!style.parbreak_is_newline) { os << '\n'; - texrow.newline(); } else if (nextpar) { - Layout const nextstyle = text.inset().forcePlainLayout() ? - bparams.documentClass().plainLayout() : nextpar->layout(); - if (nextstyle.name() != style.name()) { + Layout const nextstyle = text.inset().forcePlainLayout() + ? bparams.documentClass().plainLayout() + : nextpar->layout(); + if (nextstyle.name() != style.name()) os << '\n'; - texrow.newline(); - } } return; @@ -486,7 +501,7 @@ void TeXOnePar(Buffer const & buf, && priorpar->layout().isEnvironment() && (priorpar->getDepth() > par.getDepth() || (priorpar->getDepth() == par.getDepth() - && priorpar->layout() != par.layout())); + && priorpar->layout() != par.layout())); Language const * const prev_language = (pit != 0) ? (use_prev_env_language ? prev_env_language_ @@ -509,12 +524,11 @@ void TeXOnePar(Buffer const & buf, lang_end_command = "\\end{$$lang}"; } if (par_lang != prev_lang - // check if we already put language command in TeXEnvironment() - && !(style.isEnvironment() - && (pit == 0 || - (priorpar->layout() != par.layout() && - priorpar->getDepth() <= par.getDepth()) - || priorpar->getDepth() < par.getDepth()))) + // check if we already put language command in TeXEnvironment() + && !(style.isEnvironment() + && (pit == 0 || (priorpar->layout() != par.layout() + && priorpar->getDepth() <= par.getDepth()) + || priorpar->getDepth() < par.getDepth()))) { if (!lang_end_command.empty() && prev_lang != outer_lang && @@ -525,7 +539,6 @@ void TeXOnePar(Buffer const & buf, prev_lang)) // the '%' is necessary to prevent unwanted whitespace << "%\n"; - texrow.newline(); } // We need to open a new language if we couldn't close the previous @@ -533,20 +546,19 @@ void TeXOnePar(Buffer const & buf, // the previous one, if the current language is different than the // outer_language (which is currently in effect once the previous one // is closed). - if ((lang_end_command.empty() || - par_lang != outer_lang) && - !par_lang.empty()) { + if ((lang_end_command.empty() || par_lang != outer_lang) + && !par_lang.empty()) { // If we're inside an inset, and that inset is within an \L or \R // (or equivalents), then within the inset, too, any opposite // language paragraph should appear within an \L or \R (in addition // to, outside of, the normal language switch commands). // This behavior is not correct for ArabTeX, though. - if (!runparams.use_polyglossia && + if (!runparams.use_polyglossia // not for ArabTeX - (par_language->lang() != "arabic_arabtex" && - outer_language->lang() != "arabic_arabtex") && + && par_language->lang() != "arabic_arabtex" + && outer_language->lang() != "arabic_arabtex" // are we in an inset? - runparams.local_font != 0 && + && runparams.local_font != 0 // is the inset within an \L or \R? // // FIXME: currently, we don't check this; this means that @@ -554,9 +566,7 @@ void TeXOnePar(Buffer const & buf, // doesn't seem to hurt (though latex will complain) // // is this paragraph in the opposite direction? - runparams.local_font->isRightToLeft() != - par_language->rightToLeft() - ) { + && runparams.local_font->isRightToLeft() != par_language->rightToLeft()) { // FIXME: I don't have a working copy of the Arabi package, so // I'm not sure if the farsi and arabic_arabi stuff is correct // or not... @@ -587,7 +597,6 @@ void TeXOnePar(Buffer const & buf, << "]"; // the '%' is necessary to prevent unwanted whitespace os << "%\n"; - texrow.newline(); } } } @@ -595,8 +604,8 @@ void TeXOnePar(Buffer const & buf, // Switch file encoding if necessary; no need to do this for "default" // encoding, since this only affects the position of the outputted // \inputencoding command; the encoding switch will occur when necessary - if (bparams.inputenc == "auto" && - runparams.encoding->package() != Encoding::none) { + if (bparams.inputenc == "auto" + && runparams.encoding->package() != Encoding::none) { // Look ahead for future encoding changes. // We try to output them at the beginning of the paragraph, // since the \inputencoding command is not allowed e.g. in @@ -607,9 +616,9 @@ void TeXOnePar(Buffer const & buf, char_type const c = par.getChar(i); Encoding const * const encoding = par.getFontSettings(bparams, i).language()->encoding(); - if (encoding->package() != Encoding::CJK && - runparams.encoding->package() == Encoding::inputenc && - c < 0x80) + if (encoding->package() != Encoding::CJK + && runparams.encoding->package() == Encoding::inputenc + && c < 0x80) continue; if (par.isInset(i)) break; @@ -618,38 +627,36 @@ void TeXOnePar(Buffer const & buf, // encoding to that required by the language of c. // With CJK, only add switch if we have CJK content at the beginning // of the paragraph - if (encoding->package() != Encoding::CJK || i == 0) { - pair enc_switch = switchEncoding(os, bparams, runparams, - *encoding); - // the following is necessary after a CJK environment in a multilingual - // context (nesting issue). - if (par_language->encoding()->package() == Encoding::CJK && - open_encoding_ != CJK && cjk_inherited_ == 0) { - os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName()) - << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; - open_encoding_ = CJK; - texrow.newline(); + if (i != 0 && encoding->package() == Encoding::CJK) + continue; + + pair enc_switch = switchEncoding(os.os(), + bparams, runparams, *encoding); + // the following is necessary after a CJK environment in a multilingual + // context (nesting issue). + if (par_language->encoding()->package() == Encoding::CJK + && open_encoding_ != CJK && cjk_inherited_ == 0) { + os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName()) + << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; + open_encoding_ = CJK; + } + if (encoding->package() != Encoding::none && enc_switch.first) { + if (enc_switch.second > 0) { + // the '%' is necessary to prevent unwanted whitespace + os << "%\n"; } - if (encoding->package() != Encoding::none && enc_switch.first) { - if (enc_switch.second > 0) { - // the '%' is necessary to prevent unwanted whitespace - os << "%\n"; - texrow.newline(); - } - // With CJK, the CJK tag had to be closed first (see above) - if (runparams.encoding->package() == Encoding::CJK) { - os << from_ascii(subst( - lang_begin_command, - "$$lang", - par_lang)) - // the '%' is necessary to prevent unwanted whitespace - << "%\n"; - texrow.newline(); - } - runparams.encoding = encoding; + // With CJK, the CJK tag had to be closed first (see above) + if (runparams.encoding->package() == Encoding::CJK) { + os << from_ascii(subst( + lang_begin_command, + "$$lang", + par_lang)) + // the '%' is necessary to prevent unwanted whitespace + << "%\n"; } - break; + runparams.encoding = encoding; } + break; } } @@ -660,7 +667,6 @@ void TeXOnePar(Buffer const & buf, if (par.allowParagraphCustomization()) { if (par.params().startOfAppendix()) { os << "\\appendix\n"; - texrow.newline(); } if (!par.params().spacing().isDefault() @@ -668,46 +674,20 @@ void TeXOnePar(Buffer const & buf, { os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace)) << '\n'; - texrow.newline(); } if (style.isCommand()) { os << '\n'; - texrow.newline(); } } - switch (style.latextype) { - case LATEX_COMMAND: - os << '\\' << from_ascii(style.latexname()); - - // Separate handling of optional argument inset. - if (style.optargs != 0 || style.reqargs != 0) { - int ret = latexArgInsets(par, os, runparams, style.reqargs, style.optargs); - while (ret > 0) { - texrow.newline(); - --ret; - } - } - else - os << from_ascii(style.latexparam()); - break; - case LATEX_ITEM_ENVIRONMENT: - case LATEX_LIST_ENVIRONMENT: - os << "\\item "; - break; - case LATEX_BIB_ENVIRONMENT: - // ignore this, the inset will write itself - break; - default: - break; - } + parStartCommand(par, os, runparams, style); Font const outerfont = text.outerFont(pit); // FIXME UNICODE os << from_utf8(everypar); - par.latex(bparams, outerfont, os, texrow, runparams, start_pos, end_pos); + par.latex(bparams, outerfont, os, runparams, start_pos, end_pos); // Make sure that \\par is done with the font of the last // character if this has another size as the default. @@ -749,8 +729,9 @@ void TeXOnePar(Buffer const & buf, case LATEX_ENVIRONMENT: { // if its the last paragraph of the current environment // skip it otherwise fall through - if (nextpar && (nextpar->layout() != par.layout() - || nextpar->params().depth() != par.params().depth())) + if (nextpar + && (nextpar->layout() != par.layout() + || nextpar->params().depth() != par.params().depth())) break; } @@ -763,12 +744,9 @@ void TeXOnePar(Buffer const & buf, if (par.allowParagraphCustomization()) { if (!par.params().spacing().isDefault() - && (runparams.isLastPar || !nextpar->hasSameLayout(par))) - { - if (pending_newline) { + && (runparams.isLastPar || !nextpar->hasSameLayout(par))) { + if (pending_newline) os << '\n'; - texrow.newline(); - } os << from_ascii(par.params().spacing().writeEnvirEnd(useSetSpace)); pending_newline = true; } @@ -777,17 +755,16 @@ void TeXOnePar(Buffer const & buf, // Closing the language is needed for the last paragraph; it is also // needed if we're within an \L or \R that we may have opened above (not // necessarily in this paragraph) and are about to close. - bool closing_rtl_ltr_environment = - !runparams.use_polyglossia && + bool closing_rtl_ltr_environment = !runparams.use_polyglossia // not for ArabTeX - (par_language->lang() != "arabic_arabtex" && - outer_language->lang() != "arabic_arabtex") && - // have we opened and \L or \R environment? - runparams.local_font != 0 && - runparams.local_font->isRightToLeft() != par_language->rightToLeft() && + && (par_language->lang() != "arabic_arabtex" + && outer_language->lang() != "arabic_arabtex") + // have we opened and \L or \R environment? + && runparams.local_font != 0 + && runparams.local_font->isRightToLeft() != par_language->rightToLeft() // are we about to close the language? - ((nextpar && par_language->babel() != (nextpar->getParLanguage(bparams))->babel()) - || (runparams.isLastPar && par_language->babel() != outer_language->babel())); + &&((nextpar && par_language->babel() != (nextpar->getParLanguage(bparams))->babel()) + || (runparams.isLastPar && par_language->babel() != outer_language->babel())); if (closing_rtl_ltr_environment || (runparams.isLastPar && par_language->babel() != outer_language->babel())) { @@ -795,10 +772,9 @@ void TeXOnePar(Buffer const & buf, // we need to reset the language at the end of footnote or // float. - if (pending_newline) { + if (pending_newline) os << '\n'; - texrow.newline(); - } + // when the paragraph uses CJK, the language has to be closed earlier if (font.language()->encoding()->package() != Encoding::CJK) { if (lang_end_command.empty()) { @@ -830,18 +806,17 @@ void TeXOnePar(Buffer const & buf, if (closing_rtl_ltr_environment) os << "}"; - if (pending_newline) { + if (pending_newline) os << '\n'; - texrow.newline(); - } // if this is a CJK-paragraph and the next isn't, close CJK // also if the next paragraph is a multilingual environment (because of nesting) - if (nextpar && open_encoding_ == CJK && - (nextpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK || - (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams))) - // inbetween environments, CJK has to be closed later (nesting!) - && (!style.isEnvironment() || !nextpar->layout().isEnvironment())) { + if (nextpar + && open_encoding_ == CJK + && (nextpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK + || (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams))) + // inbetween environments, CJK has to be closed later (nesting!) + && (!style.isEnvironment() || !nextpar->layout().isEnvironment())) { os << "\\end{CJK}\n"; open_encoding_ = none; } @@ -856,10 +831,7 @@ void TeXOnePar(Buffer const & buf, break; // end of main text if (maintext) { - os << '\n'; - texrow.newline(); - os << "\\end{CJK}\n"; - texrow.newline(); + os << "\n\\end{CJK}\n"; // end of an inset } else os << "\\end{CJK}"; @@ -912,7 +884,6 @@ void TeXOnePar(Buffer const & buf, // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145787.html || nextpar->params().depth() != par.params().depth()) { os << '\n'; - texrow.newline(); } } @@ -926,8 +897,7 @@ void TeXOnePar(Buffer const & buf, // LaTeX all paragraphs void latexParagraphs(Buffer const & buf, Text const & text, - odocstream & os, - TexRow & texrow, + otexstream & os, OutputParams const & runparams, string const & everypar) { @@ -943,7 +913,6 @@ void latexParagraphs(Buffer const & buf, && bparams.encoding().package() == Encoding::CJK) { os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName()) << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; - texrow.newline(); open_encoding_ = CJK; } // if "auto begin" is switched off, explicitly switch the @@ -966,7 +935,6 @@ void latexParagraphs(Buffer const & buf, << from_ascii(bparams.language->polyglossiaOpts()) << "]"; os << '\n'; - texrow.newline(); } ParagraphList const & paragraphs = text.paragraphs(); @@ -981,7 +949,7 @@ void latexParagraphs(Buffer const & buf, pit_type pit = runparams.par_begin; // lastpit is for the language check after the loop. - pit_type lastpit; + pit_type lastpit = pit; // variables used in the loop: bool was_title = false; bool already_title = false; @@ -1007,7 +975,6 @@ void latexParagraphs(Buffer const & buf, os << "\\begin{" << from_ascii(tclass.titlename()) << "}\n"; - texrow.newline(); } } } else if (was_title && !already_title) { @@ -1019,7 +986,6 @@ void latexParagraphs(Buffer const & buf, os << "\\" << from_ascii(tclass.titlename()) << "\n"; } - texrow.newline(); already_title = true; was_title = false; } @@ -1027,15 +993,15 @@ void latexParagraphs(Buffer const & buf, if (!layout.isEnvironment() && par->params().leftIndent().zero()) { // This is a standard top level paragraph, TeX it and continue. - TeXOnePar(buf, text, pit, os, texrow, runparams, everypar); + TeXOnePar(buf, text, pit, os, runparams, everypar); continue; } - TeXEnvironementData const data = prepareEnvironement(buf, text, par, - os, texrow, runparams); + TeXEnvironementData const data = + prepareEnvironement(buf, text, par, os, runparams); // pit can be changed in TeXEnvironment. - TeXEnvironment(buf, text, runparams, pit, os, texrow); - finishEnvironement(os, texrow, runparams, data); + TeXEnvironment(buf, text, runparams, pit, os); + finishEnvironement(os, runparams, data); } if (pit == runparams.par_end) { @@ -1043,20 +1009,17 @@ void latexParagraphs(Buffer const & buf, // correctly terminated (because TeXOnePar does // not add a \n in this case) //os << '\n'; - //texrow.newline(); } // It might be that we only have a title in this document if (was_title && !already_title) { if (tclass.titletype() == TITLE_ENVIRONMENT) { os << "\\end{" << from_ascii(tclass.titlename()) - << "}\n"; - } - else { + << "}\n"; + } else { os << "\\" << from_ascii(tclass.titlename()) - << "\n"; - } - texrow.newline(); + << "\n"; + } } // if "auto end" is switched off, explicitly close the language at the end @@ -1069,14 +1032,12 @@ void latexParagraphs(Buffer const & buf, "$$lang", mainlang)) << '\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 && !is_child && open_encoding_ == CJK) { os << "\\end{CJK}\n"; - texrow.newline(); open_encoding_ = none; }