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

diff --cc Documentation/user/keyboards.itely
Simple merge

diff --cc python/convertrules.py
index 9703e8c9895485ac81739f7a36a2c874ae6ff23e,8e0a77ce35bcf360f1fc16333276e7d049e1ddb8..fb62f925412d80ccaa8aa3d2573de73b5b6e72b4
--- 1/python/convertrules.py
--- 2/python/convertrules.py
+++ b/python/convertrules.py
@@@ -3088,95 -2757,9 +2757,99 @@@ def conv (str)
            stderr_write ('\n')
      return str
  
- conversions.append (((2, 11, 50), conv, """Fret diagram properties moved to fret-diagram-details"""))
+ @rule ((2, 11, 51), "\\octave -> \\octaveCheck")
+ def conv (str):
+     str = re.sub (r"\\octave", r"\\octaveCheck", str)
+     return str
+ 
  
 +
 +def conv (str):
 +  str = re.sub (r"arpeggioUp", r"arpeggioArrowUp", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\arpeggioUp -> \\arpeggioArrowUp"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"arpeggioDown", r"arpeggioArrowDown", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\arpeggioDown -> \\arpeggioArrowDown"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"arpeggioNeutral", r"arpeggioNormal", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\arpeggioNeutral -> \\arpeggioNormal"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"setTextCresc", r"crescTextCresc", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\setTextCresc -> \\crescTextCresc"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"setTextDecresc", r"dimTextDecresc", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\setTextDecresc -> \\dimTextDecresc"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"setTextDecr", r"dimTextDecr", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\setTextDecr -> \\dimTextDecr"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"setTextDim", r"dimTextDim", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\setTextDim -> \\dimTextDim"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"setHairpinCresc", r"crescHairpin", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\setHairpinCresc -> \\crescHairpin"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"setHairpinDecresc", r"dimHairpin", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\setHairpinDecresc -> \\dimHairpin"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"sustainUp", r"sustainOff", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\sustainUp -> \\sustainOff"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"sustainDown", r"sustainOn", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\sustainDown -> \\sustainOn"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"sostenutoDown", r"sostenutoOn", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\sostenutoDown -> \\sostenutoOn"""))
 +
 +
 +def conv (str):
 +  str = re.sub (r"sostenutoUp", r"sostenutoOff", str)
 +  return str
 +
 +conversions.append (((2, 11, 51), conv, """\\sostenutoUp -> \\sostenutoOff"""))