Test invalid sanitizeLatexOption() input as well

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index faacfa0bbd577a6fdc722700aedea97788eaf3fa..0a075dd6c588c778f5ff8ec407729072c64a3513 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -277,6 +277,8 @@ protected:
        std::set<std::string> provides_;
        /// latex packages requested by document class.
        std::set<std::string> requires_;
+       ///
+       std::map<std::string, std::string> package_options_;
        /// default modules wanted by document class
        LayoutModuleList default_modules_;
        /// modules provided by document class
@@ -367,12 +369,8 @@ private:
 /// In that regard, DocumentClass objects are "dynamic". But this is really
 /// an illusion, since DocumentClass objects are not (currently) changed
 /// when, say, a new Module is loaded. Rather, the old DocumentClass is
-/// discarded---actually, it's kept around in case something on the cut
+/// discarded---actually, it will be kept around if something on the cut
 /// stack needs it---and a new one is created from scratch.
-///
-/// In the main LyX code, DocumentClass objects are created only by
-/// DocumentClassBundle, for which see below.
-///
 class DocumentClass : public TextClass {
 public:
        ///
@@ -426,7 +424,9 @@ public:
        docstring const & htmlpreamble() const { return htmlpreamble_; }
        ///
        docstring const & htmlstyles() const { return htmlstyles_; }
-       ///
+       /// Looks for the layout of "highest level", other than Part (or other
+       /// layouts with a negative toc number), for use in constructing TOCs and 
+       /// similar information.
        Layout const & getTOCLayout() const;
        /// the paragraph style to use for TOCs, Bibliography, etc
        /// we will attempt to calculate this if it was not given
@@ -435,6 +435,9 @@ public:
        bool provides(std::string const & p) const;
        /// features required by the class?
        std::set<std::string> const & requires() const { return requires_; }
+       /// package options to write to LaTeX file
+       std::map<std::string, std::string> const & packageOptions() const
+               { return package_options_; }
        ///
        unsigned int columns() const { return columns_; }
        ///
@@ -481,10 +484,10 @@ protected:
        /// Needed in tex2lyx
        DocumentClass() {}
 private:
-       /// The only class that can create a DocumentClass is
-       /// DocumentClassBundle, which calls the protected constructor.
+       /// The only way to make a DocumentClass is to call this function.
        friend DocumentClassPtr
-               getDocumentClass(LayoutFile const &, LayoutModuleList const &);
+               getDocumentClass(LayoutFile const &, LayoutModuleList const &,
+                                bool const clone);
        ///
        static InsetLayout plain_insetlayout_;
 };
@@ -495,7 +498,8 @@ private:
 /// in memory long after their associated Buffer is destroyed, mostly
 /// on the CutStack.
 DocumentClassPtr getDocumentClass(LayoutFile const & baseClass,
-                       LayoutModuleList const & modlist);
+                       LayoutModuleList const & modlist,
+                       bool const clone = false);
 
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, PageSides p);