#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "pariterator.h"
#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include <sstream>
+using lyx::docstring;
+using lyx::char_type;
using lyx::pit_type;
using lyx::pos_type;
using lyx::word_location;
using lyx::support::uppercase;
using lyx::cap::cutSelection;
+using lyx::cap::pasteParagraphList;
using std::auto_ptr;
using std::advance;
int numberOfHfills(Paragraph const & par, Row const & row)
{
- pos_type const last = row.endpos() - 1;
+ pos_type const last = row.endpos();
pos_type first = row.pos();
// hfill *DO* count at the beginning of paragraphs!
void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
- string const & token, LyXFont & font, Change & change)
+ string const & token, LyXFont & font, Change & change, ErrorList & errorList)
{
BufferParams const & bp = buf.params();
if (token[0] != '\\') {
+#if 0
string::const_iterator cit = token.begin();
for (; cit != token.end(); ++cit)
par.insertChar(par.size(), (*cit), font, change);
+#else
+ lyx::docstring dstr = lex.getDocString();
+ lyx::docstring::const_iterator cit = dstr.begin();
+ lyx::docstring::const_iterator cend = dstr.end();
+ for (; cit != cend; ++cit)
+ par.insertChar(par.size(), *cit, font, change);
+#endif
} else if (token == "\\begin_layout") {
lex.eatLine();
string layoutname = lex.getString();
bool hasLayout = tclass.hasLayout(layoutname);
if (!hasLayout) {
- buf.error(ErrorItem(_("Unknown layout"),
+ errorList.push_back(ErrorItem(_("Unknown layout"),
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()));
+ lyx::from_utf8(layoutname), lyx::from_utf8(tclass.name())), par.id(), 0, par.size()));
layoutname = tclass.defaultLayoutName();
}
} else if (token == "\\end_layout") {
lyxerr << BOOST_CURRENT_FUNCTION
- << ": Solitary \\end_layout in line "
- << lex.getLineNo() << "\n"
+ << ": Solitary \\end_layout in line "
+ << lex.getLineNo() << "\n"
<< "Missing \\begin_layout?.\n";
} else if (token == "\\end_inset") {
lyxerr << BOOST_CURRENT_FUNCTION
- << ": Solitary \\end_inset in line "
- << lex.getLineNo() << "\n"
+ << ": Solitary \\end_inset in line "
+ << lex.getLineNo() << "\n"
<< "Missing \\begin_inset?.\n";
} else if (token == "\\begin_inset") {
InsetBase * inset = readInset(lex, buf);
par.insertInset(par.size(), inset, font, change);
else {
lex.eatLine();
- string line = lex.getString();
- buf.error(ErrorItem(_("Unknown Inset"), line,
+ docstring line = lyx::from_utf8(lex.getString());
+ errorList.push_back(ErrorItem(_("Unknown Inset"), line,
par.id(), 0, par.size()));
}
} else if (token == "\\family") {
} else if (token == "\\change_inserted") {
lex.eatLine();
std::istringstream is(lex.getString());
- int aid;
+ unsigned int aid;
lyx::time_type ct;
is >> aid >> ct;
- change = Change(Change::INSERTED, bp.author_map[aid], ct);
+ if (aid >= bp.author_map.size()) {
+ errorList.push_back(ErrorItem(_("Change tracking error"),
+ bformat(_("Unknown author index for insertion: %1$d\n"), aid),
+ par.id(), 0, par.size()));
+
+ change = Change(Change::UNCHANGED);
+ } else
+ change = Change(Change::INSERTED, bp.author_map[aid], ct);
} else if (token == "\\change_deleted") {
lex.eatLine();
std::istringstream is(lex.getString());
- int aid;
+ unsigned int aid;
lyx::time_type ct;
is >> aid >> ct;
- change = Change(Change::DELETED, bp.author_map[aid], ct);
+ if (aid >= bp.author_map.size()) {
+ errorList.push_back(ErrorItem(_("Change tracking error"),
+ bformat(_("Unknown author index for deletion: %1$d\n"), aid),
+ par.id(), 0, par.size()));
+
+ change = Change(Change::UNCHANGED);
+ } else
+ change = Change(Change::DELETED, bp.author_map[aid], ct);
} else {
lex.eatLine();
- buf.error(ErrorItem(_("Unknown token"),
- bformat(_("Unknown token: %1$s %2$s\n"), token, lex.getString()),
+ errorList.push_back(ErrorItem(_("Unknown token"),
+ bformat(_("Unknown token: %1$s %2$s\n"), lyx::from_utf8(token),
+ lyx::from_utf8(lex.getString())),
par.id(), 0, par.size()));
}
}
-void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
+void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex, ErrorList & errorList)
{
lex.nextToken();
string token = lex.getString();
while (lex.isOK()) {
- readParToken(buf, par, lex, token, font, change);
+ readParToken(buf, par, lex, token, font, change, errorList);
lex.nextToken();
token = lex.getString();
}
}
// Final change goes to paragraph break:
- par.setChangeFull(par.size(), change);
-
+ par.setChange(par.size(), change);
+
// Initialize begin_of_body_ on load; redoParagraph maintains
par.setBeginOfBody();
}
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
{
// The most common case is handled first (Asger)
- if (IsPrintable(c)) {
+ if (isPrintable(c)) {
Language const * language = font.language();
- if (language->RightToLeft()) {
+ if (language->rightToLeft()) {
if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
lyxrc.font_norm_type == LyXRC::ISO_10646_1)
&& language->lang() == "arabic") {
- if (Encodings::IsComposeChar_arabic(c))
+ if (Encodings::isComposeChar_arabic(c))
return 0;
c = par.transformChar(c, pos);
} else if (language->lang() == "hebrew" &&
- Encodings::IsComposeChar_hebrew(c))
+ Encodings::isComposeChar_hebrew(c))
return 0;
}
return font_metrics::width(c, font);
BOOST_ASSERT(pos >= 0);
BOOST_ASSERT(pos <= par.size());
//lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl;
- LyXTextClass const & tclass =
- bv()->buffer()->params().getLyXTextClass();
+ BufferParams const & params = bv()->buffer()->params();
+ LyXTextClass const & tclass = params.getLyXTextClass();
LyXLayout_ptr const & layout = par.layout();
string parindent = layout->parindent;
if (isMainText())
l_margin += changebarMargin();
- l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
+ string leftm = tclass.leftmargin();
+ docstring dleft(leftm.begin(), leftm.end());
+ l_margin += font_metrics::signedWidth(dleft, params.getFont());
if (par.getDepth() != 0) {
// find the next level paragraph
LyXFont const labelfont = getLabelFont(par);
switch (layout->margintype) {
case MARGIN_DYNAMIC:
- if (!layout->leftmargin.empty())
- l_margin += font_metrics::signedWidth(layout->leftmargin,
- tclass.defaultfont());
+ if (!layout->leftmargin.empty()) {
+ string leftm = layout->leftmargin;
+ docstring dleft(leftm.begin(), leftm.end());
+ l_margin += font_metrics::signedWidth(dleft,
+ params.getFont());
+ }
if (!par.getLabelstring().empty()) {
- l_margin += font_metrics::signedWidth(layout->labelindent,
+ string labin = layout->labelindent;
+ docstring dlabin(labin.begin(), labin.end());
+ l_margin += font_metrics::signedWidth(dlabin,
labelfont);
- l_margin += font_metrics::width(par.getLabelstring(),
+ string labstr = par.getLabelstring();
+ docstring dlabstr(labstr.begin(), labstr.end());
+ l_margin += font_metrics::width(dlabstr,
labelfont);
- l_margin += font_metrics::width(layout->labelsep, labelfont);
+ string labsep = layout->labelsep;
+ docstring dlabsep(labsep.begin(), labsep.end());
+ l_margin += font_metrics::width(dlabsep, labelfont);
}
break;
- case MARGIN_MANUAL:
- l_margin += font_metrics::signedWidth(layout->labelindent, labelfont);
+ case MARGIN_MANUAL: {
+ string labin = layout->labelindent;
+ docstring dlabin(labin.begin(), labin.end());
+ l_margin += font_metrics::signedWidth(dlabin, labelfont);
// The width of an empty par, even with manual label, should be 0
if (!par.empty() && pos >= par.beginOfBody()) {
if (!par.getLabelWidthString().empty()) {
- l_margin += font_metrics::width(par.getLabelWidthString(),
+ string labstr = par.getLabelWidthString();
+ docstring dlabstr(labstr.begin(), labstr.end());
+ l_margin += font_metrics::width(dlabstr,
labelfont);
- l_margin += font_metrics::width(layout->labelsep, labelfont);
+ string labsep = layout->labelsep;
+ docstring dlabsep(labsep.begin(), labsep.end());
+ l_margin += font_metrics::width(dlabsep, labelfont);
}
}
break;
+ }
- case MARGIN_STATIC:
- l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
+ case MARGIN_STATIC: {
+ string leftm = layout->leftmargin;
+ docstring dleft(leftm.begin(), leftm.end());
+ l_margin += font_metrics::signedWidth(dleft, params.getFont()) * 4
/ (par.getDepth() + 4);
break;
+ }
case MARGIN_FIRST_DYNAMIC:
if (layout->labeltype == LABEL_MANUAL) {
if (pos >= par.beginOfBody()) {
- l_margin += font_metrics::signedWidth(layout->leftmargin,
+ string leftm = layout->leftmargin;
+ docstring dleft(leftm.begin(), leftm.end());
+ l_margin += font_metrics::signedWidth(dleft,
labelfont);
} else {
- l_margin += font_metrics::signedWidth(layout->labelindent,
+ string labin = layout->labelindent;
+ docstring dlabin(labin.begin(), labin.end());
+ l_margin += font_metrics::signedWidth(dlabin,
labelfont);
}
} else if (pos != 0
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
&& !isFirstInSequence(pit, pars_))) {
- l_margin += font_metrics::signedWidth(layout->leftmargin,
+ string leftm = layout->leftmargin;
+ docstring dleft(leftm.begin(), leftm.end());
+ l_margin += font_metrics::signedWidth(dleft,
labelfont);
} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
&& layout->labeltype != LABEL_BIBLIO
&& layout->labeltype !=
LABEL_CENTERED_TOP_ENVIRONMENT) {
- l_margin += font_metrics::signedWidth(layout->labelindent,
+ string labin = layout->labelindent;
+ docstring dlabin(labin.begin(), labin.end());
+ l_margin += font_metrics::signedWidth(dlabin,
labelfont);
- l_margin += font_metrics::width(layout->labelsep, labelfont);
- l_margin += font_metrics::width(par.getLabelstring(),
- labelfont);
+ string labsep = layout->labelsep;
+ docstring dlabsep(labsep.begin(), labsep.end());
+ l_margin += font_metrics::width(dlabsep, labelfont);
+ string labstr = par.getLabelstring();
+ docstring dlabstr(labstr.begin(), labstr.end());
+ l_margin += font_metrics::width(dlabstr, labelfont);
}
break;
if (rit->fill() < minfill)
minfill = rit->fill();
l_margin += font_metrics::signedWidth(layout->leftmargin,
- tclass.defaultfont());
+ params.getFont());
l_margin += minfill;
#endif
// also wrong, but much shorter.
|| 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 some insets, paragraphs are never indented
&& 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());
+ docstring din(parindent.begin(), parindent.end());
+ l_margin += font_metrics::signedWidth(din, params.getFont());
}
return l_margin;
int LyXText::rightMargin(Paragraph const & par) const
{
+ // FIXME: the correct way is to only call rightMargin() only
+ // within the main LyXText. The following test is thus bogus.
+ LyXText const & text = bv()->buffer()->text();
// We do not want rightmargins on inner texts.
- if (bv()->text() != this)
+ if (&text != this)
return 0;
- LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
+ BufferParams const & params = bv()->buffer()->params();
+ LyXTextClass const & tclass = params.getLyXTextClass();
+ string trmarg = tclass.rightmargin();
+ docstring dtrmarg(trmarg.begin(), trmarg.end());
+ string lrmarg = par.layout()->rightmargin;
+ docstring dlrmarg(lrmarg.begin(), lrmarg.end());
int const r_margin =
::rightMargin()
- + font_metrics::signedWidth(tclass.rightmargin(),
- tclass.defaultfont())
- + font_metrics::signedWidth(par.layout()->rightmargin,
- tclass.defaultfont())
+ + font_metrics::signedWidth(dtrmarg,
+ params.getFont())
+ + font_metrics::signedWidth(dlrmarg,
+ params.getFont())
* 4 / (par.getDepth() + 4);
return r_margin;
pos_type point = end;
pos_type i = pos;
for ( ; i < end; ++i, ++fi) {
- char const c = par.getChar(i);
+ char_type 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));
+ string lsep = layout->labelsep;
+ docstring dlsep(lsep.begin(), lsep.end());
+ int add = font_metrics::width(dlsep, getLabelFont(par));
if (par.isLineSeparator(i - 1))
add -= singleWidth(par, i - 1);
Paragraph const & par = pars_[pit];
string const & labelsep = par.layout()->labelsep;
+ docstring dlsep(labelsep.begin(), labelsep.end());
int w = leftMargin(pit, row.pos());
pos_type const body_pos = par.beginOfBody();
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 += font_metrics::width(dlsep, getLabelFont(par));
if (par.isLineSeparator(i - 1))
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);
}
}
if (body_pos > 0 && body_pos >= end) {
- w += font_metrics::width(labelsep, getLabelFont(par));
+ w += font_metrics::width(dlsep, getLabelFont(par));
if (end > 0 && par.isLineSeparator(end - 1))
w -= singleWidth(par, end - 1);
w = max(w, labelEnd(pit));
if (label.empty())
return 0;
- return max(0, font_metrics::width(label, getLabelFont(par)) - w);
+ docstring dlab(label.begin(), label.end());
+ return max(0, font_metrics::width(dlab, getLabelFont(par)) - w);
}
&& 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 (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
maxasc += int(layoutasc * 2 / (2 + pars_[pit].getDepth()));
maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth()));
+ // FIXME: the correct way is to do the following is to move the
+ // following code in another method specially tailored for the
+ // main LyXText. The following test is thus bogus.
+ LyXText const & text = bv_owner->buffer()->text();
// Top and bottom margin of the document (only at top-level)
- if (bv_owner->text() == this) {
+ if (&text == this) {
if (pit == 0 && row.pos() == 0)
maxasc += 20;
if (pit + 1 == pit_type(pars_.size()) &&
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
pars_[next_par].erase(0);
- updateCounters(cur.buffer());
+ ParIterator current_it(cur);
+ ParIterator last_it(cur);
+ ++last_it;
+ ++last_it;
+
+ updateLabels(cur.buffer(), current_it, last_it);
// Mark "carriage return" as inserted if change tracking:
if (cur.buffer().params().tracking_changes) {
- cur.paragraph().setChange(cur.paragraph().size(),
+ cur.paragraph().setChange(cur.paragraph().size(),
Change::INSERTED);
}
// 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);
par.isFreeSpacing();
if (lyxrc.auto_number) {
- static string const number_operators = "+-/*";
- static string const number_unary_operators = "+-";
- static string const number_seperators = ".,:";
+ static docstring const number_operators = lyx::from_ascii("+-/*");
+ static docstring const number_unary_operators = lyx::from_ascii("+-");
+ static docstring const number_seperators = lyx::from_ascii(".,:");
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)
// 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."));
+ "beginning of a paragraph. Please read the Tutorial."));
sent_space_message = true;
}
return;
static bool sent_space_message = false;
if (!sent_space_message) {
cur.message(_("You cannot type two spaces this way. "
- "Please read the Tutorial."));
+ "Please read the Tutorial."));
sent_space_message = true;
}
return;
if (body_pos > 0
&& (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
- result.x += font_metrics::width(layout->labelsep, getLabelFont(par));
+ string lsep = layout->labelsep;
+ docstring dlsep(lsep.begin(), lsep.end());
+ result.x += font_metrics::width(dlsep, getLabelFont(par));
if (body_pos <= end)
result.x += result.label_hfill;
}
return;
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());
+ Change::Type const type = pars_[pit].lookupChange(it.pos()).type;
for (; pit <= et.pit(); ++pit) {
pos_type left = ( pit == it.pit() ? it.pos() : 0 );
- pos_type right =
+ pos_type right =
( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
pars_[pit].acceptChange(left, right);
}
if (type == Change::DELETED) {
ParagraphList & plist = paragraphs();
if (it.pit() + 1 < et.pit())
- pars_.erase(plist.begin() + it.pit() + 1,
- plist.begin() + 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())
+ if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
== Change::DELETED) {
setCursorIntern(cur, it.pit() + 1, 0);
backspacePos0(cur);
DocIterator it = cur.selectionBegin();
DocIterator et = cur.selectionEnd();
pit_type pit = it.pit();
- Change::Type const type = pars_[pit].lookupChange(it.pos());
+ Change::Type const type = pars_[pit].lookupChange(it.pos()).type;
for (; pit <= et.pit(); ++pit) {
pos_type left = ( pit == it.pit() ? it.pos() : 0 );
- pos_type right =
+ pos_type right =
( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
pars_[pit].rejectChange(left, right);
}
if (type == Change::INSERTED) {
ParagraphList & plist = paragraphs();
if (it.pit() + 1 < et.pit())
- pars_.erase(plist.begin() + it.pit() + 1,
- plist.begin() + 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())
+ if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
== Change::INSERTED) {
setCursorIntern(cur, it.pit() + 1, 0);
backspacePos0(cur);
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:
}
-bool LyXText::Delete(LCursor & cur)
+bool LyXText::erase(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
bool needsUpdate = false;
recordUndo(cur, Undo::DELETE, cur.pit());
setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
needsUpdate = backspace(cur);
- Paragraph & par = cur.paragraph();
- if (cur.pos() < par.size()
- && par.lookupChange(cur.pos()) == Change::DELETED)
+ 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);
+ 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());
}
- }
+ } else
+ needsUpdate = dissolveInset(cur);
+
return needsUpdate;
}
BufferParams const & bparams = buf.params();
par.layout(bparams.getLyXTextClass().defaultLayout());
}
-
+
cursorLeft(cur);
return true;
}
if (cpit != tmppit
&& (pars_[cpit].layout() == pars_[tmppit].layout()
- || pars_[tmppit].layout() == tclass.defaultLayout()))
+ || pars_[tmppit].layout() == tclass.defaultLayout()))
{
mergeParagraph(bufparams, pars_, cpit);
needsUpdate = true;
--cur.pos();
// the counters may have changed
- updateCounters(cur.buffer());
+ ParIterator par_it(cur);
+ updateLabels(cur.buffer(), par_it);
+
setCursor(cur, cur.pit(), cur.pos(), false);
}
return needsUpdate;
BOOST_ASSERT(this == cur.text());
bool needsUpdate = false;
if (cur.pos() == 0) {
+ if (cur.pit() == 0)
+ return dissolveInset(cur);
+
// The cursor is at the beginning of a paragraph, so
// the the backspace will collapse two paragraphs into
// one.
- if (cur.buffer().params().tracking_changes) {
+ if (cur.pit() != 0 && cur.buffer().params().tracking_changes) {
// Previous paragraph, mark "carriage return" as
// deleted:
Paragraph & par = pars_[cur.pit() - 1];
}
+bool LyXText::dissolveInset(LCursor & cur) {
+ BOOST_ASSERT(this == cur.text());
+
+ if (isMainText() || cur.inset().nargs() != 1)
+ return false;
+
+ recordUndoInset(cur);
+ cur.selHandle(false);
+ // save position
+ lyx::pos_type spos = cur.pos();
+ lyx::pit_type spit = cur.pit();
+ ParagraphList plist;
+ if (cur.lastpit() != 0 || cur.lastpos() != 0)
+ plist = paragraphs();
+ cur.popLeft();
+ // store cursor offset
+ if (spit == 0)
+ spos += cur.pos();
+ spit += cur.pit();
+ cur.paragraph().erase(cur.pos());
+ if (!plist.empty()) {
+ Buffer & b = cur.buffer();
+ pasteParagraphList(cur, plist, b.params().textclass,
+ b.errorList("Paste"));
+ // restore position
+ cur.pit() = std::min(cur.lastpit(), spit);
+ cur.pos() = std::min(cur.lastpos(), spos);
+ }
+ cur.clearSelection();
+ cur.resetAnchor();
+ return true;
+}
+
+
Row const & LyXText::firstRow() const
{
return *paragraphs().front().rows().begin();
// 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)
+ if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
hasbibitem = true;
}
if (!hasbibitem) {
par.rows().push_back(row);
dim.des += row.height();
}
-
+
dim.asc += par.rows()[0].ascent();
dim.des -= par.rows()[0].ascent();
return;
lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << "draw selection at " << x
- << endl;
+ << BOOST_CURRENT_FUNCTION
+ << "draw selection at " << x
+ << endl;
DocIterator beg = cur.selectionBegin();
DocIterator end = cur.selectionEnd();
}
-bool LyXText::read(Buffer const & buf, LyXLex & lex)
+bool LyXText::read(Buffer const & buf, LyXLex & lex, ErrorList & errorList)
{
Paragraph::depth_type depth = 0;
// FIXME: goddamn InsetTabular makes us pass a Buffer
// not BufferParams
- ::readParagraph(buf, pars_.back(), lex);
+ ::readParagraph(buf, pars_.back(), lex, errorList);
} else if (token == "\\begin_deeper") {
++depth;
for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
pos_type pos = bidi.vis2log(vpos);
if (body_pos > 0 && pos == body_pos - 1) {
+ string lsep = par.layout()->labelsep;
+ docstring dlsep(lsep.begin(), lsep.end());
x += m.label_hfill
- + font_metrics::width(par.layout()->labelsep,
+ + font_metrics::width(dlsep,
getLabelFont(par));
if (par.isLineSeparator(body_pos - 1))
x -= singleWidth(par, body_pos - 1);
else if (par.isSeparator(pos) && pos >= body_pos)
x += m.separator;
}
-
+
// see correction above
if (boundary_correction)
if (getFont(par, ppos).isVisibleRightToLeft())
if (!boundary && font.isVisibleRightToLeft()
&& par.isInset(sl.pos()))
x -= par.getInset(sl.pos())->width();
- }
+ }
return int(x);
}
{
//lyxerr << "LyXText::cursorY: boundary: " << boundary << std::endl;
Paragraph const & par = getPar(sl.pit());
+ if (par.rows().empty())
+ return 0;
+
int h = 0;
h -= pars_[0].rows()[0].ascent();
for (pit_type pit = 0; pit < sl.pit(); ++pit)
os << "[C] ";
if (show_change) {
- Change change = par.lookupChangeFull(cur.pos());
+ Change change = par.lookupChange(cur.pos());
Author const & a = buf.params().authors().get(change.author);
- os << _("Change: ") << a.name();
+ os << lyx::to_utf8(_("Change: ")) << a.name();
if (!a.email().empty())
os << " (" << a.email() << ")";
if (change.changetime)
- os << _(" at ") << ctime(&change.changetime);
+ os << lyx::to_utf8(_(" at ")) << ctime(&change.changetime);
os << " : ";
}
LyXFont font = real_current_font;
font.reduce(buf.params().getFont());
- // avoid _(...) re-entrance problem
+ // avoid lyx::to_utf8(_(...)) re-entrance problem
string const s = font.stateText(&buf.params());
- os << bformat(_("Font: %1$s"), s);
+ os << lyx::to_utf8(bformat(_("Font: %1$s"), lyx::from_utf8(s)));
- // os << bformat(_("Font: %1$s"), font.stateText(&buf.params));
+ // os << lyx::to_utf8(bformat(_("Font: %1$s"), font.stateText(&buf.params)));
// The paragraph depth
int depth = cur.paragraph().getDepth();
if (depth > 0)
- os << bformat(_(", Depth: %1$d"), depth);
+ os << lyx::to_utf8(bformat(_(", Depth: %1$d"), depth));
// The paragraph spacing, but only if different from
// buffer spacing.
Spacing const & spacing = par.params().spacing();
if (!spacing.isDefault()) {
- os << _(", Spacing: ");
+ os << lyx::to_utf8(_(", Spacing: "));
switch (spacing.getSpace()) {
case Spacing::Single:
- os << _("Single");
+ os << lyx::to_utf8(_("Single"));
break;
case Spacing::Onehalf:
- os << _("OneHalf");
+ os << lyx::to_utf8(_("OneHalf"));
break;
case Spacing::Double:
- os << _("Double");
+ os << lyx::to_utf8(_("Double"));
break;
case Spacing::Other:
- os << _("Other (") << spacing.getValueAsString() << ')';
+ os << lyx::to_utf8(_("Other (")) << spacing.getValueAsString() << ')';
break;
case Spacing::Default:
// should never happen, do nothing
}
#ifdef DEVEL_VERSION
- os << _(", Inset: ") << &cur.inset();
- os << _(", Paragraph: ") << cur.pit();
- os << _(", Id: ") << par.id();
- os << _(", Position: ") << cur.pos();
- os << _(", Boundary: ") << cur.boundary();
+ os << lyx::to_utf8(_(", Inset: ")) << &cur.inset();
+ os << lyx::to_utf8(_(", Paragraph: ")) << cur.pit();
+ os << lyx::to_utf8(_(", Id: ")) << par.id();
+ os << lyx::to_utf8(_(", Position: ")) << cur.pos();
+ os << lyx::to_utf8(_(", Boundary: ")) << cur.boundary();
// Row & row = cur.textRow();
// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
#endif
// sets cursor only within this LyXText
bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
{
+ BOOST_ASSERT(this == cur.text());
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
+ << BOOST_CURRENT_FUNCTION
+ << ": x: " << x
+ << " y: " << y
<< " pit: " << pit
- << " yy: " << yy << endl;
+ << " yy: " << yy << endl;
Paragraph const & par = pars_[pit];
int r = 0;
Row const & row = par.rows()[r];
lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << ": row " << r
- << " from pos: " << row.pos()
- << endl;
+ << 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;
-
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": setting cursor pit: " << pit
+ << " pos: " << pos
+ << endl;
+
return setCursor(cur, pit, pos, true, bound);
}
projects / lyx.git / blobdiff