X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclass.C;h=ffcf4741761976e09c2dbf8b44588daeeaa886f6;hb=6c2e78e12855d8661eb289ded3dc8722748863b8;hp=6a5d6fc688905b737601c43169ccc504d8e5cae5;hpb=a9cd48f40e48a0e7c00f2bf9d33f01f19a0d83db;p=lyx.git

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 6a5d6fc688..ffcf474176 100644
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -22,10 +22,14 @@
 #include "FloatList.h"
 
 #include "support/lstrings.h"
+#include "support/lyxlib.h"
 #include "support/filetools.h"
 
+#include <sstream>
+
 using lyx::support::LibFileSearch;
 using lyx::support::MakeDisplayPath;
+using lyx::support::QuoteName;
 using lyx::support::rtrim;
 using lyx::support::subst;
 
@@ -36,30 +40,60 @@ using std::string;
 using std::ostream;
 
 
-namespace { // anon
-
-struct compare_name {
+namespace {
 
-	compare_name(string const & name)
+class LayoutNamesEqual : public std::unary_function<LyXLayout_ptr, bool> {
+public:
+	LayoutNamesEqual(string const & name)
 		: name_(name)
 	{}
-
-	bool operator()(boost::shared_ptr<LyXLayout> const & c)
+	bool operator()(LyXLayout_ptr const & c) const
 	{
 		return c->name() == name_;
 	}
-
+private:
 	string name_;
-
 };
 
-} // anon
+
+int const FORMAT = 2;
+
+
+bool layout2layout(string const & filename, string const & tempfile)
+{
+	string const script = LibFileSearch("scripts", "layout2layout.py");
+	if (script.empty()) {
+		lyxerr << "Could not find layout conversion "
+		          "script layout2layout.py." << endl;
+		return false;
+	}
+
+	std::ostringstream command;
+	command << "python " << QuoteName(script)
+		<< ' ' << QuoteName(filename)
+		<< ' ' << QuoteName(tempfile);
+	string const command_str = command.str();
+
+	lyxerr[Debug::TCLASS] << "Running `" << command_str << '\'' << endl;
+
+	lyx::support::cmd_ret const ret =
+		lyx::support::RunCommand(command_str);
+	if (ret.first != 0) {
+		lyxerr << "Could not run layout conversion "
+		          "script layout2layout.py." << endl;
+		return false;
+	}
+	return true;
+}
+
+} // namespace anon
 
 
 LyXTextClass::LyXTextClass(string const & fn, string const & cln,
 			   string const & desc, bool texClassAvail )
 	: name_(fn), latexname_(cln), description_(desc),
-	  floatlist_(new FloatList), ctrs_(new Counters), texClassAvail_(texClassAvail)
+	  floatlist_(new FloatList), ctrs_(new Counters),
+	  texClassAvail_(texClassAvail)
 {
 	outputType_ = LATEX;
 	columns_ = 1;
@@ -73,7 +107,7 @@ LyXTextClass::LyXTextClass(string const & fn, string const & cln,
 	provides_ = nothing;
 	titletype_ = TITLE_COMMAND_AFTER;
 	titlename_ = "maketitle";
-	loaded = false;
+	loaded_ = false;
 }
 
 
@@ -125,12 +159,20 @@ enum TextClassTags {
 	TC_COUNTER,
 	TC_NOFLOAT,
 	TC_TITLELATEXNAME,
-	TC_TITLELATEXTYPE
+	TC_TITLELATEXTYPE,
+	TC_FORMAT
 };
 
+
 // Reads a textclass structure from file.
 bool LyXTextClass::Read(string const & filename, bool merge)
 {
+	if (!lyx::support::IsFileReadable(filename)) {
+		lyxerr << "Cannot read layout file `" << filename << "'."
+		       << endl;
+		return true;
+	}
+
 	keyword_item textClassTags[] = {
 		{ "charstyle",       TC_CHARSTYLE },
 		{ "classoptions",    TC_CLASSOPTIONS },
@@ -140,6 +182,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 		{ "defaultstyle",    TC_DEFAULTSTYLE },
 		{ "environment",     TC_ENVIRONMENT },
 		{ "float",           TC_FLOAT },
+		{ "format",          TC_FORMAT },
 		{ "input",           TC_INPUT },
 		{ "leftmargin",      TC_LEFTMARGIN },
 		{ "nofloat",         TC_NOFLOAT },
@@ -171,10 +214,12 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 
 	LyXLex lexrc(textClassTags,
 		sizeof(textClassTags) / sizeof(textClassTags[0]));
-	bool error = false;
 
 	lexrc.setFile(filename);
-	if (!lexrc.isOK()) error = true;
+	bool error = !lexrc.isOK();
+
+	// Format of files before the 'Format' tag was introduced
+	int format = 1;
 
 	// parsing
 	while (lexrc.isOK() && !error) {
@@ -195,6 +240,11 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 
 		switch (static_cast<TextClassTags>(le)) {
 
+		case TC_FORMAT:
+			if (lexrc.next())
+				format = lexrc.getInteger();
+			break;
+
 		case TC_OUTPUTTYPE:   // output type definition
 			readOutputType(lexrc);
 			break;
@@ -234,7 +284,8 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 					lay.setName(name);
 					if (le == TC_ENVIRONMENT)
 						lay.is_environment = true;
-					if (!(error = do_readStyle(lexrc, lay)))
+					error = do_readStyle(lexrc, lay);
+					if (!error)
 						layoutlist_.push_back(
 							boost::shared_ptr<LyXLayout>(new LyXLayout(lay))
 							);
@@ -374,6 +425,19 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 			}
 			break;
 		}
+		if (format != FORMAT)
+			break;
+	}
+
+	if (format != FORMAT) {
+		lyxerr[Debug::TCLASS] << "Converting layout file from format "
+		                      << format << " to " << FORMAT << endl;
+		string const tempfile = lyx::support::tempName();
+		error = !layout2layout(filename, tempfile);
+		if (!error)
+			error = Read(tempfile, merge);
+		lyx::support::unlink(tempfile);
+		return error;
 	}
 
 	if (!merge) { // we are at top level here.
@@ -385,6 +449,27 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 			       << "' is missing a defaultstyle." << endl;
 			error = true;
 		}
+
+		min_toclevel_ = LyXLayout::NOT_IN_TOC;
+		max_toclevel_ = LyXLayout::NOT_IN_TOC;
+		const_iterator cit = begin();
+		const_iterator the_end = end();
+		for ( ; cit != the_end ; ++cit) {
+			int const toclevel = (*cit)->toclevel;
+			if (toclevel != LyXLayout::NOT_IN_TOC) {
+				if (min_toclevel_ == LyXLayout::NOT_IN_TOC)
+					min_toclevel_ = toclevel;
+				else
+					min_toclevel_ = std::min(min_toclevel_,
+							 toclevel);
+				max_toclevel_ = std::max(max_toclevel_,
+							 toclevel);
+			}
+		}
+		lyxerr[Debug::TCLASS]
+			<< "Minimum TocLevel is " << min_toclevel_
+			<< ", maximum is " << max_toclevel_ <<endl;
+
 	} else
 		lyxerr[Debug::TCLASS] << "Finished reading input file "
 				      << MakeDisplayPath(filename)
@@ -452,20 +537,6 @@ void LyXTextClass::readOutputType(LyXLex & lexrc)
 }
 
 
-enum MaxCounterTags {
-	MC_COUNTER_CHAPTER = 1,
-	MC_COUNTER_SECTION,
-	MC_COUNTER_SUBSECTION,
-	MC_COUNTER_SUBSUBSECTION,
-	MC_COUNTER_PARAGRAPH,
-	MC_COUNTER_SUBPARAGRAPH,
-	MC_COUNTER_ENUMI,
-	MC_COUNTER_ENUMII,
-	MC_COUNTER_ENUMIII,
-	MC_COUNTER_ENUMIV
-};
-
-
 enum ClassOptionsTags {
 	CO_FONTSIZE = 1,
 	CO_PAGESTYLE,
@@ -525,6 +596,7 @@ enum CharStyleTags {
 	CS_LABELFONT,
 	CS_LATEXTYPE,
 	CS_LATEXNAME,
+	CS_LATEXPARAM,
 	CS_PREAMBLE,
 	CS_END
 };
@@ -537,6 +609,7 @@ void LyXTextClass::readCharStyle(LyXLex & lexrc, string const & name)
 		{ "font", CS_FONT },
 		{ "labelfont", CS_LABELFONT },
 		{ "latexname", CS_LATEXNAME },
+		{ "latexparam", CS_LATEXPARAM },
 		{ "latextype", CS_LATEXTYPE },
 		{ "preamble", CS_PREAMBLE}
 	};
@@ -545,10 +618,11 @@ void LyXTextClass::readCharStyle(LyXLex & lexrc, string const & name)
 
 	string latextype;
 	string latexname;
+	string latexparam;
 	LyXFont font(LyXFont::ALL_INHERIT);
 	LyXFont labelfont(LyXFont::ALL_INHERIT);
 	string preamble;
-	
+
 	bool getout = false;
 	while (!getout && lexrc.isOK()) {
 		int le = lexrc.lex();
@@ -567,6 +641,10 @@ void LyXTextClass::readCharStyle(LyXLex & lexrc, string const & name)
 			lexrc.next();
 			latexname = lexrc.getString();
 			break;
+		case CS_LATEXPARAM:
+			lexrc.next();
+			latexparam = subst(lexrc.getString(), "&quot;", "\"");
+			break;
 		case CS_LABELFONT:
 			labelfont.lyxRead(lexrc);
 			break;
@@ -590,6 +668,7 @@ void LyXTextClass::readCharStyle(LyXLex & lexrc, string const & name)
 		cs.name = name;
 		cs.latextype = latextype;
 		cs.latexname = latexname;
+		cs.latexparam = latexparam;
 		cs.font = font;
 		cs.labelfont = labelfont;
 		cs.preamble = preamble;
@@ -782,7 +861,7 @@ bool LyXTextClass::hasLayout(string const & n) const
 	string const name = (n.empty() ? defaultLayoutName() : n);
 
 	return find_if(layoutlist_.begin(), layoutlist_.end(),
-		       compare_name(name))
+		       LayoutNamesEqual(name))
 		!= layoutlist_.end();
 }
 
@@ -795,7 +874,7 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & name) const
 	LayoutList::const_iterator cit =
 		find_if(layoutlist_.begin(),
 			layoutlist_.end(),
-			compare_name(name));
+			LayoutNamesEqual(name));
 
 	if (cit == layoutlist_.end()) {
 		lyxerr << "We failed to find the layout '" << name
@@ -821,7 +900,7 @@ bool LyXTextClass::delete_layout(string const & name)
 
 	LayoutList::iterator it =
 		remove_if(layoutlist_.begin(), layoutlist_.end(),
-			  compare_name(name));
+			  LayoutNamesEqual(name));
 
 	LayoutList::iterator end = layoutlist_.end();
 	bool const ret = (it != end);
@@ -833,22 +912,22 @@ bool LyXTextClass::delete_layout(string const & name)
 // Load textclass info if not loaded yet
 bool LyXTextClass::load() const
 {
-	if (loaded)
+	if (loaded_)
 		return true;
 
 	// Read style-file
 	string const real_file = LibFileSearch("layouts", name_, "layout");
+	loaded_ = const_cast<LyXTextClass*>(this)->Read(real_file) == 0;
 
-	if (const_cast<LyXTextClass*>(this)->Read(real_file)) {
+	if (!loaded_) {
 		lyxerr << "Error reading `"
 		       << MakeDisplayPath(real_file)
 		       << "'\n(Check `" << name_
 		       << "')\nCheck your installation and "
 			"try Options/Reconfigure..." << endl;
-		loaded = false;
 	}
-	loaded = true;
-	return loaded;
+
+	return loaded_;
 }
 
 
@@ -1004,6 +1083,18 @@ int LyXTextClass::size() const
 }
 
 
+int LyXTextClass::min_toclevel() const
+{
+	return min_toclevel_;
+}
+
+
+int LyXTextClass::max_toclevel() const
+{
+	return max_toclevel_;
+}
+
+
 ostream & operator<<(ostream & os, LyXTextClass::PageSides p)
 {
 	switch (p) {