From 9c64210c443d35c13942c8dcc3b809bd167a862a Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 30 May 2002 22:28:53 +0000
Subject: [PATCH] tremolo fixes

---
 Documentation/topdocs/INSTALL.texi |  1 -
 VERSION                            |  4 ++--
 aclocal.m4                         |  3 ---
 lily/beam.cc                       | 13 +++++++------
 make/lilypond.redhat.spec.in       |  2 +-
 mf/GNUmakefile                     |  4 ++--
 scm/font.scm                       |  6 ++++--
 scm/grob-description.scm           |  4 +++-
 8 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index dd20f21d82..be3b0ca6d3 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -143,7 +143,6 @@ distribution supports g++ 3.x and flex.
 Check out @uref{http://www.python.org, the python website}.
 
 @item GUILE (version 1.4 or newer).
-GUILE-1.3.4 may work but is no longer supported.
 Check out
 @uref{http://www.gnu.org/software/guile/guile.html,the GUILE webpage}.
 
diff --git a/VERSION b/VERSION
index 713b7065e1..eb707ebb2e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=58
-MY_PATCH_LEVEL=hjj1
+PATCH_LEVEL=59
+MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/aclocal.m4 b/aclocal.m4
index 3714dce0a0..2aca44bed3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,4 @@
 dnl aclocal.m4   -*-shell-script-*-
-dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
 
diff --git a/lily/beam.cc b/lily/beam.cc
index 59deeb40f4..465dba5254 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1011,17 +1011,20 @@ Beam::calc_stem_y (Grob *me, Grob* s, Interval pos, bool correct)
   Real interbeam = get_interbeam (me);
 
   // ugh -> use commonx
-  Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS);
+  Grob * fvs = first_visible_stem (me);
+  Grob *lvs = last_visible_stem (me);
+    
+  Real x0 = fvs ? fvs->relative_coordinate (0, X_AXIS) : 0.0;
+  Real dx = fvs ? lvs->relative_coordinate (0, X_AXIS) - x0 : 0.0;
   Real r = s->relative_coordinate (0, X_AXIS) - x0;
-  Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0;
   Real dy = pos.delta ();
   Real stem_y = (dy && dx
 		 ? r / dx
 		 * dy
 		 : 0) + pos[LEFT];
 
-  Direction first_dir = Directional_element_interface::get (first_visible_stem (me));
   Direction my_dir = Directional_element_interface::get (s);
+  Direction first_dir = fvs? Directional_element_interface::get (fvs) : my_dir;
 
   if (correct && my_dir != first_dir)
     {
@@ -1332,8 +1335,6 @@ Beam::brew_molecule (SCM smob)
   Real dydx = dy && dx ? dy/dx : 0;
 
 
-  Direction firstdir = Directional_element_interface::get ( Beam::first_visible_stem (me) );
-  
   for (int i=0; i < stems.size (); i++)
     {
       Item *item = stems[i];
@@ -1346,7 +1347,7 @@ Beam::brew_molecule (SCM smob)
       Real x = item->relative_coordinate (0, X_AXIS) - x0;
       sb.translate (Offset (x, x * dydx + pos[LEFT]));
 
-      Direction sd = Stem::get_direction (item);      
+
       mol.add_molecule (sb);
     }
   
diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 15a894d03d..26ce07e4c8 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -137,7 +137,7 @@ chkfontpath --remove=/usr/share/lilypond/pfa/
 %{_prefix}/man/man1/mup2ly.1.gz
 %{_prefix}/man/man1/pmx2ly.1.gz
 
-%{_prefix}/share/lilypond/
+%{_prefix}/share/lilypond/@TOPLEVEL_VERSION@/
 %{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
 %{_prefix}/../etc/profile.d/lilypond.*
 
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index ca60bbb4b3..b4dccfed47 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -59,7 +59,7 @@ INSTALLATION_OUT_FILES3=$(TFM_FILES)
 PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
 
 ifdef MAKE_PFA_FILES
-ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map
+ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale
 INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1
 INSTALLATION_OUT_FILES4=$(PFA_FILES) $(outdir)/fonts.scale
 
@@ -88,5 +88,5 @@ local-clean:
 	rm -f mfplain.mem mfplain.log 
 	rm -f *.tfm *.log
 
-pfa: $(PFA_FILES) 
+pfa: $(PFA_FILES)  
 
diff --git a/scm/font.scm b/scm/font.scm
index 1c17dd63f3..64b320ce6e 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -90,8 +90,10 @@
     ((-2 medium italic roman 7) . "cmti8")
     ((-3 medium italic roman 7) . "cmti7")    
 
-    ((4 bold upright roman 17) . "cmbx17")
-    ((3 bold upright roman 17) . "cmbx17")
+    ;;; cmbx17 is sauter, not commonly available as Type1.
+    ((4 bold upright roman 17) . "cmr17") 
+    ((3 bold upright roman 17) . "cmr17")
+    
     ((2 bold upright roman 14) . "cmbx14")
     ((1 bold upright roman 12) . "cmbx12")
     ((0 bold upright roman 10) . "cmbx10")
diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index b6c95fd76b..9d6f5587ad 100644
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -242,7 +242,9 @@
 			  (thickness . 0.48)
 			  (break-align-symbol . staff-bar)
 			  (visibility-lambda . ,begin-of-line-invisible)
-			  (meta . ((interfaces . (font-interface percent-repeat-interface))))
+			  (meta . ((interfaces . (font-interface
+						  break-aligned-interface
+						  percent-repeat-interface))))
 			 ))
 
     (DynamicText
-- 
2.39.5