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

diff --combined scripts/musicxml2ly.py
index b4563615a4c36211b9637b0f36fe9b618176856d,6d77d043920cbe702dc2a1ef091cd164f14718f6..14c09dadbded444d28d8077e1d695c70481af767
--- 1/scripts/musicxml2ly.py
--- 2/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@@ -756,11 -756,13 +756,13 @@@ def musicxml_spanner_to_lily_event (mxl
      return ev
  
  def musicxml_direction_to_indicator (direction):
-     return { "above": 1, "upright": 1, "up":1, "below": -1, "downright": -1, "down": -1 }.get (direction, 0)
+     return { "above": 1, "upright": 1, "up":1, "below": -1, "downright": -1, "down": -1, "inverted": -1 }.get (direction, 0)
  
  def musicxml_fermata_to_lily_event (mxl_event):
      ev = musicexp.ArticulationEvent ()
-     ev.type = "fermata"
+     txt = mxl_event.get_text ()
+     # The contents of the element defined the shape, possible are normal, angled and square
+     ev.type = { "angled": "shortfermata", "square": "longfermata" }.get (txt, "fermata")
      if hasattr (mxl_event, 'type'):
        dir = musicxml_direction_to_indicator (mxl_event.type)
        if dir and options.convert_directions:
@@@ -776,9 -778,9 +778,9 @@@ def musicxml_tremolo_to_lily_event (mxl
      ev = musicexp.TremoloEvent ()
      txt = mxl_event.get_text ()
      if txt:
-       ev.bars = mxl_event.get_text ()
+       ev.bars = txt
      else:
-       ev.bars = "3"
+       ev.bars = "3"
      return ev
  
  def musicxml_falloff_to_lily_event (mxl_event):
@@@ -885,7 -887,7 +887,7 @@@ articulations_dict = 
      "strong-accent": (musicexp.ShortArticulationEvent, "^"), # or "marcato"
      #"tap": "",
      "tenuto": (musicexp.ShortArticulationEvent, "-"), # or "tenuto"
 -    #"thumb-position": "",
 +    "thumb-position": "thumb",
      #"toe": "",
      "turn": "turn",
      "tremolo": musicxml_tremolo_to_lily_event,