X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=930ea1475c6405954d23623c2a8e322223b6eb15;hb=22e6659780390a19174d1bf896317a5baf9e40d7;hp=7680ee5fa925d8e06d4b0402c5bf143aa4ce12a5;hpb=48144c474b9ac006e93413482dbcab06e4dd4caf;p=lyx.git diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index 7680ee5fa9..930ea1475c 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -195,7 +195,7 @@ void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET; // This can happen when a layout has a left and right margin, - // and the view is made very narrow. We can't do better than + // and the view is made very narrow. We can't do better than // to draw it partly out of view (bug 5890). if (mi.base.textwidth < 1) mi.base.textwidth = 1; @@ -220,11 +220,19 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET; int const xframe = x + TEXT_TO_INSET_OFFSET / 2; bool change_drawn = false; - if (drawFrame_ || pi.full_repaint) { - if (pi.full_repaint) + if (pi.full_repaint) pi.pain.fillRectangle(xframe, yframe, w, h, pi.backgroundColor(this)); + { + Changer dummy = make_change(pi.background_color, + pi.backgroundColor(this, false)); + // The change tracking cue must not be inherited + Changer dummy2 = make_change(pi.change_, Change()); + tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y); + } + + if (drawFrame_) { // Change color of the frame in tracked changes, like for tabulars. // Only do so if the color is not custom. But do so even if RowPainter // handles the strike-through already. @@ -242,16 +250,9 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const change_drawn = true; } else c = frameColor(); - if (drawFrame_) - pi.pain.rectangle(xframe, yframe, w, h, c); - } - { - Changer dummy = make_change(pi.background_color, - pi.backgroundColor(this, false)); - // The change tracking cue must not be inherited - Changer dummy2 = make_change(pi.change_, Change()); - tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y); + pi.pain.rectangle(xframe, yframe, w, h, c); } + if (canPaintChange(*pi.base.bv) && (!change_drawn || pi.change_.deleted())) // Do not draw the change tracking cue if already done by RowPainter and // do not draw the cue for INSERTED if the information is already in the @@ -315,7 +316,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_INSET_DISSOLVE: { bool const main_inset = text_.isMainText(); - bool const target_inset = cmd.argument().empty() + bool const target_inset = cmd.argument().empty() || cmd.getArg(0) == insetName(lyxCode()); // cur.inset() is the tabular when this is a single cell (bug #9954) bool const one_cell = cur.inset().nargs() == 1; @@ -336,7 +337,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) default: text_.dispatch(cur, cmd); } - + if (!cur.result().dispatched()) Inset::doDispatch(cur, cmd); } @@ -348,7 +349,7 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action()) { case LFUN_INSET_DISSOLVE: { bool const main_inset = text_.isMainText(); - bool const target_inset = cmd.argument().empty() + bool const target_inset = cmd.argument().empty() || cmd.getArg(0) == insetName(lyxCode()); // cur.inset() is the tabular when this is a single cell (bug #9954) bool const one_cell = cur.inset().nargs() == 1; @@ -390,7 +391,7 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd, bool ret = false; if (cur.text() == &text_) ret = text_.getStatus(cur, cmd, status); - + if (!ret) ret = Inset::getStatus(cur, cmd, status); return ret; @@ -448,7 +449,7 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const { // This implements the standard way of handling the LaTeX // output of a text inset, either a command or an - // environment. Standard collapsable insets should not + // environment. Standard collapsible insets should not // redefine this, non-standard ones may call this. InsetLayout const & il = getLayout(); if (il.forceOwnlines()) @@ -591,7 +592,7 @@ docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) con // One solution would be to make the footnote , but the problem is // completely general, and so we'd have to make absolutely everything into // span. What I think will work is to check if we're about to write "div" and, -// if so, try to close fonts, etc. +// if so, try to close fonts, etc. // There are probably limits to how well we can do here, though, and we will // have to rely upon users not putting footnotes inside noun-type insets. docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, @@ -602,7 +603,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, OutputParams runparams = rp; runparams.par_begin = 0; runparams.par_end = text().paragraphs().size(); - + if (undefined()) { xs.startDivision(false); xhtmlParagraphs(text_, buffer(), xs, runparams); @@ -620,7 +621,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, cntrs.step(il.counter(), OutputUpdate); // FIXME: translate to paragraph language if (!il.htmllabel().empty()) { - docstring const lbl = + docstring const lbl = cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code()); // FIXME is this check necessary? if (!lbl.empty()) { @@ -870,13 +871,15 @@ void InsetText::iterateForToc(DocIterator const & cdit, bool output_active, addtotoc_stack.push({pit, end}); } - // if we find an optarg, we'll save it for use later. + // If we find an InsetArgument that is supposed to provide the TOC caption, + // we'll save it for use later. InsetArgument const * arginset = nullptr; for (auto const & table : par.insetList()) { dit.pos() = table.pos; table.inset->addToToc(dit, doing_output, utype, backend); if (InsetArgument const * x = table.inset->asInsetArgument()) - arginset = x; + if (x->isTocCaption()) + arginset = x; } // End custom AddToToc in paragraph layouts @@ -943,7 +946,7 @@ bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & cur) { if (buffer().isClean()) return Inset::notifyCursorLeaves(old, cur); - + // find text inset in old cursor Cursor insetCur = old; int scriptSlice = insetCur.find(this); @@ -952,10 +955,10 @@ bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & cur) LASSERT(scriptSlice != -1, return true); insetCur.cutOff(scriptSlice); LASSERT(&insetCur.inset() == this, return true); - + // update the old paragraph's words insetCur.paragraph().updateWords(); - + return Inset::notifyCursorLeaves(old, cur); } @@ -1015,7 +1018,7 @@ bool InsetText::insertCompletion(Cursor & cur, docstring const & s, } -void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y, +void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y, Dimension & dim) const { TextMetrics const & tm = cur.bv().textMetrics(&text_); @@ -1027,7 +1030,7 @@ string InsetText::contextMenu(BufferView const &, int, int) const { string context_menu = contextMenuName(); if (context_menu != InsetText::contextMenuName()) - context_menu += ";" + InsetText::contextMenuName(); + context_menu += ";" + InsetText::contextMenuName(); return context_menu; } @@ -1053,7 +1056,11 @@ docstring InsetText::toolTipText(docstring prefix, size_t const len) const for (; it != end; ++it) { if (it != beg) oss << '\n'; + if ((*it).isRTL(buffer().params())) + oss << "
"; writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed, len); + if ((*it).isRTL(buffer().params())) + oss << "
"; if (oss.tellp() >= 0 && size_t(oss.tellp()) > len) break; }