From: Georg Baum <baum@lyx.org>
Date: Mon, 20 Jun 2016 18:19:24 +0000 (+0200)
Subject: Skip paragraph parameters for dash conversion
X-Git-Tag: 2.2.1~105
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=380475f4dbcccccf1c22f3b411145c5446e16f60;p=features.git

Skip paragraph parameters for dash conversion

Some of them are directly passed to LaTeX, but for all of them a token
\twohyphens or \threehyphens is not valid. This fixes bug #10243.
---

diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index d969179652..6567eb4969 100644
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -632,6 +632,10 @@ def convert_dashes(document):
             else:
                 i = j
             continue
+        if len(words) > 0 and words[0] in ["\\leftindent", "\\paragraph_spacing", "\\align", "\\labelwidthstring"]:
+            # skip paragraph parameters (bug 10243)
+            i += 1
+            continue
         while True:
             j = document.body[i].find("--")
             if j == -1:
diff --git a/status.22x b/status.22x
index 383c6b2705..5054193f54 100644
--- a/status.22x
+++ b/status.22x
@@ -72,6 +72,8 @@ What's new
 
 * LYX2LYX
 
+- Fix paragraph argument conversion for \labelwidthstring etc (bug 10243).
+
 
 
 * USER INTERFACE