#include "ParIterator.h"
#include "TexRow.h"
#include "texstream.h"
+#include "TocBackend.h"
#include "support/convert.h"
#include "support/debug.h"
InsetArgument::InsetArgument(Buffer * buf, string const & name)
- : InsetCollapsable(buf), name_(name), labelstring_(docstring()),
+ : InsetCollapsible(buf), name_(name), labelstring_(docstring()),
font_(inherit_font), labelfont_(inherit_font), decoration_(string()),
pass_thru_context_(false), pass_thru_local_(false), pass_thru_(false),
- pass_thru_chars_(docstring())
+ free_spacing_(false), pass_thru_chars_(docstring()), is_toc_caption_(false),
+ newline_cmd_(string())
{}
void InsetArgument::write(ostream & os) const
{
os << "Argument " << name_ << "\n";
- InsetCollapsable::write(os);
+ InsetCollapsible::write(os);
}
void InsetArgument::read(Lexer & lex)
{
lex >> name_;
- InsetCollapsable::read(lex);
+ InsetCollapsible::read(lex);
}
void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
{
- Layout::LaTeXArgMap args = it.paragraph().layout().args();
- pass_thru_context_ = it.paragraph().layout().pass_thru;
- bool const insetlayout = args.empty();
- if (insetlayout) {
- args = it.inset().getLayout().args();
- pass_thru_context_ = it.inset().getLayout().isPassThru();
- }
+ bool const insetlayout = !it.paragraph().layout().hasArgs();
+ Layout::LaTeXArgMap const args = insetlayout ?
+ it.inset().getLayout().args() : it.paragraph().layout().args();
+ pass_thru_context_ = insetlayout ?
+ it.inset().getLayout().isPassThru() : it.paragraph().layout().pass_thru;
+ // Record PassThru status in order to act on changes.
+ bool const former_pass_thru = pass_thru_;
// Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them)
if (name_ == "999") {
}
}
Layout::LaTeXArgMap::const_iterator const lait = args.find(name_);
+ caption_of_toc_ = string();
if (lait != args.end()) {
docstring label = translateIfPossible((*lait).second.labelstring);
docstring striplabel;
labelfont_ = (*lait).second.labelfont;
decoration_ = (*lait).second.decoration;
pass_thru_chars_ = (*lait).second.pass_thru_chars;
+ newline_cmd_ = (*lait).second.newlinecmd;
+ free_spacing_ = (*lait).second.free_spacing;
pass_thru_local_ = false;
+ if (lait->second.is_toc_caption) {
+ is_toc_caption_ = true;
+ // empty if AddToToc is not set
+ caption_of_toc_ = insetlayout
+ ? it.inset().getLayout().tocType()
+ : it.paragraph().layout().tocType();
+ }
+
switch ((*lait).second.passthru) {
case PT_INHERITED:
pass_thru_ = pass_thru_context_;
}
} else {
labelstring_ = _("Unknown Argument");
- tooltip_ = _("Argument not known in this Layout. Will be supressed in the output.");
+ tooltip_ = _("Argument not known in this Layout. Will be suppressed in the output.");
+ }
+
+ if (former_pass_thru != pass_thru_) {
+ // PassThru status changed. We might need to update
+ // the language of the contents
+ Language const * l = insetlayout
+ ? it.inset().buffer().language()
+ : it.buffer()->language();
+ fixParagraphLanguage(l);
}
+
setButtonLabel();
- InsetCollapsable::updateBuffer(it, utype);
+ InsetCollapsible::updateBuffer(it, utype);
}
case LFUN_CLIPBOARD_PASTE:
case LFUN_SELECTION_PASTE:
case LFUN_PRIMARY_SELECTION_PASTE:
- // Do not call InsetCollapsable::doDispatch(cur, cmd)
- // with (inherited) pass_thru to avoid call for
- // fixParagraphsFont(), which does not play nicely with
- // inherited pass_thru (see #8471).
- if (pass_thru_ && !pass_thru_local_)
+ case LFUN_SELF_INSERT:
+ // With (only) inherited pass_thru, call Text::dispatch()
+ // directly to avoid call for fixParagraphsFont() and/or
+ // forcing to latex_language in InsetText::dispatch(),
+ // since this does not play nicely with inherited pass_thru
+ // (see #8471).
+ if (pass_thru_ && !pass_thru_local_) {
text().dispatch(cur, cmd);
+ // For the paste operations, check if we have
+ // non-latex_language, and if so, fix.
+ if (cmd.action() != LFUN_SELF_INSERT)
+ fixParagraphLanguage(buffer().params().language);
+ }
else
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
default:
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
}
}
Layout::LaTeXArgMap::const_iterator const lait = args.find(type);
if (lait != args.end()) {
flag.setEnabled(true);
- InsetList::const_iterator it = cur.paragraph().insetList().begin();
- InsetList::const_iterator end = cur.paragraph().insetList().end();
- for (; it != end; ++it) {
- if (it->inset->lyxCode() == ARG_CODE) {
- InsetArgument const * ins =
- static_cast<InsetArgument const *>(it->inset);
+ for (auto const & table : cur.paragraph().insetList())
+ if (InsetArgument const * ins = table.inset->asInsetArgument())
if (ins->name() == type) {
// we have this already
flag.setEnabled(false);
return true;
}
- }
- }
} else
flag.setEnabled(false);
return true;
}
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
}
default:
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
}
}
{
if (font_ != inherit_font)
return font_;
- return InsetCollapsable::getFont();
+ return InsetCollapsible::getFont();
}
{
if (labelfont_ != inherit_font)
return labelfont_;
- return InsetCollapsable::getLabelfont();
+ return InsetCollapsible::getLabelfont();
}
ColorCode InsetArgument::labelColor() const {
if (labelfont_.color() != Color_inherit)
return labelfont_.color();
- return InsetCollapsable::labelColor();
+ return InsetCollapsible::labelColor();
}
OutputParams runparams = runparams_in;
if (!pass_thru_chars_.empty())
runparams.pass_thru_chars += pass_thru_chars_;
+ if (!newline_cmd_.empty())
+ runparams.newlinecmd = newline_cmd_;
runparams.pass_thru = isPassThru();
InsetText::latex(ots, runparams);
TexString ts = ots.release();
- bool const add_braces = ldelim != "{" && support::contains(ts.str, rdelim);
+ bool const add_braces = !ldelim.empty() && ldelim != "{"
+ && support::contains(ts.str, rdelim);
os << ldelim;
if (add_braces)
os << '{';
}
+void InsetArgument::addToToc(DocIterator const & dit, bool output_active,
+ UpdateType utype, TocBackend & backend) const
+{
+ if (!caption_of_toc_.empty()) {
+ docstring str;
+ text().forOutliner(str, TOC_ENTRY_LENGTH);
+ backend.builder(caption_of_toc_).argumentItem(str);
+ }
+ // Proceed with the rest of the inset.
+ InsetText::addToToc(dit, output_active, utype, backend);
+}
+
+
+void InsetArgument::fixParagraphLanguage(Language const * l)
+{
+ Font font(inherit_font, l);
+ if (pass_thru_)
+ font.setLanguage(latex_language);
+ paragraphs().front().resetFonts(font);
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff