// 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 = 30; // lasgouttes: add \respect_os_kbd_language
+static unsigned int const LYXRC_FILEFORMAT = 32; // spitz: add \ct_markup_copied
// 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 },
+ { "\\ct_markup_copied", LyXRC::RC_CT_MARKUP_COPIED },
{ "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR },
{ "\\cursor_width", LyXRC::RC_CURSOR_WIDTH },
{ "\\def_file", LyXRC::RC_DEFFILE },
{ "\\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
lexrc.printError("Missing color tag.");
break;
}
- string lyx_name = lexrc.getString();
+ string const lyx_name = lexrc.getString();
if (!lexrc.next()) {
lexrc.printError("Missing color name for color: `$$Token'");
break;
}
- string x11_name = lexrc.getString();
+ string const x11_name = lexrc.getString();
ColorCode const col =
lcolor.getFromLyXName(lyx_name);
if (!lcolor.setColor(col, x11_name))
LYXERR0("Bad lyxrc set_color for " << lyx_name);
+ LYXERR(Debug::LYXRC, "Set " << lyx_name << "(" << col << ") to " << x11_name);
break;
}
break;
case RC_SERVERPIPE:
- if (lexrc.next())
- lyxpipes = os::internal_path(lexrc.getString());
+ if (lexrc.next()) {
+ string userdir = package().user_support().absFileName();
+ if (userdir.back() == '/')
+ userdir.pop_back();
+ lyxpipes = subst(os::internal_path(lexrc.getString()), "$$UserDir",
+ userdir);
+ }
+ break;
+
+ case RC_CT_ADDITIONS_UNDERLINED:
+ lexrc >> ct_additions_underlined;
+ break;
+
+ case RC_CT_MARKUP_COPIED:
+ lexrc >> ct_markup_copied;
break;
case RC_CURSOR_FOLLOWS_SCROLLBAR:
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_CT_MARKUP_COPIED:
+ if (ignore_system_lyxrc ||
+ ct_markup_copied
+ != system_lyxrc.ct_markup_copied) {
+ os << "\\ct_markup_copied "
+ << convert<string>(ct_markup_copied) << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
+ // fall through
case RC_CURSOR_FOLLOWS_SCROLLBAR:
if (ignore_system_lyxrc ||
cursor_follows_scrollbar
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_CT_MARKUP_COPIED:
case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR:
case LyXRC::RC_SCROLL_BELOW_DOCUMENT:
case LyXRC::RC_GUI_LANGUAGE:
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: