]> git.donarmstrong.com Git - lilypond.git/commit
Fix #1205.
authorNeil Puttock <n.puttock@gmail.com>
Wed, 9 Feb 2011 22:27:06 +0000 (22:27 +0000)
committerNeil Puttock <n.puttock@gmail.com>
Wed, 9 Feb 2011 22:27:06 +0000 (22:27 +0000)
commit266e143bd34a6cf92298b9af4ced3e4dd87872e4
tree41812a0dbfbb8b47dfdc0838c24f48ddba1d4fe4
parentb06a191bce264a37ba5d2f76ed07b2dc9345f826
Fix #1205.

Reinstate an event for \tempo, instead of relying on context property changes.

* input/regression/metronome-range.ly, metronome-text.ly:

  replace explicit tempo changes using context props with exported events

* lily/metronome-engraver.cc:

  listen to TempoChangeEvent; set as cause for MetronomeMark; pass to metronomeMarkFormatter
  proc instead of explicit text, duration and count

* lily/parser.yy (tempo_event):

  simplify rule; use single constructor for all types

* scm/define-context-properties.scm (all-user-translation-properties):

  emend metronomeMarkFormatter description
  remove tempoUnitCount, tempoUnitDuration and tempoText definitions

* scm/define-event-classes.scm (event-classes):

  add tempo-change-event

* scm/define-music-display-methods.scm:

  rework display method for \tempo

* scm/define-music-properties.scm (all-music-properties):

  change type predicate for 'metronome-count

* scm/define-music-types.scm (music-descriptions):

  add TempoChangeEvent definition

* scm/ly-syntax-constructors.scm:

  rework `tempo' constructor; use for all \tempo styles
  remove `tempoText'

* scm/song.scm (tempo->beats):

  extract tempo from TempoChangeEvent

* scm/translation-functions.scm (format-metronome-markup):

  read tempo properties from event instead of passing as separate args
12 files changed:
input/regression/metronome-range.ly
input/regression/metronome-text.ly
lily/metronome-engraver.cc
lily/parser.yy
scm/define-context-properties.scm
scm/define-event-classes.scm
scm/define-music-display-methods.scm
scm/define-music-properties.scm
scm/define-music-types.scm
scm/ly-syntax-constructors.scm
scm/song.scm
scm/translation-functions.scm