From: David Kastrup <dak@gnu.org>
Date: Sun, 17 May 2015 22:02:12 +0000 (+0200)
Subject: Revert "Issue 3229: Prefer \relative { ... } over \relative x'' { ... }"
X-Git-Tag: release/2.19.21-1~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c46d53772b63822bfefa08ce4e1d8ee4a4c0aeb2;p=lilypond.git

Revert "Issue 3229: Prefer \relative { ... } over \relative x'' { ... }"

This reverts commit 94644b3a701073c99eabb88d95b20cd3f3ac5af0.
---

diff --git a/python/convertrules.py b/python/convertrules.py
index 64356fa1f1..8dc8e9160a 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3743,38 +3743,6 @@ def conv(str):
                   + after_id, r'\1-\2', str)
     return str
 
-@rule ((2, 19, 21), r"""\relative x''' { y ... -> \relative { z''' ...""")
-def conv(str):
-    # If the file contains a language switch to a language where the
-    # name of c is not "c", we can't reliably convert.
-    m = re.search (r'\\language\s(?!\s*#?"(?:nederlands|deutsch|english|norsk|suomi|svenska))"', str)
-    if True: # not m:
-        def subst(m):
-            oct = (len (re.findall ("'", m.group (1) + m.group (4)))
-                      - len (re.findall (",", m.group (1) + m.group (4))))
-            if (re.search (m.group (1)[0] + r".{7,}" + m.group (3)[0],
-                          "c d e f g a bh")):
-                oct = oct - 1
-            elif (re.search (m.group (3)[0] + r".{7,}" + m.group (1)[0],
-                            "c d e f g a bh")):
-                oct = oct + 1
-            return m.expand (r"\\relative\2\3" + oct * "'" + (-oct) * ",")
-        str = re.sub (r"\\relative\s+([a-z]+[',]*)"
-                      + r"(\s+(?:@?\{|<<?|"
-                      + r"\\(?:new|context)\s+[a-zA-Z]+(?:\s*=\s*"
-                      + matchstring + r")?\s)"
-                      + r"(?:@?\{|<<?|\s|"
-                      + r"%.*\n|"
-                      + r"\\(?:new|context)\s+[a-zA-Z]+(?:\s*=\s*"
-                      + matchstring + r")?\s|"
-                      + r"\\clef\s+(?:[a-z]+\s|" + matchstring + ")|"
-                      + r"\\key\s+[a-z]+\s*\\[a-z]+\s|"
-                      + r"\\time\s+[0-9]+/[0-9]+\s|"
-                      + r"\||[rsR](?:[0-9]+\.*(?:\*[0-9]+)?)?"
-                      + r")*)([a-h][a-z]*)([',]*)",
-                      subst, str)
-    return str
-
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,