#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)),
+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())
{}
{
++pos_;
if (pos_ > endspan_ || pos_ == bodypos_) {
- font_ = text_.getFont(par_, pos_);
+ font_ = text_.getFont(buffer_, par_, pos_);
endspan_ = par_.fontSpan(pos_).last;
}
return *this;
}
+
+
+} // namespace lyx