Wrap rotated cells with linebreaks in varwidth

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 21d7feb9951da235f751bfbbaad4d1e76b3fc1ec..7711277e0a90f2d6c22348fc8ebb1e3188ad19f2 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -27,6 +27,8 @@
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "output_xhtml.h"
+#include "TexRow.h"
+#include "texstream.h"
 #include "TextClass.h"
 
 #include "support/debug.h"
@@ -90,7 +92,7 @@ BoxTranslatorLoc const & boxtranslator_loc()
        return translator;
 }
 
-} // namespace anon
+} // namespace
 
 
 /////////////////////////////////////////////////////////////////////////
@@ -100,7 +102,7 @@ BoxTranslatorLoc const & boxtranslator_loc()
 /////////////////////////////////////////////////////////////////////////
 
 InsetBox::InsetBox(Buffer * buffer, string const & label)
-       : InsetCollapsable(buffer), params_(label)
+       : InsetCollapsible(buffer), params_(label)
 {}
 
 
@@ -114,14 +116,14 @@ docstring InsetBox::layoutName() const
 void InsetBox::write(ostream & os) const
 {
        params_.write(os);
-       InsetCollapsable::write(os);
+       InsetCollapsible::write(os);
 }
 
 
 void InsetBox::read(Lexer & lex)
 {
        params_.read(lex);
-       InsetCollapsable::read(lex);
+       InsetCollapsible::read(lex);
 }
 
 
@@ -163,13 +165,13 @@ void InsetBox::setButtonLabel()
        if (btype == Boxed)
                setFrameColor(lcolor.getFromLaTeXName(params_.framecolor));
        else
-               setFrameColor(Color_collapsableframe);
+               setFrameColor(Color_collapsibleframe);
 }
 
 
 bool InsetBox::hasFixedWidth() const
 {
-       return !params_.width.empty();
+       return !params_.width.empty() && params_.special == "none";
 }
 
 
@@ -180,15 +182,15 @@ bool InsetBox::allowMultiPar() const
 }
 
 
-void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
+void InsetBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        // back up textwidth.
-       int textwidth_backup = m.base.textwidth;
+       int textwidth_backup = mi.base.textwidth;
        if (hasFixedWidth())
-               m.base.textwidth = params_.width.inPixels(m.base);
-       InsetCollapsable::metrics(m, dim);
+               mi.base.textwidth = mi.base.inPixels(params_.width);
+       InsetCollapsible::metrics(mi, dim);
        // retore textwidth.
-       m.base.textwidth = textwidth_backup;
+       mi.base.textwidth = textwidth_backup;
 }
 
 
@@ -199,6 +201,17 @@ bool InsetBox::forcePlainLayout(idx_type) const
 }
 
 
+bool InsetBox::needsCProtection(bool const maintext, bool const fragile) const
+{
+       // We need to cprotect boxes that use minipages as inner box
+       // in fragile context
+       if (fragile && params_.inner_box && !params_.use_parbox && !params_.use_makebox)
+               return true;
+
+       return InsetText::needsCProtection(maintext, fragile);
+}
+
+
 ColorCode InsetBox::backgroundColor(PainterInfo const &) const
 {
        // we only support background color for 3 types
@@ -223,6 +236,33 @@ ColorCode InsetBox::backgroundColor(PainterInfo const &) const
 }
 
 
+LyXAlignment InsetBox::contentAlignment() const
+{
+       // Custom horizontal alignment is only allowed with a fixed width
+       // and if either makebox or no inner box are used
+       if (params_.width.empty() || !(params_.use_makebox || !params_.inner_box))
+               return LYX_ALIGN_NONE;
+
+       // The default value below is actually irrelevant
+       LyXAlignment align = LYX_ALIGN_NONE;
+       switch (params_.hor_pos) {
+       case 'l':
+               align = LYX_ALIGN_LEFT;
+               break;
+       case 'c':
+               align = LYX_ALIGN_CENTER;
+               break;
+       case 'r':
+               align = LYX_ALIGN_RIGHT;
+               break;
+       case 's':
+               align = LYX_ALIGN_BLOCK;
+               break;
+       }
+       return align;
+}
+
+
 void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action()) {
@@ -239,16 +279,28 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
                        return;
                }
                cur.recordUndoInset(this);
-               if (change_type)
+               if (change_type) {
                        params_.type = cmd.getArg(1);
-               else // if (for_box)
+                       // set a makebox if there is no inner box but Frameless was exectued
+                       // otherwise the result would be a non existent box (no inner AND outer box)
+                       // (this was LyX bug 8712)
+                       if (params_.type == "Frameless" && !params_.inner_box) {
+                               params_.use_makebox = true;
+                               params_.inner_box = true;
+                       }
+                       // handle the opposite case
+                       if (params_.type == "Boxed" && params_.use_makebox) {
+                               params_.use_makebox = false;
+                               params_.inner_box = false;
+                       }
+               } else
                        string2params(to_utf8(cmd.argument()), params_);
                setButtonLabel();
                break;
        }
 
        default:
-               InsetCollapsable::doDispatch(cur, cmd);
+               InsetCollapsible::doDispatch(cur, cmd);
                break;
        }
 }
@@ -271,7 +323,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
                        flag.setEnabled(true);
                        return true;
                }
-               return InsetCollapsable::getStatus(cur, cmd, flag);
+               return InsetCollapsible::getStatus(cur, cmd, flag);
        }
 
        case LFUN_INSET_DIALOG_UPDATE:
@@ -279,7 +331,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        default:
-               return InsetCollapsable::getStatus(cur, cmd, flag);
+               return InsetCollapsible::getStatus(cur, cmd, flag);
        }
 }
 
@@ -297,6 +349,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
        string separation_string = params_.separation.asLatexString();
        string shadowsize_string = params_.shadowsize.asLatexString();
        bool stdwidth = false;
+       string const cprotect = hasCProtectContent(runparams.moving_arg) ? "\\cprotect" : string();
        // in general the overall width of some decorated boxes is wider thean the inner box
        // we could therefore calculate the real width for all sizes so that if the user wants
        // e.g. 0.1\columnwidth or 2cm he gets exactly this size
@@ -380,13 +433,14 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                        } else
                                os << '[' << from_ascii(width_string)
                                   << ']';
+                       // default horizontal alignment is 'c'
                        if (params_.hor_pos != 'c')
                                os << "[" << params_.hor_pos << "]";
                } else {
                        if (params_.framecolor != "black" || params_.backgroundcolor != "none")
                                os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
                        else
-                               os << "\\fbox";
+                               os << cprotect << "\\fbox";
                }
                os << "{";
                break;
@@ -508,23 +562,6 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                os << "\\begin{shaded}%\n";
        }
 
-       // \framebox and \makebox handle hor_pos their own way
-       // hor_pos is senseless for \mbox and \fbox
-       if (!params_.use_makebox
-               && !(btype == Boxed && !params_.inner_box)) {
-                       switch (params_.hor_pos) {
-                       case 'l':
-                               // do nothing because this is LaTeX's default
-                               break;
-                       case 'c':
-                               os << "\\centering ";
-                               break;
-                       case 'r':
-                               os << "\\raggedleft ";
-                               break;
-                       }
-       }
-
        InsetText::latex(os, runparams);
 
        if (btype == Shaded)
@@ -707,7 +744,7 @@ void InsetBox::validate(LaTeXFeatures & features) const
                features.require("framed");
                break;
        }
-       InsetCollapsable::validate(features);
+       InsetCollapsible::validate(features);
 }