X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=17b2359b11a0217262fd774c19e269f87863c828;hb=267e4d92ea8799f94180852fec717e7e74fe2ab6;hp=2309eab91789510d4db67e401837c14ccbb791d9;hpb=03d1c984a0b22ec123cb86ba9004d9172a4190fb;p=lyx.git diff --git a/src/lyxfont.h b/src/lyxfont.h index 2309eab917..17b2359b11 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -1,11 +1,11 @@ // -*- C++ -*- /* This file is part of * ====================================================== - * + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ @@ -19,24 +19,12 @@ #include #include "LString.h" -#include "language.h" #include "LColor.h" -// It might happen that locale.h defines ON and OFF. This is not good -// for us, since we use these names below. But of course this is due -// to some old compilers. Than is broken when it comes to C++ scoping. -#include "gettext.h" // so that we are sure tht it won't be included -// later. -#ifdef ON -#undef ON -#endif - -#ifdef OFF -#undef OFF -#endif - class LyXLex; class BufferParams; +class Language; + /// class LyXFont { @@ -57,9 +45,27 @@ public: /// SYMBOL_FAMILY, /// + CMR_FAMILY, + /// + CMSY_FAMILY, + /// + CMM_FAMILY, + /// + CMEX_FAMILY, + /// + MSA_FAMILY, + /// + MSB_FAMILY, + /// + EUFRAK_FAMILY, + /// + WASY_FAMILY, + /// INHERIT_FAMILY, /// - IGNORE_FAMILY + IGNORE_FAMILY, + /// + NUM_FAMILIES = INHERIT_FAMILY }; /// @@ -121,7 +127,7 @@ public: /// IGNORE_SIZE }; - + /// Used for emph, underbar, noun and latex toggles enum FONT_MISC_STATE { /// @@ -173,33 +179,30 @@ 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; /// - FONT_MISC_STATE latex() const; + FONT_MISC_STATE noun() const; /// FONT_MISC_STATE number() const; @@ -207,7 +210,7 @@ public: /// LColor::color color() const; - /// + /// Language const * language() const; /// @@ -215,7 +218,10 @@ public: /// bool isVisibleRightToLeft() const; - + + /// + bool isSymbolFont() const; + /// LyXFont & setFamily(LyXFont::FONT_FAMILY f); /// @@ -231,26 +237,24 @@ public: /// LyXFont & setNoun(LyXFont::FONT_MISC_STATE n); /// - LyXFont & setLatex(LyXFont::FONT_MISC_STATE l); - /// LyXFont & setNumber(LyXFont::FONT_MISC_STATE n); /// LyXFont & setColor(LColor::color c); - /// + /// LyXFont & setLanguage(Language const * l); /// Set family after LyX text format LyXFont & setLyXFamily(string const &); - + /// Set series after LyX text format LyXFont & setLyXSeries(string const &); - + /// Set shape after LyX text format LyXFont & setLyXShape(string const &); - + /// Set size after LyX text format LyXFont & setLyXSize(string const &); - + /// Returns misc flag after LyX text format LyXFont::FONT_MISC_STATE setLyXMisc(string const &); @@ -259,7 +263,7 @@ public: /// Returns size of font in LaTeX text notation 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 @@ -269,23 +273,22 @@ public: a INHERIT_FAMILY was asked for. This is necessary for the toggle-user-defined-style button on the toolbar. */ - void update(LyXFont const & newfont, + 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) LyXFont & realize(LyXFont const & tmplt); - /// 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 void lyxWriteChanges(LyXFont const & orgfont, std::ostream &) const; @@ -314,18 +317,13 @@ public: friend bool operator==(LyXFont const & font1, LyXFont const & font2); - /// compares two fonts, ignoring the setting of the Latex part. - bool equalExceptLatex(LyXFont const &) const; - /// 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; /// @@ -343,23 +341,22 @@ private: /// FONT_MISC_STATE noun; /// - FONT_MISC_STATE latex; - /// 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; @@ -368,9 +365,77 @@ private: LyXFont::FONT_MISC_STATE org); }; + +inline +LyXFont::FONT_SHAPE LyXFont::shape() const +{ + return bits.shape; +} + + +inline +LyXFont::FONT_FAMILY LyXFont::family() const +{ + return bits.family; +} + + +inline +LyXFont::FONT_SERIES LyXFont::series() const +{ + return bits.series; +} + + +inline +LyXFont::FONT_SIZE LyXFont::size() const +{ + return bits.size; +} + + +inline +LyXFont::FONT_MISC_STATE LyXFont::emph() const +{ + return bits.emph; +} + + +inline +LyXFont::FONT_MISC_STATE LyXFont::noun() const +{ + return bits.noun; +} + + +inline +bool LyXFont::isSymbolFont() const +{ + 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; + } +} + /// 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) @@ -385,4 +450,6 @@ bool operator!=(LyXFont const & font1, LyXFont const & font2) { return !(font1 == font2); } + + #endif