X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=5c54cc342bd0b1f5611f04566b6d72d180835172;hb=70c0f419f6402fc7d0856bd7a870f80f5f51e30d;hp=8cef593271959d27c3ba245b67ba3d7ee82f76ee;hpb=4c8d536692beabcec88771a53b40eaf6acd76f49;p=lyx.git diff --git a/src/text.C b/src/text.C index 8cef593271..5c54cc342b 100644 --- a/src/text.C +++ b/src/text.C @@ -20,13 +20,18 @@ #include "author.h" #include "buffer.h" +#include "buffer_funcs.h" #include "bufferparams.h" #include "BufferView.h" #include "cursor.h" +#include "coordcache.h" +#include "CutAndPaste.h" #include "debug.h" #include "dispatchresult.h" #include "encoding.h" +#include "errorlist.h" #include "funcrequest.h" +#include "factory.h" #include "FontIterator.h" #include "gettext.h" #include "language.h" @@ -47,14 +52,29 @@ #include "frontends/font_metrics.h" #include "frontends/LyXView.h" +#include "frontends/Painter.h" #include "insets/insettext.h" +#include "insets/insetbibitem.h" +#include "insets/insethfill.h" +#include "insets/insetlatexaccent.h" +#include "insets/insetline.h" +#include "insets/insetnewline.h" +#include "insets/insetpagebreak.h" +#include "insets/insetoptarg.h" +#include "insets/insetspace.h" +#include "insets/insetspecialchar.h" +#include "insets/insettabular.h" #include "support/lstrings.h" #include "support/textutils.h" -#include "support/tostr.h" -#include "support/std_sstream.h" +#include "support/convert.h" +#include + +#include + +using lyx::pit_type; using lyx::pos_type; using lyx::word_location; @@ -64,6 +84,9 @@ using lyx::support::lowercase; using lyx::support::split; using lyx::support::uppercase; +using lyx::cap::cutSelection; + +using std::auto_ptr; using std::advance; using std::distance; using std::max; @@ -72,14 +95,6 @@ using std::endl; using std::string; -/// some space for drawing the 'nested' markers (in pixel) -extern int const NEST_MARGIN = 20; -/// margin for changebar -extern int const CHANGEBAR_MARGIN = 10; -/// right margin -extern int const RIGHT_MARGIN = 10; - - namespace { int numberOfSeparators(Paragraph const & par, Row const & row) @@ -95,17 +110,6 @@ int numberOfSeparators(Paragraph const & par, Row const & row) } -unsigned int maxParagraphWidth(ParagraphList const & plist) -{ - unsigned int width = 0; - ParagraphList::const_iterator pit = plist.begin(); - ParagraphList::const_iterator end = plist.end(); - for (; pit != end; ++pit) - width = std::max(width, pit->width); - return width; -} - - int numberOfLabelHfills(Paragraph const & par, Row const & row) { pos_type last = row.endpos() - 1; @@ -148,24 +152,238 @@ int numberOfHfills(Paragraph const & par, Row const & row) return n; } -} // namespace anon - -BufferView * LyXText::bv() +void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex, + string const & token, LyXFont & font, Change & change) { - BOOST_ASSERT(bv_owner != 0); - return bv_owner; + BufferParams const & bp = buf.params(); + + if (token[0] != '\\') { + string::const_iterator cit = token.begin(); + for (; cit != token.end(); ++cit) + par.insertChar(par.size(), (*cit), font, change); + } else if (token == "\\begin_layout") { + lex.eatLine(); + string layoutname = lex.getString(); + + font = LyXFont(LyXFont::ALL_INHERIT, bp.language); + change = Change(); + + LyXTextClass const & tclass = bp.getLyXTextClass(); + + if (layoutname.empty()) { + layoutname = tclass.defaultLayoutName(); + } + + bool hasLayout = tclass.hasLayout(layoutname); + + if (!hasLayout) { + buf.error(ErrorItem(_("Unknown layout"), + bformat(_("Layout '%1$s' does not exist in textclass '%2$s'\nTrying to use the default instead.\n"), + layoutname, tclass.name()), par.id(), 0, par.size())); + layoutname = tclass.defaultLayoutName(); + } + + par.layout(bp.getLyXTextClass()[layoutname]); + + // Test whether the layout is obsolete. + LyXLayout_ptr const & layout = par.layout(); + if (!layout->obsoleted_by().empty()) + par.layout(bp.getLyXTextClass()[layout->obsoleted_by()]); + + par.params().read(lex); + + } else if (token == "\\end_layout") { + lyxerr << BOOST_CURRENT_FUNCTION + << ": 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" + << "Missing \\begin_inset?.\n"; + } else if (token == "\\begin_inset") { + InsetBase * inset = readInset(lex, buf); + if (inset) + par.insertInset(par.size(), inset, font, change); + else { + lex.eatLine(); + string line = lex.getString(); + buf.error(ErrorItem(_("Unknown Inset"), line, + par.id(), 0, par.size())); + } + } else if (token == "\\family") { + lex.next(); + font.setLyXFamily(lex.getString()); + } else if (token == "\\series") { + lex.next(); + font.setLyXSeries(lex.getString()); + } else if (token == "\\shape") { + lex.next(); + font.setLyXShape(lex.getString()); + } else if (token == "\\size") { + lex.next(); + font.setLyXSize(lex.getString()); + } else if (token == "\\lang") { + lex.next(); + string const tok = lex.getString(); + Language const * lang = languages.getLanguage(tok); + if (lang) { + font.setLanguage(lang); + } else { + font.setLanguage(bp.language); + lex.printError("Unknown language `$$Token'"); + } + } else if (token == "\\numeric") { + lex.next(); + font.setNumber(font.setLyXMisc(lex.getString())); + } else if (token == "\\emph") { + lex.next(); + font.setEmph(font.setLyXMisc(lex.getString())); + } else if (token == "\\bar") { + lex.next(); + string const tok = lex.getString(); + + if (tok == "under") + font.setUnderbar(LyXFont::ON); + else if (tok == "no") + font.setUnderbar(LyXFont::OFF); + else if (tok == "default") + font.setUnderbar(LyXFont::INHERIT); + else + lex.printError("Unknown bar font flag " + "`$$Token'"); + } else if (token == "\\noun") { + lex.next(); + font.setNoun(font.setLyXMisc(lex.getString())); + } else if (token == "\\color") { + lex.next(); + font.setLyXColor(lex.getString()); + } else if (token == "\\InsetSpace" || token == "\\SpecialChar") { + + // Insets don't make sense in a free-spacing context! ---Kayvan + if (par.isFreeSpacing()) { + if (token == "\\InsetSpace") + par.insertChar(par.size(), ' ', font, change); + else if (lex.isOK()) { + lex.next(); + string const next_token = lex.getString(); + if (next_token == "\\-") + par.insertChar(par.size(), '-', font, change); + else { + lex.printError("Token `$$Token' " + "is in free space " + "paragraph layout!"); + } + } + } else { + auto_ptr inset; + if (token == "\\SpecialChar" ) + inset.reset(new InsetSpecialChar); + else + inset.reset(new InsetSpace); + inset->read(buf, lex); + par.insertInset(par.size(), inset.release(), + font, change); + } + } else if (token == "\\i") { + auto_ptr inset(new InsetLatexAccent); + inset->read(buf, lex); + par.insertInset(par.size(), inset.release(), font, change); + } else if (token == "\\backslash") { + par.insertChar(par.size(), '\\', font, change); + } else if (token == "\\newline") { + auto_ptr inset(new InsetNewline); + inset->read(buf, lex); + par.insertInset(par.size(), inset.release(), font, change); + } else if (token == "\\LyXTable") { + auto_ptr 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 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 InsetLine, font, change); + } 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; + is >> aid >> ct; + 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; + is >> aid >> ct; + 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()), + par.id(), 0, par.size())); + } } -double LyXText::spacing(Paragraph const & par) const +void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex) { - if (par.params().spacing().isDefault()) - return bv()->buffer()->params().spacing().getValue(); - return par.params().spacing().getValue(); + lex.nextToken(); + string token = lex.getString(); + LyXFont font; + Change change; + + while (lex.isOK()) { + + readParToken(buf, par, lex, token, font, change); + + lex.nextToken(); + token = lex.getString(); + + if (token.empty()) + continue; + + if (token == "\\end_layout") { + //Ok, paragraph finished + break; + } + + lyxerr[Debug::PARSER] << "Handling paragraph token: `" + << token << '\'' << endl; + if (token == "\\begin_layout" || token == "\\end_document" + || token == "\\end_inset" || token == "\\begin_deeper" + || token == "\\end_deeper") { + lex.pushToken(token); + lyxerr << "Paragraph ended in line " + << lex.getLineNo() << "\n" + << "Missing \\end_layout.\n"; + break; + } + } + // Initialize begin_of_body_ on load; redoParagraph maintains + par.setBeginOfBody(); } +} // namespace anon + + + BufferView * LyXText::bv() const { BOOST_ASSERT(bv_owner != 0); @@ -173,165 +391,150 @@ BufferView * LyXText::bv() const } -void LyXText::updateParPositions() +double LyXText::spacing(Paragraph const & par) const { - ParagraphList::iterator pit = paragraphs().begin(); - ParagraphList::iterator end = paragraphs().end(); - for (height_ = 0; pit != end; ++pit) { - pit->y = height_; - height_ += pit->height; - } + if (par.params().spacing().isDefault()) + return bv()->buffer()->params().spacing().getValue(); + return par.params().spacing().getValue(); } int LyXText::width() const { - return width_; + return dim_.wid; } int LyXText::height() const { - return height_; + return dim_.height(); } -int LyXText::singleWidth(ParagraphList::iterator pit, pos_type pos) const +int LyXText::singleWidth(Paragraph const & par, pos_type pos) const { - if (pos >= pit->size()) - return 0; - - char const c = pit->getChar(pos); - return singleWidth(pit, pos, c, getFont(pit, pos)); + return singleWidth(par, pos, par.getChar(pos), getFont(par, pos)); } -int LyXText::singleWidth(ParagraphList::iterator pit, +int LyXText::singleWidth(Paragraph const & par, pos_type pos, char c, LyXFont const & font) const { - if (pos >= pit->size()) { - lyxerr << "in singleWidth(), pos: " << pos << endl; - BOOST_ASSERT(false); - return 0; - } - // The most common case is handled first (Asger) if (IsPrintable(c)) { - if (!font.language()->RightToLeft()) { + Language const * language = font.language(); + if (language->RightToLeft()) { if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 || lyxrc.font_norm_type == LyXRC::ISO_10646_1) - && font.language()->lang() == "arabic") { + && language->lang() == "arabic") { if (Encodings::IsComposeChar_arabic(c)) return 0; - else - c = pit->transformChar(c, pos); - } else if (font.language()->lang() == "hebrew" && - Encodings::IsComposeChar_hebrew(c)) + c = par.transformChar(c, pos); + } else if (language->lang() == "hebrew" && + Encodings::IsComposeChar_hebrew(c)) return 0; } return font_metrics::width(c, font); } if (c == Paragraph::META_INSET) - return pit->getInset(pos)->width(); + return par.getInset(pos)->width(); - if (IsSeparatorChar(c)) - c = ' '; return font_metrics::width(c, font); } -int LyXText::leftMargin(ParagraphList::iterator pit) const +int LyXText::leftMargin(pit_type pit) const { - return leftMargin(pit, pit->size()); + BOOST_ASSERT(pit >= 0); + BOOST_ASSERT(pit < int(pars_.size())); + return leftMargin(pit, pars_[pit].size()); } -int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const +int LyXText::leftMargin(pit_type const pit, pos_type const pos) const { + BOOST_ASSERT(pit >= 0); + BOOST_ASSERT(pit < int(pars_.size())); + Paragraph const & par = pars_[pit]; + BOOST_ASSERT(pos >= 0); + BOOST_ASSERT(pos <= par.size()); + //lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl; LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass(); - LyXLayout_ptr const & layout = pit->layout(); + LyXLayout_ptr const & layout = par.layout(); string parindent = layout->parindent; - int x = NEST_MARGIN + CHANGEBAR_MARGIN; + int l_margin = 0; - x += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont()); + if (isMainText()) + l_margin += changebarMargin(); - // This is the way LyX handles LaTeX-Environments. - // I have had this idea very late, so it seems to be a - // later added hack and this is true - if (pit->getDepth() == 0) { - if (pit->layout() == tclass.defaultLayout()) { - // find the previous same level paragraph - if (pit != paragraphs().begin()) { - ParagraphList::iterator newpit = - depthHook(pit, paragraphs(), pit->getDepth()); - if (newpit == pit && newpit->layout()->nextnoindent) + l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont()); + + if (par.getDepth() != 0) { + // 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); + } + if (par.layout() == tclass.defaultLayout()) { + if (pars_[newpar].params().noindent()) parindent.erase(); + else + parindent = pars_[newpar].layout()->parindent; } } - } else { - // find the next level paragraph - ParagraphList::iterator newpar = - outerHook(pit, paragraphs()); - - // Make a corresponding row. Need to call leftMargin() - // to check whether it is a sufficent paragraph. - if (newpar != paragraphs().end() - && newpar->layout()->isEnvironment()) { - x = leftMargin(newpar); - } - - if (newpar != paragraphs().end() - && pit->layout() == tclass.defaultLayout()) { - if (newpar->params().noindent()) - parindent.erase(); - else - parindent = newpar->layout()->parindent; - } } - LyXFont const labelfont = getLabelFont(pit); + // 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: if (!layout->leftmargin.empty()) - x += font_metrics::signedWidth(layout->leftmargin, + l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()); - if (!pit->getLabelstring().empty()) { - x += font_metrics::signedWidth(layout->labelindent, + if (!par.getLabelstring().empty()) { + l_margin += font_metrics::signedWidth(layout->labelindent, labelfont); - x += font_metrics::width(pit->getLabelstring(), + l_margin += font_metrics::width(par.getLabelstring(), labelfont); - x += font_metrics::width(layout->labelsep, labelfont); + l_margin += font_metrics::width(layout->labelsep, labelfont); } break; case MARGIN_MANUAL: - x += font_metrics::signedWidth(layout->labelindent, labelfont); + l_margin += font_metrics::signedWidth(layout->labelindent, labelfont); // The width of an empty par, even with manual label, should be 0 - if (!pit->empty() && pos >= pit->beginOfBody()) { - if (!pit->getLabelWidthString().empty()) { - x += font_metrics::width(pit->getLabelWidthString(), + if (!par.empty() && pos >= par.beginOfBody()) { + if (!par.getLabelWidthString().empty()) { + l_margin += font_metrics::width(par.getLabelWidthString(), labelfont); - x += font_metrics::width(layout->labelsep, labelfont); + l_margin += font_metrics::width(layout->labelsep, labelfont); } } break; case MARGIN_STATIC: - x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4 - / (pit->getDepth() + 4); + l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4 + / (par.getDepth() + 4); break; case MARGIN_FIRST_DYNAMIC: if (layout->labeltype == LABEL_MANUAL) { - if (pos >= pit->beginOfBody()) { - x += font_metrics::signedWidth(layout->leftmargin, + if (pos >= par.beginOfBody()) { + l_margin += font_metrics::signedWidth(layout->leftmargin, labelfont); } else { - x += font_metrics::signedWidth(layout->labelindent, + l_margin += font_metrics::signedWidth(layout->labelindent, labelfont); } } else if (pos != 0 @@ -339,17 +542,17 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const // theorems (JMarc) || (layout->labeltype == LABEL_STATIC && layout->latextype == LATEX_ENVIRONMENT - && !isFirstInSequence(pit, paragraphs()))) { - x += font_metrics::signedWidth(layout->leftmargin, + && !isFirstInSequence(pit, pars_))) { + l_margin += font_metrics::signedWidth(layout->leftmargin, labelfont); } else if (layout->labeltype != LABEL_TOP_ENVIRONMENT && layout->labeltype != LABEL_BIBLIO && layout->labeltype != LABEL_CENTERED_TOP_ENVIRONMENT) { - x += font_metrics::signedWidth(layout->labelindent, + l_margin += font_metrics::signedWidth(layout->labelindent, labelfont); - x += font_metrics::width(layout->labelsep, labelfont); - x += font_metrics::width(pit->getLabelstring(), + l_margin += font_metrics::width(layout->labelsep, labelfont); + l_margin += font_metrics::width(par.getLabelstring(), labelfont); } break; @@ -358,33 +561,34 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const #if 0 // ok, a terrible hack. The left margin depends on the widest // row in this paragraph. - RowList::iterator rit = pit->rows.begin(); - RowList::iterator end = pit->rows.end(); + RowList::iterator rit = par.rows().begin(); + RowList::iterator end = par.rows().end(); +#ifdef WITH_WARNINGS #warning This is wrong. +#endif int minfill = maxwidth_; for ( ; rit != end; ++rit) if (rit->fill() < minfill) minfill = rit->fill(); - x += font_metrics::signedWidth(layout->leftmargin, + l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()); - x += minfill; + l_margin += minfill; #endif // also wrong, but much shorter. - x += maxwidth_ / 2; + l_margin += maxwidth_ / 2; break; } } - - if (!pit->params().leftIndent().zero()) - x += pit->params().leftIndent().inPixels(maxwidth_); + if (!par.params().leftIndent().zero()) + l_margin += par.params().leftIndent().inPixels(maxwidth_); LyXAlignment align; - if (pit->params().align() == LYX_ALIGN_LAYOUT) + if (par.params().align() == LYX_ALIGN_LAYOUT) align = layout->align; else - align = pit->params().align(); + align = par.params().align(); // set the correct parindent if (pos == 0 @@ -393,43 +597,49 @@ int LyXText::leftMargin(ParagraphList::iterator pit, pos_type pos) const || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT || (layout->labeltype == LABEL_STATIC && layout->latextype == LATEX_ENVIRONMENT - && !isFirstInSequence(pit, paragraphs()))) + && !isFirstInSequence(pit, pars_))) && align == LYX_ALIGN_BLOCK - && !pit->params().noindent() - // in tabulars and ert paragraphs are never indented! - && (!pit->inInset() - || !pit->inInset()->owner() - || (pit->inInset()->owner()->lyxCode() != InsetOld::TABULAR_CODE - && pit->inInset()->owner()->lyxCode() != InsetOld::ERT_CODE)) - && (pit->layout() != tclass.defaultLayout() + && !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()) + && (par.layout() != tclass.defaultLayout() || bv()->buffer()->params().paragraph_separation == BufferParams::PARSEP_INDENT)) { - x += font_metrics::signedWidth(parindent, tclass.defaultfont()); + l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont()); } - return x; + return l_margin; } int LyXText::rightMargin(Paragraph const & par) const { - LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass(); + // We do not want rightmargins on inner texts. + if (bv()->text() != this) + return 0; - return - RIGHT_MARGIN + LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass(); + int const r_margin = + ::rightMargin() + font_metrics::signedWidth(tclass.rightmargin(), - tclass.defaultfont()) + tclass.defaultfont()) + font_metrics::signedWidth(par.layout()->rightmargin, - tclass.defaultfont()) + tclass.defaultfont()) * 4 / (par.getDepth() + 4); + + return r_margin; } -int LyXText::labelEnd(ParagraphList::iterator pit) const +int LyXText::labelEnd(pit_type const pit) const { // labelEnd is only needed if the layout fills a flushleft label. - if (pit->layout()->margintype != MARGIN_MANUAL) + if (pars_[pit].layout()->margintype != MARGIN_MANUAL) return 0; // return the beginning of the body return leftMargin(pit); @@ -453,9 +663,10 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par) }; -void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const +void LyXText::rowBreakPoint(pit_type const pit, Row & row) const { - pos_type const end = pit->size(); + Paragraph const & par = pars_[pit]; + pos_type const end = par.size(); pos_type const pos = row.pos(); if (pos == end) { row.endpos(end); @@ -463,20 +674,20 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const } // maximum pixel width of a row - int width = maxwidth_ - rightMargin(*pit); // - leftMargin(pit, row); + int width = maxwidth_ - rightMargin(par); // - leftMargin(pit, row); if (width < 0) { row.endpos(end); return; } - LyXLayout_ptr const & layout = pit->layout(); + LyXLayout_ptr const & layout = par.layout(); if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) { - row.endpos(addressBreakPoint(pos, *pit)); + row.endpos(addressBreakPoint(pos, par)); return; } - pos_type const body_pos = pit->beginOfBody(); + pos_type const body_pos = par.beginOfBody(); // Now we iterate through until we reach the right margin @@ -489,29 +700,26 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const // pixel width since last breakpoint int chunkwidth = 0; - FontIterator fi = FontIterator(*this, pit, pos); + FontIterator fi = FontIterator(*this, par, pos); pos_type point = end; pos_type i = pos; for ( ; i < end; ++i, ++fi) { - char const c = pit->getChar(i); + char const c = par.getChar(i); + int thiswidth = singleWidth(par, i, c, *fi); - { - int thiswidth = singleWidth(pit, 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 the auto-hfill from label end to the body - if (body_pos && i == body_pos) { - int add = font_metrics::width(layout->labelsep, getLabelFont(pit)); - if (pit->isLineSeparator(i - 1)) - add -= singleWidth(pit, i - 1); - - add = std::max(add, labelEnd(pit) - x); - thiswidth += add; - } - - 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) { @@ -527,26 +735,26 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const break; } - if (pit->isNewline(i)) { + if (par.isNewline(i)) { point = i + 1; break; } // Break before... if (i + 1 < end) { - if (pit->isInset(i + 1) && pit->getInset(i + 1)->display()) { + if (par.isInset(i + 1) && par.getInset(i + 1)->display()) { point = i + 1; break; } // ...and after. - if (pit->isInset(i) && pit->getInset(i)->display()) { + if (par.isInset(i) && par.getInset(i)->display()) { point = i + 1; break; } } - - if (!pit->isInset(i) || pit->getInset(i)->isChar()) { + + if (!par.isInset(i) || par.getInset(i)->isChar()) { // some insets are line separators too - if (pit->isLineSeparator(i)) { + if (par.isLineSeparator(i)) { // register breakpoint: point = i + 1; chunkwidth = 0; @@ -568,46 +776,47 @@ void LyXText::rowBreakPoint(ParagraphList::iterator pit, Row & row) const } -void LyXText::setRowWidth(ParagraphList::iterator pit, Row & row) const +void LyXText::setRowWidth(pit_type const pit, Row & row) const { // get the pure distance pos_type const end = row.endpos(); - string labelsep = pit->layout()->labelsep; + Paragraph const & par = pars_[pit]; + string const & labelsep = par.layout()->labelsep; int w = leftMargin(pit, row.pos()); - pos_type const body_pos = pit->beginOfBody(); + pos_type const body_pos = par.beginOfBody(); pos_type i = row.pos(); if (i < end) { - FontIterator fi = FontIterator(*this, pit, i); + FontIterator fi = FontIterator(*this, par, i); for ( ; i < end; ++i, ++fi) { if (body_pos > 0 && i == body_pos) { - w += font_metrics::width(labelsep, getLabelFont(pit)); - if (pit->isLineSeparator(i - 1)) - w -= singleWidth(pit, i - 1); + w += font_metrics::width(labelsep, getLabelFont(par)); + if (par.isLineSeparator(i - 1)) + w -= singleWidth(par, i - 1); w = max(w, labelEnd(pit)); } - char const c = pit->getChar(i); - w += singleWidth(pit, i, c, *fi); + char const c = par.getChar(i); + w += singleWidth(par, i, c, *fi); } } if (body_pos > 0 && body_pos >= end) { - w += font_metrics::width(labelsep, getLabelFont(pit)); - if (end > 0 && pit->isLineSeparator(end - 1)) - w -= singleWidth(pit, end - 1); + w += font_metrics::width(labelsep, getLabelFont(par)); + if (end > 0 && par.isLineSeparator(end - 1)) + w -= singleWidth(par, end - 1); w = max(w, labelEnd(pit)); } - row.width(w + rightMargin(*pit)); + row.width(w + rightMargin(par)); } // returns the minimum space a manual label needs on the screen in pixel -int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const +int LyXText::labelFill(Paragraph const & par, Row const & row) const { - pos_type last = pit->beginOfBody(); + pos_type last = par.beginOfBody(); BOOST_ASSERT(last > 0); @@ -615,18 +824,18 @@ int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const --last; // a separator at this end does not count - if (pit->isLineSeparator(last)) + if (par.isLineSeparator(last)) --last; int w = 0; for (pos_type i = row.pos(); i <= last; ++i) - w += singleWidth(pit, i); + w += singleWidth(par, i); - string const & label = pit->params().labelWidthString(); + string const & label = par.params().labelWidthString(); if (label.empty()) return 0; - return max(0, font_metrics::width(label, getLabelFont(pit)) - w); + return max(0, font_metrics::width(label, getLabelFont(par)) - w); } @@ -636,8 +845,9 @@ LColor_color LyXText::backgroundColor() const } -void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row) +void LyXText::setHeightOfRow(pit_type const pit, Row & row) { + Paragraph const & par = pars_[pit]; // get the maximum ascent and the maximum descent double layoutasc = 0; double layoutdesc = 0; @@ -646,29 +856,29 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row) // ok, let us initialize the maxasc and maxdesc value. // Only the fontsize count. The other properties // are taken from the layoutfont. Nicer on the screen :) - LyXLayout_ptr const & layout = pit->layout(); + LyXLayout_ptr const & layout = par.layout(); // as max get the first character of this row then it can // 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(pit, row.pos()); + LyXFont font = getFont(par, row.pos()); LyXFont::FONT_SIZE const tmpsize = font.size(); font = getLayoutFont(pit); LyXFont::FONT_SIZE const size = font.size(); font.setSize(tmpsize); - LyXFont labelfont = getLabelFont(pit); + LyXFont labelfont = getLabelFont(par); // these are minimum values - double const spacing_val = layout->spacing.getValue() * spacing(*pit); + 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); // insets may be taller - InsetList::iterator ii = pit->insetlist.begin(); - InsetList::iterator iend = pit->insetlist.end(); + InsetList::const_iterator ii = par.insetlist.begin(); + InsetList::const_iterator iend = par.insetlist.end(); for ( ; ii != iend; ++ii) { if (ii->pos >= row.pos() && ii->pos < row.endpos()) { maxasc = max(maxasc, ii->inset->ascent()); @@ -683,7 +893,7 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row) pos_type const pos_end = row.endpos(); LyXFont::FONT_SIZE maxsize = - pit->highestFontInRange(row.pos(), pos_end, size); + par.highestFontInRange(row.pos(), pos_end, size); if (maxsize > font.size()) { font.setSize(maxsize); maxasc = max(maxasc, font_metrics::maxAscent(font)); @@ -694,7 +904,7 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row) ++maxasc; ++maxdesc; - row.ascent_of_text(maxasc); + row.ascent(maxasc); // is it a top line? if (row.pos() == 0) { @@ -702,22 +912,24 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row) // some parksips VERY EASY IMPLEMENTATION if (bv()->buffer()->params().paragraph_separation == BufferParams::PARSEP_SKIP - && pit != paragraphs().begin() - && ((layout->isParagraph() && pit->getDepth() == 0) - || (boost::prior(pit)->layout()->isParagraph() - && boost::prior(pit)->getDepth() == 0))) + && pit != 0 + && ((layout->isParagraph() && par.getDepth() == 0) + || (pars_[pit - 1].layout()->isParagraph() + && pars_[pit - 1].getDepth() == 0))) { maxasc += bufparams.getDefSkip().inPixels(*bv()); } - if (pit->params().startOfAppendix()) + if (par.params().startOfAppendix()) maxasc += int(3 * dh); // This is special code for the chapter, since the label of this // layout is printed in an extra row - if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) { + if (layout->counter == "chapter" + && !par.params().labelString().empty()) { labeladdon = int(font_metrics::maxHeight(labelfont) - * layout->spacing.getValue() * spacing(*pit)); + * layout->spacing.getValue() + * spacing(par)); } // special code for the top label @@ -725,12 +937,12 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row) || layout->labeltype == LABEL_BIBLIO || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) && isFirstInSequence(pit, paragraphs()) - && !pit->getLabelstring().empty()) + && !par.getLabelstring().empty()) { labeladdon = int( font_metrics::maxHeight(labelfont) * layout->spacing.getValue() - * spacing(*pit) + * spacing(par) + (layout->topsep + layout->labelbottomsep) * dh); } @@ -738,82 +950,91 @@ void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row) // a section, or between the items of a itemize or enumerate // environment. - ParagraphList::iterator prev = - depthHook(pit, paragraphs(), pit->getDepth()); + pit_type prev = depthHook(pit, pars_, par.getDepth()); if (prev != pit - && prev->layout() == layout - && prev->getDepth() == pit->getDepth() - && prev->getLabelWidthString() == pit->getLabelWidthString()) + && pars_[prev].layout() == layout + && pars_[prev].getDepth() == par.getDepth() + && pars_[prev].getLabelWidthString() == par.getLabelWidthString()) { layoutasc = layout->itemsep * dh; - } else if (pit != paragraphs().begin() || row.pos() != 0) { + } else if (pit != 0 || row.pos() != 0) { if (layout->topsep > 0) layoutasc = layout->topsep * dh; } - prev = outerHook(pit, paragraphs()); - if (prev != paragraphs().end()) { - maxasc += int(prev->layout()->parsep * dh); - } else if (pit != paragraphs().begin()) { - ParagraphList::iterator prior_pit = boost::prior(pit); - if (prior_pit->getDepth() != 0 || - prior_pit->layout() == layout) { + prev = outerHook(pit, pars_); + if (prev != pit_type(pars_.size())) { + maxasc += int(pars_[prev].layout()->parsep * dh); + } else if (pit != 0) { + if (pars_[pit - 1].getDepth() != 0 || + pars_[pit - 1].layout() == layout) { maxasc += int(layout->parsep * dh); } } } // is it a bottom line? - if (row.endpos() >= pit->size()) { + if (row.endpos() >= par.size()) { // add the layout spaces, for example before and after // a section, or between the items of a itemize or enumerate // environment - ParagraphList::iterator nextpit = boost::next(pit); - if (nextpit != paragraphs().end()) { - ParagraphList::iterator cpit = pit; + pit_type nextpit = pit + 1; + if (nextpit != pit_type(pars_.size())) { + pit_type cpit = pit; double usual = 0; double unusual = 0; - if (cpit->getDepth() > nextpit->getDepth()) { - usual = cpit->layout()->bottomsep * dh; - cpit = depthHook(cpit, paragraphs(), nextpit->getDepth()); - if (cpit->layout() != nextpit->layout() - || nextpit->getLabelWidthString() != cpit->getLabelWidthString()) + if (pars_[cpit].getDepth() > pars_[nextpit].getDepth()) { + usual = pars_[cpit].layout()->bottomsep * dh; + cpit = depthHook(cpit, paragraphs(), pars_[nextpit].getDepth()); + if (pars_[cpit].layout() != pars_[nextpit].layout() + || pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString()) { - unusual = cpit->layout()->bottomsep * dh; + unusual = pars_[cpit].layout()->bottomsep * dh; } layoutdesc = max(unusual, usual); - } else if (cpit->getDepth() == nextpit->getDepth()) { - if (cpit->layout() != nextpit->layout() - || nextpit->getLabelWidthString() != cpit->getLabelWidthString()) - layoutdesc = int(cpit->layout()->bottomsep * dh); + } else if (pars_[cpit].getDepth() == pars_[nextpit].getDepth()) { + if (pars_[cpit].layout() != pars_[nextpit].layout() + || pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString()) + layoutdesc = int(pars_[cpit].layout()->bottomsep * dh); } } } // incalculate the layout spaces - maxasc += int(layoutasc * 2 / (2 + pit->getDepth())); - maxdesc += int(layoutdesc * 2 / (2 + pit->getDepth())); + maxasc += int(layoutasc * 2 / (2 + pars_[pit].getDepth())); + maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth())); + + // Top and bottom margin of the document (only at top-level) + if (bv_owner->text() == this) { + if (pit == 0 && row.pos() == 0) + maxasc += 20; + if (pit + 1 == pit_type(pars_.size()) && + row.endpos() == par.size()) + maxdesc += 20; + } - row.height(maxasc + maxdesc + labeladdon); - row.baseline(maxasc + labeladdon); - row.top_of_text(row.baseline() - font_metrics::maxAscent(font)); + row.ascent(maxasc + labeladdon); + row.descent(maxdesc); } -void LyXText::breakParagraph(LCursor & cur, char keep_layout) +namespace { + +} + +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(); - ParagraphList::iterator cpit = getPar(cur.par()); + pit_type cpit = cur.pit(); if (cur.pos() != 0 && cur.pos() != cur.lastpos() && cpar.isChangeEdited(0, cur.pos())) return; - LyXTextClass const & tclass = - bv()->buffer()->params().getLyXTextClass(); + LyXTextClass const & tclass = cur.buffer().params().getLyXTextClass(); LyXLayout_ptr const & layout = cpar.layout(); // this is only allowed, if the current paragraph is not empty @@ -823,73 +1044,56 @@ void LyXText::breakParagraph(LCursor & cur, char keep_layout) return; // a layout change may affect also the following paragraph - recUndo(cur.par(), parOffset(undoSpan(cpit)) - 1); + recUndo(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()); - // break the paragraph + // How should the layout for the new paragraph be? + int preserve_layout = 0; if (keep_layout) - keep_layout = 2; + preserve_layout = 2; else - keep_layout = layout->isEnvironment(); + preserve_layout = layout->isEnvironment(); + + // We need to remember this before we break the paragraph, because + // that invalidates the layout variable + bool sensitive = layout->labeltype == LABEL_SENSITIVE; - // we need to set this before we insert the paragraph. IMO the - // breakParagraph call should return a bool if it inserts the - // paragraph before or behind and we should react on that one - // but we can fix this in 1.3.0 (Jug 20020509) + // we need to set this before we insert the paragraph. bool const isempty = cpar.allowEmpty() && cpar.empty(); - ::breakParagraph(bv()->buffer()->params(), paragraphs(), cpit, - cur.pos(), keep_layout); - cpit = getPar(cur.par()); - ParagraphList::iterator next_par = boost::next(cpit); + ::breakParagraph(cur.buffer().params(), paragraphs(), cpit, + cur.pos(), preserve_layout); + + // After this, neither paragraph contains any rows! + + cpit = cur.pit(); + pit_type next_par = cpit + 1; // well this is the caption hack since one caption is really enough - if (layout->labeltype == LABEL_SENSITIVE) { - if (!cur.pos()) + if (sensitive) { + if (cur.pos() == 0) // set to standard-layout - cpit->applyLayout(tclass.defaultLayout()); + pars_[cpit].applyLayout(tclass.defaultLayout()); else // set to standard-layout - next_par->applyLayout(tclass.defaultLayout()); + pars_[next_par].applyLayout(tclass.defaultLayout()); } - // if the cursor is at the beginning of a row without prior newline, - // move one row up! - // This touches only the screen-update. Otherwise we would may have - // an empty row on the screen - if (cur.pos() != 0 && cur.textRow().pos() == cur.pos() - && !cpit->isNewline(cur.pos() - 1)) - { - cursorLeft(cur); - } + while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) + pars_[next_par].erase(0); - while (!next_par->empty() && next_par->isNewline(0)) - next_par->erase(0); - - updateCounters(); - redoParagraph(cpit); - redoParagraph(next_par); + updateCounters(cur.buffer()); // This check is necessary. Otherwise the new empty paragraph will // be deleted automatically. And it is more friendly for the user! if (cur.pos() != 0 || isempty) - setCursor(cur, cur.par() + 1, 0); + setCursor(cur, cur.pit() + 1, 0); else - setCursor(cur, cur.par(), 0); -} - - -// convenience function -void LyXText::redoParagraph(LCursor & cur) -{ - BOOST_ASSERT(this == cur.text()); - cur.clearSelection(); - redoParagraph(getPar(cur.par())); - setCursorIntern(cur, cur.par(), cur.pos()); + setCursor(cur, cur.pit(), 0); } @@ -904,7 +1108,7 @@ void LyXText::insertChar(LCursor & cur, char c) Paragraph & par = cur.paragraph(); // try to remove this - ParagraphList::iterator pit = getPar(cur.par()); + pit_type const pit = cur.pit(); bool const freeSpacing = par.layout()->free_spacing || par.isFreeSpacing(); @@ -919,8 +1123,8 @@ void LyXText::insertChar(LCursor & cur, char c) !(contains(number_seperators, c) && cur.pos() != 0 && cur.pos() != cur.lastpos() && - getFont(pit, cur.pos()).number() == LyXFont::ON && - getFont(pit, cur.pos() - 1).number() == LyXFont::ON) + getFont(par, cur.pos()).number() == LyXFont::ON && + getFont(par, cur.pos() - 1).number() == LyXFont::ON) ) number(cur); // Set current_font.number to OFF } else if (IsDigit(c) && @@ -937,7 +1141,7 @@ void LyXText::insertChar(LCursor & cur, char c) setCharFont(pit, cur.pos() - 1, current_font); } else if (contains(number_seperators, c) && cur.pos() >= 2 - && getFont(pit, cur.pos() - 2).number() == LyXFont::ON) { + && getFont(par, cur.pos() - 2).number() == LyXFont::ON) { setCharFont(pit, cur.pos() - 1, current_font); } } @@ -969,12 +1173,13 @@ void LyXText::insertChar(LCursor & cur, char c) cur.message(_("You cannot insert a space at the " "beginning of a paragraph. Please read the Tutorial.")); sent_space_message = true; - return; } + 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. " @@ -985,13 +1190,11 @@ void LyXText::insertChar(LCursor & cur, char c) } } - par.insertChar(cur.pos(), c); - setCharFont(pit, cur.pos(), rawtmpfont); + par.insertChar(cur.pos(), c, rawtmpfont); current_font = rawtmpfont; real_current_font = realtmpfont; - redoParagraph(cur); - setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary()); + setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary()); charInserted(); } @@ -1011,40 +1214,41 @@ void LyXText::charInserted() RowMetrics -LyXText::computeRowMetrics(ParagraphList::iterator pit, Row const & row) const +LyXText::computeRowMetrics(pit_type const pit, Row const & row) const { RowMetrics result; + Paragraph const & par = pars_[pit]; - double w = width_ - row.width(); + double w = dim_.wid - row.width(); - bool const is_rtl = isRTL(*pit); + bool const is_rtl = isRTL(par); if (is_rtl) - result.x = rightMargin(*pit); + result.x = rightMargin(par); else result.x = leftMargin(pit, row.pos()); // is there a manual margin with a manual label - LyXLayout_ptr const & layout = pit->layout(); + LyXLayout_ptr const & layout = par.layout(); if (layout->margintype == MARGIN_MANUAL && layout->labeltype == LABEL_MANUAL) { /// We might have real hfills in the label part - int nlh = numberOfLabelHfills(*pit, row); + int nlh = numberOfLabelHfills(par, row); // A manual label par (e.g. List) has an auto-hfill // between the label text and the body of the // paragraph too. // But we don't want to do this auto hfill if the par // is empty. - if (!pit->empty()) + if (!par.empty()) ++nlh; - if (nlh && !pit->getLabelWidthString().empty()) - result.label_hfill = labelFill(pit, row) / double(nlh); + if (nlh && !par.getLabelWidthString().empty()) + result.label_hfill = labelFill(par, row) / double(nlh); } // are there any hfills in the row? - int const nh = numberOfHfills(*pit, row); + int const nh = numberOfHfills(par, row); if (nh) { if (w > 0) @@ -1056,28 +1260,28 @@ LyXText::computeRowMetrics(ParagraphList::iterator pit, Row const & row) const // is it block, flushleft or flushright? // set x how you need it int align; - if (pit->params().align() == LYX_ALIGN_LAYOUT) + if (par.params().align() == LYX_ALIGN_LAYOUT) align = layout->align; else - align = pit->params().align(); + align = par.params().align(); // Display-style insets should always be on a centred row - // The test on pit->size() is to catch zero-size pars, which + // The test on par.size() is to catch zero-size pars, which // would trigger the assert in Paragraph::getInset(). - //inset = pit->size() ? pit->getInset(row.pos()) : 0; - if (!pit->empty() - && pit->isInset(row.pos()) - && pit->getInset(row.pos())->display()) + //inset = par.size() ? par.getInset(row.pos()) : 0; + if (!par.empty() + && par.isInset(row.pos()) + && par.getInset(row.pos())->display()) { align = LYX_ALIGN_CENTER; } switch (align) { case LYX_ALIGN_BLOCK: { - int const ns = numberOfSeparators(*pit, row); + int const ns = numberOfSeparators(par, row); bool disp_inset = false; - if (row.endpos() < pit->size()) { - InsetBase * in = pit->getInset(row.endpos()); + if (row.endpos() < par.size()) { + InsetBase const * in = par.getInset(row.endpos()); if (in) disp_inset = in->display(); } @@ -1085,8 +1289,8 @@ LyXText::computeRowMetrics(ParagraphList::iterator pit, Row const & row) const // par, does not end in newline, and is not row above a // display inset... then stretch it if (ns - && row.endpos() < pit->size() - && !pit->isNewline(row.endpos() - 1) + && row.endpos() < par.size() + && !par.isNewline(row.endpos() - 1) && !disp_inset ) { result.separator = w / ns; @@ -1104,15 +1308,15 @@ LyXText::computeRowMetrics(ParagraphList::iterator pit, Row const & row) const } } - bidi.computeTables(*pit, *bv()->buffer(), row); + bidi.computeTables(par, *bv()->buffer(), row); if (is_rtl) { - pos_type body_pos = pit->beginOfBody(); + pos_type body_pos = par.beginOfBody(); pos_type end = row.endpos(); if (body_pos > 0 - && (body_pos > end || !pit->isLineSeparator(body_pos - 1))) + && (body_pos > end || !par.isLineSeparator(body_pos - 1))) { - result.x += font_metrics::width(layout->labelsep, getLabelFont(pit)); + result.x += font_metrics::width(layout->labelsep, getLabelFont(par)); if (body_pos <= end) result.x += result.label_hfill; } @@ -1125,41 +1329,47 @@ LyXText::computeRowMetrics(ParagraphList::iterator pit, Row const & row) const // the cursor set functions have a special mechanism. When they // realize, that you left an empty paragraph, they will delete it. -void LyXText::cursorRightOneWord(LCursor & cur) +bool LyXText::cursorRightOneWord(LCursor & cur) { BOOST_ASSERT(this == cur.text()); - if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) { - ++cur.par(); - cur.pos() = 0; + + LCursor old = cur; + + if (old.pos() == old.lastpos() && old.pit() != old.lastpit()) { + ++old.pit(); + old.pos() = 0; } else { // Skip through initial nonword stuff. // Treat floats and insets as words. - while (cur.pos() != cur.lastpos() && !cur.paragraph().isWord(cur.pos())) - ++cur.pos(); + while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos())) + ++old.pos(); // Advance through word. - while (cur.pos() != cur.lastpos() && cur.paragraph().isWord(cur.pos())) - ++cur.pos(); + while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos())) + ++old.pos(); } - setCursor(cur, cur.par(), cur.pos()); + return setCursor(cur, old.pit(), old.pos()); } -void LyXText::cursorLeftOneWord(LCursor & cur) +bool LyXText::cursorLeftOneWord(LCursor & cur) { BOOST_ASSERT(this == cur.text()); - if (cur.pos() == 0 && cur.par() != 0) { - --cur.par(); - cur.pos() = cur.lastpos(); - } else { + + LCursor old = cur; + + if (old.pos() == 0 && old.pit() != 0) { + --old.pit(); + old.pos() = old.lastpos(); + } else { // Skip through initial nonword stuff. // Treat floats and insets as words. - while (cur.pos() != 0 && !cur.paragraph().isWord(cur.pos() - 1)) - --cur.pos(); + while (old.pos() != 0 && !old.paragraph().isLetter(old.pos() - 1)) + --old.pos(); // Advance through word. - while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1)) - --cur.pos(); + while (old.pos() != 0 && old.paragraph().isLetter(old.pos() - 1)) + --old.pos(); } - setCursor(cur, cur.par(), cur.pos()); + return setCursor(cur, old.pit(), old.pos()); } @@ -1170,11 +1380,11 @@ void LyXText::selectWord(LCursor & cur, word_location loc) CursorSlice to = cur.top(); getWord(from, to, loc); if (cur.top() != from) - setCursor(cur, from.par(), from.pos()); + setCursor(cur, from.pit(), from.pos()); if (to == from) return; cur.resetAnchor(); - setCursor(cur, to.par(), to.pos()); + setCursor(cur, to.pit(), to.pos()); cur.setSelection(); } @@ -1199,15 +1409,16 @@ void LyXText::acceptChange(LCursor & cur) CursorSlice const & startc = cur.selBegin(); CursorSlice const & endc = cur.selEnd(); - if (startc.par() == endc.par()) { + if (startc.pit() == endc.pit()) { recordUndoSelection(cur, Undo::INSERT); - getPar(startc)->acceptChange(startc.pos(), endc.pos()); + pars_[startc.pit()].acceptChange(startc.pos(), endc.pos()); finishUndo(); cur.clearSelection(); - redoParagraph(getPar(startc)); - setCursorIntern(cur, startc.par(), 0); + setCursorIntern(cur, startc.pit(), 0); } +#ifdef WITH_WARNINGS #warning handle multi par selection +#endif } @@ -1219,15 +1430,16 @@ void LyXText::rejectChange(LCursor & cur) CursorSlice const & startc = cur.selBegin(); CursorSlice const & endc = cur.selEnd(); - if (startc.par() == endc.par()) { + if (startc.pit() == endc.pit()) { recordUndoSelection(cur, Undo::INSERT); - getPar(startc)->rejectChange(startc.pos(), endc.pos()); + pars_[startc.pit()].rejectChange(startc.pos(), endc.pos()); finishUndo(); cur.clearSelection(); - redoParagraph(getPar(startc)); - setCursorIntern(cur, startc.par(), 0); + setCursorIntern(cur, startc.pit(), 0); } +#ifdef WITH_WARNINGS #warning handle multi par selection +#endif } @@ -1294,25 +1506,24 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action) from = cur.selBegin(); to = cur.selEnd(); } else { - from = cursor(); + from = cur.top(); getWord(from, to, lyx::PARTIAL_WORD); - setCursor(cur, to.par(), to.pos() + 1); + setCursor(cur, to.pit(), to.pos() + 1); } recordUndoSelection(cur); pos_type pos = from.pos(); - int par = from.par(); + int par = from.pit(); - while (par != int(paragraphs().size()) && - (pos != to.pos() || par != to.par())) { - ParagraphList::iterator pit = getPar(par); - if (pos == pit->size()) { + while (par != int(pars_.size()) && (pos != to.pos() || par != to.pit())) { + pit_type pit = par; + if (pos == pars_[pit].size()) { ++par; pos = 0; continue; } - unsigned char c = pit->getChar(pos); + unsigned char c = pars_[pit].getChar(pos); if (c != Paragraph::META_INSET) { switch (action) { case text_lowercase: @@ -1327,8 +1538,10 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action) break; } } +#ifdef WITH_WARNINGS #warning changes - pit->setChar(pos, c); +#endif + pars_[pit].setChar(pos, c); ++pos; } } @@ -1337,12 +1550,21 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action) void LyXText::Delete(LCursor & cur) { BOOST_ASSERT(this == cur.text()); - // just move to the right, if we had success make a backspace - CursorSlice sl = cur.top(); - cursorRight(cur); - if (sl == cur.top()) { - recordUndo(cur, Undo::DELETE, cur.par(), max(0, cur.par() - 1)); + + if (cur.pos() != cur.lastpos()) { + recordUndo(cur, Undo::DELETE, cur.pit()); + setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary()); backspace(cur); + } 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); + } else { + setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary()); + } } } @@ -1370,26 +1592,35 @@ void LyXText::backspace(LCursor & cur) // left and let the DeleteEmptyParagraphMechanism // handle the actual deletion of the paragraph. - if (cur.par() != 0) { + 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); - // the layout things can change the height of a row ! - redoParagraph(cur); return; } } - if (cur.par() != 0) - recordUndo(cur, Undo::DELETE, cur.par() - 1); + if (cur.pit() != 0) + recordUndo(cur, Undo::DELETE, cur.pit() - 1); - ParagraphList::iterator tmppit = getPar(cur.par()); + 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.par() != 0) { + if (cur.pit() != 0) { // steps into the above paragraph. - setCursorIntern(cur, cur.par() - 1, - getPar(cur.par() - 1)->size(), + setCursorIntern(cur, cur.pit() - 1, + pars_[cur.pit() - 1].size(), false); } @@ -1397,23 +1628,24 @@ void LyXText::backspace(LCursor & cur) // 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 - Buffer & buf = *bv()->buffer(); + // Correction (Jug 20050717): Remove check about alignment! + Buffer & buf = cur.buffer(); BufferParams const & bufparams = buf.params(); LyXTextClass const & tclass = bufparams.getLyXTextClass(); - ParagraphList::iterator const cpit = getPar(cur.par()); + pit_type const cpit = cur.pit(); if (cpit != tmppit - && (cpit->layout() == tmppit->layout() - || tmppit->layout() == tclass.defaultLayout()) - && cpit->getAlign() == tmppit->getAlign()) { - mergeParagraph(bufparams, buf.paragraphs(), cpit); + && (pars_[cpit].layout() == pars_[tmppit].layout() + || pars_[tmppit].layout() == tclass.defaultLayout())) + { + mergeParagraph(bufparams, pars_, cpit); - if (cur.pos() != 0 && cpit->isSeparator(cur.pos() - 1)) + if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1)) --cur.pos(); // the counters may have changed - updateCounters(); - setCursor(cur, cur.par(), cur.pos(), false); + updateCounters(cur.buffer()); + setCursor(cur, cur.pit(), cur.pos(), false); } } else { // this is the code for a normal backspace, not pasting @@ -1423,7 +1655,7 @@ void LyXText::backspace(LCursor & cur) // not a good idea since it triggers the auto-delete // mechanism. So we do a cursorLeftIntern()-lite, // without the dreaded mechanism. (JMarc) - setCursorIntern(cur, cur.par(), cur.pos() - 1, + setCursorIntern(cur, cur.pit(), cur.pos() - 1, false, cur.boundary()); cur.paragraph().erase(cur.pos()); } @@ -1431,287 +1663,329 @@ void LyXText::backspace(LCursor & cur) if (cur.pos() == cur.lastpos()) setCurrentFont(cur); - redoParagraph(cur); - setCursor(cur, cur.par(), cur.pos(), false, cur.boundary()); + setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary()); } -ParagraphList::iterator LyXText::cursorPar() const +Row const & LyXText::firstRow() const { - //lyxerr << "### cursorPar: cursor: " << bv()->cursor() << endl; - //lyxerr << "xxx cursorPar: cursor: " << cursor() << endl; - return getPar(cursor().par()); + return *paragraphs().front().rows().begin(); } -ParagraphList::iterator LyXText::getPar(CursorSlice const & cur) const +bool LyXText::redoParagraph(pit_type const pit) { - return getPar(cur.par()); -} - + // remove rows of paragraph, keep track of height changes + Paragraph & par = pars_[pit]; + + // Add bibitem insets if necessary + if (par.layout()->labeltype == LABEL_BIBLIO) { + bool hasbibitem(false); + if (!par.insetlist.empty() + // 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) + hasbibitem = true; + } + if (!hasbibitem) { + InsetBibitem * inset(new + InsetBibitem(InsetCommandParams("bibitem"))); + par.insertInset(0, static_cast(inset)); + bv()->cursor().posRight(); + } + } -ParagraphList::iterator LyXText::getPar(int par) const -{ - //lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl; - BOOST_ASSERT(par >= 0); - BOOST_ASSERT(par < int(paragraphs().size())); - ParagraphList::iterator pit = paragraphs().begin(); - advance(pit, par); - return pit; -} + // redo insets + 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); + ii->inset->metrics(mi, dim); + } + // rebreak the paragraph + par.rows().clear(); + Dimension dim; -// y is relative to this LyXText's top -RowList::iterator -LyXText::getRowNearY(int y, ParagraphList::iterator & pit) const -{ - BOOST_ASSERT(!paragraphs().empty()); - BOOST_ASSERT(!paragraphs().begin()->rows.empty()); -#if 1 - ParagraphList::iterator const - pend = boost::prior(paragraphs().end()); - pit = paragraphs().begin(); - while (int(pit->y + pit->height) < y && pit != pend) - ++pit; - - RowList::iterator rit = pit->rows.end(); - RowList::iterator const rbegin = pit->rows.begin(); + par.setBeginOfBody(); + pos_type z = 0; do { - --rit; - } while (rit != rbegin && int(pit->y + rit->y_offset()) > y); - - return rit; -#else - pit = boost::prior(paragraphs().end()); - - RowList::iterator rit = lastRow(); - RowList::iterator rbegin = firstRow(); - - while (rit != rbegin && int(pit->y + rit->y_offset()) > y) - previousRow(pit, rit); - - return rit; -#endif -} - + Row row(z); + rowBreakPoint(pit, row); + setRowWidth(pit, row); + setHeightOfRow(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(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(); -int LyXText::getDepth() const -{ - return cursorPar()->getDepth(); -} + bool const same = dim == par.dim(); + par.dim() = dim; + //lyxerr << "redoParagraph: " << par.rows().size() << " rows\n"; -RowList::iterator LyXText::firstRow() const -{ - return paragraphs().front().rows.begin(); + return !same; } -RowList::iterator LyXText::lastRow() const +void LyXText::metrics(MetricsInfo & mi, Dimension & dim) { - return boost::prior(endRow()); -} + //BOOST_ASSERT(mi.base.textwidth); + if (mi.base.textwidth) + maxwidth_ = mi.base.textwidth; + //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth + // << " maxWidth: " << maxwidth_ << "\nfont: " << mi.base.font << endl; + // save the caller's font locally: + font_ = mi.base.font; + + unsigned int h = 0; + unsigned int w = 0; + for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) { + redoParagraph(pit); + Paragraph & par = paragraphs()[pit]; + h += par.height(); + if (w < par.width()) + w = par.width(); + } + dim.wid = w; + dim.asc = pars_[0].ascent(); + dim.des = h - dim.asc; -RowList::iterator LyXText::endRow() const -{ - return paragraphs().back().rows.end(); + dim_ = dim; } -void LyXText::nextRow(ParagraphList::iterator & pit, - RowList::iterator & rit) const +// only used for inset right now. should also be used for main text +void LyXText::draw(PainterInfo & pi, int x, int y) const { - ++rit; - if (rit == pit->rows.end()) { - ++pit; - if (pit == paragraphs().end()) - --pit; - else - rit = pit->rows.begin(); - } + paintTextInset(*this, pi, x, y); } -void LyXText::previousRow(ParagraphList::iterator & pit, - RowList::iterator & rit) const +#if 0 +// only used for inset right now. should also be used for main text +void LyXText::drawSelection(PainterInfo & pi, int x , int) const { - if (rit != pit->rows.begin()) - --rit; - else { - BOOST_ASSERT(pit != paragraphs().begin()); - --pit; - rit = boost::prior(pit->rows.end()); - } -} + LCursor & cur = pi.base.bv->cursor(); + if (!cur.selection()) + return; + if (!ptr_cmp(cur.text(), this)) + return; + lyxerr << "draw selection at " << x << endl; -int LyXText::parOffset(ParagraphList::iterator pit) const -{ - return distance(paragraphs().begin(), pit); -} + 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; -void LyXText::redoParagraphInternal(ParagraphList::iterator pit) -{ - // remove rows of paragraph, keep track of height changes - height_ -= pit->height; + Paragraph const & par1 = pars_[beg.pit()]; + Paragraph const & par2 = pars_[end.pit()]; - // clear old data - pit->rows.clear(); - pit->height = 0; - pit->width = 0; + Row const & row1 = par1.getRow(beg.pos(), beg.boundary()); + Row const & row2 = par2.getRow(end.pos(), end.boundary()); - // redo insets - InsetList::iterator ii = pit->insetlist.begin(); - InsetList::iterator iend = pit->insetlist.end(); - for (; ii != iend; ++ii) { - Dimension dim; - int const w = maxwidth_ - leftMargin(pit) - rightMargin(*pit); - MetricsInfo mi(bv(), getFont(pit, ii->pos), w); - ii->inset->metrics(mi, dim); + 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; } - // rebreak the paragraph - pit->setBeginOfBody(); - pos_type z = 0; - do { - Row row(z); - rowBreakPoint(pit, row); - setRowWidth(pit, row); - setHeightOfRow(pit, row); - row.y_offset(pit->height); - pit->rows.push_back(row); - pit->width = std::max(pit->width, row.width()); - pit->height += row.height(); - z = row.endpos(); - } while (z < pit->size()); - - height_ += pit->height; - //lyxerr << "redoParagraph: " << pit->rows.size() << " rows\n"; -} + 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; -void LyXText::redoParagraphs(ParagraphList::iterator pit, - ParagraphList::iterator end) -{ - for ( ; pit != end; ++pit) - redoParagraphInternal(pit); - updateParPositions(); -} + // 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); -void LyXText::redoParagraph(ParagraphList::iterator pit) -{ - redoParagraphInternal(pit); - updateParPositions(); + // 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::fullRebreak() +void LyXText::drawSelection(PainterInfo & pi, int x, int) const { - redoParagraphs(paragraphs().begin(), paragraphs().end()); - bv()->cursor().resetAnchor(); -} - + LCursor & cur = pi.base.bv->cursor(); + if (!cur.selection()) + return; + if (!ptr_cmp(cur.text(), this)) + return; -void LyXText::metrics(MetricsInfo & mi, Dimension & dim) -{ - //BOOST_ASSERT(mi.base.textwidth); - if (mi.base.textwidth) - maxwidth_ = mi.base.textwidth; - //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth - //<< " maxWidth: " << maxwidth << "\nfont: " << mi.base.font - //<< endl; + lyxerr[Debug::DEBUG] + << BOOST_CURRENT_FUNCTION + << "draw selection at " << x + << endl; - // Rebuild row cache. This recomputes height as well. - redoParagraphs(paragraphs().begin(), paragraphs().end()); + DocIterator beg = cur.selectionBegin(); + DocIterator end = cur.selectionEnd(); - width_ = maxParagraphWidth(paragraphs()); + // 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; - // final dimension - dim.asc = firstRow()->ascent_of_text(); - dim.des = height_ - dim.asc; - dim.wid = width_; -} + Paragraph const & par1 = pars_[beg.pit()]; + Paragraph const & par2 = pars_[end.pit()]; + + bool const above = (bv_funcs::status(pi.base.bv, beg) + == bv_funcs::CUR_ABOVE); + bool const below = (bv_funcs::status(pi.base.bv, end) + == bv_funcs::CUR_BELOW); + int y1,y2,x1,x2; + if (above) { + y1 = 0; + y2 = 0; + x1 = 0; + x2 = dim_.wid; + } else { + 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(), beg.boundary()); + x1 = !isRTL(par1) ? startx : 0; + x2 = !isRTL(par1) ? 0 + dim_.wid : startx; + } + int Y1,Y2,X1,X2; + if (below) { + Y1 = pi.base.bv->workHeight(); + Y2 = pi.base.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(); + Y2 = Y1 + row2.height(); + int const endx = cursorX(end.top(), end.boundary()); + X1 = !isRTL(par2) ? 0 : endx; + X2 = !isRTL(par2) ? endx : 0 + dim_.wid; + } -// only used for inset right now. should also be used for main text -void LyXText::draw(PainterInfo & pi, int x, int y) const -{ - xo_ = x; - yo_ = y; - paintTextInset(*this, pi, x, y); -} + 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 ); + 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; -// only used for inset right now. should also be used for main text -void LyXText::drawSelection(PainterInfo &, int, int) const -{ - //lyxerr << "LyXText::drawSelection at " << x << " " << y << endl; + // paint upper rectangle + pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1, + LColor::selection); + // paint bottom rectangle + pi.pain.fillRectangle(x + X1, Y1, X2 - X1, Y2 - Y1, + LColor::selection); + // paint center rectangle + pi.pain.fillRectangle(x, y2, dim_.wid, + Y1 - y2, LColor::selection); } +#endif - -bool LyXText::isLastRow(ParagraphList::iterator pit, Row const & row) const +bool LyXText::isLastRow(pit_type pit, Row const & row) const { - return row.endpos() >= pit->size() - && boost::next(pit) == paragraphs().end(); + return row.endpos() >= pars_[pit].size() + && pit + 1 == pit_type(paragraphs().size()); } -bool LyXText::isFirstRow(ParagraphList::iterator pit, Row const & row) const +bool LyXText::isFirstRow(pit_type pit, Row const & row) const { - return row.pos() == 0 && pit == paragraphs().begin(); + return row.pos() == 0 && pit == 0; } void LyXText::getWord(CursorSlice & from, CursorSlice & to, word_location const loc) { - Paragraph & from_par = *getPar(from); + Paragraph const & from_par = pars_[from.pit()]; switch (loc) { case lyx::WHOLE_WORD_STRICT: if (from.pos() == 0 || from.pos() == from_par.size() - || from_par.isSeparator(from.pos()) - || from_par.isKomma(from.pos()) - || from_par.isNewline(from.pos()) - || from_par.isSeparator(from.pos() - 1) - || from_par.isKomma(from.pos() - 1) - || from_par.isNewline(from.pos() - 1)) { + || !from_par.isLetter(from.pos()) + || !from_par.isLetter(from.pos() - 1)) { to = from; return; } // no break here, we go to the next case lyx::WHOLE_WORD: - // Move cursor to the beginning, when not already there. - if (from.pos() && !from_par.isSeparator(from.pos() - 1) - && !(from_par.isKomma(from.pos() - 1) - || from_par.isNewline(from.pos() - 1))) - cursorLeftOneWord(bv()->cursor()); - break; + // 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: // always move the cursor to the beginning of previous word - cursorLeftOneWord(bv()->cursor()); + while (from.pos() && from_par.isLetter(from.pos() - 1)) + --from.pos(); break; case lyx::NEXT_WORD: lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet" << endl; break; case lyx::PARTIAL_WORD: + // no need to move the 'from' cursor break; } to = from; - Paragraph & to_par = *getPar(to); - while (to.pos() < to_par.size() - && !to_par.isSeparator(to.pos()) - && !to_par.isKomma(to.pos()) - && !to_par.isNewline(to.pos()) - && !to_par.isHfill(to.pos()) - && !to_par.isInset(to.pos())) - { + Paragraph & to_par = pars_[to.pit()]; + while (to.pos() < to_par.size() && to_par.isLetter(to.pos())) ++to.pos(); - } } @@ -1727,42 +2001,30 @@ void LyXText::write(Buffer const & buf, std::ostream & os) const bool LyXText::read(Buffer const & buf, LyXLex & lex) { - static Change current_change; - - bool the_end_read = false; - ParagraphList::iterator pit = paragraphs().begin(); Paragraph::depth_type depth = 0; while (lex.isOK()) { lex.nextToken(); - string token = lex.getString(); + string const token = lex.getString(); if (token.empty()) continue; - if (in_inset_) { - - if (token == "\\end_inset") { - the_end_read = true; - break; - } - - if (token == "\\end_document") { - lex.printError("\\end_document read in inset! Error in document!"); - return false; - } - - } else { + if (token == "\\end_inset") { + break; + } - if (token == "\\end_document") { - the_end_read = true; - continue; - } + if (token == "\\end_body") { + continue; + } + if (token == "\\begin_body") { + continue; } - // FIXME: ugly. - int unknown = 0; + if (token == "\\end_document") { + return false; + } if (token == "\\begin_layout") { lex.pushToken(token); @@ -1771,18 +2033,12 @@ bool LyXText::read(Buffer const & buf, LyXLex & lex) par.params().depth(depth); if (buf.params().tracking_changes) par.trackChanges(); - LyXFont f(LyXFont::ALL_INHERIT, buf.params().language); - par.setFont(0, f); - - // insert after - if (pit != paragraphs().end()) - ++pit; - - pit = paragraphs().insert(pit, par); + 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, *pit, lex); + ::readParagraph(buf, pars_.back(), lex); } else if (token == "\\begin_deeper") { ++depth; @@ -1793,35 +2049,41 @@ bool LyXText::read(Buffer const & buf, LyXLex & lex) --depth; } } else { - ++unknown; + lyxerr << "Handling unknown body token: `" + << token << '\'' << endl; } - } - return the_end_read; + return true; } int LyXText::ascent() const { - return firstRow()->ascent_of_text(); + return dim_.asc; } int LyXText::descent() const { - return height_ - firstRow()->ascent_of_text(); + return dim_.des; } -int LyXText::cursorX(CursorSlice const & cur) const +int LyXText::cursorX(CursorSlice const & sl, bool boundary) const { - ParagraphList::iterator pit = getPar(cur); - if (pit->rows.empty()) - return xo_; + pit_type const pit = sl.pit(); + Paragraph const & par = pars_[pit]; + if (par.rows().empty()) + return 0; + + pos_type ppos = sl.pos(); + // Correct position in front of big insets + bool const boundary_correction = ppos != 0 && boundary; + if (boundary_correction) + --ppos; + + Row const & row = par.getRow(sl.pos(), boundary); - Row const & row = *pit->getRow(cur.pos()); - - pos_type pos = cur.pos(); pos_type cursor_vpos = 0; RowMetrics const m = computeRowMetrics(pit, row); @@ -1832,89 +2094,85 @@ int LyXText::cursorX(CursorSlice const & cur) const if (end <= row_pos) cursor_vpos = row_pos; - else if (pos >= end) - cursor_vpos = isRTL(*pit) ? row_pos : end; - else if (pos > row_pos && pos >= end) + else if (ppos >= end) + cursor_vpos = isRTL(par) ? row_pos : end; + else if (ppos > row_pos && ppos >= end) // Place cursor after char at (logical) position pos - 1 - cursor_vpos = (bidi.level(pos - 1) % 2 == 0) - ? bidi.log2vis(pos - 1) + 1 : bidi.log2vis(pos - 1); + cursor_vpos = (bidi.level(ppos - 1) % 2 == 0) + ? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1); else - // Place cursor before char at (logical) position pos - cursor_vpos = (bidi.level(pos) % 2 == 0) - ? bidi.log2vis(pos) : bidi.log2vis(pos) + 1; + // Place cursor before char at (logical) position ppos + cursor_vpos = (bidi.level(ppos) % 2 == 0) + ? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1; - pos_type body_pos = pit->beginOfBody(); + pos_type body_pos = par.beginOfBody(); if (body_pos > 0 && - (body_pos > end || !pit->isLineSeparator(body_pos - 1))) + (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 += m.label_hfill - + font_metrics::width(pit->layout()->labelsep, - getLabelFont(pit)); - if (pit->isLineSeparator(body_pos - 1)) - x -= singleWidth(pit, body_pos - 1); + + font_metrics::width(par.layout()->labelsep, + getLabelFont(par)); + if (par.isLineSeparator(body_pos - 1)) + x -= singleWidth(par, body_pos - 1); } - if (hfillExpansion(*pit, row, pos)) { - x += singleWidth(pit, pos); - if (pos >= body_pos) - x += m.hfill; - else - x += m.label_hfill; - } else if (pit->isSeparator(pos)) { - x += singleWidth(pit, pos); - if (pos >= body_pos) - x += m.separator; - } else - x += singleWidth(pit, pos); - } - return xo_ + int(x); -} - - -int LyXText::cursorY(CursorSlice const & cur) const -{ - Paragraph & par = *getPar(cur); - Row & row = *par.getRow(cur.pos()); - return yo_ + par.y + row.y_offset() + row.baseline(); -} + // 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); -CursorSlice & LyXText::cursor() -{ - //lyxerr << "# accessing slice " << findText(this) << endl; - if (this != bv()->cursor().text()) { - lyxerr << "cursor: " << bv()->cursor() - << "\ntext: " << bv()->cursor().text() - << "\nthis: " << this << endl; - BOOST_ASSERT(false); + if (hfillExpansion(par, row, pos)) + x += (pos >= body_pos) ? m.hfill : m.label_hfill; + else if (par.isSeparator(pos) && pos >= body_pos) + x += m.separator; } - return bv()->cursor().top(); -} - + + // see correction above + if (boundary_correction) + if (getFont(par, ppos).isVisibleRightToLeft()) + x -= singleWidth(par, ppos); + else + x += singleWidth(par, ppos); -CursorSlice const & LyXText::cursor() const -{ - if (this != bv()->cursor().text()) { - lyxerr << "cursor: " << bv()->cursor() - << "\ntext: " << bv()->cursor().text() - << "\nthis: " << this << endl; - BOOST_ASSERT(false); - } - return bv()->cursor().top(); + // 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); } -void LyXText::replaceSelection(LCursor & cur) +int LyXText::cursorY(CursorSlice const & sl, bool boundary) const { - BOOST_ASSERT(this == cur.text()); - if (cur.selection()) { - cutSelection(cur, true, false); - cur.update(); - } + //lyxerr << "LyXText::cursorY: boundary: " << boundary << std::endl; + Paragraph const & par = getPar(sl.pit()); + int h = 0; + h -= pars_[0].rows()[0].ascent(); + for (pit_type pit = 0; pit < sl.pit(); ++pit) + h += pars_[pit].height(); + int pos = sl.pos(); + if (pos && boundary) + --pos; + size_t const rend = par.pos2row(pos); + for (size_t rit = 0; rit != rend; ++rit) + h += par.rows()[rit].height(); + h += par.rows()[rend].ascent(); + return h; } @@ -1922,17 +2180,17 @@ void LyXText::replaceSelection(LCursor & cur) string LyXText::currentState(LCursor & cur) { BOOST_ASSERT(this == cur.text()); - Buffer * buffer = bv()->buffer(); + Buffer & buf = cur.buffer(); Paragraph const & par = cur.paragraph(); std::ostringstream os; - bool const show_change = buffer->params().tracking_changes + bool const show_change = buf.params().tracking_changes && cur.pos() != cur.lastpos() && par.lookupChange(cur.pos()) != Change::UNCHANGED; if (show_change) { Change change = par.lookupChangeFull(cur.pos()); - Author const & a = buffer->params().authors().get(change.author); + Author const & a = buf.params().authors().get(change.author); os << _("Change: ") << a.name(); if (!a.email().empty()) os << " (" << a.email() << ")"; @@ -1944,18 +2202,18 @@ string LyXText::currentState(LCursor & cur) // I think we should only show changes from the default // font. (Asger) LyXFont font = real_current_font; - font.reduce(buffer->params().getLyXTextClass().defaultfont()); + font.reduce(buf.params().getLyXTextClass().defaultfont()); // avoid _(...) re-entrance problem - string const s = font.stateText(&buffer->params()); + string const s = font.stateText(&buf.params()); os << bformat(_("Font: %1$s"), s); - // os << bformat(_("Font: %1$s"), font.stateText(&buffer->params)); + // os << bformat(_("Font: %1$s"), font.stateText(&buf.params)); // The paragraph depth - int depth = getDepth(); + int depth = cur.paragraph().getDepth(); if (depth > 0) - os << bformat(_(", Depth: %1$s"), tostr(depth)); + os << bformat(_(", Depth: %1$d"), depth); // The paragraph spacing, but only if different from // buffer spacing. @@ -1973,24 +2231,22 @@ string LyXText::currentState(LCursor & cur) os << _("Double"); break; case Spacing::Other: - os << _("Other (") << spacing.getValue() << ')'; + os << _("Other (") << spacing.getValueAsString() << ')'; break; case Spacing::Default: // should never happen, do nothing break; } } + #ifdef DEVEL_VERSION - os << _(", Paragraph: ") << par.id(); + os << _(", Inset: ") << &cur.inset(); + os << _(", Paragraph: ") << cur.pit(); + os << _(", Id: ") << par.id(); os << _(", Position: ") << cur.pos(); - Row & row = cur.textRow(); - os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos()); - os << _(", Inset: "); - InsetOld * inset = par.inInset(); - if (inset) - os << inset << " owner: " << inset->owner(); - else - os << -1; + os << _(", Boundary: ") << cur.boundary(); +// Row & row = cur.textRow(); +// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos()); #endif return os.str(); } @@ -1998,18 +2254,14 @@ string LyXText::currentState(LCursor & cur) string LyXText::getPossibleLabel(LCursor & cur) const { - ParagraphList & plist = paragraphs(); - ParagraphList::iterator pit = getPar(cur.par()); - - LyXLayout_ptr layout = pit->layout(); - - if (layout->latextype == LATEX_PARAGRAPH && pit != plist.begin()) { - ParagraphList::iterator pit2 = boost::prior(pit); + pit_type pit = cur.pit(); - LyXLayout_ptr const & layout2 = pit2->layout(); + LyXLayout_ptr layout = pars_[pit].layout(); + if (layout->latextype == LATEX_PARAGRAPH && pit != 0) { + LyXLayout_ptr const & layout2 = pars_[pit - 1].layout(); if (layout2->latextype != LATEX_PARAGRAPH) { - pit = pit2; + --pit; layout = layout2; } } @@ -2022,7 +2274,7 @@ string LyXText::getPossibleLabel(LCursor & cur) const if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0) text.erase(); - string par_text = pit->asString(*cur.bv().buffer(), false); + string par_text = pars_[pit].asString(cur.buffer(), false); for (int i = 0; i < lyxrc.label_init_length; ++i) { if (par_text.empty()) break; @@ -2038,20 +2290,81 @@ string LyXText::getPossibleLabel(LCursor & cur) const } -int LyXText::dist(int x, int y) const -{ - int xx = 0; - int yy = 0; - - if (x < xo_) - xx = xo_ - x; - else if (x > xo_ + width_) - xx = x - xo_ - width_; - - if (y < yo_ - ascent()) - yy = yo_ - ascent() - y; - else if (y > yo_ + descent()) - yy = y - yo_ - descent(); +//pos_type LyXText::x2pos(pit_type pit, int row, int x) const +//{ +// int lastx = 0; +// int currx = 0; +// Paragraph const & par = pars_[pit]; +// Row const & r = par.rows()[row]; +// int pos = r.pos(); +// for (; currx < x && pos < r.endpos(); ++pos) { +// lastx = currx; +// currx += singleWidth(par, pos); +// } +// if (abs(lastx - x) < abs(currx - x) && pos != r.pos()) +// --pos; +// return pos; +//} + + +pos_type LyXText::x2pos(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); +} + + +//int LyXText::pos2x(pit_type pit, pos_type pos) const +//{ +// Paragraph const & par = pars_[pit]; +// Row const & r = par.rows()[row]; +// int x = 0; +// pos -= r.pos(); +//} + + +// x,y are screen coordinates +// 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(); + lyxerr[Debug::DEBUG] + << BOOST_CURRENT_FUNCTION + << ": x: " << x + << " y: " << y + << " pit: " << pit + << " yy: " << yy << endl; + + Paragraph const & par = pars_[pit]; + int r = 0; + BOOST_ASSERT(par.rows().size()); + for (; r < int(par.rows().size()) - 1; ++r) { + Row const & row = par.rows()[r]; + if (int(yy + row.height()) > y) + break; + yy += row.height(); + } - return xx + yy; + Row const & row = par.rows()[r]; + + lyxerr[Debug::DEBUG] + << 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; + + return setCursor(cur, pit, pos, true, bound); }