Continue to improve GtkLengthEntry

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

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index adf77034a58c78fecba10d9df9774214de2f25b3..a2ef8395425f2fb105b27f40b87692750eb4dc91 100644 (file)
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -34,12 +34,15 @@ extern std::map<std::string, std::vector<std::string> > used_packages;
 void parse_text(Parser & p, std::ostream & os, unsigned flags, bool outer,
                Context & context);
 
-//std::string parse_text(Parser & p, unsigned flags, const bool outer,
-//                    Context & context);
-
-/// parses a subdocument, usually useful in insets (whence the name)
+/*!
+ * Parses a subdocument, usually useful in insets (whence the name).
+ *
+ * It ignores \c context.need_layout and \c context.need_end_layout and
+ * starts and ends always a new layout.
+ * 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 & context);
+                        bool outer, Context const & context);
 
 
 /// in math.C
@@ -81,21 +84,29 @@ enum ArgumentType {
        optional
 };
 
-/// Known TeX commands with arguments that get parsed into ERT.
-extern std::map<std::string, std::vector<ArgumentType> > known_commands;
+typedef std::map<std::string, std::vector<ArgumentType> > CommandMap;
 
+/// Known TeX commands with arguments that get parsed into ERT.
+extern CommandMap known_commands;
+/// Known TeX environments with arguments that get parsed into ERT.
+extern CommandMap known_environments;
+/// Known TeX math environments with arguments that get parsed into LyX mathed.
+extern CommandMap known_math_environments;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();
+/// path of the currently processed .tex file
+extern std::string getParentFilePath();
 
 
-/*! Reads tex input from \a is and writes lyx output to \a os.
+/*!
+ *  Reads tex input from \a infilename and writes lyx output to \a outfilename.
  *  Uses some common settings for the preamble, so this should only
  *  be used more than once for included documents.
  *  Caution: Overwrites the existing preamble settings if the new document
- *  contains a preamble. */
-void tex2lyx(std::istream &, std::ostream &);
-/// \return true if the conversion was successful, else false.
-bool tex2lyx(std::string const &, std::string const &);
+ *  contains a preamble.
+ *  \return true if the conversion was successful, else false.
+ */
+bool tex2lyx(std::string const & infilename, std::string const & outfilename);
 
 #endif