X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.cpp;h=8b4bba35532f5ad543bf4657cda73c689237e185;hb=1c362c80b22012d66472da713ffa0cf3d71815e7;hp=42b74fc62bb145727baf93760bbb5e00b7abed4f;hpb=7677e9487c1669735a2aa9b2356199c2f608fe15;p=lyx.git

diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp
index 42b74fc62b..8b4bba3553 100644
--- a/src/LayoutFile.cpp
+++ b/src/LayoutFile.cpp
@@ -18,6 +18,7 @@
 #include "Lexer.h"
 #include "TextClass.h"
 
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
@@ -46,6 +47,14 @@ LayoutFile::LayoutFile(string const & fn, string const & cln,
 	texClassAvail_ = texClassAvail;
 }
 
+LayoutFileList::~LayoutFileList()
+{
+	ClassMap::const_iterator it = classmap_.begin();
+	ClassMap::const_iterator en = classmap_.end();
+	for (; it != en; ++it) {
+		delete it->second;
+	}
+}
 
 LayoutFileList & LayoutFileList::get() 
 {
@@ -68,7 +77,7 @@ bool LayoutFileList::haveClass(string const & classname) const
 
 LayoutFile const & LayoutFileList::operator[](string const & classname) const
 {
-	BOOST_ASSERT(haveClass(classname));
+	LASSERT(haveClass(classname), /**/);
 	return *classmap_[classname];
 }
 
@@ -76,7 +85,7 @@ LayoutFile const & LayoutFileList::operator[](string const & classname) const
 LayoutFile & 
 	LayoutFileList::operator[](string const & classname)
 {
-	BOOST_ASSERT(haveClass(classname));
+	LASSERT(haveClass(classname), /**/);
 	return *classmap_[classname];
 }
 
@@ -175,7 +184,7 @@ std::vector<LayoutFileIndex> LayoutFileList::classList() const
 
 
 void LayoutFileList::reset(LayoutFileIndex const & classname) {
-	BOOST_ASSERT(haveClass(classname));
+	LASSERT(haveClass(classname), /**/);
 	LayoutFile * tc = classmap_[classname];
 	LayoutFile * tmpl = 
 		new LayoutFile(tc->name(), tc->latexname(), tc->description(),
@@ -185,13 +194,50 @@ void LayoutFileList::reset(LayoutFileIndex const & classname) {
 }
 
 
-string const LayoutFileList::localPrefix = "LOCAL:";
-string const LayoutFileList::embeddedPrefix = "EMBED:";
+LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
+{
+	if (haveClass(textclass))
+		return textclass;
+
+	FileName const tempLayout = FileName::tempName();
+	ofstream ofs(tempLayout.toFilesystemEncoding().c_str());
+	ofs << "# This layout is automatically generated\n"
+		"# \\DeclareLaTeXClass{" << textclass << "}\n\n"
+		"Format		7\n"
+		"Input stdclass.inc\n\n"
+		"Columns		1\n"
+		"Sides			1\n"
+		"SecNumDepth	2\n"
+		"TocDepth		2\n"
+		"DefaultStyle	Standard\n\n"
+		"Style Standard\n"
+		"	Category              MainText\n"
+		"	Margin                Static\n"
+		"	LatexType             Paragraph\n"
+		"	LatexName             dummy\n"
+		"	ParIndent             MM\n"
+		"	ParSkip               0.4\n"
+		"	Align                 Block\n"
+		"	AlignPossible         Block, Left, Right, Center\n"
+		"	LabelType             No_Label\n"
+		"End\n";
+	ofs.close();
+
+	// We do not know if a LaTeX class is available for this document, but setting
+	// the last parameter to true will suppress a warning message about missing
+	// tex class.
+	LayoutFile * tc = new LayoutFile(textclass, textclass, "Unknown text class " + textclass, true);
+	if (!tc->load(tempLayout.absFilename()))
+		// The only way this happens is because the hardcoded layout file above
+		// is wrong.
+		LASSERT(false, /**/);
+	classmap_[textclass] = tc;
+	return textclass;
+}
 
 
 LayoutFileIndex 
-	LayoutFileList::addLayoutFile(string const & textclass, string const & path,
-		Layout_Type type)
+	LayoutFileList::addLocalLayout(string const & textclass, string const & path)
 {
 	// FIXME  There is a bug here: 4593
 	//
@@ -199,17 +245,7 @@ LayoutFileIndex
 	// NOTE: latex class name is defined in textclass.layout, which can be 
 	// different from textclass
 	string fullName = addName(path, textclass + ".layout");
-	string localIndex;
-	
-	if (type == Local)
-		localIndex = localPrefix + fullName;
-	else if (type == Embedded)
-		localIndex = embeddedPrefix + textclass;
 	
-	// if the local file has already been loaded, return it
-	if (haveClass(localIndex))
-		return localIndex;
-
 	FileName const layout_file(fullName);
 	if (layout_file.exists()) {
 		LYXERR(Debug::TCLASS, "Adding class " << textclass << " from directory " << path);
@@ -227,17 +263,23 @@ LayoutFileIndex
 			smatch sub;
 			if (regex_match(line, sub, reg)) {
 				// returns: whole string, classtype (not used here), class name, description
-				BOOST_ASSERT(sub.size() == 4);
+				LASSERT(sub.size() == 4, /**/);
 				// now, create a TextClass with description containing path information
 				string className(sub.str(2) == "" ? textclass : sub.str(2));
 				LayoutFile * tmpl = 
-					new LayoutFile(textclass, className, localIndex, true);
+					new LayoutFile(textclass, className, textclass, true);
 				// This textclass is added on request so it will definitely be
 				// used. Load it now because other load() calls may fail if they
 				// are called in a context without buffer path information.
 				tmpl->load(path);
-				classmap_[localIndex] = tmpl;
-				return localIndex;
+				// There will be only one textclass with this name, even if different
+				// layout files are loaded from different directories.
+				if (haveClass(textclass)) {
+					LYXERR0("Exisint textclass " << textclass << " is redefined by " << fullName);
+					delete classmap_[textclass];
+				}
+				classmap_[textclass] = tmpl;
+				return textclass;
 			}
 		}
 	}