cleanup error messages

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 4102a345c2ab77f6e1aa734816d021a188b37866..e19b0ec2003d72e068b2387fca7a842a3d681e30 100644 (file)
--- 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 = 19;
 
 
 bool layout2layout(FileName const & filename, FileName const & tempfile)
@@ -849,7 +853,7 @@ void TextClass::readFloat(Lexer & lexrc)
                FT_BUILTIN,
                FT_HTMLSTYLE,
                FT_HTMLCLASS,
-               FT_HTMLTYPE,
+               FT_HTMLTAG,
                FT_END
        };
 
@@ -859,7 +863,7 @@ void TextClass::readFloat(Lexer & lexrc)
                { "guiname", FT_NAME },
                { "htmlclass", FT_HTMLCLASS },
                { "htmlstyle", FT_HTMLSTYLE },
-               { "htmltype", FT_HTMLTYPE },
+               { "htmltag", FT_HTMLTAG },
                { "latexbuiltin", FT_BUILTIN },
                { "listname", FT_LISTNAME },
                { "numberwithin", FT_WITHIN },
@@ -873,7 +877,7 @@ void TextClass::readFloat(Lexer & lexrc)
        string ext;
        string htmlclass;
        string htmlstyle;
-       string htmltype;
+       string htmltag;
        string listName;
        string name;
        string placement;
@@ -944,9 +948,9 @@ void TextClass::readFloat(Lexer & lexrc)
                        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, htmlclass, 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"