commit e37e4f537c70d75835441d84bc327c56805ecc3e
Author: Günter Milde <[email protected]>
Date: Fri Oct 21 09:10:46 2016 +0200
Fix Ticket #9741 misleading name for font-encoding setting "default".
It would be nice, if the tooltip showed the value of
lyxrc.fontenc, but too complicated for my simple patch.
---
src/BufferParams.cpp | 4 ++--
src/frontends/qt4/GuiDocument.cpp | 17 +++++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 50870c5..906061a 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1647,7 +1647,7 @@ bool BufferParams::writeLaTeX(otexstream & os,
LaTeXFeatures & features,
<< from_ascii(fonts_default_family) << "}\n";
// set font encoding
- // XeTeX and LuaTeX (with OS fonts) do not need fontenc
+ // XeTeX and LuaTeX with Unicode fonts do not need fontenc
if (!useNonTeXFonts && !features.isProvided("fontenc")
&& font_encoding() != "default") {
// get main font encodings
@@ -2942,7 +2942,7 @@ vector<string> const BufferParams::font_encodings() const
vector<string> fontencs;
- // "default" means "no explicit font encoding"
+ // "default" means "no explicit font encoding, don't load fontenc.sty"
if (doc_fontenc != "default") {
fontencs = getVectorFromString(doc_fontenc);
if (!language->fontenc().empty()
diff --git a/src/frontends/qt4/GuiDocument.cpp
b/src/frontends/qt4/GuiDocument.cpp
index 2a40873..19fce60 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -859,9 +859,18 @@ GuiDocument::GuiDocument(GuiView & lv)
fontModule->fontsizeCO->addItem(qt_("11"));
fontModule->fontsizeCO->addItem(qt_("12"));
- fontModule->fontencCO->addItem(qt_("Default"), QString("global"));
+ fontModule->fontencCO->addItem(qt_("Global Default"),
QString("global"));
fontModule->fontencCO->addItem(qt_("Custom"), QString("custom"));
- fontModule->fontencCO->addItem(qt_("None (no fontenc)"),
QString("default"));
+ fontModule->fontencCO->addItem(qt_("TeX default (OT1, no fontenc)"),
QString("default"));
+ fontModule->fontencCO->setToolTip(
+ qt_("Select LaTeX font encoding(s).\n"
+ "The standard [Global Default] is "
+ "\"T1 via 'fontenc' package\" (see
Tools>Preferences>Output>LaTeX).\n"
+ "Notes:\n"
+ "TeX's default fonts (Computer Modern) are not
available "
+ "in T1 encoding, Latin Modern is the
recommended lookalike.\n"
+ "Font encodings for Greek and Cyrillic are
automatically added if required."
+ ));
for (int n = 0; GuiDocument::fontfamilies_gui[n][0]; ++n)
fontModule->fontsDefaultCO->addItem(
@@ -3060,7 +3069,7 @@ void GuiDocument::paramsToDialog()
biblioChanged_ = false;
// indices
- // We may be called when there is no Buffer, e.g., when
+ // We may be called when there is no Buffer, e.g., when
// the last view has just been closed.
bool const isReadOnly = isBufferAvailable() ? buffer().isReadonly() :
false;
indicesModule->update(bp_, isReadOnly);
@@ -3392,7 +3401,7 @@ void GuiDocument::paramsToDialog()
toqstr(bp_.fonts_cjk));
else
fontModule->cjkFontLE->setText(QString());
-
+
fontModule->microtypeCB->setChecked(bp_.use_microtype);
fontModule->fontScCB->setChecked(bp_.fonts_expert_sc);