X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.C;h=bca30a65471e4667b3a210f1e9e705108d590a23;hb=e7ef29fa2d516b8593aa3cccb6548de5686e8a9a;hp=483fe10bcecd30163f648edc253308d4e47641b3;hpb=2a5bc90633d0bb63e5cabd43837b0de78cbd8895;p=lyx.git diff --git a/src/output_latex.C b/src/output_latex.C index 483fe10bce..bca30a6547 100644 --- a/src/output_latex.C +++ b/src/output_latex.C @@ -18,57 +18,54 @@ #include "encoding.h" #include "language.h" #include "lyxrc.h" +#include "outputparams.h" #include "paragraph.h" #include "paragraph_funcs.h" #include "ParagraphParameters.h" #include "texrow.h" #include "vspace.h" +#include "insets/insetbibitem.h" #include "insets/insetoptarg.h" #include "support/lstrings.h" -#ifdef HAVE_LOCALE -#endif - using lyx::support::subst; using std::endl; using std::ostream; using std::string; -extern string bibitemWidest(Buffer const &); - namespace { -ParagraphList::iterator +ParagraphList::const_iterator TeXEnvironment(Buffer const & buf, ParagraphList const & paragraphs, - ParagraphList::iterator pit, + ParagraphList::const_iterator pit, ostream & os, TexRow & texrow, OutputParams const & runparams); -ParagraphList::iterator +ParagraphList::const_iterator TeXOnePar(Buffer const & buf, ParagraphList const & paragraphs, - ParagraphList::iterator pit, + ParagraphList::const_iterator pit, ostream & os, TexRow & texrow, OutputParams const & runparams, string const & everypar = string()); -ParagraphList::iterator +ParagraphList::const_iterator TeXDeeper(Buffer const & buf, ParagraphList const & paragraphs, - ParagraphList::iterator pit, + ParagraphList::const_iterator pit, ostream & os, TexRow & texrow, OutputParams const & runparams) { lyxerr[Debug::LATEX] << "TeXDeeper... " << &*pit << endl; - ParagraphList::iterator par = pit; + ParagraphList::const_iterator par = pit; - while (par != const_cast(paragraphs).end() && + while (par != paragraphs.end() && par->params().depth() == pit->params().depth()) { if (par->layout()->isEnvironment()) { par = TeXEnvironment(buf, paragraphs, par, @@ -78,16 +75,16 @@ TeXDeeper(Buffer const & buf, os, texrow, runparams); } } - lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl; + lyxerr[Debug::LATEX] << "TeXDeeper...done " << endl; return par; } -ParagraphList::iterator +ParagraphList::const_iterator TeXEnvironment(Buffer const & buf, ParagraphList const & paragraphs, - ParagraphList::iterator pit, + ParagraphList::const_iterator pit, ostream & os, TexRow & texrow, OutputParams const & runparams) { @@ -100,7 +97,7 @@ TeXEnvironment(Buffer const & buf, Language const * language = pit->getParLanguage(bparams); Language const * doc_language = bparams.language; Language const * previous_language = - (pit != const_cast(paragraphs).begin()) + (pit != paragraphs.begin()) ? boost::prior(pit)->getParLanguage(bparams) : doc_language; if (language->babel() != previous_language->babel()) { @@ -141,11 +138,17 @@ TeXEnvironment(Buffer const & buf, os << style->latexparam() << '\n'; texrow.newline(); } - ParagraphList::iterator par = pit; + ParagraphList::const_iterator par = pit; do { par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams); - if (par != const_cast(paragraphs).end() && par->params().depth() > pit->params().depth()) { + if (par == paragraphs.end()) { + // Make sure that the last paragraph is + // correctly terminated (because TeXOnePar does + // not add a \n in this case) + os << '\n'; + texrow.newline(); + } else if (par->params().depth() > pit->params().depth()) { if (par->layout()->isParagraph()) { // Thinko! @@ -168,7 +171,7 @@ TeXEnvironment(Buffer const & buf, par = TeXDeeper(buf, paragraphs, par, os, texrow, runparams); } - } while (par != const_cast(paragraphs).end() + } while (par != paragraphs.end() && par->layout() == pit->layout() && par->params().depth() == pit->params().depth() && par->params().leftIndent() == pit->params().leftIndent()); @@ -183,86 +186,66 @@ TeXEnvironment(Buffer const & buf, texrow.newline(); } - lyxerr[Debug::LATEX] << "TeXEnvironment...done " << &*par << endl; - return par; // ale970302 + if (par != paragraphs.end() && lyxerr.debugging(Debug::LATEX)) + lyxerr << "TeXEnvironment...done " << &*par << endl; + return par; } -InsetOptArg * optArgInset(Paragraph const & par) +int latexOptArgInsets(Buffer const & buf, Paragraph const & par, + ostream & os, OutputParams const & runparams, int number) { - // Find the entry. + int lines = 0; + InsetList::const_iterator it = par.insetlist.begin(); InsetList::const_iterator end = par.insetlist.end(); - for (; it != end; ++it) { - InsetBase * ins = it->inset; - if (ins->lyxCode() == InsetBase::OPTARG_CODE) { - return static_cast(ins); + for (; it != end && number > 0 ; ++it) { + if (it->inset->lyxCode() == InsetBase::OPTARG_CODE) { + InsetOptArg * ins = + static_cast(it->inset); + lines += ins->latexOptional(buf, os, runparams); + --number; } } - return 0; + return lines; } -ParagraphList::iterator +ParagraphList::const_iterator TeXOnePar(Buffer const & buf, ParagraphList const & paragraphs, - ParagraphList::iterator pit, + ParagraphList::const_iterator pit, ostream & os, TexRow & texrow, - OutputParams const & runparams, + OutputParams const & runparams_in, string const & everypar) { lyxerr[Debug::LATEX] << "TeXOnePar... " << &*pit << " '" << everypar << "'" << endl; BufferParams const & bparams = buf.params(); - - InsetOld const * in = pit->inInset(); bool further_blank_line = false; LyXLayout_ptr style; - // well we have to check if we are in an inset with unlimited - // length (all in one row) if that is true then we don't allow - // any special options in the paragraph and also we don't allow - // any environment other then "Standard" to be valid! - if (in == 0 || !in->forceDefaultParagraphs(in)) { + // In an an inset with unlimited length (all in one row), + // force layout to default + if (!pit->forceDefaultParagraphs()) style = pit->layout(); - - if (pit->params().startOfAppendix()) { - os << "\\appendix\n"; - texrow.newline(); - } - - if (!pit->params().spacing().isDefault() - && (pit == const_cast(paragraphs).begin() - || !boost::prior(pit)->hasSameLayout(*pit))) - { - os << pit->params().spacing().writeEnvirBegin() << '\n'; - texrow.newline(); - } - - if (style->isCommand()) { - os << '\n'; - texrow.newline(); - } - - if (further_blank_line) { - os << '\n'; - texrow.newline(); - } - } else { + else style = bparams.getLyXTextClass().defaultLayout(); - } + + OutputParams runparams = runparams_in; + runparams.moving_arg |= style->needprotect; Language const * language = pit->getParLanguage(bparams); Language const * doc_language = bparams.language; Language const * previous_language = - (pit != const_cast(paragraphs).begin()) + (pit != paragraphs.begin()) ? boost::prior(pit)->getParLanguage(bparams) : doc_language; if (language->babel() != previous_language->babel() // check if we already put language command in TeXEnvironment() && !(style->isEnvironment() - && (pit == const_cast(paragraphs).begin() || + && (pit == paragraphs.begin() || (boost::prior(pit)->layout() != pit->layout() && boost::prior(pit)->getDepth() <= pit->getDepth()) || boost::prior(pit)->getDepth() < pit->getDepth()))) @@ -294,15 +277,45 @@ TeXOnePar(Buffer const & buf, texrow.newline(); } + // In an an inset with unlimited length (all in one row), + // don't allow any special options in the paragraph + if (!pit->forceDefaultParagraphs()) { + if (pit->params().startOfAppendix()) { + os << "\\appendix\n"; + texrow.newline(); + } + + if (!pit->params().spacing().isDefault() + && (pit == paragraphs.begin() + || !boost::prior(pit)->hasSameLayout(*pit))) + { + os << pit->params().spacing().writeEnvirBegin() << '\n'; + texrow.newline(); + } + + if (style->isCommand()) { + os << '\n'; + texrow.newline(); + } + + if (further_blank_line) { + os << '\n'; + texrow.newline(); + } + } + switch (style->latextype) { case LATEX_COMMAND: os << '\\' << style->latexname(); // Separate handling of optional argument inset. - if (style->optionalargs == 1) { - InsetOptArg * it = optArgInset(*pit); - if (it) - it->latexOptional(buf, os, runparams); + if (style->optionalargs > 0) { + int ret = latexOptArgInsets(buf, *pit, os, runparams, + style->optionalargs); + while (ret > 0) { + texrow.newline(); + --ret; + } } else os << style->latexparam(); @@ -320,7 +333,7 @@ TeXOnePar(Buffer const & buf, os << everypar; bool need_par = pit->simpleTeXOnePar(buf, bparams, - outerFont(pit, paragraphs), + outerFont(pit - paragraphs.begin(), paragraphs), os, texrow, runparams); // Make sure that \\par is done with the font of the last @@ -332,7 +345,9 @@ TeXOnePar(Buffer const & buf, // Is this really needed ? (Dekel) // We do not need to use to change the font for the last paragraph // or for a command. - LyXFont const outerfont(outerFont(pit, paragraphs)); + LyXFont const outerfont = + outerFont(pit - paragraphs.begin(), +paragraphs); LyXFont const font = (pit->empty() @@ -342,7 +357,7 @@ TeXOnePar(Buffer const & buf, bool is_command = style->isCommand(); if (style->resfont.size() != font.size() - && boost::next(pit) != const_cast(paragraphs).end() + && boost::next(pit) != paragraphs.end() && !is_command) { if (!need_par) os << '{'; @@ -355,7 +370,7 @@ TeXOnePar(Buffer const & buf, switch (style->latextype) { case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: - if (boost::next(pit) != const_cast(paragraphs).end() + if (boost::next(pit) != paragraphs.end() && (pit->params().depth() < boost::next(pit)->params().depth())) { os << '\n'; texrow.newline(); @@ -364,9 +379,9 @@ TeXOnePar(Buffer const & buf, case LATEX_ENVIRONMENT: { // if its the last paragraph of the current environment // skip it otherwise fall through - ParagraphList::iterator next = boost::next(pit); + ParagraphList::const_iterator next = boost::next(pit); - if (next != const_cast(paragraphs).end() + if (next != paragraphs.end() && (next->layout() != pit->layout() || next->params().depth() != pit->params().depth())) break; @@ -375,13 +390,13 @@ TeXOnePar(Buffer const & buf, // fall through possible default: // we don't need it for the last paragraph!!! - if (boost::next(pit) != const_cast(paragraphs).end()) { + if (boost::next(pit) != paragraphs.end()) { os << '\n'; texrow.newline(); } } - if (in == 0 || !in->forceDefaultParagraphs(in)) { + if (!pit->forceDefaultParagraphs()) { further_blank_line = false; if (further_blank_line) { @@ -390,7 +405,7 @@ TeXOnePar(Buffer const & buf, } if (!pit->params().spacing().isDefault() - && (boost::next(pit) == const_cast(paragraphs).end() + && (boost::next(pit) == paragraphs.end() || !boost::next(pit)->hasSameLayout(*pit))) { os << pit->params().spacing().writeEnvirEnd() << '\n'; @@ -398,31 +413,36 @@ TeXOnePar(Buffer const & buf, } } - // we don't need it for the last paragraph!!! - if (boost::next(pit) != const_cast(paragraphs).end()) { - os << '\n'; - texrow.newline(); - } else { + if (boost::next(pit) == paragraphs.end() + && language->babel() != doc_language->babel()) { // Since \selectlanguage write the language to the aux file, // we need to reset the language at the end of footnote or // float. - if (language->babel() != doc_language->babel()) { - if (lyxrc.language_command_end.empty()) - os << subst(lyxrc.language_command_begin, - "$$lang", - doc_language->babel()) - << endl; - else - os << subst(lyxrc.language_command_end, - "$$lang", - language->babel()) - << endl; - texrow.newline(); - } + if (lyxrc.language_command_end.empty()) + os << subst(lyxrc.language_command_begin, + "$$lang", + doc_language->babel()) + << endl; + else + os << subst(lyxrc.language_command_end, + "$$lang", + language->babel()) + << endl; + texrow.newline(); + } + + // we don't need it for the last paragraph!!! + // Note from JMarc: we will re-add a \n explicitely in + // TeXEnvironment, because it is needed in this case + if (boost::next(pit) != paragraphs.end()) { + os << '\n'; + texrow.newline(); } - lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl; + if (boost::next(pit) != paragraphs.end() && + lyxerr.debugging(Debug::LATEX)) + lyxerr << "TeXOnePar...done " << &*boost::next(pit) << endl; return ++pit; } @@ -440,17 +460,16 @@ void latexParagraphs(Buffer const & buf, bool was_title = false; bool already_title = false; LyXTextClass const & tclass = buf.params().getLyXTextClass(); - ParagraphList::iterator par = const_cast(paragraphs).begin(); - ParagraphList::iterator endpar = const_cast(paragraphs).end(); + ParagraphList::const_iterator par = paragraphs.begin(); + ParagraphList::const_iterator endpar = paragraphs.end(); // if only_body while (par != endpar) { - InsetOld * in = par->inInset(); // well we have to check if we are in an inset with unlimited // length (all in one row) if that is true then we don't allow // any special options in the paragraph and also we don't allow // any environment other then "Standard" to be valid! - if (in == 0 || !in->forceDefaultParagraphs(in)) { + if (!par->forceDefaultParagraphs()) { LyXLayout_ptr const & layout = par->layout(); if (layout->intitle) {