* GuiToolbar.cpp:

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 55749646c522e4502b6917430c383dbf9f808cae..fe85a3dab86da15f46170427b48490ac393efc02 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -16,7 +16,7 @@
 #define BUFFERPARAMS_H
 
 #include "Font.h"
-#include "BiblioInfo.h"
+#include "Citation.h"
 #include "paper.h"
 
 #include "insets/InsetQuotes.h"
@@ -67,8 +67,7 @@ public:
        /// read a header token, if unrecognised, return it or an unknown class name
        std::string readToken(Lexer & lex,
                std::string const & token, ///< token to read.
-               support::FileName const & filepath,
-               support::FileName const & temppath); ///< where to look for local layout file.
+               support::FileName const & filepath);
 
        ///
        void writeFile(std::ostream &) const;
@@ -119,7 +118,7 @@ public:
        DocumentClass const & documentClass() const;
        /// \return A pointer to the DocumentClass currently in use: the BaseClass 
        /// as modified by modules. 
-       DocumentClass * documentClassPtr() const;
+       DocumentClass const * documentClassPtr() const;
        /// This bypasses the baseClass and sets the textClass directly.
        /// Should be called with care and would be better not being here,
        /// but it seems to be needed by CutAndPaste::putClipboard().
@@ -186,6 +185,8 @@ public:
        int fontsSansScale;
        /// the scale factor of the tt font
        int fontsTypewriterScale;
+       /// the font used by the CJK command
+       std::string fontsCJK;
        ///
        Spacing & spacing();
        Spacing const & spacing() const;
@@ -224,6 +225,8 @@ public:
        ///
        std::string options;
        ///
+       std::string master;
+       ///
        std::string float_placement;
        ///
        unsigned int columns;
@@ -266,11 +269,6 @@ public:
        bool outputChanges;
        ///
        bool compressed;
-       ///
-       bool embedded;
-       ///
-       std::vector<std::string> & extraEmbeddedFiles();
-       std::vector<std::string> const & extraEmbeddedFiles() const;
 
        /// the author list for the document
        AuthorList & authors();
@@ -306,9 +304,9 @@ public:
                                     int const & sfscale, int const & ttscale) const;
 
        /// get the appropriate cite engine (natbib handling)
-       biblio::CiteEngine citeEngine() const;
+       CiteEngine citeEngine() const;
        ///
-       void setCiteEngine(biblio::CiteEngine const);
+       void setCiteEngine(CiteEngine const);
 
        /// options for pdf output
        PDFOptions & pdfoptions();
@@ -331,7 +329,7 @@ private:
        void readModules(Lexer &);
 
        /// for use with natbib
-       biblio::CiteEngine cite_engine_;
+       CiteEngine cite_engine_;
        ///
        DocumentClass * doc_class_;
        ///