Remove 3rdparty/boost/Makefile.am

[lyx.git] / src / Font.h

diff --git a/src/Font.h b/src/Font.h
index f623a48c754d5c80063ae92dbed2f9930b35a2e0..b59f015eca7d9318deb5ec513f6755681c45e453 100644 (file)
--- a/src/Font.h
+++ b/src/Font.h
@@ -76,7 +76,8 @@ public:
                                   OutputParams const & runparams,
                                   Font const & base,
                                   Font const & prev,
-                                  bool const & non_inherit_inset = false) const;
+                                  bool non_inherit_inset = false,
+                                  bool needs_cprotection = false) const;
 
        /** Writes the tail of the LaTeX needed to change to this font.
            Returns number of chars written. Base is the font state we want
@@ -87,8 +88,7 @@ public:
                                 Font const & base,
                                 Font const & next,
                                 bool & needPar,
-                                bool const & closeLanguage = true,
-                                bool const & non_inherit_inset = false) const;
+                                bool closeLanguage = true) const;
 
 
        /// Build GUI description of font state
@@ -119,6 +119,9 @@ private:
        mutable bool open_encoding_;
 };
 
+///
+std::ostream & operator<<(std::ostream & os, FontInfo const & f);
+
 
 ///
 inline