#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "pariterator.h"
#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#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();
}
} 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 = 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") {
} else if (token == "\\newpage") {
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();
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();
break;
}
}
+ // Final change goes to paragraph break:
+ par.setChange(par.size(), change);
+
// Initialize begin_of_body_ on load; redoParagraph maintains
par.setBeginOfBody();
}
-BufferView * LyXText::bv() const
-{
- BOOST_ASSERT(bv_owner != 0);
- return bv_owner;
-}
-
-
-double LyXText::spacing(Paragraph const & par) const
+double LyXText::spacing(Buffer const & buffer,
+ Paragraph const & par) const
{
if (par.params().spacing().isDefault())
- return bv()->buffer()->params().spacing().getValue();
+ return buffer.params().spacing().getValue();
return par.params().spacing().getValue();
}
}
-int LyXText::singleWidth(Paragraph const & par, pos_type pos) const
+int LyXText::singleWidth(Buffer const & buffer, Paragraph const & par,
+ pos_type pos) const
{
- return singleWidth(par, pos, par.getChar(pos), getFont(par, pos));
+ return singleWidth(par, pos, par.getChar(pos),
+ getFont(buffer, par, pos));
}
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);
}
-int LyXText::leftMargin(pit_type pit) const
+int LyXText::leftMargin(Buffer const & buffer, pit_type pit) const
{
BOOST_ASSERT(pit >= 0);
BOOST_ASSERT(pit < int(pars_.size()));
- return leftMargin(pit, pars_[pit].size());
+ return leftMargin(buffer, pit, pars_[pit].size());
}
-int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
+int LyXText::leftMargin(Buffer const & buffer,
+ pit_type const pit, pos_type const pos) const
{
BOOST_ASSERT(pit >= 0);
BOOST_ASSERT(pit < int(pars_.size()));
BOOST_ASSERT(pos >= 0);
BOOST_ASSERT(pos <= par.size());
//lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl;
- LyXTextClass const & tclass =
- bv()->buffer()->params().getLyXTextClass();
+ LyXTextClass const & tclass = buffer.params().getLyXTextClass();
LyXLayout_ptr const & layout = par.layout();
string parindent = layout->parindent;
int l_margin = 0;
- if (isMainText())
+ if (isMainText(buffer))
l_margin += changebarMargin();
- l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
+ // FIXME UNICODE
+ docstring leftm = from_utf8(tclass.leftmargin());
+ l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm);
if (par.getDepth() != 0) {
- // find the next level paragraph
- pit_type newpar = outerHook(pit, pars_);
+ // 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);
+ l_margin = leftMargin(buffer, newpar);
}
if (par.layout() == tclass.defaultLayout()) {
if (pars_[newpar].params().noindent())
}
}
- LyXFont const labelfont = getLabelFont(par);
+ // 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(buffer, 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(buffer.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(buffer.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.
|| 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.inInset() && par.inInset()->neverIndent())
+ && !(par.inInset() && par.inInset()->neverIndent(buffer))
// 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))
+ || buffer.params().paragraph_separation ==
+ BufferParams::PARSEP_INDENT))
{
- l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont());
+ docstring din = from_utf8(parindent);
+ l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(din);
}
return l_margin;
}
-int LyXText::rightMargin(Paragraph const & par) const
+int LyXText::rightMargin(Buffer const & buffer, 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 = 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 = 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;
}
-int LyXText::labelEnd(pit_type const pit) const
+int LyXText::labelEnd(Buffer const & buffer, pit_type const pit) const
{
// labelEnd is only needed if the layout fills a flushleft label.
if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
return 0;
// return the beginning of the body
- return leftMargin(pit);
+ return leftMargin(buffer, pit);
}
};
-void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
+void LyXText::rowBreakPoint(Buffer const & buffer, int right_margin,
+ pit_type const pit, Row & row) const
{
Paragraph const & par = pars_[pit];
pos_type const end = par.size();
}
// maximum pixel width of a row
- int width = maxwidth_ - rightMargin(par); // - leftMargin(pit, row);
+ int width = maxwidth_ - right_margin; // - leftMargin(buffer, pit, row);
if (width < 0) {
row.endpos(end);
return;
// or the end of the par, then choose the possible break
// nearest that.
- int const left = leftMargin(pit, pos);
+ int const left = leftMargin(buffer, pit, pos);
int x = left;
// pixel width since last breakpoint
int chunkwidth = 0;
- FontIterator fi = FontIterator(*this, par, pos);
+ FontIterator fi = FontIterator(buffer, *this, par, pos);
pos_type point = end;
pos_type i = pos;
+ FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, 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);
+ add -= singleWidth(buffer, par, i - 1);
- add = std::max(add, labelEnd(pit) - x);
+ add = std::max(add, labelEnd(buffer, pit) - x);
thiswidth += add;
}
}
-void LyXText::setRowWidth(pit_type const pit, Row & row) const
+void LyXText::setRowWidth(Buffer const & buffer, pit_type const pit, Row & row) const
{
// get the pure distance
pos_type const end = row.endpos();
Paragraph const & par = pars_[pit];
- string const & labelsep = par.layout()->labelsep;
- int w = leftMargin(pit, row.pos());
+ docstring const labelsep = from_utf8(par.layout()->labelsep);
+ int w = leftMargin(buffer, pit, row.pos());
pos_type const body_pos = par.beginOfBody();
pos_type i = row.pos();
+ FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par));
+
if (i < end) {
- FontIterator fi = FontIterator(*this, par, i);
+ FontIterator fi = FontIterator(buffer, *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));
+ w -= singleWidth(buffer, par, i - 1);
+ w = max(w, labelEnd(buffer, 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));
+ w -= singleWidth(buffer, par, end - 1);
+ w = max(w, labelEnd(buffer, pit));
}
- row.width(w + rightMargin(par));
+ row.width(w + rightMargin(buffer, par));
}
// returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(Paragraph const & par, Row const & row) const
+int LyXText::labelFill(Buffer const & buffer, Paragraph const & par,
+ Row const & row) const
{
pos_type last = par.beginOfBody();
int w = 0;
for (pos_type i = row.pos(); i <= last; ++i)
- w += singleWidth(par, i);
+ w += singleWidth(buffer, 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(buffer, par));
+
+ return max(0, fm.width(label) - w);
}
}
-void LyXText::setHeightOfRow(pit_type const pit, Row & row)
+void LyXText::setHeightOfRow(BufferView const & bv, pit_type const pit,
+ Row & row)
{
Paragraph const & par = pars_[pit];
// get the maximum ascent and the maximum descent
// increase but not decrease the height. Just some point to
// start with so we don't have to do the assignment below too
// often.
- LyXFont font = getFont(par, row.pos());
+ Buffer const & buffer = *bv.buffer();
+ LyXFont font = getFont(buffer, par, row.pos());
LyXFont::FONT_SIZE const tmpsize = font.size();
- font = getLayoutFont(pit);
+ font = getLayoutFont(buffer, pit);
LyXFont::FONT_SIZE const size = font.size();
font.setSize(tmpsize);
- LyXFont labelfont = getLabelFont(par);
+ LyXFont labelfont = getLabelFont(buffer, 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);
+ double const spacing_val = layout->spacing.getValue()
+ * spacing(*bv.buffer(), 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:
// is it a top line?
if (row.pos() == 0) {
- BufferParams const & bufparams = bv()->buffer()->params();
+ Buffer const & buffer = *bv.buffer();
+ BufferParams const & bufparams = buffer.params();
// some parksips VERY EASY IMPLEMENTATION
- if (bv()->buffer()->params().paragraph_separation
+ if (bufparams.paragraph_separation
== BufferParams::PARSEP_SKIP
&& 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());
+ maxasc += bufparams.getDefSkip().inPixels(bv);
}
if (par.params().startOfAppendix())
// layout is printed in an extra row
if (layout->counter == "chapter"
&& !par.params().labelString().empty()) {
- labeladdon = int(font_metrics::maxHeight(labelfont)
- * layout->spacing.getValue()
- * spacing(par));
+ labeladdon = int(labelfont_metrics.maxHeight()
+ * layout->spacing.getValue()
+ * spacing(buffer, par));
}
// special code for the top label
&& !par.getLabelstring().empty())
{
labeladdon = int(
- font_metrics::maxHeight(labelfont)
+ labelfont_metrics.maxHeight()
* layout->spacing.getValue()
- * spacing(par)
+ * spacing(*bv.buffer(), 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 = 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()) &&
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();
pit_type cpit = cur.pit();
- if (cur.pos() != 0 && cur.pos() != cur.lastpos()
- && cpar.isChangeEdited(0, cur.pos()))
- return;
-
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.pit(), undoSpan(cur.pit()) - 1);
+ recUndo(cur, 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());
+ // 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 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().trackChanges) {
+ // FIXME: Change tracking (MG)
+ cur.paragraph().setChange(cur.paragraph().size(),
+ Change(Change::INSERTED));
+ }
+
+ // FIXME: Breaking a paragraph has nothing to do with setting a cursor.
+ // Because of the mix between the model (the paragraph contents) and the
+ // view (the paragraph breaking in rows, we have to do this here before
+ // the setCursor() call below.
+ bool changed_height = redoParagraph(cur.bv(), cpit);
+ changed_height |= redoParagraph(cur.bv(), cpit + 1);
+ if (changed_height)
+ // A singlePar update is not enough in this case.
+ cur.updateFlags(Update::Force);
- updateCounters(cur.buffer());
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
// 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);
recordUndo(cur, Undo::INSERT);
+ Buffer const & buffer = cur.buffer();
Paragraph & par = cur.paragraph();
// try to remove this
pit_type const pit = cur.pit();
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()).number() == LyXFont::ON &&
- getFont(par, cur.pos() - 1).number() == LyXFont::ON)
+ getFont(buffer, par, cur.pos()).number() == LyXFont::ON &&
+ getFont(buffer, 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)
|| par.isNewline(cur.pos() - 2))
) {
- setCharFont(pit, cur.pos() - 1, current_font);
+ setCharFont(buffer, pit, cur.pos() - 1, current_font);
} else if (contains(number_seperators, c)
&& cur.pos() >= 2
- && getFont(par, cur.pos() - 2).number() == LyXFont::ON) {
- setCharFont(pit, cur.pos() - 1, current_font);
+ && getFont(buffer, par, cur.pos() - 2).number() == LyXFont::ON) {
+ setCharFont(buffer, pit, cur.pos() - 1, current_font);
}
}
}
// 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."));
+ "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, rawtmpfont);
+ par.insertChar(cur.pos(), c, current_font, cur.buffer().params().trackChanges);
- current_font = rawtmpfont;
- real_current_font = realtmpfont;
+ // FIXME: Inserting a character has nothing to do with setting a cursor.
+ // Because of the mix between the model (the paragraph contents) and the
+ // view (the paragraph breaking in rows, we have to do this here.
+ if (redoParagraph(cur.bv(), cur.pit()))
+ // A singlePar update is not enough in this case.
+ cur.updateFlags(Update::Force);
setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
charInserted();
}
}
-RowMetrics
-LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
+RowMetrics LyXText::computeRowMetrics(Buffer const & buffer,
+ pit_type const pit, Row const & row) const
{
RowMetrics result;
Paragraph const & par = pars_[pit];
double w = dim_.wid - row.width();
- bool const is_rtl = isRTL(par);
+ bool const is_rtl = isRTL(buffer, par);
if (is_rtl)
- result.x = rightMargin(par);
+ result.x = rightMargin(buffer, par);
else
- result.x = leftMargin(pit, row.pos());
+ result.x = leftMargin(buffer, pit, row.pos());
// is there a manual margin with a manual label
LyXLayout_ptr const & layout = par.layout();
++nlh;
if (nlh && !par.getLabelWidthString().empty())
- result.label_hfill = labelFill(par, row) / double(nlh);
+ result.label_hfill = labelFill(buffer, par, row) / double(nlh);
}
// are there any hfills in the row?
}
}
- bidi.computeTables(par, *bv()->buffer(), row);
+ bidi.computeTables(par, buffer, row);
if (is_rtl) {
pos_type body_pos = par.beginOfBody();
pos_type end = row.endpos();
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(buffer, par)).width(lsep);
if (body_pos <= end)
result.x += result.label_hfill;
}
++old.pit();
old.pos() = 0;
} else {
- // Skip through initial nonword stuff.
- // Treat floats and insets as words.
- while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
- ++old.pos();
// Advance through word.
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();
}
return setCursor(cur, old.pit(), old.pos());
}
old.pos() = old.lastpos();
} else {
// Skip through initial nonword stuff.
- // Treat floats and insets as words.
while (old.pos() != 0 && !old.paragraph().isLetter(old.pos() - 1))
--old.pos();
// Advance through word.
if (!cur.selection() && cur.lastpos() != 0)
return;
- CursorSlice const & startc = cur.selBegin();
- CursorSlice const & endc = cur.selEnd();
- if (startc.pit() == endc.pit()) {
- recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.pit()].acceptChange(startc.pos(), endc.pos());
- finishUndo();
- cur.clearSelection();
- setCursorIntern(cur, startc.pit(), 0);
+ recordUndoSelection(cur, Undo::INSERT);
+
+ DocIterator it = cur.selectionBegin();
+ DocIterator et = cur.selectionEnd();
+ pit_type pit = it.pit();
+ 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].acceptChanges(left, right);
}
-#ifdef WITH_WARNINGS
-#warning handle multi par selection
-#endif
+ 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:
+ // FIXME: change tracking (MG)
+ if (pars_[it.pit()].isDeleted(pars_[it.pit()].size())) {
+ 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.pit() == endc.pit()) {
- recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.pit()].rejectChange(startc.pos(), endc.pos());
- finishUndo();
- cur.clearSelection();
- setCursorIntern(cur, startc.pit(), 0);
+ recordUndoSelection(cur, Undo::INSERT);
+
+ DocIterator it = cur.selectionBegin();
+ DocIterator et = cur.selectionEnd();
+ pit_type pit = it.pit();
+ 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].rejectChanges(left, right);
}
-#ifdef WITH_WARNINGS
-#warning handle multi par selection
-#endif
+ 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:
+ // FIXME: change tracking (MG)
+ if (pars_[it.pit()].isInserted(pars_[it.pit()].size())) {
+ setCursorIntern(cur, it.pit() + 1, 0);
+ backspacePos0(cur);
+ }
+ }
+ finishUndo();
+ cur.clearSelection();
+ setCursorIntern(cur, it.pit(), 0);
}
to = cur.selEnd();
} else {
from = cur.top();
- getWord(from, to, lyx::PARTIAL_WORD);
- setCursor(cur, to.pit(), to.pos() + 1);
+ getWord(from, to, PARTIAL_WORD);
+ cursorRightOneWord(cur);
}
recordUndoSelection(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;
}
}
-void LyXText::Delete(LCursor & cur)
+bool LyXText::erase(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
+ bool needsUpdate = false;
+ Paragraph & par = cur.paragraph();
if (cur.pos() != cur.lastpos()) {
- recordUndo(cur, Undo::DELETE, cur.pit());
- setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
- backspace(cur);
+ // this is the code for a normal delete, not pasting
+ // any paragraphs
+ recordUndo(cur, Undo::DELETE);
+ // FIXME: change tracking (MG)
+ par.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
+ if (par.isDeleted(cur.pos()))
+ cur.forwardPos();
+ needsUpdate = true;
} 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());
- backspace(cur);
+ if (cur.buffer().params().trackChanges
+ && par.isInserted(cur.pos())) {
+ // mark "carriage return" as deleted:
+ // FIXME: Change tracking (MG)
+ par.setChange(cur.pos(), Change(Change::DELETED));
+ cur.forwardPos();
+ needsUpdate = true;
} else {
- setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
+ setCursorIntern(cur, cur.pit() + 1, 0);
+ needsUpdate = backspacePos0(cur);
+ // FIXME: Change tracking (MG)
+ if (cur.paragraph().isDeleted(cur.pos()))
+ cur.forwardPos();
}
+ } else
+ needsUpdate = dissolveInset(cur);
+
+ // FIXME: Inserting characters has nothing to do with setting a cursor.
+ // Because of the mix between the model (the paragraph contents)
+ // and the view (the paragraph breaking in rows, we have to do this
+ // here before the setCursorIntern() call.
+ if (needsUpdate) {
+ if (redoParagraph(cur.bv(), cur.pit()))
+ // A singlePar update is not enough in this case.
+ cur.updateFlags(Update::Force);
+ // Make sure the cursor is correct. Is this really needed?
+ // No, not really... at least not here!
+ setCursorIntern(cur, cur.pit(), cur.pos());
}
+
+ 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.
+ if (cur.pit() == 0)
+ return false;
- // 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.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;
- }
- }
+ BufferParams const & bufparams = cur.buffer().params();
+ LyXTextClass const & tclass = bufparams.getLyXTextClass();
+ ParagraphList & plist = cur.text()->paragraphs();
+ Paragraph const & par = cur.paragraph();
+ LCursor prevcur = cur;
+ --prevcur.pit();
+ prevcur.pos() = prevcur.lastpos();
+ Paragraph const & prevpar = prevcur.paragraph();
+
+ // is it an empty paragraph?
+ if (cur.lastpos() == 0
+ || (cur.lastpos() == 1 && par.isSeparator(0))) {
+ recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
+ plist.erase(boost::next(plist.begin(), cur.pit()));
+ needsUpdate = true;
+ }
+ // is previous par empty?
+ else if (prevcur.lastpos() == 0
+ || (prevcur.lastpos() == 1 && prevpar.isSeparator(0))) {
+ recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
+ plist.erase(boost::next(plist.begin(), prevcur.pit()));
+ 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
+ else if (par.layout() == prevpar.layout()
+ || par.layout() == tclass.defaultLayout()) {
+ recordUndo(cur, Undo::ATOMIC, prevcur.pit());
+ mergeParagraph(bufparams, plist, prevcur.pit());
+ needsUpdate = true;
+ }
- if (cur.pit() != 0)
- recordUndo(cur, Undo::DELETE, cur.pit() - 1);
+ if (needsUpdate) {
+ updateLabels(cur.buffer());
+ setCursorIntern(cur, prevcur.pit(), prevcur.pos());
+ }
- 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);
- }
+ return needsUpdate;
+}
- // 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);
- if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
- --cur.pos();
- // the counters may have changed
- updateCounters(cur.buffer());
- setCursor(cur, cur.pit(), cur.pos(), false);
+
+bool LyXText::backspace(LCursor & cur)
+{
+ BOOST_ASSERT(this == cur.text());
+ bool needsUpdate = false;
+ if (cur.pos() == 0) {
+ if (cur.pit() == 0)
+ return dissolveInset(cur);
+
+ if (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:
+ // 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;
+ }
}
+
+ // The cursor is at the beginning of a paragraph, so
+ // the backspace will collapse two paragraphs into one.
+ needsUpdate = backspacePos0(cur);
+
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
// 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())
setCurrentFont(cur);
+ // FIXME: Backspacing has nothing to do with setting a cursor.
+ // Because of the mix between the model (the paragraph contents)
+ // and the view (the paragraph breaking in rows, we have to do this
+ // here before the setCursor() call.
+ if (redoParagraph(cur.bv(), cur.pit()))
+ // A singlePar update is not enough in this case.
+ cur.updateFlags(Update::Force);
setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
+
+ return needsUpdate;
+}
+
+
+bool LyXText::dissolveInset(LCursor & cur) {
+ BOOST_ASSERT(this == cur.text());
+
+ if (isMainText(*cur.bv().buffer()) || cur.inset().nargs() != 1)
+ return false;
+
+ bool const in_ert = cur.inset().lyxCode() == InsetBase::ERT_CODE;
+ 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()) {
+ if (in_ert) {
+ // ERT paragraphs have the Language latex_language.
+ // This is invalid outside of ERT, so we need to
+ // change it to the buffer language.
+ ParagraphList::iterator it = plist.begin();
+ ParagraphList::iterator it_end = plist.end();
+ for (; it != it_end; it++) {
+ it->changeLanguage(b.params(),
+ latex_language,
+ b.getLanguage());
+ }
+ }
+
+ 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;
}
}
-bool LyXText::redoParagraph(pit_type const pit)
+bool LyXText::redoParagraph(BufferView & bv, pit_type const pit)
{
// remove rows of paragraph, keep track of height changes
Paragraph & par = pars_[pit];
+ Buffer const & buffer = *bv.buffer();
// Add bibitem insets if necessary
if (par.layout()->labeltype == LABEL_BIBLIO) {
// 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) {
InsetBibitem * inset(new
InsetBibitem(InsetCommandParams("bibitem")));
- par.insertInset(0, static_cast<InsetBase *>(inset));
- bv()->cursor().posRight();
+ par.insertInset(0, static_cast<InsetBase *>(inset),
+ Change(buffer.params().trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
+ bv.cursor().posRight();
}
}
+ // Optimisation: this is used in the next two loops
+ // so better to calculate that once here.
+ int right_margin = rightMargin(buffer, par);
+
// redo insets
+ // FIXME: We should always use getFont(), see documentation of
+ // noFontChange() in insetbase.h.
+ LyXFont const bufferfont = 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, ii->pos) - rightMargin(par);
- MetricsInfo mi(bv(), getFont(par, ii->pos), w);
+ int const w = maxwidth_ - leftMargin(buffer, pit, ii->pos)
+ - right_margin;
+ LyXFont const & font = ii->inset->noFontChange() ?
+ bufferfont :
+ getFont(buffer, par, ii->pos);
+ MetricsInfo mi(&bv, font, w);
ii->inset->metrics(mi, dim);
}
pos_type z = 0;
do {
Row row(z);
- rowBreakPoint(pit, row);
- setRowWidth(pit, row);
- setHeightOfRow(pit, row);
+ rowBreakPoint(buffer, right_margin, pit, row);
+ setRowWidth(buffer, pit, row);
+ setHeightOfRow(bv, pit, row);
par.rows().push_back(row);
dim.wid = std::max(dim.wid, row.width());
dim.des += row.height();
z = row.endpos();
} while (z < par.size());
+ // 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(buffer, pit, row);
+ setHeightOfRow(bv, pit, row);
+ par.rows().push_back(row);
+ dim.des += row.height();
+ }
+
dim.asc += par.rows()[0].ascent();
dim.des -= par.rows()[0].ascent();
- bool const same = dim == par.dim();
+ bool const same = dim.height() == par.dim().height();
par.dim() = dim;
//lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
unsigned int h = 0;
unsigned int w = 0;
for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) {
- redoParagraph(pit);
+ redoParagraph(*mi.base.bv, pit);
Paragraph & par = paragraphs()[pit];
h += par.height();
if (w < par.width())
}
-#if 0
// only used for inset right now. should also be used for main text
-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 << "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
-
void LyXText::drawSelection(PainterInfo & pi, int x, int) const
{
LCursor & cur = pi.base.bv->cursor();
if (!ptr_cmp(cur.text(), this))
return;
- lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << "draw selection at " << x
- << endl;
+ if (lyxerr.debugging(Debug::DEBUG)) {
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << "draw selection at " << x
+ << endl;
+ }
DocIterator beg = cur.selectionBegin();
DocIterator end = cur.selectionEnd();
+ BufferView & bv = *pi.base.bv;
+ Buffer const & buffer = *bv.buffer();
+
// 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;
- x2 = !isRTL(par1) ? 0 + dim_.wid : startx;
+ int const startx = cursorX(buffer, beg.top(), beg.boundary());
+ if (!isRTL(buffer, par1)) {
+ x1 = startx;
+ x2 = 0 + dim_.wid;
+ }
+ else {
+ x1 = 0;
+ x2 = startx;
+ }
}
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;
- X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
+ int const endx = cursorX(buffer, end.top(), end.boundary());
+ if (!isRTL(buffer, par2)) {
+ X1 = 0;
+ X2 = endx;
+ }
+ else {
+ X1 = endx;
+ X2 = 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 );
+ int const b( !isRTL(*bv.buffer(), par1) ? x + x1 : x + X1 );
+ int const w( !isRTL(*bv.buffer(), 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;
+ if (lyxerr.debugging(Debug::DEBUG)) {
+ 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,
pi.pain.fillRectangle(x, y2, dim_.wid,
Y1 - y2, LColor::selection);
}
-#endif
bool LyXText::isLastRow(pit_type pit, Row const & row) const
{
{
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;
}
-int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
+int LyXText::cursorX(Buffer const & buffer, CursorSlice const & sl,
+ bool boundary) const
{
pit_type const pit = sl.pit();
Paragraph const & par = pars_[pit];
pos_type cursor_vpos = 0;
- RowMetrics const m = computeRowMetrics(pit, row);
+ RowMetrics const m = computeRowMetrics(buffer, pit, row);
double x = m.x;
pos_type const row_pos = row.pos();
if (end <= row_pos)
cursor_vpos = row_pos;
else if (ppos >= end)
- cursor_vpos = isRTL(par) ? row_pos : end;
+ cursor_vpos = isRTL(buffer, par) ? row_pos : end;
else if (ppos > row_pos && ppos >= end)
// Place cursor after char at (logical) position pos - 1
cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
// Use font span to speed things up, see below
FontSpan font_span;
LyXFont font;
+ FontMetrics const & labelfm = theFontMetrics(
+ getLabelFont(buffer, 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(buffer, par, body_pos - 1);
}
// 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);
+ font = getFont(buffer, par, pos);
}
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;
}
-
+
// see correction above
if (boundary_correction)
- if (getFont(par, ppos).isVisibleRightToLeft())
- x -= singleWidth(par, ppos);
+ if (getFont(buffer, par, ppos).isVisibleRightToLeft())
+ x -= singleWidth(buffer, par, ppos);
else
- x += singleWidth(par, ppos);
+ x += singleWidth(buffer, 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());
+ font = getFont(buffer, par, sl.pos());
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)
Paragraph const & par = cur.paragraph();
std::ostringstream os;
- bool const show_change = buf.params().tracking_changes
- && cur.pos() != cur.lastpos()
- && par.lookupChange(cur.pos()) != Change::UNCHANGED;
+ if (buf.params().trackChanges)
+ os << "[C] ";
+
+ Change change = par.lookupChange(cur.pos());
- if (show_change) {
- Change change = par.lookupChangeFull(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 << " : ";
}
// 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
+ // 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
}
-string LyXText::getPossibleLabel(LCursor & cur) const
+docstring LyXText::getPossibleLabel(LCursor & cur) const
{
pit_type pit = cur.pit();
}
}
- string text = layout->latexname().substr(0, 3);
- if (layout->latexname() == "theorem")
- text = "thm"; // Create a correct prefix for prettyref
+ docstring name = from_ascii(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
+ 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();
+ break;
+ }
+ }
+ }
+
+ docstring text = name.substr(0, 3);
+ if (name == "theorem")
+ text = from_ascii("thm"); // Create a correct prefix for prettyref
text += ':';
if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0)
text.erase();
- string par_text = pars_[pit].asString(cur.buffer(), false);
+ docstring par_text = pars_[pit].asString(cur.buffer(), false);
for (int i = 0; i < lyxrc.label_init_length; ++i) {
if (par_text.empty())
break;
- string head;
+ docstring head;
par_text = split(par_text, head, ' ');
// Is it legal to use spaces in labels ?
if (i > 0)
// int pos = r.pos();
// for (; currx < x && pos < r.endpos(); ++pos) {
// lastx = currx;
-// currx += singleWidth(par, pos);
+// currx += singleWidth(buffer, par, pos);
// }
// if (abs(lastx - x) < abs(currx - x) && pos != r.pos())
// --pos;
//}
-pos_type LyXText::x2pos(pit_type pit, int row, int x) const
+pos_type LyXText::x2pos(BufferView const & bv, pit_type pit, int row,
+ int x) const
{
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);
+ return r.pos() + getColumnNearX(bv, pit, r, x, bound);
}
// 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();
+ BOOST_ASSERT(this == cur.text());
+ pit_type pit = getPitNearY(cur.bv(), y);
+ int yy = cur.bv().coordCache().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;
-
+ pos_type const pos = row.pos() + getColumnNearX(cur.bv(), pit, row,
+ xx, bound);
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": setting cursor pit: " << pit
+ << " pos: " << pos
+ << endl;
+
return setCursor(cur, pit, pos, true, bound);
}
+
+
+void LyXText::charsTranspose(LCursor & cur)
+{
+ BOOST_ASSERT(this == cur.text());
+
+ pos_type pos = cur.pos();
+
+ // If cursor is at beginning or end of paragraph, do nothing.
+ if (pos == cur.lastpos() || pos == 0)
+ return;
+
+ Paragraph & par = cur.paragraph();
+
+ // Get the positions of the characters to be transposed.
+ pos_type pos1 = pos - 1;
+ pos_type pos2 = pos;
+
+ // In change tracking mode, ignore deleted characters.
+ while (pos2 < cur.lastpos() && par.isDeleted(pos2))
+ ++pos2;
+ if (pos2 == cur.lastpos())
+ return;
+
+ while (pos1 >= 0 && par.isDeleted(pos1))
+ --pos1;
+ if (pos1 < 0)
+ return;
+
+ // Don't do anything if one of the "characters" is not regular text.
+ if (par.isInset(pos1) || par.isInset(pos2))
+ return;
+
+ // Store the characters to be transposed (including font information).
+ char_type char1 = par.getChar(pos1);
+ LyXFont const font1 =
+ par.getFontSettings(cur.buffer().params(), pos1);
+
+ char_type char2 = par.getChar(pos2);
+ LyXFont const font2 =
+ par.getFontSettings(cur.buffer().params(), pos2);
+
+ // And finally, we are ready to perform the transposition.
+ // Track the changes if Change Tracking is enabled.
+ bool const trackChanges = cur.buffer().params().trackChanges;
+
+ recordUndo(cur);
+
+ par.eraseChar(pos2, trackChanges);
+ par.eraseChar(pos1, trackChanges);
+ par.insertChar(pos1, char2, font2, trackChanges);
+ par.insertChar(pos2, char1, font1, trackChanges);
+
+ // After the transposition, move cursor to after the transposition.
+ setCursor(cur, cur.pit(), pos2);
+ cur.forwardPos();
+}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff