Fix iterator invalidation.

[lyx.git] / src / insets / InsetLayout.cpp

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 808176602178638c071ab501fea5799b7fc8349f..d579132a2129d5f2d3839461b830eff23f8414f9 100644 (file)
--- 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,
@@ -116,9 +117,10 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_PREAMBLE,
                IL_REQUIRES,
                IL_RIGHTDELIM,
-               IL_SPELLCHECK,
                IL_REFPREFIX,
+               IL_RESETARGS,
                IL_RESETSFONT,
+               IL_SPELLCHECK,
                IL_END
        };
 
@@ -135,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 },
@@ -164,6 +167,7 @@ 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 }
@@ -235,9 +239,16 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        break;
                case IL_LEFTDELIM:
                        lex >> leftdelim_;
+                       leftdelim_ = support::subst(leftdelim_, from_ascii("<br/>"),
+                                                   from_ascii("\n"));
+                       break;
+               case IL_FORCE_LOCAL_FONT_SWITCH:
+                       lex >> forcelocalfontswitch_;
                        break;
                case IL_RIGHTDELIM:
                        lex >> rightdelim_;
+                       rightdelim_ = support::subst(rightdelim_, from_ascii("<br/>"),
+                                                    from_ascii("\n"));
                        break;
                case IL_LABELFONT:
                        labelfont_ = lyxRead(lex, inherit_font);
@@ -322,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;
@@ -494,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());
@@ -509,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("<br/>"), from_ascii("\n"));
                } else if (tok == "rightdelim") {
                        lex.next();
                        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();
                } 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;
@@ -531,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;
        }
@@ -547,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;
        }