Merge branch 'master' into biblatex2

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

diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h
index 01a5cd32e46fe1386691f5691fc80fb90b7979e1..bf12b7b1e358385f57ef6871f8faf0ef06ec1cfc 100644 (file)
--- a/src/tex2lyx/Preamble.h
+++ b/src/tex2lyx/Preamble.h
@@ -92,6 +92,8 @@ public:
        /// Parses the LaTeX preamble into internal data
        void parse(Parser & p, std::string const & forceclass,
                   TeX2LyXDocClass & tc);
+       /// Parse the encoding from a preamble. *this is unusable afterwards.
+       std::string parseEncoding(Parser & p, std::string const & forceclass);
        /// Writes the LyX file header from internal data
        bool writeLyXHeader(std::ostream & os, bool subdoc,
                            std::string const & outfiledir);
@@ -103,6 +105,9 @@ public:
 
 private:
        ///
+       void parse(Parser & p, std::string const & forceclass,
+                  bool detectEncoding, TeX2LyXDocClass & tc);
+       ///
        std::map<std::string, std::vector<std::string> > used_packages;
        /// Packages that will be loaded automatically by LyX
        std::set<std::string> auto_packages;
@@ -146,6 +151,7 @@ private:
        std::string h_font_tt_scale[2];
        bool h_font_cjk_set;
        std::string h_font_cjk;
+       bool h_use_microtype;
        std::string h_graphics;
        std::string h_default_output_format;
        std::string h_html_be_strict;
@@ -189,7 +195,7 @@ private:
        std::string h_pdf_pdfusetitle;
        std::string h_pdf_pagemode;
        std::string h_pdf_quoted_options;
-       std::string h_quotes_language;
+       std::string h_quotes_style;
        std::string h_secnumdepth;
        std::string h_shortcut[99];
        std::string h_spacing;
@@ -218,7 +224,8 @@ private:
        void handle_geometry(std::vector<std::string> & options);
        ///
        void handle_package(Parser &p, std::string const & name,
-                           std::string const & opts, bool in_lyx_preamble);
+                           std::string const & opts, bool in_lyx_preamble,
+                           bool detectEncoding);
        ///
        void handle_if(Parser & p, bool in_lyx_preamble);