X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=7ff4a8a22fe9be0cc57f6c4c541fc0edc2c7a119;hb=837869452ad8d917615aa4bca77402dc49ba094e;hp=be95232d1271a6da80bfab4c370d7e886e0c0e08;hpb=4916bd41d3e4ebc50b636cc036b374e4d2b8de8d;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index be95232d12..7ff4a8a22f 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -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" @@ -79,23 +76,14 @@ FontInfo Text::layoutFont(pit_type const pit) const // In case the default family has been customized if (layout.font.family() == INHERIT_FAMILY) lf.setFamily(owner_->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. - InsetCollapsable const * icp = pars_[pit].inInset().asInsetCollapsable(); - if (!icp) - return lf; - FontInfo icf = icp->getLayout().font(); + 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(outerFont(pit)); font.realize(owner_->buffer().params().getFont().fontInfo()); return font; @@ -145,7 +133,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); } @@ -166,10 +154,10 @@ void Text::setCharFont(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()) { @@ -179,7 +167,7 @@ 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); } } } @@ -232,7 +220,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 +279,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(); } @@ -324,15 +312,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(); @@ -347,17 +387,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); + 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); } } @@ -432,6 +473,35 @@ 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 (pit == end) + return; + } + 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 +523,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 +551,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(); @@ -502,84 +571,6 @@ void Text::insertInset(Cursor & cur, Inset * inset) } -// needed to insert the selection -void Text::insertStringAsLines(Cursor & cur, docstring const & str) -{ - BufferParams const & bparams = owner_->buffer().params(); - pit_type pit = cur.pit(); - pos_type pos = cur.pos(); - Font font = cur.current_font; - - // insert the string, don't insert doublespace - bool space_inserted = true; - for (docstring::const_iterator cit = str.begin(); - cit != str.end(); ++cit) { - Paragraph & par = pars_[pit]; - if (*cit == '\n') { - if (autoBreakRows_ && (!par.empty() || par.allowEmpty())) { - lyx::breakParagraph(bparams, pars_, pit, pos, - par.layout().isEnvironment()); - ++pit; - pos = 0; - space_inserted = true; - } else { - continue; - } - // do not insert consecutive spaces if !free_spacing - } else if ((*cit == ' ' || *cit == '\t') && - space_inserted && !par.isFreeSpacing()) { - continue; - } else if (*cit == '\t') { - if (!par.isFreeSpacing()) { - // tabs are like spaces here - par.insertChar(pos, ' ', font, bparams.trackChanges); - ++pos; - space_inserted = true; - } else { - par.insertChar(pos, *cit, font, bparams.trackChanges); - ++pos; - space_inserted = true; - } - } else if (!isPrintable(*cit)) { - // Ignore unprintables - continue; - } else { - // just insert the character - par.insertChar(pos, *cit, font, bparams.trackChanges); - ++pos; - space_inserted = (*cit == ' '); - } - } -} - - -// 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) { @@ -587,6 +578,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; } @@ -602,12 +596,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, /**/); @@ -672,7 +666,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) { @@ -740,7 +734,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()) { @@ -971,8 +965,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;