Another witch hunting case: break-paragraph -> paragraph-break.

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 16839b01cb70c256bc09609961f95b4184aaad30..2e611ffd30d14e818c78b09952a59a8bc7155d6b 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -102,13 +102,10 @@ InsetBox::InsetBox(Buffer * buffer, string const & label)
 {}
 
 
-docstring InsetBox::name() const 
+docstring InsetBox::layoutName() const
 {
        // FIXME: UNICODE
-       string name = "Box";
-       if (boxtranslator().find(params_.type) == Shaded)
-               name += ":Shaded";
-       return from_ascii(name);
+       return from_ascii("Box:" + params_.type);
 }
 
 
@@ -182,7 +179,8 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 
 bool InsetBox::forcePlainLayout(idx_type) const
 {
-       return (!params_.inner_box || params_.use_makebox) && params_.type != "Shaded";
+       return (!params_.inner_box || params_.use_makebox)
+               && params_.type != "Shaded" && params_.type != "Framed";
 }
 
 
@@ -192,10 +190,19 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                //lyxerr << "InsetBox::dispatch MODIFY" << endl;
+               string const first_arg = cmd.getArg(0);
+               bool const change_type = first_arg == "changetype";
+               bool const for_box = first_arg == "box";
+               if (!change_type && !for_box) {
+                       // not for us
+                       // this will not be handled higher up
+                       cur.undispatched();
+                       return;
+               }
                cur.recordUndoInset(ATOMIC_UNDO, this);
-               if (cmd.getArg(0) == "changetype") {
+               if (change_type)
                        params_.type = cmd.getArg(1);
-               } else
+               else // if (for_box)
                        string2params(to_utf8(cmd.argument()), params_);
                setButtonLabel();
                break;
@@ -213,18 +220,28 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        switch (cmd.action()) {
 
-       case LFUN_INSET_MODIFY:
-               if (cmd.getArg(0) == "changetype")
-                       flag.setOnOff(cmd.getArg(1) == params_.type);
-               flag.setEnabled(true);
-               return true;
+       case LFUN_INSET_MODIFY: {
+               string const first_arg = cmd.getArg(0);
+               if (first_arg == "changetype") {
+                       string const type = cmd.getArg(1);
+                       flag.setOnOff(type == params_.type);
+                       flag.setEnabled(!params_.inner_box || type != "Framed");
+                       return true;
+               }
+               if (first_arg == "box") {
+                       flag.setEnabled(true);
+                       return true;
+               }
+               return InsetCollapsable::getStatus(cur, cmd, flag);
+       }
 
        case LFUN_INSET_DIALOG_UPDATE:
                flag.setEnabled(true);
                return true;
 
-       case LFUN_BREAK_PARAGRAPH:
-               if ((params_.inner_box && !params_.use_makebox) || params_.type == "Shaded")
+       case LFUN_PARAGRAPH_BREAK:
+               if ((params_.inner_box && !params_.use_makebox)
+                    || params_.type == "Shaded" || params_.type == "Framed")
                        return InsetCollapsable::getStatus(cur, cmd, flag);
                flag.setEnabled(false);
                return true;
@@ -235,7 +252,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
+void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 {
        BoxType btype = boxtranslator().find(params_.type);
 
@@ -269,8 +286,10 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                }
        }
 
-       int i = 0;
-       os << "%\n";
+       os << safebreakln;
+       if (runparams.lastid != -1)
+               os.texrow().start(runparams.lastid, runparams.lastpos);
+
        // Adapt to column/text width correctly also if paragraphs indented:
        if (stdwidth)
                os << "\\noindent";
@@ -280,7 +299,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                break;
        case Framed:
                os << "\\begin{framed}%\n";
-               i += 1;
                break;
        case Boxed:
                os << "\\framebox";
@@ -309,7 +327,8 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                os << "\\shadowbox{";
                break;
        case Shaded:
-               // later
+               // must be set later because e.g. the width settings only work when
+               // it is inside a minipage or parbox
                break;
        case Doublebox:
                os << "\\doublebox{";
@@ -366,15 +385,13 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                }
 
                os << "%\n";
-               ++i;
        } // end if inner_box
 
        if (btype == Shaded) {
                os << "\\begin{shaded}%\n";
-               ++i;
        }
 
-       i += InsetText::latex(os, runparams);
+       InsetText::latex(os, runparams);
 
        if (btype == Shaded)
                os << "\\end{shaded}";
@@ -405,10 +422,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                // already done
                break;
        }
-
-       i += 2;
-
-       return i;
 }
 
 
@@ -484,8 +497,11 @@ docstring InsetBox::xhtml(XHTMLStream & xs, OutputParams const & runparams) cons
        // construct attributes
        string attrs = "class='" + params_.type + "'";
        string style;
-       if (!params_.width.empty())
-               style += ("width: " + params_.width.asHTMLString() + "; ");
+       if (!params_.width.empty()) {
+               string w = params_.width.asHTMLString();
+               if (w != "100%")
+                       style += ("width: " + params_.width.asHTMLString() + "; ");
+       }
        // The special heights don't really mean anything for us.
        if (!params_.height.empty() && params_.height_special == "none")
                style += ("height: " + params_.height.asHTMLString() + "; ");
@@ -529,9 +545,9 @@ void InsetBox::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBox::contextMenuName() const
+string InsetBox::contextMenuName() const
 {
-       return from_ascii("context-box");
+       return "context-box";
 }
 
 
@@ -546,7 +562,6 @@ string InsetBox::params2string(InsetBoxParams const & params)
 
 void InsetBox::string2params(string const & in, InsetBoxParams & params)
 {
-       params = InsetBoxParams(string());
        if (in.empty())
                return;
 
@@ -571,6 +586,7 @@ void InsetBox::string2params(string const & in, InsetBoxParams & params)
                                          "Expected arg 2 to be \"Box\"\n");
        }
 
+       params = InsetBoxParams(string());
        params.read(lex);
 }