*** empty log message ***

diff --git a/THANKS b/THANKS
index 8e997dc8820056014cf38b5aa98c5cc51e90e766..ec17d8d488e5552919488b56fb195a6426ce0cd8 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -72,6 +72,7 @@ Sean Reed
 Steven Weber
 Sven Axelsson
 Thomas Bushnell BSG
+Trent Johnston
 Trevor Bača
 Vicente Solsona Dellá
 Vincenzo Colonnella

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 455152ec25750c3d1987d116d5626e10bb49ec35..f201ee01f754665b92e2dfabec201bdbac2bda2c 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -97,7 +97,8 @@ void
 Figured_bass_engraver::stop_translation_timestep ()
 {
   if (groups_.is_empty ()
-      || now_mom ().main_part_ < stop_moment_.main_part_)
+      || now_mom ().main_part_ < stop_moment_.main_part_
+      || now_mom ().grace_part_ < Rational (0))
     return ;
   
   bool found = false;
@@ -119,7 +120,8 @@ Figured_bass_engraver::Figured_bass_engraver ()
 void
 Figured_bass_engraver::start_translation_timestep ()
 {
-  if (now_mom ().main_part_ < stop_moment_.main_part_)
+  if (now_mom ().main_part_ < stop_moment_.main_part_
+      || now_mom ().grace_part_ < Rational (0))
     return ;
   
   rest_event_ = 0;

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 400dd9713a42f220a705767dd6126857e88351f7..ab19c15abce1a858694f536a5dc0cc4718df5fe2 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -110,7 +110,8 @@ Tuplet_bracket::print (SCM smob)
   Stencil mol;
   extract_grob_set (me, "note-columns", columns);
 
-  Drul_array<Real> positions = ly_scm2realdrul (me->get_property ("positions"));
+  Drul_array<Real> positions
+    = ly_scm2realdrul (me->get_property ("positions"));
   Real dy = positions[RIGHT] - positions[LEFT];
   bool equally_long = false;
   Grob *par_beam = parallel_beam (me, columns, &equally_long);

diff --git a/scm/script.scm b/scm/script.scm
index e86b777bc47b482325c1da62c1649302a1db2086..73c4e58b4056b2b3ac7a9c6fc2f0936e5fdc684f 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -81,7 +81,6 @@
         ("staccato" .
          ((script-stencil . (feta . ("staccato" . "staccato")))
           (side-relative-direction .  -1)
-          
           (quantize-position . #t)
           (avoid-slur . inside) 
           (script-priority . -100)))