GuiCharacter: Consider default settings for underline, strikeout and language

[lyx.git] / src / Encoding.h

diff --git a/src/Encoding.h b/src/Encoding.h
index 00d0106b543fc36c1925d6e61e9b04e4d4c8fb60..7400127f2d5c5c58734384399fa24d8dea13d7cd 100644 (file)
--- a/src/Encoding.h
+++ b/src/Encoding.h
@@ -52,6 +52,8 @@ enum CharInfoFlags {
        CharInfoMathNoTermination = 32,
        ///
        CharInfoForceSelected = 64,
+       ///
+       CharInfoDeprecated = 128
 };
 
 
@@ -86,6 +88,8 @@ public:
        bool force() const { return flags_ & CharInfoForce ? true : false; }
        /// Force the LaTeX command for some encodings?
        bool forceselected() const { return flags_ & CharInfoForceSelected ? true : false; }
+       /// Disable LaTeX command => char_type conversion for this deprecated symbol?
+       bool deprecated() const { return flags_ & CharInfoDeprecated ? true : false; }
        /// TIPA shortcut
        std::string const tipashortcut() const { return tipashortcut_; }
        /// \c textcommand needs no termination (such as {} or space).
@@ -126,7 +130,8 @@ public:
        /// Represent any of the above packages
        static int const any;
        ///
-       Encoding() : fixedwidth_(true), unsafe_(false), complete_(false) {}
+       Encoding() : fixedwidth_(true), unsafe_(false), forced_(0),
+                    start_encodable_(0), package_(none), complete_(false) {}
        ///
        Encoding(std::string const & n, std::string const & l,
                 std::string const & g, std::string const & i,
@@ -281,6 +286,12 @@ public:
         * letters and accented characters that are output as math commands.
         */
        static bool isMathAlpha(char_type c);
+       /**
+        * Do we have to wrap in \text this character when in mathmode?
+        * This is true if \p c is not ascii and the "mathalpha" flag is not
+        * set and a mathcommand is not defined in the unicodesymbols file.
+        */
+       static bool isUnicodeTextOnly(char_type c);
        /**
         * Register \p c as a mathmode command.
         */