* \author Alfredo Braunstein
*
* Full author contact details are available in file CREDITS.
- *
+ *
*/
#include <config.h>
-#include "lyxtext.h"
-
#include "FontIterator.h"
+
+#include "lyxtext.h"
#include "paragraph.h"
-FontIterator::FontIterator(LyXText const & text, ParagraphList::iterator pit,
+FontIterator::FontIterator(LyXText const & text, lyx::pit_type pit,
lyx::pos_type pos)
: text_(text), pit_(pit), pos_(pos),
- font_(text.getFont(pit, pos)),
- endspan_(pit->getEndPosOfFontSpan(pos)),
- bodypos_(pit->beginOfBody())
+ font_(text.getFont(text.getPar(pit), pos)),
+ endspan_(text.getPar(pit).getEndPosOfFontSpan(pos)),
+ bodypos_(text.getPar(pit).beginOfBody())
{}
LyXFont FontIterator::operator*() const
{
- return font_;
+ return font_;
}
{
++pos_;
if (pos_ > endspan_ || pos_ == bodypos_) {
- font_ = text_.getFont(pit_, pos_);
- endspan_ = pit_->getEndPosOfFontSpan(pos_);
+ font_ = text_.getFont(text_.getPar(pit_), pos_);
+ endspan_ = text_.getPar(pit_).getEndPosOfFontSpan(pos_);
}
return *this;
}