#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "insetcaption.h"
#include "frontends/Painter.h"
#include "frontends/font_metrics.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 "BoostFormat.h"
+#include "support/LAssert.h"
+#include "support/BoostFormat.h"
using std::ostream;
using std::endl;
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.
// belongs to.
Inset * i1 = owner();
Inset * i2 = i1 ? i1->owner() : 0;
- string const type = static_cast<InsetFloat *>(i2)->type();
+ 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("#");
+ string const num = "#";
// Generate the label
- string const label = boost::io::str(boost::format("%1$s %2$s:") % _(fl) % num);
-
+ string const label = bformat("%1$s %2$s:", _(fl), num);
Painter & pain = bv->painter();
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);
}
int InsetCaption::latex(Buffer const * buf, ostream & os,
- bool fragile, bool free_spc) const
+ LatexRunParams const & runparams) const
{
// This is a bit too simplistic to take advantage of
// caption options we must add more later. (Lgb)
// \caption{...}, later we will make it take advantage
// of the one of the caption packages. (Lgb)
ostringstream ost;
- int const l = InsetText::latex(buf, ost, fragile, free_spc);
+ int const l = InsetText::latex(buf, ost, runparams);
os << "\\caption{" << ost.str() << "}\n";
return l + 1;
}