X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFontInfo.h;h=9f38000e666e371215ab9725000774aacddd6323;hb=279e656d6a7c4ee3647752cba8b9aa7d6ec6e0c2;hp=f71bc43eae79eb8f5690ad51b9be49a4f0bec7f2;hpb=e1941582590eccc4071affe395f3d9a4db2de30b;p=lyx.git diff --git a/src/FontInfo.h b/src/FontInfo.h index f71bc43eae..9f38000e66 100644 --- a/src/FontInfo.h +++ b/src/FontInfo.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author Dekel Tsur @@ -15,36 +15,44 @@ #ifndef FONT_PROPERTIES_H #define FONT_PROPERTIES_H -#ifdef TEX2LYX -#include "tex2lyx/Font.h" -#else - +#include "Color.h" #include "ColorCode.h" #include "FontEnums.h" +#include "support/Changer.h" +#include "support/strfwd.h" + + namespace lyx { +class Lexer; + /// class FontInfo { public: /// - FontInfo::FontInfo(); + FontInfo(); /// - FontInfo::FontInfo( + FontInfo( FontFamily family, FontSeries series, - FontShape shape, - FontSize size, - ColorCode color, - ColorCode background, - FontState emph, - FontState underbar, - FontState noun, - FontState number - ): family_(family), series_(series), shape_(shape), size_(size), - color_(color), background_(background), emph_(emph), - underbar_(underbar), noun_(noun), number_(number) + FontShape shape, + FontSize size, + ColorCode color, + ColorCode background, + FontState emph, + FontState underbar, + FontState strikeout, + FontState xout, + FontState uuline, + FontState uwave, + FontState noun, + FontState number) + : family_(family), series_(series), shape_(shape), size_(size), + style_(LM_ST_TEXT), color_(color), background_(background), emph_(emph), + underbar_(underbar), strikeout_(strikeout), xout_(xout), uuline_(uuline), + uwave_(uwave), noun_(noun), number_(number) {} /// Decreases font size by one @@ -52,8 +60,8 @@ public: /// Increases font size by one FontInfo & incSize(); - /// Accessor methods. - ///@{ + /// \name Accessor methods + //@{ FontFamily family() const { return family_; } void setFamily(FontFamily f) { family_ = f; } FontSeries series() const { return series_; } @@ -62,10 +70,20 @@ public: void setShape(FontShape s) { shape_ = s; } FontSize size() const { return size_; } void setSize(FontSize s) { size_ = s; } + MathStyle style() const {return style_; } + void setStyle(MathStyle s) { style_ = s; } FontState emph() const { return emph_; } void setEmph(FontState e) { emph_ = e; } FontState underbar() const { return underbar_; } void setUnderbar(FontState u) { underbar_ = u; } + FontState strikeout() const { return strikeout_; } + void setStrikeout(FontState s) { strikeout_ = s; } + FontState xout() const { return xout_; } + void setXout(FontState s) { xout_ = s; } + FontState uuline() const { return uuline_; } + void setUuline(FontState s) { uuline_ = s; } + FontState uwave() const { return uwave_; } + void setUwave(FontState s) { uwave_ = s; } FontState noun() const { return noun_; } void setNoun(FontState n) { noun_ = n; } FontState number() const { return number_; } @@ -74,7 +92,7 @@ public: void setColor(ColorCode c) { color_ = c; } ColorCode background() const { return background_; } void setBackground(ColorCode b) { background_ = b; } - ///@} + //@} /// void update(FontInfo const & newfont, bool toggleall); @@ -88,8 +106,17 @@ public: /// Is a given font fully resolved? bool resolved() const; + /// The real color of the font. This can be the color that is + /// set for painting, the color of the font or a default color. + Color realColor() const; + /// Sets the color which is used during painting + void setPaintColor(Color c) { paint_color_ = c; } + + /// Compute the font size, taking size and math style into account. + double realSize() const; + /// - ColorCode realColor() const; + docstring asCSS() const; /// Converts logical attributes to concrete shape attribute /// Try hard to inline this as it shows up with 4.6 % in the profiler. @@ -98,7 +125,7 @@ public: if (noun_ == FONT_ON) return SMALLCAPS_SHAPE; if (emph_ == FONT_ON) - return (shape_ == UP_SHAPE) ? ITALIC_SHAPE : UP_SHAPE; + return (shape_ == ITALIC_SHAPE) ? UP_SHAPE : ITALIC_SHAPE; return shape_; } @@ -111,6 +138,7 @@ public: case CMEX_FAMILY: case MSA_FAMILY: case MSB_FAMILY: + case STMARY_FAMILY: case WASY_FAMILY: case ESINT_FAMILY: return true; @@ -119,6 +147,16 @@ public: } } + /// Temporarily replace the color with \param color. + Changer changeColor(ColorCode const color); + /// Temporarily replace the shape with \param shape. + Changer changeShape(FontShape const shape); + /// Temporarily replace the style + Changer changeStyle(MathStyle style); + /// Temporarily replace the FontInfo with \param font, and optionally + /// \param realize the \param font against the current FontInfo. + Changer change(FontInfo font, bool realize = false); + private: friend bool operator==(FontInfo const & lhs, FontInfo const & rhs); @@ -131,14 +169,26 @@ private: /// FontSize size_; /// + MathStyle style_; + /// ColorCode color_; /// ColorCode background_; + /// The color used for painting + Color paint_color_; /// FontState emph_; /// FontState underbar_; /// + FontState strikeout_; + /// + FontState xout_; + /// + FontState uuline_; + /// + FontState uwave_; + /// FontState noun_; /// FontState number_; @@ -155,6 +205,10 @@ inline bool operator==(FontInfo const & lhs, FontInfo const & rhs) && lhs.background_ == rhs.background_ && lhs.emph_ == rhs.emph_ && lhs.underbar_ == rhs.underbar_ + && lhs.strikeout_ == rhs.strikeout_ + && lhs.xout_ == rhs.xout_ + && lhs.uuline_ == rhs.uuline_ + && lhs.uwave_ == rhs.uwave_ && lhs.noun_ == rhs.noun_ && lhs.number_ == rhs.number_; } @@ -172,7 +226,30 @@ extern FontInfo const inherit_font; /// All ignore font. extern FontInfo const ignore_font; +/// Set family after LyX text format +void setLyXFamily(std::string const &, FontInfo &); + +/// Set series after LyX text format +void setLyXSeries(std::string const &, FontInfo &); + +/// Set shape after LyX text format +void setLyXShape(std::string const &, FontInfo &); + +/// Set size after LyX text format +void setLyXSize(std::string const &, FontInfo &); + +/// Sets color after LyX text format +void setLyXColor(std::string const &, FontInfo &); + +/// Returns misc flag after LyX text format +FontState setLyXMisc(std::string const &); + +/// Read a font specification from Lexer. Used for layout files. +FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font); + +/// Write a font specification. Used for layout files. +void lyxWrite(std::ostream &, FontInfo const &, std::string const &, int); + } // namespace lyx -#endif // TEX2LYX_FONT_H #endif