DocBook: properly escape PI in InsetMarginal.

[lyx.git] / src / FontList.h

diff --git a/src/FontList.h b/src/FontList.h
index c5882a763518285c587c9a0aa02b0423c1b2fe52..2b09c11fb41c09d2019dfe5ed46a1c078fa9a327 100644 (file)
--- a/src/FontList.h
+++ b/src/FontList.h
@@ -56,7 +56,7 @@ private:
        paragraph or, in the case of nested paragraphs, from the
        layout in the environment one level up until completely
        resolved.
        paragraph or, in the case of nested paragraphs, from the
        layout in the environment one level up until completely
        resolved.

-       The values Font::IGNORE_* and Font::TOGGLE are NOT
+       The values Font::IGNORE_* and FONT_TOGGLE are NOT

        allowed in these font tables.
        */
        Font font_;
        allowed in these font tables.
        */
        Font font_;


@@ -84,13 +84,15 @@ public:
        ///
        bool empty() const { return list_.empty(); }
        ///
        ///
        bool empty() const { return list_.empty(); }
        ///

+       void clear() { list_.clear(); }
+       ///

        void erase(pos_type pos);
        ///
        iterator fontIterator(pos_type pos);
        ///
        const_iterator fontIterator(pos_type pos) const;
        ///
        void erase(pos_type pos);
        ///
        iterator fontIterator(pos_type pos);
        ///
        const_iterator fontIterator(pos_type pos) const;
        ///

-       Font & get(pos_type pos);
+       Font const & get(pos_type pos);

        ///
        void set(pos_type pos, Font const & font);
        ///
        ///
        void set(pos_type pos, Font const & font);
        ///


@@ -98,19 +100,6 @@ public:
        ///
        void decreasePosAfterPos(pos_type pos);
 
        ///
        void decreasePosAfterPos(pos_type pos);
 

-       /// Returns the height of the highest font in range
-       Font_size highestInRange(
-               pos_type startpos,
-               pos_type endpos,
-               Font_size def_size
-               ) const;
-
-       /// is there a font change in middle of the word?
-       bool hasChangeInRange(
-               pos_type pos, ///< position in the paragraph.
-               int len ///< length of the range to check.
-               ) const;
-

        ///
        void validate(LaTeXFeatures & features) const;
 
        ///
        void validate(LaTeXFeatures & features) const;