fix bug #6584

[lyx.git] / src / FontList.h

diff --git a/src/FontList.h b/src/FontList.h
index c5882a763518285c587c9a0aa02b0423c1b2fe52..61ab2205f244d3d78f122ff7cf13d1d4e560dc6e 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,6 +84,8 @@ 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);
        void erase(pos_type pos);
        ///
        iterator fontIterator(pos_type pos);


@@ -94,15 +96,20 @@ public:
        ///
        void set(pos_type pos, Font const & font);
        ///
        ///
        void set(pos_type pos, Font const & font);
        ///

+       void setRange(
+               pos_type startpos,
+               pos_type endpos,
+               Font const & font);
+       ///

        void increasePosAfterPos(pos_type pos);
        ///
        void decreasePosAfterPos(pos_type pos);
 
        /// Returns the height of the highest font in range
        void increasePosAfterPos(pos_type pos);
        ///
        void decreasePosAfterPos(pos_type pos);
 
        /// Returns the height of the highest font in range

-       Font_size highestInRange(
+       FontSize highestInRange(

                pos_type startpos,
                pos_type endpos,
                pos_type startpos,
                pos_type endpos,

-               Font_size def_size
+               FontSize def_size

                ) const;
 
        /// is there a font change in middle of the word?
                ) const;
 
        /// is there a font change in middle of the word?