Make sure we center displayed equations.

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 709f55881bbaee287fc716dcb9ba9329d0b7eb62..fbb55fc706976f2914e0b3921c6a8d904d2e046e 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -51,9 +51,9 @@ namespace lyx {
 
 
 InsetCaption::InsetCaption(Buffer * buf, string const & type)
-    : InsetText(buf, InsetText::PlainLayout), type_(type)
+    : InsetText(buf, InsetText::PlainLayout), 
+      labelwidth_(0), is_subfloat_(false), type_(type)
 {
-       setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_collapsableframe);
 }
@@ -62,11 +62,9 @@ InsetCaption::InsetCaption(Buffer * buf, string const & type)
 void InsetCaption::write(ostream & os) const
 {
        os << "Caption";
-       if (!type_.empty()) {
-               os << " "
-                  << type_;
-       }
-       os << "\n";
+       if (!type_.empty())
+               os << ' ' << type_;
+       os << '\n';
        text().write(os);
 }
 
@@ -93,22 +91,25 @@ void InsetCaption::setCustomLabel(docstring const & label)
 }
 
 
-void InsetCaption::addToToc(DocIterator const & cpit, bool output_active) const
+void InsetCaption::addToToc(DocIterator const & cpit, bool output_active,
+                                                       UpdateType utype) const
 {
-       if (floattype_.empty())
-               return;
-
+       string const & type = floattype_.empty() ? "senseless" : floattype_;
        DocIterator pit = cpit;
        pit.push_back(CursorSlice(const_cast<InsetCaption &>(*this)));
-
-       Toc & toc = buffer().tocBackend().toc(floattype_);
-       docstring str = full_label_;
-       int length = output_active ? INT_MAX : TOC_ENTRY_LENGTH;
-       text().forOutliner(str, length);
-       toc.push_back(TocItem(pit, 0, str, output_active));
-
+       int length = (utype == OutputUpdate) ?
+               // For output (e.g. xhtml) all (bug #8603) or nothing
+               (output_active ? INT_MAX : 0) :
+               // TOC for LyX interface
+               TOC_ENTRY_LENGTH;
+       docstring str;
+       if (length > 0) {
+               str = full_label_;
+               text().forOutliner(str, length);
+       }
+       buffer().tocBackend().builder(type).captionItem(pit, str, output_active);
        // Proceed with the rest of the inset.
-       InsetText::addToToc(cpit, output_active);
+       InsetText::addToToc(cpit, output_active, utype);
 }
 
 
@@ -200,7 +201,7 @@ void InsetCaption::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                if (cmd.getArg(0) == "changetype") {
-                       cur.recordUndoInset(ATOMIC_UNDO, this);
+                       cur.recordUndoInset(this);
                        type_ = cmd.getArg(1);
                        cur.forceBufferUpdate();
                        break;
@@ -224,7 +225,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
                if (first_arg == "changetype") {
                        string const type = cmd.getArg(1);
                        status.setOnOff(type == type_);
-                       bool varia = type != "LongTableNoNumber";
+                       bool varia = type != "Unnumbered";
                        // check if the immediate parent inset allows caption variation
                        if (cur.depth() > 1) {
                                varia = cur[cur.depth() - 2].inset().allowsCaptionVariation(type);
@@ -319,7 +320,7 @@ void InsetCaption::getArgument(otexstream & os,
 
        if (!il.leftdelim().empty())
                os << il.leftdelim();
-  
+ 
        OutputParams rp = runparams;
        if (isPassThru())
                rp.pass_thru = true;
@@ -329,6 +330,8 @@ void InsetCaption::getArgument(otexstream & os,
        rp.par_end = paragraphs().size();
 
        // Output the contents of the inset
+       if (!paragraphs().empty())
+               os.texrow().forceStart(paragraphs()[0].id(), 0);
        latexParagraphs(buffer(), text(), os, rp);
        runparams.encoding = rp.encoding;
 
@@ -352,7 +355,7 @@ docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs,
                        OutputParams const & runparams) const
 {
        xs << full_label_ << ' ';
-       InsetText::XHTMLOptions const opts = 
+       InsetText::XHTMLOptions const opts =
                InsetText::WriteLabel | InsetText::WriteInnerTag;
        return InsetText::insetAsXHTML(xs, runparams, opts);
 }
@@ -371,7 +374,7 @@ void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype)
        }
        // Memorize type for addToToc().
        floattype_ = type;
-       if (type.empty())
+       if (type.empty() || type == "senseless")
                full_label_ = master.B_("Senseless!!! ");
        else {
                // FIXME: life would be _much_ simpler if listings was
@@ -382,7 +385,7 @@ void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype)
                else
                        name = master.B_(tclass.floats().getType(type).name());
                docstring counter = from_utf8(type);
-               if (cnts.isSubfloat()) {
+               if ((is_subfloat_ = cnts.isSubfloat())) {
                        // only standard captions allowed in subfloats
                        type_ = "Standard";
                        counter = "sub-" + from_utf8(type);
@@ -405,9 +408,9 @@ void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype)
                        sec += bformat(from_ascii("(%1$s)"), labelstring);
                }
                if (!sec.empty())
-                       full_label_ = bformat(from_ascii("%1$s %2$s:"), name, sec);
+                       full_label_ = bformat(from_ascii("%1$s %2$s: "), name, sec);
                else
-                       full_label_ = bformat(from_ascii("%1$s #:"), name);
+                       full_label_ = bformat(from_ascii("%1$s #: "), name);
        }
 
        // Do the real work now.