X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.h;h=bff05191a8325ac9b90081da357ea83bd8f9daa3;hb=d09f87c3ca895e53ff77ca47918778e257826806;hp=fabed2bc45a5ff7f6029117dc6032d69877b8a7c;hpb=acd57ccaaf71b51add61edc45941f260327947b1;p=lyx.git

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index fabed2bc45..bff05191a8 100644
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -38,16 +38,15 @@ class Context;
 
 /// A trivial subclass, just to give us a public default constructor
 class TeX2LyXDocClass : public DocumentClass
-{};
+{
+public:
+	void setName(std::string const & name) { name_ = name; }
+};
 
-/// in preamble.cpp
-void parse_preamble(Parser & p, std::ostream & os, 
-	std::string const & forceclass, TeX2LyXDocClass & tc);
 /// Translate babel language name to LyX language name
 extern std::string babel2lyx(std::string const & language);
-
-/// used packages with options
-extern std::map<std::string, std::vector<std::string> > used_packages;
+/// Translate basic color name or RGB color in LaTeX syntax to LyX color code
+extern std::string rgbcolor2code(std::string const & name);
 
 /// in text.cpp
 std::string translate_len(std::string const &);
@@ -63,7 +62,8 @@ void parse_text(Parser & p, std::ostream & os, unsigned flags, bool outer,
  * Therefore this may only be used to parse text in insets or table cells.
  */
 void parse_text_in_inset(Parser & p, std::ostream & os, unsigned flags,
-			 bool outer, Context const & context);
+                         bool outer, Context const & context,
+                         InsetLayout const * layout = 0);
 
 
 /// in math.cpp
@@ -71,12 +71,12 @@ void parse_math(Parser & p, std::ostream & os, unsigned flags, mode_type mode);
 
 
 /// in table.cpp
-void handle_tabular(Parser & p, std::ostream & os, bool is_long_tabular,
-		    Context & context);
+void handle_tabular(Parser & p, std::ostream & os, std::string const & name,
+                    std::string const & width, Context & context);
 
 
 /// in tex2lyx.cpp
-std::string const trim(std::string const & a, char const * p = " \t\n\r");
+std::string const trimSpaceAndEol(std::string const & a);
 
 void split(std::string const & s, std::vector<std::string> & result,
 	char delim = ',');
@@ -84,29 +84,69 @@ std::string join(std::vector<std::string> const & input,
 	char const * delim);
 
 bool is_math_env(std::string const & name);
+bool is_display_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
+ * \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
+ * \param o2 wether \\newcommand had a second optional parameter.
+ * If \p definition is not empty the command is assumed to be from the LyX
+ * preamble and added to possible_textclass_commands.
  */
 void add_known_command(std::string const & command, std::string const & o1,
-		       bool o2);
-
+	bool o2, docstring const & definition = docstring());
+extern void add_known_environment(std::string const & environment,
+	std::string const & o1, bool o2, docstring const & beg,
+	docstring const & end);
+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);
+/*!
+ * 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
+ * list of used modules if yes.
+ */
+extern bool checkModule(std::string const & name, bool command);
 // Access to environment stack
 extern std::vector<std::string> active_environments;
 std::string active_environment();
 
 enum ArgumentType {
 	required,
+	req_group,
 	verbatim,
 	item,
-	optional
+	optional,
+	opt_group,
+	displaymath,
+};
+
+class FullCommand {
+public:
+	FullCommand() {}
+	FullCommand(std::vector<ArgumentType> const & a, docstring const & d)
+		: args(a), def(d) {}
+	std::vector<ArgumentType> args;
+	docstring def;
+};
+
+class FullEnvironment {
+public:
+	FullEnvironment() {}
+	FullEnvironment(std::vector<ArgumentType> const & a,
+	                docstring const & b, docstring const & e)
+		: args(a), beg(b), end(e) {}
+	std::vector<ArgumentType> args;
+	docstring beg;
+	docstring end;
 };
 
 typedef std::map<std::string, std::vector<ArgumentType> > CommandMap;
+typedef std::map<std::string, FullCommand> FullCommandMap;
+typedef std::map<std::string, FullEnvironment> FullEnvironmentMap;
 
 /// Known TeX commands with arguments that get parsed into ERT.
 extern CommandMap known_commands;
@@ -114,12 +154,18 @@ 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;
+/// Commands that might be defined by the document class or modules
+extern FullCommandMap possible_textclass_commands;
+/// Environments that might be defined by the document class or modules
+extern FullEnvironmentMap possible_textclass_environments;
 ///
 extern bool noweb_mode;
 /// Did we recognize any pdflatex-only construct?
 extern bool pdflatex;
+/// Did we recognize any xetex-only construct?
+extern bool xetex;
 /// LyX format that is created by tex2lyx
-int const LYX_FORMAT = 345;
+extern int const LYX_FORMAT;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();