Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[features.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index caa1855560a45be86f19903c65a6f322504ac537..eee2d69cbb769f49bf1476b5befa968962b95a38 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -27,9 +27,7 @@
 
 namespace lyx {
 
-namespace support {
-class FileName;
-}
+namespace support { class FileName; }
 
 class AuthorList;
 class BranchList;
@@ -54,24 +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,
-               support::FileName const & temppath); ///< where to look for local layout file.
+               support::FileName const & filepath);
 
        ///
        void writeFile(std::ostream &) const;
@@ -87,20 +83,18 @@ 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::QuoteLanguage quotes_language;
        ///
@@ -225,6 +219,8 @@ public:
        ///
        std::string preamble;
        ///
+       std::string local_layout;
+       ///
        std::string options;
        ///
        std::string float_placement;
@@ -269,11 +265,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();
@@ -287,7 +278,7 @@ public:
         *  purpose for which the paper size is needed, since they
         *  support different subsets of paper sizes.
        */
-       enum Papersize_Purpose {
+       enum PapersizePurpose {
                ///
                DVIPS,
                ///
@@ -296,9 +287,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;
@@ -309,8 +300,7 @@ public:
                                     int const & sfscale, int const & ttscale) const;
 
        /// get the appropriate cite engine (natbib handling)
-       biblio::CiteEngine getEngine() const;
-
+       biblio::CiteEngine citeEngine() const;
        ///
        void setCiteEngine(biblio::CiteEngine const);
 
@@ -322,6 +312,8 @@ private:
        ///
        void readPreamble(Lexer &);
        ///
+       void readLocalLayout(Lexer &);
+       ///
        void readLanguage(Lexer &);
        ///
        void readGraphicsDriver(Lexer &);