* p ,,polish''
* f <<french>>
* a >>danish<<
+ * q "plain"
*/
-char const * const style_char = "esgpfa";
+char const * const style_char = "esgpfaq";
char const * const side_char = "lr" ;
char const * const level_char = "sd";
// List of known quote chars
-char const * const quote_char = ",'`<>";
+char const * const quote_char = ",'`<>\"";
// Unicode characters needed by each quote type
-char_type const display_quote_char[2][5] = {
- { 0x201a, 0x2019, 0x2018, 0x2039, 0x203a},
- { 0x201e, 0x201d, 0x201c, 0x00ab, 0x00bb}
+char_type const display_quote_char[2][6] = {
+ { 0x201a, 0x2019, 0x2018, 0x2039, 0x203a, 0x0027},
+ { 0x201e, 0x201d, 0x201c, 0x00ab, 0x00bb, 0x0022}
};
// Index of chars used for the quote. Index is [side, style]
-int quote_index[2][6] = {
- { 2, 1, 0, 0, 3, 4 }, // "'',,<>"
- { 1, 1, 2, 1, 4, 3 } // "`'`'><"
+int quote_index[2][7] = {
+ { 2, 1, 0, 0, 3, 4, 5 }, // { ` ' , , < > \" }
+ { 1, 1, 2, 1, 4, 3, 5 } // { ' ' ` ' > < \" }
};
// Corresponding LaTeX code, for double and single quotes.
-char const * const latex_quote_t1[2][5] = {
+char const * const latex_quote_t1[2][6] = {
{ "\\quotesinglbase", "'", "`",
- "\\guilsinglleft", "\\guilsinglright" },
- { ",,", "''", "``", "<<", ">>" }
+ "\\guilsinglleft", "\\guilsinglright", "\\textquotesingle" },
+ { ",,", "''", "``", "<<", ">>", "\\textquotedbl" }
};
-char const * const latex_quote_ot1[2][5] = {
+char const * const latex_quote_ot1[2][6] = {
{ "\\quotesinglbase", "'", "`",
- "\\guilsinglleft", "\\guilsinglright" },
+ "\\guilsinglleft", "\\guilsinglright", "\\textquotesingle" },
{ "\\quotedblbase", "''", "``",
- "\\guillemotleft", "\\guillemotright" }
+ "\\guillemotleft", "\\guillemotright", "\\textquotedbl" }
};
-char const * const latex_quote_noligatures[2][5] = {
+char const * const latex_quote_noligatures[2][6] = {
{ "\\quotesinglbase", "\\textquoteleft", "\\textquoteright",
- "\\guilsinglleft", "\\guilsinglright" },
+ "\\guilsinglleft", "\\guilsinglright", "\\textquotesingle" },
{ "\\quotedblbase", "\\textquotedblleft", "\\textquotedblright",
- "\\guillemotleft", "\\guillemotright" }
+ "\\guillemotleft", "\\guillemotright", "\\textquotedbl" }
};
-char const * const latex_quote_babel[2][5] = {
- { "\\glq", "'", "`", "\\flq", "\\frq" },
- { "\\glqq", "''", "``", "\\flqq", "\\frqq" }
+char const * const latex_quote_babel[2][6] = {
+ { "\\glq", "'", "`", "\\flq", "\\frq", "\\textquotesingle" },
+ { "\\glqq", "''", "``", "\\flqq", "\\frqq", "\\textquotedbl" }
};
-char const * const html_quote[2][5] = {
+char const * const html_quote[2][6] = {
{ "‚", "’", "‘",
- "‹", "›" },
- { "„", "”", "“", "«", "»" }
+ "‹", "›", "'" },
+ { "„", "”", "“", "«", "»", """ }
};
} // namespace anon
// '.' wildcard means: keep current stylee
if (!allow_wildcards || str[0] != '.') {
- for (i = 0; i < 6; ++i) {
+ for (i = 0; i < 7; ++i) {
if (str[0] == style_char[i]) {
style_ = QuoteStyle(i);
break;
}
}
- if (i >= 6) {
+ if (i >= 7) {
lyxerr << "ERROR (InsetQuotes::InsetQuotes):"
" bad style specification." << endl;
style_ = EnglishQuotes;
qs = FrenchQuotes;
else if (s == "danish")
qs = DanishQuotes;
+ else if (s == "plain")
+ qs = PlainQuotes;
return qs;
}
string type;
// get all quote types
- for (sty = 0; sty < 6; ++sty) {
+ for (sty = 0; sty < 7; ++sty) {
style = QuoteStyle(sty);
for (sid = 0; sid < 2; ++sid) {
side = QuoteSide(sid);
docstring retdisp = docstring(1, display_quote_char[level_][index]);
// in French, thin spaces are added inside double guillemets
- // FIXME: this should be done by a separate quote type.
if (prefixIs(context_lang_, "fr")
&& level_ == DoubleQuotes && style_ == FrenchQuotes) {
// THIN SPACE (U+2009)
// In pass-thru context, we output plain quotes
if (runparams.pass_thru)
qstr = (level_ == DoubleQuotes) ? from_ascii("\"") : from_ascii("'");
+ else if (style_ == PlainQuotes && runparams.isFullUnicode()) {
+ // For XeTeX and LuaTeX,we need to disable mapping to get straight
+ // quotes. We define our own commands that do this
+ qstr = (level_ == DoubleQuotes) ?
+ from_ascii("\\textquotedblplain") : from_ascii("\\textquotesingleplain");
+ }
else if (runparams.use_polyglossia) {
// For polyglossia, we directly output the respective unicode chars
// (spacing and kerning is then handled respectively)
const int quoteind = quote_index[side_][style_];
docstring res = from_ascii(html_quote[level_][quoteind]);
// in French, thin spaces are added inside double guillemets
- // FIXME: this should be done by a separate quote type.
if (prefixIs(context_lang_, "fr")
&& level_ == DoubleQuotes && style_ == FrenchQuotes) {
// THIN SPACE (U+2009)
#else
if (!features.useBabel()
#endif
- && !features.usePolyglossia() && fontenc_ != "T1") {
+ && !features.runparams().isFullUnicode() && fontenc_ != "T1") {
if (level_ == SingleQuotes)
switch (type) {
- case ',': features.require("quotesinglbase"); break;
- case '<': features.require("guilsinglleft"); break;
- case '>': features.require("guilsinglright"); break;
- default: break;
+ case ',':
+ features.require("quotesinglbase");
+ break;
+ case '<':
+ features.require("guilsinglleft");
+ break;
+ case '>':
+ features.require("guilsinglright");
+ break;
+ default:
+ break;
}
else
switch (type) {
- case ',': features.require("quotedblbase"); break;
- case '<': features.require("guillemotleft"); break;
- case '>': features.require("guillemotright"); break;
- default: break;
+ case ',':
+ features.require("quotedblbase");
+ break;
+ case '<':
+ features.require("guillemotleft");
+ break;
+ case '>':
+ features.require("guillemotright");
+ break;
+ default:
+ break;
}
}
+ if (type == '"') {
+ switch (level_) {
+ case SingleQuotes: {
+ if (features.runparams().isFullUnicode())
+ features.require("textquotesinglep");
+ else
+ features.require("textcomp");
+ break;
+ }
+ case DoubleQuotes: {
+ if (features.runparams().isFullUnicode())
+ features.require("textquotedblp");
+ else if (fontenc_ != "T1")
+ features.require("textquotedbl");
+ break;
+ default:
+ break;
+ }
+ }
+ }
}
projects / features.git / commitdiff