#include <sstream>
+using lyx::docstring;
+using lyx::char_type;
using lyx::pit_type;
using lyx::pos_type;
using lyx::word_location;
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()));
layoutname = tclass.defaultLayoutName();
else {
lex.eatLine();
string line = lex.getString();
- buf.error(ErrorItem(_("Unknown Inset"), line,
+ 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"),
+ errorList.push_back(ErrorItem(_("Unknown token"),
bformat(_("Unknown token: %1$s %2$s\n"), token, 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)) {
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 (!par.getLabelstring().empty()) {
- l_margin += font_metrics::signedWidth(layout->labelindent,
+ 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()) {
+ 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.
|| 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;
if (bv()->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);
}
pars_[next_par].erase(0);
ParIterator current_it(cur);
- ParIterator next_it(cur); next_it.pit() = next_par;
+ ParIterator last_it(cur);
+ ++last_it;
+ ++last_it;
- if (needsUpdateCounters(cur.buffer(), current_it)
- || needsUpdateCounters(cur.buffer(), next_it))
- updateCounters(cur.buffer());
+ updateLabels(cur.buffer(), current_it, last_it);
// Mark "carriage return" as inserted if change tracking:
if (cur.buffer().params().tracking_changes) {
// 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);
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)
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;
}
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 =
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 = 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:
// the counters may have changed
ParIterator par_it(cur);
- if (needsUpdateCounters(cur.buffer(), par_it))
- updateCounters(cur.buffer());
+ updateLabels(cur.buffer(), par_it);
setCursor(cur, cur.pit(), cur.pos(), false);
}
}
-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);
{
//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();
if (!a.email().empty())
projects / lyx.git / blobdiff