X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=bcf1ed43b82b618701684c670579ed40e48f4b69;hb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;hp=f39699f66adad28313dd6471821e1c06f402f332;hpb=00e305c9d9bd8b0ff54b6c58adb6192d5934ed60;p=lyx.git diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h index f39699f66a..bcf1ed43b8 100644 --- a/src/LaTeXFeatures.h +++ b/src/LaTeXFeatures.h @@ -13,7 +13,6 @@ #ifndef LATEXFEATURES_H #define LATEXFEATURES_H - #include "OutputParams.h" #include "support/docstring.h" @@ -67,21 +66,23 @@ public: void showStruct() const; /// void addPreambleSnippet(std::string const &); - /// Provide a string name-space to the requirements + /// Add a feature name requirements void require(std::string const & name); + /// Add a set of feature names requirements + void require(std::set const & names); /// Which of the required packages are installed? static void getAvailable(); /// Is the (required) package available? static bool isAvailable(std::string const & name); /// Has the package been required? bool isRequired(std::string const & name) const; - /* Is it necessary to load the package? This is true is + /* Is it necessary to load the package? This is true if isRequired is true and the feature is not provided by the textclass. */ bool mustProvide(std::string const & name) const; /// - void useFloat(std::string const & name); + void useFloat(std::string const & name, bool subfloat = false); /// void useLanguage(Language const *); /// @@ -91,7 +92,7 @@ public: /// std::set getEncodingSet(std::string const & doc_encoding) const; /// - void useLayout(std::string const & lyt); + void useLayout(docstring const & lyt); /// Buffer const & buffer() const; /// @@ -104,28 +105,30 @@ public: OutputParams const & runparams() const { return runparams_; } private: - std::list usedLayouts_; + std::list usedLayouts_; - /// Static preamble bits from the external material insets - typedef std::list FeaturesList; + /// The features that are needed by the document + typedef std::set Features; /// - FeaturesList features_; + Features features_; + /// Static preamble bits from the external material insets + typedef std::list SnippetList; /// - FeaturesList preamble_snippets_; + SnippetList preamble_snippets_; /// The available (required) packages - typedef std::list PackagesList; + typedef std::set Packages; /// - static PackagesList packages_; + static Packages packages_; /// typedef std::set LanguageList; - /// + /// used languages (only those that are supported by babel) LanguageList UsedLanguages_; /// - typedef std::set UsedFloats; + typedef std::map UsedFloats; /// UsedFloats usedFloats_; /// - typedef std::map FileMap; + typedef std::map FileMap; /// FileMap IncludedFiles_; /** Buffer of the file being processed.