#include "LyXRC.h"
-#include "debug.h"
+#include "support/debug.h"
+#include "Color.h"
#include "Converter.h"
#include "Format.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "Session.h"
-#include "Color.h"
#include "Lexer.h"
-#include "Font.h"
+#include "FontEnums.h"
#include "Mover.h"
#include "graphics/GraphicsTypes.h"
#include "support/os.h"
#include "support/userinfo.h"
+using namespace std;
+using namespace lyx::support;
namespace lyx {
namespace os = support::os;
-using support::ascii_lowercase;
-using support::bformat;
-using support::expandPath;
-using support::FileName;
-using support::getEnv;
-using support::libFileSearch;
-using support::token;
-
-using std::cout;
-using std::endl;
-
-using std::ios;
-using std::ofstream;
-using std::ostream;
-using std::string;
-
-
namespace {
// when adding something to this array keep it sorted!
keyword_item lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
+ { "\\allow_geometry_session", LyXRC::RC_GEOMETRY_SESSION },
{ "\\alternate_language", LyXRC::RC_ALT_LANG },
{ "\\auto_number", LyXRC::RC_AUTO_NUMBER },
{ "\\auto_region_delete", LyXRC::RC_AUTOREGIONDELETE },
{ "\\custom_export_command", LyXRC::RC_CUSTOM_EXPORT_COMMAND },
{ "\\custom_export_format", LyXRC::RC_CUSTOM_EXPORT_FORMAT },
{ "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT },
+ { "\\def_file", LyXRC::RC_DEFFILE },
{ "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE },
{ "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE },
{ "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN },
{ "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
{ "\\document_path", LyXRC::RC_DOCUMENTPATH },
{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
+ { "\\example_path", LyXRC::RC_EXAMPLEPATH },
{ "\\font_encoding", LyXRC::RC_FONT_ENCODING },
{ "\\format", LyXRC::RC_FORMAT },
{ "\\index_command", LyXRC::RC_INDEX_COMMAND },
{ "\\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_geometry_height", LyXRC::RC_SCREEN_GEOMETRY_HEIGHT },
- { "\\screen_geometry_width", LyXRC::RC_SCREEN_GEOMETRY_WIDTH },
- { "\\screen_geometry_xysaved", LyXRC::RC_SCREEN_GEOMETRY_XYSAVED },
{ "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM },
{ "\\serverpipe", LyXRC::RC_SERVERPIPE },
{ "\\set_color", LyXRC::RC_SET_COLOR },
{ "\\show_banner", LyXRC::RC_SHOW_BANNER },
+ { "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS },
{ "\\spell_command", LyXRC::RC_SPELL_COMMAND },
{ "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
{ "\\template_path", LyXRC::RC_TEMPLATEPATH },
{ "\\use_input_encoding", LyXRC::RC_USE_INP_ENC },
{ "\\use_lastfilepos", LyXRC::RC_USELASTFILEPOS },
{ "\\use_personal_dictionary", LyXRC::RC_USE_PERS_DICT },
+ { "\\use_pixmap_cache", LyXRC::RC_USE_PIXMAP_CACHE },
// compatibility with versions older than 1.4.0 only
{ "\\use_pspell", LyXRC::RC_USE_SPELL_LIB },
{ "\\use_spell_lib", LyXRC::RC_USE_SPELL_LIB },
// compatibility with versions older than 1.4.0 only
{ "\\use_tempdir", LyXRC::RC_USETEMPDIR },
+ { "\\use_tooltip", LyXRC::RC_USE_TOOLTIP },
{ "\\user_email", LyXRC::RC_USER_EMAIL },
{ "\\user_name", LyXRC::RC_USER_NAME },
{ "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
// compatibility with versions older than 1.4.0 only
- { "\\viewer" ,LyXRC::RC_VIEWER}
+ { "\\viewer", LyXRC::RC_VIEWER}
};
const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
void LyXRC::setDefaults() {
bind_file = "cua";
+ def_file = "default";
ui_file = "default";
// Get printer from the environment. If fail, use default "",
// assuming that everything is set up correctly.
dpi = 75;
// Because a screen typically is wider than a piece of paper:
zoom = 150;
- geometry_width = 0;
- geometry_height = 0;
- geometry_xysaved = true;
+ allow_geometry_session = true;
// Default LaTeX font size:
- font_sizes[Font::SIZE_TINY] = "5.0";
- font_sizes[Font::SIZE_SCRIPT] = "7.0";
- font_sizes[Font::SIZE_FOOTNOTE] = "8.0";
- font_sizes[Font::SIZE_SMALL] = "9.0";
- font_sizes[Font::SIZE_NORMAL] = "10.0";
- font_sizes[Font::SIZE_LARGE] = "12.0";
- font_sizes[Font::SIZE_LARGER] = "14.4";
- font_sizes[Font::SIZE_LARGEST] = "17.26";
- font_sizes[Font::SIZE_HUGE] = "20.74";
- font_sizes[Font::SIZE_HUGER] = "24.88";
+ font_sizes[FONT_SIZE_TINY] = "5.0";
+ font_sizes[FONT_SIZE_SCRIPT] = "7.0";
+ font_sizes[FONT_SIZE_FOOTNOTE] = "8.0";
+ font_sizes[FONT_SIZE_SMALL] = "9.0";
+ font_sizes[FONT_SIZE_NORMAL] = "10.0";
+ font_sizes[FONT_SIZE_LARGE] = "12.0";
+ font_sizes[FONT_SIZE_LARGER] = "14.4";
+ font_sizes[FONT_SIZE_LARGEST] = "17.26";
+ font_sizes[FONT_SIZE_HUGE] = "20.74";
+ font_sizes[FONT_SIZE_HUGER] = "24.88";
use_scalable_fonts = true;
roman_font_name = "";
sans_font_name = "";
language_package = "\\usepackage{babel}";
language_command_begin = "\\selectlanguage{$$lang}";
language_command_local = "\\foreignlanguage{$$lang}{";
+ sort_layouts = false;
default_language = "english";
show_banner = true;
windows_style_tex_paths = false;
preview_hashed_labels = false;
preview_scale_factor = "0.9";
use_converter_cache = true;
+ use_tooltip = true;
+ use_pixmap_cache = false;
converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
user_name = to_utf8(support::user_name());
lexrc.setFile(filename);
if (!lexrc.isOK()) return -2;
- LYXERR(Debug::LYXRC) << "Reading '" << filename << "'..." << endl;
+ LYXERR(Debug::LYXRC, "Reading '" << filename << "'...");
return read(lexrc);
}
-int LyXRC::read(std::istream & is)
+int LyXRC::read(istream & is)
{
Lexer lexrc(lyxrcTags, lyxrcCount);
if (lyxerr.debugging(Debug::PARSER))
lexrc.setStream(is);
if (!lexrc.isOK()) return -2;
- LYXERR(Debug::LYXRC) << "Reading istream..." << endl;
+ LYXERR(Debug::LYXRC, "Reading istream...");
return read(lexrc);
}
}
break;
+ case RC_DEFFILE:
+ if (lexrc.next()) {
+ def_file = os::internal_path(lexrc.getString());
+ }
+ break;
+
case RC_UIFILE:
if (lexrc.next()) {
ui_file = os::internal_path(lexrc.getString());
}
break;
- case RC_SCREEN_GEOMETRY_HEIGHT:
- if (lexrc.next()) {
- geometry_height = lexrc.getInteger();
- }
- break;
-
- case RC_SCREEN_GEOMETRY_WIDTH:
+ case RC_GEOMETRY_SESSION:
if (lexrc.next()) {
- geometry_width = lexrc.getInteger();
- }
- break;
-
- case RC_SCREEN_GEOMETRY_XYSAVED:
- if (lexrc.next()) {
- geometry_xysaved = lexrc.getBool();
+ allow_geometry_session = lexrc.getBool();
}
break;
case RC_SCREEN_FONT_SIZES:
if (lexrc.next()) {
- font_sizes[Font::SIZE_TINY] =
+ font_sizes[FONT_SIZE_TINY] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_SCRIPT] =
+ font_sizes[FONT_SIZE_SCRIPT] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_FOOTNOTE] =
+ font_sizes[FONT_SIZE_FOOTNOTE] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_SMALL] =
+ font_sizes[FONT_SIZE_SMALL] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_NORMAL] =
+ font_sizes[FONT_SIZE_NORMAL] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_LARGE] =
+ font_sizes[FONT_SIZE_LARGE] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_LARGER] =
+ font_sizes[FONT_SIZE_LARGER] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_LARGEST] =
+ font_sizes[FONT_SIZE_LARGEST] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_HUGE] =
+ font_sizes[FONT_SIZE_HUGE] =
lexrc.getString();
}
if (lexrc.next()) {
- font_sizes[Font::SIZE_HUGER] =
+ font_sizes[FONT_SIZE_HUGER] =
lexrc.getString();
}
break;
}
break;
+ case RC_EXAMPLEPATH:
+ if (lexrc.next()) {
+ example_path = os::internal_path(lexrc.getString());
+ example_path = expandPath(example_path);
+ }
+ break;
+
case RC_TEMPLATEPATH:
if (lexrc.next()) {
template_path = os::internal_path(lexrc.getString());
break;
}
- Color::color const col =
+ ColorCode const col =
lcolor.getFromLyXName(lyx_name);
- if (col == Color::none ||
- col == Color::inherit ||
- col == Color::ignore)
+ if (col == Color_none ||
+ col == Color_inherit ||
+ col == Color_ignore)
break;
if (!lcolor.setColor(col, x11_name)) {
isp_use_pers_dict = lexrc.getBool();
}
break;
+ case RC_USE_TOOLTIP:
+ if (lexrc.next()) {
+ use_tooltip = lexrc.getBool();
+ }
+ break;
+ case RC_USE_PIXMAP_CACHE:
+ if (lexrc.next()) {
+ use_pixmap_cache = lexrc.getBool();
+ }
+ break;
case RC_USE_ESC_CHARS:
if (lexrc.next()) {
isp_use_esc_chars = lexrc.getBool();
int flgs = Format::none;
while (!flags.empty()) {
string flag;
- flags = support::split(flags, flag, ',');
+ flags = split(flags, flag, ',');
if (flag == "document")
flgs |= Format::document;
else if (flag == "vector")
}
} else {
formats.add(format, extension, prettyname,
- shortcut, viewer, editor, flgs);
+ shortcut, viewer, editor, flgs);
}
break;
}
convert<unsigned int>(lexrc.getString());
break;
+ case RC_SORT_LAYOUTS:
+ if (lexrc.next())
+ sort_layouts = lexrc.getBool();
+ break;
+
case RC_LAST: break; // this is just a dummy
}
}
class SameMover {
public:
- typedef std::pair<std::string, SpecialisedMover> Data;
+ typedef pair<string, SpecialisedMover> Data;
SameMover(Data const & comparison)
: comparison_(comparison) {}
};
-void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
+void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) const
{
- os << "### This file is part of\n"
- << "### ========================================================\n"
- << "### LyX, The Document Processor\n"
- << "###\n"
- << "### Copyright 1995 Matthias Ettrich\n"
- << "### Copyright 1995-2001 The LyX Team.\n"
- << "###\n"
- << "### ========================================================\n"
- << "\n"
- << "# This file is written by LyX, if you want to make your own\n"
- << "# modifications you should do them from inside LyX and save\n"
- << "\n";
+ LyXRCTags tag = RC_LAST;
+
+ if (!name.empty()) {
+ for (int i = 0; i != lyxrcCount; ++i)
+ if ("\\" + name == lyxrcTags[i].tag)
+ tag = static_cast<LyXRCTags>(lyxrcTags[i].code);
+ }
+
+ if (tag == RC_LAST)
+ os << "### This file is part of\n"
+ << "### ========================================================\n"
+ << "### LyX, The Document Processor\n"
+ << "###\n"
+ << "### Copyright 1995 Matthias Ettrich\n"
+ << "### Copyright 1995-2007 The LyX Team.\n"
+ << "###\n"
+ << "### ========================================================\n"
+ << "\n"
+ << "# This file is written by LyX, if you want to make your own\n"
+ << "# modifications you should do them from inside LyX and save\n"
+ << "\n";
// Why the switch you might ask. It is a trick to ensure that all
// the elements in the LyXRCTags enum is handled. As you can see
// there are no breaks at all. So it is just a huge fall-through.
// The nice thing is that we will get a warning from the compiler
// if we forget an element.
- LyXRCTags tag = RC_LAST;
switch (tag) {
case RC_LAST:
case RC_INPUT:
string const path = os::external_path(bind_file);
os << "\\bind_file \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
+
+ case RC_DEFFILE:
+ if (ignore_system_lyxrc ||
+ def_file != system_lyxrc.def_file) {
+ string const path = os::external_path(def_file);
+ os << "\\def_file \"" << path << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
+
//
// Misc Section
//
os << "\n#\n"
<< "# MISC SECTION ######################################\n"
<< "#\n\n";
-
// bind files are not done here.
case RC_PATH_PREFIX:
path_prefix != system_lyxrc.path_prefix) {
os << "\\path_prefix \"" << path_prefix << "\"\n";
}
-
+ if (tag != RC_LAST)
+ break;
case RC_UIFILE:
if (ignore_system_lyxrc ||
ui_file != system_lyxrc.ui_file) {
string const path = os::external_path(ui_file);
os << "\\ui_file \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_AUTOREGIONDELETE:
if (ignore_system_lyxrc ||
auto_region_delete != system_lyxrc.auto_region_delete) {
<< "\\auto_region_delete " << convert<string>(auto_region_delete)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_AUTORESET_OPTIONS:
if (ignore_system_lyxrc ||
auto_reset_options != system_lyxrc.auto_reset_options) {
<< convert<string>(auto_reset_options)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_AUTOSAVE:
if (ignore_system_lyxrc ||
autosave != system_lyxrc.autosave) {
os << "# The time interval between auto-saves in seconds.\n"
<< "\\autosave " << autosave << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_DISPLAY_GRAPHICS:
if (ignore_system_lyxrc ||
display_graphics != system_lyxrc.display_graphics) {
os << "# Display graphics within LyX\n"
<< "# monochrome|grayscale|color|none\n"
<< "\\display_graphics "
- << graphics::displayTranslator().find(display_graphics)
+ << graphics::displayTranslator().find(
+ graphics::DisplayType(display_graphics))
<< '\n';
}
-
+ if (tag != RC_LAST)
+ break;
+ case RC_SORT_LAYOUTS:
+ if (ignore_system_lyxrc ||
+ sort_layouts != system_lyxrc.sort_layouts) {
+ os << "# Sort layouts alphabetically.\n"
+ << "\\sort_layouts " << convert<string>(sort_layouts) << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
case RC_VIEWDVI_PAPEROPTION:
if (ignore_system_lyxrc ||
view_dvi_paper_option
<< "\\view_dvi_paper_option \""
<< view_dvi_paper_option << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_DEFAULT_PAPERSIZE:
if (ignore_system_lyxrc ||
default_papersize != system_lyxrc.default_papersize) {
}
os << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_CHKTEX_COMMAND:
if (ignore_system_lyxrc ||
chktex_command != system_lyxrc.chktex_command) {
os << "\\chktex_command \"" << chktex_command << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_BIBTEX_COMMAND:
if (ignore_system_lyxrc ||
bibtex_command != system_lyxrc.bibtex_command) {
os << "\\bibtex_command \"" << bibtex_command << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_INDEX_COMMAND:
if (ignore_system_lyxrc ||
index_command != system_lyxrc.index_command) {
os << "\\index_command \"" << index_command << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_TEX_EXPECTS_WINDOWS_PATHS:
if (ignore_system_lyxrc ||
windows_style_tex_paths != system_lyxrc.windows_style_tex_paths) {
os << "\\tex_expects_windows_paths "
<< convert<string>(windows_style_tex_paths) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_TEX_ALLOWS_SPACES:
if (tex_allows_spaces != system_lyxrc.tex_allows_spaces) {
os << "\\tex_allows_spaces "
<< convert<string>(tex_allows_spaces) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_KBMAP:
if (ignore_system_lyxrc ||
use_kbmap != system_lyxrc.use_kbmap) {
os << "\\kbmap " << convert<string>(use_kbmap) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_KBMAP_PRIMARY:
if (ignore_system_lyxrc ||
primary_kbmap != system_lyxrc.primary_kbmap) {
string const path = os::external_path(primary_kbmap);
os << "\\kbmap_primary \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_KBMAP_SECONDARY:
if (ignore_system_lyxrc ||
secondary_kbmap != system_lyxrc.secondary_kbmap) {
string const path = os::external_path(secondary_kbmap);
os << "\\kbmap_secondary \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_SERVERPIPE:
if (ignore_system_lyxrc ||
lyxpipes != system_lyxrc.lyxpipes) {
string const path = os::external_path(lyxpipes);
os << "\\serverpipe \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_DATE_INSERT_FORMAT:
if (ignore_system_lyxrc ||
date_insert_format != system_lyxrc.date_insert_format) {
os << "\\date_insert_format \"" << date_insert_format
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_LABEL_INIT_LENGTH:
if (ignore_system_lyxrc ||
label_init_length != system_lyxrc.label_init_length) {
os << "\\label_init_length " << label_init_length
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_USER_NAME:
os << "\\user_name \"" << user_name << "\"\n";
+ if (tag != RC_LAST)
+ break;
case RC_USER_EMAIL:
os << "\\user_email \"" << user_email << "\"\n";
+ if (tag != RC_LAST)
+ break;
case RC_SHOW_BANNER:
if (ignore_system_lyxrc ||
show_banner != system_lyxrc.show_banner) {
os << "\\show_banner " << convert<string>(show_banner) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_PREVIEW:
if (ignore_system_lyxrc ||
}
os << "\\preview " << status << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_PREVIEW_HASHED_LABELS:
if (ignore_system_lyxrc ||
os << "\\preview_hashed_labels "
<< convert<string>(preview_hashed_labels) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_PREVIEW_SCALE_FACTOR:
if (ignore_system_lyxrc ||
os << "\\preview_scale_factor "
<< preview_scale_factor << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_USE_CONVERTER_CACHE:
if (ignore_system_lyxrc ||
os << "\\use_converter_cache "
<< convert<string>(use_converter_cache) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_CONVERTER_CACHE_MAXAGE:
if (ignore_system_lyxrc ||
os << "\\converter_cache_maxage "
<< converter_cache_maxage << '\n';
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# SCREEN & FONTS SECTION ############################\n"
dpi != system_lyxrc.dpi) {
os << "\\screen_dpi " << dpi << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_ZOOM:
if (ignore_system_lyxrc ||
zoom != system_lyxrc.zoom) {
os << "\\screen_zoom " << zoom << '\n';
}
- case RC_SCREEN_GEOMETRY_HEIGHT:
- if (ignore_system_lyxrc ||
- geometry_height != system_lyxrc.geometry_height) {
- os << "\\screen_geometry_height " << geometry_height
- << '\n';
- }
- case RC_SCREEN_GEOMETRY_WIDTH:
- if (ignore_system_lyxrc ||
- geometry_width != system_lyxrc.geometry_width) {
- os << "\\screen_geometry_width " << geometry_width
- << '\n';
- }
- case RC_SCREEN_GEOMETRY_XYSAVED:
+ if (tag != RC_LAST)
+ break;
+ case RC_GEOMETRY_SESSION:
if (ignore_system_lyxrc ||
- geometry_xysaved != system_lyxrc.geometry_xysaved) {
- os << "\\screen_geometry_xysaved " << convert<string>(geometry_xysaved)
+ allow_geometry_session != system_lyxrc.allow_geometry_session) {
+ os << "\\allow_geometry_session " << convert<string>(allow_geometry_session)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_CURSOR_FOLLOWS_SCROLLBAR:
if (ignore_system_lyxrc ||
cursor_follows_scrollbar
os << "\\cursor_follows_scrollbar "
<< convert<string>(cursor_follows_scrollbar) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_DIALOGS_ICONIFY_WITH_MAIN:
if (ignore_system_lyxrc ||
dialogs_iconify_with_main
os << "\\dialogs_iconify_with_main "
<< convert<string>(dialogs_iconify_with_main) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_FONT_ROMAN:
if (ignore_system_lyxrc ||
roman_font_name != system_lyxrc.roman_font_name) {
os << "\\screen_font_roman \"" << roman_font_name
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_FONT_ROMAN_FOUNDRY:
if (ignore_system_lyxrc ||
roman_font_foundry != system_lyxrc.roman_font_foundry) {
os << "\\screen_font_roman_foundry \"" << roman_font_foundry
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_FONT_SANS:
if (ignore_system_lyxrc ||
sans_font_name != system_lyxrc.sans_font_name) {
os << "\\screen_font_sans \"" << sans_font_name
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_FONT_SANS_FOUNDRY:
if (ignore_system_lyxrc ||
sans_font_foundry != system_lyxrc.sans_font_foundry) {
os << "\\screen_font_sans_foundry \"" << sans_font_foundry
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_FONT_TYPEWRITER:
if (ignore_system_lyxrc ||
typewriter_font_name != system_lyxrc.typewriter_font_name) {
os << "\\screen_font_typewriter \""
<< typewriter_font_name << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY:
if (ignore_system_lyxrc ||
typewriter_font_foundry != system_lyxrc.typewriter_font_foundry) {
os << "\\screen_font_typewriter_foundry \""
<< typewriter_font_foundry << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_FONT_SCALABLE:
if (ignore_system_lyxrc ||
<< convert<string>(use_scalable_fonts)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_SCREEN_FONT_SIZES:
if (ignore_system_lyxrc ||
- font_sizes[Font::SIZE_TINY]
- != system_lyxrc.font_sizes[Font::SIZE_TINY] ||
- font_sizes[Font::SIZE_SCRIPT]
- != system_lyxrc.font_sizes[Font::SIZE_SCRIPT] ||
- font_sizes[Font::SIZE_FOOTNOTE]
- != system_lyxrc.font_sizes[Font::SIZE_FOOTNOTE] ||
- font_sizes[Font::SIZE_SMALL]
- != system_lyxrc.font_sizes[Font::SIZE_SMALL] ||
- font_sizes[Font::SIZE_NORMAL]
- != system_lyxrc.font_sizes[Font::SIZE_NORMAL] ||
- font_sizes[Font::SIZE_LARGE]
- != system_lyxrc.font_sizes[Font::SIZE_LARGE] ||
- font_sizes[Font::SIZE_LARGER]
- != system_lyxrc.font_sizes[Font::SIZE_LARGER] ||
- font_sizes[Font::SIZE_LARGEST]
- != system_lyxrc.font_sizes[Font::SIZE_LARGEST] ||
- font_sizes[Font::SIZE_HUGE]
- != system_lyxrc.font_sizes[Font::SIZE_HUGE] ||
- font_sizes[Font::SIZE_HUGER]
- != system_lyxrc.font_sizes[Font::SIZE_HUGER]) {
+ font_sizes[FONT_SIZE_TINY]
+ != system_lyxrc.font_sizes[FONT_SIZE_TINY] ||
+ font_sizes[FONT_SIZE_SCRIPT]
+ != system_lyxrc.font_sizes[FONT_SIZE_SCRIPT] ||
+ font_sizes[FONT_SIZE_FOOTNOTE]
+ != system_lyxrc.font_sizes[FONT_SIZE_FOOTNOTE] ||
+ font_sizes[FONT_SIZE_SMALL]
+ != system_lyxrc.font_sizes[FONT_SIZE_SMALL] ||
+ font_sizes[FONT_SIZE_NORMAL]
+ != system_lyxrc.font_sizes[FONT_SIZE_NORMAL] ||
+ font_sizes[FONT_SIZE_LARGE]
+ != system_lyxrc.font_sizes[FONT_SIZE_LARGE] ||
+ font_sizes[FONT_SIZE_LARGER]
+ != system_lyxrc.font_sizes[FONT_SIZE_LARGER] ||
+ font_sizes[FONT_SIZE_LARGEST]
+ != system_lyxrc.font_sizes[FONT_SIZE_LARGEST] ||
+ font_sizes[FONT_SIZE_HUGE]
+ != system_lyxrc.font_sizes[FONT_SIZE_HUGE] ||
+ font_sizes[FONT_SIZE_HUGER]
+ != system_lyxrc.font_sizes[FONT_SIZE_HUGER]) {
os.setf(ios::fixed);
os.precision(2);
os << "\\screen_font_sizes"
- << ' ' << font_sizes[Font::SIZE_TINY]
- << ' ' << font_sizes[Font::SIZE_SCRIPT]
- << ' ' << font_sizes[Font::SIZE_FOOTNOTE]
- << ' ' << font_sizes[Font::SIZE_SMALL]
- << ' ' << font_sizes[Font::SIZE_NORMAL]
- << ' ' << font_sizes[Font::SIZE_LARGE]
- << ' ' << font_sizes[Font::SIZE_LARGER]
- << ' ' << font_sizes[Font::SIZE_LARGEST]
- << ' ' << font_sizes[Font::SIZE_HUGE]
- << ' ' << font_sizes[Font::SIZE_HUGER]
+ << ' ' << font_sizes[FONT_SIZE_TINY]
+ << ' ' << font_sizes[FONT_SIZE_SCRIPT]
+ << ' ' << font_sizes[FONT_SIZE_FOOTNOTE]
+ << ' ' << font_sizes[FONT_SIZE_SMALL]
+ << ' ' << font_sizes[FONT_SIZE_NORMAL]
+ << ' ' << font_sizes[FONT_SIZE_LARGE]
+ << ' ' << font_sizes[FONT_SIZE_LARGER]
+ << ' ' << font_sizes[FONT_SIZE_LARGEST]
+ << ' ' << font_sizes[FONT_SIZE_HUGE]
+ << ' ' << font_sizes[FONT_SIZE_HUGER]
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# COLOR SECTION ###################################\n"
<< "#\n\n";
case RC_SET_COLOR:
- for (int i = 0; i < Color::ignore; ++i) {
- Color::color lc = static_cast<Color::color>(i);
+ for (int i = 0; i < Color_ignore; ++i) {
+ ColorCode lc = static_cast<ColorCode>(i);
string const col(lcolor.getX11Name(lc));
if (ignore_system_lyxrc ||
<< col << "\"\n";
}
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# PRINTER SECTION ###################################\n"
printer != system_lyxrc.printer) {
os << "\\printer \"" << printer << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINT_ADAPTOUTPUT:
if (ignore_system_lyxrc ||
print_adapt_output != system_lyxrc.print_adapt_output) {
<< convert<string>(print_adapt_output)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINT_COMMAND:
if (ignore_system_lyxrc ||
print_command != system_lyxrc.print_command) {
os << "\\print_command \"" << print_command << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTEXSTRAOPTIONS:
if (ignore_system_lyxrc ||
print_extra_options != system_lyxrc.print_extra_options) {
os << "\\print_extra_options \"" << print_extra_options
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTSPOOL_COMMAND:
if (ignore_system_lyxrc ||
print_spool_command != system_lyxrc.print_spool_command) {
os << "\\print_spool_command \"" << print_spool_command
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTSPOOL_PRINTERPREFIX:
if (ignore_system_lyxrc ||
print_spool_printerprefix
os << "\\print_spool_printerprefix \""
<< print_spool_printerprefix << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTEVENPAGEFLAG:
if (ignore_system_lyxrc ||
print_evenpage_flag != system_lyxrc.print_evenpage_flag) {
os << "\\print_evenpage_flag \"" << print_evenpage_flag
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTODDPAGEFLAG:
if (ignore_system_lyxrc ||
print_oddpage_flag != system_lyxrc.print_oddpage_flag) {
os << "\\print_oddpage_flag \"" << print_oddpage_flag
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTREVERSEFLAG:
if (ignore_system_lyxrc ||
print_reverse_flag != system_lyxrc.print_reverse_flag) {
os << "\\print_reverse_flag \"" << print_reverse_flag
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTLANDSCAPEFLAG:
if (ignore_system_lyxrc ||
print_landscape_flag != system_lyxrc.print_landscape_flag) {
os << "\\print_landscape_flag \"" << print_landscape_flag
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTPAGERANGEFLAG:
if (ignore_system_lyxrc ||
print_pagerange_flag != system_lyxrc.print_pagerange_flag) {
os << "\\print_pagerange_flag \"" << print_pagerange_flag
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTCOPIESFLAG:
if (ignore_system_lyxrc ||
print_copies_flag != system_lyxrc.print_copies_flag) {
os << "\\print_copies_flag \"" << print_copies_flag
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTCOLLCOPIESFLAG:
if (ignore_system_lyxrc ||
print_collcopies_flag
<< print_collcopies_flag
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTPAPERFLAG:
if (ignore_system_lyxrc ||
print_paper_flag != system_lyxrc.print_paper_flag) {
os << "\\print_paper_flag \"" << print_paper_flag
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTPAPERDIMENSIONFLAG:
if (ignore_system_lyxrc ||
print_paper_dimension_flag
os << "\\print_paper_dimension_flag \""
<< print_paper_dimension_flag << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTTOPRINTER:
if (ignore_system_lyxrc ||
print_to_printer != system_lyxrc.print_to_printer) {
os << "\\print_to_printer \"" << print_to_printer
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTTOFILE:
if (ignore_system_lyxrc ||
print_to_file != system_lyxrc.print_to_file) {
string const path = os::external_path(print_to_file);
os << "\\print_to_file \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_PRINTFILEEXTENSION:
if (ignore_system_lyxrc ||
print_file_extension != system_lyxrc.print_file_extension) {
<< print_file_extension
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# EXPORT SECTION ####################################\n"
<< custom_export_command
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_CUSTOM_EXPORT_FORMAT:
if (ignore_system_lyxrc ||
custom_export_format
os << "\\custom_export_format \"" << custom_export_format
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# TEX SECTION #######################################\n"
fontenc != system_lyxrc.fontenc) {
os << "\\font_encoding \"" << fontenc << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# FILE SECTION ######################################\n"
string const path = os::external_path(document_path);
os << "\\document_path \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_USELASTFILEPOS:
if (ignore_system_lyxrc ||
use_lastfilepos != system_lyxrc.use_lastfilepos) {
os << "\\use_lastfilepos " << convert<string>(use_lastfilepos)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_LOADSESSION:
if (ignore_system_lyxrc ||
load_session != system_lyxrc.load_session) {
os << "\\load_session " << convert<string>(load_session)
<< "\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_NUMLASTFILES:
if (ignore_system_lyxrc ||
num_lastfiles != system_lyxrc.num_lastfiles) {
os << "\\num_lastfiles " << num_lastfiles << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_CHECKLASTFILES:
if (ignore_system_lyxrc ||
check_lastfiles != system_lyxrc.check_lastfiles) {
os << "\\check_lastfiles " << convert<string>(check_lastfiles)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
+ case RC_EXAMPLEPATH:
+ if (ignore_system_lyxrc ||
+ example_path != system_lyxrc.example_path) {
+ string const path = os::external_path(example_path);
+ os << "\\example_path \"" << path << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
case RC_TEMPLATEPATH:
if (ignore_system_lyxrc ||
template_path != system_lyxrc.template_path) {
string const path = os::external_path(template_path);
os << "\\template_path \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_TEMPDIRPATH:
if (ignore_system_lyxrc ||
tempdir_path != system_lyxrc.tempdir_path) {
string const path = os::external_path(tempdir_path);
os << "\\tempdir_path \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_USETEMPDIR:
+ if (tag != RC_LAST)
+ break;
// Ignore it
case RC_PLAINTEXT_LINELEN:
if (ignore_system_lyxrc ||
plaintext_linelen != system_lyxrc.plaintext_linelen) {
os << "\\plaintext_linelen " << plaintext_linelen << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_MAKE_BACKUP:
if (ignore_system_lyxrc ||
make_backup != system_lyxrc.make_backup) {
os << "\\make_backup " << convert<string>(make_backup) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_BACKUPDIR_PATH:
if (ignore_system_lyxrc ||
backupdir_path != system_lyxrc.backupdir_path) {
string const path = os::external_path(backupdir_path);
os << "\\backupdir_path \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# PLAIN TEXT EXPORT SECTION ##############################\n"
os << "\\plaintext_roff_command \"" << plaintext_roff_command
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# SPELLCHECKER SECTION ##############################\n"
use_spell_lib != system_lyxrc.use_spell_lib) {
os << "\\use_spell_lib " << convert<string>(use_spell_lib) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_SPELL_COMMAND:
if (ignore_system_lyxrc ||
isp_command != system_lyxrc.isp_command) {
os << "\\spell_command \"" << isp_command << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_ACCEPT_COMPOUND:
if (ignore_system_lyxrc ||
isp_accept_compound != system_lyxrc.isp_accept_compound) {
os << "\\accept_compound " << convert<string>(isp_accept_compound)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_USE_ALT_LANG:
if (ignore_system_lyxrc ||
isp_use_alt_lang != system_lyxrc.isp_use_alt_lang) {
os << "\\use_alt_language " << convert<string>(isp_use_alt_lang)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_ALT_LANG:
if (ignore_system_lyxrc ||
isp_alt_lang != system_lyxrc.isp_alt_lang) {
os << "\\alternate_language \"" << isp_alt_lang
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_USE_ESC_CHARS:
if (ignore_system_lyxrc ||
isp_use_esc_chars != system_lyxrc.isp_use_esc_chars) {
os << "\\use_escape_chars " << convert<string>(isp_use_esc_chars)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_ESC_CHARS:
if (ignore_system_lyxrc ||
isp_esc_chars != system_lyxrc.isp_esc_chars) {
os << "\\escape_chars \"" << isp_esc_chars << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_USE_PERS_DICT:
if (ignore_system_lyxrc ||
isp_use_pers_dict != system_lyxrc.isp_use_pers_dict) {
<< convert<string>(isp_use_pers_dict)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
+ case RC_USE_TOOLTIP:
+ if (ignore_system_lyxrc ||
+ use_tooltip != system_lyxrc.use_tooltip) {
+ os << "\\use_tooltip "
+ << convert<string>(use_tooltip)
+ << '\n';
+ }
+ case RC_USE_PIXMAP_CACHE:
+ if (ignore_system_lyxrc ||
+ use_pixmap_cache != system_lyxrc.use_pixmap_cache) {
+ os << "\\use_pixmap_cache "
+ << convert<string>(use_pixmap_cache)
+ << '\n';
+ }
case RC_PERS_DICT:
if (isp_pers_dict != system_lyxrc.isp_pers_dict) {
string const path = os::external_path(isp_pers_dict);
os << "\\personal_dictionary \"" << path << "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_USE_INP_ENC:
if (ignore_system_lyxrc ||
isp_use_input_encoding
<< convert<string>(isp_use_input_encoding)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# LANGUAGE SUPPORT SECTION ##########################\n"
rtl_support != system_lyxrc.rtl_support) {
os << "\\rtl " << convert<string>(rtl_support) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_LANGUAGE_PACKAGE:
if (ignore_system_lyxrc ||
language_package != system_lyxrc.language_package) {
os << "\\language_package \"" << language_package
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_LANGUAGE_GLOBAL_OPTIONS:
if (ignore_system_lyxrc ||
language_global_options
<< convert<string>(language_global_options)
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_LANGUAGE_USE_BABEL:
if (ignore_system_lyxrc ||
language_use_babel != system_lyxrc.language_use_babel) {
<< convert<string>(language_use_babel)
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_LANGUAGE_COMMAND_BEGIN:
if (ignore_system_lyxrc ||
language_command_begin
<< language_command_begin
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_LANGUAGE_COMMAND_END:
if (ignore_system_lyxrc ||
language_command_end
os << "\\language_command_end \"" << language_command_end
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_LANGUAGE_COMMAND_LOCAL:
if (ignore_system_lyxrc ||
language_command_local
<< language_command_local
<< "\"\n";
}
+ if (tag != RC_LAST)
+ break;
case RC_LANGUAGE_AUTO_BEGIN:
if (ignore_system_lyxrc ||
language_auto_begin != system_lyxrc.language_auto_begin) {
os << "\\language_auto_begin "
<< convert<string>(language_auto_begin) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_LANGUAGE_AUTO_END:
if (ignore_system_lyxrc ||
language_auto_end != system_lyxrc.language_auto_end) {
os << "\\language_auto_end "
<< convert<string>(language_auto_end) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_MARK_FOREIGN_LANGUAGE:
if (ignore_system_lyxrc ||
mark_foreign_language
os << "\\mark_foreign_language " <<
convert<string>(mark_foreign_language) << '\n';
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# 2nd MISC SUPPORT SECTION ##########################\n"
auto_number != system_lyxrc.auto_number) {
os << "\\auto_number " << convert<string>(auto_number) << '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_DEFAULT_LANGUAGE:
if (ignore_system_lyxrc ||
default_language != system_lyxrc.default_language) {
os << "\\default_language " << default_language << '\n';
}
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# FORMATS SECTION ##########################\n"
<< cit->shortcut() << "\" \""
<< cit->viewer() << "\" \""
<< cit->editor() << "\" \"";
- std::vector<string> flags;
+ vector<string> flags;
if (cit->documentFormat())
flags.push_back("document");
if (cit->vectorFormat())
flags.push_back("vector");
- os << support::getStringFromVector(flags);
+ os << getStringFromVector(flags);
os << "\"\n";
}
}
if (!formats.getFormat(cit->name()))
os << "\\format \"" << cit->name()
<< "\" \"\" \"\" \"\" \"\" \"\" \"\"\n";
+ if (tag != RC_LAST)
+ break;
case RC_VIEWER:
// Ignore it
+ if (tag != RC_LAST)
+ break;
os << "\n#\n"
<< "# CONVERTERS SECTION ##########################\n"
if (!theConverters().getConverter(cit->from, cit->to))
os << "\\converter \"" << cit->from
<< "\" \"" << cit->to << "\" \"\" \"\"\n";
+ if (tag != RC_LAST)
+ break;
case RC_COPIER:
- os << "\n#\n"
- << "# COPIERS SECTION ##########################\n"
- << "#\n\n";
+ if (tag == RC_LAST)
+ os << "\n#\n"
+ << "# COPIERS SECTION ##########################\n"
+ << "#\n\n";
// Look for new movers
Movers::const_iterator const sysbegin = theSystemMovers().begin();
for (; it != end; ++it) {
Movers::const_iterator const sysit =
- std::find_if(sysbegin, sysend, SameMover(*it));
+ find_if(sysbegin, sysend, SameMover(*it));
if (sysit == sysend) {
- std::string const & fmt = it->first;
- std::string const & command =
+ string const & fmt = it->first;
+ string const & command =
it->second.command();
os << "\\copier " << fmt
<< " \"" << command << "\"\n";
}
}
+ if (tag != RC_LAST)
+ break;
// We don't actually delete SpecialisedMover(s) from the
// map, just clear their 'command', so there's no need
str = _("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\".");
break;
+ case RC_DEFFILE:
+ str = _("Command definition file. Can either specify an absolute path, or LyX will look in its global and local commands/ directories.");
+ break;
+
case RC_DEFAULT_LANGUAGE:
str = _("New documents will be assigned this language.");
break;
str = _("Specify additional chars that can be part of a word.");
break;
+ case RC_EXAMPLEPATH:
+ str = _("The path that LyX will set when offering to choose an example. An empty value selects the directory LyX was started from.");
+ break;
+
case RC_FONT_ENCODING:
str = _("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages.");
break;
break;
case RC_LOADSESSION:
- str = _("De-select to prevent loading files opened from the last lyx session.");
+ str = _("De-select to prevent loading files opened from the last LyX session.");
break;
case RC_MAKE_BACKUP:
str = _("The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper.");
break;
- case RC_SCREEN_GEOMETRY_HEIGHT:
- case RC_SCREEN_GEOMETRY_WIDTH:
- str = _("Specify geometry of the main view in width x height (values from last session will not be used if non-zero values are specified).");
- break;
-
- case RC_SCREEN_GEOMETRY_XYSAVED:
- str = _("Allow session manager to save and restore windows position.");
+ case RC_GEOMETRY_SESSION:
+ str = _("Allow session manager to save and restore windows geometry.");
break;
case RC_SERVERPIPE:
str = _("Specify whether to pass the -T input encoding option to ispell. Enable this if you cannot check the spelling of words containing accented letters. This may not work with all dictionaries.");
break;
+ case RC_USE_TOOLTIP:
+ str = _("Enable the automatic appearance of tool tips in the work area.");
+ break;
+
+ case RC_USE_PIXMAP_CACHE:
+ str = _("Enable the pixmap cache that might improve performance on Mac and Windows.");
+ break;
+
case RC_USE_SPELL_LIB:
break;