X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=955826bcf6c57034210d3c879d3217ff18e4dbd4;hb=d9f1f7e348d3175bb9bd72d42a113bf1e644031e;hp=ab6a590d20fd8d5fa4004ba0e82e05146f70c10f;hpb=7bb08f10b1567a1a5bd87ba213c13a40d6a70cfc;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index ab6a590d20..955826bcf6 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -18,9 +18,9 @@
 #ifndef LYXRC_H
 #define LYXRC_H
 
-#include "Length.h"
 #include "LyX.h"
 
+#include "support/Length.h"
 #include "support/strfwd.h"
 #include "support/userinfo.h"
 
@@ -66,9 +66,11 @@ public:
 		RC_CONVERTER,
 		RC_CONVERTER_CACHE_MAXAGE,
 		RC_COPIER,
+		RC_CT_ADDITIONS_UNDERLINED,
+		RC_CT_MARKUP_COPIED,
 		RC_CURSOR_FOLLOWS_SCROLLBAR,
 		RC_CURSOR_WIDTH,
-		RC_DEFAULT_DECIMAL_POINT,
+		RC_DEFAULT_DECIMAL_SEP,
 		RC_DEFAULT_LENGTH_UNIT,
 		RC_DEFAULT_OTF_VIEW_FORMAT,
 		RC_DEFAULT_PLATEX_VIEW_FORMAT,
@@ -135,6 +137,7 @@ public:
 		RC_PRINTPAPERDIMENSIONFLAG,
 		RC_PRINTPAPERFLAG,
 		RC_PYGMENTIZE_COMMAND,
+		RC_RESPECT_OS_KBD_LANGUAGE,
 		RC_SAVE_COMPRESSED,
 		RC_SAVE_ORIGIN,
 		RC_SCREEN_DPI,
@@ -168,6 +171,7 @@ public:
 		RC_UIFILE,
 		RC_USELASTFILEPOS,
 		RC_USER_EMAIL,
+		RC_USER_INITIALS,
 		RC_USER_NAME,
 		RC_USE_CONVERTER_CACHE,
 		RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN,
@@ -399,6 +403,8 @@ public:
 	///
 	std::string gui_language = "auto";
 	///
+	bool respect_os_kbd_language = false;
+	///
 	std::string default_otf_view_format = "pdf4";
 	///
 	std::string default_platex_view_format = "pdf3";
@@ -415,6 +421,10 @@ public:
 	///
 	bool cursor_follows_scrollbar = false;
 	///
+	bool ct_additions_underlined = true;
+	///
+	bool ct_markup_copied = false;
+	///
 	bool scroll_below_document = false;
 	///
 	enum MacroEditStyle {
@@ -446,6 +456,8 @@ public:
 	std::string user_name; // set in constructor
 	/// user email
 	std::string user_email; // set in constructor (empty for now)
+	/// user initials
+	std::string user_initials;
 	/// icon set name
 	std::string icon_set;
 	/// whether to use the icons from the theme
@@ -522,7 +534,7 @@ public:
 	///
 	int export_overwrite = NO_FILES;
 	/// Default decimal point when aligning table columns on decimal
-	std::string default_decimal_point = ".";
+	std::string default_decimal_sep = "locale";
 	///
 	Length::UNIT default_length_unit = Length::CM;
 	///
@@ -548,7 +560,7 @@ extern LyXRC lyxrc;
 ///
 extern LyXRC system_lyxrc;
 
-// used by at least frontends/qt4/GuiPref.cpp
+// used by at least frontends/qt/GuiPref.cpp
 const long maxlastfiles = 50;
 
 } // namespace lyx