X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=697a3b5028d3cb97a2263cb0e04f588c4ce6d033;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=fb632e3e52eeab8a9c90d629642d5edb325974da;hpb=ffea94c5e603043d1146180ae14590255278a37e;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index fb632e3e52..697a3b5028 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -25,15 +25,17 @@ #include "ParagraphParameters.h" #include "TextClass.h" #include "TexRow.h" -#include "VSpace.h" #include "insets/InsetBibitem.h" #include "insets/InsetArgument.h" #include "support/lassert.h" +#include "support/convert.h" #include "support/debug.h" #include "support/lstrings.h" +#include "support/textutils.h" +#include #include #include @@ -46,9 +48,9 @@ namespace lyx { namespace { enum OpenEncoding { - none, - inputenc, - CJK + none, + inputenc, + CJK }; static int open_encoding_ = none; @@ -66,7 +68,7 @@ string const getPolyglossiaEnvName(Language const * lang) } -struct TeXEnvironementData +struct TeXEnvironmentData { bool cjk_nested; Layout const * style; @@ -76,11 +78,13 @@ struct TeXEnvironementData }; -static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & text, - ParagraphList::const_iterator pit, odocstream & os, TexRow & texrow, - OutputParams const & runparams) +static TeXEnvironmentData prepareEnvironment(Buffer const & buf, + Text const & text, + ParagraphList::const_iterator pit, + otexstream & os, + OutputParams const & runparams) { - TeXEnvironementData data; + TeXEnvironmentData data; BufferParams const & bparams = buf.params(); @@ -107,19 +111,18 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & ? (use_prev_env_language ? prev_env_language_ : priorpit->getParLanguage(bparams)) : doc_language; - string par_lang = data.par_language->babel(); - string prev_par_lang = prev_par_language->babel(); - string doc_lang = doc_language->babel(); - string lang_begin_command = lyxrc.language_command_begin; - string lang_end_command = lyxrc.language_command_end; - - if (runparams.use_polyglossia) { - par_lang = getPolyglossiaEnvName(data.par_language); - prev_par_lang = getPolyglossiaEnvName(prev_par_language); - doc_lang = getPolyglossiaEnvName(doc_language); - lang_begin_command = "\\begin{$$lang}"; - lang_end_command = "\\end{$$lang}"; - } + + bool const use_polyglossia = runparams.use_polyglossia; + string const par_lang = use_polyglossia ? + getPolyglossiaEnvName(data.par_language) : data.par_language->babel(); + string const prev_par_lang = use_polyglossia ? + getPolyglossiaEnvName(prev_par_language) : prev_par_language->babel(); + string const doc_lang = use_polyglossia ? + getPolyglossiaEnvName(doc_language) : doc_language->babel(); + string const lang_begin_command = use_polyglossia ? + "\\begin{$$lang}" : lyxrc.language_command_begin; + string const lang_end_command = use_polyglossia ? + "\\end{$$lang}" : lyxrc.language_command_end; if (par_lang != prev_par_lang) { if (!lang_end_command.empty() && @@ -131,7 +134,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() || @@ -141,14 +143,13 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & lang_begin_command, "$$lang", par_lang)); - if (runparams.use_polyglossia + if (use_polyglossia && !data.par_language->polyglossiaOpts().empty()) os << "[" << from_ascii(data.par_language->polyglossiaOpts()) << "]"; // the '%' is necessary to prevent unwanted whitespace os << "%\n"; - texrow.newline(); } } @@ -157,18 +158,15 @@ 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.latexargs().empty()) { + OutputParams rp = runparams; + rp.local_font = &pit->getFirstFontSettings(bparams); + latexArgInsets(paragraphs, pit, os, rp, style.latexargs()); } if (style.latextype == LATEX_LIST_ENVIRONMENT) { os << '{' @@ -183,7 +181,6 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & << "}\n"; } else os << from_ascii(style.latexparam()) << '\n'; - texrow.newline(); } data.style = &style; @@ -196,26 +193,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 finishEnvironment(otexstream & os, OutputParams const & runparams, + TeXEnvironmentData 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 +220,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,224 +230,376 @@ static void finishEnvironement(odocstream & os, TexRow & texrow, } -ParagraphList::const_iterator -TeXEnvironment(Buffer const & buf, - Text const & text, - ParagraphList::const_iterator pit, - odocstream & os, TexRow & texrow, - OutputParams const & runparams) +void TeXEnvironment(Buffer const & buf, Text const & text, + OutputParams const & runparams, + pit_type & pit, otexstream & os) { - LYXERR(Debug::LATEX, "TeXEnvironment... " << &*pit); ParagraphList const & paragraphs = text.paragraphs(); + ParagraphList::const_iterator par = paragraphs.constIterator(pit); + LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << pit); - ParagraphList::const_iterator par = pit; - do { - TeXOnePar(buf, text, par, os, texrow, runparams); - if (par != paragraphs.end()) - par++; + Layout const & current_layout = par->layout(); + depth_type const current_depth = par->params().depth(); + Length const & current_left_indent = par->params().leftIndent(); - if (par == paragraphs.end()) { - // Make sure that the last paragraph is - // correctly terminated (because TeXOnePar does - // not add a \n in this case) + // This is for debugging purpose at the end. + pit_type const par_begin = pit; + for (; pit < runparams.par_end; ++pit) { + ParagraphList::const_iterator par = paragraphs.constIterator(pit); + + // check first if this is an higher depth paragraph. + bool go_out = (par->params().depth() < current_depth); + if (par->params().depth() == current_depth) { + // This environment is finished. + go_out |= (par->layout() != current_layout); + go_out |= (par->params().leftIndent() != current_left_indent); + } + if (go_out) { + // nothing to do here, restore pit and go out. + pit--; + break; + } + + if (par->layout() == current_layout + && 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, runparams); + continue; + } + + // We are now in a deeper environment. + // Either par->layout() != current_layout + // Or par->params().depth() > current_depth + // Or par->params().leftIndent() != current_left_indent) + + if (par->layout().isParagraph()) { + // FIXME (Lgb): How to handle this? + //&& !suffixIs(os, "\n\n") + + // (ARRae) There should be at least one '\n' already but we need there to + // be two for Standard paragraphs that are depth-increment'ed to be + // output correctly. However, tables can also be paragraphs so + // don't adjust them. + + // FIXME (Lgb): Will it ever harm to have one '\n' too + // many? i.e. that we sometimes will have + // three in a row. os << '\n'; - texrow.newline(); - } else if (par->params().depth() > pit->params().depth()) { - if (par->layout().isParagraph()) { - // Thinko! - // How to handle this? (Lgb) - //&& !suffixIs(os, "\n\n") - - // There should be at least one '\n' already - // but we need there to be two for Standard - // paragraphs that are depth-increment'ed to be - // output correctly. However, tables can - // also be paragraphs so don't adjust them. - // ARRae - // Thinkee: - // Will it ever harm to have one '\n' too - // many? i.e. that we sometimes will have - // three in a row. (Lgb) - os << '\n'; - texrow.newline(); - } + } - LYXERR(Debug::LATEX, "TeXDeeper... " << &*par); - bool const force_plain_layout = text.inset().forcePlainLayout(); - depth_type const max_depth = par->params().depth(); - - // FIXME: move that to a for loop! - while (par != paragraphs.end() - && par->params().depth() == max_depth) { - // FIXME This test should not be necessary. - // We should perhaps issue an error if it is. - Layout const & style = force_plain_layout - ? buf.params().documentClass().plainLayout() : par->layout(); - if (style.isEnvironment()) { - TeXEnvironementData const data = prepareEnvironement(buf, - text, par, os, texrow, runparams); - // Recursive call to TeXEnvironment! - par = TeXEnvironment(buf, text, par, os, texrow, runparams); - finishEnvironement(os, texrow, runparams, data); - } else { - TeXOnePar(buf, text, par, os, texrow, runparams); - if (par != text.paragraphs().end()) - par++; - } - } - LYXERR(Debug::LATEX, "TeXDeeper...done "); + // FIXME This test should not be necessary. + // We should perhaps issue an error if it is. + bool const force_plain_layout = text.inset().forcePlainLayout(); + Layout const & style = force_plain_layout + ? buf.params().documentClass().plainLayout() + : par->layout(); + + if (!style.isEnvironment()) { + // This is a standard paragraph, no need to call TeXEnvironment. + TeXOnePar(buf, text, pit, os, runparams); + continue; } - } while (par != paragraphs.end() - && par->layout() == pit->layout() - && par->params().depth() == pit->params().depth() - && par->params().leftIndent() == pit->params().leftIndent()); - if (par != paragraphs.end()) - LYXERR(Debug::LATEX, "TeXEnvironment...done " << &*par); + // This is a new environment. + TeXEnvironmentData const data = + prepareEnvironment(buf, text, par, os, runparams); + // Recursive call to TeXEnvironment! + TeXEnvironment(buf, text, runparams, pit, os); + finishEnvironment(os, runparams, data); + } - return par; + if (pit != runparams.par_end) + LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << par_begin << " done."); } + +void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, + map ilist, vector required, string const & prefix) +{ + unsigned int const argnr = latexargs.size(); + if (argnr == 0) + return; + + for (unsigned int i = 1; i <= argnr; ++i) { + map::const_iterator lit = ilist.find(i); + bool inserted = false; + if (lit != ilist.end()) { + InsetArgument const * ins = (*lit).second; + if (ins) { + Layout::LaTeXArgMap::const_iterator const lait = + latexargs.find(ins->name()); + if (lait != latexargs.end()) { + Layout::latexarg arg = (*lait).second; + docstring ldelim = arg.mandatory ? + from_ascii("{") : from_ascii("["); + docstring rdelim = arg.mandatory ? + from_ascii("}") : from_ascii("]"); + if (!arg.ldelim.empty()) + ldelim = arg.ldelim; + if (!arg.rdelim.empty()) + rdelim = arg.rdelim; + ins->latexArgument(os, runparams, ldelim, rdelim, arg.presetarg); + inserted = true; + } + } + } + if (!inserted) { + Layout::LaTeXArgMap::const_iterator lait = latexargs.begin(); + Layout::LaTeXArgMap::const_iterator const laend = latexargs.end(); + for (; lait != laend; ++lait) { + string const name = prefix + convert(i); + if ((*lait).first == name) { + Layout::latexarg arg = (*lait).second; + docstring preset = arg.presetarg; + if (!arg.defaultarg.empty()) { + if (!preset.empty()) + preset += ","; + preset += arg.defaultarg; + } + if (arg.mandatory) { + docstring ldelim = arg.ldelim.empty() ? + from_ascii("{") : arg.ldelim; + docstring rdelim = arg.rdelim.empty() ? + from_ascii("}") : arg.rdelim; + os << ldelim << preset << rdelim; + } else if (!preset.empty()) { + docstring ldelim = arg.ldelim.empty() ? + from_ascii("[") : arg.ldelim; + docstring rdelim = arg.rdelim.empty() ? + from_ascii("]") : arg.rdelim; + os << ldelim << preset << rdelim; + } else if (find(required.begin(), required.end(), + (*lait).first) != required.end()) { + docstring ldelim = arg.ldelim.empty() ? + from_ascii("[") : arg.ldelim; + docstring rdelim = arg.rdelim.empty() ? + from_ascii("]") : arg.rdelim; + os << ldelim << rdelim; + } else + break; + } + } + } + } +} + + } // namespace anon -int latexArgInsets(Paragraph const & par, odocstream & os, - OutputParams const & runparams, unsigned int reqargs, - unsigned int optargs) +void latexArgInsets(Paragraph const & par, otexstream & os, + OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix) { - unsigned int totalargs = reqargs + optargs; - list ilist; + map ilist; + vector required; InsetList::const_iterator it = par.insetList().begin(); InsetList::const_iterator end = par.insetList().end(); for (; it != end; ++it) { if (it->inset->lyxCode() == ARG_CODE) { - if (ilist.size() >= totalargs) { - LYXERR0("WARNING: Found extra argument inset."); - continue; - } InsetArgument const * ins = static_cast(it->inset); - ilist.push_back(ins); + if (ins->name().empty()) + LYXERR0("Error: Unnamed argument inset!"); + else { + string const name = prefix.empty() ? ins->name() : split(ins->name(), ':'); + unsigned int const nr = convert(name); + ilist[nr] = ins; + Layout::LaTeXArgMap::const_iterator const lit = + latexargs.find(ins->name()); + if (lit != latexargs.end()) { + Layout::latexarg const & arg = (*lit).second; + if (!arg.requires.empty()) { + vector req = getVectorFromString(arg.requires); + required.insert(required.end(), req.begin(), req.end()); + } + } + } } } + getArgInsets(os, runparams, latexargs, ilist, required, prefix); +} - if (!reqargs && ilist.size() == 0) - return 0; - - 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); - } + +void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pit, + otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, + string const & prefix) +{ + map ilist; + vector required; + + depth_type const current_depth = pit->params().depth(); + Layout const current_layout = pit->layout(); + + // get the first paragraph in sequence with this layout and depth + pit_type offset = 0; + while (true) { + if (boost::prior(pit, offset) == pars.begin()) + break; + ParagraphList::const_iterator priorpit = boost::prior(pit, offset + 1); + if (priorpit->layout() == current_layout + && priorpit->params().depth() == current_depth) + ++offset; + else + break; } - // we should now have no more insets than there are required - // arguments. - LASSERT(ilist.size() <= reqargs, /* */); - if (!reqargs) - return lines; - - for (unsigned int i = 0; i < reqargs; ++i) { - if (ilist.empty()) - // a required argument wasn't given, so we output {} - os << "{}"; - else { - InsetArgument const * ins = ilist.front(); - ilist.pop_front(); - lines += ins->latexArgument(os, runparams, false); + ParagraphList::const_iterator spit = boost::prior(pit, offset); + + for (; spit != pars.end(); ++spit) { + if (spit->layout() != current_layout || spit->params().depth() < current_depth) + break; + if (spit->params().depth() > current_depth) + continue; + InsetList::const_iterator it = spit->insetList().begin(); + InsetList::const_iterator end = spit->insetList().end(); + for (; it != end; ++it) { + if (it->inset->lyxCode() == ARG_CODE) { + InsetArgument const * ins = + static_cast(it->inset); + if (ins->name().empty()) + LYXERR0("Error: Unnamed argument inset!"); + else { + string const name = prefix.empty() ? ins->name() : split(ins->name(), ':'); + unsigned int const nr = convert(name); + if (ilist.find(nr) == ilist.end()) + ilist[nr] = ins; + Layout::LaTeXArgMap::const_iterator const lit = + latexargs.find(ins->name()); + if (lit != latexargs.end()) { + Layout::latexarg const & arg = (*lit).second; + if (!arg.requires.empty()) { + vector req = getVectorFromString(arg.requires); + required.insert(required.end(), req.begin(), req.end()); + } + } + } + } } } - return lines; + getArgInsets(os, runparams, latexargs, ilist, required, prefix); } +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()); + + // Command arguments + if (!style.latexargs().empty()) + latexArgInsets(par, os, runparams, style.latexargs()); + os << from_ascii(style.latexparam()); + break; + case LATEX_ITEM_ENVIRONMENT: + case LATEX_LIST_ENVIRONMENT: + os << "\\" + style.itemcommand(); + // Item arguments + if (!style.itemargs().empty()) + latexArgInsets(par, os, runparams, style.itemargs(), "item:"); + os << " "; + 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, - ParagraphList::const_iterator const 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) { - LYXERR(Debug::LATEX, "TeXOnePar... " << &*pit << " '" - << everypar << "'"); - BufferParams const & bparams = buf.params(); + ParagraphList const & paragraphs = text.paragraphs(); + Paragraph const & par = paragraphs.at(pit); // FIXME This check should not really be needed. // Perhaps we should issue an error if it is. Layout const style = text.inset().forcePlainLayout() ? - bparams.documentClass().plainLayout() : pit->layout(); - - ParagraphList const & paragraphs = text.paragraphs(); - ParagraphList::const_iterator const priorpit = - pit == paragraphs.begin() ? pit : boost::prior(pit); - ParagraphList::const_iterator const nextpit = - pit == paragraphs.end() ? pit : boost::next(pit); + bparams.documentClass().plainLayout() : par.layout(); if (style.inpreamble) return; + LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '" + << everypar << "'"); + OutputParams runparams = runparams_in; - runparams.isLastPar = nextpit == paragraphs.end(); + 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. + runparams.par_begin = 0; + runparams.par_end = 0; bool const maintext = text.isMainText(); // we are at the beginning of an inset and CJK is already open; // we count inheritation levels to get the inset nesting right. - if (pit == paragraphs.begin() && !maintext + if (pit == 0 && !maintext && (cjk_inherited_ > 0 || open_encoding_ == CJK)) { cjk_inherited_ += 1; open_encoding_ = none; } - if (text.inset().getLayout().isPassThru()) { - int const dist = paragraphs.position(pit); - Font const outerfont = text.outerFont(dist); + if (text.inset().isPassThru()) { + Font const outerfont = text.outerFont(pit); // No newline before first paragraph in this lyxtext - if (dist > 0) { + if (pit > 0) { os << '\n'; - texrow.newline(); - if (!text.inset().getLayout().parbreakIsNewline()) { + if (!text.inset().getLayout().parbreakIsNewline()) os << '\n'; - texrow.newline(); - } } - pit->latex(bparams, outerfont, os, texrow, - runparams, start_pos, end_pos); + par.latex(bparams, outerfont, os, runparams, start_pos, end_pos); return; } + Paragraph const * nextpar = runparams.isLastPar + ? 0 : ¶graphs.at(pit + 1); + if (style.pass_thru) { - int const dist = paragraphs.position(pit); - Font const outerfont = text.outerFont(dist); - pit->latex(bparams, outerfont, os, texrow, - runparams, start_pos, end_pos); - os << '\n'; - texrow.newline(); + Font const outerfont = text.outerFont(pit); + runparams.local_font = &par.getFirstFontSettings(bparams); + 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 (nextpit != paragraphs.end()) { - Layout const nextstyle = text.inset().forcePlainLayout() ? - bparams.documentClass().plainLayout() : nextpit->layout(); - if (nextstyle.name() != style.name()) { + } else if (nextpar && !style.isEnvironment()) { + Layout const nextstyle = text.inset().forcePlainLayout() + ? bparams.documentClass().plainLayout() + : nextpar->layout(); + if (nextstyle.name() != style.name()) os << '\n'; - texrow.newline(); - } } return; } // This paragraph's language - Language const * const par_language = pit->getParLanguage(bparams); + Language const * const par_language = par.getParLanguage(bparams); // The document's language Language const * const doc_language = bparams.language; // The language that was in effect when the environment this paragraph is @@ -463,44 +608,57 @@ void TeXOnePar(Buffer const & buf, (runparams.local_font != 0) ? runparams.local_font->language() : doc_language; + Paragraph const * priorpar = (pit == 0) ? 0 : ¶graphs.at(pit - 1); + // The previous language that was in effect is the language of the // previous paragraph, unless the previous paragraph is inside an // environment with nesting depth greater than (or equal to, but with // a different layout) the current one. If there is no previous // paragraph, the previous language is the outer language. bool const use_prev_env_language = prev_env_language_ != 0 - && priorpit->layout().isEnvironment() - && (priorpit->getDepth() > pit->getDepth() - || (priorpit->getDepth() == pit->getDepth() - && priorpit->layout() != pit->layout())); + && priorpar + && priorpar->layout().isEnvironment() + && (priorpar->getDepth() > par.getDepth() + || (priorpar->getDepth() == par.getDepth() + && priorpar->layout() != par.layout())); Language const * const prev_language = - (pit != paragraphs.begin()) + (pit != 0) ? (use_prev_env_language ? prev_env_language_ - : priorpit->getParLanguage(bparams)) + : priorpar->getParLanguage(bparams)) : outer_language; - string par_lang = par_language->babel(); - string prev_lang = prev_language->babel(); - string doc_lang = doc_language->babel(); - string outer_lang = outer_language->babel(); - string lang_begin_command = lyxrc.language_command_begin; - string lang_end_command = lyxrc.language_command_end; - - if (runparams.use_polyglossia) { - par_lang = getPolyglossiaEnvName(par_language); - prev_lang = getPolyglossiaEnvName(prev_language); - doc_lang = getPolyglossiaEnvName(doc_language); - outer_lang = getPolyglossiaEnvName(outer_language); - lang_begin_command = "\\begin{$$lang}"; - lang_end_command = "\\end{$$lang}"; + + bool const use_polyglossia = runparams.use_polyglossia; + string const par_lang = use_polyglossia ? + getPolyglossiaEnvName(par_language): par_language->babel(); + string const prev_lang = use_polyglossia ? + getPolyglossiaEnvName(prev_language) : prev_language->babel(); + string const doc_lang = use_polyglossia ? + getPolyglossiaEnvName(doc_language) : doc_language->babel(); + string const outer_lang = use_polyglossia ? + getPolyglossiaEnvName(outer_language) : outer_language->babel(); + string lang_begin_command = use_polyglossia ? + "\\begin{$$lang}" : lyxrc.language_command_begin; + string lang_end_command = use_polyglossia ? + "\\end{$$lang}" : lyxrc.language_command_end; + // the '%' is necessary to prevent unwanted whitespace + string lang_command_termination = "%\n"; + + // In some insets (such as Arguments), we cannot use \selectlanguage + bool const localswitch = !use_polyglossia + && text.inset().getLayout().forcelocalfontswitch(); + if (localswitch) { + lang_begin_command = lyxrc.language_command_local; + lang_end_command = "}"; + lang_command_termination.clear(); } + if (par_lang != prev_lang - // check if we already put language command in TeXEnvironment() - && !(style.isEnvironment() - && (pit == paragraphs.begin() || - (priorpit->layout() != pit->layout() && - priorpit->getDepth() <= pit->getDepth()) - || priorpit->getDepth() < pit->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 && @@ -509,9 +667,7 @@ void TeXOnePar(Buffer const & buf, os << from_ascii(subst(lang_end_command, "$$lang", prev_lang)) - // the '%' is necessary to prevent unwanted whitespace - << "%\n"; - texrow.newline(); + << lang_command_termination; } // We need to open a new language if we couldn't close the previous @@ -519,20 +675,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 (!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 @@ -540,9 +695,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... @@ -561,19 +714,18 @@ void TeXOnePar(Buffer const & buf, os << "\\L{"; } // With CJK, the CJK tag has to be closed first (see below) - if (runparams.encoding->package() != Encoding::CJK) { + if (runparams.encoding->package() != Encoding::CJK + && !par_lang.empty()) { os << from_ascii(subst( lang_begin_command, "$$lang", par_lang)); - if (runparams.use_polyglossia + if (use_polyglossia && !par_language->polyglossiaOpts().empty()) os << "[" << from_ascii(par_language->polyglossiaOpts()) << "]"; - // the '%' is necessary to prevent unwanted whitespace - os << "%\n"; - texrow.newline(); + os << lang_command_termination; } } } @@ -581,61 +733,59 @@ 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 // sections. For this reason we only set runparams.moving_arg // after checking for the encoding change, otherwise the // change would be always avoided by switchEncoding(). - for (pos_type i = 0; i < pit->size(); ++i) { - char_type const c = pit->getChar(i); + for (pos_type i = 0; i < par.size(); ++i) { + char_type const c = par.getChar(i); Encoding const * const encoding = - pit->getFontSettings(bparams, i).language()->encoding(); - if (encoding->package() != Encoding::CJK && - runparams.encoding->package() == Encoding::inputenc && - c < 0x80) + par.getFontSettings(bparams, i).language()->encoding(); + if (encoding->package() != Encoding::CJK + && runparams.encoding->package() == Encoding::inputenc + && isASCII(c)) continue; - if (pit->isInset(i)) + if (par.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. // 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 + && !par_lang.empty()) { + os << from_ascii(subst( + lang_begin_command, + "$$lang", + par_lang)) + << lang_command_termination; } - break; + runparams.encoding = encoding; } + break; } } @@ -643,59 +793,30 @@ void TeXOnePar(Buffer const & buf, Encoding const * const prev_encoding = runparams.encoding; bool const useSetSpace = bparams.documentClass().provides("SetSpace"); - if (pit->allowParagraphCustomization()) { - if (pit->params().startOfAppendix()) { + if (par.allowParagraphCustomization()) { + if (par.params().startOfAppendix()) { os << "\\appendix\n"; - texrow.newline(); } - if (!pit->params().spacing().isDefault() - && (pit == paragraphs.begin() - || !priorpit->hasSameLayout(*pit))) + if (!par.params().spacing().isDefault() + && (pit == 0 || !priorpar->hasSameLayout(par))) { - os << from_ascii(pit->params().spacing().writeEnvirBegin(useSetSpace)) + 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(*pit, 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; } - Font const outerfont = text.outerFont(paragraphs.position(pit)); + runparams.local_font = &par.getFirstFontSettings(bparams); + parStartCommand(par, os, runparams, style); + Font const outerfont = text.outerFont(pit); // FIXME UNICODE os << from_utf8(everypar); - pit->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. @@ -707,19 +828,21 @@ void TeXOnePar(Buffer const & buf, // We do not need to use to change the font for the last paragraph // or for a command. - Font const font = pit->empty() - ? pit->getLayoutFont(bparams, outerfont) - : pit->getFont(bparams, pit->size() - 1, outerfont); + Font const font = par.empty() + ? par.getLayoutFont(bparams, outerfont) + : par.getFont(bparams, par.size() - 1, outerfont); bool const is_command = style.isCommand(); if (style.resfont.size() != font.fontInfo().size() - && nextpit != paragraphs.end() + && nextpar && !is_command) { os << '{'; os << "\\" << from_ascii(font.latexSize()) << " \\par}"; } else if (is_command) { os << '}'; + if (!style.postcommandargs().empty()) + latexArgInsets(par, os, runparams, style.postcommandargs(), "post:"); if (runparams.encoding != prev_encoding) { runparams.encoding = prev_encoding; if (!runparams.isFullUnicode()) @@ -728,38 +851,35 @@ void TeXOnePar(Buffer const & buf, } bool pending_newline = false; + bool unskip_newline = false; switch (style.latextype) { case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: - if (nextpit != paragraphs.end() - && (pit->params().depth() < nextpit->params().depth())) + if (nextpar && (par.params().depth() < nextpar->params().depth())) pending_newline = true; break; case LATEX_ENVIRONMENT: { // if its the last paragraph of the current environment // skip it otherwise fall through - if (nextpit != paragraphs.end() && - (nextpit->layout() != pit->layout() - || nextpit->params().depth() != pit->params().depth())) + if (nextpar + && (nextpar->layout() != par.layout() + || nextpar->params().depth() != par.params().depth())) break; } // fall through possible default: // we don't need it for the last paragraph!!! - if (nextpit != paragraphs.end()) + if (nextpar) pending_newline = true; } - if (pit->allowParagraphCustomization()) { - if (!pit->params().spacing().isDefault() - && (nextpit == paragraphs.end() || !nextpit->hasSameLayout(*pit))) - { - if (pending_newline) { + if (par.allowParagraphCustomization()) { + if (!par.params().spacing().isDefault() + && (runparams.isLastPar || !nextpar->hasSameLayout(par))) { + if (pending_newline) os << '\n'; - texrow.newline(); - } - os << from_ascii(pit->params().spacing().writeEnvirEnd(useSetSpace)); + os << from_ascii(par.params().spacing().writeEnvirEnd(useSetSpace)); pending_newline = true; } } @@ -767,57 +887,55 @@ 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 = !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? - ((nextpit != paragraphs.end() && - par_language->babel() != - (nextpit->getParLanguage(bparams))->babel()) || - (nextpit == paragraphs.end() && - par_language->babel() != outer_language->babel())); - - if (closing_rtl_ltr_environment || (nextpit == paragraphs.end() - && 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 + && ((!use_polyglossia && par_language->babel() != outer_language->babel()) + || (use_polyglossia && par_language->polyglossia() != outer_language->polyglossia())))) { // Since \selectlanguage write the language to the aux file, // 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()) { // If this is a child, we should restore the // master language after the last paragraph. Language const * const current_language = - (nextpit == paragraphs.end() - && runparams.master_language) + (runparams.isLastPar && runparams.master_language) ? runparams.master_language : outer_language; - string const current_lang = runparams.use_polyglossia ? - getPolyglossiaEnvName(current_language) + string const current_lang = use_polyglossia + ? getPolyglossiaEnvName(current_language) : current_language->babel(); if (!current_lang.empty()) { os << from_ascii(subst( lang_begin_command, "$$lang", current_lang)); - pending_newline = true; + pending_newline = !localswitch; + unskip_newline = !localswitch; } } else if (!par_lang.empty()) { os << from_ascii(subst( lang_end_command, "$$lang", par_lang)); - pending_newline = true; + pending_newline = !localswitch; + unskip_newline = !localswitch; } } } @@ -825,24 +943,27 @@ void TeXOnePar(Buffer const & buf, os << "}"; if (pending_newline) { + if (unskip_newline) + // prevent unwanted whitespace + os << '%'; 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 (nextpit != paragraphs.end() && open_encoding_ == CJK && - (nextpit->getParLanguage(bparams)->encoding()->package() != Encoding::CJK || - (nextpit->layout().isEnvironment() && nextpit->isMultiLingual(bparams))) - // inbetween environments, CJK has to be closed later (nesting!) - && (!style.isEnvironment() || !nextpit->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; } // If this is the last paragraph, close the CJK environment // if necessary. If it's an environment, we'll have to \end that first. - if (nextpit == paragraphs.end() && !style.isEnvironment()) { + if (runparams.isLastPar && !style.isEnvironment()) { switch (open_encoding_) { case CJK: { // do nothing at the end of child documents @@ -850,10 +971,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}"; @@ -877,7 +995,7 @@ void TeXOnePar(Buffer const & buf, // should be set back to that local_font's encoding. // However, do not change the encoding when a fully unicode aware backend // such as XeTeX is used. - if (nextpit == paragraphs.end() && runparams_in.local_font != 0 + if (runparams.isLastPar && runparams_in.local_font != 0 && runparams_in.encoding != runparams_in.local_font->language()->encoding() && (bparams.inputenc == "auto" || bparams.inputenc == "default") && (!runparams.isFullUnicode())) { @@ -892,8 +1010,8 @@ void TeXOnePar(Buffer const & buf, // we don't need a newline for the last paragraph!!! // Note from JMarc: we will re-add a \n explicitly in // TeXEnvironment, because it is needed in this case - if (nextpit != paragraphs.end()) { - Layout const & next_layout = nextpit->layout(); + if (nextpar) { + Layout const & next_layout = nextpar->layout(); if (style == next_layout // no blank lines before environments! || !next_layout.isEnvironment() @@ -904,14 +1022,13 @@ void TeXOnePar(Buffer const & buf, // information whether the current TeX row is empty or not. // For some ideas about how to fix this, see this thread: // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145787.html - || nextpit->params().depth() != pit->params().depth()) { + || nextpar->params().depth() != par.params().depth()) { os << '\n'; - texrow.newline(); } } - if (nextpit != paragraphs.end()) - LYXERR(Debug::LATEX, "TeXOnePar...done " << &*nextpit); + LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " done; ptr " + << &par << " next " << nextpar); return; } @@ -920,11 +1037,13 @@ 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) { + LASSERT(runparams.par_begin <= runparams.par_end, + { os << "% LaTeX Output Error\n"; return; } ); + BufferParams const & bparams = buf.params(); bool const maintext = text.isMainText(); @@ -937,13 +1056,12 @@ 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 // language on at start - string const mainlang = runparams.use_polyglossia ? - getPolyglossiaEnvName(bparams.language) + string const mainlang = runparams.use_polyglossia + ? getPolyglossiaEnvName(bparams.language) : bparams.language->babel(); string const lang_begin_command = runparams.use_polyglossia ? "\\begin{$$lang}" : lyxrc.language_command_begin; @@ -960,32 +1078,26 @@ void latexParagraphs(Buffer const & buf, << from_ascii(bparams.language->polyglossiaOpts()) << "]"; os << '\n'; - texrow.newline(); } ParagraphList const & paragraphs = text.paragraphs(); - LASSERT(runparams.par_begin <= runparams.par_end, /**/); - // if only part of the paragraphs will be outputed - bool const partial_export = (runparams.par_begin != runparams.par_end); - pit_type const par_begin = partial_export ? runparams.par_begin : 0; - pit_type const par_end = partial_export ? runparams.par_end : paragraphs.size(); - - if (partial_export) { - // runparams will be passed to nested paragraphs, so - // we have to reset the range parameters. - const_cast(runparams).par_begin = 0; - const_cast(runparams).par_end = 0; + + if (runparams.par_begin == runparams.par_end) { + // The full doc will be exported but it is easier to just rely on + // runparams range parameters that will be passed TeXEnvironment. + runparams.par_begin = 0; + runparams.par_end = paragraphs.size(); } - pit_type pit = par_begin; + 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; DocumentClass const & tclass = bparams.documentClass(); - for (; pit < par_end; ++pit) { + for (; pit < runparams.par_end; ++pit) { lastpit = pit; ParagraphList::const_iterator par = paragraphs.constIterator(pit); @@ -996,16 +1108,15 @@ void latexParagraphs(Buffer const & buf, if (layout.intitle) { if (already_title) { - lyxerr << "Error in latexParagraphs: You" + LYXERR0("Error in latexParagraphs: You" " should not mix title layouts" - " with normal ones." << endl; + " with normal ones."); } 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) { @@ -1017,37 +1128,40 @@ void latexParagraphs(Buffer const & buf, os << "\\" << from_ascii(tclass.titlename()) << "\n"; } - texrow.newline(); already_title = true; was_title = false; } + if (!layout.isEnvironment() && par->params().leftIndent().zero()) { - // Standard top level paragraph. - TeXOnePar(buf, text, par, os, texrow, runparams, everypar); + // This is a standard top level paragraph, TeX it and continue. + TeXOnePar(buf, text, pit, os, runparams, everypar); continue; } - TeXEnvironementData const data = prepareEnvironement(buf, text, par, - os, texrow, runparams); - par = TeXEnvironment(buf, text, par, os, texrow, runparams); - finishEnvironement(os, texrow, runparams, data); - pit = paragraphs.position(par); - //FIXME: TeXEnvironment() advances one par too much. - pit--; + TeXEnvironmentData const data = + prepareEnvironment(buf, text, par, os, runparams); + // pit can be changed in TeXEnvironment. + TeXEnvironment(buf, text, runparams, pit, os); + finishEnvironment(os, runparams, data); + } + + if (pit == runparams.par_end) { + // Make sure that the last paragraph is + // correctly terminated (because TeXOnePar does + // not add a \n in this case) + //os << '\n'; } // 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 @@ -1060,14 +1174,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; }