anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix Ticket #9741 misleading name for font-encoding setting "default"."

Browse Source 
This reverts commit e37e4f537c.

The issue still needs discussion.
This commit is contained in:
Juergen Spitzmueller 2016-10-23 17:20:58 +02:00
parent f6104fa1ca
commit e335c764b4
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BufferParams.cpp
View File

@ -1647,7 +1647,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
<< from_ascii(fonts_default_family) << "}\n";
// set font encoding
// XeTeX and LuaTeX with Unicode fonts do not need fontenc
// XeTeX and LuaTeX (with OS 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, don't load fontenc.sty"
// "default" means "no explicit font encoding"
if (doc_fontenc != "default") {
fontencs = getVectorFromString(doc_fontenc);
if (!language->fontenc().empty()

17
src/frontends/qt4/GuiDocument.cpp
View File

@ -859,18 +859,9 @@ GuiDocument::GuiDocument(GuiView & lv)
fontModule->fontsizeCO->addItem(qt_("11"));
fontModule->fontsizeCO->addItem(qt_("12"));
fontModule->fontencCO->addItem(qt_("Global Default"), QString("global"));
fontModule->fontencCO->addItem(qt_("Default"), QString("global"));
fontModule->fontencCO->addItem(qt_("Custom"), QString("custom"));
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."
));
fontModule->fontencCO->addItem(qt_("None (no fontenc)"), QString("default"));
for (int n = 0; GuiDocument::fontfamilies_gui[n][0]; ++n)
fontModule->fontsDefaultCO->addItem(
@ -3069,7 +3060,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);
@ -3401,7 +3392,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);