X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontIterator.h;h=44ecb3790813371662cc0c4de11a9cb2a7b628fb;hb=2417d9d911dbca181c48f45d1aad26d31c9aa815;hp=e52c67b17591fef5d314df0e758052c4214fb212;hpb=0d43ba149a41e8860dde316ccbd4336d6b0bbdfa;p=lyx.git diff --git a/src/FontIterator.h b/src/FontIterator.h index e52c67b175..44ecb37908 100644 --- a/src/FontIterator.h +++ b/src/FontIterator.h @@ -9,7 +9,7 @@ * Full author contact details are available in file CREDITS. * * - * Calling LyXText::getFont is slow. While rebreaking we scan a + * Calling Text::getFont is slow. While rebreaking we scan a * paragraph from left to right calling getFont for every char. This * simple class address this problem by hidding an optimization trick * (not mine btw -AB): the font is reused in the whole font span. The @@ -20,38 +20,48 @@ #ifndef FONTITERATOR_H #define FONTITERATOR_H -#include "lyxfont.h" +#include "Font.h" #include "support/types.h" -class LyXText; +namespace lyx { -class FontIterator : std::iterator +class Paragraph; +class TextMetrics; + + +class FontIterator : std::iterator { public: /// - FontIterator(LyXText const & text, lyx::par_type pit, lyx::pos_type pos); - /// - LyXFont operator*() const; + FontIterator(TextMetrics const & tm, + Paragraph const & par, pit_type pit, pos_type pos); + /// + Font const & operator*() const; /// FontIterator & operator++(); /// - LyXFont * operator->(); + Font * operator->(); private: /// - LyXText const & text_; + TextMetrics const & tm_; /// - lyx::par_type pit_; + Paragraph const & par_; /// - lyx::pos_type pos_; + pit_type pit_; /// - LyXFont font_; + pos_type pos_; /// - lyx::pos_type endspan_; + Font font_; /// - lyx::pos_type bodypos_; + pos_type endspan_; + /// + pos_type bodypos_; }; + +} // namespace lyx + #endif // FONTITERATOR_H