Merge branch 'master' into biblatex2

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

diff --git a/src/tex2lyx/Context.h b/src/tex2lyx/Context.h
index 0ed5f59b2fa315be5be2ab52ec7413f5de46c044..ad95f02b0b8bd374be5b90532146e9faeb2f468f 100644 (file)
--- a/src/tex2lyx/Context.h
+++ b/src/tex2lyx/Context.h
@@ -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;