tex2lyx/text.cpp: take care of the brace pair after comment environments that are...

[lyx.git] / src / tex2lyx / Context.h

diff --git a/src/tex2lyx/Context.h b/src/tex2lyx/Context.h
index 1af64330238a48702503f156ca388dd14bf2e7f8..4e0c75695c677cebe28ee8d82992e7c055eb04c8 100644 (file)
--- a/src/tex2lyx/Context.h
+++ b/src/tex2lyx/Context.h
@@ -12,7 +12,7 @@
 #ifndef CONTEXT_H
 #define CONTEXT_H
 
-#include "TextClass.h"
+#include "tex2lyx.h"
 
 #include <iosfwd>
 
@@ -36,7 +36,7 @@ public:
        }
        void init()
        {
-               size = "normal";
+               size = "default";
                family = "default";
                series = "default";
                shape = "default";
@@ -77,9 +77,9 @@ void output_font_change(std::ostream & os, TeXFont const & oldfont,
 class Context {
 public:
        Context(bool need_layout_,
-               TextClass const & textclass_,
-               LayoutPtr layout_ = LayoutPtr(),
-               LayoutPtr parent_layout_= LayoutPtr(),
+               TeX2LyXDocClass const & textclass_,
+               Layout const * layout_ = 0,
+               Layout const * parent_layout_= 0,
                TeXFont font_ = TeXFont());
        ~Context();
 
@@ -140,11 +140,11 @@ public:
        static bool empty;
 
        /// The textclass of the document. Could actually be a global variable
-       TextClass const & textclass;
+       TeX2LyXDocClass const & textclass;
        /// The layout of the current paragraph
-       LayoutPtr layout;
+       Layout const * layout;
        /// The layout of the outer paragraph (for environment layouts)
-       LayoutPtr parent_layout;
+       Layout const * parent_layout;
        /// font attributes of this context
        TeXFont font;
        /// font attributes of normal text