X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcaption.C;h=55566f8dae364097cbb91b827ec5701f86666c74;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=3b8818faaa242bb5bd7340c3ebb1d09f3e45a7a1;hpb=28ad9602557a145bfd88c79dddecdc34c95c698c;p=lyx.git

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 3b8818faaa..55566f8dae 100644
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -34,14 +34,15 @@
 
 #include <sstream>
 
-using lyx::docstring;
-using lyx::support::bformat;
+
+namespace lyx {
+
+using support::bformat;
 
 using std::auto_ptr;
 using std::endl;
 using std::string;
 using std::ostream;
-using std::ostringstream;
 
 
 InsetCaption::InsetCaption(BufferParams const & bp)
@@ -81,10 +82,10 @@ docstring const InsetCaption::editMessage() const
 }
 
 
-void InsetCaption::cursorPos
-	(CursorSlice const & sl, bool boundary, int & x, int & y) const
+void InsetCaption::cursorPos(BufferView const & bv,
+		CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
-	InsetText::cursorPos(sl, boundary, x, y);
+	InsetText::cursorPos(bv, sl, boundary, x, y);
 	x += labelwidth_;
 }
 
@@ -95,37 +96,35 @@ void InsetCaption::setLabel(LCursor & cur) const
 	if (cur.top().text() == &text_) {
 		string s;
 		size_t i = cur.depth();
-			while (i > 0) {
-				--i;
-				InsetBase * const in = &cur[i].inset();
-				if (in->lyxCode() == InsetBase::FLOAT_CODE
-				    || in->lyxCode() == InsetBase::WRAP_CODE) {
-					s = in->getInsetName();
-					break;
-				}
+		while (i > 0) {
+			--i;
+			InsetBase * const in = &cur[i].inset();
+			if (in->lyxCode() == InsetBase::FLOAT_CODE ||
+			    in->lyxCode() == InsetBase::WRAP_CODE) {
+				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);
 	}
 }
 
 
-void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
+bool 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);
@@ -136,7 +135,9 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 	dim.des += TEXT_TO_INSET_OFFSET;
 	dim.wid += 2 * TEXT_TO_INSET_OFFSET;
 	mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
+	bool const changed = dim_ != dim;
 	dim_ = dim;
+	return changed;
 }
 
 
@@ -152,11 +153,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);
 }
@@ -176,7 +173,7 @@ InsetBase * InsetCaption::editXY(LCursor & cur, int x, int y)
 }
 
 
-int InsetCaption::latex(Buffer const & buf, ostream & os,
+int InsetCaption::latex(Buffer const & buf, odocstream & os,
 			OutputParams const & runparams) const
 {
 	// This is a bit too simplistic to take advantage of
@@ -184,14 +181,14 @@ int InsetCaption::latex(Buffer const & buf, ostream & 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)
-	ostringstream ost;
+	odocstringstream ost;
 	int const l = InsetText::latex(buf, ost, runparams);
 	os << "\\caption{" << ost.str() << "}\n";
 	return l + 1;
 }
 
 
-int InsetCaption::plaintext(Buffer const & /*buf*/,ostream & /*os*/,
+int InsetCaption::plaintext(Buffer const & /*buf*/, odocstream & /*os*/,
 			OutputParams const & /*runparams*/) const
 {
 	// FIXME: Implement me!
@@ -199,7 +196,7 @@ int InsetCaption::plaintext(Buffer const & /*buf*/,ostream & /*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 +211,6 @@ auto_ptr<InsetBase> InsetCaption::doClone() const
 {
 	return auto_ptr<InsetBase>(new InsetCaption(*this));
 }
+
+
+} // namespace lyx