X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.C;h=c6986cce240e8ec00ae174c12fafb2da27cd7d9a;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=d739f86176036d5a8f005fc80703e06392f65b0d;hpb=8e17851d87712c08ed4133a3408f42637c2de7a0;p=lyx.git diff --git a/src/output_latex.C b/src/output_latex.C index d739f86176..c6986cce24 100644 --- a/src/output_latex.C +++ b/src/output_latex.C @@ -29,11 +29,14 @@ #include "insets/insetoptarg.h" #include "support/lstrings.h" +#include "support/unicode.h" -using lyx::support::subst; + +namespace lyx { + +using support::subst; using std::endl; -using lyx::odocstream; using std::string; @@ -108,7 +111,7 @@ TeXEnvironment(Buffer const & buf, if (!lyxrc.language_command_end.empty() && previous_language->babel() != doc_language->babel()) { - os << lyx::from_ascii(subst( + os << from_ascii(subst( lyxrc.language_command_end, "$$lang", previous_language->babel())) @@ -118,7 +121,7 @@ TeXEnvironment(Buffer const & buf, if (lyxrc.language_command_end.empty() || language->babel() != doc_language->babel()) { - os << lyx::from_ascii(subst( + os << from_ascii(subst( lyxrc.language_command_begin, "$$lang", language->babel())) @@ -130,14 +133,14 @@ TeXEnvironment(Buffer const & buf, bool leftindent_open = false; if (!pit->params().leftIndent().zero()) { os << "\\begin{LyXParagraphLeftIndent}{" - << lyx::from_ascii(pit->params().leftIndent().asLatexString()) + << from_ascii(pit->params().leftIndent().asLatexString()) << "}\n"; texrow.newline(); leftindent_open = true; } if (style->isEnvironment()) { - os << "\\begin{" << lyx::from_ascii(style->latexname()) << '}'; + os << "\\begin{" << from_ascii(style->latexname()) << '}'; if (style->optionalargs > 0) { int ret = latexOptArgInsets(buf, *pit, os, runparams, style->optionalargs); @@ -147,15 +150,14 @@ TeXEnvironment(Buffer const & buf, } } if (style->latextype == LATEX_LIST_ENVIRONMENT) { - // FIXME UNICODE os << '{' - << lyx::from_utf8(pit->params().labelWidthString()) + << pit->params().labelWidthString() << "}\n"; } else if (style->labeltype == LABEL_BIBLIO) { // ale970405 os << '{' << bibitemWidest(buf) << "}\n"; } else - os << lyx::from_ascii(style->latexparam()) << '\n'; + os << from_ascii(style->latexparam()) << '\n'; texrow.newline(); } ParagraphList::const_iterator par = pit; @@ -197,7 +199,7 @@ TeXEnvironment(Buffer const & buf, && par->params().leftIndent() == pit->params().leftIndent()); if (style->isEnvironment()) { - os << "\\end{" << lyx::from_ascii(style->latexname()) << "}\n"; + os << "\\end{" << from_ascii(style->latexname()) << "}\n"; texrow.newline(); } @@ -235,7 +237,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, ParagraphList const & paragraphs, ParagraphList::const_iterator pit, - odocstream & os, TexRow & texrow, + odocstream & ucs4, TexRow & texrow, OutputParams const & runparams_in, string const & everypar) { @@ -273,34 +275,41 @@ TeXOnePar(Buffer const & buf, if (!lyxrc.language_command_end.empty() && previous_language->babel() != doc_language->babel()) { - os << lyx::from_ascii(subst(lyxrc.language_command_end, + ucs4 << from_ascii(subst(lyxrc.language_command_end, "$$lang", previous_language->babel())) - << endl; + << endl; texrow.newline(); } if (lyxrc.language_command_end.empty() || language->babel() != doc_language->babel()) { - os << lyx::from_ascii(subst( + ucs4 << from_ascii(subst( lyxrc.language_command_begin, "$$lang", language->babel())) - << endl; + << endl; texrow.newline(); } } - if (false) { - if (bparams.inputenc == "auto" && - language->encoding() != previous_language->encoding()) { - os << "\\inputencoding{" - << lyx::from_ascii(language->encoding()->latexName()) - << "}\n"; - texrow.newline(); - } + if (bparams.inputenc == "auto" && + language->encoding() != previous_language->encoding()) { + 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 @@ -314,7 +323,7 @@ TeXOnePar(Buffer const & buf, && (pit == paragraphs.begin() || !boost::prior(pit)->hasSameLayout(*pit))) { - os << lyx::from_ascii(pit->params().spacing().writeEnvirBegin()) + os << from_ascii(pit->params().spacing().writeEnvirBegin()) << '\n'; texrow.newline(); } @@ -332,7 +341,7 @@ TeXOnePar(Buffer const & buf, switch (style->latextype) { case LATEX_COMMAND: - os << '\\' << lyx::from_ascii(style->latexname()); + os << '\\' << from_ascii(style->latexname()); // Separate handling of optional argument inset. if (style->optionalargs > 0) { @@ -344,7 +353,7 @@ TeXOnePar(Buffer const & buf, } } else - os << lyx::from_ascii(style->latexparam()); + os << from_ascii(style->latexparam()); break; case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: @@ -358,7 +367,7 @@ TeXOnePar(Buffer const & buf, } // FIXME UNICODE - os << lyx::from_utf8(everypar); + os << from_utf8(everypar); bool need_par = pit->simpleTeXOnePar(buf, bparams, outerFont(std::distance(paragraphs.begin(), pit), paragraphs), os, texrow, runparams); @@ -388,7 +397,7 @@ TeXOnePar(Buffer const & buf, && !is_command) { if (!need_par) os << '{'; - os << "\\" << lyx::from_ascii(font.latexSize()) << " \\par}"; + os << "\\" << from_ascii(font.latexSize()) << " \\par}"; } else if (need_par) { os << "\\par}"; } else if (is_command) @@ -435,7 +444,7 @@ TeXOnePar(Buffer const & buf, && (boost::next(pit) == paragraphs.end() || !boost::next(pit)->hasSameLayout(*pit))) { - os << lyx::from_ascii(pit->params().spacing().writeEnvirEnd()) + os << from_ascii(pit->params().spacing().writeEnvirEnd()) << '\n'; texrow.newline(); } @@ -448,13 +457,13 @@ TeXOnePar(Buffer const & buf, // float. if (lyxrc.language_command_end.empty()) - os << lyx::from_ascii(subst( + os << from_ascii(subst( lyxrc.language_command_begin, "$$lang", doc_language->babel())) << endl; else - os << lyx::from_ascii(subst( + os << from_ascii(subst( lyxrc.language_command_end, "$$lang", language->babel())) @@ -473,6 +482,60 @@ TeXOnePar(Buffer const & buf, 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); + } + return ++pit; } @@ -523,18 +586,18 @@ void latexParagraphs(Buffer const & buf, was_title = true; if (tclass.titletype() == TITLE_ENVIRONMENT) { os << "\\begin{" - << lyx::from_ascii(tclass.titlename()) + << from_ascii(tclass.titlename()) << "}\n"; texrow.newline(); } } } else if (was_title && !already_title) { if (tclass.titletype() == TITLE_ENVIRONMENT) { - os << "\\end{" << lyx::from_ascii(tclass.titlename()) + os << "\\end{" << from_ascii(tclass.titlename()) << "}\n"; } else { - os << "\\" << lyx::from_ascii(tclass.titlename()) + os << "\\" << from_ascii(tclass.titlename()) << "\n"; } texrow.newline(); @@ -564,13 +627,16 @@ void latexParagraphs(Buffer const & buf, // It might be that we only have a title in this document if (was_title && !already_title) { if (tclass.titletype() == TITLE_ENVIRONMENT) { - os << "\\end{" << lyx::from_ascii(tclass.titlename()) + os << "\\end{" << from_ascii(tclass.titlename()) << "}\n"; } else { - os << "\\" << lyx::from_ascii(tclass.titlename()) + os << "\\" << from_ascii(tclass.titlename()) << "\n"; } texrow.newline(); } } + + +} // namespace lyx