some tabular fixes for the problems reported by Helge

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

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index f93bc0398ef2ecbc467cefb39b80075f0c609be5..adf77034a58c78fecba10d9df9774214de2f25b3 100644 (file)
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -26,6 +26,9 @@ class Context;
 /// in preamble.C
 LyXTextClass 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;
+
 
 /// in text.C
 void parse_text(Parser & p, std::ostream & os, unsigned flags, bool outer,
@@ -44,7 +47,8 @@ void parse_math(Parser & p, std::ostream & os, unsigned flags, mode_type mode);
 
 
 /// in table.C
-void handle_tabular(Parser & p, std::ostream & os, Context & context);
+void handle_tabular(Parser & p, std::ostream & os, bool is_long_tabular,
+                    Context & context);
 
 
 /// in tex2lyx.C
@@ -58,6 +62,15 @@ std::string join(std::vector<std::string> const & input,
 bool is_math_env(std::string const & name);
 char const * const * is_known(std::string const &, char const * const *);
 
+/*!
+ * Adds the command \p command to the list of known commands.
+ * \param o1 first optional parameter to the latex command \newcommand
+ * (with brackets), or the empty string if there were no optional arguments.
+ * \param o2 wether \newcommand had a second optional parameter
+ */
+void add_known_command(std::string const & command, std::string const & o1,
+                       bool o2);
+
 // Access to environment stack
 extern std::vector<std::string> active_environments;
 std::string active_environment();