X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=92c95b0d1e5736981178ae0947990edd840e507f;hb=027563eec2d2a1b81391b221f9ca40d823713235;hp=f8327bd7ee7ecb9e49cfbf6956b5ac6b176e3bce;hpb=e46d043034748f1fec9af1d1bba7b94e07831a77;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index f8327bd7ee..92c95b0d1e 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -63,6 +63,7 @@ keyword_item lyxrcTags[] = {
 	{ "\\bind_file", LyXRC::RC_BINDFILE },
 	{ "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES },
 	{ "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND },
+	{ "\\completion_cursor_text", LyXRC::RC_COMPLETION_CURSOR_TEXT },
 	{ "\\completion_inline_delay", LyXRC::RC_COMPLETION_INLINE_DELAY },
 	{ "\\completion_inline_dots", LyXRC::RC_COMPLETION_INLINE_DOTS },
 	{ "\\completion_inline_math", LyXRC::RC_COMPLETION_INLINE_MATH },
@@ -162,6 +163,7 @@ keyword_item lyxrcTags[] = {
 	{ "\\tex_expects_windows_paths", LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS },
 	{ "\\ui_file", LyXRC::RC_UIFILE },
 	{ "\\use_alt_language", LyXRC::RC_USE_ALT_LANG },
+	{ "\\use_bundled_format", LyXRC::RC_USE_BUNDLED_FORMAT },
 	{ "\\use_converter_cache", LyXRC::RC_USE_CONVERTER_CACHE },
 	{ "\\use_escape_chars", LyXRC::RC_USE_ESC_CHARS },
 	{ "\\use_input_encoding", LyXRC::RC_USE_INP_ENC },
@@ -298,6 +300,7 @@ void LyXRC::setDefaults() {
 #else
 	open_buffers_in_tabs = true;
 #endif
+	use_bundled_format = false;
 
 	// Fullscreen settings
 	full_screen_limit = false;
@@ -306,6 +309,7 @@ void LyXRC::setDefaults() {
 	full_screen_scrollbar = true;
 	full_screen_width = 700;
 
+	completion_cursor_text = true;
 	completion_popup_math = true;
 	completion_popup_text = false;
 	completion_popup_delay = 2.0;
@@ -821,6 +825,12 @@ int LyXRC::read(Lexer & lexrc)
 			}
 			break;
 
+		case RC_COMPLETION_CURSOR_TEXT:
+			if (lexrc.next()) {
+				completion_cursor_text = lexrc.getBool();
+			}
+			break;
+
 		case RC_COMPLETION_POPUP_AFTER_COMPLETE:
 			if (lexrc.next()) {
 				completion_popup_after_complete = lexrc.getBool();
@@ -1306,6 +1316,10 @@ int LyXRC::read(Lexer & lexrc)
 			if (lexrc.next())
 				open_buffers_in_tabs = lexrc.getBool();
 				break;
+		case RC_USE_BUNDLED_FORMAT:
+			if (lexrc.next())
+				use_bundled_format = lexrc.getBool();
+				break;
 
 		case RC_LAST: break; // this is just a dummy
 		}
@@ -1893,6 +1907,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+	case RC_USE_BUNDLED_FORMAT:
+		if (ignore_system_lyxrc ||
+		    use_bundled_format != system_lyxrc.use_bundled_format) {
+			os << "\\use_bundled_format "
+			   << convert<string>(use_bundled_format)
+			   << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
 
 		os << "\n#\n"
 		   << "# COLOR SECTION ###################################\n"
@@ -2191,6 +2214,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+	case RC_COMPLETION_CURSOR_TEXT:
+		if (ignore_system_lyxrc ||
+		    completion_cursor_text != system_lyxrc.completion_cursor_text) {
+			os << "\\completion_cursor_text "
+			   << convert<string>(completion_cursor_text) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
 	case RC_COMPLETION_POPUP_AFTER_COMPLETE:
 		if (ignore_system_lyxrc ||
 		    completion_popup_after_complete
@@ -2816,6 +2847,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		str = _("Show the completion popup without delay after non-unique completion attempt.");
 		break;
 
+	case RC_COMPLETION_POPUP_TEXT:
+		str = _("Show a small triangle on the cursor to indicate that a completion is available.");
+		break;
+
 	case RC_COMPLETION_POPUP_DELAY:
 		str = _("The inline completion delay.");
 		break;