From: David Kastrup <dak@gnu.org>
Date: Tue, 15 Mar 2016 12:50:05 +0000 (+0100)
Subject: Issue 4803: Amend convert-ly 2.17.6 rules for \tweak
X-Git-Tag: release/2.19.39-1~5^2~7
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=a80794699ca0f3f9b79ce76dbfe2c79269a102fe

Issue 4803: Amend convert-ly 2.17.6 rules for \tweak

Double application was problematic.  Since grob properties start with
lowercase letters or X or Y while grob names start with A-W, it can be
reliably avoided to do the incorrect double conversion

    \tweak #'style #'none ...
    -> \tweak style #'none ...
    -> \tweak style.none ...
---

diff --git a/python/convertrules.py b/python/convertrules.py
index 3c9caad397..9de1256783 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3468,9 +3468,9 @@ def conv (str):
                   r"\1\2.\3", str)
     str = re.sub (r'''(\\(?:alterBroken|overrideProperty)\s+)#?"([A-Za-z]+)\s*\.\s*([A-Za-z]+)"''',
                   r"\1\2.\3", str)
-    str = re.sub (r'''(\\tweak\s+)#?"?([A-Za-z]+)"?\s+?#'([-A-Za-z]+)''',
+    str = re.sub (r'''(\\tweak\s+)#?"?([A-W][A-Za-z]*)"?\s+?#'([a-zX-Z][-A-Za-z]*)''',
                   r"\1\2.\3", str)
-    str = re.sub (r'''(\\tweak\s+)#'([-A-Za-z]+)''',
+    str = re.sub (r'''(\\tweak\s+)#'([a-zX-Z][-A-Za-z]*)''',
                   r"\1\2", str)
     str = re.sub ("(" + matchmarkup + ")|"
                   + r"(\\footnote(?:\s*"