/* This file is part of
* ======================================================
- *
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
Paragraph * par = ownerParagraph();
current_font = getFont(bview->buffer(), par, 0);
-
+
while (par) {
insertParagraph(bview, par, lastrow);
par = par->next();
{
LyXFont tmpfont(font);
Paragraph::depth_type par_depth = par->getDepth();
-
+
// Resolve against environment font information
while (par && par_depth && !tmpfont.resolved()) {
par = par->outerHook();
tmpfont.realize(textclasslist[buf->params.textclass].defaultfont());
#else
tmpfont.realize(textclasslist[buf->params.textclass].defaultfont(),
- buf->params.language);
+ buf->params.language);
#endif
return tmpfont;
// 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,
- pos_type pos) const
+ pos_type pos) const
{
lyx::Assert(pos >= 0);
-
- LyXLayout const & layout =
+
+ LyXLayout const & layout =
textclasslist[buf->params.textclass][par->layout()];
-
+
Paragraph::depth_type par_depth = par->getDepth();
// We specialize the 95% common case:
if (!par_depth) {
#endif
}
}
-
+
// The uncommon case need not be optimized as much
-
+
LyXFont layoutfont;
-
+
if (pos < beginningOfMainBody(buf, par)) {
// 1% goes here
layoutfont = layout.labelfont;
#endif
if (par->inInset())
par->inInset()->getDrawFont(tmpfont);
-
+
return realizeFont(tmpfont, buf, par);
}
LyXFont const LyXText::getLayoutFont(Buffer const * buf, Paragraph * par) const
{
- LyXLayout const & layout =
+ LyXLayout const & layout =
textclasslist[buf->params.textclass][par->layout()];
Paragraph::depth_type par_depth = par->getDepth();
LyXFont const LyXText::getLabelFont(Buffer const * buf, Paragraph * par) const
{
- LyXLayout const & layout =
+ LyXLayout const & layout =
textclasslist[buf->params.textclass][par->layout()];
Paragraph::depth_type par_depth = par->getDepth();
void LyXText::setCharFont(BufferView * bv, Paragraph * par,
- pos_type pos, LyXFont const & fnt,
- bool toggleall)
+ pos_type pos, LyXFont const & fnt,
+ bool toggleall)
{
Buffer const * buf = bv->buffer();
LyXFont font = getFont(buf, par, pos);
void LyXText::setCharFont(Buffer const * buf, Paragraph * par,
- pos_type pos, LyXFont const & fnt)
+ pos_type pos, LyXFont const & fnt)
{
LyXFont font(fnt);
layoutfont.realize(tclass[tp->layout()].font);
#else
layoutfont.realize(textclasslist.
- Style(buf->params.textclass,
- tp->layout()).font,
- buf->params.language);
+ Style(buf->params.textclass,
+ tp->layout()).font,
+ buf->params.language);
#endif
}
}
// inserts a new row behind the specified row, increments
// the touched counters
void LyXText::insertRow(Row * row, Paragraph * par,
- pos_type pos) const
+ pos_type pos) const
{
Row * tmprow = new Row;
if (!row) {
tmprow->next(row->next());
row->next(tmprow);
}
-
+
if (tmprow->next())
tmprow->next()->previous(tmprow);
-
+
if (tmprow->previous())
tmprow->previous()->next(tmprow);
-
-
+
+
tmprow->par(par);
tmprow->pos(pos);
}
height -= row->height(); // the text becomes smaller
-
+
delete row;
--number_of_rows; // one row less
}
{
Paragraph * tmppar = row->par();
row = row->next();
-
+
Row * tmprow;
while (row && row->par() == tmppar) {
tmprow = row->next();
row = tmprow;
}
}
-
+
// 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
-
+
// and now append the whole paragraph behind the new row
if (!row) {
firstrow->height(0);
Inset * inset = 0;
if (cursor.pos() == 0 && cursor.par()->bibkey) {
inset = cursor.par()->bibkey;
- } else if (cursor.pos() < cursor.par()->size()
+ } else if (cursor.pos() < cursor.par()->size()
&& cursor.par()->isInset(cursor.pos())) {
inset = cursor.par()->getInset(cursor.pos());
}
layoutfont = layout.labelfont;
else
layoutfont = layout.font;
-
+
LyXFont tmpfont = par->getFontSettings(buf->params, pos);
tmpfont.reduce(layoutfont);
par->setFont(pos, tmpfont);
{
Paragraph * endpar = send_cur.par()->next();
Paragraph * undoendpar = endpar;
-
+
if (endpar && endpar->getDepth()) {
while (endpar && endpar->getDepth()) {
endpar = endpar->next();
} else if (endpar) {
endpar = endpar->next(); // because of parindents etc.
}
-
+
setUndo(bview, Undo::EDIT, sstart_cur.par(), undoendpar);
-
+
// ok we have a selection. This is always between sstart_cur
// and sel_end cursor
cur = sstart_cur;
LyXLayout const & lyxlayout =
textclasslist[bview->buffer()->params.textclass][layout];
-
+
do {
cur.par()->applyLayout(layout);
makeFontEntriesLayoutSpecific(bview->buffer(), cur.par());
fppar->params().spaceTop(lyxlayout.fill_top ?
VSpace(VSpace::VFILL)
: VSpace(VSpace::NONE));
- fppar->params().spaceBottom(lyxlayout.fill_bottom ?
+ fppar->params().spaceBottom(lyxlayout.fill_bottom ?
VSpace(VSpace::VFILL)
: VSpace(VSpace::NONE));
if (lyxlayout.margintype == MARGIN_MANUAL)
if (cur.par() != send_cur.par())
cur.par(cur.par()->next());
} while (cur.par() != send_cur.par());
-
+
return endpar;
}
Paragraph * endpar = setLayout(bview, cursor, selection.start,
selection.end, layout);
redoParagraphs(bview, selection.start, endpar);
-
+
// we have to reset the selection, because the
// geometry could have changed
setCursor(bview, selection.start.par(),
} else if (endpar) {
endpar = endpar->next(); // because of parindents etc.
}
-
+
setUndo(bview, Undo::EDIT,
selection.start.par(), undoendpar);
// ok we have a selection. This is always between sel_start_cursor
// and sel_end cursor
cursor = selection.start;
-
+
bool anything_changed = false;
-
+
LyXTextClass const & tclass =
textclasslist[bview->buffer()->params.textclass];
-
+
while (true) {
// NOTE: you can't change the depth of a bibliography entry
if (tclass[cursor.par()->layout()].labeltype != LABEL_BIBLIO) {
break;
cursor.par(cursor.par()->next());
}
-
+
// if nothing changed set all depth to 0
if (!anything_changed) {
cursor = selection.start;
}
cursor.par()->params().depth(0);
}
-
+
redoParagraphs(bview, selection.start, endpar);
-
+
// we have to reset the selection, because the
// geometry could have changed
setCursor(bview, selection.start.par(), selection.start.pos());
} else if (endpar) {
endpar = endpar->next(); // because of parindents etc.
}
-
+
setUndo(bview, Undo::EDIT,
selection.start.par(), undoendpar);
}
redoParagraphs(bview, selection.start, endpar);
-
+
// we have to reset the selection, because the
// geometry could have changed
setCursor(bview, selection.start.par(),
// Determine basis font
LyXFont layoutfont;
if (cursor.pos() < beginningOfMainBody(bview->buffer(),
- cursor.par())) {
+ cursor.par())) {
layoutfont = getLabelFont(bview->buffer(),
cursor.par());
} else {
cursor.par());
}
// Update current font
- real_current_font.update(font,
+ real_current_font.update(font,
bview->buffer()->params.language,
toggleall);
real_current_font.realize(layoutfont);
#else
real_current_font.realize(layoutfont,
- bview->buffer()->params.language);
+ bview->buffer()->params.language);
#endif
return;
}
LyXCursor tmpcursor = cursor; // store the current cursor
-
+
// ok we have a selection. This is always between sel_start_cursor
// 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() ||
}
}
unFreezeUndo();
-
+
redoParagraphs(bview, selection.start, selection.end.par()->next());
-
+
// we have to reset the selection, because the
// geometry could have changed, but we keep
// it for user convenience
setCursor(bview, selection.end.par(), selection.end.pos());
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true,
- tmpcursor.boundary());
+ tmpcursor.boundary());
}
int y = cur.y() - tmprow->baseline();
setHeightOfRow(bview, tmprow);
-
+
while (tmprow->previous()
&& tmprow->previous()->par() == tmprow->par()) {
tmprow = tmprow->previous();
y -= tmprow->height();
setHeightOfRow(bview, tmprow);
}
-
+
// we can set the refreshing parameters now
status(bview, LyXText::NEED_MORE_REFRESH);
refresh_y = y;
void LyXText::redoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur)
{
Row * tmprow = cur.row();
-
+
int y = cur.y() - tmprow->baseline();
setHeightOfRow(bview, tmprow);
// deletes and inserts again all paragaphs between the cursor
-// and the specified par
+// 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;
Paragraph * first_phys_par = 0;
-
+
Row * tmprow = cur.row();
-
+
int y = cur.y() - tmprow->baseline();
if (!tmprow->previous()) {
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();
tmppar = 0;
}
}
-
+
// remove the first one
tmprow2 = tmprow; /* this is because tmprow->previous()
- can be 0 */
+ can be 0 */
tmprow = tmprow->previous();
removeRow(tmprow2);
-
+
tmppar = first_phys_par;
do {
tmppar = tmppar->next();
}
} while (tmppar && tmppar != endpar);
-
+
// this is because of layout changes
if (refresh_row) {
refresh_y -= refresh_row->height();
- setHeightOfRow(bview, refresh_row);
+ setHeightOfRow(bview, refresh_row);
} else {
refresh_row = firstrow;
refresh_y = 0;
- setHeightOfRow(bview, refresh_row);
+ setHeightOfRow(bview, refresh_row);
}
-
+
if (tmprow && tmprow->next())
setHeightOfRow(bview, tmprow->next());
}
/* the cursor set functions have a special mechanism. When they
* realize, that you left an empty paragraph, they will delete it.
* They also delete the corresponding row */
-
+
// need the selection cursor:
void LyXText::setSelection(BufferView * bview)
{
selection.start = selection.cursor;
selection.end = selection.cursor;
}
-
+
selection.set(true);
-
+
// first the toggling area
if (cursor.y() < last_sel_cursor.y()
|| (cursor.y() == last_sel_cursor.y()
toggle_end_cursor = cursor;
toggle_cursor = last_sel_cursor;
}
-
+
last_sel_cursor = cursor;
-
+
// and now the whole selection
if (selection.cursor.par() == cursor.par())
selection.end = cursor;
selection.start = selection.cursor;
} else {
- selection.end = selection.cursor;
+ selection.end = selection.cursor;
selection.start = cursor;
}
else if (selection.cursor.y() < cursor.y() ||
selection.start = selection.cursor;
}
else {
- selection.end = selection.cursor;
+ selection.end = selection.cursor;
selection.start = cursor;
}
-
+
// a selection with no contents is not a selection
- if (selection.start.par() == selection.end.par() &&
+ if (selection.start.par() == selection.end.par() &&
selection.start.pos() == selection.end.pos())
selection.set(false);
string const LyXText::selectionAsString(Buffer const * buffer,
- bool label) const
+ bool label) const
{
if (!selection.set()) return string();
string result;
-
+
// Special handling if the whole selection is within one paragraph
if (selection.start.par() == selection.end.par()) {
result += selection.start.par()->asString(buffer,
label);
return result;
}
-
+
// The selection spans more than one paragraph
// First paragraph in selection
selection.start.par()->size(),
label)
+ "\n\n";
-
+
// The paragraphs in between (if any)
LyXCursor tmpcur(selection.start);
tmpcur.par(tmpcur.par()->next());
// Last paragraph in selection
result += selection.end.par()->asString(buffer, 0,
selection.end.pos(), label);
-
+
return result;
}
selection.set(false);
selection.mark(false);
last_sel_cursor = selection.end = selection.start = selection.cursor = cursor;
+ // reset this in the bv_owner!
+ if (bv_owner && bv_owner->text)
+ bv_owner->text->xsel_cache.set(false);
}
cursor.par(cursor.par()->next());
setCursor(bview, cursor.par(), cursor.par()->size());
}
-
-
+
+
void LyXText::toggleFree(BufferView * bview,
- LyXFont const & font, bool toggleall)
+ LyXFont const & font, bool toggleall)
{
// If the mask is completely neutral, tell user
if (font == LyXFont(LyXFont::ALL_IGNORE)) {
}
// Try implicit word selection
- // If there is a change in the language the implicit word selection
+ // If there is a change in the language the implicit word selection
// is disabled.
LyXCursor resetCursor = cursor;
bool implicitSelection = (font.language() == ignore_language
- && font.number() == LyXFont::IGNORE)
+ && font.number() == LyXFont::IGNORE)
? selectWordWhenUnderCursor(bview, WHOLE_WORD_STRICT) : false;
// Set font
string LyXText::getStringToIndex(BufferView * bview)
{
string idxstring;
-
+
// Try implicit word selection
- // If there is a change in the language the 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);
}
idxstring = selectionAsString(bview->buffer(), false);
-
+
// Implicit selections are cleared afterwards
//and cursor is set to the original position.
if (implicitSelection) {
}
-/* the DTP switches for paragraphs. LyX will store them in the
-* first physicla paragraph. When a paragraph is broken, the top settings
-* rest, the bottom settings are given to the new one. So I can make shure,
-* they do not duplicate themself and you cannnot make dirty things with
-* them! */
+/* the DTP switches for paragraphs. LyX will store them in the
+* first physicla paragraph. When a paragraph is broken, the top settings
+* rest, the bottom settings are given to the new one. So I can make shure,
+* they do not duplicate themself and you cannnot make dirty things with
+* them! */
void LyXText::setParagraph(BufferView * bview,
bool line_top, bool line_bottom,
VSpace const & space_top,
VSpace const & space_bottom,
Spacing const & spacing,
- LyXAlignment align,
+ LyXAlignment align,
string labelwidthstring,
- bool noindent)
+ bool noindent)
{
LyXCursor tmpcursor = cursor;
if (!selection.set()) {
// because of parindents etc.
endpar = endpar->next();
}
-
+
setUndo(bview, Undo::EDIT, selection.start.par(), undoendpar);
-
+
Paragraph * tmppar = selection.end.par();
LyXTextClass const & tclass =
textclasslist[bview->buffer()->params.textclass];
-
+
while (tmppar != selection.start.par()->previous()) {
setCursor(bview, tmppar, 0);
status(bview, LyXText::NEED_MORE_REFRESH);
cursor.par()->params().pagebreakBottom(pagebreak_bottom);
cursor.par()->params().spaceTop(space_top);
cursor.par()->params().spaceBottom(space_bottom);
- cursor.par()->params().spacing(spacing);
+ cursor.par()->params().spacing(spacing);
// does the layout allow the new alignment?
LyXLayout const & layout = tclass[cursor.par()->layout()];
-
+
if (align == LYX_ALIGN_LAYOUT)
align = layout.align;
if (align & layout.alignpossible) {
cursor.par()->params().noindent(noindent);
tmppar = cursor.par()->previous();
}
-
+
redoParagraphs(bview, selection.start, endpar);
-
+
clearSelection();
setCursor(bview, selection.start.par(), selection.start.pos());
selection.cursor = cursor;
{
static const char hebrew[22] = {
'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è',
- 'é', 'ë', 'ì', 'î', 'ð', 'ñ', 'ò', 'ô', 'ö',
+ 'é', 'ë', 'ì', 'î', 'ð', 'ñ', 'ò', 'ô', 'ö',
'÷', 'ø', 'ù', 'ú'
};
if (n < 1 || n > 22)
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;
} else {
for (int i = 0; i < 10; ++i) {
par->setCounter(i, 0);
- }
+ }
par->params().appendix(par->params().startOfAppendix());
par->enumdepth = 0;
par->itemdepth = 0;
for (int i = 6 + par->enumdepth + 1; i < 10; ++i)
par->setCounter(i, 0);
}
-
+
if (!par->params().labelString().empty()) {
par->params().labelString(string());
}
-
+
if (layout.margintype == MARGIN_MANUAL) {
if (par->params().labelWidthString().empty()) {
par->setLabelWidthString(layout.labelstring());
} else {
par->setLabelWidthString(string());
}
-
+
// is it a layout that has an automatic label?
if (layout.labeltype >= LABEL_COUNTER_CHAPTER) {
-
+
int i = layout.labeltype - LABEL_COUNTER_CHAPTER;
if (i >= 0 && i<= buf->params.secnumdepth) {
- par->incCounter(i); // increment the counter
-
+ par->incCounter(i); // increment the counter
+
// Is there a label? Useful for Chapter layout
if (!par->params().appendix()) {
if (!layout.labelstring().empty())
par->params().labelString(layout.labelstring());
else
par->params().labelString(string());
- } else {
+ } else {
if (!layout.labelstring_appendix().empty())
par->params().labelString(layout.labelstring_appendix());
else
<< par->getCounter(i - 2) << '.'
<< par->getCounter(i - 1) << '.'
<< par->getCounter(i);
-
+
break;
case LABEL_COUNTER_PARAGRAPH:
s << par->getCounter(i - 4) << '.'
// case it is, how can this be correct?
// (Lgb)
s << par->getCounter(i) << '.';
- break;
+ break;
}
} else { // appendix
switch (2 * LABEL_COUNTER_CHAPTER - textclass.maxcounter() + i) {
// case it is, how can this be correct?
// (Lgb)
s << par->getCounter(i) << '.';
-
+
break;
}
}
par->params().labelString(par->params().labelString() +s.str().c_str());
// We really want to remove the c_str as soon as
// possible...
-
+
for (i++; i < 10; ++i) {
// reset the following counters
par->setCounter(i, 0);
// 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;
par->incCounter(i);
}
par->bibkey->setCounter(number);
par->params().labelString(layout.labelstring());
-
+
// In biblio should't be following counters but...
} else {
string s = layout.labelstring();
-
+
// the caption hack:
if (layout.labeltype == LABEL_SENSITIVE) {
bool isOK (par->inInset() && par->inInset()->owner() &&
(par->inInset()->owner()->lyxCode() == Inset::FLOAT_CODE));
-
+
if (isOK) {
InsetFloat * tmp = static_cast<InsetFloat*>(par->inInset()->owner());
Floating const & fl
// We should get the correct number here too.
s = fl.name() + " #:";
} else {
- /* par->SetLayout(0);
+ /* par->SetLayout(0);
s = layout->labelstring; */
s = (par->getParLanguage(buf->params)->lang() == "hebrew")
? " :úåòîùî øñç" : "Senseless: ";
}
}
par->params().labelString(s);
-
+
/* reset the enumeration counter. They are always resetted
- * when there is any other layout between */
+ * when there is any other layout between */
for (int i = 6 + par->enumdepth; i < 10; ++i)
par->setCounter(i, 0);
}
while (par) {
while (row->par() != par)
row = row->next();
-
+
setCounter(bview->buffer(), par);
-
+
// now check for the headline layouts. remember that they
// have a dynamic left margin
LyXTextClass const & tclass =
textclasslist[bview->buffer()->params.textclass];
LyXLayout const & layout = tclass[par->layout()];
-
+
if (layout.margintype == MARGIN_DYNAMIC
|| layout.labeltype == LABEL_SENSITIVE) {
// Rebreak the paragraph
// This doesn't make sense, if there is no selection
if (!selection.set())
return;
-
+
// OK, we have a selection. This is always between selection.start
// and selection.end
// make sure that the depth behind the selection are restored, too
Paragraph * endpar = selection.end.par()->next();
Paragraph * undoendpar = endpar;
-
+
if (endpar && endpar->getDepth()) {
while (endpar && endpar->getDepth()) {
endpar = endpar->next();
} else if (endpar) {
endpar = endpar->next(); // because of parindents etc.
}
-
+
setUndo(bview, Undo::DELETE,
selection.start.par(), undoendpar);
-
+
// there are two cases: cut only within one paragraph or
// more than one paragraph
if (selection.start.par() == selection.end.par()) {
endpar = selection.end.par();
int pos = selection.end.pos();
CutAndPaste::cutSelection(selection.start.par(), &endpar,
- selection.start.pos(), pos,
- bview->buffer()->params.textclass,
+ 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,
+ selection.start.pos(), pos,
+ bview->buffer()->params.textclass,
doclear, realcut);
cursor.par(endpar);
selection.end.par(endpar);
&& selection.start.par()->isLineSeparator(selection.start.pos())
&& (selection.start.par() != selection.end.par()
|| selection.start.pos() < selection.end.pos()))
- selection.start.pos(selection.start.pos() + 1);
+ selection.start.pos(selection.start.pos() + 1);
CutAndPaste::copySelection(selection.start.par(), selection.end.par(),
- selection.start.pos(), selection.end.pos(),
- bview->buffer()->params.textclass);
+ selection.start.pos(), selection.end.pos(),
+ bview->buffer()->params.textclass);
}
return;
setUndo(bview, Undo::INSERT,
- cursor.par(), cursor.par()->next());
+ cursor.par(), cursor.par()->next());
Paragraph * endpar;
Paragraph * actpar = cursor.par();
CutAndPaste::pasteSelection(&actpar, &endpar, pos,
bview->buffer()->params.textclass);
-
+
redoParagraphs(bview, cursor, endpar);
-
+
setCursor(bview, cursor.par(), cursor.pos());
clearSelection();
-
+
+ selection.cursor = cursor;
setCursor(bview, actpar, pos);
+ setSelection(bview);
updateCounters(bview, cursor.row());
}
{
if (str.empty())
return;
-
+
selection.cursor = cursor;
for (string::size_type i = 0; i < str.length(); ++i)
cursorRight(bview);
selection.end.par()->insertChar(pos, (*cit), font);
++pos;
}
-
+
// Cut the selection
cutSelection(bview, true, false);
Paragraph * par = cursor.par();
pos_type pos = cursor.pos();
Paragraph * endpar = cursor.par()->next();
-
+
setCursorParUndo(bview);
-
+
// only to be sure, should not be neccessary
clearSelection();
-
+
bview->buffer()->insertStringAsLines(par, pos, current_font, str);
redoParagraphs(bview, cursor, endpar);
} else {
linestr[i] = ' ';
newline_inserted = true;
- }
+ }
} else if (IsPrintable(linestr[i])) {
newline_inserted = false;
}
res.par(res.par()->next());
res.pos(0);
}
-
- } while (res.par() &&
+
+ } while (res.par() &&
!(res.par()->isInset(res.pos())
&& (inset = res.par()->getInset(res.pos())) != 0
&& find(codes.begin(), codes.end(), inset->lyxCode())
void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
- pos_type pos)
+ pos_type pos)
{
- LyXCursor tmpcursor;
+ LyXCursor tmpcursor;
int y = 0;
pos_type z;
Row * row = getRow(par, pos, y);
-
+
// is there a break one row above
if (row->previous() && row->previous()->par() == row->par()) {
z = nextBreakPoint(bview, row->previous(), workWidth(bview));
refresh_y = y;
refresh_row = row->previous();
status(bview, LyXText::NEED_MORE_REFRESH);
-
+
breakAgain(bview, row->previous());
-
+
// set the cursor again. Otherwise
// dangling pointers are possible
setCursor(bview, cursor.par(), cursor.pos(),
pos_type const tmplast = rowLast(row);
refresh_y = y;
refresh_row = row;
-
+
breakAgain(bview, row);
if (row->height() == tmpheight && rowLast(row) == tmplast)
status(bview, LyXText::NEED_VERY_LITTLE_REFRESH);
else
- status(bview, LyXText::NEED_MORE_REFRESH);
-
+ status(bview, LyXText::NEED_MORE_REFRESH);
+
// check the special right address boxes
if (textclasslist[bview->buffer()->params.textclass][
par->layout()].margintype
tmpcursor.x(0);
tmpcursor.x_fix(0);
tmpcursor.pos(pos);
- redoDrawingOfParagraph(bview, tmpcursor);
+ redoDrawingOfParagraph(bview, tmpcursor);
}
// set the cursor again. Otherwise dangling pointers are possible
// also set the selection
-
+
if (selection.set()) {
tmpcursor = cursor;
setCursorIntern(bview, selection.cursor.par(), selection.cursor.pos(),
false, selection.cursor.boundary());
- selection.cursor = cursor;
+ selection.cursor = cursor;
setCursorIntern(bview, selection.start.par(),
selection.start.pos(),
false, selection.start.boundary());
- selection.start = cursor;
+ selection.start = cursor;
setCursorIntern(bview, selection.end.par(),
selection.end.pos(),
false, selection.end.boundary());
- selection.end = cursor;
+ selection.end = cursor;
setCursorIntern(bview, last_sel_cursor.par(),
last_sel_cursor.pos(),
false, last_sel_cursor.boundary());
- last_sel_cursor = cursor;
+ last_sel_cursor = cursor;
cursor = tmpcursor;
}
setCursorIntern(bview, cursor.par(), cursor.pos(),
checkParagraph(bview, cursor.par(), pos);
return true;
}
-
+
// check every paragraph
-
+
Paragraph * par = ownerParagraph();
do {
pos = par->getPositionOfInset(inset);
}
par = par->next();
} while (par);
-
+
return false;
}
bool LyXText::setCursor(BufferView * bview, Paragraph * par,
- pos_type pos,
- bool setfont, bool boundary) const
+ pos_type pos,
+ bool setfont, bool boundary) const
{
LyXCursor old_cursor = cursor;
setCursorIntern(bview, par, pos, setfont, boundary);
void LyXText::setCursor(BufferView * bview, LyXCursor & cur, Paragraph * par,
- pos_type pos, bool boundary) const
+ pos_type pos, bool boundary) const
{
lyx::Assert(par);
lyx::Assert(bview);
Row * row = getRow(par, pos, y);
// 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
float fill_hfill;
float fill_label_hfill;
prepareToPrint(bview, row, x, fill_separator, fill_hfill,
- fill_label_hfill);
+ fill_label_hfill);
pos_type cursor_vpos = 0;
pos_type last = rowLastPrintable(row);
pos = row->pos();
cur.pos(pos);
}
-
+
if (last < row->pos())
cursor_vpos = row->pos();
else if (pos > last && !boundary)
cursor_vpos = (row->par()->isRightToLeftPar(bview->buffer()->params))
- ? row->pos() : last + 1;
+ ? row->pos() : last + 1;
else if (pos > row->pos() &&
- (pos > last || boundary))
+ (pos > last || boundary))
/// Place cursor after char at (logical) position pos - 1
cursor_vpos = (bidi_level(pos - 1) % 2 == 0)
? log2vis(pos - 1) + 1 : log2vis(pos - 1);
/// Place cursor before char at (logical) position pos
cursor_vpos = (bidi_level(pos) % 2 == 0)
? log2vis(pos) : log2vis(pos) + 1;
-
+
pos_type main_body =
beginningOfMainBody(bview->buffer(), row->par());
if ((main_body > 0) &&
- ((main_body-1 > last) ||
+ ((main_body-1 > last) ||
!row->par()->isLineSeparator(main_body-1)))
main_body = 0;
-
+
for (pos_type vpos = row->pos(); vpos < cursor_vpos; ++vpos) {
pos = vis2log(vpos);
if (main_body > 0 && pos == main_body - 1) {
x += singleWidth(bview, row->par(), pos);
if (pos >= main_body)
x += fill_hfill;
- else
+ else
x += fill_label_hfill;
} else if (row->par()->isSeparator(pos)) {
x += singleWidth(bview, row->par(), pos);
} else
x += singleWidth(bview, row->par(), pos);
}
-
+
cur.x(int(x));
cur.x_fix(cur.x());
cur.row(row);
void LyXText::setCursorIntern(BufferView * bview, Paragraph * par,
- pos_type pos, bool setfont, bool boundary) const
+ pos_type pos, bool setfont, bool boundary) const
{
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;
+ lyxerr[Debug::INSETS] << "InsetText is " << it
+ << endl
+ << "inset_owner is "
+ << inset_owner << endl;
#ifdef WITH_WARNINGS
#warning I believe this code is wrong. (Lgb)
#warning Jürgen, have a look at this. (Lgb)
return;
}
}
-
+
setCursor(bview, cursor, par, pos, boundary);
if (setfont)
setCurrentFont(bview);
else // potentional bug... BUG (Lgb)
if (cursor.par()->isSeparator(pos)) {
if (pos > cursor.row()->pos() &&
- bidi_level(pos) % 2 ==
+ bidi_level(pos) % 2 ==
bidi_level(pos - 1) % 2)
--pos;
else if (pos + 1 < cursor.par()->size())
int x, int y) const
{
// Get the row first.
-
+
Row * row = getRowNearY(y);
bool bound = false;
pos_type const column = getColumnNearX(bview, row, x, bound);
cur.pos(row->pos() + column);
cur.x(x);
cur.y(y + row->baseline());
- cur.row(row);
+ cur.row(row);
cur.boundary(bound);
}
void LyXText::cursorUp(BufferView * bview) const
{
- setCursorFromCoordinates(bview, cursor.x_fix(),
+ setCursorFromCoordinates(bview, cursor.x_fix(),
cursor.y() - cursor.row()->baseline() - 1);
}
void LyXText::cursorDown(BufferView * bview) const
{
- setCursorFromCoordinates(bview, cursor.x_fix(),
+ setCursorFromCoordinates(bview, cursor.x_fix(),
cursor.y() - cursor.row()->baseline()
+ cursor.row()->height() + 1);
}
{
return false;
}
-
+
/* Ok I'll put some comments here about what is missing.
I have fixed BackSpace (and thus Delete) to not delete
double-spaces automagically. I have also changed Cut,
// If the pos around the old_cursor were spaces, delete one of them.
if (old_cursor.par() != cursor.par()
- || old_cursor.pos() != cursor.pos()) {
+ || old_cursor.pos() != cursor.pos()) {
// Only if the cursor has really moved
-
+
if (old_cursor.pos() > 0
&& old_cursor.pos() < old_cursor.par()->size()
&& old_cursor.par()->isLineSeparator(old_cursor.pos())
// don't delete anything if this is the ONLY paragraph!
if (!old_cursor.par()->next() && !old_cursor.par()->previous())
return false;
-
+
// Do not delete empty paragraphs with keepempty set.
if (textclasslist
[bview->buffer()->params.textclass]
return false;
// only do our magic if we changed paragraph
- if (old_cursor.par() == cursor.par())
+ if (old_cursor.par() == cursor.par())
return false;
-
+
// record if we have deleted a paragraph
// we can't possibly have deleted a paragraph before this point
bool deleted = false;
&& 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();
}
// 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
} 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();
}
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
updateCounters(bview, refresh_row->previous());
}
}
-
+
// correct cursor y
setCursorIntern(bview, cursor.par(), cursor.pos());
for (; tmp; tmp = tmp->next()) {
tmp->params().startOfAppendix(false);
}
-
+
par->params().startOfAppendix(start);
// we can set the refreshing parameters now
projects / lyx.git / blobdiff