commit 094341fa5a9597775a7adae723223e7580ab6b3a
Author: Juergen Spitzmueller <[email protected]>
Date: Wed Aug 9 17:25:02 2017 +0200
Fix straight quote character in non-T1 encoding
Fixes: #10584
---
src/Paragraph.cpp | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 7c3300d..309c20c 100644
--- 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);
}
}