X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=ae82050fce1c5ca7b00cc83a1bf6b98ee3090ce0;hb=62411b7c0f5073d77df46cb0c8a5baacd0dfce7c;hp=d83e85a41b842a84f1dfa3f02fe672b0033ec351;hpb=eef8720eca844d2647a4c14024dae03a1915b65c;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index d83e85a41b..ae82050fce 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -33,14 +33,12 @@ #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" @@ -95,7 +93,7 @@ FontInfo Text::layoutFont(pit_type const pit) const FontInfo font = layout.font; // Realize with the fonts of lesser depth. - //font.realize(outerFont(pit, paragraphs())); + //font.realize(outerFont(pit)); font.realize(owner_->buffer().params().getFont().fontInfo()); return font; @@ -145,7 +143,7 @@ void Text::setCharFont(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); } @@ -169,7 +167,7 @@ void Text::setInsetFont(BufferView const & bv, pit_type pit, pos_type pos, Font const & font, bool toggleall) { 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()) { @@ -232,7 +230,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout) pit_type undopit = undoSpan(end - 1); recUndo(cur, start, undopit - 1); setLayout(start, end, layout); - cur.buffer()->updateLabels(); + cur.forceBufferUpdate(); } @@ -291,7 +289,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 - cur.buffer()->updateLabels(); + cur.forceBufferUpdate(); } @@ -347,17 +345,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 + // text cells of the inset (bugs 1973, 6919). setInsetFont(bv, pit, pos, font, toggleall); } TextMetrics const & tm = bv.textMetrics(this); Font f = tm.displayFont(pit, pos); f.update(font, language, toggleall); setCharFont(pit, pos, f, tm.font_); + // font change may change language... + // spell checker has to know that + pars_[pit].requestSpellCheck(pos); } } @@ -432,6 +431,32 @@ docstring Text::getStringToIndex(Cursor const & cur) } +void Text::setLabelWidthStringToSequence(pit_type const par_offset, + docstring const & s) +{ + pit_type offset = par_offset; + // Find first of same layout in sequence + while (!isFirstInSequence(offset)) { + offset = depthHook(offset, pars_[offset].getDepth()); + } + + // now apply label width string to every par + // in sequence + pit_type const end = pars_.size(); + depth_type const depth = pars_[offset].getDepth(); + Layout const & layout = pars_[offset].layout(); + for (pit_type pit = offset; pit != end; ++pit) { + while (pars_[pit].getDepth() > depth) + ++pit; + if (pars_[pit].getDepth() < depth) + return; + if (pars_[pit].layout() != layout) + return; + pars_[pit].setLabelWidthString(s); + } +} + + void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) { LASSERT(cur.text(), /**/); @@ -453,8 +478,7 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) // Do this only once for a selected range of paragraphs // of the same layout and depth. if (par.getDepth() != priordepth || par.layout() != priorlayout) - setLabelWidthStringToSequence(pit, pars_, - params.labelWidthString()); + setLabelWidthStringToSequence(pit, params.labelWidthString()); par.params().apply(params, par.layout()); priordepth = par.getDepth(); priorlayout = par.layout(); @@ -482,8 +506,8 @@ void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p) // Do this only once for a selected range of paragraphs // of the same layout and depth. if (par.getDepth() != priordepth || par.layout() != priorlayout) - setLabelWidthStringToSequence(pit, pars_, - par.params().labelWidthString()); + setLabelWidthStringToSequence(pit, + par.params().labelWidthString()); par.params().apply(p, par.layout()); priordepth = par.getDepth(); priorlayout = par.layout(); @@ -524,12 +548,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, /**/); @@ -594,7 +618,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) { @@ -662,7 +686,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()) { @@ -893,8 +917,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;