X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.h;h=bed6aa3810dfb80270e7eaf7488d7bc4840b1e05;hb=653376087d4107e127d577d6a4f29351a9d46b05;hp=f099280059aca12118e36b7137d1731aea0de741;hpb=7728b5cbb94017541a38d98abadee9cdaf7b23cc;p=lyx.git

diff --git a/src/Encoding.h b/src/Encoding.h
index f099280059..bed6aa3810 100644
--- 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
@@ -190,7 +190,7 @@ public:
 	/**
 	 * Do we have to display in italics this character when in mathmode?
 	 * This is true if the "mathalpha" flag is set. We use this for
-	 * accented characters that are output as math commands.
+	 * letters and accented characters that are output as math commands.
 	 */
 	static bool isMathAlpha(char_type c);
 	/**
@@ -220,7 +220,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.
@@ -233,13 +233,23 @@ public:
 	 * point and set \p combining to true if it is a combining symbol
 	 */
 	static char_type fromLaTeXCommand(docstring const & cmd, bool & combining);
+	///
+	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,
+			docstring & rem, int cmdtype = MATH_CMD | TEXT_CMD);
 	/**
 	 * Add the preamble snippet needed for the output of \p c to
 	 * \p features.