X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=c73857f6e3214ecbf82f34d95bc168197ee9494d;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=4102a345c2ab77f6e1aa734816d021a188b37866;hpb=1f8bf874aad7ce9367568bfd6521f35cbb2cbe66;p=lyx.git

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 4102a345c2..c73857f6e3 100644
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -41,6 +41,10 @@
 #include <fstream>
 #include <sstream>
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 using namespace std;
 using namespace lyx::support;
 
@@ -62,7 +66,7 @@ private:
 };
 
 // Keep the changes documented in the Customization manual. 
-int const FORMAT = 17;
+int const FORMAT = 20;
 
 
 bool layout2layout(FileName const & filename, FileName const & tempfile)
@@ -848,8 +852,8 @@ void TextClass::readFloat(Lexer & lexrc)
 		FT_LISTNAME,
 		FT_BUILTIN,
 		FT_HTMLSTYLE,
-		FT_HTMLCLASS,
-		FT_HTMLTYPE,
+		FT_HTMLATTR,
+		FT_HTMLTAG,
 		FT_END
 	};
 
@@ -857,9 +861,9 @@ void TextClass::readFloat(Lexer & lexrc)
 		{ "end", FT_END },
 		{ "extension", FT_EXT },
 		{ "guiname", FT_NAME },
-		{ "htmlclass", FT_HTMLCLASS },
+		{ "htmlattr", FT_HTMLATTR },
 		{ "htmlstyle", FT_HTMLSTYLE },
-		{ "htmltype", FT_HTMLTYPE },
+		{ "htmltag", FT_HTMLTAG },
 		{ "latexbuiltin", FT_BUILTIN },
 		{ "listname", FT_LISTNAME },
 		{ "numberwithin", FT_WITHIN },
@@ -871,9 +875,9 @@ void TextClass::readFloat(Lexer & lexrc)
 	lexrc.pushTable(floatTags);
 
 	string ext;
-	string htmlclass;
+	string htmlattr;
 	string htmlstyle;
-	string htmltype;
+	string htmltag;
 	string listName;
 	string name;
 	string placement;
@@ -936,17 +940,17 @@ void TextClass::readFloat(Lexer & lexrc)
 			lexrc.next();
 			builtin = lexrc.getBool();
 			break;
-		case FT_HTMLCLASS:
+		case FT_HTMLATTR:
 			lexrc.next();
-			htmlclass = lexrc.getString();
+			htmlattr = lexrc.getString();
 			break;
 		case FT_HTMLSTYLE:
 			lexrc.next();
 			htmlstyle = lexrc.getLongString("EndHTMLStyle");
 			break;
-		case FT_HTMLTYPE:
+		case FT_HTMLTAG:
 			lexrc.next();
-			htmltype = lexrc.getString();
+			htmltag = lexrc.getString();
 			break;
 		case FT_END:
 			getout = true;
@@ -957,7 +961,7 @@ void TextClass::readFloat(Lexer & lexrc)
 	// Here if have a full float if getout == true
 	if (getout) {
 		Floating fl(type, placement, ext, within, style, name, 
-				listName, htmltype, htmlclass, htmlstyle, builtin);
+				listName, htmltag, htmlattr, htmlstyle, builtin);
 		floatlist_.newFloat(fl);
 		// each float has its own counter
 		counters_.newCounter(from_ascii(type), from_ascii(within),
@@ -1198,7 +1202,7 @@ DocumentClass & DocumentClassBundle::makeDocumentClass(
 	LayoutModuleList::const_iterator en = modlist.end();
 	for (; it != en; it++) {
 		string const modName = *it;
-		LyXModule * lm = moduleList[modName];
+		LyXModule * lm = theModuleList[modName];
 		if (!lm) {
 			docstring const msg =
 						bformat(_("The module %1$s has been requested by\n"