#include "lyxtext.h"
+#include "author.h"
#include "buffer.h"
#include "bufferparams.h"
#include "BufferView.h"
#include "support/lstrings.h"
#include "support/textutils.h"
+#include "support/tostr.h"
+#include "support/std_sstream.h"
using lyx::pos_type;
using lyx::word_location;
+using lyx::support::bformat;
using lyx::support::contains;
using lyx::support::lowercase;
+using lyx::support::split;
using lyx::support::uppercase;
+using std::advance;
+using std::distance;
using std::max;
+using std::min;
using std::endl;
using std::string;
namespace {
+int numberOfSeparators(Paragraph const & par, Row const & row)
+{
+ pos_type const first = max(row.pos(), par.beginOfBody());
+ pos_type const last = row.endpos() - 1;
+ int n = 0;
+ for (pos_type p = first; p < last; ++p) {
+ if (par.isSeparator(p))
+ ++n;
+ }
+ return n;
+}
+
+
unsigned int maxParagraphWidth(ParagraphList const & plist)
{
unsigned int width = 0;
return width;
}
+
+int numberOfLabelHfills(Paragraph const & par, Row const & row)
+{
+ pos_type last = row.endpos() - 1;
+ pos_type first = row.pos();
+
+ // hfill *DO* count at the beginning of paragraphs!
+ if (first) {
+ while (first < last && par.isHfill(first))
+ ++first;
+ }
+
+ last = min(last, par.beginOfBody());
+ int n = 0;
+ for (pos_type p = first; p < last; ++p) {
+ if (par.isHfill(p))
+ ++n;
+ }
+ return n;
+}
+
+
+int numberOfHfills(Paragraph const & par, Row const & row)
+{
+ pos_type const last = row.endpos() - 1;
+ pos_type first = row.pos();
+
+ // hfill *DO* count at the beginning of paragraphs!
+ if (first) {
+ while (first < last && par.isHfill(first))
+ ++first;
+ }
+
+ first = max(first, par.beginOfBody());
+
+ int n = 0;
+ for (pos_type p = first; p < last; ++p) {
+ if (par.isHfill(p))
+ ++n;
+ }
+ return n;
+}
+
} // namespace anon
{
LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
- return
+ return
RIGHT_MARGIN
+ font_metrics::signedWidth(tclass.rightmargin(),
tclass.defaultfont())
}
x += thiswidth;
- //lyxerr << "i: " << i << " x: "
- //<< x << " width: " << width << endl;
chunkwidth += thiswidth;
}
if (x >= width) {
// if no break before, break here
if (point == end || chunkwidth >= width - left) {
- if (i > pos) {
+ if (i > pos)
point = i;
- break;
- }
+ else
+ point = i + 1;
+
}
// exit on last registered breakpoint:
break;
}
-// returns the minimum space a row needs on the screen in pixel
-void LyXText::fill(ParagraphList::iterator pit, Row & row, int workwidth) const
+void LyXText::setRowWidth(ParagraphList::iterator pit, Row & row) const
{
// get the pure distance
pos_type const end = row.endpos();
w = max(w, labelEnd(pit));
}
- int const fill = workwidth - w - rightMargin(*pit);
- row.fill(fill);
- row.width(workwidth - fill);
+ row.width(w + rightMargin(*pit));
}
}
-void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
+void LyXText::breakParagraph(LCursor & cur, char keep_layout)
{
+ BOOST_ASSERT(this == cur.text());
// allow only if at start or end, or all previous is new text
- ParagraphList::iterator cpit = cursorPar();
- if (cursor().pos() && cursor().pos() != cpit->size()
- && cpit->isChangeEdited(0, cursor().pos()))
+ Paragraph & cpar = cur.paragraph();
+ ParagraphList::iterator cpit = getPar(cur.par());
+
+ if (cur.pos() != 0 && cur.pos() != cur.lastpos()
+ && cpar.isChangeEdited(0, cur.pos()))
return;
LyXTextClass const & tclass =
bv()->buffer()->params().getLyXTextClass();
- LyXLayout_ptr const & layout = cpit->layout();
+ LyXLayout_ptr const & layout = cpar.layout();
// this is only allowed, if the current paragraph is not empty
// or caption and if it has not the keepempty flag active
- if (cpit->empty() && !cpit->allowEmpty()
+ if (cur.lastpos() == 0 && !cpar.allowEmpty()
&& layout->labeltype != LABEL_SENSITIVE)
return;
// a layout change may affect also the following paragraph
- recUndo(cursor().par(), parOffset(undoSpan(cpit)) - 1);
+ recUndo(cur.par(), parOffset(undoSpan(cpit)) - 1);
// Always break behind a space
// It is better to erase the space (Dekel)
- if (cursor().pos() < cpit->size() && cpit->isLineSeparator(cursor().pos()))
- cpit->erase(cursor().pos());
+ if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
+ cpar.erase(cur.pos());
// break the paragraph
if (keep_layout)
// breakParagraph call should return a bool if it inserts the
// paragraph before or behind and we should react on that one
// but we can fix this in 1.3.0 (Jug 20020509)
- bool const isempty = cpit->allowEmpty() && cpit->empty();
- ::breakParagraph(bv()->buffer()->params(), paragraphs, cpit,
- cursor().pos(), keep_layout);
+ bool const isempty = cpar.allowEmpty() && cpar.empty();
+ ::breakParagraph(bv()->buffer()->params(), paragraphs(), cpit,
+ cur.pos(), keep_layout);
- cpit = cursorPar();
+ cpit = getPar(cur.par());
ParagraphList::iterator next_par = boost::next(cpit);
// well this is the caption hack since one caption is really enough
if (layout->labeltype == LABEL_SENSITIVE) {
- if (!cursor().pos())
+ if (!cur.pos())
// set to standard-layout
cpit->applyLayout(tclass.defaultLayout());
else
// move one row up!
// This touches only the screen-update. Otherwise we would may have
// an empty row on the screen
- RowList::iterator crit = cpit->getRow(cursor().pos());
- if (cursor().pos() && crit->pos() == cursor().pos()
- && !cpit->isNewline(cursor().pos() - 1))
+ if (cur.pos() != 0 && cur.textRow().pos() == cur.pos()
+ && !cpit->isNewline(cur.pos() - 1))
{
- cursorLeft(bv());
+ cursorLeft(cur);
}
while (!next_par->empty() && next_par->isNewline(0))
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
- if (cursor().pos() || isempty)
- setCursor(next_par, 0);
+ if (cur.pos() != 0 || isempty)
+ setCursor(cur, cur.par() + 1, 0);
else
- setCursor(cpit, 0);
+ setCursor(cur, cur.par(), 0);
}
// convenience function
-void LyXText::redoParagraph()
+void LyXText::redoParagraph(LCursor & cur)
{
- bv()->cursor().clearSelection();
- redoParagraph(cursorPar());
- setCursorIntern(cursor().par(), cursor().pos());
+ BOOST_ASSERT(this == cur.text());
+ cur.clearSelection();
+ redoParagraph(getPar(cur.par()));
+ setCursorIntern(cur, cur.par(), cur.pos());
}
// insert a character, moves all the following breaks in the
// same Paragraph one to the right and make a rebreak
-void LyXText::insertChar(char c)
+void LyXText::insertChar(LCursor & cur, char c)
{
- recordUndo(Undo::INSERT, this, cursor().par(), cursor().par());
+ BOOST_ASSERT(this == cur.text());
+ recordUndo(cur, Undo::INSERT);
- // When the free-spacing option is set for the current layout,
- // disable the double-space checking
+ Paragraph & par = cur.paragraph();
+ // try to remove this
+ ParagraphList::iterator pit = getPar(cur.par());
- bool const freeSpacing = cursorPar()->layout()->free_spacing ||
- cursorPar()->isFreeSpacing();
+ bool const freeSpacing = par.layout()->free_spacing ||
+ par.isFreeSpacing();
if (lyxrc.auto_number) {
static string const number_operators = "+-/*";
if (current_font.number() == LyXFont::ON) {
if (!IsDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
- cursor().pos() >= 1 &&
- cursor().pos() < cursorPar()->size() &&
- getFont(cursorPar(), cursor().pos()).number() == LyXFont::ON &&
- getFont(cursorPar(), cursor().pos() - 1).number() == LyXFont::ON)
+ cur.pos() != 0 &&
+ cur.pos() != cur.lastpos() &&
+ getFont(pit, cur.pos()).number() == LyXFont::ON &&
+ getFont(pit, cur.pos() - 1).number() == LyXFont::ON)
)
- number(); // Set current_font.number to OFF
+ number(cur); // Set current_font.number to OFF
} else if (IsDigit(c) &&
real_current_font.isVisibleRightToLeft()) {
- number(); // Set current_font.number to ON
+ number(cur); // Set current_font.number to ON
- if (cursor().pos() > 0) {
- char const c = cursorPar()->getChar(cursor().pos() - 1);
+ if (cur.pos() != 0) {
+ char const c = par.getChar(cur.pos() - 1);
if (contains(number_unary_operators, c) &&
- (cursor().pos() == 1 ||
- cursorPar()->isSeparator(cursor().pos() - 2) ||
- cursorPar()->isNewline(cursor().pos() - 2))
+ (cur.pos() == 1
+ || par.isSeparator(cur.pos() - 2)
+ || par.isNewline(cur.pos() - 2))
) {
- setCharFont(
- cursorPar(),
- cursor().pos() - 1,
- current_font);
- } else if (contains(number_seperators, c) &&
- cursor().pos() >= 2 &&
- getFont(
- cursorPar(),
- cursor().pos() - 2).number() == LyXFont::ON) {
- setCharFont(
- cursorPar(),
- cursor().pos() - 1,
- current_font);
+ setCharFont(pit, cur.pos() - 1, current_font);
+ } else if (contains(number_seperators, c)
+ && cur.pos() >= 2
+ && getFont(pit, cur.pos() - 2).number() == LyXFont::ON) {
+ setCharFont(pit, cur.pos() - 1, current_font);
}
}
}
LyXFont realtmpfont = real_current_font;
LyXFont rawtmpfont = current_font;
+ // When the free-spacing option is set for the current layout,
+ // disable the double-space checking
if (!freeSpacing && IsLineSeparatorChar(c)) {
- if ((cursor().pos() > 0
- && cursorPar()->isLineSeparator(cursor().pos() - 1))
- || (cursor().pos() > 0
- && cursorPar()->isNewline(cursor().pos() - 1))
- || (cursor().pos() == 0)) {
+ if (cur.pos() == 0) {
static bool sent_space_message = false;
if (!sent_space_message) {
- if (cursor().pos() == 0)
- bv()->owner()->message(_("You cannot insert a space at the beginning of a paragraph. Please read the Tutorial."));
- else
- bv()->owner()->message(_("You cannot type two spaces this way. Please read the Tutorial."));
+ cur.message(_("You cannot insert a space at the "
+ "beginning of a paragraph. Please read the Tutorial."));
+ sent_space_message = true;
+ return;
+ }
+ }
+ BOOST_ASSERT(cur.pos() > 0);
+ if (par.isLineSeparator(cur.pos() - 1)
+ || par.isNewline(cur.pos() - 1)) {
+ static bool sent_space_message = false;
+ if (!sent_space_message) {
+ cur.message(_("You cannot type two spaces this way. "
+ "Please read the Tutorial."));
sent_space_message = true;
}
- charInserted();
return;
}
}
// Here case LyXText::InsertInset already inserted the character
if (c != Paragraph::META_INSET)
- cursorPar()->insertChar(cursor().pos(), c);
+ par.insertChar(cur.pos(), c);
- setCharFont(cursorPar(), cursor().pos(), rawtmpfont);
+ setCharFont(pit, cur.pos(), rawtmpfont);
current_font = rawtmpfont;
real_current_font = realtmpfont;
- redoParagraph(cursorPar());
- setCursor(cursor().par(), cursor().pos() + 1, false, cursor().boundary());
-
+ redoParagraph(cur);
+ setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
charInserted();
}
void LyXText::prepareToPrint(ParagraphList::iterator pit, Row & row) const
{
- double w = row.fill();
+ double w = textWidth() - row.width();
double fill_hfill = 0;
double fill_label_hfill = 0;
double fill_separator = 0;
double x = 0;
- bool const is_rtl =
- pit->isRightToLeftPar(bv()->buffer()->params());
+ bool const is_rtl = isRTL(*pit);
if (is_rtl)
x = rightMargin(*pit);
else
}
switch (align) {
- case LYX_ALIGN_BLOCK: {
- int const ns = numberOfSeparators(*pit, row);
- bool disp_inset = false;
- if (row.endpos() < pit->size()) {
- InsetOld * in = pit->getInset(row.endpos());
- if (in)
- disp_inset = in->display();
- }
- // If we have separators, this is not the last row of a
- // par, does not end in newline, and is not row above a
- // display inset... then stretch it
- if (ns
- && row.endpos() < pit->size()
- && !pit->isNewline(row.endpos() - 1)
- && !disp_inset
- ) {
- fill_separator = w / ns;
- } else if (is_rtl) {
- x += w;
- }
- break;
+ case LYX_ALIGN_BLOCK: {
+ int const ns = numberOfSeparators(*pit, row);
+ bool disp_inset = false;
+ if (row.endpos() < pit->size()) {
+ InsetBase * in = pit->getInset(row.endpos());
+ if (in)
+ disp_inset = in->display();
+ }
+ // If we have separators, this is not the last row of a
+ // par, does not end in newline, and is not row above a
+ // display inset... then stretch it
+ if (ns
+ && row.endpos() < pit->size()
+ && !pit->isNewline(row.endpos() - 1)
+ && !disp_inset
+ ) {
+ fill_separator = w / ns;
+ } else if (is_rtl) {
+ x += w;
}
- case LYX_ALIGN_RIGHT:
+ break;
+ }
+ case LYX_ALIGN_RIGHT:
x += w;
break;
- case LYX_ALIGN_CENTER:
+ case LYX_ALIGN_CENTER:
x += w / 2;
break;
}
// the cursor set functions have a special mechanism. When they
// realize, that you left an empty paragraph, they will delete it.
-void LyXText::cursorRightOneWord()
+void LyXText::cursorRightOneWord(LCursor & cur)
{
- cursorRightOneWord(cursor());
- setCursor(cursorPar(), cursor().pos());
+ BOOST_ASSERT(this == cur.text());
+ if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) {
+ ++cur.par();
+ cur.pos() = 0;
+ } else {
+ // Skip through initial nonword stuff.
+ // Treat floats and insets as words.
+ while (cur.pos() != cur.lastpos() && !cur.paragraph().isWord(cur.pos()))
+ ++cur.pos();
+ // Advance through word.
+ while (cur.pos() != cur.lastpos() && cur.paragraph().isWord(cur.pos()))
+ ++cur.pos();
+ }
+ setCursor(cur, cur.par(), cur.pos());
}
-// Skip initial whitespace at end of word and move cursor to *start*
-// of prior word, not to end of next prior word.
-void LyXText::cursorLeftOneWord()
+void LyXText::cursorLeftOneWord(LCursor & cur)
{
- CursorSlice tmpcursor = cursor();
- cursorLeftOneWord(tmpcursor);
- setCursor(getPar(tmpcursor), tmpcursor.pos());
+ BOOST_ASSERT(this == cur.text());
+ if (cur.pos() == 0 && cur.par() != 0) {
+ --cur.par();
+ cur.pos() = cur.lastpos();
+ } else {
+ // Skip through initial nonword stuff.
+ // Treat floats and insets as words.
+ while (cur.pos() != 0 && !cur.paragraph().isWord(cur.pos() - 1))
+ --cur.pos();
+ // Advance through word.
+ while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1))
+ --cur.pos();
+ }
+ setCursor(cur, cur.par(), cur.pos());
}
-void LyXText::selectWord(word_location loc)
+void LyXText::selectWord(LCursor & cur, word_location loc)
{
- CursorSlice from = cursor();
- CursorSlice to = cursor();
+ BOOST_ASSERT(this == cur.text());
+ CursorSlice from = cur.current();
+ CursorSlice to = cur.current();
getWord(from, to, loc);
- if (cursor() != from)
- setCursor(from.par(), from.pos());
+ if (cur.current() != from)
+ setCursor(cur, from.par(), from.pos());
if (to == from)
return;
- bv()->cursor().resetAnchor();
- setCursor(to.par(), to.pos());
- bv()->cursor().setSelection();
+ cur.resetAnchor();
+ setCursor(cur, to.par(), to.pos());
+ cur.setSelection();
}
// Select the word currently under the cursor when no
// selection is currently set
-bool LyXText::selectWordWhenUnderCursor(word_location loc)
+bool LyXText::selectWordWhenUnderCursor(LCursor & cur, word_location loc)
{
- if (bv()->cursor().selection())
+ BOOST_ASSERT(this == cur.text());
+ if (cur.selection())
return false;
- selectWord(loc);
- return bv()->cursor().selection();
+ selectWord(cur, loc);
+ return cur.selection();
}
-void LyXText::acceptChange()
+void LyXText::acceptChange(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (!cur.selection() && cursorPar()->size())
+ BOOST_ASSERT(this == cur.text());
+ if (!cur.selection() && cur.lastpos() != 0)
return;
- if (cur.selStart().par() == cur.par()) {
- CursorSlice const & startc = cur.selStart();
- CursorSlice const & endc = cur.selEnd();
- recordUndo(Undo::INSERT, this, startc.par());
+ CursorSlice const & startc = cur.selBegin();
+ CursorSlice const & endc = cur.selEnd();
+ if (startc.par() == endc.par()) {
+ recordUndoSelection(cur, Undo::INSERT);
getPar(startc)->acceptChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
redoParagraph(getPar(startc));
- setCursorIntern(startc.par(), 0);
+ setCursorIntern(cur, startc.par(), 0);
}
#warning handle multi par selection
}
-void LyXText::rejectChange()
+void LyXText::rejectChange(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (!cur.selection() && cursorPar()->size())
+ BOOST_ASSERT(this == cur.text());
+ if (!cur.selection() && cur.lastpos() != 0)
return;
- if (cur.selStart().par() == cur.selEnd().par()) {
- CursorSlice const & startc = cur.selStart();
- CursorSlice const & endc = cur.selEnd();
- recordUndo(Undo::INSERT, this, startc.par());
+ CursorSlice const & startc = cur.selBegin();
+ CursorSlice const & endc = cur.selEnd();
+ if (startc.par() == endc.par()) {
+ recordUndoSelection(cur, Undo::INSERT);
getPar(startc)->rejectChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
redoParagraph(getPar(startc));
- setCursorIntern(startc.par(), 0);
+ setCursorIntern(cur, startc.par(), 0);
}
#warning handle multi par selection
}
// Delete from cursor up to the end of the current or next word.
-void LyXText::deleteWordForward()
+void LyXText::deleteWordForward(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (cursorPar()->empty())
- cursorRight(true);
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0)
+ cursorRight(cur);
else {
- CursorSlice tmpcursor = cursor();
- cur.selection() = true; // to avoid deletion
- cursorRightOneWord();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
cur.resetAnchor();
- cursor() = tmpcursor;
+ cur.selection() = true;
+ cursorRightOneWord(cur);
cur.setSelection();
- cutSelection(true, false);
+ cutSelection(cur, true, false);
}
}
// Delete from cursor to start of current or prior word.
-void LyXText::deleteWordBackward()
+void LyXText::deleteWordBackward(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (cursorPar()->empty())
- cursorLeft(true);
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0)
+ cursorLeft(cur);
else {
- CursorSlice tmpcursor = cursor();
- cur.selection() = true; // to avoid deletion
- cursorLeftOneWord();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
cur.resetAnchor();
- cursor() = tmpcursor;
+ cur.selection() = true;
+ cursorLeftOneWord(cur);
cur.setSelection();
- cutSelection(true, false);
+ cutSelection(cur, true, false);
}
}
// Kill to end of line.
-void LyXText::deleteLineForward()
+void LyXText::deleteLineForward(LCursor & cur)
{
- LCursor & cur = bv()->cursor();
- if (cursorPar()->empty()) {
+ BOOST_ASSERT(this == cur.text());
+ if (cur.lastpos() == 0) {
// Paragraph is empty, so we just go to the right
- cursorRight(true);
+ cursorRight(cur);
} else {
- CursorSlice tmpcursor = cursor();
- cur.selection() = true; // to avoid deletion
- cursorEnd();
- setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
cur.resetAnchor();
- cursor() = tmpcursor;
+ cur.selection() = true; // to avoid deletion
+ cursorEnd(cur);
cur.setSelection();
// What is this test for ??? (JMarc)
if (!cur.selection())
- deleteWordForward();
+ deleteWordForward(cur);
else
- cutSelection(true, false);
+ cutSelection(cur, true, false);
}
}
-void LyXText::changeCase(LyXText::TextCase action)
+void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
{
- LCursor & cur = bv()->cursor();
+ BOOST_ASSERT(this == cur.text());
CursorSlice from;
CursorSlice to;
if (cur.selection()) {
- from = cur.selStart();
+ from = cur.selBegin();
to = cur.selEnd();
} else {
from = cursor();
getWord(from, to, lyx::PARTIAL_WORD);
- setCursor(to.par(), to.pos() + 1);
+ setCursor(cur, to.par(), to.pos() + 1);
}
- recordUndo(Undo::ATOMIC, this, from.par(), to.par());
+ recordUndoSelection(cur);
pos_type pos = from.pos();
int par = from.par();
}
-void LyXText::Delete()
+void LyXText::Delete(LCursor & cur)
{
- // this is a very easy implementation
- CursorSlice old_cursor = cursor();
-
- // just move to the right
- cursorRight(true);
-
- // if you had success make a backspace
- if (old_cursor.par() != cursor().par() || old_cursor.pos() !=
-cursor().pos()) {
- recordUndo(Undo::DELETE, this, old_cursor.par());
- backspace();
+ BOOST_ASSERT(this == cur.text());
+ // just move to the right, if we had success make a backspace
+ CursorSlice sl = cur.current();
+ cursorRight(cur);
+ if (sl == cur.current()) {
+ recordUndo(cur, Undo::DELETE, cur.par(), max(0, cur.par() - 1));
+ backspace(cur);
}
}
-void LyXText::backspace()
+void LyXText::backspace(LCursor & cur)
{
- // Get the font that is used to calculate the baselineskip
- ParagraphList::iterator pit = cursorPar();
- pos_type lastpos = pit->size();
-
- if (cursor().pos() == 0) {
+ BOOST_ASSERT(this == cur.text());
+ if (cur.pos() == 0) {
// The cursor is at the beginning of a paragraph, so
// the the backspace will collapse two paragraphs into
// one.
// but it's not allowed unless it's new
- if (pit->isChangeEdited(0, pit->size()))
+ Paragraph & par = cur.paragraph();
+ if (par.isChangeEdited(0, par.size()))
return;
// we may paste some paragraphs
// is it an empty paragraph?
- if (lastpos == 0 || (lastpos == 1 && pit->isSeparator(0))) {
+ pos_type lastpos = cur.lastpos();
+ if (lastpos == 0 || (lastpos == 1 && par.isSeparator(0))) {
// This is an empty paragraph and we delete it just
// by moving the cursor one step
// left and let the DeleteEmptyParagraphMechanism
// handle the actual deletion of the paragraph.
- if (cursor().par()) {
- cursorLeft(bv());
+ if (cur.par() != 0) {
+ cursorLeft(cur);
// the layout things can change the height of a row !
- redoParagraph();
+ redoParagraph(cur);
return;
}
}
- if (cursor().par() != 0)
- recordUndo(Undo::DELETE, this, cursor().par() - 1, cursor().par());
+ if (cur.par() != 0)
+ recordUndo(cur, Undo::DELETE, cur.par() - 1);
- ParagraphList::iterator tmppit = cursorPar();
+ ParagraphList::iterator tmppit = getPar(cur.par());
// 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)
- if (cursor().par() != 0) {
+ if (cur.par() != 0) {
// steps into the above paragraph.
- setCursorIntern(cursor().par() - 1,
- getPar(cursor().par() - 1)->size(),
+ setCursorIntern(cur, cur.par() - 1,
+ getPar(cur.par() - 1)->size(),
false);
}
Buffer & buf = *bv()->buffer();
BufferParams const & bufparams = buf.params();
LyXTextClass const & tclass = bufparams.getLyXTextClass();
- ParagraphList::iterator const cpit = cursorPar();
+ ParagraphList::iterator const cpit = getPar(cur.par());
if (cpit != tmppit
&& (cpit->layout() == tmppit->layout()
&& cpit->getAlign() == tmppit->getAlign()) {
mergeParagraph(bufparams, buf.paragraphs(), cpit);
- if (cursor().pos() && cpit->isSeparator(cursor().pos() - 1))
- cursor().pos(cursor().pos() - 1);
+ if (cur.pos() != 0 && cpit->isSeparator(cur.pos() - 1))
+ --cur.pos();
// the counters may have changed
updateCounters();
- setCursor(cursor().par(), cursor().pos(), false);
+ setCursor(cur, cur.par(), cur.pos(), false);
}
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
- recordUndo(Undo::DELETE, this, cursor().par());
+ recordUndo(cur, Undo::DELETE);
// 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(cursor().par(), cursor().pos() - 1,
- false, cursor().boundary());
- cursorPar()->erase(cursor().pos());
+ setCursorIntern(cur, cur.par(), cur.pos() - 1,
+ false, cur.boundary());
+ cur.paragraph().erase(cur.pos());
}
- lastpos = cursorPar()->size();
- if (cursor().pos() == lastpos)
- setCurrentFont();
+ if (cur.pos() == cur.lastpos())
+ setCurrentFont(cur);
- redoParagraph();
- setCursor(cursor().par(), cursor().pos(), false, cursor().boundary());
+ redoParagraph(cur);
+ setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
}
ParagraphList::iterator LyXText::cursorPar() const
{
+ //lyxerr << "### cursorPar: cursor: " << bv()->cursor() << endl;
+ //lyxerr << "xxx cursorPar: cursor: " << cursor() << endl;
return getPar(cursor().par());
}
-RowList::iterator LyXText::cursorRow() const
-{
- return cursorPar()->getRow(cursor().pos());
-}
-
-
ParagraphList::iterator LyXText::getPar(CursorSlice const & cur) const
{
return getPar(cur.par());
ParagraphList::iterator LyXText::getPar(int par) const
{
+ //lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
BOOST_ASSERT(par >= 0);
BOOST_ASSERT(par < int(paragraphs().size()));
ParagraphList::iterator pit = paragraphs().begin();
- std::advance(pit, par);
+ advance(pit, par);
return pit;
}
+// y is relative to this LyXText's top
RowList::iterator
LyXText::getRowNearY(int y, ParagraphList::iterator & pit) const
{
- //lyxerr << "getRowNearY: y " << y << endl;
+ BOOST_ASSERT(!paragraphs().empty());
+ BOOST_ASSERT(!paragraphs().begin()->rows.empty());
#if 1
ParagraphList::iterator const
pend = boost::prior(paragraphs().end());
}
-ParagraphList::iterator LyXText::firstPar() const
-{
- return paragraphs().begin();
-}
-
-
RowList::iterator LyXText::lastRow() const
{
return boost::prior(endRow());
}
-ParagraphList::iterator LyXText::lastPar() const
-{
- return boost::prior(endPar());
-}
-
-
RowList::iterator LyXText::endRow() const
{
return paragraphs().back().rows.end();
}
-ParagraphList::iterator LyXText::endPar() const
-{
- return paragraphs().end();
-}
-
-
void LyXText::nextRow(ParagraphList::iterator & pit,
RowList::iterator & rit) const
{
}
-string LyXText::selectionAsString(Buffer const & buffer, bool label) const
-{
- LCursor & cur = bv()->cursor();
- if (!cur.selection())
- return string();
-
- // should be const ...
- ParagraphList::iterator startpit = getPar(cur.selStart());
- ParagraphList::iterator endpit = getPar(cur.selEnd());
- size_t const startpos = cur.selStart().pos();
- size_t const endpos = cur.selEnd().pos();
-
- if (startpit == endpit)
- return startpit->asString(buffer, startpos, endpos, label);
-
- // First paragraph in selection
- string result =
- startpit->asString(buffer, startpos, startpit->size(), label) + "\n\n";
-
- // The paragraphs in between (if any)
- ParagraphList::iterator pit = startpit;
- for (++pit; pit != endpit; ++pit)
- result += pit->asString(buffer, 0, pit->size(), label) + "\n\n";
-
- // Last paragraph in selection
- result += endpit->asString(buffer, 0, endpos, label);
-
- return result;
-}
-
-
int LyXText::parOffset(ParagraphList::iterator pit) const
{
- return std::distance(paragraphs().begin(), pit);
+ return distance(paragraphs().begin(), pit);
}
do {
Row row(z);
rowBreakPoint(pit, row);
- z = row.endpos();
- fill(pit, row, textwidth_);
+ setRowWidth(pit, row);
prepareToPrint(pit, row);
setHeightOfRow(pit, row);
row.y_offset(pit->height);
pit->rows.push_back(row);
pit->width = std::max(pit->width, row.width());
pit->height += row.height();
+ z = row.endpos();
} while (z < pit->size());
height += pit->height;
}
+// only used for inset right now. should also be used for main text
+void LyXText::drawSelection(PainterInfo &, int, int) const
+{
+ //lyxerr << "LyXText::drawSelection at " << x << " " << y << endl;
+}
+
+
bool LyXText::isLastRow(ParagraphList::iterator pit, Row const & row) const
{
return row.endpos() >= pit->size()
}
-void LyXText::cursorLeftOneWord(CursorSlice & cur)
-{
- // treat HFills, floats and Insets as words
-
- ParagraphList::iterator pit = cursorPar();
- size_t pos = cur.pos();
-
- while (pos &&
- (pit->isSeparator(pos - 1) ||
- pit->isKomma(pos - 1) ||
- pit->isNewline(pos - 1)) &&
- !(pit->isHfill(pos - 1) ||
- pit->isInset(pos - 1)))
- --pos;
-
- if (pos &&
- (pit->isInset(pos - 1) ||
- pit->isHfill(pos - 1))) {
- --pos;
- } else if (!pos) {
- if (pit != paragraphs().begin()) {
- --pit;
- pos = pit->size();
- }
- } else { // Here, cur != 0
- while (pos > 0 && pit->isWord(pos - 1))
- --pos;
- }
-
- cur.par(parOffset(pit));
- cur.pos(pos);
-}
-
-
-void LyXText::cursorRightOneWord(CursorSlice & cur)
-{
- // treat floats, HFills and Insets as words
- ParagraphList::iterator pit = cursorPar();
- pos_type pos = cur.pos();
-
- if (pos == pit->size() &&
- boost::next(pit) != paragraphs().end()) {
- ++pit;
- pos = 0;
- } else {
- // Skip through initial nonword stuff.
- while (pos < pit->size() && !pit->isWord(pos)) {
- ++pos;
- }
- // Advance through word.
- while (pos < pit->size() && pit->isWord(pos)) {
- ++pos;
- }
- }
-
- cur.par(parOffset(pit));
- cur.pos(pos);
-}
-
-
-void LyXText::getWord(CursorSlice & from, CursorSlice & to, word_location const loc)
+void LyXText::getWord(CursorSlice & from, CursorSlice & to,
+ word_location const loc)
{
- ParagraphList::iterator from_par = getPar(from);
+ Paragraph & from_par = *getPar(from);
switch (loc) {
case lyx::WHOLE_WORD_STRICT:
- if (from.pos() == 0 || from.pos() == from_par->size()
- || from_par->isSeparator(from.pos())
- || from_par->isKomma(from.pos())
- || from_par->isNewline(from.pos())
- || from_par->isSeparator(from.pos() - 1)
- || from_par->isKomma(from.pos() - 1)
- || from_par->isNewline(from.pos() - 1)) {
+ if (from.pos() == 0 || from.pos() == from_par.size()
+ || from_par.isSeparator(from.pos())
+ || from_par.isKomma(from.pos())
+ || from_par.isNewline(from.pos())
+ || from_par.isSeparator(from.pos() - 1)
+ || from_par.isKomma(from.pos() - 1)
+ || from_par.isNewline(from.pos() - 1)) {
to = from;
return;
}
case lyx::WHOLE_WORD:
// Move cursor to the beginning, when not already there.
- if (from.pos() && !from_par->isSeparator(from.pos() - 1)
- && !(from_par->isKomma(from.pos() - 1)
- || from_par->isNewline(from.pos() - 1)))
- cursorLeftOneWord(from);
+ if (from.pos() && !from_par.isSeparator(from.pos() - 1)
+ && !(from_par.isKomma(from.pos() - 1)
+ || from_par.isNewline(from.pos() - 1)))
+ cursorLeftOneWord(bv()->cursor());
break;
case lyx::PREVIOUS_WORD:
// always move the cursor to the beginning of previous word
- cursorLeftOneWord(from);
+ cursorLeftOneWord(bv()->cursor());
break;
case lyx::NEXT_WORD:
lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet"
break;
}
to = from;
- ParagraphList::iterator to_par = getPar(to);
- while (to.pos() < to_par->size()
- && !to_par->isSeparator(to.pos())
- && !to_par->isKomma(to.pos())
- && !to_par->isNewline(to.pos())
- && !to_par->isHfill(to.pos())
- && !to_par->isInset(to.pos()))
+ Paragraph & to_par = *getPar(to);
+ while (to.pos() < to_par.size()
+ && !to_par.isSeparator(to.pos())
+ && !to_par.isKomma(to.pos())
+ && !to_par.isNewline(to.pos())
+ && !to_par.isHfill(to.pos())
+ && !to_par.isInset(to.pos()))
{
- to.pos(to.pos() + 1);
+ ++to.pos();
}
}
bool LyXText::read(Buffer const & buf, LyXLex & lex)
-{
+{
static Change current_change;
bool the_end_read = false;
}
-int LyXText::cursorX() const
-{
- return cursorX(cursor());
-}
-
-
-int LyXText::cursorY() const
-{
- return cursorY(cursor());
-}
-
-
int LyXText::cursorX(CursorSlice const & cur) const
{
ParagraphList::iterator pit = getPar(cur);
if (pit->rows.empty())
- return 0;
+ return xo_;
Row const & row = *pit->getRow(cur.pos());
pos_type pos = cur.pos();
pos_type cursor_vpos = 0;
if (end <= row_pos)
cursor_vpos = row_pos;
else if (pos >= end)
- cursor_vpos = (pit->isRightToLeftPar(bv()->buffer()->params()))
- ? row_pos : end;
+ cursor_vpos = isRTL(*pit) ? row_pos : end;
else if (pos > row_pos && pos >= end)
// Place cursor after char at (logical) position pos - 1
cursor_vpos = (bidi.level(pos - 1) % 2 == 0)
} else
x += singleWidth(pit, pos);
}
- return int(x);
+ return xo_ + int(x);
}
{
Paragraph & par = *getPar(cur);
Row & row = *par.getRow(cur.pos());
- return par.y + row.y_offset() + row.baseline();
+ return yo_ + par.y + row.y_offset() + row.baseline();
}
CursorSlice & LyXText::cursor()
{
- return bv()->cursor().cursor_.back();
+ //lyxerr << "# accessing slice " << findText(this) << endl;
+ if (this != bv()->cursor().text()) {
+ lyxerr << "cursor: " << bv()->cursor()
+ << "\ntext: " << bv()->cursor().text()
+ << "\nthis: " << this << endl;
+ BOOST_ASSERT(false);
+ }
+ return bv()->cursor().current();
}
CursorSlice const & LyXText::cursor() const
{
- return bv()->cursor().cursor_.back();
+ if (this != bv()->cursor().text()) {
+ lyxerr << "cursor: " << bv()->cursor()
+ << "\ntext: " << bv()->cursor().text()
+ << "\nthis: " << this << endl;
+ BOOST_ASSERT(false);
+ }
+ return bv()->cursor().current();
+}
+
+
+void LyXText::replaceSelection(LCursor & cur)
+{
+ BOOST_ASSERT(this == cur.text());
+ if (cur.selection()) {
+ cutSelection(cur, true, false);
+ cur.update();
+ }
+}
+
+
+// Returns the current font and depth as a message.
+string LyXText::currentState(LCursor & cur)
+{
+ BOOST_ASSERT(this == cur.text());
+ Buffer * buffer = bv()->buffer();
+ Paragraph const & par = cur.paragraph();
+ std::ostringstream os;
+
+ bool const show_change = buffer->params().tracking_changes
+ && cur.pos() != cur.lastpos()
+ && par.lookupChange(cur.pos()) != Change::UNCHANGED;
+
+ if (show_change) {
+ Change change = par.lookupChangeFull(cur.pos());
+ Author const & a = buffer->params().authors().get(change.author);
+ os << _("Change: ") << a.name();
+ if (!a.email().empty())
+ os << " (" << a.email() << ")";
+ if (change.changetime)
+ os << _(" at ") << ctime(&change.changetime);
+ os << " : ";
+ }
+
+ // I think we should only show changes from the default
+ // font. (Asger)
+ LyXFont font = real_current_font;
+ font.reduce(buffer->params().getLyXTextClass().defaultfont());
+
+ // avoid _(...) re-entrance problem
+ string const s = font.stateText(&buffer->params());
+ os << bformat(_("Font: %1$s"), s);
+
+ // os << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
+
+ // The paragraph depth
+ int depth = getDepth();
+ if (depth > 0)
+ os << bformat(_(", Depth: %1$s"), tostr(depth));
+
+ // The paragraph spacing, but only if different from
+ // buffer spacing.
+ Spacing const & spacing = par.params().spacing();
+ if (!spacing.isDefault()) {
+ os << _(", Spacing: ");
+ switch (spacing.getSpace()) {
+ case Spacing::Single:
+ os << _("Single");
+ break;
+ case Spacing::Onehalf:
+ os << _("OneHalf");
+ break;
+ case Spacing::Double:
+ os << _("Double");
+ break;
+ case Spacing::Other:
+ os << _("Other (") << spacing.getValue() << ')';
+ break;
+ case Spacing::Default:
+ // should never happen, do nothing
+ break;
+ }
+ }
+#ifdef DEVEL_VERSION
+ os << _(", Paragraph: ") << par.id();
+ os << _(", Position: ") << cur.pos();
+ Row & row = cur.textRow();
+ os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
+ os << _(", Inset: ");
+ InsetOld * inset = par.inInset();
+ if (inset)
+ os << inset << " owner: " << inset->owner();
+ else
+ os << -1;
+#endif
+ return os.str();
}
-CursorSlice & LyXText::anchor()
+string LyXText::getPossibleLabel(LCursor & cur) const
{
- return bv()->cursor().anchor_.back();
+ ParagraphList & plist = paragraphs();
+ ParagraphList::iterator pit = getPar(cur.par());
+
+ LyXLayout_ptr layout = pit->layout();
+
+ if (layout->latextype == LATEX_PARAGRAPH && pit != plist.begin()) {
+ ParagraphList::iterator pit2 = boost::prior(pit);
+
+ LyXLayout_ptr const & layout2 = pit2->layout();
+
+ if (layout2->latextype != LATEX_PARAGRAPH) {
+ pit = pit2;
+ layout = layout2;
+ }
+ }
+
+ string text = layout->latexname().substr(0, 3);
+ if (layout->latexname() == "theorem")
+ text = "thm"; // Create a correct prefix for prettyref
+
+ text += ':';
+ if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0)
+ text.erase();
+
+ string par_text = pit->asString(*cur.bv().buffer(), false);
+ for (int i = 0; i < lyxrc.label_init_length; ++i) {
+ if (par_text.empty())
+ break;
+ string head;
+ par_text = split(par_text, head, ' ');
+ // Is it legal to use spaces in labels ?
+ if (i > 0)
+ text += '-';
+ text += head;
+ }
+
+ return text;
}
-CursorSlice const & LyXText::anchor() const
+int LyXText::dist(int x, int y) const
{
- return bv()->cursor().anchor_.back();
+ int xx = 0;
+ int yy = 0;
+
+ if (x < xo_)
+ xx = xo_ - x;
+ else if (x > xo_ + width)
+ xx = x - xo_ - width;
+
+ if (y < yo_ - ascent())
+ yy = yo_ - ascent() - y;
+ else if (y > yo_ + descent())
+ yy = y - yo_ - descent();
+
+ return xx + yy;
}
projects / lyx.git / blobdiff