X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.h;h=b471c297194f8ec71063ff6470cd0459ea02d78f;hb=f27d5aa9ae5f3f89c4e2923dae1592a116988906;hp=8db78d5ce1a492fe52e7ada0ecbf491cc1df9ba2;hpb=20d5148dca2f706a453b83fb413d99016e809496;p=lyx.git

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 8db78d5ce1..b471c29719 100644
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -15,16 +15,15 @@
 #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/strfwd.h"
 
 namespace lyx {
 
+class Lexer;
+
 ///
 class FontInfo
 {
@@ -41,11 +40,15 @@ public:
 		ColorCode background,
 		FontState emph,
 		FontState underbar,
+		FontState strikeout,
+		FontState uuline,
+		FontState uwave,
 		FontState noun,
 		FontState number)
 		: family_(family), series_(series), shape_(shape), size_(size), 
 		color_(color), background_(background), paint_color_(), emph_(emph),
-		underbar_(underbar), noun_(noun), number_(number)
+		underbar_(underbar), strikeout_(strikeout), uuline_(uuline),
+		uwave_(uwave), noun_(noun), number_(number)
 	{}
 
 	/// Decreases font size by one
@@ -53,8 +56,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_; }
@@ -67,6 +70,12 @@ public:
 	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 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_; }
@@ -75,7 +84,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);
@@ -95,6 +104,9 @@ public:
 	/// Sets the color which is used during painting
 	void setPaintColor(Color c) { paint_color_ = c; }
 
+	///
+	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.
 	FontShape realShape() const
@@ -145,6 +157,12 @@ private:
 	///
 	FontState underbar_;
 	///
+	FontState strikeout_;
+	///
+	FontState uuline_;
+	///
+	FontState uwave_;
+	///
 	FontState noun_;
 	///
 	FontState number_;
@@ -161,6 +179,9 @@ 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.uuline_ == rhs.uuline_
+		&& lhs.uwave_ == rhs.uwave_
 		&& lhs.noun_ == rhs.noun_
 		&& lhs.number_ == rhs.number_;
 }
@@ -178,7 +199,27 @@ 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);
+
 } // namespace lyx
 
-#endif // TEX2LYX_FONT_H
 #endif