#include "author.h"
#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "pariterator.h"
+#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
+#include "frontends/Painter.h"
#include "insets/insettext.h"
#include "insets/insetbibitem.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
+
+#include <boost/current_function.hpp>
#include <sstream>
-using lyx::par_type;
+using lyx::char_type;
+using lyx::pit_type;
using lyx::pos_type;
using lyx::word_location;
}
-unsigned int maxParagraphWidth(ParagraphList const & plist)
-{
- unsigned int width = 0;
- ParagraphList::const_iterator pit = plist.begin();
- ParagraphList::const_iterator end = plist.end();
- for (; pit != end; ++pit)
- width = std::max(width, pit->width);
- return width;
-}
-
-
int numberOfLabelHfills(Paragraph const & par, Row const & row)
{
pos_type last = row.endpos() - 1;
void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
- string const & token, LyXFont & font)
+ string const & token, LyXFont & font, Change & change)
{
- static Change change;
-
BufferParams const & bp = buf.params();
if (token[0] != '\\') {
string::const_iterator cit = token.begin();
- for (; cit != token.end(); ++cit) {
+ for (; cit != token.end(); ++cit)
par.insertChar(par.size(), (*cit), font, change);
- }
} else if (token == "\\begin_layout") {
lex.eatLine();
string layoutname = lex.getString();
if (!hasLayout) {
buf.error(ErrorItem(_("Unknown layout"),
- bformat(_("Layout '%1$s' does not exists in textclass '%2$s'\nTrying to use the default instead.\n"),
+ bformat(_("Layout '%1$s' does not exist in textclass '%2$s'\nTrying to use the default instead.\n"),
layoutname, tclass.name()), par.id(), 0, par.size()));
layoutname = tclass.defaultLayoutName();
}
par.params().read(lex);
} else if (token == "\\end_layout") {
- lyxerr << "Solitary \\end_layout in line " << lex.getLineNo() << "\n"
+ lyxerr << BOOST_CURRENT_FUNCTION
+ << ": Solitary \\end_layout in line "
+ << lex.getLineNo() << "\n"
<< "Missing \\begin_layout?.\n";
} else if (token == "\\end_inset") {
- lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
+ lyxerr << BOOST_CURRENT_FUNCTION
+ << ": Solitary \\end_inset in line "
+ << lex.getLineNo() << "\n"
<< "Missing \\begin_inset?.\n";
} else if (token == "\\begin_inset") {
InsetBase * inset = readInset(lex, buf);
} else if (token == "\\change_unchanged") {
// Hack ! Needed for empty paragraphs :/
// FIXME: is it still ??
+ /*
if (!par.size())
par.cleanChanges();
+ */
change = Change(Change::UNCHANGED);
} else if (token == "\\change_inserted") {
lex.eatLine();
lex.nextToken();
string token = lex.getString();
LyXFont font;
+ Change change;
while (lex.isOK()) {
- readParToken(buf, par, lex, token, font);
+ readParToken(buf, par, lex, token, font, change);
lex.nextToken();
token = lex.getString();
break;
}
}
+ // Final change goes to paragraph break:
+ par.setChangeFull(par.size(), change);
+
+ // Initialize begin_of_body_ on load; redoParagraph maintains
+ par.setBeginOfBody();
}
} // namespace anon
-BufferView * LyXText::bv()
-{
- BOOST_ASSERT(bv_owner != 0);
- return bv_owner;
-}
-
BufferView * LyXText::bv() const
{
}
-void LyXText::updateParPositions()
-{
- par_type pit = 0;
- par_type end = pars_.size();
- for (height_ = 0; pit != end; ++pit) {
- pars_[pit].y = height_;
- height_ += pars_[pit].height;
- }
-}
-
-
int LyXText::width() const
{
- return width_;
+ return dim_.wid;
}
int LyXText::height() const
{
- return height_;
+ return dim_.height();
}
int LyXText::singleWidth(Paragraph const & par,
- pos_type pos, char c, LyXFont const & font) const
+ pos_type pos, char_type c, LyXFont const & font) const
{
- BOOST_ASSERT(pos < par.size());
-
// The most common case is handled first (Asger)
- if (IsPrintable(c)) {
- if (font.language()->RightToLeft()) {
+ if (isPrintable(c)) {
+ Language const * language = font.language();
+ if (language->rightToLeft()) {
if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
lyxrc.font_norm_type == LyXRC::ISO_10646_1)
- && font.language()->lang() == "arabic") {
- if (Encodings::IsComposeChar_arabic(c))
+ && language->lang() == "arabic") {
+ if (Encodings::isComposeChar_arabic(c))
return 0;
- else
- c = par.transformChar(c, pos);
- } else if (font.language()->lang() == "hebrew" &&
- Encodings::IsComposeChar_hebrew(c))
+ c = par.transformChar(c, pos);
+ } else if (language->lang() == "hebrew" &&
+ Encodings::isComposeChar_hebrew(c))
return 0;
}
return font_metrics::width(c, font);
if (c == Paragraph::META_INSET)
return par.getInset(pos)->width();
- if (IsSeparatorChar(c))
- c = ' ';
return font_metrics::width(c, font);
}
-int LyXText::leftMargin(par_type pit) const
+int LyXText::leftMargin(pit_type pit) const
{
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(pars_.size()));
return leftMargin(pit, pars_[pit].size());
}
-int LyXText::leftMargin(par_type const pit, pos_type const pos) const
+int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
{
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(pars_.size()));
Paragraph const & par = pars_[pit];
+ BOOST_ASSERT(pos >= 0);
+ BOOST_ASSERT(pos <= par.size());
+ //lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl;
LyXTextClass const & tclass =
bv()->buffer()->params().getLyXTextClass();
LyXLayout_ptr const & layout = par.layout();
int l_margin = 0;
- if (xo_ == 0)
+ if (isMainText())
l_margin += changebarMargin();
l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
if (par.getDepth() != 0) {
- // find the next level paragraph
- par_type newpar = outerHook(pit, pars_);
- if (newpar != par_type(pars_.size())) {
+ // find the next level paragraph
+ pit_type newpar = outerHook(pit, pars_);
+ if (newpar != pit_type(pars_.size())) {
if (pars_[newpar].layout()->isEnvironment()) {
l_margin = leftMargin(newpar);
}
}
}
+ // This happens after sections in standard classes. The 1.3.x
+ // code compared depths too, but it does not seem necessary
+ // (JMarc)
+ if (par.layout() == tclass.defaultLayout()
+ && pit > 0 && pars_[pit - 1].layout()->nextnoindent)
+ parindent.erase();
+
LyXFont const labelfont = getLabelFont(par);
switch (layout->margintype) {
case MARGIN_DYNAMIC:
#if 0
// ok, a terrible hack. The left margin depends on the widest
// row in this paragraph.
- RowList::iterator rit = par.rows.begin();
- RowList::iterator end = par.rows.end();
+ RowList::iterator rit = par.rows().begin();
+ RowList::iterator end = par.rows().end();
#ifdef WITH_WARNINGS
#warning This is wrong.
#endif
|| layout->labeltype == LABEL_TOP_ENVIRONMENT
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|| (layout->labeltype == LABEL_STATIC
- && layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, pars_)))
+ && layout->latextype == LATEX_ENVIRONMENT
+ && !isFirstInSequence(pit, pars_)))
&& align == LYX_ALIGN_BLOCK
&& !par.params().noindent()
- // in charstyles, tabulars and ert paragraphs are never indented!
- && (par.ownerCode() != InsetBase::TEXT_CODE
- && par.ownerCode() != InsetBase::ERT_CODE
- && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
+ // in some insets, paragraphs are never indented
+ && !(par.inInset() && par.inInset()->neverIndent())
+ // display style insets are always centered, omit indentation
+ && !(!par.empty()
+ && par.isInset(pos)
+ && par.getInset(pos)->display())
&& (par.layout() != tclass.defaultLayout()
- || bv()->buffer()->params().paragraph_separation ==
- BufferParams::PARSEP_INDENT))
+ || bv()->buffer()->params().paragraph_separation ==
+ BufferParams::PARSEP_INDENT))
{
l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont());
}
}
-int LyXText::labelEnd(par_type const pit) const
+int LyXText::labelEnd(pit_type const pit) const
{
// labelEnd is only needed if the layout fills a flushleft label.
if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
};
-void LyXText::rowBreakPoint(par_type const pit, Row & row) const
+void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
{
Paragraph const & par = pars_[pit];
pos_type const end = par.size();
// pixel width since last breakpoint
int chunkwidth = 0;
- FontIterator fi = FontIterator(*this, pit, pos);
+ FontIterator fi = FontIterator(*this, par, pos);
pos_type point = end;
pos_type i = pos;
for ( ; i < end; ++i, ++fi) {
- char const c = par.getChar(i);
-
- {
- int thiswidth = singleWidth(par, i, c, *fi);
-
- // add the auto-hfill from label end to the body
- if (body_pos && i == body_pos) {
- int add = font_metrics::width(layout->labelsep, getLabelFont(par));
- if (par.isLineSeparator(i - 1))
- add -= singleWidth(par, i - 1);
+ char_type const c = par.getChar(i);
+ int thiswidth = singleWidth(par, i, c, *fi);
- add = std::max(add, labelEnd(pit) - x);
- thiswidth += add;
- }
+ // add the auto-hfill from label end to the body
+ if (body_pos && i == body_pos) {
+ int add = font_metrics::width(layout->labelsep, getLabelFont(par));
+ if (par.isLineSeparator(i - 1))
+ add -= singleWidth(par, i - 1);
- x += thiswidth;
- chunkwidth += thiswidth;
+ add = std::max(add, labelEnd(pit) - x);
+ thiswidth += add;
}
+ x += thiswidth;
+ chunkwidth += thiswidth;
+
// break before a character that will fall off
// the right of the row
if (x >= width) {
}
-void LyXText::setRowWidth(par_type const pit, Row & row) const
+void LyXText::setRowWidth(pit_type const pit, Row & row) const
{
// get the pure distance
pos_type const end = row.endpos();
Paragraph const & par = pars_[pit];
- string labelsep = par.layout()->labelsep;
+ string const & labelsep = par.layout()->labelsep;
int w = leftMargin(pit, row.pos());
pos_type const body_pos = par.beginOfBody();
pos_type i = row.pos();
if (i < end) {
- FontIterator fi = FontIterator(*this, pit, i);
+ FontIterator fi = FontIterator(*this, par, i);
for ( ; i < end; ++i, ++fi) {
if (body_pos > 0 && i == body_pos) {
w += font_metrics::width(labelsep, getLabelFont(par));
w -= singleWidth(par, i - 1);
w = max(w, labelEnd(pit));
}
- char const c = par.getChar(i);
+ char_type const c = par.getChar(i);
w += singleWidth(par, i, c, *fi);
}
}
}
-void LyXText::setHeightOfRow(par_type const pit, Row & row)
+void LyXText::setHeightOfRow(pit_type const pit, Row & row)
{
Paragraph const & par = pars_[pit];
// get the maximum ascent and the maximum descent
++maxasc;
++maxdesc;
- row.ascent_of_text(maxasc);
+ row.ascent(maxasc);
// is it a top line?
if (row.pos() == 0) {
&& pit != 0
&& ((layout->isParagraph() && par.getDepth() == 0)
|| (pars_[pit - 1].layout()->isParagraph()
- && pars_[pit - 1].getDepth() == 0)))
+ && pars_[pit - 1].getDepth() == 0)))
{
maxasc += bufparams.getDefSkip().inPixels(*bv());
}
- if (pars_[pit].params().startOfAppendix())
+ if (par.params().startOfAppendix())
maxasc += int(3 * dh);
// This is special code for the chapter, since the label of this
// layout is printed in an extra row
- if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) {
+ if (layout->counter == "chapter"
+ && !par.params().labelString().empty()) {
labeladdon = int(font_metrics::maxHeight(labelfont)
- * layout->spacing.getValue()
- * spacing(par));
+ * layout->spacing.getValue()
+ * spacing(par));
}
// special code for the top label
// a section, or between the items of a itemize or enumerate
// environment.
- par_type prev = depthHook(pit, pars_, par.getDepth());
+ pit_type prev = depthHook(pit, pars_, par.getDepth());
if (prev != pit
&& pars_[prev].layout() == layout
&& pars_[prev].getDepth() == par.getDepth()
}
prev = outerHook(pit, pars_);
- if (prev != par_type(pars_.size())) {
+ if (prev != pit_type(pars_.size())) {
maxasc += int(pars_[prev].layout()->parsep * dh);
} else if (pit != 0) {
if (pars_[pit - 1].getDepth() != 0 ||
// add the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment
- par_type nextpit = pit + 1;
- if (nextpit != par_type(pars_.size())) {
- par_type cpit = pit;
+ pit_type nextpit = pit + 1;
+ if (nextpit != pit_type(pars_.size())) {
+ pit_type cpit = pit;
double usual = 0;
double unusual = 0;
maxasc += int(layoutasc * 2 / (2 + pars_[pit].getDepth()));
maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth()));
- row.height(maxasc + maxdesc + labeladdon);
- row.baseline(maxasc + labeladdon);
- row.top_of_text(row.baseline() - font_metrics::maxAscent(font));
+ // Top and bottom margin of the document (only at top-level)
+ if (bv_owner->text() == this) {
+ if (pit == 0 && row.pos() == 0)
+ maxasc += 20;
+ if (pit + 1 == pit_type(pars_.size()) &&
+ row.endpos() == par.size())
+ maxdesc += 20;
+ }
+
+ row.ascent(maxasc + labeladdon);
+ row.descent(maxdesc);
}
}
-void LyXText::breakParagraph(LCursor & cur, char keep_layout)
+void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
{
BOOST_ASSERT(this == cur.text());
- // allow only if at start or end, or all previous is new text
- Paragraph & cpar = cur.paragraph();
- par_type cpit = cur.par();
- if (cur.pos() != 0 && cur.pos() != cur.lastpos()
- && cpar.isChangeEdited(0, cur.pos()))
- return;
+ Paragraph & cpar = cur.paragraph();
+ pit_type cpit = cur.pit();
LyXTextClass const & tclass = cur.buffer().params().getLyXTextClass();
LyXLayout_ptr const & layout = cpar.layout();
return;
// a layout change may affect also the following paragraph
- recUndo(cur.par(), undoSpan(cur.par()) - 1);
+ recUndo(cur.pit(), undoSpan(cur.pit()) - 1);
// Always break behind a space
// It is better to erase the space (Dekel)
if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
cpar.erase(cur.pos());
- // break the paragraph
+ // How should the layout for the new paragraph be?
+ int preserve_layout = 0;
if (keep_layout)
- keep_layout = 2;
+ preserve_layout = 2;
else
- keep_layout = layout->isEnvironment();
+ preserve_layout = layout->isEnvironment();
- // we need to set this before we insert the paragraph. IMO the
- // 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)
+ // We need to remember this before we break the paragraph, because
+ // that invalidates the layout variable
+ bool sensitive = layout->labeltype == LABEL_SENSITIVE;
+
+ // we need to set this before we insert the paragraph.
bool const isempty = cpar.allowEmpty() && cpar.empty();
+
::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
- cur.pos(), keep_layout);
+ cur.pos(), preserve_layout);
+
+ // After this, neither paragraph contains any rows!
- cpit = cur.par();
- par_type next_par = cpit + 1;
+ cpit = cur.pit();
+ pit_type next_par = cpit + 1;
// well this is the caption hack since one caption is really enough
- if (layout->labeltype == LABEL_SENSITIVE) {
+ if (sensitive) {
if (cur.pos() == 0)
// set to standard-layout
pars_[cpit].applyLayout(tclass.defaultLayout());
pars_[next_par].applyLayout(tclass.defaultLayout());
}
- // if the cursor is at the beginning of a row without prior newline,
- // move one row up!
- // This touches only the screen-update. Otherwise we would may have
- // an empty row on the screen
- if (cur.pos() != 0 && cur.textRow().pos() == cur.pos()
- && !pars_[cpit].isNewline(cur.pos() - 1))
- {
- cursorLeft(cur);
- }
-
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
pars_[next_par].erase(0);
- updateCounters();
- redoParagraph(cpit);
- redoParagraph(next_par);
+ ParIterator current_it(cur);
+ ParIterator next_it(cur); next_it.pit() = next_par;
+
+ if (needsUpdateCounters(cur.buffer(), current_it)
+ || needsUpdateCounters(cur.buffer(), next_it))
+ updateCounters(cur.buffer());
+
+ // Mark "carriage return" as inserted if change tracking:
+ if (cur.buffer().params().tracking_changes) {
+ cur.paragraph().setChange(cur.paragraph().size(),
+ Change::INSERTED);
+ }
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
if (cur.pos() != 0 || isempty)
- setCursor(cur, cur.par() + 1, 0);
+ setCursor(cur, cur.pit() + 1, 0);
else
- setCursor(cur, cur.par(), 0);
-}
-
-
-// convenience function
-void LyXText::redoParagraph(LCursor & cur)
-{
- BOOST_ASSERT(this == cur.text());
- cur.clearSelection();
- redoParagraph(cur.par());
- setCursorIntern(cur, cur.par(), cur.pos());
+ setCursor(cur, cur.pit(), 0);
}
// insert a character, moves all the following breaks in the
// same Paragraph one to the right and make a rebreak
-void LyXText::insertChar(LCursor & cur, char c)
+void LyXText::insertChar(LCursor & cur, char_type c)
{
BOOST_ASSERT(this == cur.text());
BOOST_ASSERT(c != Paragraph::META_INSET);
Paragraph & par = cur.paragraph();
// try to remove this
- par_type const pit = cur.par();
+ pit_type const pit = cur.pit();
bool const freeSpacing = par.layout()->free_spacing ||
par.isFreeSpacing();
static string const number_seperators = ".,:";
if (current_font.number() == LyXFont::ON) {
- if (!IsDigit(c) && !contains(number_operators, c) &&
+ if (!isDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
getFont(par, cur.pos() - 1).number() == LyXFont::ON)
)
number(cur); // Set current_font.number to OFF
- } else if (IsDigit(c) &&
+ } else if (isDigit(c) &&
real_current_font.isVisibleRightToLeft()) {
number(cur); // Set current_font.number to ON
if (cur.pos() != 0) {
- char const c = par.getChar(cur.pos() - 1);
+ char_type const c = par.getChar(cur.pos() - 1);
if (contains(number_unary_operators, c) &&
(cur.pos() == 1
|| par.isSeparator(cur.pos() - 2)
// difference are the special checks when calculating the row.fill
// (blank does not count at the end of a row) and the check here
- // The bug is triggered when we type in a description environment:
- // The current_font is not changed when we go from label to main text
- // and it should (along with realtmpfont) when we type the space.
- // CHECK There is a bug here! (Asger)
-
- // store the current font. This is because of the use of cursor
- // movements. The moving cursor would refresh the 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 (!freeSpacing && isLineSeparatorChar(c)) {
if (cur.pos() == 0) {
static bool sent_space_message = false;
if (!sent_space_message) {
cur.message(_("You cannot insert a space at the "
"beginning of a paragraph. Please read the Tutorial."));
sent_space_message = true;
- return;
}
+ return;
}
BOOST_ASSERT(cur.pos() > 0);
- if (par.isLineSeparator(cur.pos() - 1)
- || par.isNewline(cur.pos() - 1)) {
+ if ((par.isLineSeparator(cur.pos() - 1)
+ || par.isNewline(cur.pos() - 1))
+ && par.lookupChange(cur.pos() - 1) != Change::DELETED) {
static bool sent_space_message = false;
if (!sent_space_message) {
cur.message(_("You cannot type two spaces this way. "
}
}
- par.insertChar(cur.pos(), c, rawtmpfont);
-
- current_font = rawtmpfont;
- real_current_font = realtmpfont;
- redoParagraph(cur);
- setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+ par.insertChar(cur.pos(), c, current_font);
+ setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
charInserted();
}
}
-RowMetrics LyXText::computeRowMetrics(par_type const pit, Row const & row) const
+RowMetrics
+LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
{
RowMetrics result;
Paragraph const & par = pars_[pit];
- double w = width_ - row.width();
+ double w = dim_.wid - row.width();
bool const is_rtl = isRTL(par);
if (is_rtl)
// the cursor set functions have a special mechanism. When they
// realize, that you left an empty paragraph, they will delete it.
-void LyXText::cursorRightOneWord(LCursor & cur)
+bool LyXText::cursorRightOneWord(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) {
- ++cur.par();
- cur.pos() = 0;
+
+ LCursor old = cur;
+
+ if (old.pos() == old.lastpos() && old.pit() != old.lastpit()) {
+ ++old.pit();
+ old.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();
+ while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos()))
+ ++old.pos();
+ // Skip through trailing nonword stuff.
+ while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
+ ++old.pos();
}
- setCursor(cur, cur.par(), cur.pos());
+ return setCursor(cur, old.pit(), old.pos());
}
-void LyXText::cursorLeftOneWord(LCursor & cur)
+bool LyXText::cursorLeftOneWord(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- if (cur.pos() == 0 && cur.par() != 0) {
- --cur.par();
- cur.pos() = cur.lastpos();
+
+ LCursor old = cur;
+
+ if (old.pos() == 0 && old.pit() != 0) {
+ --old.pit();
+ old.pos() = old.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();
+ while (old.pos() != 0 && !old.paragraph().isLetter(old.pos() - 1))
+ --old.pos();
// Advance through word.
- while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1))
- --cur.pos();
+ while (old.pos() != 0 && old.paragraph().isLetter(old.pos() - 1))
+ --old.pos();
}
- setCursor(cur, cur.par(), cur.pos());
+ return setCursor(cur, old.pit(), old.pos());
}
CursorSlice to = cur.top();
getWord(from, to, loc);
if (cur.top() != from)
- setCursor(cur, from.par(), from.pos());
+ setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
cur.resetAnchor();
- setCursor(cur, to.par(), to.pos());
+ setCursor(cur, to.pit(), to.pos());
cur.setSelection();
}
if (!cur.selection() && cur.lastpos() != 0)
return;
- CursorSlice const & startc = cur.selBegin();
- CursorSlice const & endc = cur.selEnd();
- if (startc.par() == endc.par()) {
- recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.par()].acceptChange(startc.pos(), endc.pos());
- finishUndo();
- cur.clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(cur, startc.par(), 0);
+ recordUndoSelection(cur, Undo::INSERT);
+
+ DocIterator it = cur.selectionBegin();
+ DocIterator et = cur.selectionEnd();
+ pit_type pit = it.pit();
+ Change::Type const type = pars_[pit].lookupChange(it.pos());
+ for (; pit <= et.pit(); ++pit) {
+ pos_type left = ( pit == it.pit() ? it.pos() : 0 );
+ pos_type right =
+ ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
+ pars_[pit].acceptChange(left, right);
}
-#ifdef WITH_WARNINGS
-#warning handle multi par selection
-#endif
+ if (type == Change::DELETED) {
+ ParagraphList & plist = paragraphs();
+ if (it.pit() + 1 < et.pit())
+ pars_.erase(boost::next(plist.begin(), it.pit() + 1),
+ boost::next(plist.begin(), et.pit()));
+
+ // Paragraph merge if appropriate:
+ if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
+ == Change::DELETED) {
+ setCursorIntern(cur, it.pit() + 1, 0);
+ backspacePos0(cur);
+ }
+ }
+ finishUndo();
+ cur.clearSelection();
+ setCursorIntern(cur, it.pit(), 0);
}
if (!cur.selection() && cur.lastpos() != 0)
return;
- CursorSlice const & startc = cur.selBegin();
- CursorSlice const & endc = cur.selEnd();
- if (startc.par() == endc.par()) {
- recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.par()].rejectChange(startc.pos(), endc.pos());
- finishUndo();
- cur.clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(cur, startc.par(), 0);
+ recordUndoSelection(cur, Undo::INSERT);
+
+ DocIterator it = cur.selectionBegin();
+ DocIterator et = cur.selectionEnd();
+ pit_type pit = it.pit();
+ Change::Type const type = pars_[pit].lookupChange(it.pos());
+ for (; pit <= et.pit(); ++pit) {
+ pos_type left = ( pit == it.pit() ? it.pos() : 0 );
+ pos_type right =
+ ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
+ pars_[pit].rejectChange(left, right);
}
-#ifdef WITH_WARNINGS
-#warning handle multi par selection
-#endif
+ if (type == Change::INSERTED) {
+ ParagraphList & plist = paragraphs();
+ if (it.pit() + 1 < et.pit())
+ pars_.erase(boost::next(plist.begin(), it.pit() + 1),
+ boost::next(plist.begin(), et.pit()));
+ // Paragraph merge if appropriate:
+ if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
+ == Change::INSERTED) {
+ setCursorIntern(cur, it.pit() + 1, 0);
+ backspacePos0(cur);
+ }
+ }
+ finishUndo();
+ cur.clearSelection();
+ setCursorIntern(cur, it.pit(), 0);
}
} else {
from = cur.top();
getWord(from, to, lyx::PARTIAL_WORD);
- setCursor(cur, to.par(), to.pos() + 1);
+ cursorRightOneWord(cur);
}
recordUndoSelection(cur);
pos_type pos = from.pos();
- int par = from.par();
+ int par = from.pit();
- while (par != int(pars_.size()) && (pos != to.pos() || par != to.par())) {
- par_type pit = par;
+ while (par != int(pars_.size()) && (pos != to.pos() || par != to.pit())) {
+ pit_type pit = par;
if (pos == pars_[pit].size()) {
++par;
pos = 0;
continue;
}
- unsigned char c = pars_[pit].getChar(pos);
+ char_type c = pars_[pit].getChar(pos);
if (c != Paragraph::META_INSET) {
switch (action) {
case text_lowercase:
}
-void LyXText::Delete(LCursor & cur)
+bool LyXText::erase(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
+ bool needsUpdate = false;
+
if (cur.pos() != cur.lastpos()) {
- recordUndo(cur, Undo::DELETE, cur.par());
- setCursorIntern(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
- backspace(cur);
+ recordUndo(cur, Undo::DELETE, cur.pit());
+ setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
+ needsUpdate = backspace(cur);
+ if (cur.paragraph().lookupChange(cur.pos()) == Change::DELETED)
+ cur.posRight();
+ } else if (cur.pit() != cur.lastpit()) {
+ LCursor scur = cur;
+
+ setCursorIntern(cur, cur.pit() + 1, 0, false, false);
+ if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) {
+ recordUndo(scur, Undo::DELETE, scur.pit());
+ needsUpdate = backspace(cur);
+ if (cur.buffer().params().tracking_changes) {
+ // move forward after the paragraph break is DELETED
+ Paragraph & par = cur.paragraph();
+ if (par.lookupChange(par.size()) == Change::DELETED)
+ setCursorIntern(cur, cur.pit() + 1, 0);
+ }
+ } else {
+ setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
+ }
}
- // should we do anything in an else branch?
+ return needsUpdate;
}
-void LyXText::backspace(LCursor & cur)
+bool LyXText::backspacePos0(LCursor & cur)
{
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
- Paragraph & par = cur.paragraph();
- if (par.isChangeEdited(0, par.size()))
- return;
+ bool needsUpdate = false;
- // we may paste some paragraphs
-
- // is it an empty paragraph?
- 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 (cur.par() != 0) {
- cursorLeft(cur);
- // the layout things can change the height of a row !
- redoParagraph(cur);
- return;
+ Paragraph & par = cur.paragraph();
+ // is it an empty paragraph?
+ 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 (cur.pit() != 0) {
+ // For KeepEmpty layouts we need to get
+ // rid of the keepEmpty setting first.
+ // And the only way to do this is to
+ // reset the layout to something
+ // else: f.ex. the default layout.
+ if (par.allowEmpty()) {
+ Buffer & buf = cur.buffer();
+ BufferParams const & bparams = buf.params();
+ par.layout(bparams.getLyXTextClass().defaultLayout());
}
+
+ cursorLeft(cur);
+ return true;
}
+ }
- if (cur.par() != 0)
- recordUndo(cur, Undo::DELETE, cur.par() - 1);
+ if (cur.pit() != 0)
+ recordUndo(cur, Undo::DELETE, cur.pit() - 1);
+
+ pit_type tmppit = cur.pit();
+ // 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 (cur.pit() != 0) {
+ // steps into the above paragraph.
+ setCursorIntern(cur, cur.pit() - 1,
+ pars_[cur.pit() - 1].size(),
+ false);
+ }
- par_type tmppit = 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 (cur.par() != 0) {
- // steps into the above paragraph.
- setCursorIntern(cur, cur.par() - 1,
- pars_[cur.par() - 1].size(),
- false);
- }
+ // Pasting is not allowed, if the paragraphs have different
+ // layout. I think it is a real bug of all other
+ // word processors to allow it. It confuses the user.
+ // Correction: Pasting is always allowed with standard-layout
+ // Correction (Jug 20050717): Remove check about alignment!
+ Buffer & buf = cur.buffer();
+ BufferParams const & bufparams = buf.params();
+ LyXTextClass const & tclass = bufparams.getLyXTextClass();
+ pit_type const cpit = cur.pit();
+
+ if (cpit != tmppit
+ && (pars_[cpit].layout() == pars_[tmppit].layout()
+ || pars_[tmppit].layout() == tclass.defaultLayout()))
+ {
+ mergeParagraph(bufparams, pars_, cpit);
+ needsUpdate = true;
- // Pasting is not allowed, if the paragraphs have different
- // layout. I think it is a real bug of all other
- // word processors to allow it. It confuses the user.
- // Correction: Pasting is always allowed with standard-layout
- Buffer & buf = cur.buffer();
- BufferParams const & bufparams = buf.params();
- LyXTextClass const & tclass = bufparams.getLyXTextClass();
- par_type const cpit = cur.par();
-
- if (cpit != tmppit
- && (pars_[cpit].layout() == pars_[tmppit].layout()
- || pars_[tmppit].layout() == tclass.defaultLayout())
- && pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
- mergeParagraph(bufparams, buf.paragraphs(), cpit);
-
- if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
+ if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
--cur.pos();
- // the counters may have changed
- updateCounters();
- setCursor(cur, cur.par(), cur.pos(), false);
+ // the counters may have changed
+ ParIterator par_it(cur);
+ if (needsUpdateCounters(cur.buffer(), par_it))
+ updateCounters(cur.buffer());
+
+ setCursor(cur, cur.pit(), cur.pos(), false);
+ }
+ return needsUpdate;
+}
+
+
+bool LyXText::backspace(LCursor & cur)
+{
+ BOOST_ASSERT(this == cur.text());
+ bool needsUpdate = false;
+ if (cur.pos() == 0) {
+ // The cursor is at the beginning of a paragraph, so
+ // the the backspace will collapse two paragraphs into
+ // one.
+
+ if (cur.pit() != 0 && cur.buffer().params().tracking_changes) {
+ // Previous paragraph, mark "carriage return" as
+ // deleted:
+ Paragraph & par = pars_[cur.pit() - 1];
+ // Take care of a just inserted para break:
+ if (par.lookupChange(par.size()) != Change::INSERTED) {
+ par.setChange(par.size(), Change::DELETED);
+ setCursorIntern(cur, cur.pit() - 1, par.size());
+ return true;
+ }
}
+
+ needsUpdate = backspacePos0(cur);
+
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- setCursorIntern(cur, cur.par(), cur.pos() - 1,
+ setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
cur.paragraph().erase(cur.pos());
}
if (cur.pos() == cur.lastpos())
setCurrentFont(cur);
- redoParagraph(cur);
- setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
-}
+ setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
-
-Paragraph & LyXText::getPar(par_type par) const
-{
- //lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
- BOOST_ASSERT(par >= 0);
- BOOST_ASSERT(par < int(paragraphs().size()));
- return paragraphs()[par];
+ return needsUpdate;
}
Row const & LyXText::firstRow() const
{
- return *paragraphs().front().rows.begin();
+ return *paragraphs().front().rows().begin();
}
-void LyXText::redoParagraphInternal(par_type const pit)
+bool LyXText::redoParagraph(pit_type const pit)
{
// remove rows of paragraph, keep track of height changes
Paragraph & par = pars_[pit];
- height_ -= par.height;
- // clear old data
- par.rows.clear();
- par.height = 0;
- par.width = 0;
+ // Add bibitem insets if necessary
+ if (par.layout()->labeltype == LABEL_BIBLIO) {
+ bool hasbibitem(false);
+ if (!par.insetlist.empty()
+ // Insist on it being in pos 0
+ && par.getChar(0) == Paragraph::META_INSET) {
+ InsetBase * inset = par.insetlist.begin()->inset;
+ if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
+ hasbibitem = true;
+ }
+ if (!hasbibitem) {
+ InsetBibitem * inset(new
+ InsetBibitem(InsetCommandParams("bibitem")));
+ par.insertInset(0, static_cast<InsetBase *>(inset));
+ bv()->cursor().posRight();
+ }
+ }
// redo insets
+ // FIXME: We should always use getFont(), see documentation of
+ // noFontChange() in insetbase.h.
+ LyXFont const bufferfont = bv()->buffer()->params().getFont();
InsetList::iterator ii = par.insetlist.begin();
InsetList::iterator iend = par.insetlist.end();
for (; ii != iend; ++ii) {
Dimension dim;
- int const w = maxwidth_ - leftMargin(pit) - rightMargin(par);
- MetricsInfo mi(bv(), getFont(par, ii->pos), w);
+ int const w = maxwidth_ - leftMargin(pit, ii->pos) - rightMargin(par);
+ LyXFont const & font = ii->inset->noFontChange() ?
+ bufferfont :
+ getFont(par, ii->pos);
+ MetricsInfo mi(bv(), font, w);
ii->inset->metrics(mi, dim);
}
// rebreak the paragraph
+ par.rows().clear();
+ Dimension dim;
+
par.setBeginOfBody();
pos_type z = 0;
do {
rowBreakPoint(pit, row);
setRowWidth(pit, row);
setHeightOfRow(pit, row);
- row.y_offset(par.height);
- par.rows.push_back(row);
- par.width = std::max(par.width, row.width());
- par.height += row.height();
+ par.rows().push_back(row);
+ dim.wid = std::max(dim.wid, row.width());
+ dim.des += row.height();
z = row.endpos();
} while (z < par.size());
- height_ += par.height;
- //lyxerr << "redoParagraph: " << par.rows.size() << " rows\n";
-}
-
-
-void LyXText::redoParagraphs(par_type pit, par_type end)
-{
- for (; pit != end; ++pit)
- redoParagraphInternal(pit);
- updateParPositions();
- updateCounters();
-}
+ // Make sure that if a par ends in newline, there is one more row
+ // under it
+ // FIXME this is a dirty trick. Now the _same_ position in the
+ // paragraph occurs in _two_ different rows, and has two different
+ // display positions, leading to weird behaviour when moving up/down.
+ if (z > 0 && par.isNewline(z - 1)) {
+ Row row(z - 1);
+ row.endpos(z - 1);
+ setRowWidth(pit, row);
+ setHeightOfRow(pit, row);
+ par.rows().push_back(row);
+ dim.des += row.height();
+ }
+ dim.asc += par.rows()[0].ascent();
+ dim.des -= par.rows()[0].ascent();
-void LyXText::redoParagraph(par_type pit)
-{
- redoParagraphInternal(pit);
- updateParPositions();
-}
+ bool const same = dim == par.dim();
+ par.dim() = dim;
+ //lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
-void LyXText::fullRebreak()
-{
- redoParagraphs(0, paragraphs().size());
- bv()->cursor().resetAnchor();
+ return !same;
}
if (mi.base.textwidth)
maxwidth_ = mi.base.textwidth;
//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
- //<< " maxWidth: " << maxwidth << "\nfont: " << mi.base.font
- //<< endl;
-
- // Rebuild row cache. This recomputes height as well.
- redoParagraphs(0, paragraphs().size());
+ // << " maxWidth: " << maxwidth_ << "\nfont: " << mi.base.font << endl;
+ // save the caller's font locally:
+ font_ = mi.base.font;
+
+ unsigned int h = 0;
+ unsigned int w = 0;
+ for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) {
+ redoParagraph(pit);
+ Paragraph & par = paragraphs()[pit];
+ h += par.height();
+ if (w < par.width())
+ w = par.width();
+ }
- width_ = maxParagraphWidth(paragraphs());
+ dim.wid = w;
+ dim.asc = pars_[0].ascent();
+ dim.des = h - dim.asc;
- // final dimension
- dim.asc = firstRow().ascent_of_text();
- dim.des = height_ - dim.asc;
- dim.wid = width_;
+ dim_ = dim;
}
// only used for inset right now. should also be used for main text
void LyXText::draw(PainterInfo & pi, int x, int y) const
{
- xo_ = x;
- yo_ = y;
- paintTextInset(*this, pi);
+ paintTextInset(*this, pi, x, y);
}
+#if 0
// only used for inset right now. should also be used for main text
-void LyXText::drawSelection(PainterInfo &, int, int) const
+void LyXText::drawSelection(PainterInfo & pi, int x , int) const
{
- //lyxerr << "LyXText::drawSelection at " << x << " " << y << endl;
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.text(), this))
+ return;
+
+ lyxerr << "draw selection at " << x << endl;
+
+ DocIterator beg = cur.selectionBegin();
+ DocIterator end = cur.selectionEnd();
+
+ // the selection doesn't touch the visible screen
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW
+ || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE)
+ return;
+
+ Paragraph const & par1 = pars_[beg.pit()];
+ Paragraph const & par2 = pars_[end.pit()];
+
+ Row const & row1 = par1.getRow(beg.pos(), beg.boundary());
+ Row const & row2 = par2.getRow(end.pos(), end.boundary());
+
+ int y1,x1,x2;
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_ABOVE) {
+ y1 = 0;
+ x1 = 0;
+ x2 = 0;
+ } else {
+ y1 = bv_funcs::getPos(beg).y_ - row1.ascent();
+ int const startx = cursorX(beg.top(), begin.boundary());
+ x1 = isRTL(par1) ? startx : 0;
+ x2 = isRTL(par1) ? 0 + dim_.wid : startx;
+ }
+
+ int y2,X1,X2;
+ if (bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_BELOW) {
+ y2 = pi.base.bv->workHeight();
+ X1 = 0;
+ X2 = 0;
+ } else {
+ y2 = bv_funcs::getPos(end).y_ + row2.descent();
+ int const endx = cursorX(end.top(), end.boundary());
+ X1 = isRTL(par2) ? 0 : endx;
+ X2 = isRTL(par2) ? endx : 0 + dim_.wid;
+ }
+
+ lyxerr << " y1: " << y1 << " y2: " << y2
+ << " xo: " << xo_ << " wid: " << dim_.wid
+ << endl;
+
+ // paint big rectangle in one go
+ pi.pain.fillRectangle(x, y1, dim_.wid, y2 - y1, LColor::selection);
+
+ // reset background at begin of first selected line
+ pi.pain.fillRectangle(x + x1, y1, x2 - x1, row1.height(),
+ LColor::background);
+
+ // reset background at end of last selected line
+ pi.pain.fillRectangle(x + X1, y2 - row2.height(),
+ X2 - X1, row2.height(), LColor::background);
}
+#else
-bool LyXText::isLastRow(par_type pit, Row const & row) const
+void LyXText::drawSelection(PainterInfo & pi, int x, int) const
+{
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.text(), this))
+ return;
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << "draw selection at " << x
+ << endl;
+
+ DocIterator beg = cur.selectionBegin();
+ DocIterator end = cur.selectionEnd();
+
+ // the selection doesn't touch the visible screen
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW
+ || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE)
+ return;
+
+ Paragraph const & par1 = pars_[beg.pit()];
+ Paragraph const & par2 = pars_[end.pit()];
+
+ bool const above = (bv_funcs::status(pi.base.bv, beg)
+ == bv_funcs::CUR_ABOVE);
+ bool const below = (bv_funcs::status(pi.base.bv, end)
+ == bv_funcs::CUR_BELOW);
+ int y1,y2,x1,x2;
+ if (above) {
+ y1 = 0;
+ y2 = 0;
+ x1 = 0;
+ x2 = dim_.wid;
+ } else {
+ Row const & row1 = par1.getRow(beg.pos(), beg.boundary());
+ y1 = bv_funcs::getPos(beg, beg.boundary()).y_ - row1.ascent();
+ y2 = y1 + row1.height();
+ int const startx = cursorX(beg.top(), beg.boundary());
+ x1 = !isRTL(par1) ? startx : 0;
+ x2 = !isRTL(par1) ? 0 + dim_.wid : startx;
+ }
+
+ int Y1,Y2,X1,X2;
+ if (below) {
+ Y1 = pi.base.bv->workHeight();
+ Y2 = pi.base.bv->workHeight();
+ X1 = 0;
+ X2 = dim_.wid;
+ } else {
+ Row const & row2 = par2.getRow(end.pos(), end.boundary());
+ Y1 = bv_funcs::getPos(end, end.boundary()).y_ - row2.ascent();
+ Y2 = Y1 + row2.height();
+ int const endx = cursorX(end.top(), end.boundary());
+ X1 = !isRTL(par2) ? 0 : endx;
+ X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
+ }
+
+ if (!above && !below && &par1.getRow(beg.pos(), beg.boundary())
+ == &par2.getRow(end.pos(), end.boundary()))
+ {
+ // paint only one rectangle
+ int const b( !isRTL(par1) ? x + x1 : x + X1 );
+ int const w( !isRTL(par1) ? X2 - x1 : x2 - X1 );
+ pi.pain.fillRectangle(b, y1, w, y2 - y1, LColor::selection);
+ return;
+ }
+
+ lyxerr[Debug::DEBUG] << " y1: " << y1 << " y2: " << y2
+ << "X1:" << X1 << " x2: " << X2 << " wid: " << dim_.wid
+ << endl;
+
+ // paint upper rectangle
+ pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,
+ LColor::selection);
+ // paint bottom rectangle
+ pi.pain.fillRectangle(x + X1, Y1, X2 - X1, Y2 - Y1,
+ LColor::selection);
+ // paint center rectangle
+ pi.pain.fillRectangle(x, y2, dim_.wid,
+ Y1 - y2, LColor::selection);
+}
+#endif
+
+bool LyXText::isLastRow(pit_type pit, Row const & row) const
{
return row.endpos() >= pars_[pit].size()
- && pit + 1 == par_type(paragraphs().size());
+ && pit + 1 == pit_type(paragraphs().size());
}
-bool LyXText::isFirstRow(par_type pit, Row const & row) const
+bool LyXText::isFirstRow(pit_type pit, Row const & row) const
{
return row.pos() == 0 && pit == 0;
}
void LyXText::getWord(CursorSlice & from, CursorSlice & to,
word_location const loc)
{
- Paragraph const & from_par = pars_[from.par()];
+ Paragraph const & from_par = pars_[from.pit()];
switch (loc) {
case lyx::WHOLE_WORD_STRICT:
if (from.pos() == 0 || from.pos() == from_par.size()
- || !from_par.isWord(from.pos())
- || !from_par.isWord(from.pos() - 1)) {
+ || !from_par.isLetter(from.pos())
+ || !from_par.isLetter(from.pos() - 1)) {
to = from;
return;
}
case lyx::WHOLE_WORD:
// If we are already at the beginning of a word, do nothing
- if (!from.pos() || !from_par.isWord(from.pos() - 1))
+ if (!from.pos() || !from_par.isLetter(from.pos() - 1))
break;
// no break here, we go to the next
case lyx::PREVIOUS_WORD:
// always move the cursor to the beginning of previous word
- while (from.pos() && from_par.isWord(from.pos() - 1))
+ while (from.pos() && from_par.isLetter(from.pos() - 1))
--from.pos();
break;
case lyx::NEXT_WORD:
break;
}
to = from;
- Paragraph & to_par = pars_[to.par()];
- while (to.pos() < to_par.size() && to_par.isWord(to.pos()))
+ Paragraph & to_par = pars_[to.pit()];
+ while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
++to.pos();
}
bool LyXText::read(Buffer const & buf, LyXLex & lex)
{
- static Change current_change;
-
Paragraph::depth_type depth = 0;
while (lex.isOK()) {
int LyXText::ascent() const
{
- return firstRow().ascent_of_text();
+ return dim_.asc;
}
int LyXText::descent() const
{
- return height_ - firstRow().ascent_of_text();
+ return dim_.des;
}
-int LyXText::cursorX(CursorSlice const & cur) const
+int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
{
- par_type const pit = cur.par();
+ pit_type const pit = sl.pit();
Paragraph const & par = pars_[pit];
- if (par.rows.empty())
- return xo_;
+ if (par.rows().empty())
+ return 0;
- Row const & row = *par.getRow(cur.pos());
+ pos_type ppos = sl.pos();
+ // Correct position in front of big insets
+ bool const boundary_correction = ppos != 0 && boundary;
+ if (boundary_correction)
+ --ppos;
+
+ Row const & row = par.getRow(sl.pos(), boundary);
- pos_type pos = cur.pos();
pos_type cursor_vpos = 0;
RowMetrics const m = computeRowMetrics(pit, row);
if (end <= row_pos)
cursor_vpos = row_pos;
- else if (pos >= end)
+ else if (ppos >= end)
cursor_vpos = isRTL(par) ? row_pos : end;
- else if (pos > row_pos && pos >= end)
+ else if (ppos > row_pos && ppos >= end)
// Place cursor after char at (logical) position pos - 1
- cursor_vpos = (bidi.level(pos - 1) % 2 == 0)
- ? bidi.log2vis(pos - 1) + 1 : bidi.log2vis(pos - 1);
+ cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
+ ? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
else
- // Place cursor before char at (logical) position pos
- cursor_vpos = (bidi.level(pos) % 2 == 0)
- ? bidi.log2vis(pos) : bidi.log2vis(pos) + 1;
+ // Place cursor before char at (logical) position ppos
+ cursor_vpos = (bidi.level(ppos) % 2 == 0)
+ ? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1;
pos_type body_pos = par.beginOfBody();
if (body_pos > 0 &&
(body_pos > end || !par.isLineSeparator(body_pos - 1)))
body_pos = 0;
+ // Use font span to speed things up, see below
+ FontSpan font_span;
+ LyXFont font;
+
for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
pos_type pos = bidi.vis2log(vpos);
if (body_pos > 0 && pos == body_pos - 1) {
x -= singleWidth(par, body_pos - 1);
}
- if (hfillExpansion(par, row, pos)) {
- x += singleWidth(par, pos);
- if (pos >= body_pos)
- x += m.hfill;
- else
- x += m.label_hfill;
- } else if (par.isSeparator(pos)) {
- x += singleWidth(par, pos);
- if (pos >= body_pos)
- x += m.separator;
- } else
- x += singleWidth(par, pos);
- }
- return xo_ + int(x);
+ // Use font span to speed things up, see above
+ if (pos < font_span.first || pos > font_span.last) {
+ font_span = par.fontSpan(pos);
+ font = getFont(par, pos);
+ }
+
+ x += singleWidth(par, pos, par.getChar(pos), font);
+
+ if (hfillExpansion(par, row, pos))
+ x += (pos >= body_pos) ? m.hfill : m.label_hfill;
+ else if (par.isSeparator(pos) && pos >= body_pos)
+ x += m.separator;
+ }
+
+ // see correction above
+ if (boundary_correction)
+ if (getFont(par, ppos).isVisibleRightToLeft())
+ x -= singleWidth(par, ppos);
+ else
+ x += singleWidth(par, ppos);
+
+ // Make sure inside an inset we always count from the left
+ // edge (bidi!) -- MV
+ if (sl.pos() < par.size()) {
+ font = getFont(par, sl.pos());
+ if (!boundary && font.isVisibleRightToLeft()
+ && par.isInset(sl.pos()))
+ x -= par.getInset(sl.pos())->width();
+ }
+ return int(x);
}
-int LyXText::cursorY(CursorSlice const & cur) const
+int LyXText::cursorY(CursorSlice const & sl, bool boundary) const
{
- Paragraph const & par = getPar(cur.par());
- Row const & row = *par.getRow(cur.pos());
- return yo_ + par.y + row.y_offset() + row.baseline();
+ //lyxerr << "LyXText::cursorY: boundary: " << boundary << std::endl;
+ Paragraph const & par = getPar(sl.pit());
+ int h = 0;
+ h -= pars_[0].rows()[0].ascent();
+ for (pit_type pit = 0; pit < sl.pit(); ++pit)
+ h += pars_[pit].height();
+ int pos = sl.pos();
+ if (pos && boundary)
+ --pos;
+ size_t const rend = par.pos2row(pos);
+ for (size_t rit = 0; rit != rend; ++rit)
+ h += par.rows()[rit].height();
+ h += par.rows()[rend].ascent();
+ return h;
}
std::ostringstream os;
bool const show_change = buf.params().tracking_changes
- && cur.pos() != cur.lastpos()
&& par.lookupChange(cur.pos()) != Change::UNCHANGED;
+ if (buf.params().tracking_changes)
+ os << "[C] ";
+
if (show_change) {
Change change = par.lookupChangeFull(cur.pos());
Author const & a = buf.params().authors().get(change.author);
// I think we should only show changes from the default
// font. (Asger)
+ // No, from the document font (MV)
LyXFont font = real_current_font;
- font.reduce(buf.params().getLyXTextClass().defaultfont());
+ font.reduce(buf.params().getFont());
// avoid _(...) re-entrance problem
string const s = font.stateText(&buf.params());
// The paragraph depth
int depth = cur.paragraph().getDepth();
if (depth > 0)
- os << bformat(_(", Depth: %1$s"), tostr(depth));
+ os << bformat(_(", Depth: %1$d"), depth);
// The paragraph spacing, but only if different from
// buffer spacing.
os << _("Double");
break;
case Spacing::Other:
- os << _("Other (") << spacing.getValue() << ')';
+ os << _("Other (") << spacing.getValueAsString() << ')';
break;
case Spacing::Default:
// should never happen, do nothing
#ifdef DEVEL_VERSION
os << _(", Inset: ") << &cur.inset();
- os << _(", Paragraph: ") << cur.par();
+ os << _(", Paragraph: ") << cur.pit();
os << _(", Id: ") << par.id();
os << _(", Position: ") << cur.pos();
- Row & row = cur.textRow();
- os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
+ os << _(", Boundary: ") << cur.boundary();
+// Row & row = cur.textRow();
+// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
#endif
return os.str();
}
string LyXText::getPossibleLabel(LCursor & cur) const
{
- par_type pit = cur.par();
+ pit_type pit = cur.pit();
LyXLayout_ptr layout = pars_[pit].layout();
}
}
- string text = layout->latexname().substr(0, 3);
- if (layout->latexname() == "theorem")
+ string name = layout->latexname();
+
+ // for captions, we want the abbreviation of the float type
+ if (layout->labeltype == LABEL_SENSITIVE) {
+ // Search for the first float or wrap inset in the iterator
+ size_t i = cur.depth();
+ while (i > 0) {
+ --i;
+ InsetBase * const in = &cur[i].inset();
+ if (in->lyxCode() == InsetBase::FLOAT_CODE
+ || in->lyxCode() == InsetBase::WRAP_CODE) {
+ name = in->getInsetName();
+ break;
+ }
+ }
+ }
+
+ string text = name.substr(0, 3);
+ if (name == "theorem")
text = "thm"; // Create a correct prefix for prettyref
text += ':';
}
-// Manhattan distance to nearest corner
-int LyXText::dist(int x, int y) const
+//pos_type LyXText::x2pos(pit_type pit, int row, int x) const
+//{
+// int lastx = 0;
+// int currx = 0;
+// Paragraph const & par = pars_[pit];
+// Row const & r = par.rows()[row];
+// int pos = r.pos();
+// for (; currx < x && pos < r.endpos(); ++pos) {
+// lastx = currx;
+// currx += singleWidth(par, pos);
+// }
+// if (abs(lastx - x) < abs(currx - x) && pos != r.pos())
+// --pos;
+// return pos;
+//}
+
+
+pos_type LyXText::x2pos(pit_type pit, int row, int x) const
{
- int xx = 0;
- int yy = 0;
-
- if (x < xo_)
- xx = xo_ - x;
- else if (x > xo_ + int(width_))
- xx = x - xo_ - width_;
-
- if (y < yo_ - ascent())
- yy = yo_ - ascent() - y;
- else if (y > yo_ + descent())
- yy = y - yo_ - descent();
-
- lyxerr << " xo_=" << xo_ << " yo_=" << yo_
- << " width_=" << width_ << " ascent=" << ascent()
- << " descent=" << descent()
- << " dist=" << xx+yy <<endl;
- return xx + yy;
+ BOOST_ASSERT(row < int(pars_[pit].rows().size()));
+ bool bound = false;
+ Row const & r = pars_[pit].rows()[row];
+ return r.pos() + getColumnNearX(pit, r, x, bound);
+}
+
+
+//int LyXText::pos2x(pit_type pit, pos_type pos) const
+//{
+// Paragraph const & par = pars_[pit];
+// Row const & r = par.rows()[row];
+// int x = 0;
+// pos -= r.pos();
+//}
+
+
+// x,y are screen coordinates
+// sets cursor only within this LyXText
+bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
+{
+ pit_type pit = getPitNearY(y);
+ int yy = theCoords.get(this, pit).y_ - pars_[pit].ascent();
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": x: " << x
+ << " y: " << y
+ << " pit: " << pit
+ << " yy: " << yy << endl;
+
+ Paragraph const & par = pars_[pit];
+ int r = 0;
+ BOOST_ASSERT(par.rows().size());
+ for (; r < int(par.rows().size()) - 1; ++r) {
+ Row const & row = par.rows()[r];
+ if (int(yy + row.height()) > y)
+ break;
+ yy += row.height();
+ }
+
+ Row const & row = par.rows()[r];
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": row " << r
+ << " from pos: " << row.pos()
+ << endl;
+
+ bool bound = false;
+ int xx = x;
+ pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": setting cursor pit: " << pit
+ << " pos: " << pos
+ << endl;
+
+ return setCursor(cur, pit, pos, true, bound);
}