X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=ee2b22a248a91df9f65d4273ca69847ad749de1c;hb=21992716e52ca8c277b2a448f15c8164563b3ff7;hp=65e133b1a1f3e2ccd35a46a7b5c032ae0e0b7c0c;hpb=cbb0829728179b82d01edc5143a4c341fc80dd1b;p=lyx.git diff --git a/src/BufferParams.h b/src/BufferParams.h index 65e133b1a1..ee2b22a248 100644 --- a/src/BufferParams.h +++ b/src/BufferParams.h @@ -16,7 +16,6 @@ #define BUFFERPARAMS_H #include "Citation.h" -#include "Font.h" #include "LayoutModuleList.h" #include "paper.h" @@ -24,9 +23,7 @@ #include "support/copied_ptr.h" -#include #include -#include namespace lyx { @@ -37,6 +34,7 @@ class BranchList; class Bullet; class DocumentClass; class Encoding; +class Font; class HSpace; class IndicesList; class Language; @@ -81,10 +79,11 @@ public: void validate(LaTeXFeatures &) const; /** \returns true if the babel package is used (interogates - * the BufferParams and a LyXRC variable). + * the BufferParams, a LyXRC variable, and the document class). * This returned value can then be passed to the insets... */ - bool writeLaTeX(odocstream &, LaTeXFeatures &, TexRow &) const; + bool writeLaTeX(otexstream &, LaTeXFeatures &, + support::FileName const &) const; /// void useClassDefaults(); @@ -110,7 +109,7 @@ public: InsetQuotes::QuoteTimes quotes_times; /// std::string fontsize; - ///Get the LayoutFile this document is using. + /// Get the LayoutFile this document is using. LayoutFile const * baseClass() const; /// LayoutFileIndex const & baseClassID() const; @@ -133,10 +132,10 @@ public: /// but it seems to be needed by CutAndPaste::putClipboard(). void setDocumentClass(DocumentClass const * const); /// List of modules in use - LayoutModuleList const & getModules() const { return layoutModules_; } + LayoutModuleList const & getModules() const { return layout_modules_; } /// List of default modules the user has removed std::list const & getRemovedModules() const - { return removedModules_; } + { return removed_modules_; } /// /// Add a module to the list of modules in use. This checks only that the /// module is not already in the list, so use moduleIsCompatible first if @@ -148,16 +147,28 @@ public: bool moduleCanBeAdded(std::string const & modName) const; /// void addRemovedModule(std::string const & modName) - { removedModules_.push_back(modName); } + { removed_modules_.push_back(modName); } /// Clear the list - void clearLayoutModules() { layoutModules_.clear(); } + void clearLayoutModules() { layout_modules_.clear(); } /// Clear the removed module list - void clearRemovedModules() { removedModules_.clear(); } + void clearRemovedModules() { removed_modules_.clear(); } + + /// List of included children (for includeonly) + std::list const & getIncludedChildren() const + { return included_children_; } + /// + void addIncludedChildren(std::string const & child) + { included_children_.push_back(child); } + /// Clear the list of included children + void clearIncludedChildren() { included_children_.clear(); } + + /// update aux files of unincluded children (with \includeonly) + bool maintain_unincluded_children; /// returns the main font for the buffer (document) Font const getFont() const; - /* this are for the PaperLayout */ + /* these are for the PaperLayout */ /// the papersize PAPER_SIZE papersize; /// @@ -187,33 +198,35 @@ public: /* some LaTeX options */ /// The graphics driver - std::string graphicsDriver; + std::string graphics_driver; /// The default output format - std::string defaultOutputFormat; + std::string default_output_format; /// customized bibliography processor std::string bibtex_command; /// customized index processor std::string index_command; + /// font encoding + std::string fontenc; /// the rm font - std::string fontsRoman; + std::string fonts_roman; /// the sf font - std::string fontsSans; + std::string fonts_sans; /// the tt font - std::string fontsTypewriter; + std::string fonts_typewriter; /// the default family (rm, sf, tt) - std::string fontsDefaultFamily; - /// use the XeTeX processor - bool useXetex; + std::string fonts_default_family; + /// use the fonts of the OS (OpenType, True Type) directly + bool useNonTeXFonts; /// use expert Small Caps - bool fontsSC; + bool fonts_expert_sc; /// use Old Style Figures - bool fontsOSF; + bool fonts_old_figures; /// the scale factor of the sf font - int fontsSansScale; + int fonts_sans_scale; /// the scale factor of the tt font - int fontsTypewriterScale; + int fonts_typewriter_scale; /// the font used by the CJK command - std::string fontsCJK; + std::string fonts_cjk; /// Spacing & spacing(); Spacing const & spacing() const; @@ -223,6 +236,8 @@ public: int tocdepth; /// Language const * language; + /// language package + std::string lang_package; /// BranchList: BranchList & branchlist(); BranchList const & branchlist() const; @@ -259,6 +274,8 @@ public: /// std::string master; /// + bool suppress_date; + /// std::string float_placement; /// unsigned int columns; @@ -270,6 +287,16 @@ public: std::string pagestyle; /// RGBColor backgroundcolor; + /// + bool isbackgroundcolor; + /// + RGBColor fontcolor; + /// + bool isfontcolor; + /// + RGBColor notefontcolor; + /// + RGBColor boxbgcolor; /// \param index should lie in the range 0 <= \c index <= 3. Bullet & temp_bullet(size_type index); Bullet const & temp_bullet(size_type index) const; @@ -292,6 +319,10 @@ public: Package use_amsmath; /// Whether and how to load esint Package use_esint; + /// Whether and how to load mhchem + Package use_mhchem; + /// Whether and how to load mathdots + Package use_mathdots; /// Split bibliography? bool use_bibtopic; /// Split the index? @@ -311,7 +342,10 @@ public: AuthorList const & authors() const; /// map of the file's author IDs to AuthorList indexes - std::map author_map; + typedef std::map AuthorMap; + AuthorMap author_map; + /// the buffer's font encoding + std::string const font_encoding() const; /// std::string const dvips_options() const; /** The return value of paperSizeName() depends on the @@ -329,12 +363,11 @@ public: /// std::string paperSizeName(PapersizePurpose purpose) const; /// set up if and how babel is called - std::string babelCall(std::string const & lang_opts) const; + std::string babelCall(std::string const & lang_opts, bool const langoptions) const; /// return supported drivers for specific packages docstring getGraphicsDriver(std::string const & package) const; /// handle inputenc etc. - void writeEncodingPreamble(odocstream & os, LaTeXFeatures & features, - TexRow & texrow) const; + void writeEncodingPreamble(otexstream & os, LaTeXFeatures & features) const; /// std::string const parseFontName(std::string const & name) const; /// set up the document fonts @@ -342,7 +375,8 @@ public: std::string const & sf, std::string const & tt, bool const & sc, bool const & osf, int const & sfscale, int const & ttscale, - bool const & xetex) const; + bool const & use_nonlatexfonts, + LaTeXFeatures & features) const; /// get the appropriate cite engine (natbib handling) CiteEngine citeEngine() const; @@ -353,6 +387,33 @@ public: PDFOptions & pdfoptions(); PDFOptions const & pdfoptions() const; + // do not change these values. we rely upon them. + enum MathOutput { + MathML = 0, + HTML = 1, + Images = 2, + LaTeX = 3 + }; + /// what to use for math output. present choices are above + MathOutput html_math_output; + /// whether to attempt to be XHTML 1.1 compliant or instead be + /// a little more mellow + bool html_be_strict; + /// + double html_math_img_scale; + /// + std::string html_latex_start; + /// + std::string html_latex_end; + /// + bool html_css_as_file; + /// generate output usable for reverse/forward search + bool output_sync; + /// custom LaTeX macro from user instead our own + std::string output_sync_macro; + /// use refstyle? or prettyref? + bool use_refstyle; + private: /// void readPreamble(Lexer &); @@ -370,15 +431,20 @@ private: void readModules(Lexer &); /// void readRemovedModules(Lexer &); + /// + void readIncludeonly(Lexer &); /// for use with natbib CiteEngine cite_engine_; /// DocumentClass * doc_class_; /// - LayoutModuleList layoutModules_; + LayoutModuleList layout_modules_; /// this is for modules that are required by the document class but that /// the user has chosen not to use - std::list removedModules_; + std::list removed_modules_; + + /// the list of included children (for includeonly) + std::list included_children_; /** Use the Pimpl idiom to hide those member variables that would otherwise * drag in other header files.