Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h
index 4d5817586f01e4b72f10e03800efe32fd3bdff3e..5690e1903c85b0484b2483a79d33e02ed4506954 100644 (file)
--- a/src/tex2lyx/Preamble.h
+++ b/src/tex2lyx/Preamble.h
@@ -55,6 +55,10 @@ public:
        void addModule(std::string const & module);
        ///
        void suppressDate(bool suppress);
+       ///
+       bool titleLayoutFound() const { return title_layout_found; }
+       ///
+       void titleLayoutFound(bool found) { title_layout_found = found; }
        /// Register an author named \p name in the author list
        void registerAuthor(std::string const & name);
        /// Get author named \p name (must be registered first)
@@ -78,10 +82,15 @@ private:
        /// needed to handle encodings with babel
        bool one_language;
 
+       /// was at least one title layout found?
+       bool title_layout_found;
+
        std::ostringstream h_preamble;
        std::string h_backgroundcolor;
+       std::string h_biblio_style;
        std::string h_boxbgcolor;
        std::string h_cite_engine;
+       std::string h_cite_engine_type;
        std::string h_defskip;
        std::string h_float_placement;
        std::string h_fontcolor;
@@ -90,11 +99,13 @@ private:
        std::string h_font_sans;
        std::string h_font_typewriter;
        std::string h_font_default_family;
+       std::string h_use_non_tex_fonts;
        std::string h_font_sc;
        std::string h_font_osf;
        std::string h_font_sf_scale;
        std::string h_font_tt_scale;
        std::string h_graphics;
+       std::string h_default_output_format;
        std::string h_html_be_strict;
        std::string h_html_css_as_file;
        std::string h_html_math_output;
@@ -141,14 +152,10 @@ private:
        std::string h_use_bibtopic;
        std::string h_use_indices;
        std::string h_use_geometry;
-       std::string h_use_amsmath;
+       std::map<std::string, std::string> h_use_packages;
        std::string h_use_default_options;
-       std::string h_use_esint;
        std::string h_use_hyperref;
-       std::string h_use_mhchem;
-       std::string h_use_mathdots;
        std::string h_use_refstyle;
-       std::string h_use_undertilde;
 
        /*!
         * Add package \p name with options \p options to used_packages.