int LyXText::singleWidth(BufferView * bview, Paragraph * par,
- Paragraph::size_type pos, char c) const
+ Paragraph::size_type pos, char c) const
{
LyXFont const font = getFont(bview->buffer(), par, pos);
++vpos;
if (lyxrc.mark_foreign_language &&
- font.language() != ignore_language &&
+ font.language() != latex_language &&
font.language() != bview->buffer()->params.language) {
int const y = offset + row->height() - 1;
pain.line(int(tmpx), y, int(x), y, LColor::language);
x += lyxfont::width(textstring, font);
}
+#ifdef INHERIT_LANGUAGE
#ifdef WITH_WARNINGS
if ((font.language() == inherit_language) ||
(font.language() == ignore_language))
lyxerr << "No this shouldn't happen!\n";
+#endif
#endif
if (lyxrc.mark_foreign_language &&
+ font.language() != latex_language &&
font.language() != bview->buffer()->params.language) {
int const y = offset + row->height() - 1;
pain.line(int(tmpx), y, int(x), y,
int LyXText::fill(BufferView * bview, Row * row, int paper_width) const
{
if (paper_width < 0)
- return 20;
+ return 0;
int w;
// get the pure distance
// returns true, if a expansion is needed.
// Rules are given by LaTeX
bool LyXText::hfillExpansion(Buffer const * buf, Row const * row_ptr,
- Paragraph::size_type pos) const
+ Paragraph::size_type pos) const
{
// by the way, is it a hfill?
if (!row_ptr->par()->isHfill(pos))
if (firstpar->params().lineBottom())
maxdesc += 2 * lyxfont::ascent('x',
getFont(bview->buffer(),
- par, par->size() - 1));
+ par,
+ max(Paragraph::size_type(0), par->size() - 1)));
// and now the pagebreaks
if (firstpar->params().pagebreakBottom())
void LyXText::prepareToPrint(BufferView * bview,
- Row * row, float & x,
- float & fill_separator,
- float & fill_hfill,
- float & fill_label_hfill,
- bool bidi) const
+ Row * row, float & x,
+ float & fill_separator,
+ float & fill_hfill,
+ float & fill_label_hfill,
+ bool bidi) const
{
float nlh;
float ns;
// are there any hfills in the row?
float const nh = numberOfHfills(bview->buffer(), row);
- if (nh)
- fill_hfill = w / nh;
- else {
+ if (nh) {
+ if (w > 0)
+ fill_hfill = w / nh;
+ } else {
// is it block, flushleft or flushright?
// set x how you need it
- int align;
- if (row->par()->params().align() == LYX_ALIGN_LAYOUT)
- align = textclasslist.Style(bview->buffer()->params.textclass, row->par()->getLayout()).align;
- else
- align = row->par()->params().align();
-
- // center displayed insets
- Inset * inset;
- if (row->par()->getChar(row->pos()) == Paragraph::META_INSET
- && (inset=row->par()->getInset(row->pos()))
- && (inset->display())) // || (inset->scroll() < 0)))
- align = (inset->lyxCode() == Inset::MATHMACRO_CODE)
- ? LYX_ALIGN_BLOCK : LYX_ALIGN_CENTER;
-
- switch (align) {
+ int align;
+ if (row->par()->params().align() == LYX_ALIGN_LAYOUT) {
+ align = textclasslist.Style(bview->buffer()->params.textclass, row->par()->getLayout()).align;
+ } else {
+ align = row->par()->params().align();
+ }
+
+ // center displayed insets
+ Inset * inset;
+ if (row->par()->getChar(row->pos()) == Paragraph::META_INSET
+ && (inset=row->par()->getInset(row->pos()))
+ && (inset->display())) // || (inset->scroll() < 0)))
+ align = (inset->lyxCode() == Inset::MATHMACRO_CODE)
+ ? LYX_ALIGN_BLOCK : LYX_ALIGN_CENTER;
+
+ switch (align) {
case LYX_ALIGN_BLOCK:
- ns = numberOfSeparators(bview->buffer(), row);
- if (ns && row->next() && row->next()->par() == row->par() &&
- !(row->next()->par()->isNewline(row->next()->pos() - 1))
- && !(row->next()->par()->getChar(row->next()->pos()) == Paragraph::META_INSET
- && row->next()->par()->getInset(row->next()->pos())
- && row->next()->par()->getInset(row->next()->pos())->display())
- )
- fill_separator = w / ns;
- else if (is_rtl)
- x += w;
- break;
+ ns = numberOfSeparators(bview->buffer(), row);
+ if (ns && row->next() && row->next()->par() == row->par() &&
+ !(row->next()->par()->isNewline(row->next()->pos() - 1))
+ && !(row->next()->par()->getChar(row->next()->pos()) == Paragraph::META_INSET
+ && row->next()->par()->getInset(row->next()->pos())
+ && row->next()->par()->getInset(row->next()->pos())->display())
+ )
+ {
+ fill_separator = w / ns;
+ } else if (is_rtl) {
+ x += w;
+ }
+ break;
case LYX_ALIGN_RIGHT:
- x += w;
- break;
+ x += w;
+ break;
case LYX_ALIGN_CENTER:
- x += w / 2;
- break;
- }
+ x += w / 2;
+ break;
+ }
}
if (!bidi)
return;
// This function is only used by the spellchecker for NextWord().
// It doesn't handle LYX_ACCENTs and probably never will.
-string const LyXText::selectNextWord(BufferView * bview,
- float & value) const
+string const LyXText::selectNextWordToSpellcheck(BufferView * bview,
+ float & value) const
{
if (the_locking_inset) {
- string str = the_locking_inset->selectNextWord(bview, value);
+ string str = the_locking_inset->selectNextWordToSpellcheck(bview, value);
if (!str.empty()) {
value += float(cursor.y())/float(height);
return str;
}
#warning Dekel please have a look on this one RTL? (Jug)
+#warning DEKEL!
// we have to go on checking so move cusor to the right
if (cursor.pos() == cursor.par()->size()) {
if (!cursor.par()->next())
!cursor.par()->getInset(cursor.pos())->isTextInset()))
|| (cursor.par()->size() == cursor.pos()
&& cursor.par()->next()))
- {
+ {
if (cursor.pos() == cursor.par()->size()) {
cursor.par(cursor.par()->next());
cursor.pos(0);
// now check if we hit an inset so it has to be a inset containing text!
if (cursor.pos() < cursor.par()->size() &&
- cursor.par()->isInset(cursor.pos()))
+ cursor.par()->isInset(cursor.pos()))
{
// lock the inset!
cursor.par()->getInset(cursor.pos())->edit(bview);
// now call us again to do the above trick
// but obviously we have to start from down below ;)
- return bview->text->selectNextWord(bview, value);
+ return bview->text->selectNextWordToSpellcheck(bview, value);
}
// Update the value if we changed paragraphs
setCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
selection.cursor = cursor;
cursor = tmpcursor;
- setSelection(bview);
+ setSelection(bview);
/* -----> Great, CutSelection() gets rid of multiple spaces. */
- cutSelection(bview);
+ cutSelection(bview, true, false);
}
}
selection.cursor = cursor;
cursor = tmpcursor;
setSelection(bview);
- cutSelection(bview);
+ cutSelection(bview, true, false);
}
}
if (!selection.set()) {
deleteWordForward(bview);
} else {
- cutSelection(bview);
+ cutSelection(bview, true, false);
}
}
}
if ((cursor.par()->previous() ? cursor.par()->previous()->id() : 0)
== old_cur_par_prev_id
&& cursor.par()->id() != old_cur_par_id)
+ {
return; // delete-empty-paragraph-mechanism has done it
+ }
// if you had success make a backspace
if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) {
if (cursor.par()->previous()) {
setUndo(bview, Undo::DELETE,
- cursor.par()->previous(),
- cursor.par()->next());
+ cursor.par()->previous(), cursor.par()->next());
}
Paragraph * tmppar = cursor.par();
if (cursor.par()->previous()) {
// steps into the above paragraph.
setCursorIntern(bview, cursor.par()->previous(),
- cursor.par()->previous()->size(),
- false);
+ cursor.par()->previous()->size(),
+ false);
}
/* Pasting is not allowed, if the paragraphs have different
if (cursor.par() != tmppar
&& (cursor.par()->getLayout() == tmppar->getLayout()
|| tmppar->getLayout() == 0 /*standard*/)
- && cursor.par()->getAlign() == tmppar->getAlign()) {
-
+ && cursor.par()->getAlign() == tmppar->getAlign())
+ {
removeParagraph(tmprow);
removeRow(tmprow);
cursor.par()->pasteParagraph(bview->buffer()->params);
/* this is the code for a normal backspace, not pasting
* any paragraphs */
setUndo(bview, Undo::DELETE,
- cursor.par(), cursor.par()->next());
+ cursor.par(), cursor.par()->next());
// We used to do cursorLeftIntern() here, but it is
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
setCursorIntern(bview, cursor.par(), cursor.pos()- 1,
- false, cursor.boundary());
+ false, cursor.boundary());
// some insets are undeletable here
if (cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET) {
if (cursor.pos() < rowLast(row) ||
!cursor.par()->isLineSeparator(cursor.pos())) {
row->fill(row->fill() + singleWidth(bview,
- cursor.par(),
- cursor.pos()));
+ cursor.par(),
+ cursor.pos()));
}
/* some special code when deleting a newline. This is similar
if (cleared) {
clear_area = true;
} else if (clear_area) {
-#ifdef WITH_WARNINGS
-#warning Should be fixed with a lyxinset::clear_width(bv, font) function! (Jug)
-#warning Should we not fix this in the Painter, please have a look Lars! (Jug)
-#endif
int const y = y_offset < 0 ? 0 : y_offset;
int const h = y_offset < 0 ?
row_ptr->height() + y_offset : row_ptr->height();
int const w = inset_owner ?
- inset_owner->width(bview, font) - 2 : ww;
+ inset_owner->textWidth(bview, true) : ww;
int const x = x_offset;
pain.fillRectangle(x, y, w, h, backgroundColor());
} else if (inset != 0) {
int h = row_ptr->baseline() - inset->ascent(bview, font);
// first clear the whole row above the inset!
if (h > 0) {
-#if 0
int const w = (inset_owner ?
- inset_owner->width(bview, font) : ww);
-#endif
- pain.fillRectangle(x_offset, y_offset, ww, h,
+ inset_owner->textWidth(bview, true) : ww);
+ pain.fillRectangle(x_offset, y_offset, w, h,
backgroundColor());
}
h += inset->ascent(bview, font) + inset->descent(bview, font);
// clear the space below the inset!
if ((row_ptr->height() - h) > 0) {
-#if 0
int const w = (inset_owner ?
- inset_owner->width(bview, font) : ww);
-#endif
+ inset_owner->textWidth(bview, true) : ww);
pain.fillRectangle(x_offset, y_offset + h,
- ww, row_ptr->height() - h,
+ w, row_ptr->height() - h,
backgroundColor());
}
// clear the space behind the inset, if needed
- if (!inset_owner && !inset->display() && !inset->needFullRow())
- {
- int const w = inset->width(bview, font) + int(x);
- pain.fillRectangle(w, y_offset,
- ww - w, row_ptr->height(),
- backgroundColor());
+ if (!inset->display() && !inset->needFullRow()) {
+ int const w = (inset_owner ?
+ inset_owner->textWidth(bview, true) : ww);
+ int const xp = int(x) + inset->width(bview, font);
+ if (w-xp > 0) {
+ pain.fillRectangle(xp, y_offset,
+ w-xp, row_ptr->height(),
+ backgroundColor());
+ }
}
}
if (selection.set()) {
int const w = (inset_owner ?
- inset_owner->width(bview, font) : ww);
+ inset_owner->textWidth(bview, true) : ww);
// selection code
if (bidi_same_direction) {
if (selection.start.row() == row_ptr &&
y_bottom -= lyxfont::ascent('x',
getFont(bview->buffer(),
par,
- par->size() - 1));
+ max(Paragraph::size_type(0), par->size() - 1)));
int const w = (inset_owner ?
inset_owner->width(bview, font) : ww);
int const xp = static_cast<int>(inset_owner ? x : 0);
y_bottom -= lyxfont::ascent('x',
getFont(bview->buffer(),
par,
- par->size() - 1));
+ max(Paragraph::size_type(0), par->size() - 1)));
}
// draw an endlabel
projects / lyx.git / blobdiff