X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontIterator.C;h=ab97a6f384c5c862bc13f0a6b224f3cf7585bc97;hb=8765ab59cdddad67284007813ef25934ea0042ce;hp=ac3f52170d6b6c2cf9dde1fbbc8d13c2eae3d160;hpb=f5e68ec257e1d18c1b94f165377dfab06c1e553e;p=lyx.git diff --git a/src/FontIterator.C b/src/FontIterator.C index ac3f52170d..ab97a6f384 100644 --- a/src/FontIterator.C +++ b/src/FontIterator.C @@ -14,14 +14,18 @@ #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()) {} @@ -43,8 +47,11 @@ FontIterator & FontIterator::operator++() { ++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