X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=783be726084195a10b6ec8c4f3d9f36b59865b6b;hb=7032b0374801d7e2621c221ce43f409855a901d6;hp=e680cc7aeb1bfee54a0510ca5a98a52485050981;hpb=1252c22fd35424f817e8ca216a57f509cc5526d6;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index e680cc7aeb..783be72608 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -33,6 +33,9 @@ #include "support/convert.h" #include "support/debug.h" #include "support/lstrings.h" +#include "support/textutils.h" + +#include #include #include @@ -52,9 +55,28 @@ enum OpenEncoding { CJK }; -static int open_encoding_ = none; -static int cjk_inherited_ = 0; -Language const * prev_env_language_ = 0; + +struct OutputState +{ + OutputState() : open_encoding_(none), cjk_inherited_(0), + prev_env_language_(0) + { + } + int open_encoding_; + int cjk_inherited_; + Language const * prev_env_language_; +}; + + +OutputState * getOutputState() +{ + // FIXME An instance of OutputState should be kept around for each export + // instead of using local thread storage + static QThreadStorage outputstate; + if (!outputstate.hasLocalData()) + outputstate.setLocalData(new OutputState); + return outputstate.localData(); +} string const getPolyglossiaEnvName(Language const * lang) @@ -96,7 +118,8 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, ParagraphList::const_iterator const priorpit = pit == paragraphs.begin() ? pit : boost::prior(pit); - bool const use_prev_env_language = prev_env_language_ != 0 + OutputState * state = getOutputState(); + bool const use_prev_env_language = state->prev_env_language_ != 0 && priorpit->layout().isEnvironment() && (priorpit->getDepth() > pit->getDepth() || (priorpit->getDepth() == pit->getDepth() @@ -107,7 +130,7 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, Language const * const doc_language = bparams.language; Language const * const prev_par_language = (pit != paragraphs.begin()) - ? (use_prev_env_language ? prev_env_language_ + ? (use_prev_env_language ? state->prev_env_language_ : priorpit->getParLanguage(bparams)) : doc_language; @@ -162,8 +185,11 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, if (style.isEnvironment()) { os << "\\begin{" << from_ascii(style.latexname()) << '}'; - if (!style.latexargs().empty()) - latexArgInsets(*pit, os, runparams, style.latexargs()); + 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 << '{' << pit->params().labelWidthString() @@ -183,11 +209,11 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, // in multilingual environments, the CJK tags have to be nested properly data.cjk_nested = false; if (data.par_language->encoding()->package() == Encoding::CJK && - open_encoding_ != CJK && pit->isMultiLingual(bparams)) { + state->open_encoding_ != CJK && pit->isMultiLingual(bparams)) { if (prev_par_language->encoding()->package() == Encoding::CJK) os << "\\begin{CJK}{" << from_ascii(data.par_language->encoding()->latexName()) << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; - open_encoding_ = CJK; + state->open_encoding_ = CJK; data.cjk_nested = true; } return data; @@ -195,18 +221,20 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, static void finishEnvironment(otexstream & os, OutputParams const & runparams, - TeXEnvironmentData const & data) + TeXEnvironmentData const & data) { - if (open_encoding_ == CJK && data.cjk_nested) { + OutputState * state = getOutputState(); + if (state->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"; - open_encoding_ = none; + state->open_encoding_ = none; } if (data.style->isEnvironment()) { - os << "\\end{" << from_ascii(data.style->latexname()) << "}\n"; - prev_env_language_ = data.par_language; + os << breakln + << "\\end{" << from_ascii(data.style->latexname()) << "}\n"; + state->prev_env_language_ = data.par_language; if (runparams.encoding != data.prev_encoding) { runparams.encoding = data.prev_encoding; if (!runparams.isFullUnicode()) @@ -215,14 +243,18 @@ static void finishEnvironment(otexstream & os, OutputParams const & runparams, } if (data.leftindent_open) { - os << "\\end{LyXParagraphLeftIndent}\n"; - prev_env_language_ = data.par_language; + os << breakln << "\\end{LyXParagraphLeftIndent}\n"; + state->prev_env_language_ = data.par_language; if (runparams.encoding != data.prev_encoding) { runparams.encoding = data.prev_encoding; if (!runparams.isFullUnicode()) os << setEncoding(data.prev_encoding->iconvName()); } } + + // Check whether we should output a blank line after the environment + if (!data.style->nextnoindent) + os << '\n'; } @@ -269,21 +301,6 @@ void TeXEnvironment(Buffer const & buf, Text const & text, // 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'; - } - // FIXME This test should not be necessary. // We should perhaps issue an error if it is. bool const force_plain_layout = text.inset().forcePlainLayout(); @@ -309,43 +326,26 @@ void TeXEnvironment(Buffer const & buf, Text const & text, LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << par_begin << " done."); } -} // namespace anon - -void latexArgInsets(Paragraph const & par, otexstream & os, - OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs) +void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, + map ilist, vector required, string const & prefix) { - 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) { - InsetArgument const * ins = - static_cast(it->inset); - if (ins->name().empty()) - LYXERR0("Error: Unnamed argument inset!"); - else { - unsigned int const nr = convert(ins->name()); - ilist[nr] = ins; - Layout::LaTeXArgMap::const_iterator const lit = - latexargs.find(nr); - 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()); - } - } - } - } - } - unsigned int const argnr = latexargs.size(); if (argnr == 0) return; + // Default and preset args are always output, so if they require + // other arguments, consider this. + Layout::LaTeXArgMap::const_iterator lit = latexargs.begin(); + Layout::LaTeXArgMap::const_iterator const lend = latexargs.end(); + for (; lit != lend; ++lit) { + Layout::latexarg arg = (*lit).second; + if ((!arg.presetarg.empty() || !arg.defaultarg.empty()) && !arg.requires.empty()) { + vector req = getVectorFromString(arg.requires); + required.insert(required.end(), req.begin(), req.end()); + } + } + for (unsigned int i = 1; i <= argnr; ++i) { map::const_iterator lit = ilist.find(i); bool inserted = false; @@ -353,7 +353,7 @@ void latexArgInsets(Paragraph const & par, otexstream & os, InsetArgument const * ins = (*lit).second; if (ins) { Layout::LaTeXArgMap::const_iterator const lait = - latexargs.find(convert(ins->name())); + latexargs.find(ins->name()); if (lait != latexargs.end()) { Layout::latexarg arg = (*lait).second; docstring ldelim = arg.mandatory ? @@ -364,7 +364,7 @@ void latexArgInsets(Paragraph const & par, otexstream & os, ldelim = arg.ldelim; if (!arg.rdelim.empty()) rdelim = arg.rdelim; - ins->latexArgument(os, runparams, ldelim, rdelim); + ins->latexArgument(os, runparams, ldelim, rdelim, arg.presetarg); inserted = true; } } @@ -373,16 +373,29 @@ void latexArgInsets(Paragraph const & par, otexstream & os, Layout::LaTeXArgMap::const_iterator lait = latexargs.begin(); Layout::LaTeXArgMap::const_iterator const laend = latexargs.end(); for (; lait != laend; ++lait) { - if ((*lait).first == i) { + 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 << 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(), - convert((*lait).first)) != required.end()) { + (*lait).first) != required.end()) { docstring ldelim = arg.ldelim.empty() ? from_ascii("[") : arg.ldelim; docstring rdelim = arg.rdelim.empty() ? @@ -396,6 +409,103 @@ void latexArgInsets(Paragraph const & par, otexstream & os, } } + +} // namespace anon + + +void latexArgInsets(Paragraph const & par, otexstream & os, + OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix) +{ + 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) { + 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); + 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); +} + + +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; + } + + 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()); + } + } + } + } + } + } + getArgInsets(os, runparams, latexargs, ilist, required, prefix); +} + namespace { // output the proper paragraph start according to latextype. @@ -406,15 +516,18 @@ void parStartCommand(Paragraph const & par, otexstream & os, case LATEX_COMMAND: os << '\\' << from_ascii(style.latexname()); - // Separate handling of optional argument inset. + // Command arguments if (!style.latexargs().empty()) latexArgInsets(par, os, runparams, style.latexargs()); - else - os << from_ascii(style.latexparam()); + os << from_ascii(style.latexparam()); break; case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: - os << "\\item "; + 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 @@ -435,12 +548,13 @@ void TeXOnePar(Buffer const & buf, string const & everypar, int start_pos, int end_pos) { - BufferParams const & bparams = buf.params(); + BufferParams const & bparams = runparams_in.is_child + ? buf.masterParams() : 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() ? + Layout const & style = text.inset().forcePlainLayout() ? bparams.documentClass().plainLayout() : par.layout(); if (style.inpreamble) @@ -460,13 +574,14 @@ void TeXOnePar(Buffer const & buf, 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. + OutputState * state = getOutputState(); if (pit == 0 && !maintext - && (cjk_inherited_ > 0 || open_encoding_ == CJK)) { - cjk_inherited_ += 1; - open_encoding_ = none; + && (state->cjk_inherited_ > 0 || state->open_encoding_ == CJK)) { + state->cjk_inherited_ += 1; + state->open_encoding_ = none; } - if (text.inset().getLayout().isPassThru()) { + if (text.inset().isPassThru()) { Font const outerfont = text.outerFont(pit); // No newline before first paragraph in this lyxtext @@ -498,7 +613,7 @@ void TeXOnePar(Buffer const & buf, os << '\n'; if (!style.parbreak_is_newline) { os << '\n'; - } else if (nextpar) { + } else if (nextpar && !style.isEnvironment()) { Layout const nextstyle = text.inset().forcePlainLayout() ? bparams.documentClass().plainLayout() : nextpar->layout(); @@ -526,7 +641,7 @@ void TeXOnePar(Buffer const & buf, // 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 + bool const use_prev_env_language = state->prev_env_language_ != 0 && priorpar && priorpar->layout().isEnvironment() && (priorpar->getDepth() > par.getDepth() @@ -534,7 +649,7 @@ void TeXOnePar(Buffer const & buf, && priorpar->layout() != par.layout())); Language const * const prev_language = (pit != 0) - ? (use_prev_env_language ? prev_env_language_ + ? (use_prev_env_language ? state->prev_env_language_ : priorpar->getParLanguage(bparams)) : outer_language; @@ -548,10 +663,21 @@ void TeXOnePar(Buffer const & buf, getPolyglossiaEnvName(doc_language) : doc_language->babel(); string const outer_lang = use_polyglossia ? getPolyglossiaEnvName(outer_language) : outer_language->babel(); - string const lang_begin_command = use_polyglossia ? + string lang_begin_command = use_polyglossia ? "\\begin{$$lang}" : lyxrc.language_command_begin; - string const lang_end_command = use_polyglossia ? + 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().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() @@ -567,8 +693,7 @@ void TeXOnePar(Buffer const & buf, os << from_ascii(subst(lang_end_command, "$$lang", prev_lang)) - // the '%' is necessary to prevent unwanted whitespace - << "%\n"; + << lang_command_termination; } // We need to open a new language if we couldn't close the previous @@ -626,8 +751,7 @@ void TeXOnePar(Buffer const & buf, os << "[" << from_ascii(par_language->polyglossiaOpts()) << "]"; - // the '%' is necessary to prevent unwanted whitespace - os << "%\n"; + os << lang_command_termination; } } } @@ -649,7 +773,7 @@ void TeXOnePar(Buffer const & buf, par.getFontSettings(bparams, i).language()->encoding(); if (encoding->package() != Encoding::CJK && runparams.encoding->package() == Encoding::inputenc - && c < 0x80) + && isASCII(c)) continue; if (par.isInset(i)) break; @@ -666,10 +790,10 @@ void TeXOnePar(Buffer const & buf, // 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) { + && state->open_encoding_ != CJK && state->cjk_inherited_ == 0) { os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName()) << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; - open_encoding_ = CJK; + state->open_encoding_ = CJK; } if (encoding->package() != Encoding::none && enc_switch.first) { if (enc_switch.second > 0) { @@ -683,8 +807,7 @@ void TeXOnePar(Buffer const & buf, lang_begin_command, "$$lang", par_lang)) - // the '%' is necessary to prevent unwanted whitespace - << "%\n"; + << lang_command_termination; } runparams.encoding = encoding; } @@ -698,7 +821,7 @@ void TeXOnePar(Buffer const & buf, bool const useSetSpace = bparams.documentClass().provides("SetSpace"); if (par.allowParagraphCustomization()) { if (par.params().startOfAppendix()) { - os << "\\appendix\n"; + os << "\n\\appendix\n"; } if (!par.params().spacing().isDefault() @@ -714,7 +837,6 @@ void TeXOnePar(Buffer const & buf, } parStartCommand(par, os, runparams, style); - Font const outerfont = text.outerFont(pit); // FIXME UNICODE @@ -727,9 +849,9 @@ void TeXOnePar(Buffer const & buf, // calculates the space between the baselines according // to this font. (Matthias) // - // Is this really needed ? (Dekel) - // We do not need to use to change the font for the last paragraph - // or for a command. + // We must not change the font for the last paragraph + // of non-multipar insets, tabular cells or commands, + // since this produces unwanted whitespace. Font const font = par.empty() ? par.getLayoutFont(bparams, outerfont) @@ -738,12 +860,16 @@ void TeXOnePar(Buffer const & buf, bool const is_command = style.isCommand(); if (style.resfont.size() != font.fontInfo().size() - && nextpar + && (nextpar || maintext + || (text.inset().getLayout().isMultiPar() + && text.inset().lyxCode() != CELL_CODE)) && !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()) @@ -756,7 +882,7 @@ void TeXOnePar(Buffer const & buf, switch (style.latextype) { case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: - if (nextpar && (par.params().depth() < nextpar->params().depth())) + if (nextpar && par.params().depth() < nextpar->params().depth()) pending_newline = true; break; case LATEX_ENVIRONMENT: { @@ -780,7 +906,13 @@ void TeXOnePar(Buffer const & buf, && (runparams.isLastPar || !nextpar->hasSameLayout(par))) { if (pending_newline) os << '\n'; - os << from_ascii(par.params().spacing().writeEnvirEnd(useSetSpace)); + + string const endtag = + par.params().spacing().writeEnvirEnd(useSetSpace); + if (prefixIs(endtag, "\\end{")) + os << breakln; + + os << from_ascii(endtag); pending_newline = true; } } @@ -792,7 +924,7 @@ void TeXOnePar(Buffer const & buf, // not for ArabTeX && (par_language->lang() != "arabic_arabtex" && outer_language->lang() != "arabic_arabtex") - // have we opened and \L or \R environment? + // have we opened an \L or \R environment? && runparams.local_font != 0 && runparams.local_font->isRightToLeft() != par_language->rightToLeft() // are we about to close the language? @@ -827,45 +959,49 @@ void TeXOnePar(Buffer const & buf, lang_begin_command, "$$lang", current_lang)); - pending_newline = true; - unskip_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; - unskip_newline = true; + pending_newline = !localswitch; + unskip_newline = !localswitch; } } } if (closing_rtl_ltr_environment) os << "}"; + bool const last_was_separator = + par.size() > 0 && par.isEnvSeparator(par.size() - 1); + if (pending_newline) { if (unskip_newline) // prevent unwanted whitespace os << '%'; - os << '\n'; + if (!os.afterParbreak() && !last_was_separator) + os << '\n'; } // 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 + && state->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; + state->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 (runparams.isLastPar && !style.isEnvironment()) { - switch (open_encoding_) { + switch (state->open_encoding_) { case CJK: { // do nothing at the end of child documents if (maintext && buf.masterBuffer() != &buf) @@ -876,12 +1012,12 @@ void TeXOnePar(Buffer const & buf, // end of an inset } else os << "\\end{CJK}"; - open_encoding_ = none; + state->open_encoding_ = none; break; } case inputenc: { os << "\\egroup"; - open_encoding_ = none; + state->open_encoding_ = none; break; } case none: @@ -911,20 +1047,51 @@ 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 (nextpar) { + if (nextpar && !os.afterParbreak() && !last_was_separator) { + // Make sure to start a new line + os << breakln; Layout const & next_layout = nextpar->layout(); - if (style == next_layout - // no blank lines before environments! - || !next_layout.isEnvironment() - // unless there's a depth change - // FIXME What we really want to do here is put every \begin and \end - // tag on a new line (which was not the case with nested environments). - // But in the present state of play, we don't have access to the - // 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 - || nextpar->params().depth() != par.params().depth()) { - os << '\n'; + // A newline '\n' is always output before a command, + // so avoid doubling it. + if (!next_layout.isCommand()) { + // Here we now try to avoid spurious empty lines by + // outputting a paragraph break only if: (case 1) the + // paragraph style allows parbreaks and no \begin, \end + // or \item tags are going to follow (i.e., if the next + // isn't the first or the current isn't the last + // paragraph of an environment or itemize) and the + // depth and alignment of the following paragraph is + // unchanged, or (case 2) the following is a + // non-environment paragraph whose depth is increased + // but whose alignment is unchanged, or (case 3) the + // paragraph is not an environment and the next one is a + // non-itemize-like env at lower depth, or (case 4) the + // paragraph is a command not followed by an environment + // and the alignment of the current and next paragraph + // is unchanged, or (case 5) the current alignment is + // changed and a standard paragraph follows. + DocumentClass const & tclass = bparams.documentClass(); + if ((style == next_layout + && !style.parbreak_is_newline + && style.latextype != LATEX_ITEM_ENVIRONMENT + && style.latextype != LATEX_LIST_ENVIRONMENT + && style.align == par.getAlign() + && nextpar->getDepth() == par.getDepth() + && nextpar->getAlign() == par.getAlign()) + || (!next_layout.isEnvironment() + && nextpar->getDepth() > par.getDepth() + && nextpar->getAlign() == par.getAlign()) + || (!style.isEnvironment() + && next_layout.latextype == LATEX_ENVIRONMENT + && nextpar->getDepth() < par.getDepth()) + || (style.isCommand() + && !next_layout.isEnvironment() + && style.align == par.getAlign() + && next_layout.align == nextpar->getAlign()) + || (style.align != par.getAlign() + && tclass.isDefaultLayout(next_layout))) { + os << '\n'; + } } } @@ -942,6 +1109,9 @@ void latexParagraphs(Buffer const & buf, 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(); @@ -950,11 +1120,12 @@ void latexParagraphs(Buffer const & buf, // Open a CJK environment at the beginning of the main buffer // if the document's language is a CJK language // (but not in child documents) + OutputState * state = getOutputState(); if (maintext && !is_child && bparams.encoding().package() == Encoding::CJK) { os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName()) << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; - open_encoding_ = CJK; + state->open_encoding_ = CJK; } // if "auto begin" is switched off, explicitly switch the // language on at start @@ -979,7 +1150,6 @@ void latexParagraphs(Buffer const & buf, } ParagraphList const & paragraphs = text.paragraphs(); - LASSERT(runparams.par_begin <= runparams.par_end, /**/); if (runparams.par_begin == runparams.par_end) { // The full doc will be exported but it is easier to just rely on @@ -1077,16 +1247,16 @@ void latexParagraphs(Buffer const & buf, // 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) { + if (maintext && !is_child && state->open_encoding_ == CJK) { os << "\\end{CJK}\n"; - open_encoding_ = none; + state->open_encoding_ = none; } // reset inherited encoding - if (cjk_inherited_ > 0) { - cjk_inherited_ -= 1; - if (cjk_inherited_ == 0) - open_encoding_ = CJK; + if (state->cjk_inherited_ > 0) { + state->cjk_inherited_ -= 1; + if (state->cjk_inherited_ == 0) + state->open_encoding_ = CJK; } } @@ -1097,8 +1267,12 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, { Encoding const & oldEnc = *runparams.encoding; bool moving_arg = runparams.moving_arg; - if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default") - || moving_arg)) + // If we switch from/to CJK, we need to switch anyway, despite custom inputenc + bool const from_to_cjk = + (oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK) + || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK); + if (!force && !from_to_cjk + && ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg)) return make_pair(false, 0); // Do nothing if the encoding is unchanged. @@ -1121,6 +1295,7 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, return make_pair(true, 0); docstring const inputenc_arg(from_ascii(newEnc.latexName())); + OutputState * state = getOutputState(); switch (newEnc.package()) { case Encoding::none: case Encoding::japanese: @@ -1129,15 +1304,15 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, case Encoding::inputenc: { int count = inputenc_arg.length(); if (oldEnc.package() == Encoding::CJK && - open_encoding_ == CJK) { + state->open_encoding_ == CJK) { os << "\\end{CJK}"; - open_encoding_ = none; + state->open_encoding_ = none; count += 9; } else if (oldEnc.package() == Encoding::inputenc && - open_encoding_ == inputenc) { + state->open_encoding_ == inputenc) { os << "\\egroup"; - open_encoding_ = none; + state->open_encoding_ = none; count += 7; } if (runparams.local_font != 0 @@ -1147,7 +1322,7 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, // else CJK fails. os << "\\bgroup"; count += 7; - open_encoding_ = inputenc; + state->open_encoding_ = inputenc; } // with the japanese option, inputenc is omitted. if (runparams.use_japanese) @@ -1158,18 +1333,18 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, case Encoding::CJK: { int count = inputenc_arg.length(); if (oldEnc.package() == Encoding::CJK && - open_encoding_ == CJK) { + state->open_encoding_ == CJK) { os << "\\end{CJK}"; count += 9; } if (oldEnc.package() == Encoding::inputenc && - open_encoding_ == inputenc) { + state->open_encoding_ == inputenc) { os << "\\egroup"; count += 7; } os << "\\begin{CJK}{" << inputenc_arg << "}{" << from_ascii(bparams.fonts_cjk) << "}"; - open_encoding_ = CJK; + state->open_encoding_ = CJK; return make_pair(true, count + 15); } }