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

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index b205fbe123..55566f8dae 100644
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -26,7 +26,7 @@
 #include "metricsinfo.h"
 #include "paragraph.h"
 
-#include "frontends/font_metrics.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "support/lstrings.h"
@@ -35,13 +35,14 @@
 #include <sstream>
 
 
-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)
@@ -75,24 +76,55 @@ void InsetCaption::read(Buffer const & buf, LyXLex & lex)
 }
 
 
-string const InsetCaption::editMessage() const
+docstring const InsetCaption::editMessage() const
 {
 	return _("Opened Caption Inset");
 }
 
 
-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_;
 }
 
 
-void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCaption::setLabel(LCursor & cur) const
+{
+	// Set caption label _only_ if the cursor is in _this_ float:
+	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 = to_utf8(in->getInsetName());
+				break;
+			}
+		}
+		Floating const & fl = textclass_.floats().getType(s);
+		s = fl.name();
+		docstring num;
+		if (s.empty())
+			s = "Senseless";
+		else
+			num = convert<docstring>(counter_);
+
+		// Generate the label
+		label = bformat(from_ascii("%1$s %2$s:"), _(s), num);
+	}
+}
+
+
+bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
-	labelwidth_ = font_metrics::width(label, mi.base.font);
+	LCursor cur = mi.base.bv->cursor();
+	setLabel(cur);
+	labelwidth_ = theFontMetrics(mi.base.font).width(label);
 	dim.wid = labelwidth_;
 	Dimension textdim;
 	InsetText::metrics(mi, textdim);
@@ -103,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;
 }
 
 
@@ -118,33 +152,8 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 	// See if we can find the name of the float this caption
 	// belongs to.
 	LCursor cur = pi.base.bv->cursor();
-	// Set caption label _only_ if the cursor is in _this_ float:
-	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;
-				}
-			}
-		Floating const & fl = textclass_.floats().getType(s);
-		s = fl.name();
-		string num;
-		if (s.empty())
-			s = "Senseless";
-		else
-			num = convert<string>(textclass_.counters().value(fl.type()));
-
-		// Generate the label
-		label = bformat("%1$s %2$s:", _(s), num);
-	}
-
-	labelwidth_ = font_metrics::width(label, pi.base.font);
-	pi.pain.text(x, y, label, pi.base.font);
+	setLabel(cur);
+	labelwidth_ = pi.pain.text(x, y, label, pi.base.font);
 	InsetText::draw(pi, x + labelwidth_, y);
 	setPosCache(pi, x, y);
 }
@@ -164,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
@@ -172,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!
@@ -187,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;
@@ -202,3 +211,6 @@ auto_ptr<InsetBase> InsetCaption::doClone() const
 {
 	return auto_ptr<InsetBase>(new InsetCaption(*this));
 }
+
+
+} // namespace lyx