// The format should also be updated in configure.py, and conversion code
// should be added to prefs2prefs_prefs.py.
-static unsigned int const LYXRC_FILEFORMAT = 29; // spitz: remove \\date_insert_format
+static unsigned int const LYXRC_FILEFORMAT = 31; // lasgouttes: add \ct_additions_underlined
// when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
{ "\\converter", LyXRC::RC_CONVERTER },
{ "\\converter_cache_maxage", LyXRC::RC_CONVERTER_CACHE_MAXAGE },
{ "\\copier", LyXRC::RC_COPIER },
+ { "\\ct_additions_underlined", LyXRC::RC_CT_ADDITIONS_UNDERLINED },
{ "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR },
{ "\\cursor_width", LyXRC::RC_CURSOR_WIDTH },
{ "\\def_file", LyXRC::RC_DEFFILE },
- { "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_POINT },
+ { "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_SEP },
{ "\\default_length_unit", LyXRC::RC_DEFAULT_LENGTH_UNIT },
{ "\\default_otf_view_format", LyXRC::RC_DEFAULT_OTF_VIEW_FORMAT },
{ "\\default_platex_view_format", LyXRC::RC_DEFAULT_PLATEX_VIEW_FORMAT },
{ "\\print_paper_dimension_flag", LyXRC::RC_PRINTPAPERDIMENSIONFLAG },
{ "\\print_paper_flag", LyXRC::RC_PRINTPAPERFLAG },
{ "\\pygmentize_command", LyXRC::RC_PYGMENTIZE_COMMAND },
+ { "\\respect_os_kbd_language", LyXRC::RC_RESPECT_OS_KBD_LANGUAGE },
{ "\\save_compressed", LyXRC::RC_SAVE_COMPRESSED },
{ "\\save_origin", LyXRC::RC_SAVE_ORIGIN },
{ "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
{ "\\use_system_theme_icons", LyXRC::RC_USE_SYSTEM_THEME_ICONS },
{ "\\use_tooltip", LyXRC::RC_USE_TOOLTIP },
{ "\\user_email", LyXRC::RC_USER_EMAIL },
+ { "\\user_initials", LyXRC::RC_USER_INITIALS },
{ "\\user_name", LyXRC::RC_USER_NAME },
{ "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
// compatibility with versions older than 1.4.0 only
break;
case RC_SCREEN_FONT_SIZES:
- lexrc >> font_sizes[FONT_SIZE_TINY];
- lexrc >> font_sizes[FONT_SIZE_SCRIPT];
- lexrc >> font_sizes[FONT_SIZE_FOOTNOTE];
- lexrc >> font_sizes[FONT_SIZE_SMALL];
- lexrc >> font_sizes[FONT_SIZE_NORMAL];
- lexrc >> font_sizes[FONT_SIZE_LARGE];
- lexrc >> font_sizes[FONT_SIZE_LARGER];
- lexrc >> font_sizes[FONT_SIZE_LARGEST];
- lexrc >> font_sizes[FONT_SIZE_HUGE];
- lexrc >> font_sizes[FONT_SIZE_HUGER];
+ lexrc >> font_sizes[TINY_SIZE];
+ lexrc >> font_sizes[SCRIPT_SIZE];
+ lexrc >> font_sizes[FOOTNOTE_SIZE];
+ lexrc >> font_sizes[SMALL_SIZE];
+ lexrc >> font_sizes[NORMAL_SIZE];
+ lexrc >> font_sizes[LARGE_SIZE];
+ lexrc >> font_sizes[LARGER_SIZE];
+ lexrc >> font_sizes[LARGEST_SIZE];
+ lexrc >> font_sizes[HUGE_SIZE];
+ lexrc >> font_sizes[HUGER_SIZE];
break;
case RC_SCREEN_FONT_SCALABLE:
lyxpipes = os::internal_path(lexrc.getString());
break;
+ case RC_CT_ADDITIONS_UNDERLINED:
+ lexrc >> ct_additions_underlined;
+ break;
+
case RC_CURSOR_FOLLOWS_SCROLLBAR:
lexrc >> cursor_follows_scrollbar;
break;
if (lexrc.next())
backupdir_path = os::internal_path(lexrc.getString());
break;
- case RC_DEFAULT_DECIMAL_POINT:
- lexrc >> default_decimal_point;
+ case RC_DEFAULT_DECIMAL_SEP:
+ lexrc >> default_decimal_sep;
break;
case RC_DEFAULT_LENGTH_UNIT:
if (lexrc.next())
case RC_LANGUAGE_COMMAND_LOCAL:
lexrc >> language_command_local;
break;
+ case RC_RESPECT_OS_KBD_LANGUAGE:
+ lexrc >> respect_os_kbd_language;
+ break;
case RC_VISUAL_CURSOR:
lexrc >> visual_cursor;
break;
flgs |= Format::zipped_native;
else if (flag == "menu=export")
flgs |= Format::export_menu;
+ else if (flag == "menu=none")
+ flgs |= Format::no_menu;
else
LYXERR0("Ignoring unknown flag `"
<< flag << "' for format `"
case RC_USER_EMAIL:
lexrc >> user_email;
break;
+ case RC_USER_INITIALS:
+ lexrc >> user_initials;
+ break;
case RC_PATH_PREFIX:
lexrc >> path_prefix;
if (tag != RC_LAST)
break;
// fall through
+ case RC_USER_INITIALS:
+ os << "\\user_initials \"" << user_initials << "\"\n";
+ if (tag != RC_LAST)
+ break;
+ // fall through
case RC_SHOW_BANNER:
if (ignore_system_lyxrc ||
show_banner != system_lyxrc.show_banner) {
if (tag != RC_LAST)
break;
// fall through
+ case RC_CT_ADDITIONS_UNDERLINED:
+ if (ignore_system_lyxrc ||
+ ct_additions_underlined
+ != system_lyxrc.ct_additions_underlined) {
+ os << "\\ct_additions_underlined "
+ << convert<string>(ct_additions_underlined) << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
+ // fall through
case RC_CURSOR_FOLLOWS_SCROLLBAR:
if (ignore_system_lyxrc ||
cursor_follows_scrollbar
// fall through
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[TINY_SIZE]
+ != system_lyxrc.font_sizes[TINY_SIZE] ||
+ font_sizes[SCRIPT_SIZE]
+ != system_lyxrc.font_sizes[SCRIPT_SIZE] ||
+ font_sizes[FOOTNOTE_SIZE]
+ != system_lyxrc.font_sizes[FOOTNOTE_SIZE] ||
+ font_sizes[SMALL_SIZE]
+ != system_lyxrc.font_sizes[SMALL_SIZE] ||
+ font_sizes[NORMAL_SIZE]
+ != system_lyxrc.font_sizes[NORMAL_SIZE] ||
+ font_sizes[LARGE_SIZE]
+ != system_lyxrc.font_sizes[LARGE_SIZE] ||
+ font_sizes[LARGER_SIZE]
+ != system_lyxrc.font_sizes[LARGER_SIZE] ||
+ font_sizes[LARGEST_SIZE]
+ != system_lyxrc.font_sizes[LARGEST_SIZE] ||
+ font_sizes[HUGE_SIZE]
+ != system_lyxrc.font_sizes[HUGE_SIZE] ||
+ font_sizes[HUGER_SIZE]
+ != system_lyxrc.font_sizes[HUGER_SIZE]) {
streamsize old_prec = os.precision();
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[TINY_SIZE]
+ << ' ' << font_sizes[SCRIPT_SIZE]
+ << ' ' << font_sizes[FOOTNOTE_SIZE]
+ << ' ' << font_sizes[SMALL_SIZE]
+ << ' ' << font_sizes[NORMAL_SIZE]
+ << ' ' << font_sizes[LARGE_SIZE]
+ << ' ' << font_sizes[LARGER_SIZE]
+ << ' ' << font_sizes[LARGEST_SIZE]
+ << ' ' << font_sizes[HUGE_SIZE]
+ << ' ' << font_sizes[HUGER_SIZE]
<< '\n';
os.precision(old_prec);
os.unsetf(ios::fixed);
<< "#\n\n";
// fall through
- case RC_DEFAULT_DECIMAL_POINT:
+ case RC_DEFAULT_DECIMAL_SEP:
if (ignore_system_lyxrc ||
- default_decimal_point != system_lyxrc.default_decimal_point) {
- os << "\\default_decimal_point " << default_decimal_point << '\n';
+ default_decimal_sep != system_lyxrc.default_decimal_sep) {
+ os << "\\default_decimal_point \"" << default_decimal_sep << "\"" << '\n';
}
if (tag != RC_LAST)
break;
os << "\\mark_foreign_language " <<
convert<string>(mark_foreign_language) << '\n';
}
+ // fall through
+ case RC_RESPECT_OS_KBD_LANGUAGE:
+ if (ignore_system_lyxrc ||
+ respect_os_kbd_language
+ != system_lyxrc.respect_os_kbd_language) {
+ os << "\\respect_os_kbd_language " <<
+ convert<string>(respect_os_kbd_language) << '\n';
+ }
+ //fall through
if (tag != RC_LAST)
break;
format->documentFormat() != cit->documentFormat() ||
format->vectorFormat() != cit->vectorFormat() ||
format->inExportMenu() != cit->inExportMenu() ||
+ format->noMenu() != cit->noMenu() ||
format->mime() != cit->mime()) {
os << "\\format \"" << cit->name() << "\" \""
<< cit->extensions() << "\" \""
case LyXRC::RC_CONVERTER:
case LyXRC::RC_CONVERTER_CACHE_MAXAGE:
case LyXRC::RC_COPIER:
+ case LyXRC::RC_CT_ADDITIONS_UNDERLINED:
case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR:
case LyXRC::RC_SCROLL_BELOW_DOCUMENT:
case LyXRC::RC_GUI_LANGUAGE:
case LyXRC::RC_MACRO_EDIT_STYLE:
case LyXRC::RC_MAKE_BACKUP:
case LyXRC::RC_MARK_FOREIGN_LANGUAGE:
+ case LyXRC::RC_RESPECT_OS_KBD_LANGUAGE:
case LyXRC::RC_MOUSE_WHEEL_SPEED:
case LyXRC::RC_MOUSE_MIDDLEBUTTON_PASTE:
case LyXRC::RC_NUMLASTFILES:
case LyXRC::RC_THESAURUSDIRPATH:
case LyXRC::RC_UIFILE:
case LyXRC::RC_USER_EMAIL:
+ case LyXRC::RC_USER_INITIALS:
case LyXRC::RC_USER_NAME:
case LyXRC::RC_USE_CONVERTER_CACHE:
case LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
case LyXRC::RC_FORWARD_SEARCH_DVI:
case LyXRC::RC_FORWARD_SEARCH_PDF:
case LyXRC::RC_EXPORT_OVERWRITE:
- case LyXRC::RC_DEFAULT_DECIMAL_POINT:
+ case LyXRC::RC_DEFAULT_DECIMAL_SEP:
case LyXRC::RC_DEFAULT_LENGTH_UNIT:
case LyXRC::RC_SCROLL_WHEEL_ZOOM:
case LyXRC::RC_CURSOR_WIDTH:
str = _("Select to control the highlighting of words with a language foreign to that of the document.");
break;
+ case RC_RESPECT_OS_KBD_LANGUAGE:
+ str = _("Select to use the current keyboard language, as set from the operating system, as default input language.");
+ break;
+
case RC_MOUSE_WHEEL_SPEED:
str = _("The scrolling speed of the mouse wheel.");
break;
projects / lyx.git / blobdiff