InsetLayout::InsetLayout() :
name_(from_ascii("undefined")), lyxtype_(STANDARD),
labelstring_(from_ascii("UNDEFINED")), contentaslabel_(false),
- decoration_(DEFAULT), latextype_(NOLATEXTYPE), font_(sane_font),
+ decoration_(DEFAULT), latextype_(NOLATEXTYPE), font_(inherit_font),
labelfont_(sane_font), bgcolor_(Color_error),
htmlforcecss_ (false), htmlisblock_(true),
multipar_(true), custompars_(true), forceplain_(false),
passthru_(false), parbreakisnewline_(false), freespacing_(false),
keepempty_(false), forceltr_(false),
needprotect_(false), intoc_(false), spellcheck_(true),
- resetsfont_(true), display_(true), forcelocalfontswitch_(false)
+ resetsfont_(false), display_(true), forcelocalfontswitch_(false)
{
labelfont_.setColor(Color_error);
}
-namespace {
-
InsetLayout::InsetDecoration translateDecoration(std::string const & str)
{
if (support::compare_ascii_no_case(str, "classic") == 0)
return InsetLayout::DEFAULT;
}
+namespace {
+
InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
{
if (support::compare_ascii_no_case(str, "command") == 0)
IL_PREAMBLE,
IL_REQUIRES,
IL_RIGHTDELIM,
- IL_SPELLCHECK,
IL_REFPREFIX,
+ IL_RESETARGS,
IL_RESETSFONT,
+ IL_SPELLCHECK,
IL_END
};
{ "preamble", IL_PREAMBLE },
{ "refprefix", IL_REFPREFIX },
{ "requires", IL_REQUIRES },
+ { "resetargs", IL_RESETARGS },
{ "resetsfont", IL_RESETSFONT },
{ "rightdelim", IL_RIGHTDELIM },
{ "spellcheck", IL_SPELLCHECK }
labelfont_ = font_;
break;
}
+ case IL_RESETARGS:
+ bool reset;
+ lex >> reset;
+ if (reset) {
+ latexargs_.clear();
+ postcommandargs_.clear();
+ }
+ break;
case IL_ARGUMENT:
readArgument(lex);
break;
{
Layout::latexarg arg;
arg.mandatory = false;
+ arg.autoinsert = false;
bool error = false;
bool finished = false;
arg.font = inherit_font;
arg.labelfont = inherit_font;
string nr;
lex >> nr;
+ bool const postcmd = support::prefixIs(nr, "post:");
while (!finished && lex.isOK() && !error) {
lex.next();
string const tok = support::ascii_lowercase(lex.getString());
} else if (tok == "labelstring") {
lex.next();
arg.labelstring = lex.getDocString();
+ } else if (tok == "menustring") {
+ lex.next();
+ arg.menustring = lex.getDocString();
} else if (tok == "mandatory") {
lex.next();
arg.mandatory = lex.getBool();
+ } else if (tok == "autoinsert") {
+ lex.next();
+ arg.autoinsert = lex.getBool();
} else if (tok == "leftdelim") {
lex.next();
arg.ldelim = lex.getDocString();
arg.rdelim = lex.getDocString();
arg.rdelim = support::subst(arg.rdelim,
from_ascii("<br/>"), from_ascii("\n"));
+ } else if (tok == "defaultarg") {
+ lex.next();
+ arg.defaultarg = lex.getDocString();
+ } else if (tok == "presetarg") {
+ lex.next();
+ arg.presetarg = lex.getDocString();
} else if (tok == "tooltip") {
lex.next();
arg.tooltip = lex.getDocString();
}
if (arg.labelstring.empty())
LYXERR0("Incomplete Argument definition!");
+ else if (postcmd)
+ postcommandargs_[nr] = arg;
else
latexargs_[nr] = arg;
}
+
+Layout::LaTeXArgMap InsetLayout::args() const
+{
+ Layout::LaTeXArgMap args = latexargs_;
+ if (!postcommandargs_.empty())
+ args.insert(postcommandargs_.begin(), postcommandargs_.end());
+ return args;
+}
+
+
unsigned int InsetLayout::optArgs() const
{
unsigned int nr = 0;
- Layout::LaTeXArgMap::const_iterator it = latexargs_.begin();
- for (; it != latexargs_.end(); ++it) {
+ Layout::LaTeXArgMap const args = InsetLayout::args();
+ Layout::LaTeXArgMap::const_iterator it = args.begin();
+ for (; it != args.end(); ++it) {
if (!(*it).second.mandatory)
++nr;
}
unsigned int InsetLayout::requiredArgs() const
{
unsigned int nr = 0;
- Layout::LaTeXArgMap::const_iterator it = latexargs_.begin();
- for (; it != latexargs_.end(); ++it) {
+ Layout::LaTeXArgMap const args = InsetLayout::args();
+ Layout::LaTeXArgMap::const_iterator it = args.begin();
+ for (; it != args.end(); ++it) {
if ((*it).second.mandatory)
++nr;
}