X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFontIterator.cpp;h=c4f553162c7aa9f1e91f209bb708a1229dc7973b;hb=f1687373b1486e0f66b6545acae3b4384c195658;hp=116523f430e50e4e1da5c4648a0868a02d5d1bc5;hpb=d35d25460b57c14e67a26c593881dfff31b35da5;p=lyx.git diff --git a/src/FontIterator.cpp b/src/FontIterator.cpp index 116523f430..c4f553162c 100644 --- a/src/FontIterator.cpp +++ b/src/FontIterator.cpp @@ -22,9 +22,9 @@ namespace lyx { FontIterator::FontIterator(TextMetrics const & tm, - Paragraph const & par, pos_type pos) - : tm_(tm), par_(par), pos_(pos), - font_(tm.getDisplayFont(par, pos)), + Paragraph const & par, pit_type pit, pos_type pos) + : tm_(tm), par_(par), pit_(pit), pos_(pos), + font_(tm.getDisplayFont(pit, pos)), endspan_(par.fontSpan(pos).last), bodypos_(par.beginOfBody()) {} @@ -46,7 +46,7 @@ FontIterator & FontIterator::operator++() { ++pos_; if (pos_ > endspan_ || pos_ == bodypos_) { - font_ = tm_.getDisplayFont(par_, pos_); + font_ = tm_.getDisplayFont(pit_, pos_); endspan_ = par_.fontSpan(pos_).last; } return *this;