{
ParagraphList::iterator end = paragraphs().end();
for (ParagraphList::iterator it = paragraphs().begin(); it != end; ++it)
- it->setBuffer(buf);
+ it->setInsetBuffers(buf);
Inset::setBuffer(buf);
}
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;
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)
+ 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.
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
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;
default:
text_.dispatch(cur, cmd);
}
-
+
if (!cur.result().dispatched())
Inset::doDispatch(cur, 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;
bool ret = false;
if (cur.text() == &text_)
ret = text_.getStatus(cur, cmd, status);
-
+
if (!ret)
ret = Inset::getStatus(cur, cmd, status);
return ret;
{
// 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())
// FIXME UNICODE
// FIXME \protect should only be used for fragile
// commands, but we do not provide this information yet.
- if (runparams.moving_arg)
+ if (hasCProtectContent(runparams.moving_arg))
+ os << "\\cprotect";
+ else if (runparams.moving_arg)
os << "\\protect";
os << '\\' << from_utf8(il.latexname());
if (!il.latexargs().empty())
// One solution would be to make the footnote <span>, 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,
OutputParams runparams = rp;
runparams.par_begin = 0;
runparams.par_end = text().paragraphs().size();
-
+
if (undefined()) {
xs.startDivision(false);
xhtmlParagraphs(text_, buffer(), xs, runparams);
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()) {
}
+bool InsetText::hasCProtectContent(bool const fragile) const
+{
+ ParagraphList const & pars = paragraphs();
+ pit_type pend = paragraphs().size();
+ for (pit_type pit = 0; pit != pend; ++pit) {
+ Paragraph const & par = pars[pit];
+ if (par.needsCProtection(fragile))
+ return true;
+ }
+ return false;
+}
+
+
bool InsetText::insetAllowed(InsetCode code) const
{
switch (code) {
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
{
if (buffer().isClean())
return Inset::notifyCursorLeaves(old, cur);
-
+
// find text inset in old cursor
Cursor insetCur = old;
int scriptSlice = insetCur.find(this);
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);
}
}
-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_);
{
string context_menu = contextMenuName();
if (context_menu != InsetText::contextMenuName())
- context_menu += ";" + InsetText::contextMenuName();
+ context_menu += ";" + InsetText::contextMenuName();
return context_menu;
}
return static_cast<InsetText::XHTMLOptions>((int)a1 | (int)a2);
}
+
+bool InsetText::needsCProtection(bool const maintext, bool const fragile) const
+{
+ // Nested cprotect content needs \cprotect
+ // on each level
+ if (producesOutput() && hasCProtectContent(fragile))
+ return true;
+
+ // Environments generally need cprotection in fragile context
+ if (fragile && getLayout().latextype() == InsetLayout::ENVIRONMENT)
+ return true;
+
+ if (!getLayout().needsCProtect())
+ return false;
+
+ // Environments and "no latex" types (e.g., knitr chunks)
+ // need cprotection regardless the content
+ if (!maintext && getLayout().latextype() != InsetLayout::COMMAND)
+ return true;
+
+ // If the inset does not produce output (e.g. Note or Branch),
+ // we can ignore the contained paragraphs
+ if (!producesOutput())
+ return false;
+
+ // Commands need cprotection if they contain specific chars
+ int const nchars_escape = 9;
+ static char_type const chars_escape[nchars_escape] = {
+ '&', '_', '$', '%', '#', '^', '{', '}', '\\'};
+
+ ParagraphList const & pars = paragraphs();
+ pit_type pend = paragraphs().size();
+
+ for (pit_type pit = 0; pit != pend; ++pit) {
+ Paragraph const & par = pars[pit];
+ if (par.needsCProtection(fragile))
+ return true;
+ docstring const pars = par.asString();
+ for (int k = 0; k < nchars_escape; k++) {
+ if (contains(pars, chars_escape[k]))
+ return true;
+ }
+ }
+ return false;
+}
+
} // namespace lyx
projects / lyx.git / blobdiff