{ "\\autocorrection_math", LyXRC::RC_AUTOCORRECTION_MATH },
{ "\\autosave", LyXRC::RC_AUTOSAVE },
{ "\\backupdir_path", LyXRC::RC_BACKUPDIR_PATH },
+ { "\\bibtex_alternatives", LyXRC::RC_BIBTEX_ALTERNATIVES },
{ "\\bibtex_command", LyXRC::RC_BIBTEX_COMMAND },
{ "\\bind_file", LyXRC::RC_BINDFILE },
{ "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES },
{ "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN },
{ "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
{ "\\document_path", LyXRC::RC_DOCUMENTPATH },
+ { "\\editor_alternatives", LyXRC::RC_EDITOR_ALTERNATIVES },
{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
{ "\\example_path", LyXRC::RC_EXAMPLEPATH },
{ "\\font_encoding", LyXRC::RC_FONT_ENCODING },
{ "\\format", LyXRC::RC_FORMAT },
{ "\\fullscreen_limit", LyXRC::RC_FULL_SCREEN_LIMIT },
+ { "\\fullscreen_menubar", LyXRC::RC_FULL_SCREEN_MENUBAR },
{ "\\fullscreen_scrollbar", LyXRC::RC_FULL_SCREEN_SCROLLBAR },
{ "\\fullscreen_tabbar", LyXRC::RC_FULL_SCREEN_TABBAR },
{ "\\fullscreen_toolbars", LyXRC::RC_FULL_SCREEN_TOOLBARS },
{ "\\fullscreen_width", LyXRC::RC_FULL_SCREEN_WIDTH },
{ "\\group_layouts", LyXRC::RC_GROUP_LAYOUTS },
{ "\\gui_language", LyXRC::RC_GUI_LANGUAGE },
+ { "\\hunspelldir_path", LyXRC::RC_HUNSPELLDIR_PATH },
+ { "\\index_alternatives", LyXRC::RC_INDEX_ALTERNATIVES },
{ "\\index_command", LyXRC::RC_INDEX_COMMAND },
{ "\\input", LyXRC::RC_INPUT },
+ { "\\jbibtex_command", LyXRC::RC_JBIBTEX_COMMAND },
+ { "\\jindex_command", LyXRC::RC_JINDEX_COMMAND },
{ "\\kbmap", LyXRC::RC_KBMAP },
{ "\\kbmap_primary", LyXRC::RC_KBMAP_PRIMARY },
{ "\\kbmap_secondary", LyXRC::RC_KBMAP_SECONDARY },
{ "\\nomencl_command", LyXRC::RC_NOMENCL_COMMAND },
{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
{ "\\open_buffers_in_tabs", LyXRC::RC_OPEN_BUFFERS_IN_TABS },
+ { "\\paragraph_markers", LyXRC::RC_PARAGRAPH_MARKERS },
{ "\\path_prefix", LyXRC::RC_PATH_PREFIX },
{ "\\personal_dictionary", LyXRC::RC_PERS_DICT },
{ "\\plaintext_linelen", LyXRC::RC_PLAINTEXT_LINELEN },
{ "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS },
{ "\\spell_command", LyXRC::RC_SPELL_COMMAND },
{ "\\spellcheck_continuously", LyXRC::RC_SPELLCHECK_CONTINUOUSLY },
+ { "\\spellchecker", LyXRC::RC_SPELLCHECKER },
+ { "\\splitindex_command", LyXRC::RC_SPLITINDEX_COMMAND },
{ "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
{ "\\template_path", LyXRC::RC_TEMPLATEPATH },
{ "\\tex_allows_spaces", LyXRC::RC_TEX_ALLOWS_SPACES },
{ "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
// compatibility with versions older than 1.4.0 only
{ "\\viewer", LyXRC::RC_VIEWER},
+ { "\\viewer_alternatives", LyXRC::RC_VIEWER_ALTERNATIVES },
{ "\\visual_cursor" ,LyXRC::RC_VISUAL_CURSOR}
};
index_command = "makeindex -c -q";
nomencl_command = "makeindex -s nomencl.ist";
dpi = 75;
- // Because a screen typically is wider than a piece of paper:
+ // Because a screen is typically wider than a piece of paper:
zoom = 150;
allow_geometry_session = true;
// Default LaTeX font size:
backupdir_path.erase();
display_graphics = true;
// Spellchecker settings:
+ spellchecker = "aspell";
spellchecker_accept_compound = false;
- spellchecker_use_input_encoding = false;
- spellchecker_use_alt_lang = false;
- spellchecker_use_pers_dict = false;
- spellchecker_use_esc_chars = false;
spellcheck_continuously = false;
use_kbmap = false;
rtl_support = true;
date_insert_format = "%x";
cursor_follows_scrollbar = false;
scroll_below_document = false;
+ paragraph_markers = false;
mac_like_word_movement = false;
macro_edit_style = MACRO_EDIT_INLINE_BOX;
dialogs_iconify_with_main = false;
label_init_length = 3;
preview = PREVIEW_OFF;
preview_hashed_labels = false;
- preview_scale_factor = "0.9";
+ preview_scale_factor = 1.0;
use_converter_cache = true;
use_tooltip = true;
use_pixmap_cache = false;
full_screen_limit = false;
full_screen_toolbars = true;
full_screen_tabbar = true;
+ full_screen_menubar = true;
full_screen_scrollbar = true;
full_screen_width = 700;
case RC_KBMAP_PRIMARY:
if (lexrc.next()) {
string const kmap(os::internal_path(lexrc.getString()));
- if (kmap.empty()) {
- // nothing
- } else if (!libFileSearch("kbd", kmap,
- "kmap").empty()) {
+ if (!libFileSearch("kbd", kmap, "kmap").empty()
+ || kmap.empty()) {
primary_kbmap = kmap;
} else {
lexrc.printError("LyX: Keymap `$$Token' not found");
case RC_KBMAP_SECONDARY:
if (lexrc.next()) {
string const kmap(os::internal_path(lexrc.getString()));
- if (kmap.empty()) {
- // nothing
- } else if (!libFileSearch("kbd", kmap,
- "kmap").empty()) {
+ if (!libFileSearch("kbd", kmap, "kmap").empty()
+ || kmap.empty()) {
secondary_kbmap = kmap;
} else {
lexrc.printError("LyX: Keymap `$$Token' not found");
}
break;
+ case RC_BIBTEX_ALTERNATIVES:
+ if (lexrc.next(true)) {
+ bibtex_alternatives.insert(lexrc.getString());
+ }
+ break;
+
case RC_BIBTEX_COMMAND:
if (lexrc.next(true)) {
bibtex_command = lexrc.getString();
}
break;
+ case RC_JBIBTEX_COMMAND:
+ if (lexrc.next(true)) {
+ jbibtex_command = lexrc.getString();
+ }
+ break;
+
+ case RC_INDEX_ALTERNATIVES:
+ if (lexrc.next(true)) {
+ index_alternatives.insert(lexrc.getString());
+ }
+ break;
+
case RC_INDEX_COMMAND:
if (lexrc.next(true)) {
index_command = lexrc.getString();
}
break;
+ case RC_JINDEX_COMMAND:
+ if (lexrc.next(true)) {
+ jindex_command = lexrc.getString();
+ }
+ break;
+
+ case RC_SPLITINDEX_COMMAND:
+ if (lexrc.next(true)) {
+ splitindex_command = lexrc.getString();
+ }
+ break;
+
case RC_NOMENCL_COMMAND:
if (lexrc.next(true)) {
nomencl_command = lexrc.getString();
}
break;
- case RC_USETEMPDIR:
- if (lexrc.next())
- LYXERR0("Ignoring obsolete use_tempdir flag.");
+ case RC_HUNSPELLDIR_PATH:
+ if (lexrc.next()) {
+ hunspelldir_path = os::internal_path(lexrc.getString());
+ hunspelldir_path = expandPath(hunspelldir_path);
+ }
break;
case RC_USELASTFILEPOS:
lexrc >> scroll_below_document;
break;
+ case RC_PARAGRAPH_MARKERS:
+ lexrc >> paragraph_markers;
+ break;
+
case RC_MAC_LIKE_WORD_MOVEMENT:
lexrc >> mac_like_word_movement;
break;
lexrc >> dialogs_iconify_with_main;
break;
- case RC_PLAINTEXT_ROFF_COMMAND:
- (void) lexrc.getString(); // Obsoleted in 2.0
- break;
case RC_PLAINTEXT_LINELEN:
lexrc >> plaintext_linelen;
break;
case RC_ACCEPT_COMPOUND:
lexrc >> spellchecker_accept_compound;
break;
- case RC_USE_INP_ENC:
- lexrc >> spellchecker_use_input_encoding;
- break;
- case RC_USE_ALT_LANG:
- lexrc >> spellchecker_use_alt_lang;
- break;
- case RC_USE_PERS_DICT:
- lexrc >> spellchecker_use_pers_dict;
- break;
case RC_USE_TOOLTIP:
lexrc >> use_tooltip;
break;
case RC_USE_PIXMAP_CACHE:
lexrc >> use_pixmap_cache;
break;
- case RC_USE_ESC_CHARS:
- lexrc >> spellchecker_use_esc_chars;
+ case RC_SPELLCHECKER:
+ lexrc >> spellchecker;
break;
case RC_ALT_LANG:
lexrc >> spellchecker_alt_lang;
break;
- case RC_PERS_DICT:
- if (lexrc.next())
- spellchecker_pers_dict = os::internal_path(lexrc.getString());
- break;
case RC_ESC_CHARS:
lexrc >> spellchecker_esc_chars;
break;
}
break;
}
+ case RC_VIEWER_ALTERNATIVES: {
+ string format, command;
+ if (lexrc.next())
+ format = lexrc.getString();
+ if (lexrc.eatLine())
+ command = lexrc.getString();
+ viewer_alternatives.push_back(make_pair(format, command));
+ break;
+ }
+ case RC_EDITOR_ALTERNATIVES: {
+ string format, command;
+ lexrc >> format >> command;
+ editor_alternatives.push_back(make_pair(format, command));
+ break;
+ }
+
case RC_DEFAULT_VIEW_FORMAT:
lexrc >> default_view_format;
break;
case RC_FULL_SCREEN_TABBAR:
lexrc >> full_screen_tabbar;
break;
+ case RC_FULL_SCREEN_MENUBAR:
+ lexrc >> full_screen_menubar;
+ break;
case RC_FULL_SCREEN_WIDTH:
lexrc >> full_screen_width;
break;
lexrc >> open_buffers_in_tabs;
break;
+ // Obsoteted in 1.4.0
+ case RC_USETEMPDIR:
// Obsoleted in 2.0
case RC_SPELL_COMMAND:
+ case RC_PERS_DICT:
+ case RC_PLAINTEXT_ROFF_COMMAND:
+ case RC_USE_ALT_LANG:
+ case RC_USE_ESC_CHARS:
+ case RC_USE_INP_ENC:
+ case RC_USE_PERS_DICT:
case RC_USE_SPELL_LIB:
- (void) lexrc.getString();
+ LYXERR(Debug::LYXRC, "Skipping obsolete tag `"
+ << lexrc.getString() << "'.");
+ lexrc.next(true);
break;
case RC_LAST:
}
if (tag != RC_LAST)
break;
+ case RC_BIBTEX_ALTERNATIVES: {
+ set<string>::const_iterator it = bibtex_alternatives.begin();
+ set<string>::const_iterator end = bibtex_alternatives.end();
+ for ( ; it != end; ++it) {
+ if (ignore_system_lyxrc
+ || !system_lyxrc.bibtex_alternatives.count(*it))
+ os << "\\bibtex_alternatives \""
+ << *it << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
+ }
case RC_BIBTEX_COMMAND:
if (ignore_system_lyxrc ||
bibtex_command != system_lyxrc.bibtex_command) {
}
if (tag != RC_LAST)
break;
+ case RC_JBIBTEX_COMMAND:
+ if (ignore_system_lyxrc ||
+ jbibtex_command != system_lyxrc.jbibtex_command) {
+ os << "\\jbibtex_command \"" << escapeCommand(jbibtex_command) << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
+ case RC_INDEX_ALTERNATIVES: {
+ set<string>::const_iterator it = index_alternatives.begin();
+ set<string>::const_iterator end = index_alternatives.end();
+ for ( ; it != end; ++it) {
+ if (ignore_system_lyxrc
+ || !system_lyxrc.index_alternatives.count(*it))
+ os << "\\index_alternatives \""
+ << *it << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
+ }
case RC_INDEX_COMMAND:
if (ignore_system_lyxrc ||
index_command != system_lyxrc.index_command) {
}
if (tag != RC_LAST)
break;
+ case RC_JINDEX_COMMAND:
+ if (ignore_system_lyxrc ||
+ jindex_command != system_lyxrc.jindex_command) {
+ os << "\\jindex_command \"" << escapeCommand(jindex_command) << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
+ case RC_SPLITINDEX_COMMAND:
+ if (ignore_system_lyxrc ||
+ splitindex_command != system_lyxrc.splitindex_command) {
+ os << "\\splitindex_command \"" << escapeCommand(splitindex_command) << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
case RC_NOMENCL_COMMAND:
if (ignore_system_lyxrc ||
nomencl_command != system_lyxrc.nomencl_command) {
}
if (tag != RC_LAST)
break;
+ case RC_PARAGRAPH_MARKERS:
+ if (ignore_system_lyxrc ||
+ paragraph_markers
+ != system_lyxrc.paragraph_markers) {
+ os << "\\paragraph_markers "
+ << convert<string>(paragraph_markers) << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
case RC_MAC_LIKE_WORD_MOVEMENT:
if (ignore_system_lyxrc ||
mac_like_word_movement
}
if (tag != RC_LAST)
break;
+ case RC_FULL_SCREEN_MENUBAR:
+ if (ignore_system_lyxrc ||
+ full_screen_menubar != system_lyxrc.full_screen_menubar) {
+ os << "\\fullscreen_menubar "
+ << convert<string>(full_screen_menubar)
+ << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
case RC_FULL_SCREEN_WIDTH:
if (ignore_system_lyxrc ||
full_screen_width != system_lyxrc.full_screen_width) {
}
if (tag != RC_LAST)
break;
+ case RC_HUNSPELLDIR_PATH:
+ if (ignore_system_lyxrc ||
+ hunspelldir_path != system_lyxrc.hunspelldir_path) {
+ string const path = os::external_path(hunspelldir_path);
+ os << "\\hunspelldir_path \"" << path << "\"\n";
+ }
+ if (tag != RC_LAST)
+ break;
case RC_USETEMPDIR:
if (tag != RC_LAST)
break;
if (tag != RC_LAST)
break;
case RC_USE_ALT_LANG:
- if (ignore_system_lyxrc ||
- spellchecker_use_alt_lang != system_lyxrc.spellchecker_use_alt_lang) {
- os << "\\use_alt_language " << convert<string>(spellchecker_use_alt_lang)
- << '\n';
- }
+ // Obsoleted in 2.0
if (tag != RC_LAST)
break;
case RC_ALT_LANG:
if (tag != RC_LAST)
break;
case RC_USE_ESC_CHARS:
- if (ignore_system_lyxrc ||
- spellchecker_use_esc_chars != system_lyxrc.spellchecker_use_esc_chars) {
- os << "\\use_escape_chars " << convert<string>(spellchecker_use_esc_chars)
- << '\n';
- }
if (tag != RC_LAST)
break;
case RC_ESC_CHARS:
if (tag != RC_LAST)
break;
case RC_USE_PERS_DICT:
- if (ignore_system_lyxrc ||
- spellchecker_use_pers_dict != system_lyxrc.spellchecker_use_pers_dict) {
- os << "\\use_personal_dictionary "
- << convert<string>(spellchecker_use_pers_dict)
- << '\n';
- }
+ // obsoleted in 2.0
if (tag != RC_LAST)
break;
case RC_USE_TOOLTIP:
<< convert<string>(use_tooltip)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_USE_PIXMAP_CACHE:
if (ignore_system_lyxrc ||
use_pixmap_cache != system_lyxrc.use_pixmap_cache) {
<< convert<string>(use_pixmap_cache)
<< '\n';
}
+ if (tag != RC_LAST)
+ break;
case RC_PERS_DICT:
- if (spellchecker_pers_dict != system_lyxrc.spellchecker_pers_dict) {
- string const path = os::external_path(spellchecker_pers_dict);
- os << "\\personal_dictionary \"" << path << "\"\n";
- }
+ // obsoleted in 2.0
if (tag != RC_LAST)
break;
case RC_USE_INP_ENC:
- if (ignore_system_lyxrc ||
- spellchecker_use_input_encoding
- != system_lyxrc.spellchecker_use_input_encoding) {
- os << "\\use_input_encoding "
- << convert<string>(spellchecker_use_input_encoding)
- << '\n';
- }
+ // obsoleted in 2.0
if (tag != RC_LAST)
break;
os << "\n#\n"
<< "# LANGUAGE SUPPORT SECTION ##########################\n"
<< "#\n\n";
+ if (tag != RC_LAST)
+ break;
+
+ case RC_SPELLCHECKER:
+ if (ignore_system_lyxrc ||
+ spellchecker != system_lyxrc.spellchecker) {
+ os << "\\spellchecker " << spellchecker << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
case RC_SPELLCHECK_CONTINUOUSLY:
if (ignore_system_lyxrc ||
<< "\" \"\" \"\" \"\" \"\" \"\" \"\"\n";
if (tag != RC_LAST)
break;
+ case RC_VIEWER_ALTERNATIVES:
+ if (ignore_system_lyxrc ||
+ viewer_alternatives != system_lyxrc.viewer_alternatives) {
+ for (vector<pair<string, string> >::const_iterator it = viewer_alternatives.begin();
+ it != viewer_alternatives.end(); ++it)
+ os << "\\viewer_alternatives "
+ << it->first << " " << it->second << "\n";
+ }
+ if (tag != RC_LAST)
+ break;
+ case RC_EDITOR_ALTERNATIVES:
+ if (ignore_system_lyxrc ||
+ editor_alternatives != system_lyxrc.editor_alternatives) {
+ for (vector<pair<string, string> >::const_iterator it = editor_alternatives.begin();
+ it != editor_alternatives.end(); ++it)
+ os << "\\editor_alternatives "
+ << it->first << " " << it->second << "\n";
+ }
+ if (tag != RC_LAST)
+ break;
case RC_DEFAULT_VIEW_FORMAT:
if (ignore_system_lyxrc ||
default_view_format != system_lyxrc.default_view_format) {
str = _("Define the options of bibtex (cf. man bibtex) or select an alternative compiler (e.g. mlbibtex or bibulus).");
break;
+ case RC_JBIBTEX_COMMAND:
+ str = _("Define the options of the bibtex program for PLaTeX (Japanese LaTeX).");
+ break;
+
case RC_BINDFILE:
str = _("Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories.");
break;
str = _("Define the options of makeindex (cf. man makeindex) or select an alternative compiler. E.g., using xindy/make-rules, the command string would be \"makeindex.sh -m $$lang\".");
break;
+ case RC_JINDEX_COMMAND:
+ str = _("Define the options of the index program for PLaTeX (Japanese LaTeX).");
+ break;
+
case RC_NOMENCL_COMMAND:
str = _("Define the options of makeindex (cf. man makeindex) to be used for nomenclatures. This might differ from the index processing options.");
break;
"Use the OS native format.");
break;
- case RC_PERS_DICT:
- case RC_USE_PERS_DICT:
- str = _("Specify an alternate personal dictionary file. E.g. \".aspell_english\".");
- break;
-
case RC_PREVIEW:
str = _("Shows a typeset preview of things such as math");
break;
case RC_USETEMPDIR:
break;
- case RC_USE_INP_ENC:
- str = _("Specify whether to pass the -T input encoding option to aspell. 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;
projects / lyx.git / blobdiff