Remove wmf2eps as EMF > EPS converter

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

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index 6de70f9c1f3b5d2c81c51ac0b4995d5fe88eace8..61685180bdd074b1f5e7f38e8b464f31432d85bc 100644 (file)
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -41,7 +41,7 @@ void end_deeper(ostream & os)
        os << "\n\\end_deeper";
 }
 
-}
+} // namespace
 
 
 bool operator==(TeXFont const & f1, TeXFont const & f2)
@@ -78,11 +78,12 @@ bool Context::empty = true;
 Context::Context(bool need_layout_,
                 TeX2LyXDocClass const & textclass_,
                 Layout const * layout_, Layout const * parent_layout_,
-                TeXFont font_)
+                TeXFont const & font_)
        : need_layout(need_layout_),
          need_end_layout(false), need_end_deeper(false),
          has_item(false), deeper_paragraph(false),
-         new_layout_allowed(true), textclass(textclass_),
+         new_layout_allowed(true), merging_hyphens_allowed(true),
+         textclass(textclass_),
          layout(layout_), parent_layout(parent_layout_),
          font(font_)
 {
@@ -240,6 +241,8 @@ void Context::dump(ostream & os, string const & desc) const
                os << "deeper_paragraph ";
        if (new_layout_allowed)
                os << "new_layout_allowed ";
+       if (merging_hyphens_allowed)
+               os << "merging_hyphens_allowed ";
        if (!extra_stuff.empty())
                os << "extrastuff=[" << extra_stuff << "] ";
        if (!par_extra_stuff.empty())