X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=a594375cda5930118f51d3513ea237c56dc77d64;hb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;hp=69f40e9b79d3a3ee62f41c5a3dc3c4cda452f72c;hpb=763ef015ce995b7b46eb029af12ffab3f8810152;p=lyx.git

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 69f40e9b79..a594375cda 100644
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -61,7 +61,7 @@ private:
 };
 
 
-int const FORMAT = 7;
+int const FORMAT = 8;
 
 
 bool layout2layout(FileName const & filename, FileName const & tempfile)
@@ -111,10 +111,10 @@ std::string translateRT(TextClass::ReadType rt)
 
 // This string should not be translated here, 
 // because it is a layout identifier.
-docstring const TextClass::emptylayout_ = from_ascii("Plain Layout");
+docstring const TextClass::plain_layout_ = from_ascii("Plain Layout");
 
 
-InsetLayout DocumentClass::empty_insetlayout_;
+InsetLayout DocumentClass::plain_insetlayout_;
 
 
 /////////////////////////////////////////////////////////////////////////
@@ -182,7 +182,8 @@ enum TextClassTags {
 	TC_TITLELATEXNAME,
 	TC_TITLELATEXTYPE,
 	TC_FORMAT,
-	TC_ADDTOPREAMBLE
+	TC_ADDTOPREAMBLE,
+	TC_USEMODULE
 };
 
 
@@ -213,7 +214,8 @@ namespace {
 		{ "style",           TC_STYLE },
 		{ "titlelatexname",  TC_TITLELATEXNAME },
 		{ "titlelatextype",  TC_TITLELATEXTYPE },
-		{ "tocdepth",        TC_TOCDEPTH }
+		{ "tocdepth",        TC_TOCDEPTH },
+		{ "usemodule",       TC_USEMODULE }
 	};
 	
 } //namespace anon
@@ -222,7 +224,7 @@ namespace {
 bool TextClass::convertLayoutFormat(support::FileName const & filename, ReadType rt)
 {
 	LYXERR(Debug::TCLASS, "Converting layout file to " << FORMAT);
-		FileName const tempfile = FileName::tempName();
+		FileName const tempfile = FileName::tempName("convert_layout");
 		bool success = layout2layout(filename, tempfile);
 		if (success)
 			success = read(tempfile, rt);
@@ -241,11 +243,11 @@ bool TextClass::read(FileName const & filename, ReadType rt)
 	LYXERR(Debug::TCLASS, "Reading " + translateRT(rt) + ": " +
 		to_utf8(makeDisplayPath(filename.absFilename())));
 
-	// Define the `empty' layout used in table cells, ert, etc. Note that 
+	// Define the plain layout used in table cells, ert, etc. Note that 
 	// we do this before loading any layout file, so that classes can 
 	// override features of this layout if they should choose to do so.
-	if (rt == BASECLASS && !hasLayout(emptylayout_))
-		layoutlist_.push_back(createDefaultLayout(emptylayout_));
+	if (rt == BASECLASS && !hasLayout(plain_layout_))
+		layoutlist_.push_back(createBasicLayout(plain_layout_));
 
 	Lexer lexrc(textClassTags);
 	lexrc.setFile(filename);
@@ -285,10 +287,10 @@ bool TextClass::read(std::string const & str, ReadType rt)
 		return retval == OK;
 
 	// write the layout string to a temporary file
-	FileName const tempfile = FileName::tempName();
+	FileName const tempfile = FileName::tempName("TextClass_read");
 	ofstream os(tempfile.toFilesystemEncoding().c_str());
 	if (!os) {
-		LYXERR0("Unable to create tempoary file");
+		LYXERR0("Unable to create temporary file");
 		return false;
 	}
 	os << str;
@@ -491,6 +493,13 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
 			break;
 		}
 
+		case TC_USEMODULE: {
+			lexrc.next();
+			string const module = lexrc.getString();
+			usemod_.insert(module);
+			break;
+		}
+
 		case TC_LEFTMARGIN:	// left margin type
 			if (lexrc.next())
 				leftmargin_ = lexrc.getDocString();
@@ -504,7 +513,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
 		case TC_INSETLAYOUT:
 			if (lexrc.next()) {
 				InsetLayout il;
-				if (il.read(lexrc))
+				if (il.read(lexrc, *this))
 					insetlayoutlist_[il.name()] = il;
 				// else there was an error, so forget it
 			}
@@ -903,13 +912,6 @@ bool TextClass::hasLayout(docstring const & n) const
 }
 
 
-void TextClass::addLayoutIfNeeded(docstring const & n) const
-{
-	if (!hasLayout(n))
-		layoutlist_.push_back(createDefaultLayout(n, true));
-}
-
-
 Layout const & TextClass::operator[](docstring const & name) const
 {
 	LASSERT(!name.empty(), /**/);
@@ -954,7 +956,7 @@ Layout & TextClass::operator[](docstring const & name)
 
 bool TextClass::deleteLayout(docstring const & name)
 {
-	if (name == defaultLayoutName() || name == emptyLayoutName())
+	if (name == defaultLayoutName() || name == plainLayoutName())
 		return false;
 
 	LayoutList::iterator it =
@@ -995,8 +997,17 @@ bool TextClass::load(string const & path) const
 }
 
 
+void DocumentClass::addLayoutIfNeeded(docstring const & n) const
+{
+	if (!hasLayout(n))
+		layoutlist_.push_back(createBasicLayout(n, true));
+}
+
+
 InsetLayout const & DocumentClass::insetLayout(docstring const & name) const 
 {
+	// FIXME The fix for the InsetLayout part of 4812 would be here:
+	// Add the InsetLayout to the document class if it is not found.
 	docstring n = name;
 	InsetLayouts::const_iterator cen = insetlayoutlist_.end();
 	while (!n.empty()) {
@@ -1008,7 +1019,7 @@ InsetLayout const & DocumentClass::insetLayout(docstring const & name) const
 			break;
 		n = n.substr(0,i);
 	}
-	return empty_insetlayout_;
+	return plain_insetlayout_;
 }
 
 
@@ -1033,11 +1044,11 @@ bool TextClass::isDefaultLayout(Layout const & layout) const
 
 bool TextClass::isPlainLayout(Layout const & layout) const 
 {
-	return layout.name() == emptyLayoutName();
+	return layout.name() == plainLayoutName();
 }
 
 
-Layout TextClass::createDefaultLayout(docstring const & name, bool unknown) const
+Layout TextClass::createBasicLayout(docstring const & name, bool unknown) const
 {
 	static Layout * defaultLayout = NULL;