*
*/
-
#include <config.h>
#include "FontIterator.h"
FontIterator::FontIterator(TextMetrics const & tm,
Paragraph const & par, pit_type pit, pos_type pos)
: tm_(tm), par_(par), pit_(pit), pos_(pos),
- font_(tm.getDisplayFont(pit, pos)),
+ font_(tm.displayFont(pit, pos)),
endspan_(par.fontSpan(pos).last),
bodypos_(par.beginOfBody())
{}
{
++pos_;
if (pos_ > endspan_ || pos_ == bodypos_) {
- font_ = tm_.getDisplayFont(pit_, pos_);
+ font_ = tm_.displayFont(pit_, pos_);
endspan_ = par_.fontSpan(pos_).last;
}
return *this;