Two fixes involving RtL text drawing

[lyx.git] / src / lyxtextclass.h

diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 2bf28f6a9e3013ec9fc19ba7390b721f00783172..e602b4041b453a6238509d191a3ff56905da67f1 100644 (file)
--- a/src/lyxtextclass.h
+++ b/src/lyxtextclass.h
@@ -22,6 +22,23 @@ class Counters;
 class FloatList;
 
 
+///
+class CharStyle {
+public:
+       std::string name;
+       std::string latextype;
+       std::string latexname;
+       std::string latexparam;
+       LyXFont font;
+       LyXFont labelfont;
+       std::string preamble;
+};
+
+
+/// List of semantically defined character style insets
+typedef std::vector<CharStyle> CharStyles;
+
+
 /// Stores the layout specification of a LyX document class.
 class LyXTextClass {
 public:
@@ -55,6 +72,8 @@ public:
        ///
        void readClassOptions(LyXLex &);
        ///
+       void readCharStyle(LyXLex &, std::string const &);
+       ///
        void readFloat(LyXLex &);
        ///
        void readCounter(LyXLex &);
@@ -66,6 +85,8 @@ public:
 
        /// Sees to that the textclass structure has been loaded
        bool load() const;
+       /// Has this layout file been loaded yet?
+       bool loaded() const { return loaded_; }
 
        /// the list of floats defined in the document class
        FloatList & floats();
@@ -73,6 +94,10 @@ public:
        FloatList const & floats() const;
        /// The Counters present in this document class.
        Counters & counters() const;
+       /// CharStyles of this doc class
+       CharStyles & charstyles() const { return charstylelist_; };
+       /// Retrieve element of name s:
+       CharStyles::iterator charstyle(std::string const & s) const;
        ///
        std::string const & defaultLayoutName() const;
        ///
@@ -90,6 +115,8 @@ public:
        ///
        std::string const & options() const;
        ///
+       std::string const & class_header() const;
+       ///
        std::string const & pagestyle() const;
        ///
        std::string const & preamble() const;
@@ -145,6 +172,10 @@ public:
 
        ///
        int size() const;
+       /// The minimal TocLevel of sectioning layouts
+       int min_toclevel() const;
+       /// The maximal TocLevel of sectioning layouts
+       int max_toclevel() const;
 private:
        ///
        bool delete_layout(std::string const &);
@@ -165,6 +196,8 @@ private:
        ///
        std::string pagestyle_;
        ///
+       std::string class_header_;
+       ///
        std::string defaultlayout_;
        /// preamble text to support layout styles
        std::string preamble_;
@@ -199,6 +232,8 @@ private:
 
        /// Paragraph styles used in this layout
        LayoutList layoutlist_;
+       /// CharStyles available to this layout
+       mutable CharStyles charstylelist_;
 
        /// available types of float, eg. figure, algorithm.
        boost::shared_ptr<FloatList> floatlist_;
@@ -207,10 +242,15 @@ private:
        boost::shared_ptr<Counters> ctrs_;
 
        /// Has this layout file been loaded yet?
-       mutable bool loaded;
+       mutable bool loaded_;
 
        /// Is the TeX class available?
        bool texClassAvail_;
+
+       /// The minimal TocLevel of sectioning layouts
+       int min_toclevel_;
+       /// The maximal TocLevel of sectioning layouts
+       int max_toclevel_;
 };