hopefully fix tex2lyx linking.

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

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 791e4566a4c5a1e7417e767bd289b2ee8af0a392..482642f94aa548e824d91410091226de772b4d09 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -34,9 +34,10 @@
 
 #include <sstream>
 
-using lyx::docstring;
-using lyx::odocstream;
-using lyx::support::bformat;
+
+namespace lyx {
+
+using support::bformat;
 
 using std::auto_ptr;
 using std::endl;
@@ -100,21 +101,20 @@ void InsetCaption::setLabel(LCursor & cur) const
                                InsetBase * const in = &cur[i].inset();
                                if (in->lyxCode() == InsetBase::FLOAT_CODE
                                    || in->lyxCode() == InsetBase::WRAP_CODE) {
-                                       s = in->getInsetName();
+                                       s = to_utf8(in->getInsetName());
                                        break;
                                }
                        }
                Floating const & fl = textclass_.floats().getType(s);
                s = fl.name();
-               string num;
+               docstring num;
                if (s.empty())
                        s = "Senseless";
                else
-                       num = convert<string>(counter_);
+                       num = convert<docstring>(counter_);
 
                // Generate the label
-               label = lyx::to_utf8(
-                       bformat(lyx::from_ascii("%1$s %2$s:"), _(s), lyx::from_ascii(num)));
+               label = bformat(from_ascii("%1$s %2$s:"), _(s), num);
        }
 }
 
@@ -124,8 +124,7 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
        mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
        LCursor cur = mi.base.bv->cursor();
        setLabel(cur);
-       docstring dlab(label.begin(), label.end());
-       labelwidth_ = theFontMetrics(mi.base.font).width(dlab);
+       labelwidth_ = theFontMetrics(mi.base.font).width(label);
        dim.wid = labelwidth_;
        Dimension textdim;
        InsetText::metrics(mi, textdim);
@@ -152,11 +151,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
        // belongs to.
        LCursor cur = pi.base.bv->cursor();
        setLabel(cur);
-       docstring dlab(label.begin(), label.end());
-       // FXIME: instead of using the fontLoader metrics, we should make
-       // painter::text() returns the drawn text witdh.
-       labelwidth_ = theFontMetrics(pi.base.font).width(dlab);
-       pi.pain.text(x, y, dlab, pi.base.font);
+       labelwidth_ = pi.pain.text(x, y, label, pi.base.font);
        InsetText::draw(pi, x + labelwidth_, y);
        setPosCache(pi, x, y);
 }
@@ -184,7 +179,7 @@ int InsetCaption::latex(Buffer const & buf, odocstream & os,
        // This code is currently only able to handle the simple
        // \caption{...}, later we will make it take advantage
        // of the one of the caption packages. (Lgb)
-       lyx::odocstringstream ost;
+       odocstringstream ost;
        int const l = InsetText::latex(buf, ost, runparams);
        os << "\\caption{" << ost.str() << "}\n";
        return l + 1;
@@ -199,7 +194,7 @@ int InsetCaption::plaintext(Buffer const & /*buf*/, odocstream & /*os*/,
 }
 
 
-int InsetCaption::docbook(Buffer const & buf, ostream & os,
+int InsetCaption::docbook(Buffer const & buf, odocstream & os,
                          OutputParams const & runparams) const
 {
        int ret;
@@ -214,3 +209,6 @@ auto_ptr<InsetBase> InsetCaption::doClone() const
 {
        return auto_ptr<InsetBase>(new InsetCaption(*this));
 }
+
+
+} // namespace lyx