Remove wmf2eps as EMF > EPS converter

[lyx.git] / src / tex2lyx / Context.h

diff --git a/src/tex2lyx/Context.h b/src/tex2lyx/Context.h
index ccd9c0541b3b91790ee2925060f72aa587fc303c..b88a921f33e6c0ac8466e6912cd56c18d8bf5aa0 100644 (file)
--- a/src/tex2lyx/Context.h
+++ b/src/tex2lyx/Context.h
@@ -40,7 +40,7 @@ public:
                family = "default";
                series = "default";
                shape = "default";
-               language = "default";
+               language = "english";
        }
        std::string size;
        std::string family;
@@ -82,7 +82,7 @@ public:
                TeX2LyXDocClass const & textclass_,
                Layout const * layout_ = 0,
                Layout const * parent_layout_= 0,
-               TeXFont font_ = TeXFont());
+               TeXFont const & font_ = normalfont);
        ~Context();
 
        /// Output a \\begin_layout if requested
@@ -113,7 +113,7 @@ public:
        /// Add extra stuff if not already there
        void add_extra_stuff(std::string const &);
 
-       /*! 
+       /*!
         *  Add paragraph-level extra stuff if not already there. This
         *  will be reset at the next check_layout()
         */
@@ -146,6 +146,8 @@ public:
         * would not work.
         */
        bool new_layout_allowed;
+       /// May -- be converted to endash and --- to emdash?
+       bool merging_hyphens_allowed;
        /// Did we output anything yet in any context?
        static bool empty;