X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=3ba4f84d558cde1e9bd2459d975260ca88e6ce9c;hb=b7406da7f0326fbd895c700ad5ded4cc5112094f;hp=d18a993132a377d27c71b7a008071bafaf351cc2;hpb=11a6b3c4c7a031fd3776f53c9c43f62116933cea;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index d18a993132..3ba4f84d55 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -28,7 +28,6 @@ #include "BufferList.h" #include "BufferParams.h" #include "BufferView.h" -#include "Bullet.h" #include "Changes.h" #include "Cursor.h" #include "CutAndPaste.h" @@ -47,8 +46,6 @@ #include "TextMetrics.h" #include "VSpace.h" -#include "frontends/FontMetrics.h" - #include "insets/InsetEnvironment.h" #include "mathed/InsetMathHull.h" @@ -76,19 +73,19 @@ bool Text::isMainText(Buffer const & buffer) const } -FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const +FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const { - LayoutPtr const & layout = pars_[pit].layout(); + Layout const & layout = pars_[pit].layout(); if (!pars_[pit].getDepth()) { - FontInfo lf = layout->resfont; + FontInfo lf = layout.resfont; // In case the default family has been customized - if (layout->font.family() == INHERIT_FAMILY) + if (layout.font.family() == INHERIT_FAMILY) lf.setFamily(buffer.params().getFont().fontInfo().family()); return lf; } - FontInfo font = layout->font; + FontInfo font = layout.font; // Realize with the fonts of lesser depth. //font.realize(outerFont(pit, paragraphs())); font.realize(buffer.params().getFont().fontInfo()); @@ -97,19 +94,19 @@ FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const } -FontInfo Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const +FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const { - LayoutPtr const & layout = par.layout(); + Layout const & layout = par.layout(); if (!par.getDepth()) { - FontInfo lf = layout->reslabelfont; + FontInfo lf = layout.reslabelfont; // In case the default family has been customized - if (layout->labelfont.family() == INHERIT_FAMILY) + if (layout.labelfont.family() == INHERIT_FAMILY) lf.setFamily(buffer.params().getFont().fontInfo().family()); return lf; } - FontInfo font = layout->labelfont; + FontInfo font = layout.labelfont; // Realize with the fonts of lesser depth. font.realize(buffer.params().getFont().fontInfo()); @@ -121,15 +118,15 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit, pos_type pos, Font const & fnt, Font const & display_font) { Font font = fnt; - LayoutPtr const & layout = pars_[pit].layout(); + Layout const & layout = pars_[pit].layout(); // Get concrete layout font to reduce against FontInfo layoutfont; if (pos < pars_[pit].beginOfBody()) - layoutfont = layout->labelfont; + layoutfont = layout.labelfont; else - layoutfont = layout->font; + layoutfont = layout.font; // Realize against environment font information if (pars_[pit].getDepth()) { @@ -139,7 +136,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit, pars_[tp].getDepth()) { tp = outerHook(tp, paragraphs()); if (tp != pit_type(paragraphs().size())) - layoutfont.realize(pars_[tp].layout()->font); + layoutfont.realize(pars_[tp].layout().font); } } @@ -202,14 +199,14 @@ void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end, BOOST_ASSERT(start != end); BufferParams const & bufparams = buffer.params(); - LayoutPtr const & lyxlayout = bufparams.getTextClass()[layout]; + Layout const & lyxlayout = bufparams.documentClass()[layout]; for (pit_type pit = start; pit != end; ++pit) { Paragraph & par = pars_[pit]; par.applyLayout(lyxlayout); - if (lyxlayout->margintype == MARGIN_MANUAL) + if (lyxlayout.margintype == MARGIN_MANUAL) par.setLabelWidthString(par.translateIfPossible( - lyxlayout->labelstring(), buffer.params())); + lyxlayout.labelstring(), buffer.params())); } } @@ -221,14 +218,14 @@ void Text::setLayout(Cursor & cur, docstring const & layout) // special handling of new environment insets BufferView & bv = cur.bv(); BufferParams const & params = bv.buffer().params(); - LayoutPtr const & lyxlayout = params.getTextClass()[layout]; - if (lyxlayout->is_environment) { + Layout const & lyxlayout = params.documentClass()[layout]; + if (lyxlayout.is_environment) { // move everything in a new environment inset LYXERR(Debug::DEBUG, "setting layout " << to_utf8(layout)); lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN)); lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT)); lyx::dispatch(FuncRequest(LFUN_CUT)); - Inset * inset = new InsetEnvironment(params, layout); + Inset * inset = new InsetEnvironment(bv.buffer(), layout); insertInset(cur, inset); //inset->edit(cur, true); //lyx::dispatch(FuncRequest(LFUN_PASTE)); @@ -247,7 +244,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout) static bool changeDepthAllowed(Text::DEPTH_CHANGE type, Paragraph const & par, int max_depth) { - if (par.layout()->labeltype == LABEL_BIBLIO) + if (par.layout().labeltype == LABEL_BIBLIO) return false; int const depth = par.params().depth(); if (type == Text::INC_DEPTH && depth < max_depth) @@ -311,9 +308,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 = getLabelFont(cur.buffer(), pars_[pit]); + layoutfont = labelFont(cur.buffer(), pars_[pit]); else - layoutfont = getLayoutFont(cur.buffer(), pit); + layoutfont = layoutFont(cur.buffer(), pit); // Update current font cur.real_current_font.update(font, @@ -350,22 +347,22 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin, // nested insets. Language const * language = buffer.params().language; for (CursorSlice dit = begin; dit != end; dit.forwardPos()) { - if (dit.pos() != dit.lastpos()) { - pit_type const pit = dit.pit(); - pos_type const pos = dit.pos(); - Inset * inset = pars_[pit].getInset(pos); - if (inset && inset->noFontChange()) { - // 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); - } - TextMetrics const & tm = bv.textMetrics(this); - Font f = tm.getDisplayFont(pit, pos); - f.update(font, language, toggleall); - setCharFont(buffer, pit, pos, f, tm.font_); + if (dit.pos() == dit.lastpos()) + continue; + pit_type const pit = dit.pit(); + pos_type const pos = dit.pos(); + Inset * inset = pars_[pit].getInset(pos); + if (inset && inset->noFontChange()) { + // 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); } + TextMetrics const & tm = bv.textMetrics(this); + Font f = tm.displayFont(pit, pos); + f.update(font, language, toggleall); + setCharFont(buffer, pit, pos, f, tm.font_); } } @@ -421,25 +418,23 @@ docstring Text::getStringToIndex(Cursor const & cur) { BOOST_ASSERT(this == cur.text()); - docstring idxstring; if (cur.selection()) - idxstring = cur.selectionAsString(false); - else { - // Try implicit word selection. If there is a change - // in the language the implicit word selection is - // disabled. - Cursor tmpcur = cur; - selectWord(tmpcur, PREVIOUS_WORD); - - if (!tmpcur.selection()) - cur.message(_("Nothing to index!")); - else if (tmpcur.selBegin().pit() != tmpcur.selEnd().pit()) - cur.message(_("Cannot index more than one paragraph!")); - else - idxstring = tmpcur.selectionAsString(false); - } - - return idxstring; + return cur.selectionAsString(false); + + // Try implicit word selection. If there is a change + // in the language the implicit word selection is + // disabled. + Cursor tmpcur = cur; + selectWord(tmpcur, PREVIOUS_WORD); + + if (!tmpcur.selection()) + cur.message(_("Nothing to index!")); + else if (tmpcur.selBegin().pit() != tmpcur.selEnd().pit()) + cur.message(_("Cannot index more than one paragraph!")); + else + return tmpcur.selectionAsString(false); + + return docstring(); } @@ -450,13 +445,14 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) 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]; ParagraphParameters params = par.params(); - params.read(to_utf8(arg), merge); - Layout const & layout = *(par.layout()); - par.params().apply(params, layout); + params.read(argument, merge); + par.params().apply(params, par.layout()); } } @@ -474,8 +470,7 @@ void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p) for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit(); pit <= end; ++pit) { Paragraph & par = pars_[pit]; - Layout const & layout = *(par.layout()); - par.params().apply(p, layout); + par.params().apply(p, par.layout()); } } @@ -486,8 +481,8 @@ void Text::insertInset(Cursor & cur, Inset * inset) BOOST_ASSERT(this == cur.text()); BOOST_ASSERT(inset); cur.paragraph().insertInset(cur.pos(), inset, cur.current_font, - Change(cur.buffer().params().trackChanges ? - Change::INSERTED : Change::UNCHANGED)); + Change(cur.buffer().params().trackChanges + ? Change::INSERTED : Change::UNCHANGED)); } @@ -495,7 +490,7 @@ void Text::insertInset(Cursor & cur, Inset * inset) void Text::insertStringAsLines(Cursor & cur, docstring const & str) { cur.buffer().insertStringAsLines(pars_, cur.pit(), cur.pos(), - cur.current_font, str, autoBreakRows_); + cur.current_font, str, autoBreakRows_); } @@ -529,9 +524,11 @@ void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str) bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos, bool setfont, bool boundary) { + TextMetrics const & tm = cur.bv().textMetrics(this); + bool const update_needed = !tm.contains(par); Cursor old = cur; setCursorIntern(cur, par, pos, setfont, boundary); - return cur.bv().checkDepm(cur, old); + return cur.bv().checkDepm(cur, old) || update_needed; } @@ -608,7 +605,7 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool mo if (!inset || inset->editable() != Inset::HIGHLY_EDITABLE) return false; inset->edit(cur, movingForward, - movingLeft ? Inset::ENTER_FROM_RIGHT : Inset::ENTER_FROM_LEFT); + movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : Inset::ENTRY_DIRECTION_LEFT); return true; } @@ -713,10 +710,20 @@ bool Text::cursorVisLeft(Cursor & cur, bool skip_inset) // position 'left_pos' + 1. if (new_pos_is_RTL) { new_pos = left_pos + 1; - // if the position *after* left_pos is not RTL, set boundary to - // true (we want to be *after* left_pos, not before left_pos + 1!) - new_boundary = !cur.paragraph().getFontSettings( - cur.bv().buffer().params(), new_pos).isVisibleRightToLeft(); + // set the boundary to true in two situations: + if ( + // 1. if new_pos is now lastpos (which means that we're moving left + // to the end of an RTL chunk which is at the end of an LTR + // paragraph); + new_pos == cur.lastpos() + // 2. if the position *after* left_pos is not RTL (we want to be + // *after* left_pos, not before left_pos + 1!) + || !cur.paragraph().getFontSettings(cur.bv().buffer().params(), + new_pos).isVisibleRightToLeft() + ) + new_boundary = true; + else // set the boundary to false + new_boundary = false; } // Otherwise (if the character at position 'left_pos' is LTR), then // moving to the left of it is as easy as setting the new position @@ -793,10 +800,20 @@ bool Text::cursorVisRight(Cursor & cur, bool skip_inset) // position 'right_pos' + 1. if (!new_pos_is_RTL) { new_pos = right_pos + 1; - // if the position *after* right_pos is RTL, set boundary to - // true (we want to be *after* right_pos, not before right_pos + 1!) - new_boundary = cur.paragraph().getFontSettings( - cur.bv().buffer().params(), new_pos).isVisibleRightToLeft(); + // set the boundary to true in two situations: + if ( + // 1. if new_pos is now lastpos (which means that we're moving + // right to the end of an LTR chunk which is at the end of an + // RTL paragraph); + new_pos == cur.lastpos() + // 2. if the position *after* right_pos is RTL (we want to be + // *after* right_pos, not before right_pos + 1!) + || cur.paragraph().getFontSettings(cur.bv().buffer().params(), + new_pos).isVisibleRightToLeft() + ) + new_boundary = true; + else // set the boundary to false + new_boundary = false; } // Otherwise (if the character at position 'right_pos' is RTL), then // moving to the right of it is as easy as setting the new position