Better TOC output for XHTML, per Rob and Pavel.

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 6b409200bf19f3309f00943c48963675e3092263..ec113744964695eaa25f40d5ad45a07e40c795cf 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,8 +190,8 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                //lyxerr << "InsetBox::dispatch MODIFY" << endl;
+               cur.recordUndoInset(ATOMIC_UNDO, this);
                if (cmd.getArg(0) == "changetype") {
-                       cur.recordUndoInset(ATOMIC_UNDO, this);
                        params_.type = cmd.getArg(1);
                } else
                        string2params(to_utf8(cmd.argument()), params_);
@@ -224,7 +222,8 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        case LFUN_BREAK_PARAGRAPH:
-               if ((params_.inner_box && !params_.use_makebox) || params_.type == "Shaded")
+               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 +234,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 +268,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 +281,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                break;
        case Framed:
                os << "\\begin{framed}%\n";
-               i += 1;
                break;
        case Boxed:
                os << "\\framebox";
@@ -366,15 +366,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 +403,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                // already done
                break;
        }
-
-       i += 2;
-
-       return i;
 }
 
 
@@ -484,8 +478,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() + "; ");