#include "CoordCache.h"
#include "Cursor.h"
#include "CutAndPaste.h"
-#include "FuncRequest.h"
#include "HSpace.h"
#include "InsetList.h"
#include "Layout.h"
dim_.wid = max_width_;
dim_.asc = 10;
dim_.des = 10;
-
- //text_->updateLabels(bv->buffer());
}
pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
{
+ LASSERT(!par_metrics_.empty(), /**/);
ParMetricsCache::const_reverse_iterator it = par_metrics_.rbegin();
return make_pair(it->first, &it->second);
}
}
-int TextMetrics::parPosition(pit_type pit) const
-{
- if (pit < par_metrics_.begin()->first)
- return -1000000;
- if (pit > par_metrics_.rbegin()->first)
- return +1000000;
-
- return par_metrics_[pit].position();
-}
-
-
bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
{
LASSERT(mi.base.textwidth > 0, /**/);
bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
{
- if (!lyxrc.rtl_support)
- return false;
-
// no RTL boundary at paragraph start
- if (pos == 0)
+ if (!lyxrc.rtl_support || pos == 0)
return false;
Font const & left_font = displayFont(pit, pos - 1);
}
+// isRTLBoundary returns false on a real end-of-line boundary,
+// because otherwise the two boundary types get mixed up.
+// This is the whole purpose of this being in TextMetrics.
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;
}
bool TextMetrics::redoParagraph(pit_type const pit)
{
Paragraph & par = text_->getPar(pit);
- // IMPORTANT NOTE: We pass 'false' explicitely in order to not call
+ // IMPORTANT NOTE: We pass 'false' explicitly in order to not call
// redoParagraph() recursively inside parMetrics.
Dimension old_dim = parMetrics(pit, false).dim();
ParagraphMetrics & pm = par_metrics_[pit];
main_text_ = (text_ == &buffer.text());
bool changed = false;
+ // Check whether there are InsetBibItems that need fixing
// 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?
+ // 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);
- if (moveCursor > 0)
- const_cast<Cursor &>(bv_->cursor()).posForward();
- else if (moveCursor < 0) {
- Cursor & cursor = const_cast<Cursor &>(bv_->cursor());
- if (cursor.pos() >= -moveCursor)
- cursor.posBackward();
+ if (par.brokenBiblio()) {
+ Cursor & cur = const_cast<Cursor &>(bv_->cursor());
+ // In some cases, we do not know how to record undo
+ if (&cur.inset() == &text_->inset())
+ cur.recordUndo(ATOMIC_UNDO, pit, pit);
+
+ int const moveCursor = par.fixBiblio(buffer);
+
+ // Is it necessary to update the cursor?
+ if (&cur.inset() == &text_->inset() && cur.pit() == pit) {
+ if (moveCursor > 0)
+ cur.posForward();
+ else if (moveCursor < 0 && cur.pos() >= -moveCursor)
+ cur.posBackward();
+ }
}
// Optimisation: this is used in the next two loops
LYXERR(Debug::INFO, "MacroContext not initialised!"
<< " Going through the buffer again and hope"
<< " the context is better then.");
- bv_->buffer().updateLabels();
+ // FIXME audit updateBuffer calls
+ // This should not be here, but it is not clear yet where else it
+ // should be.
+ bv_->buffer().updateBuffer();
parPos = text_->macrocontextPosition();
LASSERT(!parPos.empty(), /**/);
parPos.pit() = pit;
}
// redo insets
- // FIXME: We should always use getFont(), see documentation of
- // noFontChange() in Inset.h.
Font const bufferfont = buffer.params().getFont();
InsetList::const_iterator ii = par.insetList().begin();
InsetList::const_iterator iend = par.insetList().end();
for (; ii != iend; ++ii) {
+ // FIXME Doesn't this HAVE to be non-empty?
// position already initialized?
if (!parPos.empty()) {
parPos.pos() = ii->pos;
Dimension dim;
int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
- right_margin;
- Font const & font = ii->inset->noFontChange() ?
- bufferfont : displayFont(pit, ii->pos);
+ Font const & font = ii->inset->inheritFont() ?
+ displayFont(pit, ii->pos) : bufferfont;
MacroContext mc(&buffer, parPos);
MetricsInfo mi(bv_, font.fontInfo(), w, mc);
ii->inset->metrics(mi, dim);
}
}
+ // Has the user requested we not justify stuff?
+ if (!bv_->buffer().params().justification
+ && align == LYX_ALIGN_BLOCK)
+ align = LYX_ALIGN_LEFT;
+
switch (align) {
case LYX_ALIGN_BLOCK: {
int const ns = numberOfSeparators(par, row);
}
+#if 0
+// Not used, see TextMetrics::rowBreakPoint.
// this needs special handling - only newlines count as a break point
static pos_type addressBreakPoint(pos_type i, Paragraph const & par)
{
return end;
}
+#endif
int TextMetrics::labelEnd(pit_type const pit) const
Layout const & layout = par.layout();
+#if 0
+ //FIXME: As long as leftMargin() is not correctly implemented for
+ // MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here.
+ // Otherwise, long rows will be painted off the screen.
if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX)
return addressBreakPoint(pos, par);
+#endif
pos_type const body_pos = par.beginOfBody();
if (first == 0 && topBottomSpace) {
BufferParams const & bufparams = buffer.params();
// some parskips VERY EASY IMPLEMENTATION
- if (bufparams.paragraph_separation
- == BufferParams::ParagraphSkipSeparation
- && inset.lyxCode() != ERT_CODE
- && inset.lyxCode() != LISTINGS_CODE
- && pit > 0
- && ((layout.isParagraph() && par.getDepth() == 0)
- || (pars[pit - 1].layout().isParagraph()
- && pars[pit - 1].getDepth() == 0)))
- {
- maxasc += bufparams.getDefSkip().inPixels(*bv_);
+ if (bufparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
+ && !inset.getLayout().parbreakIsNewline()
+ && !par.layout().parbreak_is_newline
+ && pit > 0
+ && ((layout.isParagraph() && par.getDepth() == 0)
+ || (pars[pit - 1].layout().isParagraph()
+ && pars[pit - 1].getDepth() == 0))) {
+ maxasc += bufparams.getDefSkip().inPixels(*bv_);
}
if (par.params().startOfAppendix())
return 0;
}
- // if the first character is a separator, we are in RTL
- // text. This character will not be painted on screen
- // and thus we should not count it and skip to the next.
- if (par.isSeparator(bidi.vis2log(vc)))
+ // This (rtl_support test) is not needed, but gives
+ // some speedup if rtl_support == false
+ bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size();
+
+ // If lastrow is false, we don't need to compute
+ // the value of rtl.
+ bool const rtl_on_lastrow = lastrow ? text_->isRTL(par) : false;
+
+ // if the first character is a separator, and we are in RTL
+ // text, this character will not be painted on screen
+ // and thus we should not count it and skip to the next. Only
+ // in freespacing paragraphs, this first character is painted.
+ if (!par.isFreeSpacing() && par.isSeparator(bidi.vis2log(vc)))
++vc;
while (vc < end && tmpx <= x) {
LASSERT(vc <= end, /**/); // This shouldn't happen.
boundary = false;
- // This (rtl_support test) is not needed, but gives
- // some speedup if rtl_support == false
- bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size();
- // If lastrow is false, we don't need to compute
- // the value of rtl.
- bool const rtl = lastrow ? text_->isRTL(par) : false;
if (lastrow &&
- ((rtl && left_side && vc == row.pos() && x < tmpx - 5) ||
- (!rtl && !left_side && vc == end && x > tmpx + 5))) {
+ ((rtl_on_lastrow && left_side && vc == row.pos() && x < tmpx - 5) ||
+ (!rtl_on_lastrow && !left_side && vc == end && x > tmpx + 5))) {
if (!par.isNewline(end - 1))
c = end;
} else if (vc == row.pos()) {
int yy = -1;
ParMetricsCache::const_iterator it = par_metrics_.begin();
ParMetricsCache::const_iterator et = par_metrics_.end();
- ParMetricsCache::const_iterator last = et; last--;
+ ParMetricsCache::const_iterator last = et;
+ --last;
ParagraphMetrics const & pm = it->second;
// This should be just before or just behind the
// cursor position set above.
LASSERT(inset == inset_before
- || inset == pars[pit].getInset(pos), /**/);
+ || inset == pars[pit].getInset(pos), return 0);
// Make sure the cursor points to the position before
// this inset.
case MARGIN_RIGHT_ADDRESS_BOX: {
#if 0
- // ok, a terrible hack. The left margin depends on the widest
- // row in this paragraph.
- RowList::iterator rit = par.rows().begin();
- RowList::iterator end = par.rows().end();
- // FIXME: This is wrong.
+ // The left margin depends on the widest row in this paragraph.
+ // This code is wrong because it depends on the rows, but at the
+ // same time this function is used in redoParagraph to construct
+ // the rows.
+ ParagraphMetrics const & pm = par_metrics_[pit];
+ RowList::const_iterator rit = pm.rows().begin();
+ RowList::const_iterator end = pm.rows().end();
int minfill = max_width;
for ( ; rit != end; ++rit)
if (rit->fill() < minfill)
minfill = rit->fill();
- l_margin += theFontMetrics(params.getFont()).signedWidth(layout.leftmargin);
+ l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(layout.leftmargin);
l_margin += minfill;
#endif
// also wrong, but much shorter.
|| (layout.labeltype == LABEL_STATIC
&& layout.latextype == LATEX_ENVIRONMENT
&& !text_->isFirstInSequence(pit)))
- && align == LYX_ALIGN_BLOCK
+ && (align == LYX_ALIGN_BLOCK || align == LYX_ALIGN_LEFT)
&& !par.params().noindent()
// in some insets, paragraphs are never indented
&& !text_->inset().neverIndent()
&& par.getInset(pos)->display())
&& (!(tclass.isDefaultLayout(par.layout())
|| tclass.isPlainLayout(par.layout()))
- || buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation)
+ || buffer.params().paragraph_separation
+ == BufferParams::ParagraphIndentSeparation)
)
{
- // use the parindent of the layout when the default indentation is used
- // otherwise use the indentation set in the document settings
+ // use the parindent of the layout when the default indentation is
+ // used otherwise use the indentation set in the document settings
if (buffer.params().getIndentation().asLyXCommand() == "default")
- l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
- parindent);
+ l_margin += theFontMetrics(
+ buffer.params().getFont()).signedWidth(parindent);
else
l_margin += buffer.params().getIndentation().inPixels(*bv_);
}
// This is our text.
&& cur.text() == text_
// if the anchor is outside, this is not our selection
- && cur.anchor().text() == text_
+ && cur.normalAnchor().text() == text_
&& pit >= sel_beg.pit() && pit <= sel_end.pit();
// We store the begin and end pos of the selection relative to this par
// Take this opportunity to spellcheck the row contents.
if (row_has_changed && lyxrc.spellcheck_continuously) {
- WordLangTuple wl;
- // dummy variable, not used.
- static docstring_list suggestions;
- pos_type from = row.pos();
- pos_type to = row.endpos();
- while (from < row.endpos()) {
- text_->getPar(pit).spellCheck(from, to, wl, suggestions, false);
- from = to + 1;
- }
+ text_->getPar(pit).spellCheck();
}
// Don't paint the row if a full repaint has not been requested
width(), row.height(), pi.background_color);
}
- if (row.selection())
- drawRowSelection(pi, x, row, cur, pit);
-
// Instrumentation for testing row cache (see also
// 12 lines lower):
if (lyxerr.debugging(Debug::PAINTING) && inside
// for inner insets as the Row has been cleared out.
bool tmp = pi.full_repaint;
pi.full_repaint = true;
+
+ rp.paintSelection();
rp.paintAppendix();
rp.paintDepthBar();
rp.paintChangeBar();
if (i == 0 && is_rtl)
rp.paintFirst();
y += row.descent();
+
// Restore full_repaint status.
pi.full_repaint = tmp;
}
}
-void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
- Cursor const & curs, pit_type pit) const
-{
- DocIterator beg = curs.selectionBegin();
- beg.pit() = pit;
- beg.pos() = row.sel_beg;
-
- DocIterator end = curs.selectionEnd();
- end.pit() = pit;
- end.pos() = row.sel_end;
-
- bool const begin_boundary = beg.pos() >= row.endpos();
- bool const end_boundary = row.sel_end == row.endpos();
-
- DocIterator cur = beg;
- cur.boundary(begin_boundary);
- int x1 = cursorX(beg.top(), begin_boundary);
- int x2 = cursorX(end.top(), end_boundary);
- int const y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
- int const y2 = y1 + row.height();
-
- int const rm = text_->isMainText() ? bv_->rightMargin() : 0;
- int const lm = text_->isMainText() ? bv_->leftMargin() : 0;
-
- // draw the margins
- if (row.begin_margin_sel) {
- if (text_->isRTL(beg.paragraph())) {
- pi.pain.fillRectangle(x + x1, y1, width() - rm - x1, y2 - y1,
- Color_selection);
- } else {
- pi.pain.fillRectangle(x + lm, y1, x1 - lm, y2 - y1,
- Color_selection);
- }
- }
-
- if (row.end_margin_sel) {
- if (text_->isRTL(beg.paragraph())) {
- pi.pain.fillRectangle(x + lm, y1, x2 - lm, y2 - y1,
- Color_selection);
- } else {
- pi.pain.fillRectangle(x + x2, y1, width() - rm - x2, y2 - y1,
- Color_selection);
- }
- }
-
- // if we are on a boundary from the beginning, it's probably
- // a RTL boundary and we jump to the other side directly as this
- // segement is 0-size and confuses the logic below
- if (cur.boundary())
- cur.boundary(false);
-
- // go through row and draw from RTL boundary to RTL boundary
- while (cur < end) {
- bool drawNow = false;
-
- // simplified cursorForward code below which does not
- // descend into insets and which does not go into the
- // next line. Compare the logic with the original cursorForward
-
- // if left of boundary -> just jump to right side, but
- // for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
- if (cur.boundary()) {
- cur.boundary(false);
- } else if (isRTLBoundary(cur.pit(), cur.pos() + 1)) {
- // in front of RTL boundary -> Stay on this side of the boundary
- // because: ab|cDDEEFFghi -> abc|DDEEFFghi
- ++cur.pos();
- cur.boundary(true);
- drawNow = true;
- } else {
- // move right
- ++cur.pos();
-
- // line end?
- if (cur.pos() == row.endpos())
- cur.boundary(true);
- }
-
- if (x1 == -1) {
- // the previous segment was just drawn, now the next starts
- x1 = cursorX(cur.top(), cur.boundary());
- }
-
- if (!(cur < end) || drawNow) {
- x2 = cursorX(cur.top(), cur.boundary());
- pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1,
- Color_selection);
-
- // reset x1, so it is set again next round (which will be on the
- // right side of a boundary or at the selection end)
- x1 = -1;
- }
- }
-}
-
-
void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y,
Dimension & dim) const
{
wordStart.pos() -= word.length();
// get position on screen of the word start and end
- Point lxy = cur.bv().getPos(wordStart, false);
- Point rxy = cur.bv().getPos(bvcur, bvcur.boundary());
+ //FIXME: Is it necessary to explicitly set this to false?
+ wordStart.boundary(false);
+ Point lxy = cur.bv().getPos(wordStart);
+ Point rxy = cur.bv().getPos(bvcur);
// calculate dimensions of the word
dim = rowHeight(bvcur.pit(), wordStart.pos(), bvcur.pos(), false);
projects / lyx.git / blobdiff