X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.h;h=913060977c578e73d0f05112538921b889352fbe;hb=116740d7e35b3f9e54e87afdc7aa00ad62364947;hp=a2ef8395425f2fb105b27f40b87692750eb4dc91;hpb=233c69505a3e6774fff3876f535dca4da7ec74f2;p=lyx.git

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index a2ef839542..913060977c 100644
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -13,24 +13,31 @@
 #ifndef TEX2LYX_H
 #define TEX2LYX_H
 
-#include "texparser.h"
-#include "lyxtextclass.h"
+#include "Parser.h"
+#include "TextClass.h"
 
 #include <iosfwd>
 #include <string>
 #include <vector>
 #include <map>
 
+
+namespace lyx {
+
+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 &);
 
-/// in text.C
 void parse_text(Parser & p, std::ostream & os, unsigned flags, bool outer,
 		Context & context);
 
@@ -45,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);
+		    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,
@@ -72,7 +79,7 @@ char const * const * is_known(std::string const &, char const * const *);
  * \param o2 wether \newcommand had a second optional parameter
  */
 void add_known_command(std::string const & command, std::string const & o1,
-                       bool o2);
+		       bool o2);
 
 // Access to environment stack
 extern std::vector<std::string> active_environments;
@@ -92,6 +99,8 @@ extern CommandMap known_commands;
 extern CommandMap known_environments;
 /// Known TeX math environments with arguments that get parsed into LyX mathed.
 extern CommandMap known_math_environments;
+///
+extern bool noweb_mode;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();
@@ -107,6 +116,9 @@ extern std::string getParentFilePath();
  *  contains a preamble.
  *  \return true if the conversion was successful, else false.
  */
-bool tex2lyx(std::string const & infilename, std::string const & outfilename);
+bool tex2lyx(std::string const & infilename, support::FileName const & outfilename);
+
+
+} // namespace lyx
 
 #endif