Amend 6c3447c8: FindAdv: sometimes a space is added on some math symbols

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index bf061acd0ff64e3fae2e4a819563babfe371ab07..2f4213349172760e1b705dd858028934de367f4d 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -15,7 +15,6 @@
 #include "DocumentClassPtr.h"
 #include "FloatList.h"
 #include "FontInfo.h"
-#include "Layout.h"
 #include "LayoutEnums.h"
 #include "LayoutModuleList.h"
 
@@ -36,13 +35,14 @@
 
 namespace lyx {
 
-namespace support { class FileName; }
+namespace support {
+class FileName;
+class Lexer;
+}
 
-class Counters;
 class FloatList;
 class Layout;
 class LayoutFile;
-class Lexer;
 
 /// Based upon ideas in boost::noncopyable, inheriting from this
 /// class effectively makes the copy constructor protected but the
@@ -169,7 +169,7 @@ public:
        ///
        ReturnValues read(std::string const & str, ReadType rt = MODULE);
        ///
-       ReturnValues read(Lexer & lex, ReadType rt = BASECLASS);
+       ReturnValues read(support::Lexer & lex, ReadType rt = BASECLASS);
        /// validates the layout information passed in str
        static ReturnValues validate(std::string const & str);
        /// \return the conversion of \param str to the latest layout format
@@ -389,29 +389,29 @@ private:
        /// Reads the layout file without running layout2layout.
        ReturnValues readWithoutConv(support::FileName const & filename, ReadType rt);
        /// \return true for success.
-       bool readStyle(Lexer &, Layout &) const;
+       bool readStyle(support::Lexer &, Layout &, ReadType) const;
        ///
-       void readOutputType(Lexer &);
+       void readOutputType(support::Lexer &);
        ///
-       void readTitleType(Lexer &);
+       void readTitleType(support::Lexer &);
        ///
-       void readMaxCounter(Lexer &);
+       void readMaxCounter(support::Lexer &);
        ///
-       void readClassOptions(Lexer &);
+       void readClassOptions(support::Lexer &);
        ///
-       void readCharStyle(Lexer &, std::string const &);
+       void readCharStyle(support::Lexer &, std::string const &);
        ///
-       bool readFloat(Lexer &);
+       bool readFloat(support::Lexer &);
        ///
        std::vector<CitationStyle> const & getCiteStyles(CiteEngineType const &) const;
        ///
-       bool readCiteEngine(Lexer &, ReadType, bool const add = false);
+       bool readCiteEngine(support::Lexer &, ReadType, bool const add = false);
        ///
-       int readCiteEngineType(Lexer &) const;
+       int readCiteEngineType(support::Lexer &) const;
        ///
-       bool readCiteFormat(Lexer &, ReadType);
+       bool readCiteFormat(support::Lexer &, ReadType);
        ///
-       bool readOutlinerName(Lexer &);
+       bool readOutlinerName(support::Lexer &);
 };
 
 
@@ -435,7 +435,7 @@ public:
        /// \return true if there is a Layout with latexname lay
        bool hasLaTeXLayout(std::string const & lay) const;
        /// A DocumentClass nevers count as loaded, since it is dynamic
-       virtual bool loaded() const { return false; }
+       bool loaded() const override { return false; }
        /// \return the layout object of an inset given by name. If the name
        /// is not found as such, the part after the ':' is stripped off, and
        /// searched again. In this way, an error fallback can be provided:
@@ -490,7 +490,7 @@ public:
        ///
        docstring const & htmlstyles() const { return htmlstyles_; }
        ///
-       bool const & docbookforceabstract() const { return docbookforceabstract_; }
+       bool docbookforceabstract() const { return docbookforceabstract_; }
        ///
        std::string const & docbookroot() const { return docbookroot_; }
        /// Looks for the layout of "highest level", other than Part (or other
@@ -553,9 +553,9 @@ public:
        /// The maximum number of citations before "et al."
        size_t max_citenames() const { return maxcitenames_; }
        ///
-       bool const & fullAuthorList() const { return cite_full_author_list_; }
+       bool fullAuthorList() const { return cite_full_author_list_; }
        ///
-       bool const & bibInToc() const { return bibintoc_; }
+       bool bibInToc() const { return bibintoc_; }
 protected:
        /// Constructs a DocumentClass based upon a LayoutFile.
        DocumentClass(LayoutFile const & tc);
@@ -566,7 +566,7 @@ private:
        friend DocumentClassPtr
                getDocumentClass(LayoutFile const &, LayoutModuleList const &,
                                 std::string const &,
-                                bool const clone);
+                                bool clone, bool internal);
 };
 
 
@@ -577,7 +577,7 @@ private:
 DocumentClassPtr getDocumentClass(LayoutFile const & baseClass,
                        LayoutModuleList const & modlist,
                        std::string const & cengine = std::string(),
-                       bool const clone = false);
+                       bool clone = false, bool internal = false);
 
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, PageSides p);