From: Richard Heck <rgheck@lyx.org>
Date: Thu, 19 Jan 2017 02:47:40 +0000 (-0500)
Subject: Do not replace "--" with "\twohyphens" in formula macros.
X-Git-Tag: 2.2.3~87
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=dc7a5ecea1e905880675b8e1a0647d5a1ee546dd;p=features.git

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 6567eb4969..20b0199725 100644
--- 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 46887eeb5e..a9f1fb22cd 100644
--- a/status.22x
+++ b/status.22x
@@ -124,6 +124,7 @@ What's new
 
 * LYX2LYX
 
+- Do not convert "--" to "\twohyphens" in formula macros.
 
 
 * USER INTERFACE