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

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 910350243c..4c6472dcbc 100644
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -14,9 +14,13 @@
 
 #include "insetcharstyle.h"
 
+#include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "dispatchresult.h"
 #include "funcrequest.h"
+#include "FuncStatus.h"
+#include "cursor.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
@@ -24,55 +28,97 @@
 #include "lyxtext.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
+#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");
-	setStatus(Inlined);
+	setInsetName(from_utf8("CharStyle"));
+	setInlined();
+	setDrawFrame(false);
+}
+
+
+InsetCharStyle::InsetCharStyle(BufferParams const & bp, string const s)
+	: InsetCollapsable(bp)
+{
+	params_.type = s;
+	setUndefined();
+	init();
 }
 
 
 InsetCharStyle::InsetCharStyle(BufferParams const & bp,
 				CharStyles::iterator cs)
-	: InsetCollapsable(bp), has_label_(true)
+	: InsetCollapsable(bp)
 {
 	params_.type = cs->name;
-	params_.latextype = cs->latextype;
-	params_.latexname = cs->latexname;
-	params_.latexparam = cs->latexparam;
-	params_.font = cs->font;
-	params_.labelfont = cs->labelfont;
+	setDefined(cs);
 	init();
 }
 
 
 InsetCharStyle::InsetCharStyle(InsetCharStyle const & in)
-	: InsetCollapsable(in), params_(in.params_), has_label_(true)
+	: InsetCollapsable(in), params_(in.params_)
 {
 	init();
 }
 
 
-auto_ptr<InsetBase> InsetCharStyle::clone() const
+auto_ptr<InsetBase> InsetCharStyle::doClone() const
 {
 	return auto_ptr<InsetBase>(new InsetCharStyle(*this));
 }
 
 
-string const InsetCharStyle::editMessage() const
+bool InsetCharStyle::undefined() const
+{
+	return params_.latexname.empty();
+}
+
+
+void InsetCharStyle::setUndefined()
+{
+	params_.latextype.clear();
+	params_.latexname.clear();
+	params_.latexparam.clear();
+	params_.font = LyXFont(LyXFont::ALL_INHERIT);
+	params_.labelfont = LyXFont(LyXFont::ALL_INHERIT);
+	params_.labelfont.setColor(LColor::error);
+	params_.show_label = true;
+}
+
+
+void InsetCharStyle::setDefined(CharStyles::iterator cs)
+{
+	params_.latextype = cs->latextype;
+	params_.latexname = cs->latexname;
+	params_.latexparam = cs->latexparam;
+	params_.font = cs->font;
+	params_.labelfont = cs->labelfont;
+	params_.show_label = true;
+}
+
+
+docstring const InsetCharStyle::editMessage() const
 {
 	return _("Opened CharStyle Inset");
 }
@@ -87,20 +133,46 @@ void InsetCharStyle::write(Buffer const & buf, ostream & os) const
 
 void InsetCharStyle::read(Buffer const & buf, LyXLex & lex)
 {
+	params_.read(lex);
 	InsetCollapsable::read(buf, lex);
-	setStatus(Inlined);
+	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);
-	InsetCollapsable::metrics(mi, dim);
+	mi.base.font.reduce(LyXFont(LyXFont::ALL_SANE));
+	mi.base.font.realize(tmpfont);
+	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;
 }
 
 
@@ -108,21 +180,25 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
 {
 	setPosCache(pi, x, y);
 
-	// FIXME: setStatus(Inlined); this is not a const operation
 	LyXFont tmpfont = pi.base.font;
-	//setDrawFrame(InsetText::NEVER);
 	getDrawFont(pi.base.font);
+	// I don't understand why the above .reduce and .realize aren't
+	//needed, or even wanted, here. It just works. -- MV 10.04.2005
 	InsetText::draw(pi, x, y);
 	pi.base.font = tmpfont;
 
-	pi.pain.line(x + 2, y + InsetText::descent() - 4, x + 2,
-		y + InsetText::descent(), params_.labelfont.color());
-	pi.pain.line(x + 2, y + InsetText::descent(), x + dim_.wid - 2,
-		y + InsetText::descent(), params_.labelfont.color());
-	pi.pain.line(x + dim_.wid - 2, y + InsetText::descent(), x + dim_.wid - 2,
-		y + InsetText::descent() - 4, params_.labelfont.color());
+	int desc = InsetText::descent();
+	if (params_.show_label)
+		desc -= ascent();
 
-	if (has_label_) {
+	pi.pain.line(x, y + desc - 4, x, y + desc, params_.labelfont.color());
+	pi.pain.line(x, y + desc, x + dim_.wid - 3, y + desc,
+		params_.labelfont.color());
+	pi.pain.line(x + dim_.wid - 3, y + desc, x + dim_.wid - 3, y + desc - 4,
+		params_.labelfont.color());
+
+	// the name of the charstyle. Can be toggled.
+	if (params_.show_label) {
 		LyXFont font(params_.labelfont);
 		font.realize(LyXFont(LyXFont::ALL_SANE));
 		font.decSize();
@@ -130,10 +206,25 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
 		int w = 0;
 		int a = 0;
 		int d = 0;
-		font_metrics::rectText(params_.type, font, w, a, d);
-		pi.pain.rectText(x + (dim_.wid - w) / 2,
-			y + InsetText::descent() + a,
-			params_.type, font, LColor::none, LColor::none);
+		// FIXME UNICODE
+		docstring s(from_utf8(params_.type));
+		if (undefined())
+			s = _("Undef: ") + s;
+		theFontMetrics(font).rectText(s, w, a, d);
+		pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
+			s, font, LColor::none, LColor::none);
+	}
+
+	// a visual clue when the cursor is inside the inset
+	LCursor & cur = pi.base.bv->cursor();
+	if (cur.isInside(this)) {
+		y -= ascent();
+		pi.pain.line(x, y + 4, x, y, params_.labelfont.color());
+		pi.pain.line(x + 4, y, x, y, params_.labelfont.color());
+		pi.pain.line(x + dim_.wid - 3, y + 4, x + dim_.wid - 3, y,
+			params_.labelfont.color());
+		pi.pain.line(x + dim_.wid - 7, y, x + dim_.wid - 3, y,
+			params_.labelfont.color());
 	}
 }
 
@@ -144,121 +235,146 @@ void InsetCharStyle::getDrawFont(LyXFont & font) const
 }
 
 
-void InsetCharStyle::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetCharStyle::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-	setStatus(Inlined);
+	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::dispatch(cur, cmd);
+				InsetText::doDispatch(cur, cmd);
 			break;
 
-		default:
-			InsetCollapsable::priv_dispatch(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;
 	}
 }
 
 
-namespace {
-
-int outputVerbatim(std::ostream & os, InsetText const & inset)
+bool InsetCharStyle::getStatus(LCursor & cur, FuncRequest const & cmd,
+	FuncStatus & status) const
 {
-	int lines = 0;
-	ParagraphList::const_iterator par = inset.paragraphs().begin();
-	ParagraphList::const_iterator end = inset.paragraphs().end();
-	while (par != end) {
-		lyx::pos_type siz = par->size();
-		for (lyx::pos_type i = 0; i < siz; ++i) {
-			if (par->isNewline(i)) {
-				os << '\n';
-				++lines;
-			} else {
-				os << par->getChar(i);
-			}
-		}
-		++par;
-		if (par != end) {
-			os << "\n";
-			lines ++;
+	switch (cmd.action) {
+		// paragraph breaks not allowed in charstyle insets
+		case LFUN_BREAK_PARAGRAPH:
+		case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
+		case LFUN_BREAK_PARAGRAPH_SKIP:
+			status.enabled(false);
+			return true;
+
+		default:
+			return InsetCollapsable::getStatus(cur, cmd, status);
 		}
-	}
-	return lines;
 }
 
-} // namespace anon
-
 
-int InsetCharStyle::latex(Buffer const &, ostream & os,
-		     OutputParams const &) const
+int InsetCharStyle::latex(Buffer const & buf, odocstream & os,
+		     OutputParams const & runparams) const
 {
-	os << "%\n\\" << params_.latexname;
-	if (!params_.latexparam.empty())
-		os << params_.latexparam;
-	os << "{";
-	int i = outputVerbatim(os, *this);
-	os << "}%\n";
-		i += 2;
+	if (!undefined()) {
+		// FIXME UNICODE
+		os << '\\' << from_utf8(params_.latexname);
+		if (!params_.latexparam.empty())
+			os << from_utf8(params_.latexparam);
+		os << '{';
+	}
+	int i = InsetText::latex(buf, os, runparams);
+	if (!undefined())
+		os << "}";
 	return i;
 }
 
 
-int InsetCharStyle::linuxdoc(Buffer const &, std::ostream & os,
-			     OutputParams const &) const
+int InsetCharStyle::docbook(Buffer const & buf, odocstream & os,
+			    OutputParams const & runparams) const
 {
-	os << "<" << params_.latexname;
-	if (!params_.latexparam.empty())
-		os << " " << params_.latexparam;
-	os << ">";
-	int const i = outputVerbatim(os, *this);
-	os << "</" << params_.latexname << ">";
-	return i;
+	ParagraphList::const_iterator beg = paragraphs().begin();
+	ParagraphList::const_iterator par = paragraphs().begin();
+	ParagraphList::const_iterator end = paragraphs().end();
+
+	if (!undefined())
+                // FIXME UNICODE
+                sgml::openTag(os, params_.latexname,
+                              par->getID(buf, runparams) + params_.latexparam);
+
+	for (; par != end; ++par) {
+		par->simpleDocBookOnePar(buf, os, runparams,
+					 outerFont(std::distance(beg, par),
+						   paragraphs()));
+	}
+
+	if (!undefined())
+		sgml::closeTag(os, params_.latexname);
+
+	return 0;
 }
 
 
-int InsetCharStyle::docbook(Buffer const &, std::ostream & os,
-			    OutputParams const &) const
+int InsetCharStyle::plaintext(Buffer const & buf, odocstream & os,
+			      OutputParams const & runparams) const
 {
-	os << "<" << params_.latexname;
-	if (!params_.latexparam.empty())
-		os << " " << params_.latexparam;
-	os << ">";
-	int const i = outputVerbatim(os, *this);
-	os << "</" << params_.latexname << ">";
-	return i;
+	return InsetText::plaintext(buf, os, runparams);
 }
 
 
-int InsetCharStyle::plaintext(Buffer const &, std::ostream & os,
-			      OutputParams const & /*runparams*/) const
+void InsetCharStyle::textString(Buffer const & buf, odocstream & os) const
 {
-	return outputVerbatim(os, *this);
+	os << paragraphs().begin()->asString(buf, true);
 }
 
 
 void InsetCharStyle::validate(LaTeXFeatures & features) const
 {
+	// Force inclusion of preamble snippet in layout file
 	features.require(params_.type);
+	InsetText::validate(features);
 }
 
 
 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