lilypond-1.5.35

diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely
index 208904fae8b7bbd0cc1d36ffa749f365f9199011..100d39fc95711a03479053cceea18778ba950ae1 100644 (file)
--- a/Documentation/regression-test.tely
+++ b/Documentation/regression-test.tely
@@ -88,15 +88,17 @@ Accidentals are currently in a development stage.
 @section Chord names
 
 @lilypondfile[printfilename]{chord-names.ly}
+
 @lilypondfile[printfilename]{chord-changes.ly}
 
+@section Figured bass
 
+@lilypondfile[printfilename]{figured-bass.ly}
 
 @section Grace notes
 
 Grace note do weird things with timing. Fragile.
 
-
 @lilypondfile[printfilename]{grace.ly}
 
 @lilypondfile[printfilename]{grace-bar-line.ly}
@@ -108,6 +110,7 @@ Grace note do weird things with timing. Fragile.
 @lilypondfile[printfilename]{grace-nest4.ly}
 
 @lilypondfile[printfilename]{grace-nest5.ly}
+
 @lilypondfile[printfilename]{grace-nest1.ly}
 
 @lilypondfile[printfilename]{grace-start.ly}
@@ -125,8 +128,11 @@ Grace note do weird things with timing. Fragile.
 
 @lilypondfile[printfilename]{beam-position.ly}
 
+
 @lilypondfile[printfilename]{auto-beam-bar.ly}
 
+@lilypondfile[printfilename]{beam-over-barline.ly}
+
 @lilypondfile[printfilename]{beam-rest.ly}
 
 @lilypondfile[printfilename]{beam-length.ly}
@@ -139,6 +145,7 @@ Grace note do weird things with timing. Fragile.
 
 @lilypondfile[printfilename]{triplets.ly}
 
+@lilypondfile[printfilename]{beaming-ternary-metrum.ly}
 
 @section  Slurs 
 

diff --git a/lily/music.cc b/lily/music.cc
index b00c8519d66f1dc56a8efee83999f0e74e65118b..f2939fb4f51ddc3b15d3fe0a234a6b010fa42304 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -174,7 +174,7 @@ Music::internal_set_mus_property (SCM s, SCM v)
 {
 #ifndef NDEBUG
   if (internal_type_checking_global_b)
-    assert (type_check_assignment (s, v, ly_symbol2scm ("backend-type?")));
+    assert (type_check_assignment (s, v, ly_symbol2scm ("music-type?")));
 #endif
   
 

diff --git a/lily/scm-option.cc b/lily/scm-option.cc
index 2eac1482aca2df84441d60cfb0a720e54163d4db..e472f2878e96e70ce2892d58c92084f35edf86b7 100644 (file)
--- a/lily/scm-option.cc
+++ b/lily/scm-option.cc
@@ -11,7 +11,7 @@
 #include "string.hh"
 #include "lily-guile.hh"
 #include "scm-option.hh"
-
+#include "warn.hh"
 
 /*
   This interface to option setting is meant for setting options are
@@ -74,7 +74,7 @@ possible options for SYMBOL are :
 ")<<endl;
       
       cout << "  help (any-symbol)"<<endl; 
-      cout << "  internal-type-checks #t"<<endl; 
+      cout << "  internal-type-checking (boolean)"<<endl; 
       cout << "  midi-debug (boolean)"<<endl; 
       cout << "  testing-level (int)"<<endl; 
 
@@ -88,7 +88,7 @@ possible options for SYMBOL are :
     {
      testing_level_global = gh_scm2int (val); 
     }
-  else if (var == ly_symbol2scm ("internal-type-checks"))
+  else if (var == ly_symbol2scm ("internal-type-checking"))
     {
      internal_type_checking_global_b = to_boolean (val); 
     }
@@ -105,8 +105,12 @@ possible options for SYMBOL are :
       */
 
       ;
-      
     }
+  else
+    {
+      warning (_("Unknown internal option!"));
+    }
+  
 
   return SCM_UNSPECIFIED;
 }

diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 0753b2c245119cd06333e5b918f9348fd54a4f0e..4fd4f1a68e7b43f0903fc6c81fe9aa4213c00acb 100644 (file)
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -91,7 +91,7 @@ Span_arpeggio_engraver::stop_translation_timestep ()
            we can't kill the children, since we don't want to the
            previous note to bump into the span arpeggio; so we make
            it transparent.  */
-         arpeggios_[i]->set_grob_property ("molecule-callback", SCM_BOOL_T);
+         arpeggios_[i]->set_grob_property ("molecule-callback", SCM_EOL);
        }
       
       typeset_grob (span_arpeggio_);

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index cdf1a6b5d48ee34b695f299d46730514f0f52bbf..a23d1430a8e8fb14509dac706799b93b1f05a52c 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -137,13 +137,13 @@ Stem_engraver::stop_translation_timestep ()
       if (gh_number_p (prop))
        {
          Stem::set_beaming (stem_p_,gh_scm2int (prop),LEFT);
-         daddy_trans_l_->set_property ("stemLeftBeamCount", SCM_UNDEFINED);
+         daddy_trans_l_->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
        }
       prop = get_property ("stemRightBeamCount");
       if (gh_number_p (prop))
        {
          Stem::set_beaming (stem_p_,gh_scm2int (prop), RIGHT);
-         daddy_trans_l_->set_property ("stemRightBeamCount", SCM_UNDEFINED);
+         daddy_trans_l_->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
 
       

diff --git a/lily/third-try.cc b/lily/third-try.cc
index 2690c877c7601f53c71072dce133325ac51dc9dd..c91e3fd69722600ae730ae5dbbc1b33290087658 100644 (file)
--- a/lily/third-try.cc
+++ b/lily/third-try.cc
@@ -287,16 +287,20 @@ Third_spacing_spanner::set_implicit_neighbor_columns (Link_array<Grob> cols)
        continue;
 
       // it->breakable || it->musical
+
+      /*
+       sloppy with typnig left/right-neighbors should take list, but paper-column found instead.
+       */
       SCM ln = cols[i] ->get_grob_property ("left-neighbors");
       if (!gh_pair_p (ln) && i ) 
        {
-         cols[i]->set_grob_property ("left-neighbors", cols[i-1]->self_scm());
+         cols[i]->set_grob_property ("left-neighbors", gh_cons (cols[i-1]->self_scm(), SCM_EOL));
        }
 
       SCM rn = cols[i] ->get_grob_property ("right-neighbors");
       if (!gh_pair_p (rn) && i < cols.size () - 1) 
        {
-         cols[i]->set_grob_property ("right-neighbors", cols[i + 1]->self_scm());
+         cols[i]->set_grob_property ("right-neighbors", gh_cons (cols[i + 1]->self_scm(), SCM_EOL));
        }
     }
 }

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 48384af09fef845392f862794aabd20f2c155487..fe46960c4eb1898124280f3c6bf7985e7e8ef252 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -306,7 +306,7 @@ Translator_group::internal_set_property (SCM sym, SCM val)
 {
 #ifndef NDEBUG
   if (internal_type_checking_global_b)
-    assert (type_check_assignment (sym, val, ly_symbol2scm ("backend-type?")));
+    assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")));
 #endif
   
   properties_dict ()->set (sym, val);

diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm
index b64817cf6147a7b34536c85e6fa83e568ec8cc6e..280fba7f6705b94ed4187bcaf2133e5c4d29f37f 100644 (file)
--- a/scm/grob-property-description.scm
+++ b/scm/grob-property-description.scm
@@ -432,3 +432,7 @@ function of type (beam multiplicity dy staff-line-thickness) -> real.  Default v
 (grob-property-description 'script-molecule pair? "index code for script.")
 
 (grob-property-description 'accidentals-grob ly-grob? "accidentals for this note.")
+
+(grob-property-description 'causes list? "list of cause objects.")
+(grob-property-description 'tremolo-flags number? "")
+(grob-property-description 'chord-tremolo boolean? "if set, this beam is a tremolo. TODO: use interface for this!")