{ "\\make_backup", LyXRC::RC_MAKE_BACKUP },
{ "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
- { "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS },
{ "\\personal_dictionary", LyXRC::RC_PERS_DICT },
{ "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT },
{ "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING },
// compatibility with versions older than 1.2.0 only Angus 10 Jan 2002
{ "\\screen_font_popup", LyXRC::RC_POPUP_NORMAL_FONT },
{ "\\screen_font_roman", LyXRC::RC_SCREEN_FONT_ROMAN },
+ { "\\screen_font_roman_foundry", LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY },
{ "\\screen_font_sans", LyXRC::RC_SCREEN_FONT_SANS },
+ { "\\screen_font_sans_foundry", LyXRC::RC_SCREEN_FONT_SANS_FOUNDRY },
{ "\\screen_font_scalable", LyXRC::RC_SCREEN_FONT_SCALABLE },
{ "\\screen_font_sizes", LyXRC::RC_SCREEN_FONT_SIZES },
{ "\\screen_font_typewriter", LyXRC::RC_SCREEN_FONT_TYPEWRITER },
+ { "\\screen_font_typewriter_foundry", LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY },
{ "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM },
{ "\\serverpipe", LyXRC::RC_SERVERPIPE },
{ "\\set_color", LyXRC::RC_SET_COLOR },
dpi = 75;
// Because a screen typically is wider than a piece of paper:
zoom = 150;
- wheel_jump = 100;
+ wheel_jump = 5;
// Default LaTeX font size:
font_sizes[LyXFont::SIZE_TINY] = 5.0;
font_sizes[LyXFont::SIZE_SCRIPT] = 7.0;
font_sizes[LyXFont::SIZE_HUGE] = 20.74;
font_sizes[LyXFont::SIZE_HUGER] = 24.88;
use_scalable_fonts = true;
- roman_font_name = "-*-times";
- sans_font_name = "-*-helvetica";
- typewriter_font_name = "-*-courier";
+ roman_font_name = "times";
+ sans_font_name = "helvetica";
+ typewriter_font_name = "courier";
popup_bold_font = "-*-helvetica-bold-r";
popup_normal_font = "-*-helvetica-medium-r";
font_norm = "iso8859-1";
font_norm_type = ISO_8859_1;
popup_font_encoding.erase();
- override_x_deadkeys = true;
autosave = 300;
auto_region_delete = true;
auto_reset_options = false;
}
+namespace {
+
+void oldFontFormat(string & family, string & foundry)
+{
+ if (family.empty() || family[0] != '-')
+ return;
+ foundry = token(family, '-', 1);
+ family = token(family, '-', 2);
+ if (foundry == "*")
+ foundry.erase();
+}
+
+} // namespace anon
+
+
int LyXRC::read(string const & filename)
{
LyXLex lexrc(lyxrcTags, lyxrcCount);
case RC_SCREEN_FONT_ROMAN:
if (lexrc.next()) {
roman_font_name = lexrc.getString();
+ oldFontFormat(roman_font_name,
+ roman_font_foundry);
}
break;
case RC_SCREEN_FONT_SANS:
if (lexrc.next()) {
sans_font_name = lexrc.getString();
+ oldFontFormat(sans_font_name, sans_font_foundry);
}
break;
case RC_SCREEN_FONT_TYPEWRITER:
if (lexrc.next()) {
typewriter_font_name = lexrc.getString();
+ oldFontFormat(typewriter_font_name,
+ typewriter_font_foundry);
+ }
+ break;
+
+ case RC_SCREEN_FONT_ROMAN_FOUNDRY:
+ if (lexrc.next()) {
+ roman_font_foundry = lexrc.getString();
+ }
+ break;
+
+ case RC_SCREEN_FONT_SANS_FOUNDRY:
+ if (lexrc.next()) {
+ sans_font_foundry = lexrc.getString();
+ }
+ break;
+
+ case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY:
+ if (lexrc.next()) {
+ typewriter_font_foundry = lexrc.getString();
}
break;
if (lexrc.next()) {
x11_name = lexrc.getString();
} else {
- lexrc.printError("Missing color name for color : `$$Token'");
+ lexrc.printError("Missing color name for color: `$$Token'");
break;
}
}
break;
}
- case RC_OVERRIDE_X_DEADKEYS:
- if (lexrc.next()) {
- override_x_deadkeys = lexrc.getBool();
- }
- break;
-
case RC_SERVERPIPE:
if (lexrc.next()) {
lyxpipes = ExpandPath(lexrc.getString());
os << "\\screen_font_roman \"" << roman_font_name
<< "\"\n";
}
+ case RC_SCREEN_FONT_ROMAN_FOUNDRY:
+ if (roman_font_foundry != system_lyxrc.roman_font_foundry) {
+ os << "\\screen_font_roman_foundry \"" << roman_font_foundry
+ << "\"\n";
+ }
case RC_SCREEN_FONT_SANS:
if (sans_font_name != system_lyxrc.sans_font_name) {
os << "\\screen_font_sans \"" << sans_font_name
<< "\"\n";
}
+ case RC_SCREEN_FONT_SANS_FOUNDRY:
+ if (sans_font_foundry != system_lyxrc.sans_font_foundry) {
+ os << "\\screen_font_sans_foundry \"" << sans_font_foundry
+ << "\"\n";
+ }
case RC_SCREEN_FONT_TYPEWRITER:
if (typewriter_font_name != system_lyxrc.typewriter_font_name) {
os << "\\screen_font_typewriter \""
<< typewriter_font_name << "\"\n";
}
+ case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY:
+ if (typewriter_font_foundry != system_lyxrc.typewriter_font_foundry) {
+ os << "\\screen_font_typewriter_foundry \""
+ << typewriter_font_foundry << "\"\n";
+ }
+
case RC_SCREEN_FONT_SCALABLE:
if (use_scalable_fonts != system_lyxrc.use_scalable_fonts) {
os << "\\screen_font_scalable "
<< "# 2nd MISC SUPPORT SECTION ##########################\n"
<< "#\n\n";
- case RC_OVERRIDE_X_DEADKEYS:
- if (override_x_deadkeys != system_lyxrc.override_x_deadkeys) {
- os << "\\override_x_deadkeys "
- << tostr(override_x_deadkeys) << '\n';
- }
case RC_AUTO_NUMBER:
if (auto_number != system_lyxrc.auto_number) {
os << "\\auto_number " << tostr(auto_number) << '\n';
break;
case RC_DOCUMENTPATH:
- str = _("The default path for your documents. An empty value selects the directory LyX was started from.");
+ str = _("The default path for your documents. An empty value selects the directory LyX was started from.");
break;
case RC_TEMPLATEPATH:
- str = _("The path that LyX will set when offering to choose a template. An empty value selects the directory LyX was started from.");
+ str = _("The path that LyX will set when offering to choose a template. An empty value selects the directory LyX was started from.");
break;
case RC_TEMPDIRPATH:
str = _("De-select if you don't want the class options to be reset to defaults after class change.");
break;
- case RC_OVERRIDE_X_DEADKEYS:
- str = _("Select if LyX is to take over the handling of the dead keys (a.k.a. accent keys) that may be defined for your keyboard.");
- break;
-
-
case RC_SERVERPIPE:
str = _("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users.");
break;
break;
case RC_UIFILE:
- str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories.");
+ str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories.");
break;
case RC_KBMAP:
break;
case RC_ASCIIROFF_COMMAND:
- str = _("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used.");
+ str = _("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used.");
break;
case RC_ASCII_LINELEN:
break;
case RC_LANGUAGE_PACKAGE:
- str = _("The latex command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
+ str = _("The LaTeX command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
break;
case RC_LANGUAGE_GLOBAL_OPTIONS:
break;
case RC_LANGUAGE_COMMAND_BEGIN:
- str = _("The latex command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
+ str = _("The LaTeX command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
break;
case RC_LANGUAGE_COMMAND_END:
- str = _("The latex command for changing back to the language of the document.");
+ str = _("The LaTeX command for changing back to the language of the document.");
break;
case RC_LANGUAGE_COMMAND_LOCAL:
- str = _("The latex command for local changing of the language.");
+ str = _("The LaTeX command for local changing of the language.");
break;
case RC_DATE_INSERT_FORMAT:
break;
case RC_WHEEL_JUMP:
- str = _("The wheel movement factor (for mice with wheels or five button mice).");
+ str = _("The number of lines that are scrolled by mice with wheels or five button mice.");
break;
case RC_CONVERTER:
projects / lyx.git / blobdiff