InsetIndex: revamp IndexEntry to handle both legacy and modern index insets; simplify...

[features.git] / src / insets / InsetQuotes.h

diff --git a/src/insets/InsetQuotes.h b/src/insets/InsetQuotes.h
index 2be62e71dcbbf46941f424c668f2eb6514c12d4c..c4b525ce8c8de6757364af799779eb8cf26fd28a 100644 (file)
--- a/src/insets/InsetQuotes.h
+++ b/src/insets/InsetQuotes.h
@@ -15,7 +15,7 @@
 
 #include "Inset.h"
 
-#include "support/docstring.h"
+#include <map>
 
 
 namespace lyx {
@@ -23,51 +23,53 @@ namespace lyx {
 ///
 enum class QuoteStyle : int {
        ///
-       EnglishQuotes,
+       English,
        ///
-       SwedishQuotes,
+       Swedish,
        ///
-       GermanQuotes,
+       German,
        ///
-       PolishQuotes,
+       Polish,
        ///
-       SwissQuotes,
+       Swiss,
        ///
-       DanishQuotes,
+       Danish,
        ///
-       PlainQuotes,
+       Plain,
        ///
-       BritishQuotes,
+       British,
        ///
-       SwedishGQuotes,
+       SwedishG,
        ///
-       FrenchQuotes,
+       French,
        ///
-       FrenchINQuotes,
+       FrenchIN,
        ///
-       RussianQuotes,
+       Russian,
        ///
-       CJKQuotes,
+       CJK,
        ///
-       CJKAngleQuotes,
+       CJKAngle,
        ///
-       DynamicQuotes
+       Hungarian,
+       ///
+       Dynamic
 };
 
 ///
 enum class QuoteSide : int {
        ///
-       OpeningQuote,
+       Opening,
        ///
-       ClosingQuote
+       Closing
 };
 
 ///
 enum class QuoteLevel : int {
        ///
-       SecondaryQuotes,
+       Secondary,
        ///
-       PrimaryQuotes
+       Primary
 };
 
 
@@ -100,15 +102,15 @@ public:
        /// Returns the quote style from the shortcut string
        QuoteStyle getQuoteStyle(std::string const & s,
                bool const allow_wildcards = false,
-               QuoteStyle fallback = QuoteStyle::EnglishQuotes) const;
+               QuoteStyle fallback = QuoteStyle::English) const;
        /// Returns the quote sind from the shortcut string
        QuoteSide getQuoteSide(std::string const & s,
                bool const allow_wildcards = false,
-               QuoteSide fallback = QuoteSide::OpeningQuote) const;
+               QuoteSide fallback = QuoteSide::Opening) const;
        /// Returns the quote level from the shortcut string
        QuoteLevel getQuoteLevel(std::string const & s,
                bool const allow_wildcards = false,
-               QuoteLevel fallback = QuoteLevel::PrimaryQuotes) const;
+               QuoteLevel fallback = QuoteLevel::Primary) const;
 };
 
 ///
@@ -191,15 +193,13 @@ private:
        QuoteStyle getStyle(std::string const &);
 
        ///
-       QuoteStyle style_ = QuoteStyle::EnglishQuotes;
+       QuoteStyle style_ = QuoteStyle::English;
        ///
-       QuoteSide side_ = QuoteSide::OpeningQuote;
+       QuoteSide side_ = QuoteSide::Opening;
        ///
-       QuoteLevel level_ = QuoteLevel::PrimaryQuotes;
+       QuoteLevel level_ = QuoteLevel::Primary;
        ///
-       QuoteStyle global_style_ = QuoteStyle::EnglishQuotes;
-       /// Current font encoding
-       std::string fontenc_;
+       QuoteStyle global_style_ = QuoteStyle::English;
        /// Code of the contextual language
        std::string context_lang_;
        /// Is this in a pass-thru context?