Revert commits from 36745

[features.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 326c5c98138fab76f05522eaa70bac27ff11b5fd..4d31441d4f37ab848600667d51bb39e00e2446fa 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1328,20 +1328,35 @@ bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
 void Paragraph::Private::validate(LaTeXFeatures & features) const
 {
        if (layout_->inpreamble && inset_owner_) {
+               bool const is_command = layout_->latextype == LATEX_COMMAND;
                Buffer const & buf = inset_owner_->buffer();
                BufferParams const & bp = buf.params();
                Font f;
                TexRow tr;
+               // Using a string stream here circumvents the encoding
+               // switching machinery of odocstream. Therefore the
+               // output is wrong if this paragraph contains content
+               // that needs to switch encoding.
                odocstringstream ods;
-               // we have to provide all the optional arguments here, even though
-               // the last one is the only one we care about.
+               if (is_command) {
+                       ods << '\\' << from_ascii(layout_->latexname());
+                       // we have to provide all the optional arguments here, even though
+                       // the last one is the only one we care about.
+                       // Separate handling of optional argument inset.
+                       if (layout_->optargs != 0 || layout_->reqargs != 0)
+                               latexArgInsets(*owner_, ods, features.runparams(),
+                                                                                        layout_->reqargs, layout_->optargs);
+                       else
+                               ods << from_ascii(layout_->latexparam());
+               }
+               docstring::size_type const length = ods.str().length();
+               // this will output "{" at the beginning, but not at the end
                owner_->latex(bp, f, ods, tr, features.runparams(), 0, -1, true);
-               docstring const d = ods.str();
-               if (!d.empty()) {
-                       // this will have "{" at the beginning, but not at the end
-                       string const content = to_utf8(d);
-                       string const cmd = layout_->latexname();
-                       features.addPreambleSnippet("\\" + cmd + content + "}");
+               if (ods.str().length() > length) {
+                       if (is_command)
+                               ods << '}';
+                       string const snippet = to_utf8(ods.str());
+                       features.addPreambleSnippet(snippet);
                }
        }
 
@@ -2369,12 +2384,16 @@ void Paragraph::latex(BufferParams const & bparams,
                        open_font = false;
                }
 
+               string const running_lang = runparams.use_polyglossia ?
+                       running_font.language()->polyglossia() : running_font.language()->babel();
                // close babel's font environment before opening CJK.
-               if (!running_font.language()->babel().empty() &&
+               string const lang_end_command = runparams.use_polyglossia ?
+                       "\\end{$$lang}" : lyxrc.language_command_end;
+               if (!running_lang.empty() &&
                    font.language()->encoding()->package() == Encoding::CJK) {
-                               string end_tag = subst(lyxrc.language_command_end,
+                               string end_tag = subst(lang_end_command,
                                                        "$$lang",
-                                                       running_font.language()->babel());
+                                                       running_lang);
                                os << from_ascii(end_tag);
                                column += end_tag.length();
                }
@@ -2512,7 +2531,7 @@ void Paragraph::latex(BufferParams const & bparams,
        if (allowcust && d->endTeXParParams(bparams, os, texrow, runparams)
            && runparams.encoding != prev_encoding) {
                runparams.encoding = prev_encoding;
-               if (!bparams.useXetex)
+               if (!runparams.isFullUnicode())
                        os << setEncoding(prev_encoding->iconvName());
        }
 
@@ -2755,7 +2774,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
                                // We don't want to escape the entities. Note that
                                // it is safe to do this, since str can otherwise
                                // only be "-". E.g., it can't be "<".
-                               xs << XHTMLStream::NextRaw() << str;
+                               xs << XHTMLStream::ESCAPE_NONE << str;
                        } else
                                xs << c;
                }
@@ -3071,7 +3090,7 @@ int Paragraph::checkBiblio(Buffer const & buffer)
 {
        // FIXME From JS:
        // This is getting more and more a mess. ...We really should clean
-       // up this bibitem issue for 1.6. See also bug 2743.
+       // up this bibitem issue for 1.6.
 
        // Add bibitem insets if necessary
        if (d->layout_->labeltype != LABEL_BIBLIO)