X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=fe2d94e831ae6f2b2540fb5af62d655adf609ae4;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=65c08044c2160156ffdaabadfa3b7b3e77ba8266;hpb=0743708418059fd7688228451a681ee79ba1db8a;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index 65c08044c2..fe2d94e831 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -4,16 +4,16 @@ * Licence details can be found in the file COPYING. * * \author Asger Alstrup - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Alfredo Braunstein * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Allan Rae * \author Stefan Schimanski * \author Dekel Tsur - * \author Jürgen Vigna + * \author Jürgen Vigna * * Full author contact details are available in file CREDITS. */ @@ -33,18 +33,15 @@ #include "CutAndPaste.h" #include "DispatchResult.h" #include "ErrorList.h" -#include "FuncRequest.h" #include "Language.h" #include "Layout.h" #include "Lexer.h" -#include "LyXFunc.h" +#include "LyX.h" #include "LyXRC.h" #include "Paragraph.h" -#include "paragraph_funcs.h" #include "ParagraphParameters.h" #include "TextClass.h" #include "TextMetrics.h" -#include "VSpace.h" #include "insets/InsetCollapsable.h" @@ -63,19 +60,14 @@ using namespace std; namespace lyx { -Text::Text() - : autoBreakRows_(false) -{} - - -bool Text::isMainText(Buffer const & buffer) const +bool Text::isMainText() const { - return &buffer.text() == this; + return &owner_->buffer().text() == this; } // Note that this is supposed to return a fully realized font. -FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const +FontInfo Text::layoutFont(pit_type const pit) const { Layout const & layout = pars_[pit].layout(); @@ -83,34 +75,25 @@ FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const FontInfo lf = layout.resfont; // In case the default family has been customized if (layout.font.family() == INHERIT_FAMILY) - lf.setFamily(buffer.params().getFont().fontInfo().family()); - // FIXME - // It ought to be possible here just to use Inset::getLayout() and skip - // the asInsetCollapsable() bit. Unfortunatley, that doesn't work right - // now, because Inset::getLayout() will return a default-constructed - // InsetLayout, and that e.g. sets the foreground color to red. So we - // need to do some work to make that possible. - Inset const * inset = pars_[pit].inInset(); - InsetCollapsable const * icp = inset? inset->asInsetCollapsable() : 0; - if (!icp) - return lf; - FontInfo icf = icp->getLayout().font(); + lf.setFamily(owner_->buffer().params().getFont().fontInfo().family()); + FontInfo icf = owner_->getLayout().font(); icf.realize(lf); return icf; } FontInfo font = layout.font; // Realize with the fonts of lesser depth. - //font.realize(outerFont(pit, paragraphs())); - font.realize(buffer.params().getFont().fontInfo()); + //font.realize(outerFont(pit)); + font.realize(owner_->buffer().params().getFont().fontInfo()); return font; } // Note that this is supposed to return a fully realized font. -FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const +FontInfo Text::labelFont(Paragraph const & par) const { + Buffer const & buffer = owner_->buffer(); Layout const & layout = par.layout(); if (!par.getDepth()) { @@ -118,14 +101,7 @@ FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const // In case the default family has been customized if (layout.labelfont.family() == INHERIT_FAMILY) lf.setFamily(buffer.params().getFont().fontInfo().family()); - // FIXME As above.... - Inset const * inset = par.inInset(); - InsetCollapsable const * icp = inset? inset->asInsetCollapsable() : 0; - if (!icp) - return lf; - FontInfo icf = icp->getLayout().labelfont(); - icf.realize(lf); - return icf; + return lf; } FontInfo font = layout.labelfont; @@ -136,9 +112,10 @@ FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const } -void Text::setCharFont(Buffer const & buffer, pit_type pit, +void Text::setCharFont(pit_type pit, pos_type pos, Font const & fnt, Font const & display_font) { + Buffer const & buffer = owner_->buffer(); Font font = fnt; Layout const & layout = pars_[pit].layout(); @@ -156,7 +133,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit, while (!layoutfont.resolved() && tp != pit_type(paragraphs().size()) && pars_[tp].getDepth()) { - tp = outerHook(tp, paragraphs()); + tp = outerHook(tp); if (tp != pit_type(paragraphs().size())) layoutfont.realize(pars_[tp].layout().font); } @@ -164,7 +141,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit, // Inside inset, apply the inset's font attributes if any // (charstyle!) - if (!isMainText(buffer)) + if (!isMainText()) layoutfont.realize(display_font.fontInfo()); layoutfont.realize(buffer.params().getFont().fontInfo()); @@ -177,10 +154,10 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit, void Text::setInsetFont(BufferView const & bv, pit_type pit, - pos_type pos, Font const & font, bool toggleall) + pos_type pos, Font const & font) { Inset * const inset = pars_[pit].getInset(pos); - LASSERT(inset && inset->noFontChange(), /**/); + LASSERT(inset && inset->resetFontEdit(), /**/); CursorSlice::idx_type endidx = inset->nargs(); for (CursorSlice cs(*inset); cs.idx() != endidx; ++cs.idx()) { @@ -190,45 +167,26 @@ void Text::setInsetFont(BufferView const & bv, pit_type pit, CursorSlice cellend = cs; cellend.pit() = cellend.lastpit(); cellend.pos() = cellend.lastpos(); - text->setFont(bv, cs, cellend, font, toggleall); + text->setFont(bv, cs, cellend, font); } } } -// return past-the-last paragraph influenced by a layout change on pit -pit_type Text::undoSpan(pit_type pit) -{ - pit_type end = paragraphs().size(); - pit_type nextpit = pit + 1; - if (nextpit == end) - return nextpit; - //because of parindents - if (!pars_[pit].getDepth()) - return boost::next(nextpit); - //because of depth constrains - for (; nextpit != end; ++pit, ++nextpit) { - if (!pars_[pit].getDepth()) - break; - } - return nextpit; -} - - -void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end, - docstring const & layout) +void Text::setLayout(pit_type start, pit_type end, + docstring const & layout) { LASSERT(start != end, /**/); - BufferParams const & bufparams = buffer.params(); - Layout const & lyxlayout = bufparams.documentClass()[layout]; + Buffer const & buffer = owner_->buffer(); + BufferParams const & bp = buffer.params(); + Layout const & lyxlayout = bp.documentClass()[layout]; for (pit_type pit = start; pit != end; ++pit) { Paragraph & par = pars_[pit]; par.applyLayout(lyxlayout); if (lyxlayout.margintype == MARGIN_MANUAL) - par.setLabelWidthString(par.translateIfPossible( - lyxlayout.labelstring(), buffer.params())); + par.setLabelWidthString(par.expandLabel(lyxlayout, bp)); } } @@ -240,18 +198,15 @@ void Text::setLayout(Cursor & cur, docstring const & layout) pit_type start = cur.selBegin().pit(); pit_type end = cur.selEnd().pit() + 1; - pit_type undopit = undoSpan(end - 1); - recUndo(cur, start, undopit - 1); - setLayout(cur.buffer(), start, end, layout); - updateLabels(cur.buffer()); + cur.recordUndoSelection(); + setLayout(start, end, layout); + cur.forceBufferUpdate(); } static bool changeDepthAllowed(Text::DEPTH_CHANGE type, Paragraph const & par, int max_depth) { - if (par.layout().labeltype == LABEL_BIBLIO) - return false; int const depth = par.params().depth(); if (type == Text::INC_DEPTH && depth < max_depth) return true; @@ -302,7 +257,7 @@ void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type) } // this handles the counter labels, and also fixes up // depth values for follow-on (child) paragraphs - updateLabels(cur.buffer()); + cur.forceBufferUpdate(); } @@ -314,13 +269,13 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall) FontInfo layoutfont; pit_type pit = cur.pit(); if (cur.pos() < pars_[pit].beginOfBody()) - layoutfont = labelFont(cur.buffer(), pars_[pit]); + layoutfont = labelFont(pars_[pit]); else - layoutfont = layoutFont(cur.buffer(), pit); + layoutfont = layoutFont(pit); // Update current font cur.real_current_font.update(font, - cur.buffer().params().language, + cur.buffer()->params().language, toggleall); // Reduce to implicit settings @@ -335,15 +290,67 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall) // Ok, we have a selection. cur.recordUndoSelection(); + Font newfont = font; + + if (toggleall) { + // Toggling behaves as follows: We check the first character of the + // selection. If it's (say) got EMPH on, then we set to off; if off, + // then to on. With families and the like, we set it to INHERIT, if + // we already have it. + CursorSlice const & sl = cur.selBegin(); + Text const & text = *sl.text(); + Paragraph const & par = text.getPar(sl.pit()); + + // get font at the position + Font oldfont = par.getFont(cur.bv().buffer().params(), sl.pos(), + text.outerFont(sl.pit())); + FontInfo const & oldfi = oldfont.fontInfo(); + + FontInfo & newfi = newfont.fontInfo(); + + FontFamily newfam = newfi.family(); + if (newfam != INHERIT_FAMILY && newfam != IGNORE_FAMILY && + newfam == oldfi.family()) + newfi.setFamily(INHERIT_FAMILY); + + FontSeries newser = newfi.series(); + if (newser == BOLD_SERIES && oldfi.series() == BOLD_SERIES) + newfi.setSeries(INHERIT_SERIES); + + FontShape newshp = newfi.shape(); + if (newshp != INHERIT_SHAPE && newshp != IGNORE_SHAPE && + newshp == oldfi.shape()) + newfi.setShape(INHERIT_SHAPE); + + ColorCode newcol = newfi.color(); + if (newcol != Color_none && newcol != Color_inherit + && newcol != Color_ignore && newcol == oldfi.color()) + newfi.setColor(Color_none); + + // ON/OFF ones + if (newfi.emph() == FONT_TOGGLE) + newfi.setEmph(oldfi.emph() == FONT_OFF ? FONT_ON : FONT_OFF); + if (newfi.underbar() == FONT_TOGGLE) + newfi.setUnderbar(oldfi.underbar() == FONT_OFF ? FONT_ON : FONT_OFF); + if (newfi.strikeout() == FONT_TOGGLE) + newfi.setStrikeout(oldfi.strikeout() == FONT_OFF ? FONT_ON : FONT_OFF); + if (newfi.uuline() == FONT_TOGGLE) + newfi.setUuline(oldfi.uuline() == FONT_OFF ? FONT_ON : FONT_OFF); + if (newfi.uwave() == FONT_TOGGLE) + newfi.setUwave(oldfi.uwave() == FONT_OFF ? FONT_ON : FONT_OFF); + if (newfi.noun() == FONT_TOGGLE) + newfi.setNoun(oldfi.noun() == FONT_OFF ? FONT_ON : FONT_OFF); + if (newfi.number() == FONT_TOGGLE) + newfi.setNumber(oldfi.number() == FONT_OFF ? FONT_ON : FONT_OFF); + } setFont(cur.bv(), cur.selectionBegin().top(), - cur.selectionEnd().top(), font, toggleall); + cur.selectionEnd().top(), newfont); } void Text::setFont(BufferView const & bv, CursorSlice const & begin, - CursorSlice const & end, Font const & font, - bool toggleall) + CursorSlice const & end, Font const & font) { Buffer const & buffer = bv.buffer(); @@ -358,17 +365,18 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin, pit_type const pit = dit.pit(); pos_type const pos = dit.pos(); Inset * inset = pars_[pit].getInset(pos); - if (inset && inset->noFontChange()) { + if (inset && inset->resetFontEdit()) { // We need to propagate the font change to all - // text cells of the inset (bug 1973). - // FIXME: This should change, see documentation - // of noFontChange in Inset.h - setInsetFont(bv, pit, pos, font, toggleall); + // text cells of the inset (bugs 1973, 6919). + setInsetFont(bv, pit, pos, font); } TextMetrics const & tm = bv.textMetrics(this); Font f = tm.displayFont(pit, pos); - f.update(font, language, toggleall); - setCharFont(buffer, pit, pos, f, tm.font_); + f.update(font, language); + setCharFont(pit, pos, f, tm.font_); + // font change may change language... + // spell checker has to know that + pars_[pit].requestSpellCheck(pos); } } @@ -400,8 +408,8 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall) // Try implicit word selection // If there is a change in the language the implicit word selection // is disabled. - CursorSlice resetCursor = cur.top(); - bool implicitSelection = + CursorSlice const resetCursor = cur.top(); + bool const implicitSelection = font.language() == ignore_language && font.fontInfo().number() == FONT_IGNORE && selectWordWhenUnderCursor(cur, WHOLE_WORD_STRICT); @@ -443,21 +451,59 @@ docstring Text::getStringToIndex(Cursor const & cur) } +void Text::setLabelWidthStringToSequence(Cursor const & cur, + docstring const & s) +{ + Cursor c = cur; + // Find first of same layout in sequence + while (!isFirstInSequence(c.pit())) { + c.pit() = depthHook(c.pit(), c.paragraph().getDepth()); + } + + // now apply label width string to every par + // in sequence + depth_type const depth = c.paragraph().getDepth(); + Layout const & layout = c.paragraph().layout(); + for ( ; c.pit() <= c.lastpit() ; ++c.pit()) { + while (c.paragraph().getDepth() > depth) { + ++c.pit(); + if (c.pit() > c.lastpit()) + return; + } + if (c.paragraph().getDepth() < depth) + return; + if (c.paragraph().layout() != layout) + return; + c.recordUndo(); + c.paragraph().setLabelWidthString(s); + } +} + + void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) { LASSERT(cur.text(), /**/); - // make sure that the depth behind the selection are restored, too - pit_type undopit = undoSpan(cur.selEnd().pit()); - recUndo(cur, cur.selBegin().pit(), undopit - 1); //FIXME UNICODE string const argument = to_utf8(arg); - for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit(); - pit <= end; ++pit) { - Paragraph & par = pars_[pit]; + depth_type priordepth = -1; + Layout priorlayout; + Cursor c(cur.bv()); + c.setCursor(cur.selectionBegin()); + for ( ; c <= cur.selectionEnd() ; ++c.pit()) { + Paragraph & par = c.paragraph(); ParagraphParameters params = par.params(); params.read(argument, merge); + // Changes to label width string apply to all paragraphs + // with same layout in a sequence. + // Do this only once for a selected range of paragraphs + // of the same layout and depth. + cur.recordUndo(); par.params().apply(params, par.layout()); + if (par.getDepth() != priordepth || par.layout() != priorlayout) + setLabelWidthStringToSequence(c, params.labelWidthString()); + priordepth = par.getDepth(); + priorlayout = par.layout(); } } @@ -468,15 +514,25 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p) { LASSERT(cur.text(), /**/); - // make sure that the depth behind the selection are restored, too - pit_type undopit = undoSpan(cur.selEnd().pit()); - recUndo(cur, cur.selBegin().pit(), undopit - 1); - for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit(); - pit <= end; ++pit) { - Paragraph & par = pars_[pit]; + depth_type priordepth = -1; + Layout priorlayout; + Cursor c(cur.bv()); + c.setCursor(cur.selectionBegin()); + for ( ; c < cur.selectionEnd() ; ++c.pit()) { + Paragraph & par = c.paragraph(); + // Changes to label width string apply to all paragraphs + // with same layout in a sequence. + // Do this only once for a selected range of paragraphs + // of the same layout and depth. + cur.recordUndo(); par.params().apply(p, par.layout()); - } + if (par.getDepth() != priordepth || par.layout() != priorlayout) + setLabelWidthStringToSequence(c, + par.params().labelWidthString()); + priordepth = par.getDepth(); + priorlayout = par.layout(); + } } @@ -486,46 +542,11 @@ void Text::insertInset(Cursor & cur, Inset * inset) LASSERT(this == cur.text(), /**/); LASSERT(inset, /**/); cur.paragraph().insertInset(cur.pos(), inset, cur.current_font, - Change(cur.buffer().params().trackChanges + Change(cur.buffer()->params().trackChanges ? Change::INSERTED : Change::UNCHANGED)); } -// needed to insert the selection -void Text::insertStringAsLines(Cursor & cur, docstring const & str) -{ - cur.buffer().insertStringAsLines(pars_, cur.pit(), cur.pos(), - cur.current_font, str, autoBreakRows_); -} - - -// turn double CR to single CR, others are converted into one -// blank. Then insertStringAsLines is called -void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str) -{ - docstring linestr = str; - bool newline_inserted = false; - - for (string::size_type i = 0, siz = linestr.size(); i < siz; ++i) { - if (linestr[i] == '\n') { - if (newline_inserted) { - // we know that \r will be ignored by - // insertStringAsLines. Of course, it is a dirty - // trick, but it works... - linestr[i - 1] = '\r'; - linestr[i] = '\n'; - } else { - linestr[i] = ' '; - newline_inserted = true; - } - } else if (isPrintable(linestr[i])) { - newline_inserted = false; - } - } - insertStringAsLines(cur, linestr); -} - - bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos, bool setfont, bool boundary) { @@ -533,6 +554,9 @@ bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos, bool const update_needed = !tm.contains(par); Cursor old = cur; setCursorIntern(cur, par, pos, setfont, boundary); + // FIXME There is a chance that we'll miss a screen update here. + // If so, then do DEPM and then check if cur wants an update and + // go ahead and do it, if so. return cur.bv().checkDepm(cur, old) || update_needed; } @@ -548,12 +572,12 @@ void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos) // None of these should happen, but we're scaredy-cats if (pos < 0) { - lyxerr << "dont like -1" << endl; + lyxerr << "don't like -1" << endl; LASSERT(false, /**/); } if (pos > para.size()) { - lyxerr << "dont like 1, pos: " << pos + lyxerr << "don't like 1, pos: " << pos << " size: " << para.size() << " par: " << par << endl; LASSERT(false, /**/); @@ -581,7 +605,7 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front) if (!front && cur.pos() == 0) return false; Inset * inset = front ? cur.nextInset() : cur.prevInset(); - if (!inset || inset->editable() != Inset::HIGHLY_EDITABLE) + if (!inset || !inset->editable()) return false; /* * Apparently, when entering an inset we are expected to be positioned @@ -607,7 +631,7 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool mo return false; Paragraph & par = cur.paragraph(); Inset * inset = par.isInset(cur.pos()) ? par.getInset(cur.pos()) : 0; - if (!inset || inset->editable() != Inset::HIGHLY_EDITABLE) + if (!inset || !inset->editable()) return false; inset->edit(cur, movingForward, movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : Inset::ENTRY_DIRECTION_LEFT); @@ -618,7 +642,7 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool mo bool Text::cursorBackward(Cursor & cur) { // Tell BufferView to test for FitCursor in any case! - cur.updateFlags(Update::FitCursor); + cur.screenUpdateFlags(Update::FitCursor); // not at paragraph start? if (cur.pos() > 0) { @@ -686,7 +710,7 @@ bool Text::cursorVisRight(Cursor & cur, bool skip_inset) bool Text::cursorForward(Cursor & cur) { // Tell BufferView to test for FitCursor in any case! - cur.updateFlags(Update::FitCursor); + cur.screenUpdateFlags(Update::FitCursor); // not at paragraph end? if (cur.pos() != cur.lastpos()) { @@ -810,10 +834,18 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, // delete the LineSeparator. // MISSING - bool const same_inset = &old.inset() == &cur.inset(); - bool const same_par = same_inset && old.pit() == cur.pit(); - bool const same_par_pos = same_par && old.pos() == cur.pos(); + // Find a common inset and the corresponding depth. + size_t depth = 0; + for (; depth < cur.depth(); ++depth) + if (&old.inset() == &cur[depth].inset()) + break; + // Whether a common inset is found and whether the cursor is still in + // the same paragraph (possibly nested). + bool const same_par = depth < cur.depth() && old.pit() == cur[depth].pit(); + bool const same_par_pos = depth == cur.depth() - 1 && same_par + && old.pos() == cur[depth].pos(); + // If the chars around the old cursor were spaces, delete one of them. if (!same_par_pos) { // Only if the cursor has really moved. @@ -823,14 +855,14 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, && oldpar.isLineSeparator(old.pos() - 1) && !oldpar.isDeleted(old.pos() - 1) && !oldpar.isDeleted(old.pos())) { - oldpar.eraseChar(old.pos() - 1, cur.buffer().params().trackChanges); + oldpar.eraseChar(old.pos() - 1, cur.buffer()->params().trackChanges); // FIXME: This will not work anymore when we have multiple views of the same buffer // In this case, we will have to correct also the cursors held by // other bufferviews. It will probably be easier to do that in a more // automated way in CursorSlice code. (JMarc 26/09/2001) // correct all cursor parts if (same_par) { - fixCursorAfterDelete(cur.top(), old.top()); + fixCursorAfterDelete(cur[depth], old.top()); need_anchor_change = true; } return true; @@ -878,7 +910,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, return true; } - if (oldpar.stripLeadingSpaces(cur.buffer().params().trackChanges)) { + if (oldpar.stripLeadingSpaces(cur.buffer()->params().trackChanges)) { need_anchor_change = true; // We return true here because the Paragraph contents changed and // we need a redraw before further action is processed. @@ -909,8 +941,9 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra } } - // don't delete anything if this is the only remaining paragraph within the given range - // note: Text::acceptOrRejectChanges() sets the cursor to 'first' after calling DEPM + // don't delete anything if this is the only remaining paragraph + // within the given range. Note: Text::acceptOrRejectChanges() + // sets the cursor to 'first' after calling DEPM if (first == last) continue;