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

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 76b60b7385..4c6472dcbc 100644
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -14,6 +14,8 @@
 
 #include "insetcharstyle.h"
 
+#include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "dispatchresult.h"
 #include "funcrequest.h"
@@ -29,25 +31,29 @@
 #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;
+using std::max;
 using std::ostream;
 using std::ostringstream;
 
 
 void InsetCharStyle::init()
 {
-	setInsetName("CharStyle");
+	setInsetName(from_utf8("CharStyle"));
 	setInlined();
 	setDrawFrame(false);
-	has_label_ = true;
 }
 
 
@@ -96,7 +102,8 @@ void InsetCharStyle::setUndefined()
 	params_.latexparam.clear();
 	params_.font = LyXFont(LyXFont::ALL_INHERIT);
 	params_.labelfont = LyXFont(LyXFont::ALL_INHERIT);
-	params_.labelfont.setColor(LColor::red);
+	params_.labelfont.setColor(LColor::error);
+	params_.show_label = true;
 }
 
 
@@ -107,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");
 }
@@ -125,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);
@@ -139,13 +148,31 @@ 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 (params_.show_label) {
+		// consider width of the inset label
+		LyXFont font(params_.labelfont);
+		font.realize(LyXFont(LyXFont::ALL_SANE));
+		font.decSize();
+		font.decSize();
+		int w = 0;
+		int a = 0;
+		int d = 0;
+		// FIXME UNICODE
+		docstring s(from_utf8(params_.type));
+		if (undefined())
+			s = _("Undef: ") + s;
+		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;
 }
 
 
@@ -161,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());
@@ -171,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();
@@ -179,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(params_.type, 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);
 	}
@@ -211,16 +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;
 
-		default:
-			InsetCollapsable::doDispatch(cur, cmd);
-			break;
+	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);
+		break;
 	}
 }
 
@@ -230,9 +271,9 @@ bool InsetCharStyle::getStatus(LCursor & cur, FuncRequest const & cmd,
 {
 	switch (cmd.action) {
 		// paragraph breaks not allowed in charstyle insets
-		case LFUN_BREAKPARAGRAPH:
-		case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
-		case LFUN_BREAKPARAGRAPH_SKIP:
+		case LFUN_BREAK_PARAGRAPH:
+		case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
+		case LFUN_BREAK_PARAGRAPH_SKIP:
 			status.enabled(false);
 			return true;
 
@@ -242,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())
@@ -258,33 +300,23 @@ 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();
 	ParagraphList::const_iterator par = paragraphs().begin();
-        ParagraphList::const_iterator end = paragraphs().end();
+	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) {
+	for (; par != end; ++par) {
 		par->simpleDocBookOnePar(buf, os, runparams,
-				 outerFont(par - paragraphs().begin(),
+					 outerFont(std::distance(beg, par),
 						   paragraphs()));
-        }
+	}
 
 	if (!undefined())
 		sgml::closeTag(os, params_.latexname);
@@ -293,13 +325,19 @@ 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);
 }
 
 
+void InsetCharStyle::textString(Buffer const & buf, odocstream & os) const
+{
+	os << paragraphs().begin()->asString(buf, true);
+}
+
+
 void InsetCharStyle::validate(LaTeXFeatures & features) const
 {
 	// Force inclusion of preamble snippet in layout file
@@ -311,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