X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=974f9a89a1ab1241a048ae63e2457a109b7aebdf;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=b32f3a05261809cd9f922c4c99e10fe67e5d7703;hpb=4c9fe33c833fb7239a790acc847f45393983da2b;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index b32f3a0526..974f9a89a1 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -40,7 +40,6 @@ #include "LyXFunc.h" #include "LyXRC.h" #include "Paragraph.h" -#include "paragraph_funcs.h" #include "ParagraphParameters.h" #include "TextClass.h" #include "TextMetrics.h" @@ -63,19 +62,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,14 +77,14 @@ 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()); + 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(); + InsetCollapsable const * icp = owner_->asInsetCollapsable(); if (!icp) return lf; FontInfo icf = icp->getLayout().font(); @@ -100,16 +94,17 @@ FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const 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()) { @@ -128,9 +123,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(); @@ -148,7 +144,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); } @@ -156,7 +152,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()); @@ -207,20 +203,20 @@ pit_type Text::undoSpan(pit_type pit) } -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)); } } @@ -234,7 +230,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout) pit_type end = cur.selEnd().pit() + 1; pit_type undopit = undoSpan(end - 1); recUndo(cur, start, undopit - 1); - setLayout(*cur.buffer(), start, end, layout); + setLayout(start, end, layout); cur.buffer()->updateLabels(); } @@ -306,9 +302,9 @@ 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, @@ -360,7 +356,7 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin, TextMetrics const & tm = bv.textMetrics(this); Font f = tm.displayFont(pit, pos); f.update(font, language, toggleall); - setCharFont(buffer, pit, pos, f, tm.font_); + setCharFont(pit, pos, f, tm.font_); } } @@ -392,8 +388,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); @@ -435,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(), /**/); @@ -444,12 +466,22 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) //FIXME UNICODE string const argument = to_utf8(arg); + depth_type priordepth = -1; + Layout priorlayout; for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit(); pit <= end; ++pit) { Paragraph & par = pars_[pit]; 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. + if (par.getDepth() != priordepth || par.layout() != priorlayout) + setLabelWidthStringToSequence(pit, params.labelWidthString()); par.params().apply(params, par.layout()); + priordepth = par.getDepth(); + priorlayout = par.layout(); } } @@ -464,11 +496,22 @@ void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p) pit_type undopit = undoSpan(cur.selEnd().pit()); recUndo(cur, cur.selBegin().pit(), undopit - 1); + depth_type priordepth = -1; + Layout priorlayout; for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit(); pit <= end; ++pit) { Paragraph & par = pars_[pit]; + // 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. + if (par.getDepth() != priordepth || par.layout() != priorlayout) + setLabelWidthStringToSequence(pit, + par.params().labelWidthString()); par.params().apply(p, par.layout()); - } + priordepth = par.getDepth(); + priorlayout = par.layout(); + } } @@ -483,41 +526,6 @@ void Text::insertInset(Cursor & cur, Inset * inset) } -// 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) { @@ -540,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, /**/);