X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetArgument.cpp;h=605286ca20f76482f8bae5190d12b7870e29eea9;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=de239e157e6dd6257acd2615e954877041010e40;hpb=9914f21bceef9610bd1822f96eff0aa6d1a8df7c;p=lyx.git diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp index de239e157e..605286ca20 100644 --- a/src/insets/InsetArgument.cpp +++ b/src/insets/InsetArgument.cpp @@ -4,6 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Martin Vermeer + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ @@ -12,13 +13,20 @@ #include "InsetArgument.h" +#include "Buffer.h" +#include "BufferParams.h" #include "Cursor.h" #include "FuncStatus.h" #include "FuncRequest.h" #include "InsetList.h" +#include "Language.h" #include "Layout.h" #include "Lexer.h" +#include "OutputParams.h" #include "ParIterator.h" +#include "TexRow.h" +#include "texstream.h" +#include "TocBackend.h" #include "support/convert.h" #include "support/debug.h" @@ -32,7 +40,10 @@ namespace lyx { InsetArgument::InsetArgument(Buffer * buf, string const & name) - : InsetCollapsable(buf), name_(name), labelstring_(docstring()) + : InsetCollapsable(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()) {} @@ -42,29 +53,32 @@ void InsetArgument::write(ostream & os) const InsetCollapsable::write(os); } + void InsetArgument::read(Lexer & lex) { lex >> name_; InsetCollapsable::read(lex); } + void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) { - Layout::LaTeXArgMap args; - bool const insetlayout = &it.inset() && it.paragraph().layout().latexargs().empty(); - if (insetlayout) - args = it.inset().getLayout().latexargs(); - else - args = it.paragraph().layout().latexargs(); + 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(); + } // Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them) if (name_ == "999") { - int req = insetlayout ? it.inset().getLayout().requiredArgs() + unsigned int const req = insetlayout ? it.inset().getLayout().requiredArgs() : it.paragraph().layout().requiredArgs(); - int opts = insetlayout ? it.inset().getLayout().optArgs() + unsigned int const opts = insetlayout ? it.inset().getLayout().optArgs() : it.paragraph().layout().optArgs(); - int nr = 0; - int ours = 0; + unsigned int nr = 0; + unsigned int ours = 0; InsetList::const_iterator parit = it.paragraph().insetList().begin(); InsetList::const_iterator parend = it.paragraph().insetList().end(); for (; parit != parend; ++parit) { @@ -75,7 +89,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) } } bool done = false; - int realopts = 0; + unsigned int realopts = 0; if (nr > req) { // We have optional arguments realopts = nr - req; @@ -92,11 +106,37 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) name_ = convert(ours); } } - Layout::LaTeXArgMap::const_iterator const lait = - args.find(convert(name_)); + Layout::LaTeXArgMap::const_iterator const lait = args.find(name_); + caption_of_toc_ = string(); if (lait != args.end()) { - labelstring_ = translateIfPossible((*lait).second.labelstring); + docstring label = translateIfPossible((*lait).second.labelstring); + docstring striplabel; + support::rsplit(label, striplabel, '|'); + labelstring_ = striplabel.empty() ? label: striplabel; tooltip_ = translateIfPossible((*lait).second.tooltip); + font_ = (*lait).second.font; + labelfont_ = (*lait).second.labelfont; + decoration_ = (*lait).second.decoration; + pass_thru_chars_ = (*lait).second.pass_thru_chars; + pass_thru_local_ = false; + if (lait->second.is_toc_caption) + // 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_; + break; + case PT_TRUE: + pass_thru_ = true; + pass_thru_local_ = true; + break; + case PT_FALSE: + pass_thru_ = false; + break; + } } else { labelstring_ = _("Unknown Argument"); tooltip_ = _("Argument not known in this Layout. Will be supressed in the output."); @@ -105,11 +145,13 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) InsetCollapsable::updateBuffer(it, utype); } + void InsetArgument::setButtonLabel() { setLabel(labelstring_); } + docstring InsetArgument::toolTip(BufferView const & bv, int, int) const { if (isOpen(bv)) @@ -117,6 +159,7 @@ docstring InsetArgument::toolTip(BufferView const & bv, int, int) const return toolTipText(tooltip_ + from_ascii(":\n")); } + void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd) { switch (cmd.action()) { @@ -130,12 +173,28 @@ void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd) cur.undispatched(); return; } - cur.recordUndoInset(ATOMIC_UNDO, this); + cur.recordUndoInset(this); name_ = cmd.getArg(1); cur.forceBufferUpdate(); break; } + case LFUN_PASTE: + case LFUN_CLIPBOARD_PASTE: + case LFUN_SELECTION_PASTE: + case LFUN_PRIMARY_SELECTION_PASTE: + 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); + else + InsetCollapsable::doDispatch(cur, cmd); + break; + default: InsetCollapsable::doDispatch(cur, cmd); break; @@ -158,13 +217,12 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd, return true; } Layout::LaTeXArgMap args; - bool const insetlayout = &cur.inset() && cur.paragraph().layout().latexargs().empty(); + bool const insetlayout = cur.paragraph().layout().latexargs().empty(); if (insetlayout) args = cur.inset().getLayout().latexargs(); else args = cur.paragraph().layout().latexargs(); - Layout::LaTeXArgMap::const_iterator const lait = - args.find(convert(type)); + Layout::LaTeXArgMap::const_iterator const lait = args.find(type); if (lait != args.end()) { flag.setEnabled(true); InsetList::const_iterator it = cur.paragraph().insetList().begin(); @@ -192,23 +250,84 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd, } } + string InsetArgument::contextMenuName() const { - return "context-argument"; + if (decoration() == InsetLayout::CONGLOMERATE) + return "context-argument-conglomerate"; + else + return "context-argument"; } + +FontInfo InsetArgument::getFont() const +{ + if (font_ != inherit_font) + return font_; + return InsetCollapsable::getFont(); +} + + +FontInfo InsetArgument::getLabelfont() const +{ + if (labelfont_ != inherit_font) + return labelfont_; + return InsetCollapsable::getLabelfont(); +} + + +ColorCode InsetArgument::labelColor() const { + if (labelfont_.color() != Color_inherit) + return labelfont_.color(); + return InsetCollapsable::labelColor(); +} + + +InsetLayout::InsetDecoration InsetArgument::decoration() const +{ + InsetLayout::InsetDecoration dec = getLayout().decoration(); + if (!decoration_.empty()) + dec = translateDecoration(decoration_); + return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec; +} + + void InsetArgument::latexArgument(otexstream & os, - OutputParams const & runparams, docstring const & ldelim, - docstring const & rdelim) const + OutputParams const & runparams_in, docstring const & ldelim, + docstring const & rdelim, docstring const & presetarg) const { - TexRow texrow; - odocstringstream ss; - otexstream ots(ss, texrow); + otexstringstream ots; + OutputParams runparams = runparams_in; + if (!pass_thru_chars_.empty()) + runparams.pass_thru_chars += pass_thru_chars_; + runparams.pass_thru = isPassThru(); InsetText::latex(ots, runparams); - docstring str = ss.str(); - if (ldelim != "{" && support::contains(str, rdelim)) - str = '{' + str + '}'; - os << ldelim << str << rdelim; + TexString ts = ots.release(); + bool const add_braces = ldelim != "{" && support::contains(ts.str, rdelim); + os << ldelim; + if (add_braces) + os << '{'; + os << presetarg; + if (!presetarg.empty() && !ts.str.empty()) + os << ", "; + os << move(ts); + if (add_braces) + os << '}'; + os << rdelim; +} + + + +void InsetArgument::addToToc(DocIterator const & dit, bool output_active, + UpdateType utype) const +{ + if (!caption_of_toc_.empty()) { + docstring str; + text().forOutliner(str, TOC_ENTRY_LENGTH); + buffer().tocBackend().builder(caption_of_toc_).argumentItem(str); + } + // Proceed with the rest of the inset. + InsetText::addToToc(dit, output_active, utype); }