From 3daaf5e7a27834e38c51ee14b5918decd0d974b4 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 23 Dec 2005 19:07:41 +0000
Subject: [PATCH] * Documentation/topdocs/NEWS.tely (Top): document new
 feature.

* input/regression/stem-direction-context.ly: new file.

* lily/relocate.cc (set_relocation): add PANGO_PREFIX

* lily/melody-spanner.cc (calc_neutral_stem_direction):

* lily/melody-spanner.cc: new file. Interpolate stem directions.

* lily/slur-engraver.cc (acknowledge_extra_object): remove
DynamicText hardcoding.
---
 ChangeLog                                  |  6 ++++++
 Documentation/topdocs/NEWS.tely            | 12 ++++++++++--
 THANKS                                     |  3 +++
 input/regression/stem-direction-context.ly | 17 +++++++++++++++++
 lily/melody-spanner.cc                     |  4 +++-
 lily/relocate.cc                           |  2 ++
 lily/tie.cc                                |  2 ++
 lily/tuplet-bracket.cc                     |  7 -------
 8 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 input/regression/stem-direction-context.ly

diff --git a/ChangeLog b/ChangeLog
index 4a188a14db..ee5493c6b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-12-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* Documentation/topdocs/NEWS.tely (Top): document new feature.
+
+	* input/regression/stem-direction-context.ly: new file.
+
+	* lily/relocate.cc (set_relocation): add PANGO_PREFIX
+
 	* lily/melody-engraver.cc (acknowledge_stem): restart MelodyItem
 	on rest.
 
diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 9e96c15152..6ef9fdc353 100644
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -48,9 +48,17 @@ This document is also available in @uref{NEWS.pdf,PDF}.
 @item
 Stem direction on the center staff line are now interpolated between
 neighbors. This results in less stem direction changes, leading to a
-more even typography. For example,
+more even appearance. For example,
 
- 
+@lilypond[raggedright]
+\relative c'' {
+  c4 b c b
+  c c c r
+  b a b a
+}
+@end lilypond 
+
+This feature was sponsored by Mike Rolish and Basil Crow.
 
 @item
 Slurs now avoid @code{TupletNumber}s, and tuplet numbers may enter the
diff --git a/THANKS b/THANKS
index ecb68c0397..cfec48ece7 100644
--- a/THANKS
+++ b/THANKS
@@ -24,7 +24,9 @@ Yoshinobu Ishizaki
 
 SPONSORS
 
+
 Aaron Mehl
+Basil Crow
 Bertalan Fodor
 Christian Ebert
 Henrik Frisk
@@ -35,6 +37,7 @@ D. Josiah Boothby
 Kieren MacMillan
 Kris Shaffer
 Mark van den Borre
+Mike Rolish 
 Nancho Alvarez
 Nicolas Sceaux
 Sean Reed
diff --git a/input/regression/stem-direction-context.ly b/input/regression/stem-direction-context.ly
new file mode 100644
index 0000000000..79f56305f5
--- /dev/null
+++ b/input/regression/stem-direction-context.ly
@@ -0,0 +1,17 @@
+\header {
+
+  texidoc = "Stem directions for notes on the middle staff line are
+  determined by the directions of their neighbors."
+
+}
+
+\version "2.7.25"
+
+
+\relative c'' \new Voice {
+  c4 b c b
+  c c c r
+  b a b a
+} 
+  
+  
diff --git a/lily/melody-spanner.cc b/lily/melody-spanner.cc
index d5cb6007ff..542b0328dd 100644
--- a/lily/melody-spanner.cc
+++ b/lily/melody-spanner.cc
@@ -26,7 +26,9 @@ Melody_spanner::calc_neutral_stem_direction (SCM smob)
 {
   Grob *stem = unsmob_grob (smob);
   Grob *me =  unsmob_grob (stem->get_object ("melody-spanner"));
-
+  if (!me || !me->is_live ())
+    return SCM_UNSPECIFIED;
+  
   extract_grob_set (me, "stems", stems);
 
   Array<Direction> dirs;
diff --git a/lily/relocate.cc b/lily/relocate.cc
index 39abfc74d7..1530e65726 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -126,6 +126,8 @@ set_relocation (String bindir, String prefix)
 		    + to_string ("/guile/%d.%d",
 				 SCM_MAJOR_VERSION, SCM_MINOR_VERSION));
   set_env_file ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc");
+  set_env_file ("PANGO_PREFIX", prefix);
+		
   prepend_env_path ("PATH", bindir);
 }
 
diff --git a/lily/tie.cc b/lily/tie.cc
index 05da06fb82..76d1b65b36 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -245,6 +245,7 @@ ADD_INTERFACE (Tie,
 	       
 
 	       /* properties */
+	       "avoid-slur " 	//  UGH.
 	       "control-points "
 	       "dash-fraction "
 	       "dash-period "
@@ -255,3 +256,4 @@ ADD_INTERFACE (Tie,
 
 
 
+
diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index cd27c28d61..d4a120ca5b 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -626,13 +626,6 @@ Tuplet_bracket::calc_positions (SCM smob)
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "note-columns", columns);
 
-  if (columns.is_empty())
-    {
-      me->suicide ();
-      return scm_cons (scm_from_double (0),
-		       scm_from_double (0));
-    }
-  
   Direction dir = get_grob_direction (me);
   bool equally_long = false;
   Grob *par_beam = parallel_beam (me, columns, &equally_long);
-- 
2.39.2