X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.h;h=df900b343b92058f8a43d3a32a205da083a94e8f;hb=02d2e4aa3279b872c9786718dab4f95fd44e900a;hp=33919281d1322c7d42061c9c7757c6774c83a106;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git diff --git a/src/Encoding.h b/src/Encoding.h index 33919281d1..df900b343b 100644 --- a/src/Encoding.h +++ b/src/Encoding.h @@ -14,6 +14,7 @@ #define ENCODING_H #include "support/docstring.h" +#include "support/trivstring.h" #include "support/types.h" #include @@ -29,7 +30,7 @@ public: EncodingException(char_type c); virtual ~EncodingException() throw() {} virtual const char * what() const throw(); - + char_type failed_char; int par_id; pos_type pos; @@ -51,6 +52,8 @@ enum CharInfoFlags { CharInfoMathNoTermination = 32, /// CharInfoForceSelected = 64, + /// + CharInfoDeprecated = 128 }; @@ -73,42 +76,48 @@ 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 - docstring textcommand_; + trivdocstring textcommand_; /// LaTeX command (math mode) for this character - docstring mathcommand_; + trivdocstring mathcommand_; /// Needed LaTeX preamble (or feature) for text mode - std::string textpreamble_; + trivstring textpreamble_; /// Needed LaTeX preamble (or feature) for math mode - std::string mathpreamble_; + trivstring mathpreamble_; /// TIPA shortcut - std::string tipashortcut_; + trivstring tipashortcut_; /// feature flags unsigned int flags_; }; -/// +/** + * An encoding as defined in lib/encodings. + * All const methods are thread-safe, so the caller does not need any locking. + * This property must be kept when changing the class. + */ class Encoding { public: /// Which LaTeX package handles this encoding? @@ -121,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, @@ -129,13 +139,13 @@ public: /// void init() const; /// - std::string const & name() const { return name_; } + std::string const name() const { return name_; } /// - std::string const & latexName() const { return latexName_; } + std::string const latexName() const { return latexName_; } /// - std::string const & guiName() const { return guiName_; } + std::string const guiName() const { return guiName_; } /// - std::string const & iconvName() const { return iconvName_; } + std::string const iconvName() const { return iconvName_; } /// bool hasFixedWidth() const { return fixedwidth_; } /// @@ -178,13 +188,13 @@ private: */ bool isForced(char_type c) const; /// - std::string name_; + trivstring name_; /// - std::string latexName_; + trivstring latexName_; /// - std::string guiName_; + trivstring guiName_; /// - std::string iconvName_; + trivstring iconvName_; /// Is this a fixed width encoding? bool fixedwidth_; /// Is this encoding TeX unsafe, e.g. control characters like {, } @@ -194,13 +204,13 @@ private: typedef std::set CharSet; /// Set of UCS4 characters that we can encode (for singlebyte /// encodings only) - mutable CharSet encodable_; + CharSet encodable_; /// Set of UCS4 characters that we can't encode CharSet const * forced_; /// All code points below this are encodable. This helps us to avoid /// lokup of ASCII characters in encodable_ and gives about 1 sec /// speedup on export of the Userguide. - mutable char_type start_encodable_; + char_type start_encodable_; /// Which LaTeX package handles this encoding? Package package_; /** @@ -210,7 +220,7 @@ private: * This is needed especially for the multibyte encodings, if we * complete all encoding info on startup it takes 2-3 minutes. */ - mutable bool complete_; + bool complete_; }; class Encodings { @@ -222,7 +232,7 @@ public: /// typedef std::set MathSymbolSet; /// - typedef std::map EncodingList; + typedef std::map EncodingList; /// iterator to iterate over all encodings. /// We hide the fact that our encoding list is implemented as a map. class const_iterator : public EncodingList::const_iterator { @@ -262,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. */