Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 2ff8ece309f26eaedc236fff3316928413fae2ad..7314b421b2bc1d9340cbf9944738d4a645497fd7 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -15,6 +15,7 @@
 #ifndef BUFFERPARAMS_H
 #define BUFFERPARAMS_H
 
+#include "Author.h"
 #include "Citation.h"
 #include "DocumentClassPtr.h"
 #include "Format.h"
@@ -33,7 +34,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-class AuthorList;
 class BranchList;
 class Bullet;
 class DocumentClass;
@@ -42,13 +42,11 @@ class Font;
 class HSpace;
 class IndicesList;
 class Language;
-class LatexFeatures;
 class LayoutFile;
 class LayoutFileIndex;
 class Lexer;
 class PDFOptions;
 class Spacing;
-class TexRow;
 class VSpace;
 
 /** Buffer parameters.
@@ -77,12 +75,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...
         */
@@ -244,16 +242,24 @@ 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: [0] for TeX fonts, [1] for non-TeX fonts
+       std::string fonts_roman[2];
        /// the rm font
-       std::string fonts_roman;
+       std::string const & fontsRoman() const { return fonts_roman[useNonTeXFonts]; }
+       /// the sf font: [0] for TeX fonts, [1] for non-TeX fonts
+       std::string fonts_sans[2];
        /// the sf font
-       std::string fonts_sans;
+       std::string const & fontsSans() const { return fonts_sans[useNonTeXFonts]; }
+       /// the tt font: [0] for TeX fonts, [1] for non-TeX fonts
+       std::string fonts_typewriter[2];
        /// the tt font
-       std::string fonts_typewriter;
+       std::string const & fontsTypewriter() const { return fonts_typewriter[useNonTeXFonts]; }
+       /// the math font: [0] for TeX fonts, [1] for non-TeX fonts
+       std::string fonts_math[2];
        /// the math font
-       std::string fonts_math;
+       std::string const & fontsMath() const { return fonts_math[useNonTeXFonts]; }
        /// the default family (rm, sf, tt)
        std::string fonts_default_family;
        /// use the fonts of the OS (OpenType, True Type) directly
@@ -262,12 +268,18 @@ public:
        bool fonts_expert_sc;
        /// use Old Style Figures
        bool fonts_old_figures;
+       /// the scale factor of the sf font: [0] for TeX fonts, [1] for non-TeX fonts
+       int fonts_sans_scale[2];
        /// the scale factor of the sf font
-       int fonts_sans_scale;
+       int fontsSansScale() const { return fonts_sans_scale[useNonTeXFonts]; }
+       /// the scale factor of the tt font: [0] for TeX fonts, [1] for non-TeX fonts
+       int fonts_typewriter_scale[2];
        /// the scale factor of the tt font
-       int fonts_typewriter_scale;
+       int fontsTypewriterScale() const { return fonts_typewriter_scale[useNonTeXFonts]; }
        /// the font used by the CJK command
        std::string fonts_cjk;
+       /// use LaTeX microtype package
+       bool use_microtype;
        ///
        Spacing & spacing();
        Spacing const & spacing() const;
@@ -303,8 +315,12 @@ public:
        std::string inputenc;
        /// The main encoding used by this buffer for LaTeX output.
        /// Individual pieces of text can use different encodings.
+       /// Output for XeTeX with 8-bit TeX fonts uses ASCII (set at runtime)
+       /// instead of the value returned by this function.
        Encoding const & encoding() const;
        ///
+       std::string origin;
+       ///
        std::string preamble;
        ///
        std::string options;
@@ -366,11 +382,14 @@ public:
        bool use_bibtopic;
        /// Split the index?
        bool use_indices;
-       /// revision tracking for this buffer ?
+       /// Save trensient properties?
+       bool save_transient_properties;
+       /// revision tracking for this buffer ? (this is a transient property)
        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)
+        *  This is a transient property.
         */
        bool output_changes;
        ///
@@ -379,12 +398,18 @@ public:
        /// the author list for the document
        AuthorList & authors();
        AuthorList const & authors() const;
+       void addAuthor(Author a);
 
        /// map of the file's author IDs to AuthorList indexes
        typedef std::map<int, int> AuthorMap;
-       AuthorMap author_map;
-       /// the buffer's font encoding
+       AuthorMap author_map_;
+
+       /// 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