X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontIterator.C;h=ab97a6f384c5c862bc13f0a6b224f3cf7585bc97;hb=9e1ce30ff75b0282f428738aa3f3562c21ceb9df;hp=dab014bba1ff3a2f4065bfc462297ad6be0274f5;hpb=a10a536dcf158f1ed5735d0d3e2195ae622fd165;p=lyx.git

diff --git a/src/FontIterator.C b/src/FontIterator.C
index dab014bba1..ab97a6f384 100644
--- a/src/FontIterator.C
+++ b/src/FontIterator.C
@@ -14,15 +14,19 @@
 
 #include "FontIterator.h"
 
+#include "buffer.h"
 #include "lyxtext.h"
 #include "paragraph.h"
 
 
-FontIterator::FontIterator(LyXText const & text, Paragraph const & par,
-			   lyx::pos_type pos)
-	: text_(text), par_(par), pos_(pos),
-	  font_(text.getFont(par, pos)),
-	  endspan_(par.getEndPosOfFontSpan(pos)),
+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)),
+	  endspan_(par.fontSpan(pos).last),
 	  bodypos_(par.beginOfBody())
 {}
 
@@ -43,8 +47,11 @@ FontIterator & FontIterator::operator++()
 {
 	++pos_;
 	if (pos_ > endspan_ || pos_ == bodypos_) {
-		font_ = text_.getFont(par_, pos_);
-		endspan_ = par_.getEndPosOfFontSpan(pos_);
+		font_ = text_.getFont(buffer_, par_, pos_);
+		endspan_ = par_.fontSpan(pos_).last;
 	}
 	return *this;
 }
+
+
+} // namespace lyx