X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.h;h=704e3ed6113afdfd6fc8b1f0b92b6685c2e24864;hb=2455bc258f3b62c29ec4a41cb88070ff8518e842;hp=069431b22f2fc6538b775c50d357920fb3a432d9;hpb=8cbc28d88029b0f877f116a79238ebcd4a8fd910;p=lyx.git

diff --git a/src/Encoding.h b/src/Encoding.h
index 069431b22f..704e3ed611 100644
--- a/src/Encoding.h
+++ b/src/Encoding.h
@@ -51,7 +51,8 @@ public:
 	Encoding() {}
 	///
 	Encoding(std::string const & n, std::string const & l,
-		 std::string const & i, bool f, Package p);
+		 std::string const & g, std::string const & i,
+		 bool f, Package p);
 	///
 	void init() const;
 	///
@@ -59,7 +60,11 @@ public:
 	///
 	std::string const & latexName() const { return latexName_; }
 	///
+	std::string const & guiName() const { return guiName_; }
+	///
 	std::string const & iconvName() const { return iconvName_; }
+	///
+	bool const & hasFixedWidth() const { return fixedwidth_; }
 	/**
 	 * Convert \p c to something that LaTeX can understand.
 	 * This is either the character itself (if it is representable
@@ -68,7 +73,7 @@ public:
 	 * LaTeX macro is known, a warning is given of lyxerr, and the
 	 * character is returned.
 	 */
-	docstring latexChar(char_type c) const;
+	docstring latexChar(char_type c, bool for_mathed = false) const;
 	/// Which LaTeX package handles this encoding?
 	Package package() const { return package_; }
 	/// A list of all characters usable in this encoding
@@ -79,6 +84,8 @@ private:
 	///
 	std::string latexName_;
 	///
+	std::string guiName_;
+	///
 	std::string iconvName_;
 	/// Is this a fixed width encoding?
 	bool fixedwidth_;
@@ -173,10 +180,11 @@ public:
 	 */
 	static bool isForced(char_type c);
 	/**
-	 * Convert \p c to something that LaTeX can understand in math mode.
+	 * If \p c cannot be encoded in the given \p encoding, convert
+	 * it to something that LaTeX can understand in math mode.
 	 * \return whether \p command is a math mode command
 	 */
-	static bool latexMathChar(char_type c, docstring & command);
+	static bool latexMathChar(char_type c, Encoding const * encoding, docstring & command);
 
 	/**
 	 * Convert the LaTeX command in \p cmd to the corresponding unicode