anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not use babel quotation mark macros with non-TeX fonts

Browse Source 
These rely on [O]T1 font encoding.

Also, add some comments.
This commit is contained in:
Juergen Spitzmueller 2016-12-10 17:25:04 +01:00
parent 449a89825b
commit dc38b66e60
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/insets/InsetQuotes.cpp
View File

@ -266,20 +266,27 @@ void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const
else if (language_ == FrenchQuotes && times_ == DoubleQuotes else if (language_ == FrenchQuotes && times_ == DoubleQuotes
&& prefixIs(runparams.local_font->language()->code(), "fr") && prefixIs(runparams.local_font->language()->code(), "fr")
&& !runparams.use_polyglossia) { && !runparams.use_polyglossia) {
// Specific guillemets of French babel
// including correct French spacing
if (side_ == LeftQuote) if (side_ == LeftQuote)
qstr = "\\og "; //the spaces are important here qstr = "\\og "; //the spaces are important here
else else
qstr = " \\fg{}"; //and here qstr = " \\fg{}"; //and here
} else if (fontenc_ == "T1" && !runparams.use_polyglossia) { } else if (fontenc_ == "T1" && !runparams.use_polyglossia) {
// Quotation marks for T1 font encoding
// (using ligatures)
qstr = latex_quote_t1[times_][quoteind]; qstr = latex_quote_t1[times_][quoteind];
#ifdef DO_USE_DEFAULT_LANGUAGE #ifdef DO_USE_DEFAULT_LANGUAGE
} else if (doclang == "default") { } else if (doclang == "default") {
#else #else
} else if (!runparams.use_babel) { } else if (!runparams.use_babel || runparams.isFullUnicode()) {
#endif #endif
// these are also used by polyglossia // Standard quotation mark macros
// These are also used by polyglossia
// and babel without fontenc (XeTeX/LuaTeX)
qstr = latex_quote_ot1[times_][quoteind]; qstr = latex_quote_ot1[times_][quoteind];
} else { } else {
// Babel shorthand quotation marks (for T1/OT1)
qstr = latex_quote_babel[times_][quoteind]; qstr = latex_quote_babel[times_][quoteind];
} }