Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

diff --git a/python/convertrules.py b/python/convertrules.py
index 28577d9140fb58af1b372060d4b890956d59e804..5a4bbe0c6b9c674ba674972cd7530045aaa95c09 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3064,4 +3064,29 @@ def conv (str):
                           "\t(format-metronome-markup text dur count context)\n")
     return str
 
-conversions.append (((2, 11, 50), conv, """metronomeMarkFormatter uses text markup as second argument"""))
\ No newline at end of file
+conversions.append (((2, 11, 50), conv, """metronomeMarkFormatter uses text markup as second argument"""))
+
+
+def conv (str):
+    fret_props = ['barre-type', 
+                'dot-color', 
+                'dot-radius',
+                'finger-code',
+                'fret-count',
+                'label-dir',
+                'number-type',
+                'string-count',
+                'xo-font-magnification',
+                'mute-string',
+                'open-string',
+                'orientation']
+    for prop in fret_props:
+      if re.search ( prop, str):
+          stderr_write ('\n')
+          stderr_write (NOT_SMART %
+            prop + " in fret-diagram properties. Use fret-diagram-details.")
+          stderr_write ('\n')
+    return str
+
+conversions.append (((2, 11, 50), conv, """Fret diagram properties moved to fret-diagram-details"""))
+