hyperref support for tex2lyx

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

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 7c5ed348d98f4484f9b0b8ae04d4945ae34266dd..f6fae1e9b4cb40ee0d9e5e1305fb1b4559badc0a 100644 (file)
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  * \author Jean-Marc Lasgouttes
  *
  * Full author contact details are available in file CREDITS.
@@ -26,6 +26,14 @@ 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
@@ -33,11 +41,11 @@ class TeX2LyXDocClass : public DocumentClass
 {};
 
 /// in preamble.cpp
-TeX2LyXDocClass const parse_preamble(Parser & p, std::ostream & os, std::string const & forceclass);
+void parse_preamble(Parser & p, std::ostream & os, 
+       std::string const & forceclass, TeX2LyXDocClass & tc);
 
 /// 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 &);
@@ -79,11 +87,11 @@ 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 argument.
- * \param optionalsNum is the number of optional parameters
+ * (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,
-       unsigned optionalsNum);
+                      bool o2);
 
 // Access to environment stack
 extern std::vector<std::string> active_environments;
@@ -92,6 +100,7 @@ std::string active_environment();
 enum ArgumentType {
        required,
        verbatim,
+       item,
        optional
 };
 
@@ -105,6 +114,10 @@ extern CommandMap known_environments;
 extern CommandMap known_math_environments;
 ///
 extern bool noweb_mode;
+/// Did we recognize any pdflatex-only construct?
+extern bool pdflatex;
+/// LyX format that is created by tex2lyx
+int const LYX_FORMAT = 345;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();
@@ -114,13 +127,16 @@ extern std::string getParentFilePath();
 
 /*!
  *  Reads tex input from \a infilename and writes lyx output to \a outfilename.
+ *  The (latex) encoding can be provided as \a encoding.
  *  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.
  *  \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);
 
 
 } // namespace lyx