#include "layout.h"
#include "LyXView.h"
#include "support/textutils.h"
+#include "support/lstrings.h"
#include "undo_funcs.h"
#include "buffer.h"
#include "bufferparams.h"
#include "FloatList.h"
#include "language.h"
#include "ParagraphParameters.h"
+#include "support/LAssert.h"
using std::copy;
using std::find;
LyXText::LyXText(BufferView * bv)
: number_of_rows(0), height(0), width(0), first(0),
bv_owner(bv), inset_owner(0), the_locking_inset(0),
- need_break_row(0), refresh_y(0), status_(LyXText::UNCHANGED),
- firstrow(0), lastrow(0), copylayouttype(0)
+ need_break_row(0), refresh_y(0), refresh_row(0),
+ status_(LyXText::UNCHANGED), firstrow(0), lastrow(0),
+ copylayouttype(0)
{}
LyXText::LyXText(InsetText * inset)
: number_of_rows(0), height(0), width(0), first(0),
bv_owner(0), inset_owner(inset), the_locking_inset(0),
- need_break_row(0), refresh_y(0), status_(LyXText::UNCHANGED),
- firstrow(0), lastrow(0), copylayouttype(0)
+ need_break_row(0), refresh_y(0), refresh_row(0),
+ status_(LyXText::UNCHANGED), firstrow(0), lastrow(0),
+ copylayouttype(0)
{}
-void LyXText::init(BufferView * bview)
+void LyXText::init(BufferView * bview, bool reinit)
{
- if (firstrow)
+ if (reinit) {
+ // Delete all rows, this does not touch the paragraphs!
+ Row * tmprow = firstrow;
+ while (firstrow) {
+ tmprow = firstrow->next();
+ delete firstrow;
+ firstrow = tmprow;
+ }
+ lastrow = refresh_row = need_break_row = 0;
+ width = height = copylayouttype = 0;
+ number_of_rows = first = refresh_y = 0;
+ status_ = LyXText::UNCHANGED;
+ } else if (firstrow)
return;
Paragraph * par = ownerParagraph();
}
+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
// If position is -1, we get the layout font of the paragraph.
// If position is -2, we get the font of the manual label of the paragraph.
LyXFont const LyXText::getFont(Buffer const * buf, Paragraph * par,
- Paragraph::size_type pos) const
+ 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);
- } else {
- LyXFont f = par->getFontSettings(buf->params, pos);
- return f.realize(layout.resfont);
- }
-
+ 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);
+
+ 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);
- 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());
+ 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);
}
if (par->getChar(pos) == Paragraph::META_INSET) {
Inset * inset = par->getInset(pos);
if (inset) {
- if (inset->editable()==Inset::HIGHLY_EDITABLE) {
- UpdatableInset * uinset = static_cast<UpdatableInset *>(inset);
+ if (inset->editable()==Inset::IS_EDITABLE) {
+ UpdatableInset * uinset =
+ 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);
+ 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);
+ 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);
}
-/* inserts a new row behind the specified row, increments
- * the touched counters */
+// inserts a new row behind the specified row, increments
+// the touched counters
void LyXText::insertRow(Row * row, Paragraph * par,
- Paragraph::size_type pos) const
+ Paragraph::size_type pos) const
{
Row * tmprow = new Row;
if (!row) {
if (row == lastrow)
lastrow = tmprow;
- ++number_of_rows; // one more row
+ ++number_of_rows;
}
// insert the specified paragraph behind the specified row
void LyXText::insertParagraph(BufferView * bview, Paragraph * par,
- Row * row) const
+ Row * row) const
{
- insertRow(row, par, 0); /* insert a new row, starting
- * at postition 0 */
+ insertRow(row, par, 0); /* insert a new row, starting
+ * at postition 0 */
setCounter(bview->buffer(), par); // set the counters
}
+Inset * LyXText::getInset() const
+{
+ Inset * inset = 0;
+ if (cursor.pos() == 0 && cursor.par()->bibkey) {
+ inset = cursor.par()->bibkey;
+ } else if (cursor.pos() < cursor.par()->size()
+ && cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET) {
+ inset = cursor.par()->getInset(cursor.pos());
+ }
+ return inset;
+}
+
+
+void LyXText::toggleInset(BufferView * bview)
+{
+ Inset * inset = getInset();
+ if (!inset->editable())
+ return;
+ //bview->owner()->message(inset->editMessage());
+
+ // do we want to keep this?? (JMarc)
+ if (inset->editable() != Inset::HIGHLY_EDITABLE)
+ setCursorParUndo(bview);
+
+ if (inset->isOpen()) {
+ inset->close(bview);
+ } else {
+ inset->open(bview);
+ }
+#if 0
+ inset->open(bview, !inset->isOpen());
+#endif
+}
+
+
/* used in setlayout */
// Asger is not sure we want to do this...
void LyXText::makeFontEntriesLayoutSpecific(Buffer const * buf,
Paragraph * par)
{
-
LyXLayout const & layout =
textclasslist.Style(buf->params.textclass, par->getLayout());
- LyXFont layoutfont, tmpfont;
- for (Paragraph::size_type pos = 0;
- pos < par->size(); ++pos) {
+ LyXFont layoutfont;
+ for (Paragraph::size_type pos = 0; pos < par->size(); ++pos) {
if (pos < beginningOfMainBody(buf, par))
layoutfont = layout.labelfont;
else
layoutfont = layout.font;
- tmpfont = par->getFontSettings(buf->params, pos);
+ LyXFont tmpfont = par->getFontSettings(buf->params, pos);
tmpfont.reduce(layoutfont);
par->setFont(pos, tmpfont);
}
Paragraph * LyXText::setLayout(BufferView * bview,
- LyXCursor & cur, LyXCursor & sstart_cur,
- LyXCursor & send_cur,
- LyXTextClass::size_type layout)
+ LyXCursor & cur, LyXCursor & sstart_cur,
+ LyXCursor & send_cur,
+ LyXTextClass::size_type layout)
{
Paragraph * endpar = send_cur.par()->next();
Paragraph * undoendpar = endpar;
setUndo(bview, Undo::EDIT,
sstart_cur.par(), undoendpar);
- /* ok we have a selection. This is always between sstart_cur
- * and sel_end cursor */
+ // ok we have a selection. This is always between sstart_cur
+ // and sel_end cursor
cur = sstart_cur;
LyXLayout const & lyxlayout =
makeFontEntriesLayoutSpecific(bview->buffer(), cur.par());
Paragraph * fppar = cur.par();
fppar->params().spaceTop(lyxlayout.fill_top ?
- VSpace(VSpace::VFILL)
- : VSpace(VSpace::NONE));
+ VSpace(VSpace::VFILL)
+ : VSpace(VSpace::NONE));
fppar->params().spaceBottom(lyxlayout.fill_bottom ?
- VSpace(VSpace::VFILL)
- : VSpace(VSpace::NONE));
+ VSpace(VSpace::VFILL)
+ : VSpace(VSpace::NONE));
if (lyxlayout.margintype == MARGIN_MANUAL)
cur.par()->setLabelWidthString(lyxlayout.labelstring());
if (lyxlayout.labeltype != LABEL_BIBLIO
makeFontEntriesLayoutSpecific(bview->buffer(), cur.par());
Paragraph * fppar = cur.par();
fppar->params().spaceTop(lyxlayout.fill_top ?
- VSpace(VSpace::VFILL) : VSpace(VSpace::NONE));
+ VSpace(VSpace::VFILL) : VSpace(VSpace::NONE));
fppar->params().spaceBottom(lyxlayout.fill_bottom ?
- VSpace(VSpace::VFILL) : VSpace(VSpace::NONE));
+ VSpace(VSpace::VFILL) : VSpace(VSpace::NONE));
if (lyxlayout.margintype == MARGIN_MANUAL)
cur.par()->setLabelWidthString(lyxlayout.labelstring());
if (lyxlayout.labeltype != LABEL_BIBLIO
selection.end = cursor;
}
Paragraph * endpar = setLayout(bview, cursor, selection.start,
- selection.end, layout);
+ selection.end, layout);
redoParagraphs(bview, selection.start, endpar);
// we have to reset the selection, because the
setCursor(bview, selection.start.par(),
selection.start.pos(), false);
selection.cursor = cursor;
- setCursor(bview, selection.end.par(), selection.end.pos(),
- false);
+ setCursor(bview, selection.end.par(), selection.end.pos(), false);
updateCounters(bview, cursor.row());
- clearSelection(bview);
+ clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true);
}
endpar = endpar->next();
undoendpar = endpar;
}
- }
- else if (endpar) {
+ } else if (endpar) {
endpar = endpar->next(); // because of parindents etc.
}
while (true) {
// NOTE: you can't change the depth of a bibliography entry
if (
- textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()
- ).labeltype != LABEL_BIBLIO) {
+ textclasslist.Style(bview->buffer()->params.textclass,
+ cursor.par()->getLayout()
+ ).labeltype != LABEL_BIBLIO) {
Paragraph * prev = cursor.par()->previous();
if (prev
&& (prev->getDepth() - cursor.par()->getDepth() > 0
|| (prev->getDepth() == cursor.par()->getDepth()
&& textclasslist.Style(bview->buffer()->params.textclass,
- prev->getLayout()).isEnvironment()))) {
+ prev->getLayout()).isEnvironment()))) {
cursor.par()->params().depth(cursor.par()->params().depth() + 1);
anything_changed = true;
- }
+ }
}
if (cursor.par() == selection.end.par())
- break;
+ break;
cursor.par(cursor.par()->next());
}
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
updateCounters(bview, cursor.row());
- clearSelection(bview);
+ clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos());
}
cursor = selection.start;
while (true) {
- if (cursor.par()->params().depth())
- cursor.par()->params().depth(cursor.par()->params().depth() - 1);
- if (cursor.par() == selection.end.par())
+ if (cursor.par()->params().depth()) {
+ cursor.par()->params()
+ .depth(cursor.par()->params().depth() - 1);
+ }
+ if (cursor.par() == selection.end.par()) {
break;
+ }
cursor.par(cursor.par()->next());
}
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
updateCounters(bview, cursor.row());
- clearSelection(bview);
+ clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos());
}
// 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,
+ real_current_font.update(font,
bview->buffer()->params.language,
toggleall);
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
- setCharFont(bview, cursor.par(), cursor.pos(), font, toggleall);
+ setCharFont(bview, cursor.par(), cursor.pos(),
+ font, toggleall);
cursor.pos(cursor.pos() + 1);
} else {
cursor.pos(0);
setCursor(bview, selection.start.par(), selection.start.pos());
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
- clearSelection(bview);
+ clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true,
- tmpcursor.boundary());
+ tmpcursor.boundary());
}
setHeightOfRow(bview, tmprow);
-#if 0
- Paragraph * first_phys_par = tmprow->par();
-
- // find the first row of the paragraph
- if (first_phys_par != tmprow->par())
- while (tmprow->previous()
- && tmprow->previous()->par() != first_phys_par) {
- tmprow = tmprow->previous();
- y -= tmprow->height();
- setHeightOfRow(bview, tmprow);
- }
- while (tmprow->previous() && tmprow->previous()->par() == first_phys_par) {
- tmprow = tmprow->previous();
- y -= tmprow->height();
- setHeightOfRow(bview, tmprow);
- }
-#else
- while (tmprow->previous() && tmprow->previous()->par() == tmprow->par()) {
+ while (tmprow->previous()
+ && tmprow->previous()->par() == tmprow->par()) {
tmprow = tmprow->previous();
y -= tmprow->height();
setHeightOfRow(bview, tmprow);
}
-#endif
// we can set the refreshing parameters now
status(bview, LyXText::NEED_MORE_REFRESH);
int y = cur.y() - tmprow->baseline();
setHeightOfRow(bview, tmprow);
-#if 0
- Paragraph * first_phys_par = tmprow->par();
-
- // find the first row of the paragraph
- if (first_phys_par != tmprow->par())
- while (tmprow->previous() && tmprow->previous()->par() != first_phys_par) {
- tmprow = tmprow->previous();
- y -= tmprow->height();
- }
- while (tmprow->previous() && tmprow->previous()->par() == first_phys_par) {
+ while (tmprow->previous()
+ && tmprow->previous()->par() == tmprow->par()) {
tmprow = tmprow->previous();
y -= tmprow->height();
}
-#else
- while (tmprow->previous() && tmprow->previous()->par() == tmprow->par()) {
- tmprow = tmprow->previous();
- y -= tmprow->height();
- }
-#endif
+
// we can set the refreshing parameters now
if (status_ == LyXText::UNCHANGED || y < refresh_y) {
refresh_y = y;
}
-/* deletes and inserts again all paragaphs between the cursor
-* and the specified par
-* This function is needed after SetLayout and SetFont etc. */
+// deletes and inserts again all paragaphs between the cursor
+// and the specified par
+// This function is needed after SetLayout and SetFont etc.
void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
- Paragraph const * endpar) const
+ Paragraph const * endpar) const
{
Row * tmprow2;
Paragraph * tmppar = 0;
int y = cur.y() - tmprow->baseline();
-#if 0
- if (!tmprow->previous()) {
- first_phys_par = firstParagraph(); // a trick/hack for UNDO
- } else {
- first_phys_par = tmprow->par();
- // find the first row of the paragraph
- if (first_phys_par != tmprow->par())
- while (tmprow->previous() &&
- (tmprow->previous()->par() != first_phys_par)) {
- tmprow = tmprow->previous();
- y -= tmprow->height();
- }
- while (tmprow->previous()
- && tmprow->previous()->par() == first_phys_par) {
- tmprow = tmprow->previous();
- y -= tmprow->height();
- }
- }
-#else
if (!tmprow->previous()) {
// a trick/hack for UNDO
// Can somebody please tell me _why_ this solves
} else {
first_phys_par = tmprow->par();
while (tmprow->previous()
- && tmprow->previous()->par() == first_phys_par) {
+ && tmprow->previous()->par() == first_phys_par)
+ {
tmprow = tmprow->previous();
y -= tmprow->height();
}
}
-#endif
// we can set the refreshing parameters now
status(bview, LyXText::NEED_MORE_REFRESH);
refresh_y = y;
refresh_row = tmprow->previous(); /* the real refresh row will
- be deleted, so I store
- the previous here */
+ be deleted, so I store
+ the previous here */
// remove it
if (tmprow->next())
tmppar = tmprow->next()->par();
// remove the first one
tmprow2 = tmprow; /* this is because tmprow->previous()
- can be 0 */
+ can be 0 */
tmprow = tmprow->previous();
removeRow(tmprow2);
do {
if (tmppar) {
insertParagraph(bview, tmppar, tmprow);
- if (!tmprow)
+ if (!tmprow) {
tmprow = firstrow;
- while (tmprow->next() && tmprow->next()->par() == tmppar)
+ }
+ while (tmprow->next()
+ && tmprow->next()->par() == tmppar) {
tmprow = tmprow->next();
+ }
tmppar = tmppar->next();
}
} while (tmppar && tmppar != endpar);
}
-/* important for the screen */
+// important for the screen
/* the cursor set functions have a special mechanism. When they
// first the toggling area
if (cursor.y() < last_sel_cursor.y()
|| (cursor.y() == last_sel_cursor.y()
- && cursor.x() < last_sel_cursor.x())) {
+ && cursor.x() < last_sel_cursor.x())) {
toggle_end_cursor = last_sel_cursor;
toggle_cursor = cursor;
} else {
// and now the whole selection
if (selection.cursor.par() == cursor.par())
- if (selection.cursor.pos() < cursor.pos()) {
- selection.end = cursor;
- selection.start = selection.cursor;
- } else {
- selection.end = selection.cursor;
- selection.start = cursor;
- }
+ if (selection.cursor.pos() < cursor.pos()) {
+ selection.end = cursor;
+ selection.start = selection.cursor;
+ } else {
+ selection.end = selection.cursor;
+ selection.start = cursor;
+ }
else if (selection.cursor.y() < cursor.y() ||
- (selection.cursor.y() == cursor.y() && selection.cursor.x() < cursor.x())) {
+ (selection.cursor.y() == cursor.y()
+ && selection.cursor.x() < cursor.x())) {
selection.end = cursor;
selection.start = selection.cursor;
}
// Special handling if the whole selection is within one paragraph
if (selection.start.par() == selection.end.par()) {
result += selection.start.par()->asString(buffer,
- selection.start.pos(),
- selection.end.pos());
+ selection.start.pos(),
+ selection.end.pos());
return result;
}
// First paragraph in selection
result += selection.start.par()->asString(buffer,
- selection.start.pos(),
- selection.start.par()->size())
+ selection.start.pos(),
+ selection.start.par()->size())
+ "\n\n";
// The paragraphs in between (if any)
LyXCursor tmpcur(selection.start);
tmpcur.par(tmpcur.par()->next());
while (tmpcur.par() != selection.end.par()) {
- result += tmpcur.par()->asString(buffer, 0, tmpcur.par()->size()) + "\n\n";
- tmpcur.par(tmpcur.par()->next()); // Or NextAfterFootnote??
+ result += tmpcur.par()->asString(buffer, 0,
+ tmpcur.par()->size()) +"\n\n";
+ tmpcur.par(tmpcur.par()->next());
}
// Last paragraph in selection
- result += selection.end.par()->asString(buffer, 0, selection.end.pos());
+ result += selection.end.par()->asString(buffer, 0,
+ selection.end.pos());
return result;
}
-void LyXText::clearSelection(BufferView * /*bview*/) const
+void LyXText::clearSelection() const
{
selection.set(false);
selection.mark(false);
- selection.end = selection.start = cursor;
+ selection.end = selection.start = selection.cursor = cursor;
}
void LyXText::cursorEnd(BufferView * bview) const
{
- if (!cursor.row()->next() || cursor.row()->next()->par() != cursor.row()->par())
+ if (!cursor.row()->next()
+ || cursor.row()->next()->par() != cursor.row()->par()) {
setCursor(bview, cursor.par(), rowLast(cursor.row()) + 1);
- else {
+ } else {
if (cursor.par()->size() &&
(cursor.par()->getChar(rowLast(cursor.row())) == ' '
- || cursor.par()->isNewline(rowLast(cursor.row()))))
+ || cursor.par()->isNewline(rowLast(cursor.row())))) {
setCursor(bview, cursor.par(), rowLast(cursor.row()));
- else
- setCursor(bview,cursor.par(), rowLast(cursor.row()) + 1);
+ } else {
+ setCursor(bview,cursor.par(),
+ rowLast(cursor.row()) + 1);
+ }
}
}
// is disabled.
LyXCursor resetCursor = cursor;
bool implicitSelection = (font.language() == ignore_language
- && font.number() == LyXFont::IGNORE)
- ? selectWordWhenUnderCursor(bview) : false;
+ && font.number() == LyXFont::IGNORE)
+ ? selectWordWhenUnderCursor(bview, WHOLE_WORD_STRICT) : false;
// Set font
setFont(bview, font, toggleall);
- /* Implicit selections are cleared afterwards and cursor is set to the
- original position. */
+ // Implicit selections are cleared afterwards
+ //and cursor is set to the original position.
if (implicitSelection) {
- clearSelection(bview);
+ clearSelection();
cursor = resetCursor;
setCursor(bview, cursor.par(), cursor.pos());
selection.cursor = cursor;
}
+string
+LyXText::getStringToIndex(BufferView * bview)
+{
+ string idxstring;
+
+ // Try implicit word selection
+ // If there is a change in the language the implicit word selection
+ // is disabled.
+ LyXCursor resetCursor = cursor;
+ bool implicitSelection = selectWordWhenUnderCursor(bview, PREVIOUS_WORD);
+
+ if (!selection.set()) {
+ bview->owner()->message(_("Nothing to index!"));
+ return string();
+ }
+ if (selection.start.par() != selection.end.par()) {
+ bview->owner()->message(_("Cannot index more than one paragraph!"));
+ return string();
+ }
+
+ idxstring = selectionAsString(bview->buffer());
+
+ // Implicit selections are cleared afterwards
+ //and cursor is set to the original position.
+ if (implicitSelection) {
+ clearSelection();
+ cursor = resetCursor;
+ setCursor(bview, cursor.par(), cursor.pos());
+ selection.cursor = cursor;
+ }
+ return idxstring;
+}
+
Paragraph::size_type
LyXText::beginningOfMainBody(Buffer const * buf,
Paragraph const * par) const
bool pagebreak_top, bool pagebreak_bottom,
VSpace const & space_top,
VSpace const & space_bottom,
+ Spacing const & spacing,
LyXAlignment align,
string labelwidthstring,
bool noindent)
}
}
else if (endpar) {
- endpar = endpar->next(); // because of parindents etc.
+ // because of parindents etc.
+ endpar = endpar->next();
}
setUndo(bview, Undo::EDIT, selection.start.par(), undoendpar);
status(bview, LyXText::NEED_MORE_REFRESH);
refresh_row = cursor.row();
refresh_y = cursor.y() - cursor.row()->baseline();
- cursor.par()->params().lineTop(line_top);
- cursor.par()->params().lineBottom(line_bottom);
- cursor.par()->params().pagebreakTop(pagebreak_top);
- cursor.par()->params().pagebreakBottom(pagebreak_bottom);
- cursor.par()->params().spaceTop(space_top);
- cursor.par()->params().spaceBottom(space_bottom);
- // does the layout allow the new alignment?
- if (align == LYX_ALIGN_LAYOUT)
- align = textclasslist
- .Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).align;
- if (align & textclasslist
+ cursor.par()->params().lineTop(line_top);
+ cursor.par()->params().lineBottom(line_bottom);
+ cursor.par()->params().pagebreakTop(pagebreak_top);
+ 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
+ .Style(bview->buffer()->params.textclass,
+ cursor.par()->getLayout()).align;
+ if (align & textclasslist
+ .Style(bview->buffer()->params.textclass,
+ cursor.par()->getLayout()).alignpossible) {
+ if (align == textclasslist
.Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).alignpossible) {
- if (align == textclasslist
- .Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).align)
- cursor.par()->params().align(LYX_ALIGN_LAYOUT);
- else
- cursor.par()->params().align(align);
- }
- cursor.par()->setLabelWidthString(labelwidthstring);
- cursor.par()->params().noindent(noindent);
+ cursor.par()->getLayout()).align)
+ cursor.par()->params().align(LYX_ALIGN_LAYOUT);
+ else
+ cursor.par()->params().align(align);
+ }
+ cursor.par()->setLabelWidthString(labelwidthstring);
+ cursor.par()->params().noindent(noindent);
tmppar = cursor.par()->previous();
}
redoParagraphs(bview, selection.start, endpar);
- clearSelection(bview);
+ clearSelection();
setCursor(bview, selection.start.par(), selection.start.pos());
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos());
if (inset_owner)
- bview->updateInset(inset_owner, true);
+ bview->updateInset(inset_owner, true);
}
LyXTextClass const & textclass =
textclasslist.TextClass(buf->params.textclass);
- /* copy the prev-counters to this one, unless this is the start of a
- footnote or of a bibliography or the very first paragraph */
- if (par->previous()
- && !(textclasslist.Style(buf->params.textclass,
- par->previous()->getLayout()
- ).labeltype != LABEL_BIBLIO
- && layout.labeltype == LABEL_BIBLIO)) {
+ // copy the prev-counters to this one,
+ // unless this is the first paragraph
+ if (par->previous()) {
for (int i = 0; i < 10; ++i) {
par->setCounter(i, par->previous()->getFirstCounter(i));
}
par->params().appendix(par->previous()->params().appendix());
if (!par->params().appendix() && par->params().startOfAppendix()) {
- par->params().appendix(true);
- for (int i = 0; i < 10; ++i) {
- par->setCounter(i, 0);
- }
+ par->params().appendix(true);
+ for (int i = 0; i < 10; ++i) {
+ par->setCounter(i, 0);
+ }
}
par->enumdepth = par->previous()->enumdepth;
par->itemdepth = par->previous()->itemdepth;
if (par->previous()
&& par->previous()->getDepth() < par->getDepth()
&& textclasslist.Style(buf->params.textclass,
- par->previous()->getLayout()
- ).labeltype == LABEL_COUNTER_ENUMI
+ par->previous()->getLayout()
+ ).labeltype == LABEL_COUNTER_ENUMI
&& par->enumdepth < 3
&& layout.labeltype != LABEL_BIBLIO) {
par->enumdepth++;
}
- /* Maybe we have to decrement the enumeration depth, see note above */
+ // Maybe we have to decrement the enumeration depth, see note above
if (par->previous()
&& par->previous()->getDepth() > par->getDepth()
&& layout.labeltype != LABEL_BIBLIO) {
par->enumdepth = par->depthHook(par->getDepth())->enumdepth;
par->setCounter(6 + par->enumdepth,
- par->depthHook(par->getDepth())->getCounter(6 + par->enumdepth));
+ par->depthHook(par->getDepth())->getCounter(6 + par->enumdepth));
/* reset the counters.
* A depth change is like a breaking layout
*/
par->setLabelWidthString(string());
}
- /* is it a layout that has an automatic label ? */
+ // is it a layout that has an automatic label?
if (layout.labeltype >= LABEL_COUNTER_CHAPTER) {
int i = layout.labeltype - LABEL_COUNTER_CHAPTER;
par->params().labelString(string());
}
- std::ostringstream s;
+ ostringstream s;
if (!par->params().appendix()) {
switch (2 * LABEL_COUNTER_CHAPTER -
break;
case LABEL_COUNTER_SECTION:
s << par->getCounter(i - 1) << '.'
- << par->getCounter(i);
+ << par->getCounter(i);
break;
case LABEL_COUNTER_SUBSECTION:
s << par->getCounter(i - 2) << '.'
par->incCounter(i + par->enumdepth);
int number = par->getCounter(i + par->enumdepth);
- std::ostringstream s;
+ ostringstream s;
switch (par->enumdepth) {
case 1:
}
par->params().labelString(s.str().c_str());
- // we really want to get rid of that c_str()
- for (i += par->enumdepth + 1; i < 10; ++i)
- par->setCounter(i, 0); /* reset the following counters */
-
+ for (i += par->enumdepth + 1; i < 10; ++i) {
+ // reset the following counters
+ par->setCounter(i, 0);
+ }
+
}
} else if (layout.labeltype == LABEL_BIBLIO) {// ale970302
int i = LABEL_COUNTER_ENUMI - LABEL_COUNTER_CHAPTER + par->enumdepth;
// the caption hack:
if (layout.labeltype == LABEL_SENSITIVE) {
- bool isOK (par->InInset() && par->InInset()->owner() &&
- (par->InInset()->owner()->lyxCode() == Inset::FLOAT_CODE));
+ bool isOK (par->inInset() && par->inInset()->owner() &&
+ (par->inInset()->owner()->lyxCode() == Inset::FLOAT_CODE));
if (isOK) {
- InsetFloat * tmp = static_cast<InsetFloat*>(par->InInset()->owner());
+ InsetFloat * tmp = static_cast<InsetFloat*>(par->inInset()->owner());
Floating const & fl
= floatList.getType(tmp->type());
// We should get the correct number here too.
}
-/* Updates all counters BEHIND the row. Changed paragraphs
-* with a dynamic left margin will be rebroken. */
+// Updates all counters BEHIND the row. Changed paragraphs
+// with a dynamic left margin will be rebroken.
void LyXText::updateCounters(BufferView * bview, Row * row) const
{
Paragraph * par;
setCounter(bview->buffer(), par);
- /* now check for the headline layouts. remember that they
- * have a dynamic left margin */
+ // now check for the headline layouts. remember that they
+ // have a dynamic left margin
if ((textclasslist.Style(bview->buffer()->params.textclass,
par->layout).margintype == MARGIN_DYNAMIC
|| textclasslist.Style(bview->buffer()->params.textclass,
par->layout).labeltype == LABEL_SENSITIVE)) {
- /* Rebreak the paragraph */
+ // Rebreak the paragraph
removeParagraph(row);
appendParagraph(bview, row);
}
}
-/* insets an inset. */
void LyXText::insertInset(BufferView * bview, Inset * inset)
{
- if (!cursor.par()->insertInsetAllowed(inset))
+ if (!cursor.par()->insetAllowed(inset->lyxCode()))
return;
setUndo(bview, Undo::INSERT,
cursor.par(), cursor.par()->next());
cursor.par()->insertInset(cursor.pos(), inset);
- insertChar(bview, Paragraph::META_INSET); /* just to rebreak and refresh correctly.
- * The character will not be inserted a
- * second time */
+ // Just to rebreak and refresh correctly.
+ // The character will not be inserted a second time
+ insertChar(bview, Paragraph::META_INSET);
#if 1
// If we enter a highly editable inset the cursor should be to before
// the inset. This couldn't happen before as Undo was not handled inside
}
-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.
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);
cursor = selection.start;
// need a valid cursor. (Lgb)
- clearSelection(bview);
+ clearSelection();
setCursor(bview, cursor.par(), cursor.pos());
selection.cursor = cursor;
int pos = cursor.pos();
CutAndPaste::pasteSelection(&actpar, &endpar, pos,
- bview->buffer()->params.textclass);
+ bview->buffer()->params.textclass);
redoParagraphs(bview, cursor, endpar);
setCursor(bview, cursor.par(), cursor.pos());
- clearSelection(bview);
+ clearSelection();
selection.cursor = cursor;
setCursor(bview, actpar, pos);
}
// Cut the selection
- cutSelection(bview);
+ cutSelection(bview, true, false);
unFreezeUndo();
}
setCursorParUndo(bview);
- bool isEnvironment =
- textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).isEnvironment();
- bool free_spacing =
- textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).free_spacing;
- bool keepempty =
- textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).keepempty;
-
// only to be sure, should not be neccessary
- clearSelection(bview);
+ clearSelection();
- // insert the string, don't insert doublespace
- bool space_inserted = true;
- for(string::const_iterator cit = str.begin();
- cit != str.end(); ++cit) {
- if (*cit == '\n') {
- if (par->size() || keepempty) {
- par->breakParagraph(bview->buffer()->params,
- pos, isEnvironment);
- par = par->next();
- pos = 0;
- space_inserted = true;
- } else {
- continue;
- }
- // do not insert consecutive spaces if !free_spacing
- } else if ((*cit == ' ' || *cit == '\t')
- && space_inserted && !free_spacing) {
- continue;
- } else if (*cit == '\t') {
- if (!free_spacing) {
- // tabs are like spaces here
- par->insertChar(pos, ' ',
- current_font);
- ++pos;
- space_inserted = true;
- } else {
- const Paragraph::value_type nb = 8 - pos % 8;
- for (Paragraph::size_type a = 0;
- a < nb ; ++a) {
- par->insertChar(pos, ' ',
- current_font);
- ++pos;
- }
- space_inserted = true;
- }
- } else if (!IsPrintable(*cit)) {
- // Ignore unprintables
- continue;
- } else {
- // just insert the character
- par->insertChar(pos, *cit, current_font);
- ++pos;
- space_inserted = (*cit == ' ');
- }
-
- }
+ bview->buffer()->insertStringAsLines(par, pos, current_font, str);
redoParagraphs(bview, cursor, endpar);
setCursor(bview, cursor.par(), cursor.pos());
}
-/* turns double-CR to single CR, others where converted into one
- blank. Then InsertStringAsLines is called */
+// turns double-CR to single CR, others where converted into one
+// blank. Then InsertStringAsLines is called
void LyXText::insertStringAsParagraphs(BufferView * bview, string const & str)
{
string linestr(str);
!(res.par()->getChar(res.pos()) == Paragraph::META_INSET
&& (inset = res.par()->getInset(res.pos())) != 0
&& find(codes.begin(), codes.end(), inset->lyxCode())
- != codes.end()
+ != codes.end()
&& (contents.empty() ||
static_cast<InsetCommand *>(res.par()->getInset(res.pos()))->getContents()
== contents)));
Paragraph * par = firstParagraph();
do {
- pos = par->getPositionOfInset(inset);
- if (pos != -1){
- checkParagraph(bview, par, pos);
- return true;
- }
+ pos = par->getPositionOfInset(inset);
+ if (pos != -1){
+ checkParagraph(bview, par, pos);
+ return true;
+ }
par = par->next();
} while (par);
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);
cur.pos(pos);
cur.boundary(boundary);
- /* get the cursor y position in text */
+ // get the cursor y position in text
int y = 0;
Row * row = getRow(par, pos, y);
- /* y is now the beginning of the cursor row */
+ // y is now the beginning of the cursor row
y += row->baseline();
- /* y is now the cursor baseline */
+ // y is now the cursor baseline
cur.y(y);
- /* now get the cursors x position */
+ // now get the cursors x position
float x;
float fill_separator;
float fill_hfill;
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);
}
Paragraph::size_type pos,
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);
+ InsetText * it = static_cast<InsetText *>(par->inInset());
+ if (it) {
+ if (it != inset_owner) {
+ lyxerr << "InsetText is " << it << endl;
+ lyxerr << "inset_owner is " << inset_owner << endl;
+#warning I belive 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);
}
if (pos == cursor.par()->size())
--pos;
else // potentional bug... BUG (Lgb)
- if (cursor.par()->isSeparator(pos)) {
- if (pos > cursor.row()->pos() &&
- bidi_level(pos) % 2 ==
- bidi_level(pos - 1) % 2)
- --pos;
- else if (pos + 1 < cursor.par()->size())
- ++pos;
- }
+ if (cursor.par()->isSeparator(pos)) {
+ if (pos > cursor.row()->pos() &&
+ bidi_level(pos) % 2 ==
+ bidi_level(pos - 1) % 2)
+ --pos;
+ else if (pos + 1 < cursor.par()->size())
+ ++pos;
+ }
}
current_font =
void LyXText::setCursorFromCoordinates(BufferView * bview, int x, int y) const
{
LyXCursor old_cursor = cursor;
-
- /* get the row first */
-
- Row * row = getRowNearY(y);
- cursor.par(row->par());
- bool bound = false;
- int column = getColumnNearX(bview, row, x, bound);
- cursor.pos(row->pos() + column);
- cursor.x(x);
- cursor.y(y + row->baseline());
- cursor.row(row);
- cursor.boundary(bound);
+ setCursorFromCoordinates(bview, cursor, x, y);
setCurrentFont(bview);
deleteEmptyParagraphMechanism(bview, old_cursor);
}
void LyXText::setCursorFromCoordinates(BufferView * bview, LyXCursor & cur,
int x, int y) const
{
- /* get the row first */
+ // Get the row first.
Row * row = getRowNearY(y);
bool bound = false;
- int column = getColumnNearX(bview, row, x, bound);
+ int const column = getColumnNearX(bview, row, x, bound);
cur.par(row->par());
cur.pos(row->pos() + column);
if (old_cursor.par() != cursor.par()) {
if ((old_cursor.par()->size() == 0
- || (old_cursor.par()->size() == 1
- && old_cursor.par()->isLineSeparator(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;
+ 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;
-
- // delete old row
- removeRow(old_cursor.row());
- if (ownerParagraph() == old_cursor.par()) {
- ownerParagraph(ownerParagraph()->next());
- }
- // delete old par
- delete old_cursor.par();
+ }
+ 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());
+ }
+ // delete old 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());
+ 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)) {
}
-Paragraph * LyXText::getParFromID(int id) const
-{
- if (id < 0)
- return 0;
- Paragraph * result = firstParagraph();
- Paragraph * ires = 0;
- while (result && result->id() != id) {
- if ((ires = result->getParFromID(id)))
- return ires;
- result = result->next();
- }
- return result;
-}
-
void LyXText::toggleAppendix(BufferView * bview)
{
Paragraph * par = cursor.par();
// ensure that we have only one start_of_appendix in this document
Paragraph * tmp = firstParagraph();
- for (; tmp; tmp = tmp->next())
+ for (; tmp; tmp = tmp->next()) {
tmp->params().startOfAppendix(false);
-
+ }
+
par->params().startOfAppendix(start);
// we can set the refreshing parameters now
Paragraph * LyXText::ownerParagraph() const
{
- if (inset_owner)
+ if (inset_owner) {
return inset_owner->paragraph();
-
+ }
return bv_owner->buffer()->paragraph;
}
Paragraph * LyXText::ownerParagraph(Paragraph * p) const
{
- if (inset_owner)
+ if (inset_owner) {
inset_owner->paragraph(p);
- else
+ } else {
bv_owner->buffer()->paragraph = p;
+ }
return 0;
}
Paragraph * LyXText::ownerParagraph(int id, Paragraph * p) const
{
- Paragraph * op = getParFromID(id);
- if (op && op->InInset()) {
- static_cast<InsetText *>(op->InInset())->paragraph(p);
+ Paragraph * op = bv_owner->buffer()->getParFromID(id);
+ if (op && op->inInset()) {
+ static_cast<InsetText *>(op->inInset())->paragraph(p);
} else {
- if (inset_owner)
+ if (inset_owner) {
inset_owner->paragraph(p);
- else
+ } else {
bv_owner->buffer()->paragraph = p;
+ }
}
return 0;
}
void LyXText::status(BufferView * bview, LyXText::text_status st) const
{
- if ((status_ != NEED_MORE_REFRESH) ||
- (status_ == NEED_MORE_REFRESH) && (st != NEED_VERY_LITTLE_REFRESH))
+ // 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:
+ // We should only go up with refreshing code so this means that if
+ // we have a MORE refresh we should never set it to LITTLE if we still
+ // didn't handle it (and then it will be UNCHANGED. Now as long as
+ // we stay inside one LyXText this may work but we need to tell the
+ // outermost LyXText that it should REALLY draw us if there is some
+ // change in a Inset::LyXText. So you see that when we are inside a
+ // inset's LyXText we give the LITTLE to the outermost LyXText to
+ // tell'em that it should redraw the actual row (where the inset
+ // resides! Capito?!
+
+ if ((status_ != NEED_MORE_REFRESH)
+ || (status_ == NEED_MORE_REFRESH
+ && st != NEED_VERY_LITTLE_REFRESH))
{
status_ = st;
- if (inset_owner && st != UNCHANGED)
+ if (inset_owner && st != UNCHANGED) {
bview->text->status(bview, NEED_VERY_LITTLE_REFRESH);
+ if (!bview->text->refresh_row) {
+ bview->text->refresh_row = bview->text->cursor.row();
+ bview->text->refresh_y = bview->text->cursor.y() -
+ bview->text->cursor.row()->baseline();
+ }
+ }
}
}