X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=d579132a2129d5f2d3839461b830eff23f8414f9;hb=21f62c7184859eb8aadcf8c6efba2f3cdd810da4;hp=53f56aea6099307376e0c257a31c27be03903cec;hpb=1252c22fd35424f817e8ca216a57f509cc5526d6;p=lyx.git
diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 53f56aea60..d579132a21 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -34,21 +34,19 @@ namespace lyx {
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)
+ 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)
@@ -60,6 +58,8 @@ InsetLayout::InsetDecoration translateDecoration(std::string const & str)
return InsetLayout::DEFAULT;
}
+namespace {
+
InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
{
if (support::compare_ascii_no_case(str, "command") == 0)
@@ -87,6 +87,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
IL_DECORATION,
IL_DISPLAY,
IL_FONT,
+ IL_FORCE_LOCAL_FONT_SWITCH,
IL_FORCELTR,
IL_FORCEPLAIN,
IL_FREESPACING,
@@ -106,6 +107,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
IL_LATEXNAME,
IL_LATEXPARAM,
IL_LATEXTYPE,
+ IL_LEFTDELIM,
IL_LYXTYPE,
IL_KEEPEMPTY,
IL_MULTIPAR,
@@ -114,9 +116,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
IL_PARBREAKISNEWLINE,
IL_PREAMBLE,
IL_REQUIRES,
- IL_SPELLCHECK,
+ IL_RIGHTDELIM,
IL_REFPREFIX,
+ IL_RESETARGS,
IL_RESETSFONT,
+ IL_SPELLCHECK,
IL_END
};
@@ -133,6 +137,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
{ "display", IL_DISPLAY },
{ "end", IL_END },
{ "font", IL_FONT },
+ { "forcelocalfontswitch", IL_FORCE_LOCAL_FONT_SWITCH },
{ "forceltr", IL_FORCELTR },
{ "forceplain", IL_FORCEPLAIN },
{ "freespacing", IL_FREESPACING },
@@ -153,6 +158,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
{ "latexname", IL_LATEXNAME },
{ "latexparam", IL_LATEXPARAM },
{ "latextype", IL_LATEXTYPE },
+ { "leftdelim", IL_LEFTDELIM },
{ "lyxtype", IL_LYXTYPE },
{ "multipar", IL_MULTIPAR },
{ "needprotect", IL_NEEDPROTECT },
@@ -161,7 +167,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
{ "preamble", IL_PREAMBLE },
{ "refprefix", IL_REFPREFIX },
{ "requires", IL_REQUIRES },
+ { "resetargs", IL_RESETARGS },
{ "resetsfont", IL_RESETSFONT },
+ { "rightdelim", IL_RIGHTDELIM },
{ "spellcheck", IL_SPELLCHECK }
};
@@ -229,6 +237,19 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
lex >> tmp;
latexparam_ = support::subst(tmp, """, "\"");
break;
+ case IL_LEFTDELIM:
+ lex >> leftdelim_;
+ leftdelim_ = support::subst(leftdelim_, from_ascii("
"),
+ from_ascii("\n"));
+ break;
+ case IL_FORCE_LOCAL_FONT_SWITCH:
+ lex >> forcelocalfontswitch_;
+ break;
+ case IL_RIGHTDELIM:
+ lex >> rightdelim_;
+ rightdelim_ = support::subst(rightdelim_, from_ascii("
"),
+ from_ascii("\n"));
+ break;
case IL_LABELFONT:
labelfont_ = lyxRead(lex, inherit_font);
break;
@@ -312,6 +333,14 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
labelfont_ = font_;
break;
}
+ case IL_RESETARGS:
+ bool reset;
+ lex >> reset;
+ if (reset) {
+ latexargs_.clear();
+ postcommandargs_.clear();
+ }
+ break;
case IL_ARGUMENT:
readArgument(lex);
break;
@@ -484,10 +513,14 @@ void InsetLayout::readArgument(Lexer & lex)
{
Layout::latexarg arg;
arg.mandatory = false;
+ arg.autoinsert = false;
bool error = false;
bool finished = false;
- unsigned int nr;
+ 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());
@@ -499,21 +532,44 @@ void InsetLayout::readArgument(Lexer & lex)
} 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.ldelim = support::subst(arg.ldelim,
+ from_ascii("
"), from_ascii("\n"));
} else if (tok == "rightdelim") {
lex.next();
arg.rdelim = lex.getDocString();
+ arg.rdelim = support::subst(arg.rdelim,
+ from_ascii("
"), 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();
} else if (tok == "requires") {
lex.next();
arg.requires = lex.getString();
+ } else if (tok == "decoration") {
+ lex.next();
+ arg.decoration = lex.getString();
+ } else if (tok == "font") {
+ arg.font = lyxRead(lex, arg.font);
+ } else if (tok == "labelfont") {
+ arg.labelfont = lyxRead(lex, arg.labelfont);
} else {
lex.printError("Unknown tag");
error = true;
@@ -521,15 +577,28 @@ void InsetLayout::readArgument(Lexer & lex)
}
if (arg.labelstring.empty())
LYXERR0("Incomplete Argument definition!");
+ else if (postcmd)
+ postcommandargs_[nr] = arg;
else
latexargs_[nr] = arg;
}
-unsigned int InsetLayout::numOptArgs() const
+
+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;
}
@@ -537,11 +606,12 @@ unsigned int InsetLayout::numOptArgs() const
}
-unsigned int InsetLayout::numRequiredArgs() const
+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;
}