From: David Kastrup Date: Fri, 27 Dec 2013 17:29:20 +0000 (+0100) Subject: Match python/convertrules.py versions to that of stable branch. X-Git-Tag: release/2.19.0-1~31 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a37cf04dba2b26005255c60f22d6958e90fdb354;p=lilypond.git Match python/convertrules.py versions to that of stable branch. This became necessary due to cherry-picking the following into stable: convert-ly rule for new make-relative semantics accepting music arguments This only works when the "reference pitch" is the first or last of the list. No attempt is made to rewind the version numbers of already converted files from 2.19.0 to 2.17.97. --- diff --git a/python/convertrules.py b/python/convertrules.py index 8c472a63e0..28c27fb8b8 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -3683,7 +3683,7 @@ def conv(str): str = re.sub ("New_dynamic_engraver", "Dynamic_engraver", str) return str -@rule ((2, 19, 0), r'''(make-relative (a b) b ...) -> make-relative (a b) #{ a b #}...''') +@rule ((2, 17, 97), r'''(make-relative (a b) b ...) -> make-relative (a b) #{ a b #}...''') def conv (str): str = re.sub (r"(\(make-relative\s+\(\s*(([A-Za-z][-_A-Za-z0-9]*)" + r"(?:\s+[A-Za-z][-_A-Za-z0-9]*)*)\s*\)\s*)\3(?=\s)",