The removed inset functions return the same value as the base functions
The rest are simple transformations of the code. No visible difference.
--
Those who desire to give up Freedom in order to gain Security, will not have,
nor do they deserve, either one. (T. Jefferson or B. Franklin or both...)
? 1.diff
? 1.diff.gz
? 2.diff
? 3.diff
? ?t
? fullredraw.diff
? par-row.diff
? tabular-il.diff
? textcache.diff
? insets/.inset.h.swp
? insets/1.diff
? mathed/cursor.diff
? support/1.diff
Index: rowpainter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/rowpainter.C,v
retrieving revision 1.93
diff -u -p -r1.93 rowpainter.C
--- rowpainter.C 21 Nov 2003 16:02:29 -0000 1.93
+++ rowpainter.C 21 Nov 2003 16:31:43 -0000
@@ -449,20 +449,16 @@ void RowPainter::paintSelection()
tmpx -= singleWidth(body_pos - 1);
}
+ tmpx += singleWidth(pos);
+
if (hfillExpansion(*pit_, row_, pos)) {
- tmpx += singleWidth(pos);
if (pos >= body_pos)
tmpx += hfill_;
else
tmpx += label_hfill_;
- }
-
- else if (pit_->isSeparator(pos)) {
- tmpx += singleWidth(pos);
- if (pos >= body_pos)
- tmpx += separator_;
} else {
- tmpx += singleWidth(pos);
+ if (pit_->isSeparator(pos) && pos >= body_pos)
+ tmpx += separator_;
}
if ((startrow != rit_ || text_.selection.start.pos() <= pos) &&
@@ -976,7 +972,6 @@ int paintRows(BufferView const & bv, LyX
int xo, int yo, int y)
{
//lyxerr << " paintRows: rit: " << &*rit << endl;
- int const yy = yo;
int const y2 = bv.painter().paperHeight();
ParagraphList::iterator end = text.ownerParagraphs().end();
@@ -997,7 +992,7 @@ int paintRows(BufferView const & bv, LyX
//lyxerr << " paintRows: row: " << &*row << "
ignored" << endl;
}
}
- if (yy + y >= y2)
+ if (yo + y >= y2)
return y;
}
@@ -1017,11 +1012,10 @@ int paintText(BufferView & bv)
}
-void paintTextInset(BufferView & bv, LyXText & text, int xo, int baseline)
+void paintTextInset(BufferView & bv, LyXText & text, int xo, int yo)
{
- RowList::iterator rit = text.firstRow();
ParagraphList::iterator pit = text.ownerParagraphs().begin();
- paintRows(bv, text, pit, rit, xo, baseline - rit->ascent_of_text(), 0);
+ paintRows(bv, text, pit, pit->rows.begin(), xo, yo, 0);
}
Index: insets/insetspace.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetspace.C,v
retrieving revision 1.22
diff -u -p -r1.22 insetspace.C
--- insets/insetspace.C 5 Nov 2003 12:06:17 -0000 1.22
+++ insets/insetspace.C 21 Nov 2003 16:31:43 -0000
@@ -275,8 +275,3 @@ bool InsetSpace::isSpace() const
{
return true;
}
-
-bool InsetSpace::isLineSeparator() const
-{
- return false;
-}
Index: insets/insetspace.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetspace.h,v
retrieving revision 1.21
diff -u -p -r1.21 insetspace.h
--- insets/insetspace.h 5 Nov 2003 12:06:17 -0000 1.21
+++ insets/insetspace.h 21 Nov 2003 16:31:43 -0000
@@ -86,8 +86,6 @@ public:
/// is this equivalent to a space (which is BTW different from
// a line separator)?
bool isSpace() const;
- // should we break lines after this inset?
- bool isLineSeparator() const;
private:
/// And which kind is this?
Kind kind_;
Index: insets/insetspecialchar.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetspecialchar.C,v
retrieving revision 1.81
diff -u -p -r1.81 insetspecialchar.C
--- insets/insetspecialchar.C 5 Nov 2003 12:06:17 -0000 1.81
+++ insets/insetspecialchar.C 21 Nov 2003 16:31:43 -0000
@@ -269,12 +269,6 @@ bool InsetSpecialChar::isLetter() const
}
-bool InsetSpecialChar::isSpace() const
-{
- return false;
-}
-
-
bool InsetSpecialChar::isLineSeparator() const
{
#if 0
Index: insets/insetspecialchar.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetspecialchar.h,v
retrieving revision 1.63
diff -u -p -r1.63 insetspecialchar.h
--- insets/insetspecialchar.h 5 Nov 2003 12:06:17 -0000 1.63
+++ insets/insetspecialchar.h 21 Nov 2003 16:31:43 -0000
@@ -77,9 +77,6 @@ public:
bool isChar() const;
/// is this equivalent to a letter?
bool isLetter() const;
- /// is this equivalent to a space (which is BTW different from
- // a line separator)?
- bool isSpace() const;
// should we break lines after this inset?
bool isLineSeparator() const;
private:
Index: insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.549
diff -u -p -r1.549 insettext.C
--- insets/insettext.C 21 Nov 2003 14:59:23 -0000 1.549
+++ insets/insettext.C 21 Nov 2003 16:31:43 -0000
@@ -257,9 +257,10 @@ void InsetText::draw(PainterInfo & pi, i
x += scroll();
x += TEXT_TO_INSET_OFFSET;
+ y -= text_.firstRow()->ascent_of_text();
text_.xo_ = x;
- text_.yo_ = y - text_.firstRow()->ascent_of_text() + bv->top_y();
+ text_.yo_ = y + bv->top_y();
paintTextInset(*bv, text_, x, y);
