* TextMetrics::draw(): withdraw first row ascent before drawing because the conventio...

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 7c0121b864d48151566d0c12612f2bb1d33b2770..7b25e463d1723345b9cedcc3e9579c46633944c8 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -36,12 +36,10 @@
 #include "frontends/Painter.h"
 
 #include "support/lstrings.h"
-#include "support/convert.h"
 
 #include <sstream>
 
 
-using std::auto_ptr;
 using std::endl;
 using std::string;
 using std::ostream;
@@ -49,7 +47,6 @@ using std::ostream;
 
 namespace lyx {
 
-using support::bformat;
 
 InsetCaption::InsetCaption(InsetCaption const & ic)
        : InsetText(ic), textclass_(ic.textclass_)
@@ -131,24 +128,22 @@ void InsetCaption::addToToc(TocList & toclist, Buffer const & buf, ParConstItera
 bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        int const width_offset = TEXT_TO_INSET_OFFSET / 2;
-       mi.base.textwidth -= width_offset;
 
        labelwidth_ = theFontMetrics(mi.base.font).width(full_label_);
        // add some space to separate the label from the inset text
        labelwidth_ += 2 * TEXT_TO_INSET_OFFSET;
        dim.wid = labelwidth_;
        Dimension textdim;
-       InsetText::metrics(mi, textdim);
-       // Correct for button width, and re-fit
+       dim.wid += width_offset;
+       // Correct for button and label width
        mi.base.textwidth -= dim.wid;
        InsetText::metrics(mi, textdim);
+       mi.base.textwidth += dim.wid;
        dim.des = std::max(dim.des - textdim.asc + dim.asc, textdim.des);
        dim.asc = textdim.asc;
        dim.wid += textdim.wid;
        dim.asc += TEXT_TO_INSET_OFFSET;
        dim.des += TEXT_TO_INSET_OFFSET;
-       dim.wid += width_offset;
-       mi.base.textwidth += width_offset;
        bool const changed = dim_ != dim;
        dim_ = dim;
        return changed;
@@ -289,6 +284,7 @@ int InsetCaption::getOptArg(Buffer const & buf, odocstream & os,
 
 void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it)
 {
+       using support::bformat;
        TextClass const & tclass = buf.params().getTextClass();
        Counters & cnts = tclass.counters();
        string const & type = cnts.current_float();
@@ -306,7 +302,7 @@ void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it)
                        cnts.step(from_utf8(type));
                        full_label_ = bformat(from_ascii("%1$s %2$s:"), 
                                              name, 
-                                             convert<docstring>(cnts.value(from_utf8(type))));
+                                             cnts.theCounter(from_utf8(type)));
                } else
                        full_label_ = bformat(from_ascii("%1$s #:"), name);     
        }
@@ -316,9 +312,9 @@ void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it)
 }
 
 
-auto_ptr<Inset> InsetCaption::doClone() const
+Inset * InsetCaption::clone() const
 {
-       return auto_ptr<Inset>(new InsetCaption(*this));
+       return new InsetCaption(*this);
 }