using std::string;
-LyXText::LyXText(BufferView * bv, InsetText * inset, bool ininset,
+LyXText::LyXText(BufferView * bv, InsetText * inset, bool in_inset,
ParagraphList & paragraphs)
- : height(0), width(0), inset_owner(inset), bv_owner(bv),
- in_inset_(ininset), paragraphs_(¶graphs),
- cache_pos_(-1), xo_(0), yo_(0)
+ : height(0), width(0), textwidth_(bv ? bv->workWidth() : 100),
+ inset_owner(inset), bv_owner(bv),
+ in_inset_(in_inset), paragraphs_(¶graphs), xo_(0), yo_(0)
{}
width = 0;
height = 0;
- cache_pos_ = -1;
current_font = getFont(beg, 0);
}
-// used in setLayout
+// used in setLayout
// Asger is not sure we want to do this...
void LyXText::makeFontEntriesLayoutSpecific(BufferParams const & params,
Paragraph & par)
start = pit;
}
- ParagraphList::iterator pastend = boost::next(end);
-
if (!test_only)
recUndo(parOffset(start), parOffset(end));
if (test_only)
return changed;
- redoParagraphs(start, pastend);
+ redoParagraphs(start, boost::next(end));
// We need to actually move the text->cursor. I don't
// understand why ...
// If the mask is completely neutral, tell user
if (font == LyXFont(LyXFont::ALL_IGNORE)) {
// Could only happen with user style
- bv()->owner()->message(_("No font change defined. Use Character under the Layout menu to define font change."));
+ bv()->owner()->message(_("No font change defined. "
+ "Use Character under the Layout menu to define font change."));
return;
}
}
-namespace {
-
string expandLabel(LyXTextClass const & textclass,
LyXLayout_ptr const & layout, bool appendix)
{
}
+namespace {
+
void incrementItemDepth(ParagraphList::iterator pit,
ParagraphList::iterator first_pit)
{
int const cur_labeltype = pit->layout()->labeltype;
- if (cur_labeltype != LABEL_ENUMERATE &&
- cur_labeltype != LABEL_ITEMIZE)
+ if (cur_labeltype != LABEL_ENUMERATE && cur_labeltype != LABEL_ITEMIZE)
return;
int const cur_depth = pit->getDepth();
}
-// Updates all counters. Paragraphs with changed label string will be rebroken
+// Updates all counters. Paragraphs with changed label string will be
+// not be rebroken as this is too expensive. The next round will get it
+// right anyway...
void LyXText::updateCounters()
{
// start over
ParagraphList::iterator beg = ownerParagraphs().begin();
ParagraphList::iterator end = ownerParagraphs().end();
for (ParagraphList::iterator pit = beg; pit != end; ++pit) {
- string const oldLabel = pit->params().labelString();
-
size_t maxdepth = 0;
if (pit != beg)
maxdepth = boost::prior(pit)->getMaxDepthAfter();
// setCounter can potentially change the labelString.
setCounter(*bv()->buffer(), pit);
-
- string const & newLabel = pit->params().labelString();
-
- if (oldLabel != newLabel)
- redoParagraph(pit);
}
}
// The character will not be inserted a second time
insertChar(Paragraph::META_INSET);
// If we enter a highly editable inset the cursor should be before
- // the inset. After an Undo LyX tries to call inset->edit(...)
+ // the inset. After an undo LyX tries to call inset->edit(...)
// and fails if the cursor is behind the inset and getInset
// does not return the inset!
if (isHighlyEditableInset(inset))
cursorLeft(true);
-
+
unFreezeUndo();
}
deleteEmptyParagraphMechanism(old_cursor);
}
-//x,y are coordinates relative to this LyXText
+// x,y are coordinates relative to this LyXText
void LyXText::setCursorFromCoordinates(LyXCursor & cur, int x, int y)
{
// Get the row first.
}
-
bool LyXText::checkAndActivateInset(bool front)
{
if (cursor.pos() == cursorPar()->size())
DispatchResult LyXText::moveUp()
{
- if (cursorRow() == firstRow())
+ if (cursorPar() == firstPar() && cursorRow() == firstRow())
return DispatchResult(false, FINISHED_UP);
cursorUp(false);
clearSelection();
DispatchResult LyXText::moveDown()
{
- if (cursorRow() == lastRow())
+ if (cursorPar() == lastPar() && cursorRow() == lastRow())
return DispatchResult(false, FINISHED_DOWN);
cursorDown(false);
clearSelection();
int x = bv()->x_target() - xo_;
int y = cursor.y() - row.baseline() - 1;
setCursorFromCoordinates(x, y);
-
+
if (!selecting) {
int y_abs = y + yo_ - bv()->top_y();
InsetOld * inset_hit = checkInsetHit(bv()->x_target(), y_abs);