X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.C;h=c6986cce240e8ec00ae174c12fafb2da27cd7d9a;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=483fe10bcecd30163f648edc253308d4e47641b3;hpb=ec4ab8ce18418999b547368d1d2bbf546bec1e7b;p=lyx.git diff --git a/src/output_latex.C b/src/output_latex.C index 483fe10bce..c6986cce24 100644 --- a/src/output_latex.C +++ b/src/output_latex.C @@ -18,57 +18,57 @@ #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" +#include "support/unicode.h" -#ifdef HAVE_LOCALE -#endif -using lyx::support::subst; +namespace lyx { + +using 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, - ostream & os, TexRow & texrow, + ParagraphList::const_iterator pit, + odocstream & os, TexRow & texrow, OutputParams const & runparams); -ParagraphList::iterator +ParagraphList::const_iterator TeXOnePar(Buffer const & buf, ParagraphList const & paragraphs, - ParagraphList::iterator pit, - ostream & os, TexRow & texrow, + ParagraphList::const_iterator pit, + odocstream & 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, - ostream & os, TexRow & texrow, + ParagraphList::const_iterator pit, + odocstream & 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,17 +78,21 @@ TeXDeeper(Buffer const & buf, os, texrow, runparams); } } - lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl; + lyxerr[Debug::LATEX] << "TeXDeeper...done " << endl; return par; } -ParagraphList::iterator +int latexOptArgInsets(Buffer const & buf, Paragraph const & par, + odocstream & os, OutputParams const & runparams, int number); + + +ParagraphList::const_iterator TeXEnvironment(Buffer const & buf, ParagraphList const & paragraphs, - ParagraphList::iterator pit, - ostream & os, TexRow & texrow, + ParagraphList::const_iterator pit, + odocstream & os, TexRow & texrow, OutputParams const & runparams) { lyxerr[Debug::LATEX] << "TeXEnvironment... " << &*pit << endl; @@ -100,23 +104,27 @@ 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()) { if (!lyxrc.language_command_end.empty() && previous_language->babel() != doc_language->babel()) { - os << subst(lyxrc.language_command_end, "$$lang", - previous_language->babel()) + os << from_ascii(subst( + lyxrc.language_command_end, + "$$lang", + previous_language->babel())) << endl; texrow.newline(); } if (lyxrc.language_command_end.empty() || language->babel() != doc_language->babel()) { - os << subst(lyxrc.language_command_begin, "$$lang", - language->babel()) + os << from_ascii(subst( + lyxrc.language_command_begin, + "$$lang", + language->babel())) << endl; texrow.newline(); } @@ -124,28 +132,45 @@ TeXEnvironment(Buffer const & buf, bool leftindent_open = false; if (!pit->params().leftIndent().zero()) { - os << "\\begin{LyXParagraphLeftIndent}{" << - pit->params().leftIndent().asLatexString() << "}\n"; + os << "\\begin{LyXParagraphLeftIndent}{" + << from_ascii(pit->params().leftIndent().asLatexString()) + << "}\n"; texrow.newline(); leftindent_open = true; } if (style->isEnvironment()) { - os << "\\begin{" << style->latexname() << '}'; + os << "\\begin{" << from_ascii(style->latexname()) << '}'; + if (style->optionalargs > 0) { + int ret = latexOptArgInsets(buf, *pit, os, runparams, + style->optionalargs); + while (ret > 0) { + texrow.newline(); + --ret; + } + } if (style->latextype == LATEX_LIST_ENVIRONMENT) { - os << "{" << pit->params().labelWidthString() << "}\n"; + os << '{' + << pit->params().labelWidthString() + << "}\n"; } else if (style->labeltype == LABEL_BIBLIO) { // ale970405 - os << "{" << bibitemWidest(buf) << "}\n"; + os << '{' << bibitemWidest(buf) << "}\n"; } else - os << style->latexparam() << '\n'; + os << from_ascii(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,13 +193,13 @@ 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()); if (style->isEnvironment()) { - os << "\\end{" << style->latexname() << "}\n"; + os << "\\end{" << from_ascii(style->latexname()) << "}\n"; texrow.newline(); } @@ -183,86 +208,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, + odocstream & 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, - ostream & os, TexRow & texrow, - OutputParams const & runparams, + ParagraphList::const_iterator pit, + odocstream & ucs4, TexRow & texrow, + 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()))) @@ -270,42 +275,85 @@ TeXOnePar(Buffer const & buf, if (!lyxrc.language_command_end.empty() && previous_language->babel() != doc_language->babel()) { - os << subst(lyxrc.language_command_end, "$$lang", - previous_language->babel()) - << endl; + ucs4 << from_ascii(subst(lyxrc.language_command_end, + "$$lang", + previous_language->babel())) + << endl; texrow.newline(); } if (lyxrc.language_command_end.empty() || language->babel() != doc_language->babel()) { - os << subst(lyxrc.language_command_begin, "$$lang", - language->babel()) - << endl; + ucs4 << from_ascii(subst( + lyxrc.language_command_begin, + "$$lang", + language->babel())) + << endl; texrow.newline(); } } if (bparams.inputenc == "auto" && language->encoding() != previous_language->encoding()) { - os << "\\inputencoding{" - << language->encoding()->LatexName() - << "}\n"; + ucs4 << "\\inputencoding{" + << from_ascii(language->encoding()->latexName()) + << "}\n"; texrow.newline(); } + // We need to output the paragraph to a temporary stream if we + // need to change the encoding. Don't do this if the result does + // not go to a file but to the builtin source viewer. + odocstringstream par_stream; + bool const change_encoding = !runparams_in.dryrun && + bparams.inputenc == "auto" && + language->encoding() != doc_language->encoding(); + // don't trigger the copy ctor because it's private on msvc + odocstream & os = *(change_encoding ? &par_stream : &ucs4); + + // 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 << from_ascii(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(); + os << '\\' << from_ascii(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(); + os << from_ascii(style->latexparam()); break; case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: @@ -318,9 +366,10 @@ TeXOnePar(Buffer const & buf, break; } - os << everypar; + // FIXME UNICODE + os << from_utf8(everypar); bool need_par = pit->simpleTeXOnePar(buf, bparams, - outerFont(pit, paragraphs), + outerFont(std::distance(paragraphs.begin(), pit), paragraphs), os, texrow, runparams); // Make sure that \\par is done with the font of the last @@ -332,7 +381,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(std::distance(paragraphs.begin(), pit), + paragraphs); LyXFont const font = (pit->empty() @@ -342,11 +393,11 @@ 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 << '{'; - os << "\\" << font.latexSize() << " \\par}"; + os << "\\" << from_ascii(font.latexSize()) << " \\par}"; } else if (need_par) { os << "\\par}"; } else if (is_command) @@ -355,7 +406,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 +415,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 +426,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,39 +441,101 @@ 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'; + os << from_ascii(pit->params().spacing().writeEnvirEnd()) + << '\n'; texrow.newline(); } } - // 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 << from_ascii(subst( + lyxrc.language_command_begin, + "$$lang", + doc_language->babel())) + << endl; + else + os << from_ascii(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(); + } + + if (boost::next(pit) != paragraphs.end() && + lyxerr.debugging(Debug::LATEX)) + lyxerr << "TeXOnePar...done " << &*boost::next(pit) << endl; + + if (change_encoding) { + lyxerr[Debug::LATEX] << "Converting paragraph to encoding " + << language->encoding()->iconvName() << endl; + docstring const par = par_stream.str(); + // Convert the paragraph to the 8bit encoding that we need to + // output. + std::vector const encoded = lyx::ucs4_to_eightbit(par.c_str(), + par.size(), language->encoding()->iconvName()); + // Interpret this as if it was in the 8 bit encoding of the + // document language and convert it back to UCS4. That means + // that faked does not contain pure UCS4 anymore, but what + // will be written to the output file will be correct, because + // the real output stream will do a UCS4 -> document language + // encoding conversion. + // This is of course a hack, but not a bigger one than mixing + // two encodings in one file. + // FIXME: Catch iconv conversion errors and display an error + // dialog. + + // Here follows an explanation how I (gb) came to the current + // solution: + + // codecvt facets are only used by file streams -> OK, maybe + // we could use file streams and not generic streams in the + // latex() methods? No, that does not work, we use them at + // several places to write to string streams. + // Next try: Maybe we could do something else than codecvt + // in our streams, and add a setEncoding() method? That + // does not work unless we rebuild the functionality of file + // and string streams, since both odocfstream and + // odocstringstream inherit from std::basic_ostream + // and we can neither add a method to that class nor change + // the inheritance of the file and string streams. + + // What might be possible is to encapsulate the real file and + // string streams in our own version, and use a homemade + // streambuf that would do the encoding conversion and then + // forward to the real stream. That would probably work, but + // would require far more code and a good understanding of + // stream buffers to get it right. + + // Another idea by JMarc is to use a modifier like + // os << setencoding("iso-8859-1"); + // That currently looks like the best idea. + + std::vector const faked = lyx::eightbit_to_ucs4(&(encoded[0]), + encoded.size(), doc_language->encoding()->iconvName()); + std::vector::const_iterator const end = faked.end(); + std::vector::const_iterator it = faked.begin(); + for (; it != end; ++it) + ucs4.put(*it); } - lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl; return ++pit; } @@ -432,7 +545,7 @@ TeXOnePar(Buffer const & buf, // LaTeX all paragraphs void latexParagraphs(Buffer const & buf, ParagraphList const & paragraphs, - ostream & os, + odocstream & os, TexRow & texrow, OutputParams const & runparams, string const & everypar) @@ -440,17 +553,28 @@ 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(); + + BOOST_ASSERT(runparams.par_begin <= runparams.par_end); + // if only part of the paragraphs will be outputed + if (runparams.par_begin != runparams.par_end) { + par = boost::next(paragraphs.begin(), runparams.par_begin); + endpar = boost::next(paragraphs.begin(), runparams.par_end); + // 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 only_body while (par != endpar) { - InsetOld * in = par->inInset(); + ParagraphList::const_iterator lastpar = par; // 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) { @@ -462,18 +586,18 @@ void latexParagraphs(Buffer const & buf, was_title = true; if (tclass.titletype() == TITLE_ENVIRONMENT) { os << "\\begin{" - << tclass.titlename() + << from_ascii(tclass.titlename()) << "}\n"; texrow.newline(); } } } else if (was_title && !already_title) { if (tclass.titletype() == TITLE_ENVIRONMENT) { - os << "\\end{" << tclass.titlename() + os << "\\end{" << from_ascii(tclass.titlename()) << "}\n"; } else { - os << "\\" << tclass.titlename() + os << "\\" << from_ascii(tclass.titlename()) << "\n"; } texrow.newline(); @@ -483,7 +607,7 @@ void latexParagraphs(Buffer const & buf, if (layout->is_environment) { par = TeXOnePar(buf, paragraphs, par, os, texrow, - runparams, everypar); + runparams, everypar); } else if (layout->isEnvironment() || !par->params().leftIndent().zero()) { @@ -491,23 +615,28 @@ void latexParagraphs(Buffer const & buf, texrow, runparams); } else { par = TeXOnePar(buf, paragraphs, par, os, texrow, - runparams, everypar); + runparams, everypar); } } else { par = TeXOnePar(buf, paragraphs, par, os, texrow, - runparams, everypar); + runparams, everypar); } + if (std::distance(lastpar, par) >= std::distance(lastpar, endpar)) + break; } // It might be that we only have a title in this document if (was_title && !already_title) { if (tclass.titletype() == TITLE_ENVIRONMENT) { - os << "\\end{" << tclass.titlename() + os << "\\end{" << from_ascii(tclass.titlename()) << "}\n"; } else { - os << "\\" << tclass.titlename() + os << "\\" << from_ascii(tclass.titlename()) << "\n"; } texrow.newline(); } } + + +} // namespace lyx