adjust

[lyx.git] / src / FontIterator.cpp

diff --git a/src/FontIterator.cpp b/src/FontIterator.cpp
index c24cbce693eacf09fae699c1d060607f6b8a01ce..c4f553162c7aa9f1e91f209bb708a1229dc7973b 100644 (file)
--- a/src/FontIterator.cpp
+++ b/src/FontIterator.cpp
@@ -14,18 +14,17 @@
 
 #include "FontIterator.h"
 
-#include "Buffer.h"
-#include "LyXText.h"
+#include "TextMetrics.h"
 #include "Paragraph.h"
 
 
 namespace lyx {
 
 
-FontIterator::FontIterator(Buffer const & buffer, LyXText const & text,
-               Paragraph const & par, pos_type pos)
-       : buffer_(buffer), text_(text), par_(par), pos_(pos),
-         font_(text.getFont(buffer, par, pos)),
+FontIterator::FontIterator(TextMetrics const & tm,
+               Paragraph const & par, pit_type pit, pos_type pos)
+       : tm_(tm), par_(par), pit_(pit), pos_(pos),
+         font_(tm.getDisplayFont(pit, pos)),
          endspan_(par.fontSpan(pos).last),
          bodypos_(par.beginOfBody())
 {}
@@ -47,7 +46,7 @@ FontIterator & FontIterator::operator++()
 {
        ++pos_;
        if (pos_ > endspan_ || pos_ == bodypos_) {
-               font_ = text_.getFont(buffer_, par_, pos_);
+               font_ = tm_.getDisplayFont(pit_, pos_);
                endspan_ = par_.fontSpan(pos_).last;
        }
        return *this;