-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.getFontSpan(pos).second),
+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),