Allow boldface and font size changing commands for unicode symbols in math.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 9e858275aeaadcf0e0121128f7ad2b930d9e4099..dae8c4e3b2a086149e513f1cdef6bfd13685d69b 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"
@@ -27,9 +27,7 @@
 
 namespace lyx {
 
-namespace support {
-class FileName;
-}
+namespace support { class FileName; }
 
 class AuthorList;
 class BranchList;
@@ -54,23 +52,22 @@ class VSpace;
 class BufferParams {
 public:
        ///
-       enum PARSEP {
+       enum ParagraphSeparation {
                ///
-               PARSEP_INDENT,
+               ParagraphIndentSeparation,
                ///
-               PARSEP_SKIP
+               ParagraphSkipSeparation
        };
        ///
        BufferParams();
-       ~BufferParams();
 
        /// get l10n translated to the buffers language
-       docstring const B_(std::string const & l10n) const;
+       docstring B_(std::string const & l10n) const;
 
        /// read a header token, if unrecognised, return it or an unknown class name
-       std::string const readToken(Lexer & lex,
+       std::string readToken(Lexer & lex,
                std::string const & token, ///< token to read.
-               support::FileName const & filepath); ///< where to look for local layout file.
+               support::FileName const & filepath);
 
        ///
        void writeFile(std::ostream &) const;
@@ -86,24 +83,22 @@ public:
 
        ///
        void useClassDefaults();
-
        ///
        bool hasClassDefaults() const;
 
        ///
        VSpace const & getDefSkip() const;
-
        ///
        void setDefSkip(VSpace const & vs);
 
        /** Whether paragraphs are separated by using a indent like in
         *  articles or by using a little skip like in letters.
         */
-       PARSEP paragraph_separation;
+       ParagraphSeparation paragraph_separation;
        ///
-       InsetQuotes::quote_language quotes_language;
+       InsetQuotes::QuoteLanguage quotes_language;
        ///
-       InsetQuotes::quote_times quotes_times;
+       InsetQuotes::QuoteTimes quotes_times;
        ///
        std::string fontsize;
        ///Get the LayoutFile this document is using.
@@ -123,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().
@@ -224,8 +219,12 @@ public:
        ///
        std::string preamble;
        ///
+       std::string local_layout;
+       ///
        std::string options;
        ///
+       std::string master;
+       ///
        std::string float_placement;
        ///
        unsigned int columns;
@@ -268,8 +267,6 @@ public:
        bool outputChanges;
        ///
        bool compressed;
-       ///
-       bool embedded;
 
        /// the author list for the document
        AuthorList & authors();
@@ -283,7 +280,7 @@ public:
         *  purpose for which the paper size is needed, since they
         *  support different subsets of paper sizes.
        */
-       enum Papersize_Purpose {
+       enum PapersizePurpose {
                ///
                DVIPS,
                ///
@@ -292,9 +289,9 @@ public:
                XDVI
        };
        ///
-       std::string const paperSizeName(Papersize_Purpose const & purpose) const;
+       std::string paperSizeName(PapersizePurpose purpose) const;
        /// set up if and how babel is called
-       std::string const babelCall(std::string const & lang_opts) const;
+       std::string babelCall(std::string const & lang_opts) const;
        /// handle inputenc etc.
        void writeEncodingPreamble(odocstream & os, LaTeXFeatures & features,
                                              TexRow & texrow) const;
@@ -305,10 +302,9 @@ public:
                                     int const & sfscale, int const & ttscale) const;
 
        /// get the appropriate cite engine (natbib handling)
-       biblio::CiteEngine getEngine() const;
-
+       CiteEngine citeEngine() const;
        ///
-       void setCiteEngine(biblio::CiteEngine const);
+       void setCiteEngine(CiteEngine const);
 
        /// options for pdf output
        PDFOptions & pdfoptions();
@@ -318,6 +314,8 @@ private:
        ///
        void readPreamble(Lexer &);
        ///
+       void readLocalLayout(Lexer &);
+       ///
        void readLanguage(Lexer &);
        ///
        void readGraphicsDriver(Lexer &);
@@ -329,7 +327,7 @@ private:
        void readModules(Lexer &);
 
        /// for use with natbib
-       biblio::CiteEngine cite_engine_;
+       CiteEngine cite_engine_;
        ///
        DocumentClass * doc_class_;
        ///