DocBook: don't use a surrounding <para> for rendered insets.

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 3ebecb7c197ecc2abfda7dbf92e49dd09093703d..74c0e4cfe104fdd194a2e67badccda5276eff3a8 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -51,6 +51,7 @@ public:
                RC_BIBTEX_ALTERNATIVES,
                RC_BIBTEX_COMMAND,
                RC_BINDFILE,
+               RC_BOOKMARKS_VISIBILITY,
                RC_CHECKLASTFILES,
                RC_CHKTEX_COMMAND,
                RC_CITATION_SEARCH,
@@ -194,7 +195,7 @@ public:
        ///
        LyXRC() : user_name(support::user_name()),
                  user_email(support::user_email()) // always empty
-               {};
+               {}
 
        /// \param check_format: whether to try to convert the file format,
        /// if it is not current. this should only be true, really, for the
@@ -318,6 +319,7 @@ public:
        int defaultZoom = 150;
        /// Actual zoom factor for screen fonts
        /// (default zoom plus buffer zoom factor)
+       /// Do not set directly. Use GuiView::setCurrentZoom()
        int currentZoom = 150;
        /// Screen font sizes in points for each font size
        std::string font_sizes[10] = { "5.0", "7.0", "8.0", "9.0", "10.0",
@@ -370,11 +372,9 @@ public:
        /// Accept compound words in spellchecker?
        bool spellchecker_accept_compound = false;
        /// spellcheck continuously?
-       bool spellcheck_continuously = false;
+       bool spellcheck_continuously = true;
        /// spellcheck notes and comments?
        bool spellcheck_notes = true;
-       /// minimum length of words to complete
-       unsigned int completion_minlength = 6;
        ///
        bool use_kbmap = false;
        ///
@@ -523,6 +523,8 @@ public:
        bool completion_inline_text = false;
        ///
        int completion_inline_dots = -1;
+       /// minimum length of words to complete
+       unsigned int completion_minlength = 6;
        ///
        double completion_popup_delay = 2.0;
        ///
@@ -560,9 +562,17 @@ 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";
+       enum BookmarksVisibility {
+               BMK_NONE,
+               BMK_MARGIN,
+               BMK_INLINE
+       };
+
+       ///
+       BookmarksVisibility bookmarks_visibility = BMK_NONE;
 };