fix #832

[lyx.git] / src / insets / insetcaption.C

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index f1ba9df2deaec60738e83e180d931f365bd05bc7..36ba68968634b188ae68220af36be9662bba1cd0 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -1,34 +1,35 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *          Copyright 2000-2001 The LyX Team.
+/**
+ * \file insetcaption.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "insetcaption.h"
-#include "Painter.h"
-#include "font.h"
+#include "frontends/Painter.h"
+#include "frontends/font_metrics.h"
 #include "BufferView.h"
+#include "buffer.h"
 #include "FloatList.h"
 #include "insets/insetfloat.h"
+#include "insets/insetwrap.h"
 #include "debug.h"
 #include "gettext.h"
+#include "Lsstream.h"
 #include "support/lstrings.h"
+#include "support/LAssert.h"
+#include "support/BoostFormat.h"
 
 using std::ostream;
 using std::endl;
 
-InsetCaption::InsetCaption()
-       : InsetText()
+InsetCaption::InsetCaption(BufferParams const & bp)
+       : InsetText(bp)
 {
        setAutoBreakRows(true);
        setDrawFrame(0, InsetText::LOCKED);
@@ -59,14 +60,14 @@ void InsetCaption::read(Buffer const * buf, LyXLex & lex)
 }
 
 
-string const InsetCaption::editMessage() const 
+string const InsetCaption::editMessage() const
 {
        return _("Opened Caption Inset");
 }
 
 
 void InsetCaption::draw(BufferView * bv, LyXFont const & f,
-                       int baseline, float & x, bool cleared) const
+                       int baseline, float & x) const
 {
        // We must draw the label, we should get the label string
        // from the enclosing float inset.
@@ -78,22 +79,29 @@ void InsetCaption::draw(BufferView * bv, LyXFont const & f,
        // belongs to.
        Inset * i1 = owner();
        Inset * i2 = i1 ? i1->owner() : 0;
-       string const type = static_cast<InsetFloat *>(i2)->type();
-       string const fl = i2 ? floatList.getType(type).name() : N_("Float");
+       string type;
+       if (i2->lyxCode() == FLOAT_CODE)
+               type = static_cast<InsetFloat *>(i2)->params().type;
+       else if (i2->lyxCode() == WRAP_CODE)
+               type = static_cast<InsetWrap *>(i2)->params().type;
+       else
+               lyx::Assert(0);
+
+       FloatList const & floats =
+               bv->buffer()->params.getLyXTextClass().floats();
+       string const fl = i2 ? floats.getType(type).name() : N_("Float");
 
        // Discover the number...
-       // ...
        string const num = "#";
 
        // Generate the label
-       string const label = _(fl) + " " + num + ":";
-       
+       string const label = bformat("%1$s %2$s:", _(fl), num);
        Painter & pain = bv->painter();
-       int const w = lyxfont::width(label, f);
+       int const w = font_metrics::width(label, f);
        pain.text(int(x), baseline, label, f);
        x += w;
 
-       InsetText::draw(bv, f, baseline, x, cleared);
+       InsetText::draw(bv, f, baseline, x);
 }
 
 
@@ -120,11 +128,11 @@ int InsetCaption::ascii(Buffer const * /*buf*/,
 }
 
 
-int InsetCaption::docbook(Buffer const * buf, ostream & os) const
+int InsetCaption::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 {
        int ret;
        os << "<title>";
-       ret = InsetText::docbook(buf, os);
+       ret = InsetText::docbook(buf, os, mixcont);
        os << "</title>\n";
        return ret;
 }