X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=5c54cc342bd0b1f5611f04566b6d72d180835172;hb=70c0f419f6402fc7d0856bd7a870f80f5f51e30d;hp=6a6922c561a97731c3d84806204ece667efa45c8;hpb=f5e68ec257e1d18c1b94f165377dfab06c1e553e;p=lyx.git diff --git a/src/text.C b/src/text.C index 6a6922c561..5c54cc342b 100644 --- a/src/text.C +++ b/src/text.C @@ -70,6 +70,8 @@ #include "support/textutils.h" #include "support/convert.h" +#include + #include using lyx::pit_type; @@ -152,10 +154,8 @@ int numberOfHfills(Paragraph const & par, Row const & row) 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] != '\\') { @@ -346,10 +346,11 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex) 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(); @@ -419,8 +420,6 @@ int LyXText::singleWidth(Paragraph const & par, pos_type pos) const 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(); @@ -475,8 +474,8 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont()); 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); @@ -490,6 +489,13 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const } } + // 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(par); switch (layout->margintype) { case MARGIN_DYNAMIC: @@ -594,14 +600,12 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const && !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)) @@ -1005,7 +1009,8 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row) if (bv_owner->text() == this) { if (pit == 0 && row.pos() == 0) maxasc += 20; - if (pit + 1 == pars_.size() && row.endpos() == par.size()) + if (pit + 1 == pit_type(pars_.size()) && + row.endpos() == par.size()) maxdesc += 20; } @@ -1172,8 +1177,9 @@ void LyXText::insertChar(LCursor & cur, char c) 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. " @@ -1188,8 +1194,7 @@ void LyXText::insertChar(LCursor & cur, char c) current_font = rawtmpfont; real_current_font = realtmpfont; - //setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary()); - setCursor(cur, cur.pit(), cur.pos() + 1, false, true); + setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary()); charInserted(); } @@ -1696,7 +1701,7 @@ bool LyXText::redoParagraph(pit_type const pit) InsetList::iterator iend = par.insetlist.end(); for (; ii != iend; ++ii) { Dimension dim; - int const w = maxwidth_ - leftMargin(pit) - rightMargin(par); + int const w = maxwidth_ - leftMargin(pit, ii->pos) - rightMargin(par); MetricsInfo mi(bv(), getFont(par, ii->pos), w); ii->inset->metrics(mi, dim); } @@ -1718,6 +1723,20 @@ bool LyXText::redoParagraph(pit_type const pit) 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(pit, row); + setHeightOfRow(pit, row); + par.rows().push_back(row); + dim.des += row.height(); + } + dim.asc += par.rows()[0].ascent(); dim.des -= par.rows()[0].ascent(); @@ -1777,12 +1796,8 @@ void LyXText::drawSelection(PainterInfo & pi, int x , int) const lyxerr << "draw selection at " << x << endl; - // is there a better way of getting these two iterators? - DocIterator beg = cur; - DocIterator end = cur; - - beg.top() = cur.selBegin(); - end.top() = cur.selEnd(); + 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 @@ -1850,12 +1865,8 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const << "draw selection at " << x << endl; - // is there a better way of getting these two iterators? - DocIterator beg = cur; - DocIterator end = cur; - - beg.top() = cur.selBegin(); - end.top() = cur.selEnd(); + 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 @@ -1899,12 +1910,13 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const 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; } @@ -1989,8 +2001,6 @@ void LyXText::write(Buffer const & buf, std::ostream & os) const bool LyXText::read(Buffer const & buf, LyXLex & lex) { - static Change current_change; - Paragraph::depth_type depth = 0; while (lex.isOK()) { @@ -2101,8 +2111,8 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const body_pos = 0; // Use font span to speed things up, see below - FontSpan font_span = par.fontSpan(row_pos); - LyXFont font = getFont(par, row_pos); + FontSpan font_span; + LyXFont font; for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) { pos_type pos = bidi.vis2log(vpos); @@ -2130,8 +2140,19 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const // see correction above if (boundary_correction) - x += singleWidth(par, ppos); - + if (getFont(par, ppos).isVisibleRightToLeft()) + x -= singleWidth(par, ppos); + else + x += singleWidth(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()); + if (!boundary && font.isVisibleRightToLeft() + && par.isInset(sl.pos())) + x -= par.getInset(sl.pos())->width(); + } return int(x); } @@ -2306,7 +2327,7 @@ pos_type LyXText::x2pos(pit_type pit, int row, int x) const // x,y are screen coordinates // sets cursor only within this LyXText -void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y) +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(); @@ -2345,5 +2366,5 @@ void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y) << " pos: " << pos << endl; - setCursor(cur, pit, pos, true, bound); + return setCursor(cur, pit, pos, true, bound); }