X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.cpp;h=279f9940542a2327f2fd1d300e5cf3b1bb4bf3b7;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=ae0430d07ee9236901564edf2562c8a811818895;hpb=12e1d4bc8d0fc7daa015e74028be2d7b2860d69f;p=lyx.git

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index ae0430d07e..279f994054 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -21,8 +21,8 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Cursor.h"
-#include "gettext.h"
-#include "Color.h"
+#include "support/gettext.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "Text.h"
 #include "MetricsInfo.h"
@@ -30,31 +30,28 @@
 #include "paragraph_funcs.h"
 #include "sgml.h"
 
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
-
 #include "support/convert.h"
 
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::ostream;
-
 
 InsetFlex::InsetFlex(BufferParams const & bp,
-				InsetLayout il)
-	: InsetCollapsable(bp, Collapsed)
+	TextClassPtr tc, string const & layoutName)
+	: InsetCollapsable(bp, Collapsed, tc),
+	name_(layoutName)
 {
-	params_.name = il.name;
-	setLayout(il);
+	setLayout(tc); // again, because now the name is initialized
+	packages_ = getLayout().requires();
+	preamble_ = getLayout().preamble();
 }
 
 
 InsetFlex::InsetFlex(InsetFlex const & in)
-	: InsetCollapsable(in), params_(in.params_)
+	: InsetCollapsable(in), name_(in.name_)
 {}
 
 
@@ -64,89 +61,38 @@ Inset * InsetFlex::clone() const
 }
 
 
-bool InsetFlex::undefined() const
-{
-	return layout_.labelstring == from_utf8("UNDEFINED");
-}
-
-
-void InsetFlex::setLayout(InsetLayout il)
-{
-	layout_ = il;
-}
-
-
 docstring const InsetFlex::editMessage() const
 {
-	return _("Opened CharStyle Inset");
+	return _("Opened Flex Inset");
 }
 
 
 void InsetFlex::write(Buffer const & buf, ostream & os) const
 {
-	params_.write(os);
+	os << "Flex " <<
+		(name_.empty() ? "undefined" : name_) << "\n";
 	InsetCollapsable::write(buf, os);
 }
 
 
 void InsetFlex::read(Buffer const & buf, Lexer & lex)
 {
-	params_.read(lex);
-	InsetCollapsable::read(buf, lex);
-}
-
-
-bool InsetFlex::metrics(MetricsInfo & mi, Dimension & dim) const
-{
-	Font tmpfont = mi.base.font;
-	getDrawFont(mi.base.font);
-	mi.base.font.reduce(Font(Font::ALL_SANE));
-	mi.base.font.realize(tmpfont);
-	bool changed = InsetCollapsable::metrics(mi, dim);
-	mi.base.font = tmpfont;
-	return changed;
-}
-
-
-void InsetFlex::draw(PainterInfo & pi, int x, int y) const
-{
-	setPosCache(pi, x, y);
-
-	Font tmpfont = pi.base.font;
-	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
-	InsetCollapsable::draw(pi, x, y);
-	pi.base.font = tmpfont;
-}
-
-
-void InsetFlex::getDrawFont(Font & font) const
-{
-	font = layout_.font;
-}
-
-
-void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
-{
-	InsetCollapsable::doDispatch(cur, cmd);
-}
+	while (lex.isOK()) {
+		lex.next();
+		string token = lex.getString();
 
+		if (token == "Flex") {
+			lex.next();
+			name_ = lex.getString();
+		}
 
-bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
-	FuncStatus & status) const
-{
-	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);
+		// This is handled in Collapsable
+		else if (token == "status") {
+			lex.pushToken(token);
+			break;
 		}
+	}
+	InsetCollapsable::read(buf, lex);
 }
 
 
@@ -165,18 +111,17 @@ int InsetFlex::docbook(Buffer const & buf, odocstream & os,
 	ParagraphList::const_iterator end = paragraphs().end();
 
 	if (!undefined())
-		// FIXME UNICODE
-		sgml::openTag(os, layout_.latexname,
-			      par->getID(buf, runparams) + layout_.latexparam);
+		sgml::openTag(os, getLayout().latexname(),
+			      par->getID(buf, runparams) + getLayout().latexparam());
 
 	for (; par != end; ++par) {
 		par->simpleDocBookOnePar(buf, os, runparams,
-					 outerFont(std::distance(beg, par),
+					 outerFont(distance(beg, par),
 						   paragraphs()));
 	}
 
 	if (!undefined())
-		sgml::closeTag(os, layout_.latexname);
+		sgml::closeTag(os, getLayout().latexname());
 
 	return 0;
 }
@@ -188,30 +133,11 @@ void InsetFlex::textString(Buffer const & buf, odocstream & os) const
 }
 
 
-void InsetFlexParams::write(ostream & os) const
+void InsetFlex::validate(LaTeXFeatures & features) const
 {
-	os << "CharStyle " << name << "\n";
+	if (!preamble_.empty())
+		features.addPreambleSnippet(preamble_);
+	features.require(packages_);
 }
 
-
-void InsetFlexParams::read(Lexer & lex)
-{
-	while (lex.isOK()) {
-		lex.next();
-		string token = lex.getString();
-
-		if (token == "CharStyle") {
-			lex.next();
-			name = lex.getString();
-		}
-
-		// This is handled in Collapsable
-		else if (token == "status") {
-			lex.pushToken(token);
-			break;
-		}
-	}
-}
-
-
 } // namespace lyx