#include "FloatList.h"
#include "language.h"
#include "ParagraphParameters.h"
+#include "support/LAssert.h"
using std::copy;
using std::find;
}
+namespace {
+
+LyXFont const realizeFont(LyXFont const & font,
+ Buffer const * buf,
+ Paragraph * par)
+{
+ LyXFont tmpfont(font);
+ Paragraph::depth_type par_depth = par->getDepth();
+
+ // Resolve against environment font information
+ while (par && par_depth && !tmpfont.resolved()) {
+ par = par->outerHook();
+ if (par) {
+#ifndef INHERIT_LANGUAGE
+ tmpfont.realize(textclasslist.
+ Style(buf->params.textclass,
+ par->getLayout()).font);
+#else
+ tmpfont.realize(textclasslist.
+ Style(buf->params.textclass,
+ par->getLayout()).font,
+ buf->params.language);
+#endif
+ par_depth = par->getDepth();
+ }
+ }
+
+#ifndef INHERIT_LANGUAGE
+ tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+#else
+ tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
+ buf->params.language);
+#endif
+
+ return tmpfont;
+}
+
+}
+
+
// Gets the fully instantiated font at a given position in a paragraph
// Basically the same routine as Paragraph::getFont() in paragraph.C.
// The difference is that this one is used for displaying, and thus we
LyXFont const LyXText::getFont(Buffer const * buf, Paragraph * par,
Paragraph::size_type pos) const
{
+ lyx::Assert(pos >= 0);
+
LyXLayout const & layout =
textclasslist.Style(buf->params.textclass, par->getLayout());
-
+
Paragraph::depth_type par_depth = par->getDepth();
// We specialize the 95% common case:
if (!par_depth) {
- if (pos >= 0){
- // 95% goes here
- if (layout.labeltype == LABEL_MANUAL
- && pos < beginningOfMainBody(buf, par)) {
+ if (layout.labeltype == LABEL_MANUAL
+ && pos < beginningOfMainBody(buf, par)) {
// 1% goes here
- LyXFont f = par->getFontSettings(buf->params,
- pos);
- return f.realize(layout.reslabelfont, buf->params.language);
- } else {
- LyXFont f = par->getFontSettings(buf->params, pos);
- return f.realize(layout.resfont, buf->params.language);
- }
-
+ LyXFont f = par->getFontSettings(buf->params,
+ pos);
+#ifndef INHERIT_LANGUAGE
+ return f.realize(layout.reslabelfont);
+#else
+ return f.realize(layout.reslabelfont, buf->params.language);
+#endif
} else {
- // 5% goes here.
- // process layoutfont for pos == -1 and labelfont for pos < -1
- if (pos == -1)
- return layout.resfont;
- else
- return layout.reslabelfont;
+ LyXFont f = par->getFontSettings(buf->params, pos);
+#ifndef INHERIT_LANGUAGE
+ return f.realize(layout.resfont);
+#else
+ return f.realize(layout.resfont, buf->params.language);
+#endif
}
}
-
+
// The uncommon case need not be optimized as much
-
- LyXFont layoutfont, tmpfont;
-
- if (pos >= 0){
- // 95% goes here
- if (pos < beginningOfMainBody(buf, par)) {
- // 1% goes here
- layoutfont = layout.labelfont;
- } else {
- // 99% goes here
- layoutfont = layout.font;
- }
- tmpfont = par->getFontSettings(buf->params, pos);
- tmpfont.realize(layoutfont, buf->params.language);
+
+ LyXFont layoutfont;
+
+ if (pos < beginningOfMainBody(buf, par)) {
+ // 1% goes here
+ layoutfont = layout.labelfont;
} else {
- // 5% goes here.
- // process layoutfont for pos == -1 and labelfont for pos < -1
- if (pos == -1)
- tmpfont = layout.font;
- else
- tmpfont = layout.labelfont;
+ // 99% goes here
+ layoutfont = layout.font;
}
- // Resolve against environment font information
- while (par && par_depth && !tmpfont.resolved()) {
- par = par->outerHook();
- if (par) {
- tmpfont.realize(textclasslist.
- Style(buf->params.textclass,
- par->getLayout()).font,
- buf->params.language);
- par_depth = par->getDepth();
- }
+ LyXFont tmpfont = par->getFontSettings(buf->params, pos);
+#ifndef INHERIT_LANGUAGE
+ tmpfont.realize(layoutfont);
+#else
+ tmpfont.realize(layoutfont, buf->params.language);
+#endif
+
+ return realizeFont(tmpfont, buf, par);
+}
+
+
+LyXFont const LyXText::getLayoutFont(Buffer const * buf, Paragraph * par) const
+{
+ LyXLayout const & layout =
+ textclasslist.Style(buf->params.textclass, par->getLayout());
+
+ Paragraph::depth_type par_depth = par->getDepth();
+
+ if (!par_depth) {
+ return layout.resfont;
}
- tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
- buf->params.language);
+ return realizeFont(layout.font, buf, par);
+}
- return tmpfont;
+
+LyXFont const LyXText::getLabelFont(Buffer const * buf, Paragraph * par) const
+{
+ LyXLayout const & layout =
+ textclasslist.Style(buf->params.textclass, par->getLayout());
+
+ Paragraph::depth_type par_depth = par->getDepth();
+
+ if (!par_depth) {
+ return layout.reslabelfont;
+ }
+
+ return realizeFont(layout.labelfont, buf, par);
}
{
Buffer const * buf = bv->buffer();
LyXFont font = getFont(buf, par, pos);
- font.update(fnt, toggleall);
+ font.update(fnt, buf->params.language, toggleall);
// Let the insets convert their font
if (par->getChar(pos) == Paragraph::META_INSET) {
Inset * inset = par->getInset(pos);
static_cast<UpdatableInset *>(inset);
uinset->setFont(bv, fnt, toggleall, true);
}
- font = inset->convertFont(font);
}
}
while (!layoutfont.resolved() && tp && tp->getDepth()) {
tp = tp->outerHook();
if (tp)
+#ifndef INHERIT_LANGUAGE
+ layoutfont.realize(textclasslist.
+ Style(buf->params.textclass,
+ tp->getLayout()).font);
+#else
layoutfont.realize(textclasslist.
Style(buf->params.textclass,
tp->getLayout()).font,
buf->params.language);
+#endif
}
}
+#ifndef INHERIT_LANGUAGE
+ layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+#else
layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
buf->params.language);
+#endif
// Now, reduce font against full layout font
font.reduce(layoutfont);
Paragraph::size_type pos, LyXFont const & fnt)
{
LyXFont font(fnt);
- // Let the insets convert their font
- if (par->getChar(pos) == Paragraph::META_INSET) {
- font = par->getInset(pos)->convertFont(font);
- }
LyXLayout const & layout =
textclasslist.Style(buf->params.textclass,
while (!layoutfont.resolved() && tp && tp->getDepth()) {
tp = tp->outerHook();
if (tp)
+#ifndef INHERIT_LANGUAGE
+ layoutfont.realize(textclasslist.
+ Style(buf->params.textclass,
+ tp->getLayout()).font);
+#else
layoutfont.realize(textclasslist.
Style(buf->params.textclass,
tp->getLayout()).font,
buf->params.language);
+#endif
}
}
+#ifndef INHERIT_LANGUAGE
+ layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+#else
layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
buf->params.language);
+#endif
// Now, reduce font against full layout font
font.reduce(layoutfont);
// Determine basis font
LyXFont layoutfont;
if (cursor.pos() < beginningOfMainBody(bview->buffer(),
- cursor.par()))
- layoutfont = getFont(bview->buffer(), cursor.par(),-2);
- else
- layoutfont = getFont(bview->buffer(), cursor.par(),-1);
+ cursor.par())) {
+ layoutfont = getLabelFont(bview->buffer(),
+ cursor.par());
+ } else {
+ layoutfont = getLayoutFont(bview->buffer(),
+ cursor.par());
+ }
// Update current font
- real_current_font.update(font, toggleall);
+ real_current_font.update(font,
+ bview->buffer()->params.language,
+ toggleall);
// Reduce to implicit settings
current_font = real_current_font;
current_font.reduce(layoutfont);
// And resolve it completely
+#ifndef INHERIT_LANGUAGE
+ real_current_font.realize(layoutfont);
+#else
real_current_font.realize(layoutfont,
bview->buffer()->params.language);
+#endif
return;
}
// and sel_end cursor
setUndo(bview, Undo::EDIT,
- selection.start.par(),
- selection.end.par()->next());
+ selection.start.par(), selection.end.par()->next());
freezeUndo();
cursor = selection.start;
while (cursor.par() != selection.end.par() ||
- (cursor.pos() < selection.end.pos())) {
+ (cursor.pos() < selection.end.pos()))
+ {
if (cursor.pos() < cursor.par()->size()) {
// an open footnote should behave
// like a closed one
clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true,
- tmpcursor.boundary());
+ tmpcursor.boundary());
}
}
-string const LyXText::selectionAsString(Buffer const * buffer) const
+string const LyXText::selectionAsString(Buffer const * buffer,
+ bool label) const
{
if (!selection.set()) return string();
string result;
if (selection.start.par() == selection.end.par()) {
result += selection.start.par()->asString(buffer,
selection.start.pos(),
- selection.end.pos());
+ selection.end.pos(),
+ label);
return result;
}
// First paragraph in selection
result += selection.start.par()->asString(buffer,
selection.start.pos(),
- selection.start.par()->size())
+ selection.start.par()->size(),
+ label)
+ "\n\n";
// The paragraphs in between (if any)
tmpcur.par(tmpcur.par()->next());
while (tmpcur.par() != selection.end.par()) {
result += tmpcur.par()->asString(buffer, 0,
- tmpcur.par()->size()) +"\n\n";
+ tmpcur.par()->size(),
+ label) + "\n\n";
tmpcur.par(tmpcur.par()->next());
}
// Last paragraph in selection
result += selection.end.par()->asString(buffer, 0,
- selection.end.pos());
+ selection.end.pos(), label);
return result;
}
}
-string
-LyXText::getStringToIndex(BufferView * bview)
+string LyXText::getStringToIndex(BufferView * bview)
{
string idxstring;
return string();
}
- idxstring = selectionAsString(bview->buffer());
+ idxstring = selectionAsString(bview->buffer(), false);
// Implicit selections are cleared afterwards
//and cursor is set to the original position.
return idxstring;
}
-Paragraph::size_type
-LyXText::beginningOfMainBody(Buffer const * buf,
+
+Paragraph::size_type LyXText::beginningOfMainBody(Buffer const * buf,
Paragraph const * par) const
{
if (textclasslist.Style(buf->params.textclass,
bool pagebreak_top, bool pagebreak_bottom,
VSpace const & space_top,
VSpace const & space_bottom,
+ Spacing const & spacing,
LyXAlignment align,
string labelwidthstring,
bool noindent)
cursor.par()->params().pagebreakBottom(pagebreak_bottom);
cursor.par()->params().spaceTop(space_top);
cursor.par()->params().spaceBottom(space_bottom);
+ cursor.par()->params().spacing(spacing);
// does the layout allow the new alignment?
if (align == LYX_ALIGN_LAYOUT)
align = textclasslist
}
-void LyXText::cutSelection(BufferView * bview, bool doclear)
+void LyXText::cutSelection(BufferView * bview, bool doclear, bool realcut)
{
// Stuff what we got on the clipboard. Even if there is no selection.
// finished. The solution used currently just works, to make it
// faster we need to be more clever and probably also have more
// calls to stuffClipboard. (Lgb)
- bview->stuffClipboard(selectionAsString(bview->buffer()));
+ bview->stuffClipboard(selectionAsString(bview->buffer(), true));
// This doesn't make sense, if there is no selection
if (!selection.set())
endpar = selection.end.par();
int pos = selection.end.pos();
CutAndPaste::cutSelection(selection.start.par(), &endpar,
- selection.start.pos(), pos,
- bview->buffer()->params.textclass, doclear);
+ selection.start.pos(), pos,
+ bview->buffer()->params.textclass,
+ doclear, realcut);
selection.end.pos(pos);
} else {
endpar = selection.end.par();
int pos = selection.end.pos();
CutAndPaste::cutSelection(selection.start.par(), &endpar,
- selection.start.pos(), pos,
- bview->buffer()->params.textclass, doclear);
+ selection.start.pos(), pos,
+ bview->buffer()->params.textclass,
+ doclear, realcut);
cursor.par(endpar);
selection.end.par(endpar);
selection.end.pos(pos);
// finished. The solution used currently just works, to make it
// faster we need to be more clever and probably also have more
// calls to stuffClipboard. (Lgb)
- bview->stuffClipboard(selectionAsString(bview->buffer()));
+ bview->stuffClipboard(selectionAsString(bview->buffer(), true));
// this doesnt make sense, if there is no selection
if (!selection.set())
Paragraph * endpar;
Paragraph * actpar = cursor.par();
-
int pos = cursor.pos();
+
CutAndPaste::pasteSelection(&actpar, &endpar, pos,
bview->buffer()->params.textclass);
setCursor(bview, cursor.par(), cursor.pos());
clearSelection();
- selection.cursor = cursor;
setCursor(bview, actpar, pos);
- setSelection(bview);
updateCounters(bview, cursor.row());
}
}
// Cut the selection
- cutSelection(bview);
+ cutSelection(bview, true, false);
unFreezeUndo();
}
void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
- Paragraph::size_type pos)
+ Paragraph::size_type pos)
{
LyXCursor tmpcursor;
// check the special right address boxes
if (textclasslist.Style(bview->buffer()->params.textclass,
par->getLayout()).margintype
- == MARGIN_RIGHT_ADDRESS_BOX) {
+ == MARGIN_RIGHT_ADDRESS_BOX)
+ {
tmpcursor.par(par);
tmpcursor.row(row);
tmpcursor.y(y);
{
// first check the current paragraph
int pos = cursor.par()->getPositionOfInset(inset);
- if (pos != -1){
+ if (pos != -1) {
checkParagraph(bview, cursor.par(), pos);
return true;
}
Paragraph * par = firstParagraph();
do {
pos = par->getPositionOfInset(inset);
- if (pos != -1){
+ if (pos != -1) {
checkParagraph(bview, par, pos);
return true;
}
void LyXText::setCursor(BufferView * bview, Paragraph * par,
- Paragraph::size_type pos,
- bool setfont, bool boundary) const
+ Paragraph::size_type pos,
+ bool setfont, bool boundary) const
{
LyXCursor old_cursor = cursor;
setCursorIntern(bview, par, pos, setfont, boundary);
bview->buffer()->params.textclass,
row->par()->getLayout())
.labelsep,
- getFont(bview->buffer(), row->par(), -2));
+ getLabelFont(bview->buffer(), row->par()));
if (row->par()->isLineSeparator(main_body-1))
x -= singleWidth(bview, row->par(),main_body-1);
}
bool setfont, bool boundary) const
{
InsetText * it = static_cast<InsetText *>(par->inInset());
- if (it && (it != inset_owner)) {
- it->getLyXText(bview)->setCursorIntern(bview, par, pos, setfont,
- boundary);
- } else {
- setCursor(bview, cursor, par, pos, boundary);
- if (setfont)
- setCurrentFont(bview);
+ if (it) {
+ if (it != inset_owner) {
+ lyxerr << "InsetText is " << it << endl;
+ lyxerr << "inset_owner is " << inset_owner << endl;
+#warning I believe this code is wrong. (Lgb)
+#warning Jürgen, have a look at this. (Lgb)
+#warning Hmmm, I guess you are right but we
+#warning should verify when this is needed
+ // Jürgen, would you like to have a look?
+ // I guess we need to move the outer cursor
+ // and open and lock the inset (bla bla bla)
+ // stuff I don't know... so can you have a look?
+ // (Lgb)
+ // I moved the lyxerr stuff in here so we can see if
+ // this is actually really needed and where!
+ // (Jug)
+ it->getLyXText(bview)->setCursorIntern(bview, par, pos, setfont,
+ boundary);
+ return;
+ }
}
+
+ setCursor(bview, cursor, par, pos, boundary);
+ if (setfont)
+ setCurrentFont(bview);
}
{
LyXCursor old_cursor = cursor;
-#if 0
- // Get the row first.
-
- Row * row = getRowNearY(y);
-
- bool bound = false;
- int column = getColumnNearX(bview, row, x, bound);
-
- cursor.par(row->par());
- cursor.pos(row->pos() + column);
- cursor.x(x);
- cursor.y(y + row->baseline());
- cursor.row(row);
- cursor.boundary(bound);
-#else
setCursorFromCoordinates(bview, cursor, x, y);
-#endif
setCurrentFont(bview);
deleteEmptyParagraphMechanism(bview, old_cursor);
}
Row * row = getRowNearY(y);
bool bound = false;
- int const column = getColumnNearX(bview, row, x, bound);
+ Paragraph::size_type const column = getColumnNearX(bview, row, x,
+ bound);
cur.par(row->par());
cur.pos(row->pos() + column);
}
}
+// fix the cursor `cur' after a characters has been deleted at `where'
+// position. Called by deleteEmptyParagraphMechanism
+void LyXText::fixCursorAfterDelete(BufferView * bview,
+ LyXCursor & cur,
+ LyXCursor const & where) const
+{
+ // if cursor is not in the paragraph where the delete occured,
+ // do nothing
+ if (cur.par() != where.par())
+ return;
+
+ // if cursor position is after the place where the delete occured,
+ // update it
+ if (cur.pos() > where.pos())
+ cur.pos(cur.pos()-1);
+
+ // recompute row et al. for this cursor
+ setCursor(bview, cur, cur.par(), cur.pos(), cur.boundary());
+}
+
void LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
LyXCursor const & old_cursor) const
&& old_cursor.par()->isLineSeparator(old_cursor.pos() - 1)) {
old_cursor.par()->erase(old_cursor.pos() - 1);
redoParagraphs(bview, old_cursor, old_cursor.par()->next());
- // correct cursor
- if (old_cursor.par() == cursor.par() &&
- cursor.pos() > old_cursor.pos()) {
- setCursorIntern(bview, cursor.par(),
- cursor.pos() - 1);
- } else
- setCursorIntern(bview, cursor.par(),
- cursor.pos());
+
+#ifdef WITH_WARNINGS
+#warning This will not work anymore when we have multiple views of the same buffer
+// In this case, we will have to correct also the cursors held by
+// other bufferviews. It will probably be easier to do that in a more
+// automated way in LyXCursor code. (JMarc 26/09/2001)
+#endif
+ // correct all cursors held by the LyXText
+ fixCursorAfterDelete(bview, cursor, old_cursor);
+ fixCursorAfterDelete(bview, selection.cursor,
+ old_cursor);
+ fixCursorAfterDelete(bview, selection.start,
+ old_cursor);
+ fixCursorAfterDelete(bview, selection.end, old_cursor);
+ fixCursorAfterDelete(bview, last_sel_cursor,
+ old_cursor);
+ fixCursorAfterDelete(bview, toggle_cursor, old_cursor);
+ fixCursorAfterDelete(bview, toggle_end_cursor,
+ old_cursor);
return;
}
}
old_cursor.par()->getLayout())).keepempty)
return;
- LyXCursor tmpcursor;
-
- if (old_cursor.par() != cursor.par()) {
- if ((old_cursor.par()->size() == 0
- || (old_cursor.par()->size() == 1
- && old_cursor.par()->isLineSeparator(0)))) {
- // ok, we will delete anything
-
- // make sure that you do not delete any environments
- status(bview, LyXText::NEED_MORE_REFRESH);
- deleted = true;
+ // only do our magic if we changed paragraph
+ if (old_cursor.par() == cursor.par())
+ return;
+
+ if ((old_cursor.par()->size() == 0
+ || (old_cursor.par()->size() == 1
+ && old_cursor.par()->isLineSeparator(0)))) {
+ // ok, we will delete anything
+ LyXCursor tmpcursor;
+
+ // make sure that you do not delete any environments
+ status(bview, LyXText::NEED_MORE_REFRESH);
+ deleted = true;
- if (old_cursor.row()->previous()) {
- refresh_row = old_cursor.row()->previous();
- refresh_y = old_cursor.y() - old_cursor.row()->baseline() - refresh_row->height();
- tmpcursor = cursor;
- cursor = old_cursor; // that undo can restore the right cursor position
- Paragraph * endpar = old_cursor.par()->next();
- if (endpar && endpar->getDepth()) {
- while (endpar && endpar->getDepth()) {
- endpar = endpar->next();
- }
+ if (old_cursor.row()->previous()) {
+ refresh_row = old_cursor.row()->previous();
+ refresh_y = old_cursor.y() - old_cursor.row()->baseline() - refresh_row->height();
+ tmpcursor = cursor;
+ cursor = old_cursor; // that undo can restore the right cursor position
+ Paragraph * endpar = old_cursor.par()->next();
+ if (endpar && endpar->getDepth()) {
+ while (endpar && endpar->getDepth()) {
+ endpar = endpar->next();
}
- setUndo(bview, Undo::DELETE,
- old_cursor.par(),
- endpar);
- cursor = tmpcursor;
+ }
+ setUndo(bview, Undo::DELETE, old_cursor.par(), endpar);
+ cursor = tmpcursor;
// delete old row
- removeRow(old_cursor.row());
- if (ownerParagraph() == old_cursor.par()) {
- ownerParagraph(ownerParagraph()->next());
- }
+ removeRow(old_cursor.row());
+ if (ownerParagraph() == old_cursor.par()) {
+ ownerParagraph(ownerParagraph()->next());
+ }
// delete old par
- delete old_cursor.par();
+ delete old_cursor.par();
- /* Breakagain the next par. Needed
- * because of the parindent that
- * can occur or dissappear. The
- * next row can change its height,
- * if there is another layout before */
- if (refresh_row->next()) {
- breakAgain(bview, refresh_row->next());
- updateCounters(bview, refresh_row);
- }
- setHeightOfRow(bview, refresh_row);
- } else {
- refresh_row = old_cursor.row()->next();
- refresh_y = old_cursor.y() - old_cursor.row()->baseline();
+ /* Breakagain the next par. Needed because of
+ * the parindent that can occur or dissappear.
+ * The next row can change its height, if
+ * there is another layout before */
+ if (refresh_row->next()) {
+ breakAgain(bview, refresh_row->next());
+ updateCounters(bview, refresh_row);
+ }
+ setHeightOfRow(bview, refresh_row);
+ } else {
+ refresh_row = old_cursor.row()->next();
+ refresh_y = old_cursor.y() - old_cursor.row()->baseline();
- tmpcursor = cursor;
- cursor = old_cursor; // that undo can restore the right cursor position
- Paragraph * endpar = old_cursor.par()->next();
- if (endpar && endpar->getDepth()) {
- while (endpar && endpar->getDepth()) {
- endpar = endpar->next();
- }
- }
- setUndo(bview, Undo::DELETE,
- old_cursor.par(),
- endpar);
- cursor = tmpcursor;
-
- // delete old row
- removeRow(old_cursor.row());
- // delete old par
- if (ownerParagraph() == old_cursor.par()) {
- ownerParagraph(ownerParagraph()->next());
+ tmpcursor = cursor;
+ cursor = old_cursor; // that undo can restore the right cursor position
+ Paragraph * endpar = old_cursor.par()->next();
+ if (endpar && endpar->getDepth()) {
+ while (endpar && endpar->getDepth()) {
+ endpar = endpar->next();
}
+ }
+ setUndo(bview, Undo::DELETE, old_cursor.par(), endpar);
+ cursor = tmpcursor;
+
+ // delete old row
+ removeRow(old_cursor.row());
+ // delete old par
+ if (ownerParagraph() == old_cursor.par()) {
+ ownerParagraph(ownerParagraph()->next());
+ }
- delete old_cursor.par();
+ delete old_cursor.par();
- /* Breakagain the next par. Needed
- because of the parindent that can
- occur or dissappear.
- The next row can change its height,
- if there is another layout before
- */
- if (refresh_row) {
- breakAgain(bview, refresh_row);
- updateCounters(bview, refresh_row->previous());
- }
+ /* Breakagain the next par. Needed because of
+ the parindent that can occur or dissappear.
+ The next row can change its height, if
+ there is another layout before */
+ if (refresh_row) {
+ breakAgain(bview, refresh_row);
+ updateCounters(bview, refresh_row->previous());
}
+ }
- // correct cursor y
-
- setCursorIntern(bview, cursor.par(), cursor.pos());
+ // correct cursor y
+ setCursorIntern(bview, cursor.par(), cursor.pos());
- if (selection.cursor.par() == old_cursor.par()
- && selection.cursor.pos() == selection.cursor.pos()) {
- // correct selection
- selection.cursor = cursor;
- }
+ if (selection.cursor.par() == old_cursor.par()
+ && selection.cursor.pos() == selection.cursor.pos()) {
+ // correct selection
+ selection.cursor = cursor;
}
- if (!deleted) {
- if (old_cursor.par()->stripLeadingSpaces(bview->buffer()->params.textclass)) {
- redoParagraphs(bview, old_cursor, old_cursor.par()->next());
- // correct cursor y
- setCursorIntern(bview, cursor.par(), cursor.pos());
- selection.cursor = cursor;
- }
+ }
+ if (!deleted) {
+ if (old_cursor.par()->stripLeadingSpaces(bview->buffer()->params.textclass)) {
+ redoParagraphs(bview, old_cursor,
+ old_cursor.par()->next());
+ // correct cursor y
+ setCursorIntern(bview, cursor.par(), cursor.pos());
+ selection.cursor = cursor;
}
}
}
}
-Paragraph * LyXText::ownerParagraph(Paragraph * p) const
+void LyXText::ownerParagraph(Paragraph * p) const
{
if (inset_owner) {
inset_owner->paragraph(p);
} else {
bv_owner->buffer()->paragraph = p;
}
- return 0;
}
-Paragraph * LyXText::ownerParagraph(int id, Paragraph * p) const
+
+void LyXText::ownerParagraph(int id, Paragraph * p) const
{
Paragraph * op = bv_owner->buffer()->getParFromID(id);
if (op && op->inInset()) {
bv_owner->buffer()->paragraph = p;
}
}
- return 0;
}
void LyXText::status(BufferView * bview, LyXText::text_status st) const
{
-#if 0
- if ((status_ != NEED_MORE_REFRESH)
- || (status_ == NEED_MORE_REFRESH)
- && (st != NEED_VERY_LITTLE_REFRESH)) {
- status_ = st;
- if (inset_owner && st != UNCHANGED) {
- bview->text->status(bview, NEED_VERY_LITTLE_REFRESH);
- }
- }
-#else
-#warning Please tell what the intention is here. (Lgb)
- // The above does not make any sense, I changed it to what is here,
- // but it still does not make much sense. (Lgb)
-#warning Sure have a look now! (Jug)
// well as much as I know && binds more then || so the above and the
// below are identical (this for your known use of parentesis!)
// Now some explanation:
}
}
}
-#endif
}
projects / lyx.git / blobdiff