X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.h;h=0591be7c74b215a8c564a5ce97e337efbac12a07;hb=9dcb24d578cfc9df5b70bbf3f13a95cd63ac3213;hp=4fc7ebc6f4633b4f02f1c17171498ad28eeb7657;hpb=3ebf1c9bac1c58cbd62c1d57c92ff13d52479619;p=lyx.git

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 4fc7ebc6f4..0591be7c74 100644
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -26,14 +26,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-/// Simple support for frontend::Alert::warning().
-namespace frontend { 
-namespace Alert {
-	void warning(docstring const & title, docstring const & message,
-				 bool const &);
-}
-}
-
 class Context;
 
 /// A trivial subclass, just to give us a public default constructor
@@ -56,7 +48,15 @@ extern std::string rgbcolor2code(std::string const & name);
 std::string translate_len(std::string const &);
 
 void parse_text(Parser & p, std::ostream & os, unsigned flags, bool outer,
-		Context & context);
+		Context & context, std::string const rdelim = std::string());
+void check_comment_bib(std::ostream & os, Context & context);
+
+void fix_child_filename(std::string & name);
+
+std::string const normalize_filename(std::string const & name);
+
+std::string find_file(std::string const & name, std::string const & path,
+		 char const * const * extensions);
 
 /*!
  * Parses a subdocument, usually useful in insets (whence the name).
@@ -67,7 +67,8 @@ void parse_text(Parser & p, std::ostream & os, unsigned flags, bool outer,
  */
 void parse_text_in_inset(Parser & p, std::ostream & os, unsigned flags,
                          bool outer, Context const & context,
-                         InsetLayout const * layout = 0);
+                         InsetLayout const * layout = 0,
+                         std::string const rdelim = std::string());
 
 /// Guess document language from \p p if CJK is used.
 /// \p lang is used for all non-CJK contents.
@@ -80,7 +81,8 @@ void parse_math(Parser & p, std::ostream & os, unsigned flags, mode_type mode);
 
 /// in table.cpp
 void handle_tabular(Parser & p, std::ostream & os, std::string const & name,
-                    std::string const & width, Context & context);
+		    std::string const & width, std::string const & halign,
+		    Context & context);
 
 
 /// in tex2lyx.cpp
@@ -93,6 +95,7 @@ std::string join(std::vector<std::string> const & input,
 
 bool is_math_env(std::string const & name);
 bool is_display_math_env(std::string const & name);
+/// Is first string in the array of strings (second parameter)
 char const * const * is_known(std::string const &, char const * const *);
 
 /*!
@@ -110,10 +113,10 @@ extern void add_known_environment(std::string const & environment,
 	docstring const & end);
 extern void add_known_theorem(std::string const & theorem,
 	std::string const & o1, bool o2, docstring const & definition);
-extern Layout const * findLayoutWithoutModule(TextClass const & textclass,
-	std::string const & name, bool command);
-extern InsetLayout const * findInsetLayoutWithoutModule(
-	TextClass const & textclass, std::string const & name, bool command);
+extern Layout const * findLayoutWithoutModule(TextClass const & tc,
+	std::string const & name, bool command,	std::string const & latexparam = std::string());
+extern InsetLayout const * findInsetLayoutWithoutModule(TextClass const & tc, std::string const & name, bool command,
+	std::string const & latexparam = std::string());
 /*!
  * Check whether a module provides command (if \p command is true) or
  * environment (if \p command is false) \p name, and add the module to the
@@ -206,8 +209,8 @@ extern bool roundtripMode();
  *  contains a preamble.
  *  \return true if the conversion was successful, else false.
  */
-bool tex2lyx(std::string const & infilename, 
-	     support::FileName const & outfilename, 
+bool tex2lyx(std::string const & infilename,
+	     support::FileName const & outfilename,
 	     std::string const & encoding);