Revert "Fix bug with wrong baseline calculation in last paragraph"

[lyx.git] / src / FontList.h

diff --git a/src/FontList.h b/src/FontList.h
index c5882a763518285c587c9a0aa02b0423c1b2fe52..fed99fe8fc08d34c14ae29bbb565312d68fc79f1 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.
-       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_;
@@ -84,25 +84,32 @@ public:
        ///
        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;
        ///
-       Font & get(pos_type pos);
+       Font const & get(pos_type pos);
        ///
        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
-       Font_size highestInRange(
+       FontSize highestInRange(
                pos_type startpos,
                pos_type endpos,
-               Font_size def_size
+               FontSize def_size
                ) const;
 
        /// is there a font change in middle of the word?