X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcharstyle.C;h=4c6472dcbc080d91bcda94b1c252854952d911ca;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=beb2b2135783a6b40bef08838ede874235af1b15;hpb=c9c6ed0b7fbccbbed8b5ef48d05cfefa5acfb99e;p=lyx.git

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index beb2b21357..4c6472dcbc 100644
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -15,8 +15,8 @@
 #include "insetcharstyle.h"
 
 #include "buffer.h"
-#include "BufferView.h"
 #include "bufferparams.h"
+#include "BufferView.h"
 #include "dispatchresult.h"
 #include "funcrequest.h"
 #include "FuncStatus.h"
@@ -31,12 +31,16 @@
 #include "paragraph_funcs.h"
 #include "sgml.h"
 
-#include "frontends/font_metrics.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/convert.h"
+
 #include <sstream>
 
 
+namespace lyx {
+
 using std::string;
 using std::auto_ptr;
 using std::istringstream;
@@ -47,10 +51,9 @@ using std::ostringstream;
 
 void InsetCharStyle::init()
 {
-	setInsetName("CharStyle");
+	setInsetName(from_utf8("CharStyle"));
 	setInlined();
 	setDrawFrame(false);
-	has_label_ = true;
 }
 
 
@@ -100,6 +103,7 @@ void InsetCharStyle::setUndefined()
 	params_.font = LyXFont(LyXFont::ALL_INHERIT);
 	params_.labelfont = LyXFont(LyXFont::ALL_INHERIT);
 	params_.labelfont.setColor(LColor::error);
+	params_.show_label = true;
 }
 
 
@@ -110,10 +114,11 @@ void InsetCharStyle::setDefined(CharStyles::iterator cs)
 	params_.latexparam = cs->latexparam;
 	params_.font = cs->font;
 	params_.labelfont = cs->labelfont;
+	params_.show_label = true;
 }
 
 
-string const InsetCharStyle::editMessage() const
+docstring const InsetCharStyle::editMessage() const
 {
 	return _("Opened CharStyle Inset");
 }
@@ -128,12 +133,13 @@ void InsetCharStyle::write(Buffer const & buf, ostream & os) const
 
 void InsetCharStyle::read(Buffer const & buf, LyXLex & lex)
 {
+	params_.read(lex);
 	InsetCollapsable::read(buf, lex);
 	setInlined();
 }
 
 
-void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	LyXFont tmpfont = mi.base.font;
 	getDrawFont(mi.base.font);
@@ -142,7 +148,7 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
 	mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
 	InsetText::metrics(mi, dim);
 	mi.base.font = tmpfont;
-	if (has_label_) {
+	if (params_.show_label) {
 		// consider width of the inset label
 		LyXFont font(params_.labelfont);
 		font.realize(LyXFont(LyXFont::ALL_SANE));
@@ -151,19 +157,22 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
 		int w = 0;
 		int a = 0;
 		int d = 0;
-		string s(params_.type);
+		// FIXME UNICODE
+		docstring s(from_utf8(params_.type));
 		if (undefined())
 			s = _("Undef: ") + s;
-		font_metrics::rectText(s, font, w, a, d);
+		theFontMetrics(font).rectText(s, w, a, d);
 		dim.wid = max(dim.wid, w);
 	}
 	dim.asc += TEXT_TO_INSET_OFFSET;
 	dim.des += TEXT_TO_INSET_OFFSET;
 	dim.wid += 2 * TEXT_TO_INSET_OFFSET;
 	mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
+	if (params_.show_label)
+		dim.des += ascent();
+	bool const changed = dim_ != dim;
 	dim_ = dim;
-	if (has_label_)
-		dim_.des += ascent();
+	return changed;
 }
 
 
@@ -179,7 +188,7 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
 	pi.base.font = tmpfont;
 
 	int desc = InsetText::descent();
-	if (has_label_)
+	if (params_.show_label)
 		desc -= ascent();
 
 	pi.pain.line(x, y + desc - 4, x, y + desc, params_.labelfont.color());
@@ -189,7 +198,7 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
 		params_.labelfont.color());
 
 	// the name of the charstyle. Can be toggled.
-	if (has_label_) {
+	if (params_.show_label) {
 		LyXFont font(params_.labelfont);
 		font.realize(LyXFont(LyXFont::ALL_SANE));
 		font.decSize();
@@ -197,10 +206,11 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
 		int w = 0;
 		int a = 0;
 		int d = 0;
-		string s(params_.type);
+		// FIXME UNICODE
+		docstring s(from_utf8(params_.type));
 		if (undefined())
 			s = _("Undef: ") + s;
-		font_metrics::rectText(s, font, w, a, d);
+		theFontMetrics(font).rectText(s, w, a, d);
 		pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
 			s, font, LColor::none, LColor::none);
 	}
@@ -229,22 +239,29 @@ void InsetCharStyle::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
 	setInlined();
 	switch (cmd.action) {
-		case LFUN_MOUSE_PRESS:
+	
+	case LFUN_MOUSE_PRESS:
 			if (cmd.button() == mouse_button::button3)
-				has_label_ = !has_label_;
+				params_.show_label = !params_.show_label;
 			else
 				InsetText::doDispatch(cur, cmd);
 			break;
-	case LFUN_PASTE:
-	case LFUN_CLIPBOARD_PASTE:
-	case LFUN_PRIMARY_SELECTION_PASTE: {
+
+	case LFUN_INSET_TOGGLE:
+		if (cmd.argument() == "open")
+			params_.show_label = true;
+		else if (cmd.argument() == "close")
+			params_.show_label = false;
+		else if (cmd.argument() == "toggle" || cmd.argument().empty())
+			params_.show_label = !params_.show_label;
+		else // if assign or anything else
+			cur.undispatched();
+		cur.dispatched();
+		break;
+
+	default:
 		InsetCollapsable::doDispatch(cur, cmd);
-		forceParagraphsToDefault(cur);
 		break;
-		}
-		default:
-			InsetCollapsable::doDispatch(cur, cmd);
-			break;
 	}
 }
 
@@ -266,14 +283,15 @@ bool InsetCharStyle::getStatus(LCursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetCharStyle::latex(Buffer const & buf, ostream & os,
+int InsetCharStyle::latex(Buffer const & buf, odocstream & os,
 		     OutputParams const & runparams) const
 {
 	if (!undefined()) {
-		os << "\\" << params_.latexname;
+		// FIXME UNICODE
+		os << '\\' << from_utf8(params_.latexname);
 		if (!params_.latexparam.empty())
-			os << params_.latexparam;
-		os << "{";
+			os << from_utf8(params_.latexparam);
+		os << '{';
 	}
 	int i = InsetText::latex(buf, os, runparams);
 	if (!undefined())
@@ -282,19 +300,7 @@ int InsetCharStyle::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetCharStyle::linuxdoc(Buffer const & buf, ostream & os,
-			     OutputParams const & runparams) const
-{
-	if (!undefined())
-		sgml::openTag(os, params_.latexname, params_.latexparam);
-	int i = InsetText::linuxdoc(buf, os, runparams);
-	if (!undefined())
-		sgml::closeTag(os, params_.latexname);
-	return i;
-}
-
-
-int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
+int InsetCharStyle::docbook(Buffer const & buf, odocstream & os,
 			    OutputParams const & runparams) const
 {
 	ParagraphList::const_iterator beg = paragraphs().begin();
@@ -302,8 +308,9 @@ int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
 	ParagraphList::const_iterator end = paragraphs().end();
 
 	if (!undefined())
-		sgml::openTag(os, params_.latexname,
-			par->getID(buf, runparams) + params_.latexparam);
+                // FIXME UNICODE
+                sgml::openTag(os, params_.latexname,
+                              par->getID(buf, runparams) + params_.latexparam);
 
 	for (; par != end; ++par) {
 		par->simpleDocBookOnePar(buf, os, runparams,
@@ -318,17 +325,16 @@ int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
 }
 
 
-int InsetCharStyle::plaintext(Buffer const & buf, ostream & os,
+int InsetCharStyle::plaintext(Buffer const & buf, odocstream & os,
 			      OutputParams const & runparams) const
 {
 	return InsetText::plaintext(buf, os, runparams);
 }
 
 
-int InsetCharStyle::textString(Buffer const & buf, ostream & os,
-		       OutputParams const & op) const
+void InsetCharStyle::textString(Buffer const & buf, odocstream & os) const
 {
-	return plaintext(buf, os, op);
+	os << paragraphs().begin()->asString(buf, true);
 }
 
 
@@ -343,18 +349,32 @@ void InsetCharStyle::validate(LaTeXFeatures & features) const
 void InsetCharStyleParams::write(ostream & os) const
 {
 	os << "CharStyle " << type << "\n";
+	os << "show_label " << convert<string>(show_label) << "\n";
 }
 
 
 void InsetCharStyleParams::read(LyXLex & lex)
 {
-	if (lex.isOK()) {
+	while (lex.isOK()) {
 		lex.next();
 		string token = lex.getString();
-	}
 
-	if (lex.isOK()) {
-		lex.next();
-		type = lex.getString();
+		if (token == "CharStyle") {
+			lex.next();
+			type = lex.getString();
+		}
+
+		else if (token == "show_label") {
+			lex.next();
+			show_label = lex.getBool();
+		}
+
+		else if (token == "status") {
+			lex.pushToken(token);
+			break;
+		}
 	}
 }
+
+
+} // namespace lyx