Replace a half-baked attempt to remove \lyxdot from the directory part of

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index c053c5b587f0230e327e6ff63ee16d7f61e502d2..03cdc318a4bd3aef4acf0fa5f897f8879f737e62 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);
 }
 
 
@@ -215,10 +212,13 @@ 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;
+               if (cmd.getArg(0) == "changetype") {
+                       string const type = cmd.getArg(1);
+                       flag.setOnOff(type == params_.type);
+                       flag.setEnabled(!params_.inner_box || type != "Framed");
+                       return true;
+               }
+               return InsetCollapsable::getStatus(cur, cmd, flag);
 
        case LFUN_INSET_DIALOG_UPDATE:
                flag.setEnabled(true);
@@ -237,7 +237,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetBox::latex(otexstream & os, OutputParams const & runparams) const
+void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 {
        BoxType btype = boxtranslator().find(params_.type);
 
@@ -271,8 +271,10 @@ int InsetBox::latex(otexstream & 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";
@@ -282,7 +284,6 @@ int InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                break;
        case Framed:
                os << "\\begin{framed}%\n";
-               i += 1;
                break;
        case Boxed:
                os << "\\framebox";
@@ -311,7 +312,8 @@ int InsetBox::latex(otexstream & 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{";
@@ -368,15 +370,13 @@ int InsetBox::latex(otexstream & 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}";
@@ -407,10 +407,6 @@ int InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                // already done
                break;
        }
-
-       i += 2;
-
-       return i;
 }
 
 
@@ -486,8 +482,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() + "; ");
@@ -531,9 +530,9 @@ void InsetBox::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBox::contextMenuName() const
+string InsetBox::contextMenuName() const
 {
-       return from_ascii("context-box");
+       return "context-box";
 }