* 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 be9d77efd7793a245884774022ee3fae5b48bce0..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,10 +47,17 @@ using std::ostream;
 
 namespace lyx {
 
-using support::bformat;
+
+InsetCaption::InsetCaption(InsetCaption const & ic)
+       : InsetText(ic), textclass_(ic.textclass_)
+{
+       setAutoBreakRows(true);
+       setDrawFrame(true);
+       setFrameColor(Color::captionframe);
+}
 
 InsetCaption::InsetCaption(BufferParams const & bp)
-       : InsetText(bp), textclass_(bp.getLyXTextClass())
+       : InsetText(bp), textclass_(bp.getTextClass())
 {
        setAutoBreakRows(true);
        setDrawFrame(true);
@@ -107,7 +112,7 @@ void InsetCaption::setCustomLabel(docstring const & label)
 }
 
 
-void InsetCaption::addToToc(TocList & toclist, Buffer const & buf) const
+void InsetCaption::addToToc(TocList & toclist, Buffer const & buf, ParConstIterator const &) const
 {
        if (type_.empty())
                return;
@@ -115,8 +120,7 @@ void InsetCaption::addToToc(TocList & toclist, Buffer const & buf) const
        ParConstIterator pit = par_const_iterator_begin(*this);
 
        Toc & toc = toclist[type_];
-       docstring const str = convert<docstring>(counter_)
-               + ". " + pit->asString(buf, false);
+       docstring const str = full_label_ + ". " + pit->asString(buf, false);
        toc.push_back(TocItem(pit, 0, str));
 }
 
@@ -124,26 +128,22 @@ void InsetCaption::addToToc(TocList & toclist, Buffer const & buf) const
 bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        int const width_offset = TEXT_TO_INSET_OFFSET / 2;
-       mi.base.textwidth -= width_offset;
-
-       computeFullLabel();
 
        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;
@@ -181,14 +181,14 @@ void InsetCaption::edit(Cursor & cur, bool left)
 }
 
 
-InsetBase * InsetCaption::editXY(Cursor & cur, int x, int y)
+Inset * InsetCaption::editXY(Cursor & cur, int x, int y)
 {
        cur.push(*this);
        return InsetText::editXY(cur, x, y);
 }
 
 
-bool InsetCaption::insetAllowed(InsetBase::Code code) const
+bool InsetCaption::insetAllowed(Inset::Code code) const
 {
        switch (code) {
        case FLOAT_CODE:
@@ -225,7 +225,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 
 int InsetCaption::latex(Buffer const & buf, odocstream & os,
-                        OutputParams const & runparams_in) const
+                       OutputParams const & runparams_in) const
 {
        // This is a bit too simplistic to take advantage of
        // caption options we must add more later. (Lgb)
@@ -247,10 +247,8 @@ int InsetCaption::latex(Buffer const & buf, odocstream & os,
 
 
 int InsetCaption::plaintext(Buffer const & buf, odocstream & os,
-                            OutputParams const & runparams) const
+                           OutputParams const & runparams) const
 {
-       computeFullLabel();
-
        os << '[' << full_label_ << "\n";
        InsetText::plaintext(buf, os, runparams);
        os << "\n]";
@@ -260,7 +258,7 @@ int InsetCaption::plaintext(Buffer const & buf, odocstream & os,
 
 
 int InsetCaption::docbook(Buffer const & buf, odocstream & os,
-                          OutputParams const & runparams) const
+                         OutputParams const & runparams) const
 {
        int ret;
        os << "<title>";
@@ -270,21 +268,53 @@ int InsetCaption::docbook(Buffer const & buf, odocstream & os,
 }
 
 
-void InsetCaption::computeFullLabel() const
+int InsetCaption::getArgument(Buffer const & buf, odocstream & os,
+                       OutputParams const & runparams) const
 {
-       if (type_.empty())
-               full_label_ = _("Senseless!!! ");
+       return InsetText::latex(buf, os, runparams);
+}
+
+
+int InsetCaption::getOptArg(Buffer const & buf, odocstream & os,
+                       OutputParams const & runparams) const
+{
+       return latexOptArgInsets(buf, paragraphs()[0], os, runparams, 1);
+}
+
+
+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();
+       if (type.empty())
+               full_label_ = buf.B_("Senseless!!! ");
        else {
-               docstring const number = convert<docstring>(counter_);
-               docstring label = custom_label_.empty()? _(type_): custom_label_;
-               full_label_ = bformat(from_ascii("%1$s %2$s:"), label, number);
+               // FIXME: life would be _much_ simpler if listings was
+               // listed in Floating.
+               docstring name;
+               if (type == "listing")
+                       name = buf.B_("Listing");
+               else
+                       name = buf.B_(tclass.floats().getType(type).name());
+               if (cnts.hasCounter(from_utf8(type))) {
+                       cnts.step(from_utf8(type));
+                       full_label_ = bformat(from_ascii("%1$s %2$s:"), 
+                                             name, 
+                                             cnts.theCounter(from_utf8(type)));
+               } else
+                       full_label_ = bformat(from_ascii("%1$s #:"), name);     
        }
+
+       // Do the real work now.
+       InsetText::updateLabels(buf, it);
 }
 
 
-auto_ptr<InsetBase> InsetCaption::doClone() const
+Inset * InsetCaption::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetCaption(*this));
+       return new InsetCaption(*this);
 }