very big tex2lyx patch:

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

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 4452c77b79096531f5fde8c59a4c9bf3adebd2a4..913060977c578e73d0f05112538921b889352fbe 100644 (file)
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -13,8 +13,8 @@
 #ifndef TEX2LYX_H
 #define TEX2LYX_H
 
-#include "texparser.h"
-#include "LyXTextClass.h"
+#include "Parser.h"
+#include "TextClass.h"
 
 #include <iosfwd>
 #include <string>
@@ -28,12 +28,12 @@ namespace support { class FileName; }
 
 class Context;
 
-/// in preamble.C
-LyXTextClass const parse_preamble(Parser & p, std::ostream & os, std::string const & forceclass);
+/// in preamble.cpp
+TextClass const parse_preamble(Parser & p, std::ostream & os, std::string const & forceclass);
 
 /// used packages with options
 extern std::map<std::string, std::vector<std::string> > used_packages;
-
+extern LayoutPtr captionlayout;
 
 /// in text.cpp
 std::string translate_len(std::string const &);
@@ -52,16 +52,16 @@ void parse_text_in_inset(Parser & p, std::ostream & os, unsigned flags,
                         bool outer, Context const & context);
 
 
-/// in math.C
+/// in math.cpp
 void parse_math(Parser & p, std::ostream & os, unsigned flags, mode_type mode);
 
 
-/// in table.C
+/// in table.cpp
 void handle_tabular(Parser & p, std::ostream & os, bool is_long_tabular,
                    Context & context);
 
 
-/// in tex2lyx.C
+/// in tex2lyx.cpp
 std::string const trim(std::string const & a, char const * p = " \t\n\r");
 
 void split(std::string const & s, std::vector<std::string> & result,