* src/insets/InsetNote.h:

[lyx.git] / src / tex2lyx / preamble.cpp

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 8a884713d528b4ce7a1bd93a9e870689c650e240..86510f721d4176fbc83c1ef8fe5c0830102b5bba 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -15,10 +15,13 @@
 
 #include "tex2lyx.h"
 
+#include "LayoutFile.h"
 #include "Layout.h"
 #include "Lexer.h"
 #include "TextClass.h"
+
 #include "support/convert.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
@@ -403,7 +406,8 @@ void end_preamble(ostream & os, TextClass const & /*textclass*/)
 
 } // anonymous namespace
 
-TextClass const parse_preamble(Parser & p, ostream & os, string const & forceclass)
+void parse_preamble(Parser & p, ostream & os, 
+       string const & forceclass, TeX2LyXDocClass & tc)
 {
        // initialize fixed types
        special_columns['D'] = 3;
@@ -459,8 +463,10 @@ TextClass const parse_preamble(Parser & p, ostream & os, string const & forcecla
                        p.setCatCode('@', catOther);
                }
 
-               else if (t.cs() == "newcommand" || t.cs() == "renewcommand"
-                           || t.cs() == "providecommand") {
+               else if (t.cs() == "newcommand" 
+                        || t.cs() == "renewcommand"
+                        || t.cs() == "providecommand"
+                        || t.cs() == "newlyxcommand") {
                        bool star = false;
                        if (p.next_token().character() == '*') {
                                p.get_token();
@@ -656,15 +662,13 @@ TextClass const parse_preamble(Parser & p, ostream & os, string const & forcecla
                cerr << "Error: Could not find layout file for textclass \"" << h_textclass << "\"." << endl;
                exit(1);
        }
-       TextClass textclass;
-       textclass.read(layoutfilename);
+       tc.read(layoutfilename);
        if (h_papersides.empty()) {
                ostringstream ss;
-               ss << textclass.sides();
+               ss << tc.sides();
                h_papersides = ss.str();
        }
-       end_preamble(os, textclass);
-       return textclass;
+       end_preamble(os, tc);
 }
 
 // }])