Move <algorithm> from DocIterator.h

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index ba5020cf20b370e6241f75a95b3a0abf04a610e5..8950ea511c15ca7f64988e13a114703def498c47 100644 (file)
--- 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"
 
@@ -53,6 +53,9 @@ public:
                RC_BINDFILE,
                RC_CHECKLASTFILES,
                RC_CHKTEX_COMMAND,
+               RC_CITATION_SEARCH,
+               RC_CITATION_SEARCH_PATTERN,
+               RC_CITATION_SEARCH_VIEW,
                RC_COMPLETION_CURSOR_TEXT,
                RC_COMPLETION_INLINE_DELAY,
                RC_COMPLETION_INLINE_MATH,
@@ -66,9 +69,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,
@@ -169,6 +174,7 @@ public:
                RC_UIFILE,
                RC_USELASTFILEPOS,
                RC_USER_EMAIL,
+               RC_USER_INITIALS,
                RC_USER_NAME,
                RC_USE_CONVERTER_CACHE,
                RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN,
@@ -240,6 +246,15 @@ public:
        /// default paper size for local xdvi/dvips/ghostview/whatever
        /// command to run chktex incl. options
        std::string chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
+       /// Use external script to search for file corresponding to a 
+       /// given citation.
+       bool citation_search = false;
+       /// Name of external script which searches for file corresponding to a 
+       /// given citation. At this moment only script lyxpaperview.p is supported
+       /// (search for pdf or ps based on specific items)
+       std::string citation_search_view;
+       /// Items to search for in citation_search_view
+       std::string citation_search_pattern = "%year% %abbrvciteauthor%";
        /// all available commands to run bibtex incl. options
        CommandSet bibtex_alternatives;
        /// command to run bibtex incl. options
@@ -418,6 +433,10 @@ public:
        ///
        bool cursor_follows_scrollbar = false;
        ///
+       bool ct_additions_underlined = true;
+       ///
+       bool ct_markup_copied = false;
+       ///
        bool scroll_below_document = false;
        ///
        enum MacroEditStyle {
@@ -449,6 +468,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
@@ -525,7 +546,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;
        ///
@@ -537,8 +558,9 @@ public:
        };
        ///
        ScrollWheelZoom scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
+       // FIXME: should be caret_width
        ///
-       int cursor_width = 1;
+       int cursor_width = 0;
        /// One of: yes, no, ask
        std::string close_buffer_with_last_view = "yes";
 };
@@ -551,7 +573,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