Now tex2lyx is able to set the encoding from what it reads in the preamble.

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

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 2fbb4ec5b697f672bc573ab367fb141ecce31957..4850eeea8826ccc09402eba68efdcc9b9a3e6fba 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,8 +26,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-typedef Layout const * LayoutPtr;
-
 class Context;
 
 /// A trivial subclass, just to give us a public default constructor
@@ -35,11 +33,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 &);
@@ -81,11 +79,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;