X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontIterator.C;h=ab97a6f384c5c862bc13f0a6b224f3cf7585bc97;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=38c12672e734e5a1e51088978aca017ae6d9cab1;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git diff --git a/src/FontIterator.C b/src/FontIterator.C index 38c12672e7..ab97a6f384 100644 --- a/src/FontIterator.C +++ b/src/FontIterator.C @@ -14,6 +14,7 @@ #include "FontIterator.h" +#include "buffer.h" #include "lyxtext.h" #include "paragraph.h" @@ -21,10 +22,10 @@ namespace lyx { -FontIterator::FontIterator(LyXText const & text, Paragraph const & par, - pos_type pos) - : text_(text), par_(par), pos_(pos), - font_(text.getFont(par, pos)), +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()) {} @@ -46,7 +47,7 @@ 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;