#include "lyxlex.h"
#include "lyxrc.h"
#include "lyxrow.h"
-#include "lyxrow_funcs.h"
#include "metricsinfo.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "vspace.h"
#include "WordLangTuple.h"
-#include "frontends/font_metrics.h"
-#include "frontends/LyXView.h"
+#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include "insets/insettext.h"
#include <sstream>
-using lyx::pit_type;
-using lyx::pos_type;
-using lyx::word_location;
-using lyx::support::bformat;
-using lyx::support::contains;
-using lyx::support::lowercase;
-using lyx::support::split;
-using lyx::support::uppercase;
+namespace lyx {
-using lyx::cap::cutSelection;
+using support::bformat;
+using support::contains;
+using support::lowercase;
+using support::split;
+using support::uppercase;
+
+using cap::cutSelection;
+using cap::pasteParagraphList;
+
+using frontend::FontMetrics;
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
+ docstring dstr = lex.getDocString();
+ docstring::const_iterator cit = dstr.begin();
+ 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();
font = LyXFont(LyXFont::ALL_INHERIT, bp.language);
- change = Change();
+ change = Change(Change::UNCHANGED);
LyXTextClass const & tclass = bp.getLyXTextClass();
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()));
+ from_utf8(layoutname), from_utf8(tclass.name())), par.id(), 0, par.size()));
layoutname = tclass.defaultLayoutName();
}
par.insertInset(par.size(), inset, font, change);
else {
lex.eatLine();
- string line = lex.getString();
- buf.error(ErrorItem(_("Unknown Inset"), line,
+ docstring line = from_utf8(lex.getString());
+ errorList.push_back(ErrorItem(_("Unknown Inset"), line,
par.id(), 0, par.size()));
}
} else if (token == "\\family") {
auto_ptr<InsetBase> inset(new InsetTabular(buf));
inset->read(buf, lex);
par.insertInset(par.size(), inset.release(), font, change);
- } else if (token == "\\bibitem") {
- InsetCommandParams p("bibitem", "dummy");
- auto_ptr<InsetBibitem> inset(new InsetBibitem(p));
- inset->read(buf, lex);
- par.insertInset(par.size(), inset.release(), font, change);
} else if (token == "\\hfill") {
par.insertInset(par.size(), new InsetHFill, font, change);
} else if (token == "\\lyxline") {
par.insertInset(par.size(), new InsetPagebreak, font, change);
} else if (token == "\\change_unchanged") {
// Hack ! Needed for empty paragraphs :/
- // FIXME: is it still ??
- /*
- if (!par.size())
- par.cleanChanges();
- */
+ // FIXME: change tracking (MG)
+ // set empty 'par' to INSERTED???
change = Change(Change::UNCHANGED);
} else if (token == "\\change_inserted") {
lex.eatLine();
std::istringstream is(lex.getString());
- int aid;
- lyx::time_type ct;
+ unsigned int aid;
+ 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;
- lyx::time_type ct;
+ unsigned int aid;
+ 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"), from_utf8(token),
+ 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();
LyXFont font;
- Change change;
+ Change change(Change::UNCHANGED);
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);
+ return theFontMetrics(font).width(c);
}
if (c == Paragraph::META_INSET)
return par.getInset(pos)->width();
- return font_metrics::width(c, font);
+ return theFontMetrics(font).width(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());
+ // FIXME UNICODE
+ docstring leftm = from_utf8(tclass.leftmargin());
+ l_margin += theFontMetrics(params.getFont()).signedWidth(leftm);
if (par.getDepth() != 0) {
// find the next level paragraph
parindent.erase();
LyXFont const labelfont = getLabelFont(par);
+ FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
+
switch (layout->margintype) {
case MARGIN_DYNAMIC:
- if (!layout->leftmargin.empty())
- l_margin += font_metrics::signedWidth(layout->leftmargin,
- tclass.defaultfont());
+ if (!layout->leftmargin.empty()) {
+ // FIXME UNICODE
+ docstring leftm = from_utf8(layout->leftmargin);
+ l_margin += theFontMetrics(params.getFont()).signedWidth(leftm);
+ }
if (!par.getLabelstring().empty()) {
- l_margin += font_metrics::signedWidth(layout->labelindent,
- labelfont);
- l_margin += font_metrics::width(par.getLabelstring(),
- labelfont);
- l_margin += font_metrics::width(layout->labelsep, labelfont);
+ // FIXME UNICODE
+ docstring labin = from_utf8(layout->labelindent);
+ l_margin += labelfont_metrics.signedWidth(labin);
+ docstring labstr = par.getLabelstring();
+ l_margin += labelfont_metrics.width(labstr);
+ docstring labsep = from_utf8(layout->labelsep);
+ l_margin += labelfont_metrics.width(labsep);
}
break;
- case MARGIN_MANUAL:
- l_margin += font_metrics::signedWidth(layout->labelindent, labelfont);
+ case MARGIN_MANUAL: {
+ // FIXME UNICODE
+ docstring labin = from_utf8(layout->labelindent);
+ l_margin += labelfont_metrics.signedWidth(labin);
// 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(),
- labelfont);
- l_margin += font_metrics::width(layout->labelsep, labelfont);
+ docstring labstr = par.getLabelWidthString();
+ l_margin += labelfont_metrics.width(labstr);
+ docstring labsep = from_utf8(layout->labelsep);
+ l_margin += labelfont_metrics.width(labsep);
}
}
break;
+ }
- case MARGIN_STATIC:
- l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
- / (par.getDepth() + 4);
+ case MARGIN_STATIC: {
+ // FIXME UNICODE
+ docstring leftm = from_utf8(layout->leftmargin);
+ l_margin += theFontMetrics(params.getFont()).signedWidth(leftm)
+ * 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,
- labelfont);
+ // FIXME UNICODE
+ l_margin += labelfont_metrics.signedWidth(
+ from_utf8(layout->leftmargin));
} else {
- l_margin += font_metrics::signedWidth(layout->labelindent,
- labelfont);
+ // FIXME UNICODE
+ l_margin += labelfont_metrics.signedWidth(
+ from_utf8(layout->labelindent));
}
} else if (pos != 0
// Special case to fix problems with
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
&& !isFirstInSequence(pit, pars_))) {
- l_margin += font_metrics::signedWidth(layout->leftmargin,
- labelfont);
+ // FIXME UNICODE
+ l_margin += labelfont_metrics.signedWidth(from_utf8(layout->leftmargin));
} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
&& layout->labeltype != LABEL_BIBLIO
&& layout->labeltype !=
LABEL_CENTERED_TOP_ENVIRONMENT) {
- l_margin += font_metrics::signedWidth(layout->labelindent,
- labelfont);
- l_margin += font_metrics::width(layout->labelsep, labelfont);
- l_margin += font_metrics::width(par.getLabelstring(),
- labelfont);
+ l_margin += labelfont_metrics.signedWidth(from_utf8(layout->labelindent));
+ l_margin += labelfont_metrics.width(from_utf8(layout->labelsep));
+ l_margin += labelfont_metrics.width(par.getLabelstring());
}
break;
for ( ; rit != end; ++rit)
if (rit->fill() < minfill)
minfill = rit->fill();
- l_margin += font_metrics::signedWidth(layout->leftmargin,
- tclass.defaultfont());
+ l_margin += theFontMetrics(params.getFont()).signedWidth(layout->leftmargin);
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 = from_utf8(parindent);
+ l_margin += theFontMetrics(params.getFont()).signedWidth(din);
}
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();
+ docstring trmarg = from_utf8(tclass.rightmargin());
+ docstring lrmarg = from_utf8(par.layout()->rightmargin);
+ FontMetrics const & fm = theFontMetrics(params.getFont());
int const r_margin =
- ::rightMargin()
- + font_metrics::signedWidth(tclass.rightmargin(),
- tclass.defaultfont())
- + font_metrics::signedWidth(par.layout()->rightmargin,
- tclass.defaultfont())
+ lyx::rightMargin()
+ + fm.signedWidth(trmarg)
+ + fm.signedWidth(lrmarg)
* 4 / (par.getDepth() + 4);
return r_margin;
FontIterator fi = FontIterator(*this, par, pos);
pos_type point = end;
pos_type i = pos;
+ FontMetrics const & fm = theFontMetrics(getLabelFont(par));
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));
+ docstring lsep = from_utf8(layout->labelsep);
+ int add = fm.width(lsep);
if (par.isLineSeparator(i - 1))
add -= singleWidth(par, i - 1);
pos_type const end = row.endpos();
Paragraph const & par = pars_[pit];
- string const & labelsep = par.layout()->labelsep;
+ docstring const labelsep = from_utf8(par.layout()->labelsep);
int w = leftMargin(pit, row.pos());
pos_type const body_pos = par.beginOfBody();
pos_type i = row.pos();
+ FontMetrics const & fm = theFontMetrics(getLabelFont(par));
+
if (i < end) {
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 += fm.width(labelsep);
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 += fm.width(labelsep);
if (end > 0 && par.isLineSeparator(end - 1))
w -= singleWidth(par, end - 1);
w = max(w, labelEnd(pit));
for (pos_type i = row.pos(); i <= last; ++i)
w += singleWidth(par, i);
- string const & label = par.params().labelWidthString();
+ docstring const & label = par.params().labelWidthString();
if (label.empty())
return 0;
- return max(0, font_metrics::width(label, getLabelFont(par)) - w);
+ FontMetrics const & fm = theFontMetrics(getLabelFont(par));
+
+ return max(0, fm.width(label) - w);
}
LyXFont labelfont = getLabelFont(par);
+ FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
+ FontMetrics const & fontmetrics = theFontMetrics(font);
+
// these are minimum values
double const spacing_val = layout->spacing.getValue() * spacing(par);
//lyxerr << "spacing_val = " << spacing_val << endl;
- int maxasc = int(font_metrics::maxAscent(font) * spacing_val);
- int maxdesc = int(font_metrics::maxDescent(font) * spacing_val);
+ int maxasc = int(fontmetrics.maxAscent() * spacing_val);
+ int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
// insets may be taller
InsetList::const_iterator ii = par.insetlist.begin();
par.highestFontInRange(row.pos(), pos_end, size);
if (maxsize > font.size()) {
font.setSize(maxsize);
- maxasc = max(maxasc, font_metrics::maxAscent(font));
- maxdesc = max(maxdesc, font_metrics::maxDescent(font));
+ maxasc = max(maxasc, fontmetrics.maxAscent());
+ maxdesc = max(maxdesc, fontmetrics.maxDescent());
}
// This is nicer with box insets:
// layout is printed in an extra row
if (layout->counter == "chapter"
&& !par.params().labelString().empty()) {
- labeladdon = int(font_metrics::maxHeight(labelfont)
+ labeladdon = int(labelfont_metrics.maxHeight()
* layout->spacing.getValue()
* spacing(par));
}
&& !par.getLabelstring().empty())
{
labeladdon = int(
- font_metrics::maxHeight(labelfont)
+ labelfont_metrics.maxHeight()
* layout->spacing.getValue()
* spacing(par)
+ (layout->topsep + layout->labelbottomsep) * dh);
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()) &&
// 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());
+ // FIXME: change tracking (MG)
+ cpar.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
// How should the layout for the new paragraph be?
int preserve_layout = 0;
// we need to set this before we insert the paragraph.
bool const isempty = cpar.allowEmpty() && cpar.empty();
- ::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
+ lyx::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
cur.pos(), preserve_layout);
// After this, neither paragraph contains any rows!
}
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
- pars_[next_par].erase(0);
+ // FIXME: change tracking (MG)
+ pars_[next_par].eraseChar(0, cur.buffer().params().trackChanges);
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) {
+ if (cur.buffer().params().trackChanges) {
+ // FIXME: Change tracking (MG)
cur.paragraph().setChange(cur.paragraph().size(),
- Change::INSERTED);
+ Change(Change::INSERTED));
}
// This check is necessary. Otherwise the new empty paragraph will
// 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 = from_ascii("+-/*");
+ static docstring const number_unary_operators = from_ascii("+-");
+ static docstring const number_seperators = 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;
}
BOOST_ASSERT(cur.pos() > 0);
- if ((par.isLineSeparator(cur.pos() - 1)
- || par.isNewline(cur.pos() - 1))
- && par.lookupChange(cur.pos() - 1) != Change::DELETED) {
+ if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
+ && !par.isDeleted(cur.pos() - 1)) {
static bool sent_space_message = false;
if (!sent_space_message) {
cur.message(_("You cannot type two spaces this way. "
- "Please read the Tutorial."));
+ "Please read the Tutorial."));
sent_space_message = true;
}
return;
}
}
- par.insertChar(cur.pos(), c, current_font);
+ par.insertChar(cur.pos(), c, current_font, cur.buffer().params().trackChanges);
setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
charInserted();
}
if (body_pos > 0
&& (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
- result.x += font_metrics::width(layout->labelsep, getLabelFont(par));
+ docstring const lsep = from_utf8(layout->labelsep);
+ result.x += theFontMetrics(getLabelFont(par)).width(lsep);
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());
+ bool isDeleted = pars_[pit].isDeleted(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);
+ pars_[pit].acceptChanges(left, right);
}
- if (type == Change::DELETED) {
+ if (isDeleted) {
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) {
+ // FIXME: change tracking (MG)
+ if (pars_[it.pit()].isDeleted(pars_[it.pit()].size())) {
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());
+ bool isInserted = pars_[pit].isInserted(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);
+ pars_[pit].rejectChanges(left, right);
}
- if (type == Change::INSERTED) {
+ if (isInserted) {
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) {
+ // FIXME: change tracking (MG)
+ if (pars_[it.pit()].isInserted(pars_[it.pit()].size())) {
setCursorIntern(cur, it.pit() + 1, 0);
backspacePos0(cur);
}
to = cur.selEnd();
} else {
from = cur.top();
- getWord(from, to, lyx::PARTIAL_WORD);
+ getWord(from, to, PARTIAL_WORD);
cursorRightOneWord(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:
break;
}
}
-#ifdef WITH_WARNINGS
-#warning changes
-#endif
- pars_[pit].setChar(pos, c);
+
+ // FIXME: change tracking (MG)
+ // sorry but we are no longer allowed to set a single character directly
+ // we have to rewrite this method in terms of erase&insert operations
+ //pars_[pit].setChar(pos, c);
++pos;
}
}
-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);
- if (cur.paragraph().lookupChange(cur.pos()) == Change::DELETED)
+ // FIXME: change tracking (MG)
+ if (cur.paragraph().isDeleted(cur.pos()))
cur.posRight();
} else if (cur.pit() != cur.lastpit()) {
LCursor scur = cur;
if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) {
recordUndo(scur, Undo::DELETE, scur.pit());
needsUpdate = backspace(cur);
- if (cur.buffer().params().tracking_changes) {
+ if (cur.buffer().params().trackChanges) {
+ // FIXME: Change tracking (MG)
// move forward after the paragraph break is DELETED
Paragraph & par = cur.paragraph();
- if (par.lookupChange(par.size()) == Change::DELETED)
+ // FIXME: change tracking (MG)
+ if (par.isDeleted(par.size()))
setCursorIntern(cur, cur.pit() + 1, 0);
}
} else {
setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
}
- }
+ } else
+ needsUpdate = dissolveInset(cur);
+
return needsUpdate;
}
// 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);
}
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.pit() != 0 && cur.buffer().params().tracking_changes) {
+ if (cur.pit() != 0 && cur.buffer().params().trackChanges) {
+ // FIXME: Change tracking (MG)
// 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);
+ // FIXME: change tracking (MG)
+ if (!par.isInserted(par.size())) {
+ // FIXME: change tracking (MG)
+ par.setChange(par.size(), Change(Change::DELETED));
setCursorIntern(cur, cur.pit() - 1, par.size());
return true;
}
// without the dreaded mechanism. (JMarc)
setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
- cur.paragraph().erase(cur.pos());
+ // FIXME: change tracking (MG)
+ cur.paragraph().eraseChar(cur.pos(), cur.buffer().params().trackChanges);
}
if (cur.pos() == cur.lastpos())
}
+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
+ pos_type spos = cur.pos();
+ 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();
+ Buffer & b = cur.buffer();
+ // FIXME: change tracking (MG)
+ cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+ if (!plist.empty()) {
+ 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();
if (!hasbibitem) {
InsetBibitem * inset(new
InsetBibitem(InsetCommandParams("bibitem")));
- par.insertInset(0, static_cast<InsetBase *>(inset));
+ // FIXME: change tracking (MG)
+ par.insertInset(0, static_cast<InsetBase *>(inset), Change(Change::INSERTED));
bv()->cursor().posRight();
}
}
DocIterator beg = cur.selectionBegin();
DocIterator end = cur.selectionEnd();
+ BufferView * bv = pi.base.bv;
+
// 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)
+ if (bv_funcs::status(bv, beg) == bv_funcs::CUR_BELOW
+ || bv_funcs::status(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)
+ bool const above = (bv_funcs::status(bv, beg)
== bv_funcs::CUR_ABOVE);
- bool const below = (bv_funcs::status(pi.base.bv, end)
+ bool const below = (bv_funcs::status(bv, end)
== bv_funcs::CUR_BELOW);
int y1,y2,x1,x2;
if (above) {
x2 = dim_.wid;
} else {
Row const & row1 = par1.getRow(beg.pos(), beg.boundary());
- y1 = bv_funcs::getPos(beg, beg.boundary()).y_ - row1.ascent();
+ y1 = bv_funcs::getPos(*bv, beg, beg.boundary()).y_ - row1.ascent();
y2 = y1 + row1.height();
int const startx = cursorX(beg.top(), beg.boundary());
x1 = !isRTL(par1) ? startx : 0;
int Y1,Y2,X1,X2;
if (below) {
- Y1 = pi.base.bv->workHeight();
- Y2 = pi.base.bv->workHeight();
+ Y1 = bv->workHeight();
+ Y2 = 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();
+ Y1 = bv_funcs::getPos(*bv, end, end.boundary()).y_ - row2.ascent();
Y2 = Y1 + row2.height();
int const endx = cursorX(end.top(), end.boundary());
X1 = !isRTL(par2) ? 0 : endx;
{
Paragraph const & from_par = pars_[from.pit()];
switch (loc) {
- case lyx::WHOLE_WORD_STRICT:
+ case WHOLE_WORD_STRICT:
if (from.pos() == 0 || from.pos() == from_par.size()
|| !from_par.isLetter(from.pos())
|| !from_par.isLetter(from.pos() - 1)) {
}
// no break here, we go to the next
- case lyx::WHOLE_WORD:
+ case WHOLE_WORD:
// If we are already at the beginning of a word, do nothing
if (!from.pos() || !from_par.isLetter(from.pos() - 1))
break;
// no break here, we go to the next
- case lyx::PREVIOUS_WORD:
+ case PREVIOUS_WORD:
// always move the cursor to the beginning of previous word
while (from.pos() && from_par.isLetter(from.pos() - 1))
--from.pos();
break;
- case lyx::NEXT_WORD:
+ case NEXT_WORD:
lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet"
<< endl;
break;
- case lyx::PARTIAL_WORD:
+ case PARTIAL_WORD:
// no need to move the 'from' cursor
break;
}
{
ParagraphList::const_iterator pit = paragraphs().begin();
ParagraphList::const_iterator end = paragraphs().end();
- Paragraph::depth_type dth = 0;
+ depth_type dth = 0;
for (; pit != end; ++pit)
pit->write(buf, os, buf.params(), dth);
}
-bool LyXText::read(Buffer const & buf, LyXLex & lex)
+bool LyXText::read(Buffer const & buf, LyXLex & lex, ErrorList & errorList)
{
- Paragraph::depth_type depth = 0;
+ depth_type depth = 0;
while (lex.isOK()) {
lex.nextToken();
if (token.empty())
continue;
- if (token == "\\end_inset") {
+ if (token == "\\end_inset")
break;
- }
- if (token == "\\end_body") {
+ if (token == "\\end_body")
continue;
- }
- if (token == "\\begin_body") {
+ if (token == "\\begin_body")
continue;
- }
- if (token == "\\end_document") {
+ if (token == "\\end_document")
return false;
- }
if (token == "\\begin_layout") {
lex.pushToken(token);
Paragraph par;
par.params().depth(depth);
- if (buf.params().tracking_changes)
- par.trackChanges();
par.setFont(0, LyXFont(LyXFont::ALL_INHERIT, buf.params().language));
pars_.push_back(par);
// FIXME: goddamn InsetTabular makes us pass a Buffer
// not BufferParams
- ::readParagraph(buf, pars_.back(), lex);
+ lyx::readParagraph(buf, pars_.back(), lex, errorList);
} else if (token == "\\begin_deeper") {
++depth;
// Use font span to speed things up, see below
FontSpan font_span;
LyXFont font;
+ FontMetrics const & labelfm = theFontMetrics(getLabelFont(par));
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 += m.label_hfill
- + font_metrics::width(par.layout()->labelsep,
- getLabelFont(par));
+ // FIXME UNICODE
+ docstring const lsep = from_utf8(par.layout()->labelsep);
+ x += m.label_hfill + labelfm.width(lsep);
if (par.isLineSeparator(body_pos - 1))
x -= singleWidth(par, body_pos - 1);
}
x += singleWidth(par, pos, par.getChar(pos), font);
- if (hfillExpansion(par, row, pos))
+ if (par.hfillExpansion(row, pos))
x += (pos >= body_pos) ? m.hfill : m.label_hfill;
else if (par.isSeparator(pos) && pos >= body_pos)
x += m.separator;
{
//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)
Paragraph const & par = cur.paragraph();
std::ostringstream os;
- bool const show_change = buf.params().tracking_changes
- && par.lookupChange(cur.pos()) != Change::UNCHANGED;
-
- if (buf.params().tracking_changes)
+ if (buf.params().trackChanges)
os << "[C] ";
- if (show_change) {
- Change change = par.lookupChangeFull(cur.pos());
+ Change change = par.lookupChange(cur.pos());
+
+ if (change.type != Change::UNCHANGED) {
Author const & a = buf.params().authors().get(change.author);
- os << _("Change: ") << a.name();
+ os << to_utf8(_("Change: ")) << a.name();
if (!a.email().empty())
os << " (" << a.email() << ")";
- if (change.changetime)
- os << _(" at ") << ctime(&change.changetime);
+ os << to_utf8(_(" at ")) << ctime(&change.changetime);
os << " : ";
}
LyXFont font = real_current_font;
font.reduce(buf.params().getFont());
- // avoid _(...) re-entrance problem
+ // avoid to_utf8(_(...)) re-entrance problem
string const s = font.stateText(&buf.params());
- os << bformat(_("Font: %1$s"), s);
+ os << to_utf8(bformat(_("Font: %1$s"), from_utf8(s)));
- // os << bformat(_("Font: %1$s"), font.stateText(&buf.params));
+ // os << 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 << 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 << to_utf8(_(", Spacing: "));
switch (spacing.getSpace()) {
case Spacing::Single:
- os << _("Single");
+ os << to_utf8(_("Single"));
break;
case Spacing::Onehalf:
- os << _("OneHalf");
+ os << to_utf8(_("OneHalf"));
break;
case Spacing::Double:
- os << _("Double");
+ os << to_utf8(_("Double"));
break;
case Spacing::Other:
- os << _("Other (") << spacing.getValueAsString() << ')';
+ os << 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 << to_utf8(_(", Inset: ")) << &cur.inset();
+ os << to_utf8(_(", Paragraph: ")) << cur.pit();
+ os << to_utf8(_(", Id: ")) << par.id();
+ os << to_utf8(_(", Position: ")) << cur.pos();
+ os << to_utf8(_(", Boundary: ")) << cur.boundary();
// Row & row = cur.textRow();
// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
#endif
// 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;
+ for (int i = cur.depth(); --i >= 0; ) {
InsetBase * const in = &cur[i].inset();
if (in->lyxCode() == InsetBase::FLOAT_CODE
|| in->lyxCode() == InsetBase::WRAP_CODE) {
- name = in->getInsetName();
+ name = to_utf8(in->getInsetName());
break;
}
}
if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0)
text.erase();
- string par_text = pars_[pit].asString(cur.buffer(), false);
+ // FIXME UNICODE
+ string par_text = to_utf8(pars_[pit].asString(cur.buffer(), false));
for (int i = 0; i < lyxrc.label_init_length; ++i) {
if (par_text.empty())
break;
// 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();
+ int yy = cur.bv().coordCache().get(this, pit).y_ - pars_[pit].ascent();
lyxerr[Debug::DEBUG]
<< BOOST_CURRENT_FUNCTION
<< ": x: " << x
return setCursor(cur, pit, pos, true, bound);
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff