Disable setting vertical lines when using a formal table

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 9c558a6f5e2afaa58d15ada0b3fcf79886eaeb45..b5ab65ecce3383abce504d80e90a4b30718b4892 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -77,12 +77,12 @@ public:
                support::FileName const & filepath);
 
        ///
-       void writeFile(std::ostream &) const;
+       void writeFile(std::ostream &, Buffer const *) const;
 
        /// check what features are implied by the buffer parameters.
        void validate(LaTeXFeatures &) const;
 
-       /** \returns true if the babel package is used (interogates
+       /** \returns true if the babel package is used (interrogates
         *  the BufferParams, a LyXRC variable, and the document class).
         *  This returned value can then be passed to the insets...
         */
@@ -110,8 +110,6 @@ public:
        ///
        InsetQuotes::QuoteLanguage quotes_language;
        ///
-       InsetQuotes::QuoteTimes quotes_times;
-       ///
        std::string fontsize;
        /// Get the LayoutFile this document is using.
        LayoutFile const * baseClass() const;
@@ -120,7 +118,7 @@ public:
        /// Set the LyX layout file this document is using.
        /// NOTE: This does not call makeDocumentClass() to update the local
        /// DocumentClass. That needs to be done manually.
-       /// \param filename the name of the layout file
+       /// \param classname: the name of the layout file
        bool setBaseClass(std::string const & classname);
        /// Adds the module information to the baseClass information to
        /// create our local DocumentClass.
@@ -128,7 +126,7 @@ public:
        /// on to class BufferView::updateDocumentClass(). The exception, of course,
        /// is in GuiDocument, where we use a BufferParams simply to hold a copy of
        /// the parameters from the active Buffer.
-       void makeDocumentClass();
+       void makeDocumentClass(bool const clone = false);
        /// Returns the DocumentClass currently in use: the BaseClass as modified
        /// by modules.
        DocumentClass const & documentClass() const;
@@ -180,7 +178,7 @@ public:
        std::string getDefaultOutputFormat() const;
        /// return the output flavor of \p format or the default
        OutputParams::FLAVOR getOutputFlavor(
-                 std::string const format = std::string()) const;
+                 std::string const & format = std::string()) const;
        ///
        bool isExportable(std::string const & format) const;
        ///
@@ -207,7 +205,7 @@ public:
        Font const getFont() const;
 
        /// translate quote style string to enum value
-       InsetQuotes::QuoteLanguage getQuoteStyle(std::string const qs) const;
+       InsetQuotes::QuoteLanguage getQuoteStyle(std::string const & qs) const;
 
        /* these are for the PaperLayout */
        /// the papersize
@@ -246,7 +244,7 @@ public:
        std::string bibtex_command;
        /// customized index processor
        std::string index_command;
-       /// font encoding
+       /// font encoding(s) requested for this document
        std::string fontenc;
        /// the rm font
        std::string fonts_roman;
@@ -307,6 +305,8 @@ public:
        /// Individual pieces of text can use different encodings.
        Encoding const & encoding() const;
        ///
+       std::string origin;
+       ///
        std::string preamble;
        ///
        std::string options;
@@ -369,12 +369,12 @@ public:
        /// Split the index?
        bool use_indices;
        /// revision tracking for this buffer ?
-       bool trackChanges;
+       bool track_changes;
        /** This param decides whether change tracking marks should be used
         *  in output (irrespective of how these marks are actually defined;
         *  for instance, they may differ for DVI and PDF generation)
         */
-       bool outputChanges;
+       bool output_changes;
        ///
        bool compressed;
 
@@ -385,8 +385,12 @@ public:
        /// map of the file's author IDs to AuthorList indexes
        typedef std::map<int, int> AuthorMap;
        AuthorMap author_map;
-       /// the buffer's font encoding
+       /// the buffer's active font encoding
        std::string const font_encoding() const;
+       /// all font encodings requested by the prefs/document/main language.
+       /// This does NOT include font encodings required by secondary languages
+       std::vector<std::string> const font_encodings() const;
+
        ///
        std::string const dvips_options() const;
        /** The return value of paperSizeName() depends on the
@@ -465,6 +469,8 @@ public:
        ///
        double html_math_img_scale;
        ///
+       double display_pixel_ratio;
+       ///
        std::string html_latex_start;
        ///
        std::string html_latex_end;