- Simplify prefs, graphics and external display options which are now true or false.

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 384526f8dbff9ca82597ea64fd5c07f689a94000..25911bc985f4f0b0612c1a0b4b8a0cc56e818652 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -178,7 +178,7 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 
 bool InsetBox::forceEmptyLayout(idx_type) const
 {
-       return !params_.inner_box;
+       return !params_.inner_box && params_.type != "Framed";
 }
 
 
@@ -223,18 +223,17 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "changetype")
                        flag.setOnOff(cmd.getArg(1) == params_.type);
-               else
-                       flag.enabled(true);
+               flag.setEnabled(true);
                return true;
 
        case LFUN_INSET_DIALOG_UPDATE:
-               flag.enabled(true);
+               flag.setEnabled(true);
                return true;
 
        case LFUN_BREAK_PARAGRAPH:
-               if (params_.inner_box)
+               if (params_.inner_box || params_.type == "Framed")
                        return InsetCollapsable::getStatus(cur, cmd, flag);
-               flag.enabled(false);
+               flag.setEnabled(false);
                return true;
 
        default:
@@ -584,128 +583,19 @@ void InsetBoxParams::write(ostream & os) const
 
 void InsetBoxParams::read(Lexer & lex)
 {
-       if (!lex.isOK())
-               return;
-
-       lex.next();
-       type = lex.getString();
-
-       if (!lex)
-               return;
-
-       lex.next();
-       string token;
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "position") {
-               lex.next();
-               // The [0] is needed. We need the first and only char in
-               // this string -- MV
-               pos = lex.getString()[0];
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'position'-tag!" << token << endl;
-               lex.pushToken(token);
-       }
-
-       lex.next();
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "hor_pos") {
-               lex.next();
-               hor_pos = lex.getString()[0];
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'hor_pos'-tag!" << token << endl;
-               lex.pushToken(token);
-       }
-
-       lex.next();
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "has_inner_box") {
-               lex.next();
-               inner_box = lex.getInteger();
-               if (type == "Framed")
-                       inner_box = false;
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'has_inner_box'-tag!" << endl;
-               lex.pushToken(token);
-       }
-
-       lex.next();
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "inner_pos") {
-               lex.next();
-               inner_pos = lex.getString()[0];
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'inner_pos'-tag!"
-                       << token << endl;
-               lex.pushToken(token);
-       }
-
-       lex.next();
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "use_parbox") {
-               lex.next();
-               use_parbox = lex.getInteger();
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'use_parbox'-tag!" << endl;
-               lex.pushToken(token);
-       }
-
-       lex.next();
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "width") {
-               lex.next();
-               width = Length(lex.getString());
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'width'-tag!" << endl;
-               lex.pushToken(token);
-       }
-
-       lex.next();
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "special") {
-               lex.next();
-               special = lex.getString();
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'special'-tag!" << endl;
-               lex.pushToken(token);
-       }
-
-       lex.next();
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "height") {
-               lex.next();
-               height = Length(lex.getString());
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'height'-tag!" << endl;
-               lex.pushToken(token);
-       }
-
-       lex.next();
-       token = lex.getString();
-       if (!lex)
-               return;
-       if (token == "height_special") {
-               lex.next();
-               height_special = lex.getString();
-       } else {
-               lyxerr << "InsetBox::Read: Missing 'height_special'-tag!" << endl;
-               lex.pushToken(token);
-       }
+       lex.setContext("InsetBoxParams::read");
+       lex >> type;
+       lex >> "position" >> pos;
+       lex >> "hor_pos" >> hor_pos;
+       lex >> "has_inner_box" >> inner_box;
+       if (type == "Framed")
+               inner_box = false;
+       lex >> "inner_pos" >> inner_pos;
+       lex >> "use_parbox" >> use_parbox;
+       lex >> "width" >> width;
+       lex >> "special" >> special;
+       lex >> "height" >> height;
+       lex >> "height_special" >> height_special;
 }