tremolo fixes

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index dd20f21d820e0d75c8c3f7ee11a57d31afc12a95..be3b0ca6d326684f0543d165030515f25bb85aac 100644 (file)
--- 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 713b7065e1d08654c9215689e1e5a759490911b9..eb707ebb2e329de993c308a16e7b9fd95d5f6c55 100644 (file)
--- 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 3714dce0a0890abfbbecdf2a5d31bce157176177..2aca44bed32961f7205e95c94f4abaf765be37aa 100644 (file)
--- 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 59deeb40f48b6b3b45da5b36df4c64c49f24693e..465dba52541d837b1b196ed69a6c58737062d33e 100644 (file)
--- 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 15a894d03d7989a8c7a07e6038c5b08f327c2314..26ce07e4c864087a1becd470b6915940bc214371 100644 (file)
--- 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 ca60bbb4b3bb0579cf9bfd96e2e4b930619eb047..b4dccfed47056aeeca03c0e28ce2564e97aa57a6 100644 (file)
--- 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 1c17dd63f333fc37b2079df1c399935ff9359ea3..64b320ce6e6526a3c65a71918308b6998065b03d 100644 (file)
--- 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 b6c95fd76b9e8b03de5f013c473e710fc974c177..9d6f5587ad8638e3020f596bfb1996231206624d 100644 (file)
--- 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