X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.h;h=df900b343b92058f8a43d3a32a205da083a94e8f;hb=59e3ff27ffde4f7ac54cc4849c537f9f15dd3d8f;hp=00d0106b543fc36c1925d6e61e9b04e4d4c8fb60;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/src/Encoding.h b/src/Encoding.h
index 00d0106b54..df900b343b 100644
--- a/src/Encoding.h
+++ b/src/Encoding.h
@@ -52,6 +52,8 @@ enum CharInfoFlags {
 	CharInfoMathNoTermination = 32,
 	///
 	CharInfoForceSelected = 64,
+	///
+	CharInfoDeprecated = 128
 };
 
 
@@ -74,24 +76,26 @@ public:
 	/// Needed LaTeX preamble (or feature) for math mode
 	std::string mathpreamble() const { return mathpreamble_; }
 	/// Is this a combining character?
-	bool combining() const { return flags_ & CharInfoCombining ? true : false; }
+	bool combining() const { return flags_ & CharInfoCombining; }
 	/// Is \c textpreamble a feature known by LaTeXFeatures, or a raw LaTeX
 	/// command?
-	bool textfeature() const { return flags_ & CharInfoTextFeature ? true : false; }
+	bool textfeature() const { return flags_ & CharInfoTextFeature; }
 	/// Is \c mathpreamble a feature known by LaTeXFeatures, or a raw LaTeX
 	/// command?
-	bool mathfeature() const { return flags_ & CharInfoMathFeature ? true : false; }
+	bool mathfeature() const { return flags_ & CharInfoMathFeature; }
 	/// Always force the LaTeX command, even if the encoding contains
 	/// this character?
-	bool force() const { return flags_ & CharInfoForce ? true : false; }
+	bool force() const { return flags_ & CharInfoForce; }
 	/// Force the LaTeX command for some encodings?
-	bool forceselected() const { return flags_ & CharInfoForceSelected ? true : false; }
+	bool forceselected() const { return flags_ & CharInfoForceSelected; }
+	/// Disable LaTeX command => char_type conversion for this deprecated symbol?
+	bool deprecated() const { return flags_ & CharInfoDeprecated; }
 	/// TIPA shortcut
 	std::string const tipashortcut() const { return tipashortcut_; }
 	/// \c textcommand needs no termination (such as {} or space).
-	bool textnotermination() const { return flags_ & CharInfoTextNoTermination ? true : false; }
+	bool textnotermination() const { return flags_ & CharInfoTextNoTermination; }
 	/// \c mathcommand needs no termination (such as {} or space).
-	bool mathnotermination() const { return flags_ & CharInfoMathNoTermination ? true : false; }
+	bool mathnotermination() const { return flags_ & CharInfoMathNoTermination; }
 	///
 private:
 	/// LaTeX command (text mode) for this character
@@ -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,
@@ -267,20 +272,25 @@ public:
 	/// 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
-	 * to a supported script, true is returned and \p preamble is set
-	 * to the corresponding entry in the unicodesymbols file.
-	 * If \p preamble is not empty, a check is made whether code point
-	 * \p c is a known character matching the preamble entry.
+	 * Test, if \p c is a supported Greek or Cyrillic letter.
+	 * Return script macro name or empty string.
 	 */
-	static bool isKnownScriptChar(char_type const c, std::string & preamble);
+	static std::string const isKnownScriptChar(char_type const c);
+	/// Does \p fontenc support characters in \p script?
+	static bool fontencSupportsScript(std::string const & fontenc,
+									  std::string const & script);
 	/**
 	 * 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
 	 * 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.
 	 */