Use ASCII number in \char definition

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index ba101e4eb277ac782a436a789c1d297710497f9d..0ae8291a05b3fe4728ae920eda3ae90c28eb2206 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -562,10 +562,10 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner,
 }
 
 
-void Paragraph::addChangesToToc(DocIterator const & cdit,
-       Buffer const & buf, bool output_active) const
+void Paragraph::addChangesToToc(DocIterator const & cdit, Buffer const & buf,
+                                bool output_active, TocBackend & backend) const
 {
-       d->changes_.addToToc(cdit, buf, output_active);
+       d->changes_.addToToc(cdit, buf, output_active, backend);
 }
 
 
@@ -1187,8 +1187,10 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
        // NOTE: Some languages reset the font encoding internally to a
        //       non-standard font encoding. If we are using such a language,
        //       we do not output special T1 chars.
+       // NOTE: XeTeX and LuaTeX use OT1 (pre 2017) or TU (as of 2017) encoding
        if (!runparams.inIPA && !running_font.language()->internalFontEncoding()
-           && bparams.font_encoding() == "T1" && latexSpecialT1(c, os, i, column))
+           && !runparams.isFullUnicode() && bparams.font_encoding() == "T1"
+           && latexSpecialT1(c, os, i, column))
                return;
 
        // Otherwise, we use what LaTeX provides us.
@@ -1223,7 +1225,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
                }
                break;
        case '\"':
-               os << "\\char`\\\"" << termcmd;
+               os << "\\char34" << termcmd;
                column += 9;
                break;
 
@@ -1948,7 +1950,7 @@ depth_type Paragraph::getMaxDepthAfter() const
 }
 
 
-char Paragraph::getAlign() const
+LyXAlignment Paragraph::getAlign() const
 {
        if (d->params_.align() == LYX_ALIGN_LAYOUT)
                return d->layout_->align;
@@ -3333,11 +3335,11 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options, const Out
 
 
 void Paragraph::forOutliner(docstring & os, size_t const maxlen,
-                                                       bool const shorten) const
+                            bool const shorten, bool const label) const
 {
        size_t tmplen = shorten ? maxlen + 1 : maxlen;
-       if (!d->params_.labelString().empty())
-               os += d->params_.labelString() + ' ';
+       if (label && !labelString().empty())
+               os += labelString() + ' ';
        for (pos_type i = 0; i < size() && os.length() < tmplen; ++i) {
                if (isDeleted(i))
                        continue;