Scons: update_po target, part one: language_l10n.pot

[lyx.git] / src / output_latex.C

diff --git a/src/output_latex.C b/src/output_latex.C
index e78773eea6862420ab9a675bdd53bfd8e168901b..a109c934b455da8c44deee79104097463dcc7bc6 100644 (file)
--- a/src/output_latex.C
+++ b/src/output_latex.C
@@ -83,10 +83,6 @@ TeXDeeper(Buffer const & buf,
 }
 
 
-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,
@@ -100,30 +96,30 @@ TeXEnvironment(Buffer const & buf,
 
        LyXLayout_ptr const & style = pit->layout();
 
-       Language const * language = pit->getParLanguage(bparams);
-       Language const * doc_language = bparams.language;
-       Language const * previous_language =
+       Language const * const par_language = pit->getParLanguage(bparams);
+       Language const * const doc_language = bparams.language;
+       Language const * const prev_par_language =
                (pit != paragraphs.begin())
                ? boost::prior(pit)->getParLanguage(bparams)
                : doc_language;
-       if (language->babel() != previous_language->babel()) {
+       if (par_language->babel() != prev_par_language->babel()) {
 
                if (!lyxrc.language_command_end.empty() &&
-                   previous_language->babel() != doc_language->babel()) {
+                   prev_par_language->babel() != doc_language->babel()) {
                        os << from_ascii(subst(
                                lyxrc.language_command_end,
                                "$$lang",
-                               previous_language->babel()))
+                               prev_par_language->babel()))
                           << '\n';
                        texrow.newline();
                }
 
                if (lyxrc.language_command_end.empty() ||
-                   language->babel() != doc_language->babel()) {
+                   par_language->babel() != doc_language->babel()) {
                        os << from_ascii(subst(
                                lyxrc.language_command_begin,
                                "$$lang",
-                               language->babel()))
+                               par_language->babel()))
                           << '\n';
                        texrow.newline();
                }
@@ -212,6 +208,8 @@ TeXEnvironment(Buffer const & buf,
        return par;
 }
 
+}
+
 
 int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
                      odocstream & os, OutputParams const & runparams, int number)
@@ -232,6 +230,8 @@ int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
 }
 
 
+namespace {
+
 ParagraphList::const_iterator
 TeXOnePar(Buffer const & buf,
          ParagraphList const & paragraphs,
@@ -255,14 +255,14 @@ TeXOnePar(Buffer const & buf,
        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 =
+       Language const * const par_language = pit->getParLanguage(bparams);
+       Language const * const doc_language = bparams.language;
+       Language const * const prev_par_language =
                (pit != paragraphs.begin())
                ? boost::prior(pit)->getParLanguage(bparams)
                : doc_language;
 
-       if (language->babel() != previous_language->babel()
+       if (par_language->babel() != prev_par_language->babel()
            // check if we already put language command in TeXEnvironment()
            && !(style->isEnvironment()
                 && (pit == paragraphs.begin() ||
@@ -271,45 +271,27 @@ TeXOnePar(Buffer const & buf,
                     || boost::prior(pit)->getDepth() < pit->getDepth())))
        {
                if (!lyxrc.language_command_end.empty() &&
-                   previous_language->babel() != doc_language->babel())
+                   prev_par_language->babel() != doc_language->babel())
                {
                        os << from_ascii(subst(lyxrc.language_command_end,
                                "$$lang",
-                               previous_language->babel()))
+                               prev_par_language->babel()))
                           << '\n';
                        texrow.newline();
                }
 
                if (lyxrc.language_command_end.empty() ||
-                   language->babel() != doc_language->babel())
+                   par_language->babel() != doc_language->babel())
                {
                        os << from_ascii(subst(
                                lyxrc.language_command_begin,
                                "$$lang",
-                               language->babel()))
+                               par_language->babel()))
                           << '\n';
                        texrow.newline();
                }
        }
 
-       LyXFont const outerfont =
-               outerFont(std::distance(paragraphs.begin(), pit),
-                         paragraphs);
-       // This must be identical to basefont in Paragraph::simpleTeXOnePar
-       LyXFont basefont = (pit->beginOfBody() > 0) ?
-                       pit->getLabelFont(bparams, outerfont) :
-                       pit->getLayoutFont(bparams, outerfont);
-       Encoding const & outer_encoding(*(outerfont.language()->encoding()));
-       // FIXME we switch from the outer encoding to the encoding of
-       // this paragraph, since I could not figure out the correct
-       // logic to take the encoding of the previous paragraph into
-       // account. This may result in some unneeded encoding changes.
-       if (switchEncoding(os, bparams, outer_encoding,
-                          *(basefont.language()->encoding()))) {
-               os << '\n';
-               texrow.newline();
-       }
-
        // In an inset with unlimited length (all in one row),
        // don't allow any special options in the paragraph
        if (!pit->forceDefaultParagraphs()) {
@@ -360,9 +342,14 @@ TeXOnePar(Buffer const & buf,
                break;
        }
 
+       LyXFont const outerfont =
+               outerFont(std::distance(paragraphs.begin(), pit),
+                         paragraphs);
+
        // FIXME UNICODE
        os << from_utf8(everypar);
        bool need_par = pit->simpleTeXOnePar(buf, bparams, outerfont,
+       //                                     *encoding,
                                             os, texrow, runparams);
 
        // Make sure that \\par is done with the font of the last
@@ -434,7 +421,7 @@ TeXOnePar(Buffer const & buf,
        }
 
        if (boost::next(pit) == paragraphs.end()
-           && language->babel() != doc_language->babel()) {
+           && par_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.
@@ -452,21 +439,15 @@ TeXOnePar(Buffer const & buf,
                        os << from_ascii(subst(
                                lyxrc.language_command_end,
                                "$$lang",
-                               language->babel()));
+                               par_language->babel()));
                pending_newline = true;
        }
 
-       // FIXME we switch from the encoding of this paragraph to the
-       // outer encoding, since I could not figure out the correct logic
-       // to take the encoding of the next paragraph into account.
-       // This may result in some unneeded encoding changes.
-       basefont = pit->getLayoutFont(bparams, outerfont);
-       switchEncoding(os, bparams, *(basefont.language()->encoding()),
-                      outer_encoding);
        if (pending_newline) {
                os << '\n';
                texrow.newline();
        }
+       runparams_in.encoding = runparams.encoding;
 
        // we don't need it for the last paragraph!!!
        // Note from JMarc: we will re-add a \n explicitely in
@@ -592,6 +573,7 @@ int switchEncoding(odocstream & os, BufferParams const & bparams,
        // only, but it is the best we can do.
        if ((bparams.inputenc == "auto" || bparams.inputenc == "default") &&
            oldEnc.name() != newEnc.name() &&
+           oldEnc.name() != "ascii" && newEnc.name() != "ascii" &&
            oldEnc.name() != "tis620-0" && newEnc.name() != "tis620-0") {
                lyxerr[Debug::LATEX] << "Changing LaTeX encoding from "
                                     << oldEnc.name() << " to "