Whitespace

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index ec113744964695eaa25f40d5ad45a07e40c795cf..c96a7c9e7d11375d5a2fac0ec9537743a63fe0c1 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -17,6 +17,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "ColorSet.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncStatus.h"
@@ -77,14 +78,14 @@ BoxTranslatorLoc initBoxtranslatorLoc()
 
 BoxTranslator const & boxtranslator()
 {
-       static BoxTranslator translator = initBoxtranslator();
+       static BoxTranslator const translator = initBoxtranslator();
        return translator;
 }
 
 
 BoxTranslatorLoc const & boxtranslator_loc()
 {
-       static BoxTranslatorLoc translator = initBoxtranslatorLoc();
+       static BoxTranslatorLoc const translator = initBoxtranslatorLoc();
        return translator;
 }
 
@@ -161,7 +162,7 @@ void InsetBox::setButtonLabel()
 
 bool InsetBox::hasFixedWidth() const
 {
-       return params_.inner_box || params_.special != "width";
+       return !params_.width.empty();
 }
 
 
@@ -184,16 +185,39 @@ bool InsetBox::forcePlainLayout(idx_type) const
 }
 
 
+ColorCode InsetBox::backgroundColor(PainterInfo const &) const
+{
+       if (params_.type != "Shaded")
+               return getLayout().bgcolor();
+       // FIXME: This hardcoded color is a hack!
+       if (buffer().params().boxbgcolor == lyx::rgbFromHexName("#ff0000"))
+               return getLayout().bgcolor();
+       ColorCode c = lcolor.getFromLyXName("boxbgcolor");
+       if (c == Color_none)
+               return getLayout().bgcolor();
+       return c;
+}
+
+
 void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action()) {
 
        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;
@@ -211,17 +235,26 @@ 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:
+       case LFUN_PARAGRAPH_BREAK:
                if ((params_.inner_box && !params_.use_makebox)
                     || params_.type == "Shaded" || params_.type == "Framed")
                        return InsetCollapsable::getStatus(cur, cmd, flag);
@@ -240,6 +273,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 
        string width_string = params_.width.asLatexString();
        bool stdwidth = false;
+       // FIXME: do not test explicitely values of width_string
        if (params_.inner_box &&
                        (width_string.find("1.0\\columnwidth") != string::npos
                        || width_string.find("1.0\\textwidth") != string::npos)) {
@@ -283,20 +317,24 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                os << "\\begin{framed}%\n";
                break;
        case Boxed:
-               os << "\\framebox";
-               if (!params_.inner_box) {
-                       // Special widths, see usrguide §3.5
-                       // FIXME UNICODE
-                       if (params_.special != "none") {
-                               os << "[" << params_.width.value()
-                                  << '\\' << from_utf8(params_.special)
-                                  << ']';
+               if (!width_string.empty()) {
+                       if (!params_.inner_box) {
+                               os << "\\framebox";
+                               // Special widths, see usrguide sec. 3.5
+                               // FIXME UNICODE
+                               if (params_.special != "none") {
+                                       os << "[" << params_.width.value()
+                                          << '\\' << from_utf8(params_.special)
+                                          << ']';
+                               } else
+                                       os << '[' << from_ascii(width_string)
+                                          << ']';
+                               if (params_.hor_pos != 'c')
+                                       os << "[" << params_.hor_pos << "]";
                        } else
-                               os << '[' << from_ascii(width_string)
-                                  << ']';
-                       if (params_.hor_pos != 'c')
-                               os << "[" << params_.hor_pos << "]";
-               }
+                               os << "\\fbox";
+               } else
+                       os << "\\fbox";
                os << "{";
                break;
        case ovalbox:
@@ -309,7 +347,8 @@ void 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{";
@@ -320,18 +359,21 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                if (params_.use_parbox)
                        os << "\\parbox";
                else if (params_.use_makebox) {
-                       os << "\\makebox";
-                       // FIXME UNICODE
-                       // output the width and horizontal position
-                       if (params_.special != "none") {
-                               os << "[" << params_.width.value()
-                                  << '\\' << from_utf8(params_.special)
-                                  << ']';
+                       if (!width_string.empty()) {
+                               os << "\\makebox";
+                               // FIXME UNICODE
+                               // output the width and horizontal position
+                               if (params_.special != "none") {
+                                       os << "[" << params_.width.value()
+                                          << '\\' << from_utf8(params_.special)
+                                          << ']';
+                               } else
+                                       os << '[' << from_ascii(width_string)
+                                          << ']';
+                               if (params_.hor_pos != 'c')
+                                       os << "[" << params_.hor_pos << "]";
                        } else
-                               os << '[' << from_ascii(width_string)
-                                  << ']';
-                       if (params_.hor_pos != 'c')
-                               os << "[" << params_.hor_pos << "]";
+                               os << "\\mbox";
                        os << "{";
                }
                else
@@ -406,7 +448,8 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 }
 
 
-int InsetBox::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetBox::plaintext(odocstringstream & os,
+       OutputParams const & runparams, size_t max_length) const
 {
        BoxType const btype = boxtranslator().find(params_.type);
 
@@ -432,7 +475,7 @@ int InsetBox::plaintext(odocstream & os, OutputParams const & runparams) const
                        break;
        }
 
-       InsetText::plaintext(os, runparams);
+       InsetText::plaintext(os, runparams, max_length);
 
        int len = 0;
        switch (btype) {
@@ -526,9 +569,9 @@ void InsetBox::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBox::contextMenuName() const
+string InsetBox::contextMenuName() const
 {
-       return from_ascii("context-box");
+       return "context-box";
 }
 
 
@@ -543,7 +586,6 @@ string InsetBox::params2string(InsetBoxParams const & params)
 
 void InsetBox::string2params(string const & in, InsetBoxParams & params)
 {
-       params = InsetBoxParams(string());
        if (in.empty())
                return;
 
@@ -568,6 +610,7 @@ void InsetBox::string2params(string const & in, InsetBoxParams & params)
                                          "Expected arg 2 to be \"Box\"\n");
        }
 
+       params = InsetBoxParams(string());
        params.read(lex);
 }