X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=488932d208f592e52bd8299aa101b0bfb9c8c9be;hb=67f9c9fdae42211aa3ff8d0c6f62485bd721d8eb;hp=9bf18307d49d9bd4c76e9e93f0c06ddb35a7fc60;hpb=3f1021344b067ebf2b5a048d0bd03d3d4d9cd2dc;p=lyx.git diff --git a/src/lyxfont.h b/src/lyxfont.h index 9bf18307d4..488932d208 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -1,26 +1,24 @@ // -*- C++ -*- -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. +/** + * \file src/lyxfont.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * ====================================================== */ + * \author Lars Gullik Bjønnes + * \author Jean-Marc Lasgouttes + * \author Angus Leeming + * \author Dekel Tsur + * + * Full author contact details are available in file CREDITS. + */ #ifndef LYXFONT_H #define LYXFONT_H -#ifdef __GNUG__ -#pragma interface -#endif - #include +#include -#include "LString.h" -#include "LColor.h" - +class LColor_color; class LyXLex; class BufferParams; class Language; @@ -57,6 +55,10 @@ public: /// MSB_FAMILY, /// + EUFRAK_FAMILY, + /// + WASY_FAMILY, + /// INHERIT_FAMILY, /// IGNORE_FAMILY, @@ -123,7 +125,7 @@ public: /// IGNORE_SIZE }; - + /// Used for emph, underbar, noun and latex toggles enum FONT_MISC_STATE { /// @@ -175,28 +177,28 @@ public: /// Decreases font size by one LyXFont & decSize(); - + /// Increases font size by one LyXFont & incSize(); - + /// FONT_FAMILY family() const; - + /// FONT_SERIES series() const; - + /// FONT_SHAPE shape() const; - + /// FONT_SIZE size() const; - + /// FONT_MISC_STATE emph() const; - + /// FONT_MISC_STATE underbar() const; - + /// FONT_MISC_STATE noun() const; @@ -204,9 +206,9 @@ public: FONT_MISC_STATE number() const; /// - LColor::color color() const; + LColor_color color() const; - /// + /// Language const * language() const; /// @@ -217,49 +219,40 @@ public: /// bool isSymbolFont() const; - - /// - LyXFont & setFamily(LyXFont::FONT_FAMILY f); - /// - LyXFont & setSeries(LyXFont::FONT_SERIES s); - /// - LyXFont & setShape(LyXFont::FONT_SHAPE s); - /// - LyXFont & setSize(LyXFont::FONT_SIZE s); - /// - LyXFont & setEmph(LyXFont::FONT_MISC_STATE e); - /// - LyXFont & setUnderbar(LyXFont::FONT_MISC_STATE u); - /// - LyXFont & setNoun(LyXFont::FONT_MISC_STATE n); - /// - LyXFont & setNumber(LyXFont::FONT_MISC_STATE n); + /// - LyXFont & setColor(LColor::color c); - /// - LyXFont & setLanguage(Language const * l); + void setFamily(LyXFont::FONT_FAMILY f); + void setSeries(LyXFont::FONT_SERIES s); + void setShape(LyXFont::FONT_SHAPE s); + void setSize(LyXFont::FONT_SIZE s); + void setEmph(LyXFont::FONT_MISC_STATE e); + void setUnderbar(LyXFont::FONT_MISC_STATE u); + void setNoun(LyXFont::FONT_MISC_STATE n); + void setNumber(LyXFont::FONT_MISC_STATE n); + void setColor(LColor_color c); + void setLanguage(Language const * l); /// Set family after LyX text format - LyXFont & setLyXFamily(string const &); - + LyXFont & setLyXFamily(std::string const &); + /// Set series after LyX text format - LyXFont & setLyXSeries(string const &); - + LyXFont & setLyXSeries(std::string const &); + /// Set shape after LyX text format - LyXFont & setLyXShape(string const &); - + LyXFont & setLyXShape(std::string const &); + /// Set size after LyX text format - LyXFont & setLyXSize(string const &); - + LyXFont & setLyXSize(std::string const &); + /// Returns misc flag after LyX text format - LyXFont::FONT_MISC_STATE setLyXMisc(string const &); + LyXFont::FONT_MISC_STATE setLyXMisc(std::string const &); /// Sets color after LyX text format - LyXFont & setLyXColor(string const &); + LyXFont & setLyXColor(std::string const &); /// Returns size of font in LaTeX text notation - string const latexSize() const; - + std::string const latexSize() const; + /** Updates font settings according to request. If an attribute is IGNORE, the attribute is left as it is. When toggleall = true, all properties that matches the font in use @@ -272,30 +265,21 @@ public: void update(LyXFont const & newfont, Language const * default_lang, bool toggleall = false); - + /** Reduce font to fall back to template where possible. Equal fields are reduced to INHERIT */ void reduce(LyXFont const & tmplt); - + /// Realize font from a template (INHERIT are realized) -#ifndef INHERIT_LANGUAGE LyXFont & realize(LyXFont const & tmplt); -#else - LyXFont & realize(LyXFont const & tmplt, Language const * language); -#endif /// Is a given font fully resolved? bool resolved() const; - + /// Read a font specification from LyXLex. Used for layout files. LyXFont & lyxRead(LyXLex &); - + /// Writes the changes from this font to orgfont in .lyx format in file -#ifndef INHERIT_LANGUAGE void lyxWriteChanges(LyXFont const & orgfont, std::ostream &) const; -#else - void lyxWriteChanges(LyXFont const & orgfont, Language const * doclang, - std::ostream &) const; -#endif /** Writes the head of the LaTeX needed to change to this font. Writes to string, the head of the LaTeX needed to change @@ -305,7 +289,7 @@ public: int latexWriteStartChanges(std::ostream &, LyXFont const & base, LyXFont const & prev) const; - /** Writes tha tail of the LaTeX needed to chagne to this font. + /** Writes the tail of the LaTeX needed to change to this font. Returns number of chars written. Base is the font state we want to achieve. */ @@ -313,24 +297,25 @@ public: LyXFont const & next) const; /// Build GUI description of font state - string const stateText(BufferParams * params) const; + std::string const stateText(BufferParams * params) const; /// - LColor::color realColor() const; + LColor_color realColor() const; /// friend bool operator==(LyXFont const & font1, LyXFont const & font2); + /// + friend + std::ostream & operator<<(std::ostream & os, LyXFont const & font); /// Converts logical attributes to concrete shape attribute LyXFont::FONT_SHAPE realShape() const; -private: - /// + + /** Compaq cxx 6.5 requires that the definition be public so that + it can compile operator==() + */ struct FontBits { - /// - bool operator==(FontBits const & fb1) const; - /// - bool operator!=(FontBits const & fb1) const; /// FONT_FAMILY family; /// @@ -339,8 +324,10 @@ private: FONT_SHAPE shape; /// FONT_SIZE size; - /// - LColor::color color; + /** We store the LColor::color value as an int to get LColor.h out + * of the header file. + */ + int color; /// FONT_MISC_STATE emph; /// @@ -350,28 +337,40 @@ private: /// FONT_MISC_STATE number; }; - +private: /// FontBits bits; - /// Language const * lang; - /// Sane font static FontBits sane; - /// All inherit font static FontBits inherit; - /// All ignore font static FontBits ignore; - /// Updates a misc setting according to request LyXFont::FONT_MISC_STATE setMisc(LyXFont::FONT_MISC_STATE newfont, LyXFont::FONT_MISC_STATE org); }; +/** \c LyXFont_size is a wrapper for LyXFont::FONT_SIZE. + * It can be forward-declared and passed as a function argument without + * having to expose lyxfont.h. + */ +class LyXFont_size { +public: + /// + LyXFont_size(LyXFont::FONT_SIZE val) : val_(val) {} + /// + operator LyXFont::FONT_SIZE() const { return val_; } +private: + /// + LyXFont::FONT_SIZE val_; +}; + + + inline LyXFont::FONT_SHAPE LyXFont::shape() const { @@ -380,7 +379,7 @@ LyXFont::FONT_SHAPE LyXFont::shape() const inline -LyXFont::FONT_FAMILY LyXFont::family() const +LyXFont::FONT_FAMILY LyXFont::family() const { return bits.family; } @@ -417,13 +416,14 @@ LyXFont::FONT_MISC_STATE LyXFont::noun() const inline bool LyXFont::isSymbolFont() const { - switch(family()) { + switch (family()) { case LyXFont::SYMBOL_FAMILY: case LyXFont::CMSY_FAMILY: case LyXFont::CMM_FAMILY: case LyXFont::CMEX_FAMILY: case LyXFont::MSA_FAMILY: case LyXFont::MSB_FAMILY: + case LyXFont::WASY_FAMILY: return true; default: return false; @@ -433,12 +433,19 @@ bool LyXFont::isSymbolFont() const /// std::ostream & operator<<(std::ostream &, LyXFont::FONT_MISC_STATE); +bool operator==(LyXFont::FontBits const & lhs, LyXFont::FontBits const & rhs); + +inline +bool operator!=(LyXFont::FontBits const & lhs, LyXFont::FontBits const & rhs) +{ + return !(lhs == rhs); +} + /// inline bool operator==(LyXFont const & font1, LyXFont const & font2) { - return font1.bits == font2.bits && - font1.lang == font2.lang; + return font1.bits == font2.bits && font1.lang == font2.lang; } /// @@ -447,4 +454,5 @@ bool operator!=(LyXFont const & font1, LyXFont const & font2) { return !(font1 == font2); } + #endif