Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:

	lily/tuplet-engraver.cc

diff --git a/buildscripts/catmidi.py b/buildscripts/catmidi.py
new file mode 100644 (file)
index 0000000..c90d602
--- /dev/null
+++ b/buildscripts/catmidi.py
@@ -0,0 +1,12 @@
+#!@PYTHON@
+
+import sys
+import midi
+
+(h,tracks) = midi.parse (open (sys.argv[1]).read ())
+
+tracks = tracks[1:]
+
+for t in tracks:
+    for e in t:
+        print e

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 9916dd15af5cce2646ceb34cdc2164c30cc20bf0..da4bc4ff6e37b543f6132b3e0fc87dd4504353e4 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -119,7 +119,7 @@ Audio_span_dynamic::render ()
   
   Real start_v = dynamics_[0]->volume_;
   if (dynamics_.back ()->volume_ < 0)
-    dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * 0.25, 1.0), 0.0);
+    dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * 0.25, 1.0), 0.1);
 
   delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_;
 

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 47abca1ead515d9d363639d3cb2f005cb0e8daf7..9b8f366843404336f72ea36da38b1714f85c28f1 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -149,7 +149,6 @@ Dynamic_performer::stop_translation_timestep ()
       finished_span_dynamic_->render ();
       finished_span_dynamic_ = 0;
     }
-
   
   if (absolute_ && absolute_->volume_ < 0)
     {

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 727b41bf026e575db1127dc8452940abf01eebd2..888f5ccb81a133c148966d84d39689f59e016c4f 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -215,8 +215,9 @@ Tuplet_engraver::Tuplet_engraver ()
 
 ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
+
                /* doc */
-               "Catch @ref{TupletSpanEvent} and generate appropriate bracket.",
+               "Catch tuplet events and generate appropriate bracket.",
                
                /* create */
                "TupletBracket "