X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclass.C;h=3df1271e40147b24f52fe9389a143c5a5d2380cb;hb=eead5ba43d0ddf06544ad1b40063981d3788c635;hp=d44748b0e5cec4e526fcc78bc15a8bef6348f259;hpb=102266cf922b4a62c9ce33635b67e98a8872c004;p=lyx.git

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index d44748b0e5..3df1271e40 100644
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -24,6 +24,8 @@
 
 #include <algorithm>
 
+using namespace lyx::support;
+
 using std::endl;
 using std::find_if;
 using std::remove_if;
@@ -32,22 +34,27 @@ using std::ostream;
 namespace { // anon
 
 struct compare_name {
+
 	compare_name(string const & name)
-		: name_(name) {}
-	template <class C>
-	bool operator()(C & c) {
+		: name_(name)
+	{}
+
+	bool operator()(boost::shared_ptr<LyXLayout> const & c)
+	{
 		return c->name() == name_;
 	}
+
 	string name_;
+
 };
 
 } // anon
 
 
 LyXTextClass::LyXTextClass(string const & fn, string const & cln,
-			   string const & desc)
+			   string const & desc, bool texClassAvail )
 	: name_(fn), latexname_(cln), description_(desc),
-	  floatlist_(new FloatList), ctrs_(new Counters)
+	  floatlist_(new FloatList), ctrs_(new Counters), texClassAvail_(texClassAvail)
 {
 	outputType_ = LATEX;
 	columns_ = 1;
@@ -66,6 +73,12 @@ LyXTextClass::LyXTextClass(string const & fn, string const & cln,
 }
 
 
+bool LyXTextClass::isTeXClassAvailable() const
+{
+	return texClassAvail_;
+}
+
+
 bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
 {
 	lyxerr[Debug::TCLASS] << "Reading style " << lay.name() << endl;
@@ -87,6 +100,7 @@ enum TextClassTags {
 	TC_INPUT,
 	TC_STYLE,
 	TC_DEFAULTSTYLE,
+	TC_ENVIRONMENT,
 	TC_NOSTYLE,
 	TC_COLUMNS,
 	TC_SIDES,
@@ -119,6 +133,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 		{ "counter",         TC_COUNTER },
 		{ "defaultfont",     TC_DEFAULTFONT },
 		{ "defaultstyle",    TC_DEFAULTSTYLE },
+		{ "environment",     TC_ENVIRONMENT },
 		{ "float",           TC_FLOAT },
 		{ "input",           TC_INPUT },
 		{ "leftmargin",      TC_LEFTMARGIN },
@@ -150,7 +165,8 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 				     << MakeDisplayPath(filename)
 				     << endl;
 
-	LyXLex lexrc(textClassTags, TC_TITLELATEXTYPE);
+	LyXLex lexrc(textClassTags,
+		sizeof(textClassTags) / sizeof(textClassTags[0]));
 	bool error = false;
 
 	lexrc.setFile(filename);
@@ -159,6 +175,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 	// parsing
 	while (lexrc.isOK() && !error) {
 		int le = lexrc.lex();
+
 		switch (le) {
 		case LyXLex::LEX_FEOF:
 			continue;
@@ -167,9 +184,13 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 			lexrc.printError("Unknown TextClass tag `$$Token'");
 			error = true;
 			continue;
-		default: break;
+
+		default:
+			break;
 		}
+
 		switch (static_cast<TextClassTags>(le)) {
+
 		case TC_OUTPUTTYPE:   // output type definition
 			readOutputType(lexrc);
 			break;
@@ -196,19 +217,22 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 			}
 			break;
 
+		case TC_ENVIRONMENT:
 		case TC_STYLE:
 			if (lexrc.next()) {
 				string const name = subst(lexrc.getString(),
 						    '_', ' ');
 				if (hasLayout(name)) {
-					LyXLayout * lay =
-						operator[](name).get();
+					LyXLayout * lay = operator[](name).get();
 					error = do_readStyle(lexrc, *lay);
 				} else {
 					LyXLayout lay;
 					lay.setName(name);
+					if (le == TC_ENVIRONMENT)
+						lay.is_environment = true;
 					if (!(error = do_readStyle(lexrc, lay)))
-						layoutlist_.push_back(boost::shared_ptr<LyXLayout>(new LyXLayout(lay)));
+						layoutlist_.push_back
+							(boost::shared_ptr<LyXLayout>(new LyXLayout(lay)));
 					if (defaultlayout_.empty()) {
 						// We do not have a default
 						// layout yet, so we choose
@@ -450,13 +474,16 @@ void LyXTextClass::readMaxCounter(LyXLex & lexrc)
 	};
 
 	pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV);
+
 	int le = lexrc.lex();
 	switch (le) {
 	case LyXLex::LEX_UNDEF:
 		lexrc.printError("Unknown MaxCounter tag `$$Token'");
 		return;
-	default: break;
+	default:
+		break;
 	}
+
 	switch (static_cast<MaxCounterTags>(le)) {
 	case MC_COUNTER_CHAPTER:
 		maxcounter_ = LABEL_COUNTER_CHAPTER;
@@ -727,20 +754,10 @@ bool LyXTextClass::hasLayout(string const & n) const
 }
 
 
-LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
-{
-	lyx::Assert(!n.empty());
-
-	if (n.empty())
-		lyxerr << "Operator[] called with empty n" << endl;
 
-	string const name = (n.empty() ? defaultLayoutName() : n);
-
-	static string lastLayoutName;
-	static LayoutList::difference_type lastLayoutIndex;
-
-	if (name == lastLayoutName)
-		return layoutlist_[lastLayoutIndex];
+LyXLayout_ptr const & LyXTextClass::operator[](string const & name) const
+{
+	Assert(!name.empty());
 
 	LayoutList::const_iterator cit =
 		find_if(layoutlist_.begin(),
@@ -751,18 +768,19 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
 		lyxerr << "We failed to find the layout '" << name
 		       << "' in the layout list. You MUST investigate!"
 		       << endl;
+		for (LayoutList::const_iterator it = layoutlist_.begin();
+		         it != layoutlist_.end(); ++it)
+			lyxerr  << " " << it->get()->name() << endl;
 
 		// we require the name to exist
-		lyx::Assert(false);
+		Assert(false);
 	}
 
-	lastLayoutName = name;
-	lastLayoutIndex = std::distance(layoutlist_.begin(), cit);
-
 	return (*cit);
 }
 
 
+
 bool LyXTextClass::delete_layout(string const & name)
 {
 	if (name == defaultLayoutName())