Fix straight quote character in non-T1 encoding

Fixes: #10584

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 7c3300d601f8bdfe016b6c44bcf88c1badf25904..309c20caffc442873690df490b044340bd997236 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1247,8 +1247,8 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
                }
                break;
        case '\"':
-               os << "\\char34" << termcmd;
-               column += 9;
+               os << "\\textquotedbl" << termcmd;
+               column += 14;
                break;
 
        case '$': case '&':
@@ -1499,8 +1499,16 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
        }
 
        // then the contents
+       BufferParams const bp = features.buffer().masterParams();
        for (pos_type i = 0; i < int(text_.size()) ; ++i) {
-               BufferEncodings::validate(text_[i], features);
+               char_type c = text_[i];
+               if (c == 0x0022) {
+                       if (features.runparams().isFullUnicode() && bp.useNonTeXFonts)
+                               features.require("textquotedblp");
+                       else if (bp.main_font_encoding() != "T1")
+                               features.require("textquotedbl");
+               }
+               BufferEncodings::validate(c, features);
        }
 }