}
-bool TextMetrics::has(pit_type pit) const
+bool TextMetrics::contains(pit_type pit) const
{
return par_metrics_.find(pit) != par_metrics_.end();
}
}
-Font TextMetrics::getDisplayFont(pit_type pit, pos_type pos) const
+Font TextMetrics::displayFont(pit_type pit, pos_type pos) const
{
BOOST_ASSERT(pos >= 0);
if (boundary && sl.pos() > 0)
correction = -1;
- return getDisplayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
+ return displayFont(sl.pit(), sl.pos() + correction).isVisibleRightToLeft();
}
Paragraph const & par = text_->getPar(pit);
- bool left = getDisplayFont(pit, pos - 1).isVisibleRightToLeft();
+ bool left = displayFont(pit, pos - 1).isVisibleRightToLeft();
bool right;
if (pos == par.size())
right = par.isRTL(bv_->buffer().params());
else
- right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+ right = displayFont(pit, pos).isVisibleRightToLeft();
return left != right;
}
if (pos == par.size())
right = par.isRTL(bv_->buffer().params());
else
- right = getDisplayFont(pit, pos).isVisibleRightToLeft();
+ right = displayFont(pit, pos).isVisibleRightToLeft();
return left != right;
}
main_text_ = (text_ == &buffer.text());
bool changed = false;
- // FIXME This check ought to be done somewhere else. It is the reason
+ // FIXME: This check ought to be done somewhere else. It is the reason
// why text_ is not const. But then, where else to do it?
// Well, how can you end up with either (a) a biblio environment that
// has no InsetBibitem or (b) a biblio environment with more than one
// InsetBibitem? I think the answer is: when paragraphs are merged;
// when layout is set; when material is pasted.
- int const moveCursor = par.checkBiblio(buffer.params().trackChanges);
+ int const moveCursor = par.checkBiblio(buffer);
if (moveCursor > 0)
const_cast<Cursor &>(bv_->cursor()).posForward();
else if (moveCursor < 0) {
int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
- right_margin;
Font const & font = ii->inset->noFontChange() ?
- bufferfont : getDisplayFont(pit, ii->pos);
+ bufferfont : displayFont(pit, ii->pos);
MacroContext mc(buffer, parPos);
MetricsInfo mi(bv_, font.fontInfo(), w, mc);
ii->inset->metrics(mi, dim);
if (body_pos > 0
&& (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
- row.x += theFontMetrics(text_->getLabelFont(buffer, par)).
+ row.x += theFontMetrics(text_->labelFont(buffer, par)).
width(layout->labelsep);
if (body_pos <= end)
row.x += row.label_hfill;
return 0;
FontMetrics const & fm
- = theFontMetrics(text_->getLabelFont(buffer, par));
+ = theFontMetrics(text_->labelFont(buffer, par));
return max(0, fm.width(label) - w);
}
// add the auto-hfill from label end to the body
if (body_pos && i == body_pos) {
FontMetrics const & fm = theFontMetrics(
- text_->getLabelFont(buffer, par));
+ text_->labelFont(buffer, par));
int add = fm.width(layout->labelsep);
if (par.isLineSeparator(i - 1))
add -= singleWidth(pit, i - 1);
for ( ; i < end; ++i, ++fi) {
if (body_pos > 0 && i == body_pos) {
FontMetrics const & fm = theFontMetrics(
- text_->getLabelFont(buffer, par));
+ text_->labelFont(buffer, par));
w += fm.width(par.layout()->labelsep);
if (par.isLineSeparator(i - 1))
w -= singleWidth(pit, i - 1);
if (body_pos > 0 && body_pos >= end) {
FontMetrics const & fm = theFontMetrics(
- text_->getLabelFont(buffer, par));
+ text_->labelFont(buffer, par));
w += fm.width(par.layout()->labelsep);
if (end > 0 && par.isLineSeparator(end - 1))
w -= singleWidth(pit, end - 1);
// start with so we don't have to do the assignment below too
// often.
Buffer const & buffer = bv_->buffer();
- Font font = getDisplayFont(pit, first);
+ Font font = displayFont(pit, first);
FontSize const tmpsize = font.fontInfo().size();
- font.fontInfo() = text_->getLayoutFont(buffer, pit);
+ font.fontInfo() = text_->layoutFont(buffer, pit);
FontSize const size = font.fontInfo().size();
font.fontInfo().setSize(tmpsize);
- FontInfo labelfont = text_->getLabelFont(buffer, par);
+ FontInfo labelfont = text_->labelFont(buffer, par);
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
FontMetrics const & fontmetrics = theFontMetrics(font);
|| layout->labeltype == LABEL_BIBLIO
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
&& isFirstInSequence(pit, pars)
- && !par.getLabelstring().empty())
+ && !par.labelString().empty())
{
labeladdon = int(
labelfont_metrics.maxHeight()
last_tmpx = tmpx;
if (body_pos > 0 && c == body_pos - 1) {
FontMetrics const & fm = theFontMetrics(
- text_->getLabelFont(buffer, par));
+ text_->labelFont(buffer, par));
tmpx += row.label_hfill + fm.width(layout->labelsep);
if (par.isLineSeparator(body_pos - 1))
tmpx -= singleWidth(pit, body_pos - 1);
if (inlineCompletionPos.inTexted()
&& inlineCompletionPos.text() == text_
&& inlineCompletionPos.pit() == pit
- && inlineCompletionPos.pos() >= row_pos
- && inlineCompletionPos.pos() <= end) {
+ && inlineCompletionPos.pos() - 1 >= row_pos
+ && inlineCompletionPos.pos() - 1 < end) {
// draw logically behind the previous character
inlineCompletionVPos = bidi.log2vis(inlineCompletionPos.pos() - 1);
}
// Inline completion RTL special case row_pos == cursor_pos:
// "__|b" => cursor_pos is right of __
if (row_pos == inlineCompletionVPos && row_pos == cursor_vpos) {
- font = getDisplayFont(pit, row_pos + 1);
+ font = displayFont(pit, row_pos + 1);
docstring const & completion = bv_->inlineCompletion();
if (font.isRightToLeft() && completion.length() > 0)
x += theFontMetrics(font.fontInfo()).width(completion);
pos_type pos = bidi.vis2log(vpos);
if (body_pos > 0 && pos == body_pos - 1) {
FontMetrics const & labelfm = theFontMetrics(
- text_->getLabelFont(buffer, par));
+ text_->labelFont(buffer, par));
x += row.label_hfill + labelfm.width(par.layout()->labelsep);
if (par.isLineSeparator(body_pos - 1))
x -= singleWidth(pit, body_pos - 1);
// Use font span to speed things up, see above
if (pos < font_span.first || pos > font_span.last) {
font_span = par.fontSpan(pos);
- font = getDisplayFont(pit, pos);
+ font = displayFont(pit, pos);
}
x += pm.singleWidth(pos, font);
// "a__|b", __ of b => non-boundary a-pos is right of __
if (vpos + 1 == inlineCompletionVPos
&& (vpos + 1 < cursor_vpos || !boundary_correction)) {
- font = getDisplayFont(pit, vpos + 1);
+ font = displayFont(pit, vpos + 1);
docstring const & completion = bv_->inlineCompletion();
if (font.isRightToLeft() && completion.length() > 0)
x += theFontMetrics(font.fontInfo()).width(completion);
// "b|__a", __ of b => non-boundary a-pos is in front of __
if (vpos == inlineCompletionVPos
&& (vpos + 1 < cursor_vpos || boundary_correction)) {
- font = getDisplayFont(pit, vpos);
+ font = displayFont(pit, vpos);
docstring const & completion = bv_->inlineCompletion();
if (!font.isRightToLeft() && completion.length() > 0)
x += theFontMetrics(font.fontInfo()).width(completion);
BOOST_ASSERT(pos <= par.size());
Buffer const & buffer = bv_->buffer();
//lyxerr << "TextMetrics::leftMargin: pit: " << pit << " pos: " << pos << endl;
- TextClass const & tclass = buffer.params().textClass();
+ DocumentClass const & tclass = buffer.params().documentClass();
LayoutPtr const & layout = par.layout();
docstring parindent = layout->parindent;
&& pit > 0 && pars[pit - 1].layout()->nextnoindent)
parindent.erase();
- FontInfo const labelfont = text_->getLabelFont(buffer, par);
+ FontInfo const labelfont = text_->labelFont(buffer, par);
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
switch (layout->margintype) {
l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
layout->leftmargin);
}
- if (!par.getLabelstring().empty()) {
+ if (!par.labelString().empty()) {
l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- l_margin += labelfont_metrics.width(par.getLabelstring());
+ l_margin += labelfont_metrics.width(par.labelString());
l_margin += labelfont_metrics.width(layout->labelsep);
}
break;
LABEL_CENTERED_TOP_ENVIRONMENT) {
l_margin += labelfont_metrics.signedWidth(layout->labelindent);
l_margin += labelfont_metrics.width(layout->labelsep);
- l_margin += labelfont_metrics.width(par.getLabelstring());
+ l_margin += labelfont_metrics.width(par.labelString());
}
break;
&& align == LYX_ALIGN_BLOCK
&& !par.params().noindent()
// in some insets, paragraphs are never indented
- && !(par.inInset() && par.inInset()->neverIndent(buffer))
+ && !(par.inInset() && par.inInset()->neverIndent())
// display style insets are always centered, omit indentation
&& !(!par.empty()
&& par.isInset(pos)
{
ParagraphMetrics const & pm = par_metrics_[pit];
- return pm.singleWidth(pos, getDisplayFont(pit, pos));
+ return pm.singleWidth(pos, displayFont(pit, pos));
}