Two fixes involving RtL text drawing

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 14e89546a8710a4adfe40f381bc630ff0011d7f4..070b1840f369706398a16aec2ee9055b431b09fe 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -36,30 +36,29 @@ using std::string;
 using std::ostream;
 
 
-namespace { // anon
+namespace {
 
-struct compare_name {
-
-       compare_name(string const & name)
+class LayoutNamesEqual : public std::unary_function<LyXLayout_ptr, bool> {
+public:
+       LayoutNamesEqual(string const & name)
                : name_(name)
        {}
-
-       bool operator()(boost::shared_ptr<LyXLayout> const & c)
+       bool operator()(LyXLayout_ptr const & c) const
        {
                return c->name() == name_;
        }
-
+private:
        string name_;
-
 };
 
-} // anon
+} // namespace anon
 
 
 LyXTextClass::LyXTextClass(string const & fn, string const & cln,
                           string const & desc, bool texClassAvail )
        : name_(fn), latexname_(cln), description_(desc),
-         floatlist_(new FloatList), ctrs_(new Counters), texClassAvail_(texClassAvail)
+         floatlist_(new FloatList), ctrs_(new Counters),
+         texClassAvail_(texClassAvail)
 {
        outputType_ = LATEX;
        columns_ = 1;
@@ -73,7 +72,7 @@ LyXTextClass::LyXTextClass(string const & fn, string const & cln,
        provides_ = nothing;
        titletype_ = TITLE_COMMAND_AFTER;
        titlename_ = "maketitle";
-       loaded = false;
+       loaded_ = false;
 }
 
 
@@ -385,6 +384,27 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                               << "' is missing a defaultstyle." << endl;
                        error = true;
                }
+
+               min_toclevel_ = LyXLayout::NOT_IN_TOC;
+               max_toclevel_ = LyXLayout::NOT_IN_TOC;
+               const_iterator cit = begin();
+               const_iterator the_end = end();
+               for ( ; cit != the_end ; ++cit) {
+                       int const toclevel = (*cit)->toclevel;
+                       if (toclevel != LyXLayout::NOT_IN_TOC) {
+                               if (min_toclevel_ == LyXLayout::NOT_IN_TOC)
+                                       min_toclevel_ = toclevel;
+                               else
+                                       min_toclevel_ = std::min(min_toclevel_,
+                                                        toclevel);
+                               max_toclevel_ = std::max(max_toclevel_,
+                                                        toclevel);
+                       }
+               }
+               lyxerr[Debug::TCLASS]
+                       << "Minimum TocLevel is " << min_toclevel_
+                       << ", maximum is " << max_toclevel_ <<endl;
+
        } else
                lyxerr[Debug::TCLASS] << "Finished reading input file "
                                      << MakeDisplayPath(filename)
@@ -452,20 +472,6 @@ void LyXTextClass::readOutputType(LyXLex & lexrc)
 }
 
 
-enum MaxCounterTags {
-       MC_COUNTER_CHAPTER = 1,
-       MC_COUNTER_SECTION,
-       MC_COUNTER_SUBSECTION,
-       MC_COUNTER_SUBSUBSECTION,
-       MC_COUNTER_PARAGRAPH,
-       MC_COUNTER_SUBPARAGRAPH,
-       MC_COUNTER_ENUMI,
-       MC_COUNTER_ENUMII,
-       MC_COUNTER_ENUMIII,
-       MC_COUNTER_ENUMIV
-};
-
-
 enum ClassOptionsTags {
        CO_FONTSIZE = 1,
        CO_PAGESTYLE,
@@ -551,7 +557,7 @@ void LyXTextClass::readCharStyle(LyXLex & lexrc, string const & name)
        LyXFont font(LyXFont::ALL_INHERIT);
        LyXFont labelfont(LyXFont::ALL_INHERIT);
        string preamble;
-       
+
        bool getout = false;
        while (!getout && lexrc.isOK()) {
                int le = lexrc.lex();
@@ -790,7 +796,7 @@ bool LyXTextClass::hasLayout(string const & n) const
        string const name = (n.empty() ? defaultLayoutName() : n);
 
        return find_if(layoutlist_.begin(), layoutlist_.end(),
-                      compare_name(name))
+                      LayoutNamesEqual(name))
                != layoutlist_.end();
 }
 
@@ -803,7 +809,7 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & name) const
        LayoutList::const_iterator cit =
                find_if(layoutlist_.begin(),
                        layoutlist_.end(),
-                       compare_name(name));
+                       LayoutNamesEqual(name));
 
        if (cit == layoutlist_.end()) {
                lyxerr << "We failed to find the layout '" << name
@@ -829,7 +835,7 @@ bool LyXTextClass::delete_layout(string const & name)
 
        LayoutList::iterator it =
                remove_if(layoutlist_.begin(), layoutlist_.end(),
-                         compare_name(name));
+                         LayoutNamesEqual(name));
 
        LayoutList::iterator end = layoutlist_.end();
        bool const ret = (it != end);
@@ -841,22 +847,22 @@ bool LyXTextClass::delete_layout(string const & name)
 // Load textclass info if not loaded yet
 bool LyXTextClass::load() const
 {
-       if (loaded)
+       if (loaded_)
                return true;
 
        // Read style-file
        string const real_file = LibFileSearch("layouts", name_, "layout");
+       loaded_ = const_cast<LyXTextClass*>(this)->Read(real_file) == 0;
 
-       if (const_cast<LyXTextClass*>(this)->Read(real_file)) {
+       if (!loaded_) {
                lyxerr << "Error reading `"
                       << MakeDisplayPath(real_file)
                       << "'\n(Check `" << name_
                       << "')\nCheck your installation and "
                        "try Options/Reconfigure..." << endl;
-               loaded = false;
        }
-       loaded = true;
-       return loaded;
+
+       return loaded_;
 }
 
 
@@ -1012,6 +1018,18 @@ int LyXTextClass::size() const
 }
 
 
+int LyXTextClass::min_toclevel() const
+{
+       return min_toclevel_;
+}
+
+
+int LyXTextClass::max_toclevel() const
+{
+       return max_toclevel_;
+}
+
+
 ostream & operator<<(ostream & os, LyXTextClass::PageSides p)
 {
        switch (p) {