void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
- string const & token, LyXFont & font)
+ string const & token, LyXFont & font, Change & change)
{
- static Change change;
-
BufferParams const & bp = buf.params();
if (token[0] != '\\') {
string::const_iterator cit = token.begin();
- for (; cit != token.end(); ++cit) {
+ for (; cit != token.end(); ++cit)
par.insertChar(par.size(), (*cit), font, change);
- }
} else if (token == "\\begin_layout") {
lex.eatLine();
string layoutname = lex.getString();
lex.nextToken();
string token = lex.getString();
LyXFont font;
+ Change change;
while (lex.isOK()) {
- readParToken(buf, par, lex, token, font);
+ readParToken(buf, par, lex, token, font, change);
lex.nextToken();
token = lex.getString();
int LyXText::singleWidth(Paragraph const & par,
pos_type pos, char c, LyXFont const & font) const
{
- BOOST_ASSERT(pos < par.size());
-
// The most common case is handled first (Asger)
if (IsPrintable(c)) {
Language const * language = font.language();
&& !isFirstInSequence(pit, pars_)))
&& align == LYX_ALIGN_BLOCK
&& !par.params().noindent()
+ // in some insets, paragraphs are never indented
+ && !(par.inInset() && par.inInset()->neverIndent())
// display style insets are always centered, omit indentation
&& !(!par.empty()
&& par.isInset(pos)
&& par.getInset(pos)->display())
- // in charstyles, tabulars and ert paragraphs are never indented!
- && ((par.ownerCode() != InsetBase::TEXT_CODE || isMainText())
- && par.ownerCode() != InsetBase::ERT_CODE
- && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
&& (par.layout() != tclass.defaultLayout()
|| bv()->buffer()->params().paragraph_separation ==
BufferParams::PARSEP_INDENT))
pos_type i = pos;
for ( ; i < end; ++i, ++fi) {
char const c = par.getChar(i);
+ int thiswidth = singleWidth(par, i, c, *fi);
- {
- int thiswidth = singleWidth(par, i, c, *fi);
-
- // add the auto-hfill from label end to the body
- if (body_pos && i == body_pos) {
- int add = font_metrics::width(layout->labelsep, getLabelFont(par));
- if (par.isLineSeparator(i - 1))
- add -= singleWidth(par, i - 1);
-
- add = std::max(add, labelEnd(pit) - x);
- thiswidth += add;
- }
+ // add the auto-hfill from label end to the body
+ if (body_pos && i == body_pos) {
+ int add = font_metrics::width(layout->labelsep, getLabelFont(par));
+ if (par.isLineSeparator(i - 1))
+ add -= singleWidth(par, i - 1);
- x += thiswidth;
- chunkwidth += thiswidth;
+ add = std::max(add, labelEnd(pit) - x);
+ thiswidth += add;
}
+ x += thiswidth;
+ chunkwidth += thiswidth;
+
// break before a character that will fall off
// the right of the row
if (x >= width) {
return;
}
BOOST_ASSERT(cur.pos() > 0);
- if (par.isLineSeparator(cur.pos() - 1)
- || par.isNewline(cur.pos() - 1)) {
+ if ((par.isLineSeparator(cur.pos() - 1)
+ || par.isNewline(cur.pos() - 1))
+ && par.lookupChange(cur.pos() - 1) != Change::DELETED) {
static bool sent_space_message = false;
if (!sent_space_message) {
cur.message(_("You cannot type two spaces this way. "
}
-Paragraph & LyXText::getPar(pit_type par) const
-{
- //lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
- BOOST_ASSERT(par >= 0);
- BOOST_ASSERT(par < int(paragraphs().size()));
- return paragraphs()[par];
-}
-
-
Row const & LyXText::firstRow() const
{
return *paragraphs().front().rows().begin();
Row const & row1 = par1.getRow(beg.pos(), beg.boundary());
y1 = bv_funcs::getPos(beg, beg.boundary()).y_ - row1.ascent();
y2 = y1 + row1.height();
- int const startx = cursorX(beg.top(), false);
+ int const startx = cursorX(beg.top(), beg.boundary());
x1 = !isRTL(par1) ? startx : 0;
x2 = !isRTL(par1) ? 0 + dim_.wid : startx;
}
Row const & row2 = par2.getRow(end.pos(), end.boundary());
Y1 = bv_funcs::getPos(end, end.boundary()).y_ - row2.ascent();
Y2 = Y1 + row2.height();
- int const endx = cursorX(end.top(), false);
+ int const endx = cursorX(end.top(), end.boundary());
X1 = !isRTL(par2) ? 0 : endx;
X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
}
- if (!above && !below && &par1.getRow(beg.pos(), end.boundary())
+ if (!above && !below && &par1.getRow(beg.pos(), beg.boundary())
== &par2.getRow(end.pos(), end.boundary()))
{
// paint only one rectangle
- pi.pain.fillRectangle(x + x1, y1, X2 - x1, y2 - y1,
- LColor::selection);
+ int const b( !isRTL(par1) ? x + x1 : x + X1 );
+ int const w( !isRTL(par1) ? X2 - x1 : x2 - X1 );
+ pi.pain.fillRectangle(b, y1, w, y2 - y1, LColor::selection);
return;
}
+ lyxerr[Debug::DEBUG] << " y1: " << y1 << " y2: " << y2
+ << "X1:" << X1 << " x2: " << X2 << " wid: " << dim_.wid
+ << endl;
+
// paint upper rectangle
pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,
LColor::selection);
bool LyXText::read(Buffer const & buf, LyXLex & lex)
{
- static Change current_change;
-
Paragraph::depth_type depth = 0;
while (lex.isOK()) {
(body_pos > end || !par.isLineSeparator(body_pos - 1)))
body_pos = 0;
+ // Use font span to speed things up, see below
+ FontSpan font_span;
+ LyXFont font;
+
for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
pos_type pos = bidi.vis2log(vpos);
if (body_pos > 0 && pos == body_pos - 1) {
x -= singleWidth(par, body_pos - 1);
}
- x += singleWidth(par, pos);
+ // Use font span to speed things up, see above
+ if (pos < font_span.first || pos > font_span.last) {
+ font_span = par.fontSpan(pos);
+ font = getFont(par, pos);
+ }
+
+ x += singleWidth(par, pos, par.getChar(pos), font);
if (hfillExpansion(par, row, pos))
x += (pos >= body_pos) ? m.hfill : m.label_hfill;
// see correction above
if (boundary_correction)
- x += singleWidth(par, ppos);
+ if (getFont(par, ppos).isRightToLeft())
+ x -= singleWidth(par, ppos);
+ else
+ x += singleWidth(par, ppos);
return int(x);
}