Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index adb25053642eff1198a7bcbc4331c4c2c304c759..5dc3a2c24e1eb27d89fcdb6b5005a4f57032c994 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,11 +1,7 @@
-\version "2.7.39"
+\version "2.9.29"
 \header {
   texidoc =
-
-  "If @code{merge-differently-headed} is enabled, then
-open note heads may be merged with black noteheads, but only
-if the black note heads are from 8th or shorter notes.
-"
+  "Open and black note heads are not merged by default."
   
 }
 
@@ -15,15 +11,8 @@ if the black note heads are from 8th or shorter notes.
 \context Staff  \relative c'' <<
   {
     c2 c8 c4.
-    
-    \override Staff.NoteCollision  #'merge-differently-headed = ##t
-    c2 c8 c4.
-    c2
   }\\
   {
     c8 c4. c2
-    
-    c8 c4. c2
-    c4
   }
 >>

diff --git a/input/regression/collision-merge-differently-headed.ly b/input/regression/collision-merge-differently-headed.ly
new file mode 100644 (file)
index 0000000..62e6e6b
--- /dev/null
+++ b/input/regression/collision-merge-differently-headed.ly
@@ -0,0 +1,25 @@
+\version "2.7.39"
+\header {
+  texidoc =
+
+  "If @code{merge-differently-headed} is enabled, then
+open note heads may be merged with black noteheads, but only
+if the black note heads are from 8th or shorter notes.
+"
+  
+}
+
+\layout { ragged-right= ##t }
+
+
+\context Staff  \relative c'' <<
+  {
+    \override Staff.NoteCollision  #'merge-differently-headed = ##t
+    c2 c8 c4.
+    c2
+  }\\
+  {
+    c8 c4. c2
+    c4
+  }
+>>

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 4159cd5a32356f52be6d2d85105fee8919e83bfc..4d95f9e6c1c00fd4aab59a5b1f3e7f6e0d38f202 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -15,8 +15,6 @@
 #include "scm-hash.hh"
 #include "warn.hh"
 
-static char const *default_font_str0_ = "cmr10";
-
 All_font_metrics::All_font_metrics (string path)
 {
   otf_dict_ = new Scheme_hash_table;
@@ -158,20 +156,9 @@ All_font_metrics::find_font (string name)
 {
   Font_metric *f = find_otf (name);
 
-
-  if (!f)
-    {
-      warning (_f ("can't find font: `%s'", name.c_str ()));
-      warning (_ ("loading default font"));
-    }
-
-  string def_name = default_font_str0_;
-
   if (!f)
     {
-      error (_f ("can't find default font: `%s'", def_name.c_str ()));
-      error (_f ("(search path: `%s')", search_path_.to_string ()));
-      error (_ ("giving up"));
+      error (_f ("can't find font: `%s'", name.c_str ()));
     }
 
   return f;

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index b01f2421206f49824c1b0a348c075f63e0f21994..20ae27b01ffc6fa3e1630da61542de2698068e68 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -322,6 +322,8 @@ Spanner::fast_substitute_grob_array (SCM sym,
 
   /*
     We store items on the left, spanners on the right in this vector.
+
+    FIXME: will not multithread.
   */
   static Substitution_entry *vec;
   static int vec_room;

diff --git a/lily/cluster.cc b/lily/cluster.cc
index 6cb0060e67cc33c28f2ed624d3f03f0ee6881420..27ef9dd08a88defccd4c2bbc9f55e407b5810c97 100644 (file)
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -203,7 +203,9 @@ ADD_INTERFACE (Cluster, "cluster-interface",
               "The property @code{style} controls the shape of cluster segments.  Valid values "
               "include @code{leftsided-stairs}, @code{rightsided-stairs}, @code{centered-stairs}, "
               "and @code{ramp}.\n",
-              "style padding columns");
+              "style "
+              "padding "
+              "columns ");
 
 struct Cluster_beacon
 {

diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc
index 32ef531c14adb13494cb7a51cd96013c39b1a69a..59eb1c3a58a767ae9b20c1534e1806a6eaf7c681 100644 (file)
--- a/lily/dynamic-text-spanner.cc
+++ b/lily/dynamic-text-spanner.cc
@@ -51,7 +51,8 @@ Dynamic_text_spanner::print (SCM smob)
   Grob *me = unsmob_grob (smob);
   Spanner *spanner = dynamic_cast<Spanner *> (me);
 
-  Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
+  Grob *common = spanner->get_bound (LEFT)
+    ->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
   Output_def *layout = me->layout ();
 
   Interval span_points;

diff --git a/lily/engraver.cc b/lily/engraver.cc
index f66aff808c044ff0730682f8ab7424ea63c34b78..b61850eb2fe467a15c0295e8178b349ed2b78c52 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -98,12 +98,12 @@ LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback",
           "the grob to be created and the corresponding line number in the "
           "C++ source file.")
 {
-  if (!ly_is_procedure (cb))
-    warning (_ ("not setting creation callback: not a procedure"));
-  else
-    creation_callback = cb;
+  SCM_ASSERT_TYPE(ly_is_procedure (cb), cb, SCM_ARG1, __FUNCTION__,
+                 "procedure");
 
-  return SCM_EOL;
+  creation_callback = cb;
+
+  return SCM_UNSPECIFIED;
 }
 #endif
 

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 707f4c118aa6953604417bd039614e6cbb85e2de..f1242994d53fb696133cbedfc6e6b2bc1b9336ce 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -32,11 +32,12 @@ LY_DEFINE (ly_set_grob_modification_callback, "ly:set-grob-modification-callback
           "which the modification was requested, the property to be changed and "
           "the new value for the property.")
 {
-  if (!ly_is_procedure (cb))
-    warning (_ ("not setting modification callback: not a procedure"));
-  else
-    modification_callback = cb;
-  return SCM_EOL;
+
+  SCM_ASSERT_TYPE(ly_is_procedure (cb), cb, SCM_ARG1, __FUNCTION__,
+                 "procedure");
+
+  modification_callback = cb;
+  return SCM_UNSPECIFIED;
 }
 #endif
 

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index bce6d08a60c52dfdb3da8eb4590b6169ae51872c..ddfbf19983e14572dcf8fe4eec4baae09489cce1 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -39,6 +39,9 @@ check_meshing_chords (Grob *me,
   if (!Note_column::get_stem (cu) || !Note_column::get_stem (cd))
     return;
 
+  Drul_array<Grob*> stems (Note_column::get_stem (cd),
+                          Note_column::get_stem (cu));
+  
   Grob *nu = Note_column::first_head (cu);
   Grob *nd = Note_column::first_head (cd);
 
@@ -90,10 +93,10 @@ check_meshing_chords (Grob *me,
   /* Should never merge quarter and half notes, as this would make
      them indistinguishable.  */
   if (merge_possible
-      && ((Rhythmic_head::duration_log (nu) == 1
-          && Rhythmic_head::duration_log (nd) == 2)
-         || (Rhythmic_head::duration_log (nu) == 2
-             && Rhythmic_head::duration_log (nd) == 1)))
+      && ((Stem::duration_log (stems[UP]) == 1
+          && Stem::duration_log (stems[DOWN]) == 2)
+         || (Stem::duration_log (stems[UP]) == 2
+             && Stem::duration_log (stems[DOWN]) == 1)))
     merge_possible = false;
 
   /*
@@ -535,4 +538,4 @@ ADD_INTERFACE (Note_collision_interface, "note-collision-interface",
               /* properties */
               "merge-differently-dotted "
               "merge-differently-headed "
-              "positioning-done");
+              "positioning-done ");

diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm
index b07304e232cea1fda9d0d005a58929899d3f228b..048ac3f53b3021fa005478e3ace188f1e3fd02f4 100755 (executable)
--- a/scripts/lilypond-invoke-editor.scm
+++ b/scripts/lilypond-invoke-editor.scm
@@ -1,5 +1,4 @@
-#!@GUILE@ \
--e main -s
+#!@GUILE@ -s
 !#
 ;;;; lilypond-invoke-editor.scm -- Invoke an editor in file:line:column mode
 ;;;;
@@ -146,3 +145,4 @@ Options:
          (run-editor uri)
          (run-browser uri)))))
 
+(main (command-line))