again some things which cherry pick did not catch, sorry

[lyx.git] / src / Encoding.h

diff --git a/src/Encoding.h b/src/Encoding.h
index 6a1e76ce9a0648a63c0a7b61a3ab43b06a0a83a1..7b0fa8ec19a30a0fb8134d8d12b28e38d78b3d80 100644 (file)
--- a/src/Encoding.h
+++ b/src/Encoding.h
@@ -75,7 +75,7 @@ public:
         * LaTeX macro is known, a warning is given of lyxerr, and the
         * character is returned.
         */
-       docstring latexChar(char_type c, bool for_mathed = false) const;
+       docstring latexChar(char_type c, bool no_commands = false) const;
        /// Which LaTeX package handles this encoding?
        Package package() const { return package_; }
        /// A list of all characters usable in this encoding
@@ -172,6 +172,8 @@ public:
        static char_type transformChar(char_type c, LetterForm form);
        /// Is this a combining char?
        static bool isCombiningChar(char_type c);
+       /// Return the TIPA shortcut
+       static std::string const TIPAShortcut(char_type c);
        /**
         * Is this a known char from some language?
         * If \p preamble is empty and code point \p c is known to belong
@@ -193,6 +195,11 @@ public:
         * letters and accented characters that are output as math commands.
         */
        static bool isMathAlpha(char_type c);
+       /**
+        * Do we need to terminate this command (by {} or space)?
+        * This is true if the "notermination" flag is not set.
+        */
+       static bool needsTermination(char_type c);
        /**
         * Register \p c as a mathmode command.
         */
@@ -220,7 +227,7 @@ public:
        /**
         * Initialize mathcmd, textcmd, and mathsym sets.
         */
-       static void initUnicodeMath(Buffer const & buffer, bool clear_sets = true);
+       static void initUnicodeMath(Buffer const & buffer, bool for_master = true);
        /**
         * If \p c cannot be encoded in the given \p encoding, convert
         * it to something that LaTeX can understand in mathmode.
@@ -232,14 +239,25 @@ public:
         * Convert the LaTeX command in \p cmd to the corresponding unicode
         * point and set \p combining to true if it is a combining symbol
         */
-       static char_type fromLaTeXCommand(docstring const & cmd, bool & combining);
+       static char_type fromLaTeXCommand(docstring const & cmd, int cmdtype,
+                       bool & combining, std::set<std::string> * req = 0);
+       ///
+       enum LatexCmd {
+               ///
+               MATH_CMD = 1,
+               ///
+               TEXT_CMD = 2
+       };
        /**
         * Convert the LaTeX commands in \p cmd and \return a docstring
         * of corresponding unicode points. The conversion stops at the
         * first command which could not be converted, and the remaining
-        * unconverted commands are returned in \p rem
+        * unconverted commands are returned in \p rem.
+        * The \p cmdtype parameter can be used to limit recognized
+        * commands to math or text mode commands only.
         */
-       static docstring fromLaTeXCommand(docstring const & cmd, docstring & rem);
+       static docstring fromLaTeXCommand(docstring const & cmd, int cmdtype,
+                       docstring & rem, std::set<std::string> * req = 0);
        /**
         * Add the preamble snippet needed for the output of \p c to
         * \p features.