#include "frontends/alert.h"
#include "frontends/Painter.h"
+#include "support/bind.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/gettext.h"
-#include "support/lstrings.h"
-
-#include "support/bind.h"
#include "support/lassert.h"
+#include "support/lstrings.h"
+#include "support/RefChanger.h"
#include <algorithm>
{
TextMetrics & tm = pi.base.bv->textMetrics(&text_);
+ int const w = tm.width() + TEXT_TO_INSET_OFFSET;
+ int const yframe = y - TEXT_TO_INSET_OFFSET - tm.ascent();
+ 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) {
- int const w = tm.width() + TEXT_TO_INSET_OFFSET;
- int const yframe = y - TEXT_TO_INSET_OFFSET - tm.ascent();
- int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET;
- int const xframe = x + TEXT_TO_INSET_OFFSET / 2;
if (pi.full_repaint)
pi.pain.fillRectangle(xframe, yframe, w, h,
pi.backgroundColor(this));
+ // 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.
+ Color c;
+ if (pi.change_.changed()
+ // Originally, these are the colors with role Text, from role() in
+ // ColorCache.cpp. The code is duplicated to avoid depending on Qt
+ // types, and also maybe it need not match in the future.
+ && (frameColor() == Color_foreground
+ || frameColor() == Color_cursor
+ || frameColor() == Color_preview
+ || frameColor() == Color_tabularline
+ || frameColor() == Color_previewframe)) {
+ c = pi.change_.color();
+ change_drawn = true;
+ } else
+ c = frameColor();
if (drawFrame_)
- pi.pain.rectangle(xframe, yframe, w, h, frameColor());
+ pi.pain.rectangle(xframe, yframe, w, h, c);
}
- ColorCode const old_color = pi.background_color;
- pi.background_color = pi.backgroundColor(this, false);
-
- tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
-
- pi.background_color = old_color;
+ {
+ 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 (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
+ // color of the frame
+ pi.change_.paintCue(pi, xframe, yframe, xframe + w, yframe + h);
}
pos = temp_cur.pos();
}
- text_.setCursor(cur.top(), pit, pos);
+ cur.top().setPitPos(pit, pos);
cur.finishUndo();
}
break;
case LFUN_INSET_DISSOLVE: {
- bool const main_inset = &buffer().inset() == this;
+ bool const main_inset = text_.isMainText();
bool const target_inset = cmd.argument().empty()
|| cmd.getArg(0) == insetName(lyxCode());
- bool const one_cell = nargs() == 1;
+ // cur.inset() is the tabular when this is a single cell (bug #9954)
+ bool const one_cell = cur.inset().nargs() == 1;
if (!main_inset && target_inset && one_cell) {
// Text::dissolveInset assumes that the cursor
{
switch (cmd.action()) {
case LFUN_INSET_DISSOLVE: {
- bool const main_inset = &buffer().inset() == this;
+ bool const main_inset = text_.isMainText();
bool const target_inset = cmd.argument().empty()
|| cmd.getArg(0) == insetName(lyxCode());
- bool const one_cell = nargs() == 1;
+ // cur.inset() is the tabular when this is a single cell (bug #9954)
+ bool const one_cell = cur.inset().nargs() == 1;
if (target_inset)
status.setEnabled(!main_inset && one_cell);
status.setEnabled(false);
return true;
}
- if (&buffer().inset() == this || !cur.paragraph().layout().args().empty())
+ if (text_.isMainText() || !cur.paragraph().layout().args().empty())
return text_.getStatus(cur, cmd, status);
Layout::LaTeXArgMap args = getLayout().args();
void InsetText::validate(LaTeXFeatures & features) const
{
features.useInsetLayout(getLayout());
- for_each(paragraphs().begin(), paragraphs().end(),
- bind(&Paragraph::validate, _1, ref(features)));
+ for (Paragraph const & p : paragraphs())
+ p.validate(features);
}
if (!il.latexname().empty()) {
if (il.latextype() == InsetLayout::COMMAND) {
// FIXME UNICODE
+ // FIXME \protect should only be used for fragile
+ // commands, but we do not provide this information yet.
if (runparams.moving_arg)
os << "\\protect";
os << '\\' << from_utf8(il.latexname());
rp.pass_thru = true;
if (il.isNeedProtect())
rp.moving_arg = true;
+ if (!il.passThruChars().empty())
+ rp.pass_thru_chars += il.passThruChars();
rp.par_begin = 0;
rp.par_end = paragraphs().size();
xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr());
// we will eventually lose information about the containing inset
- if (!il.isMultiPar() || opts == JustText)
+ if (!allowMultiPar() || opts == JustText)
runparams.html_make_pars = false;
if (il.isPassThru())
runparams.pass_thru = true;
}
-void InsetText::setAutoBreakRows(bool flag)
-{
- if (flag == text_.autoBreakRows_)
- return;
-
- text_.autoBreakRows_ = flag;
- if (flag)
- return;
-
- // remove previously existing newlines
- ParagraphList::iterator it = paragraphs().begin();
- ParagraphList::iterator end = paragraphs().end();
- for (; it != end; ++it)
- for (int i = 0; i < it->size(); ++i)
- if (it->isNewline(i))
- // do not track the change, because the user
- // is not allowed to revert/reject it
- it->eraseChar(i, false);
-}
-
-
void InsetText::setDrawFrame(bool flag)
{
drawFrame_ = flag;
// since we are saving and restoring the existing counters, etc.
Counters const savecnt = tclass.counters();
tclass.counters().reset();
+ // we need float information even in note insets (#9760)
+ tclass.counters().current_float(savecnt.current_float());
+ tclass.counters().isSubfloat(savecnt.isSubfloat());
buffer().updateBuffer(it2, utype);
tclass.counters() = savecnt;
}
}
-void InsetText::forOutliner(docstring & os, size_t maxlen) const
+void InsetText::forOutliner(docstring & os, size_t const maxlen,
+ bool const shorten) const
{
if (!getLayout().isInToc())
return;
- text().forOutliner(os, maxlen, false);
+ text().forOutliner(os, maxlen, shorten);
}
-void InsetText::addToToc(DocIterator const & cdit, bool output_active) const
+void InsetText::addToToc(DocIterator const & cdit, bool output_active,
+ UpdateType utype) const
{
DocIterator dit = cdit;
dit.push_back(CursorSlice(const_cast<InsetText &>(*this)));
- iterateForToc(dit, output_active);
+ iterateForToc(dit, output_active, utype);
}
-void InsetText::iterateForToc(DocIterator const & cdit, bool output_active) const
+void InsetText::iterateForToc(DocIterator const & cdit, bool output_active,
+ UpdateType utype) const
{
DocIterator dit = cdit;
- Toc & toc = buffer().tocBackend().toc("tableofcontents");
+ // This also ensures that any document has a table of contents
+ shared_ptr<Toc> toc = buffer().tocBackend().toc("tableofcontents");
BufferParams const & bufparams = buffer_->params();
int const min_toclevel = bufparams.documentClass().min_toclevel();
Inset & inset = *it->inset;
dit.pos() = it->pos;
//lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl;
- inset.addToToc(dit, doing_output);
+ inset.addToToc(dit, doing_output, utype);
if (inset.lyxCode() == ARG_CODE)
arginset = inset.asInsetText();
}
if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel) {
// insert this into the table of contents
docstring tocstring;
- int const length = doing_output ? INT_MAX : TOC_ENTRY_LENGTH;
+ int const length = (doing_output && utype == OutputUpdate) ?
+ INT_MAX : TOC_ENTRY_LENGTH;
if (arginset) {
tocstring = par.labelString();
if (!tocstring.empty())
} else
par.forOutliner(tocstring, length);
dit.pos() = 0;
- toc.push_back(TocItem(dit, toclevel - min_toclevel,
- tocstring, doing_output, tocstring));
+ toc->push_back(TocItem(dit, toclevel - min_toclevel,
+ tocstring, doing_output));
}
-
+
// And now the list of changes.
par.addChangesToToc(dit, buffer(), doing_output);
}
}
-docstring InsetText::toolTipText(docstring prefix,
- size_t numlines, size_t len) const
+docstring InsetText::toolTipText(docstring prefix, size_t const len) const
{
- size_t const max_length = numlines * len;
OutputParams rp(&buffer().params().encoding());
rp.for_tooltip = true;
odocstringstream oss;
ParagraphList::const_iterator end = paragraphs().end();
ParagraphList::const_iterator it = beg;
bool ref_printed = false;
- docstring str;
for (; it != end; ++it) {
if (it != beg)
oss << '\n';
- writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed, max_length);
- str = oss.str();
- if (str.length() >= max_length)
+ writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed, len);
+ if (oss.tellp() >= 0 && size_t(oss.tellp()) > len)
break;
}
- return support::wrapParas(str, 4, len, numlines);
+ docstring str = oss.str();
+ support::truncateWithEllipsis(str, len);
+ return str;
}
projects / lyx.git / blobdiff