Do not replace "--" with "\twohyphens" in formula macros.

(cherry picked from commit 5cb5d2cb5a5c369cabcb784899f4a00c7eaf6aa3)

diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index 6567eb4969570f0f5205b36b599fe58894b8fe2c..20b0199725dda0445ec4e1832e6de3ea50ef49bc 100644 (file)
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -620,7 +620,7 @@ def convert_dashes(document):
     while i < len(document.body):
         words = document.body[i].split()
         if len(words) > 1 and words[0] == "\\begin_inset" and \
-           words[1] in ["CommandInset", "ERT", "External", "Formula", "Graphics", "IPA", "listings"]:
+           words[1] in ["CommandInset", "ERT", "External", "Formula", "FormulaMacro", "Graphics", "IPA", "listings"]:
             # must not replace anything in insets that store LaTeX contents in .lyx files
             # (math and command insets withut overridden read() and write() methods
             # filtering out IPA makes Text::readParToken() more simple

diff --git a/status.22x b/status.22x
index 46887eeb5ece074f18e3bdc6244213ac66591333..a9f1fb22cd78743e1e764f53262ef5af501519d0 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -124,6 +124,7 @@ What's new
 
 * LYX2LYX
 
+- Do not convert "--" to "\twohyphens" in formula macros.
 
 
 * USER INTERFACE