X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=f7c085c64c3cb6e4c3aa372b126ea1ffc66ff216;hb=861c6167ca5f1329e16dd788489a7c03772e2332;hp=55efe9c7cade62811393853aea2e7ee3e29220bd;hpb=c476c3766cf74b3c95ca91f2fb0a0fd7f5df1110;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 55efe9c7ca..f7c085c64c 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -61,7 +61,7 @@ namespace {
 
 // 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 },
@@ -92,10 +92,12 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\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 },
-	{ "\\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 },
@@ -201,6 +203,7 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\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
@@ -670,6 +673,14 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 				lyxpipes = os::internal_path(lexrc.getString());
 			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:
 			lexrc >> cursor_follows_scrollbar;
 			break;
@@ -752,8 +763,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			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())
@@ -884,6 +895,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 					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 `"
@@ -969,6 +982,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		case RC_USER_EMAIL:
 			lexrc >> user_email;
 			break;
+		case RC_USER_INITIALS:
+			lexrc >> user_initials;
+			break;
 
 		case RC_PATH_PREFIX:
 			lexrc >> path_prefix;
@@ -1444,6 +1460,11 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		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) {
@@ -1575,6 +1596,26 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		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
@@ -2267,10 +2308,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		   << "#\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;
@@ -2521,6 +2562,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 			    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() << "\" \""
@@ -2743,6 +2785,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	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:
@@ -2866,6 +2910,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	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:
@@ -2892,7 +2937,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	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: