Amend 207eaeee9071cb

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 2a2e0f3087122a2fcb7d156f7e0ad4f1c61d48b0..92c1418da1f2cb5e9c58ba2413a40e9c808b25a6 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -31,7 +31,10 @@
 
 namespace lyx {
 
-namespace support { class FileName; }
+namespace support {
+class FileName;
+class Lexer;
+}
 
 class Author;
 class AuthorList;
@@ -48,7 +51,6 @@ class LaTeXFeatures;
 class LayoutFile;
 class LayoutFileIndex;
 class Length;
-class Lexer;
 class OutputParams;
 class otexstream;
 class PDFOptions;
@@ -79,7 +81,7 @@ public:
        docstring B_(std::string const & l10n) const;
 
        /// read a header token, if unrecognised, return it or an unknown class name
-       std::string readToken(Lexer & lex,
+       std::string readToken(support::Lexer & lex,
                std::string const & token, ///< token to read.
                support::FileName const & filename);
 
@@ -197,6 +199,8 @@ public:
        bool isLiterate() const;
        /// Is this package option requested?
        bool hasPackageOption(std::string const package, std::string const opt) const;
+       /// Get the options requested for a given package
+       std::string getPackageOptions(std::string const package) const;
        /// Do we use the bidi package (which does some reordering and stuff)?
        bool useBidiPackage(OutputParams const & rp) const;
 
@@ -606,6 +610,8 @@ public:
        std::string output_sync_macro;
        /// use refstyle? or prettyref?
        bool use_refstyle;
+       /// use formatted references in the workarea?
+       bool use_formatted_ref;
        /// use minted? or listings?
        bool use_minted;
        //output line numbering
@@ -625,25 +631,25 @@ public:
 
 private:
        ///
-       void readPreamble(Lexer &);
+       void readPreamble(support::Lexer &);
        ///
-       void readDocumentMetadata(Lexer &);
+       void readDocumentMetadata(support::Lexer &);
        ///
-       void readLocalLayout(Lexer &, bool);
+       void readLocalLayout(support::Lexer &, bool);
        ///
-       void readLanguage(Lexer &);
+       void readLanguage(support::Lexer &);
        ///
-       void readGraphicsDriver(Lexer &);
+       void readGraphicsDriver(support::Lexer &);
        ///
-       void readBullets(Lexer &);
+       void readBullets(support::Lexer &);
        ///
-       void readBulletsLaTeX(Lexer &);
+       void readBulletsLaTeX(support::Lexer &);
        ///
-       void readModules(Lexer &);
+       void readModules(support::Lexer &);
        ///
-       void readRemovedModules(Lexer &);
+       void readRemovedModules(support::Lexer &);
        ///
-       void readIncludeonly(Lexer &);
+       void readIncludeonly(support::Lexer &);
        /// A cache for the default flavors
        typedef std::map<std::string, Flavor> DefaultFlavorCache;
        ///