bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
Font const & font) const
{
- if (!lyxrc.rtl_support)
+ if (!lyxrc.rtl_support
+ // no RTL boundary at paragraph start
+ || pos == 0
+ // if the metrics have not been calculated, then we are not
+ // on screen and can safely ignore issues about boundaries.
+ || !contains(pit))
return false;
- // no RTL boundary at paragraph start
- if (pos == 0)
- return false;
-
ParagraphMetrics & pm = par_metrics_[pit];
// no RTL boundary in empty paragraph
if (pm.rows().empty())
return false;
Paragraph const & par = text_->getPar(pit);
- bool left = font.isVisibleRightToLeft();
- bool right;
- if (pos == par.size())
- right = par.isRTL(bv_->buffer().params());
- else
- right = displayFont(pit, pos).isVisibleRightToLeft();
-
// no RTL boundary at line break:
// abc|\n -> move right -> abc\n (and not: abc\n|
// FED FED| FED )
|| par.isSeparator(pos - 1)))
return false;
+ bool left = font.isVisibleRightToLeft();
+ bool right;
+ if (pos == par.size())
+ right = par.isRTL(bv_->buffer().params());
+ else
+ right = displayFont(pit, pos).isVisibleRightToLeft();
+
return left != right;
}