{ "\\personal_dictionary", LyXRC::RC_PERS_DICT },
{ "\\plaintext_linelen", LyXRC::RC_PLAINTEXT_LINELEN },
{ "\\plaintext_roff_command", LyXRC::RC_PLAINTEXT_ROFF_COMMAND },
- { "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT },
- { "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING },
- { "\\popup_normal_font", LyXRC::RC_POPUP_NORMAL_FONT },
{ "\\preview", LyXRC::RC_PREVIEW },
{ "\\preview_hashed_labels", LyXRC::RC_PREVIEW_HASHED_LABELS },
{ "\\preview_scale_factor", LyXRC::RC_PREVIEW_SCALE_FACTOR },
{ "\\printer", LyXRC::RC_PRINTER },
{ "\\rtl", LyXRC::RC_RTL_SUPPORT },
{ "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
- { "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING },
- // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002
- { "\\screen_font_encoding_menu", LyXRC::RC_POPUP_FONT_ENCODING },
- // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002
- { "\\screen_font_menu", LyXRC::RC_POPUP_BOLD_FONT },
- // 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 },
roman_font_name = "";
sans_font_name = "";
typewriter_font_name = "";
- 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();
autosave = 300;
auto_region_delete = true;
auto_reset_options = false;
lexrc.setFile(filename);
if (!lexrc.isOK()) return -2;
- lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl;
+ LYXERR(Debug::LYXRC) << "Reading '" << filename << "'..." << endl;
return read(lexrc);
}
lexrc.setStream(is);
if (!lexrc.isOK()) return -2;
- lyxerr[Debug::LYXRC] << "Reading istream..." << endl;
+ LYXERR(Debug::LYXRC) << "Reading istream..." << endl;
return read(lexrc);
}
}
break;
- case RC_SCREEN_FONT_ENCODING:
- if (lexrc.next()) {
- font_norm = lexrc.getString();
- set_font_norm_type();
- }
- break;
-
- case RC_POPUP_BOLD_FONT:
- if (lexrc.next()) {
- popup_bold_font = lexrc.getString();
- }
- break;
-
- case RC_POPUP_NORMAL_FONT:
- if (lexrc.next()) {
- popup_normal_font = lexrc.getString();
- }
- break;
-
- case RC_POPUP_FONT_ENCODING:
- if (lexrc.next()) {
- popup_font_encoding = lexrc.getString();
- }
- break;
-
case RC_SET_COLOR:
{
string lyx_name, x11_name;
<< "# SCREEN & FONTS SECTION ############################\n"
<< "#\n\n";
- case RC_POPUP_NORMAL_FONT:
- if (ignore_system_lyxrc ||
- popup_normal_font != system_lyxrc.popup_normal_font) {
- os << "\\popup_normal_font \"" << popup_normal_font
- << "\"\n";
- }
- case RC_POPUP_BOLD_FONT:
- if (ignore_system_lyxrc ||
- popup_bold_font != system_lyxrc.popup_bold_font) {
- os << "\\popup_bold_font \"" << popup_bold_font
- << "\"\n";
- }
- case RC_POPUP_FONT_ENCODING:
- if (ignore_system_lyxrc ||
- popup_font_encoding != system_lyxrc.popup_font_encoding) {
- os << "\\popup_font_encoding \"" << popup_font_encoding
- << "\"\n";
- }
case RC_SCREEN_DPI:
if (ignore_system_lyxrc ||
dpi != system_lyxrc.dpi) {
<< convert<string>(use_scalable_fonts)
<< '\n';
}
- case RC_SCREEN_FONT_ENCODING:
- if (ignore_system_lyxrc ||
- font_norm != system_lyxrc.font_norm) {
- os << "\\screen_font_encoding \"" << font_norm
- << "\"\n";
- }
case RC_SCREEN_FONT_SIZES:
if (ignore_system_lyxrc ||
font_sizes[LyXFont::SIZE_TINY]
}
os << "\n#\n"
- << "# ASCII EXPORT SECTION ##############################\n"
+ << "# PLAIN TEXT EXPORT SECTION ##############################\n"
<< "#\n\n";
case RC_PLAINTEXT_ROFF_COMMAND:
os.flush();
}
-void LyXRC::set_font_norm_type()
-{
- if (font_norm == "iso10646-1")
- font_norm_type = ISO_10646_1;
- else if (font_norm == "iso8859-1")
- font_norm_type = ISO_8859_1;
- else if (font_norm == "iso8859-3")
- font_norm_type = ISO_8859_3;
- else if (font_norm == "iso8859-4")
- font_norm_type = ISO_8859_4;
- else if (font_norm == "iso8859-6.8x")
- font_norm_type = ISO_8859_6_8;
- else if (font_norm == "iso8859-9")
- font_norm_type = ISO_8859_9;
- else if (font_norm == "iso8859-15")
- font_norm_type = ISO_8859_15;
- else
- font_norm_type = OTHER_ENCODING;
-}
-
#if 0
string const LyXRC::getDescription(LyXRCTags tag)
break;
case RC_PLAINTEXT_LINELEN:
- str = _("This is the maximum line length of an exported text file (LaTeX, SGML or plain text). If set to 0, paragraphs are output in a single line; if the line length is != 0, paragraphs are separated by a blank line.");
+ str = _("The maximum line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line.");
break;
case RC_AUTOREGIONDELETE:
str = _("Specify an alternate personal dictionary file. E.g. \".ispell_english\".");
break;
- case RC_POPUP_BOLD_FONT:
- str = _("The bold font in the dialogs.");
- break;
-
- case RC_POPUP_FONT_ENCODING:
- str = _("The encoding for the menu/popups fonts.");
- break;
-
- case RC_POPUP_NORMAL_FONT:
- str = _("The normal font in the dialogs.");
- break;
-
case RC_PREVIEW:
str = _("Shows a typeset preview of things such as math");
break;
str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
break;
- case RC_SCREEN_FONT_ENCODING:
- str = _("The encoding for the screen fonts.");
- break;
-
case RC_SCREEN_FONT_ROMAN:
case RC_SCREEN_FONT_SANS:
case RC_SCREEN_FONT_TYPEWRITER:
projects / lyx.git / blobdiff