update the ACM SIGPLAN files to latest layout and fileformat

[lyx.git] / src / Font.h

diff --git a/src/Font.h b/src/Font.h
index e044fc4fd926e29fd32c3f05a759a1d50c242ce6..49c8f31b5b9ed52ffba3ce325fa43c156c0feb59 100644 (file)
--- a/src/Font.h
+++ b/src/Font.h
@@ -22,7 +22,7 @@
 #include "ColorCode.h"
 #include "FontInfo.h"
 
-#include "support/docstream.h"
+#include "support/strfwd.h"
 
 
 namespace lyx {
@@ -38,7 +38,7 @@ class Font {
 
 public:
        ///
-       Font(FontInfo = sane_font, Language const * l = 0);
+       explicit Font(FontInfo = sane_font, Language const * l = 0);
 
        ///
        FontInfo & fontInfo() { return bits_; }
@@ -163,7 +163,7 @@ void setLyXSize(std::string const &, FontInfo &);
 void setLyXColor(std::string const &, FontInfo &);
 
 /// Read a font specification from Lexer. Used for layout files.
-FontInfo lyxRead(Lexer &);
+FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
 
 } // namespace lyx