From 9cb2babace92581a2d3025360e6c064662398026 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 23:56:17 +0000
Subject: [PATCH] lilypond-1.3.91

---
 CHANGES                                 | 22 ++++++++++++++++++++++
 Documentation/header.html.in            |  4 ++--
 NEWS                                    |  6 ++----
 VERSION                                 |  2 +-
 lily/include/side-position-interface.hh |  9 +++++++--
 lily/side-position-interface.cc         |  9 ++++-----
 6 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index dc84c63d28..79bdc9e7cd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,25 @@
+1.3.90.jcn1
+===========
+
+* Use S_ISDIR () and check for stat.h.
+
+* Various fixes for RedHat 7.0 / gcc 2.96.54
+
+* separate basic propertylist for fingerings, center them on
+noteheads.
+
+* Side_position_interface::aligned_on_self() now can take a real
+number for self-alignment-{X,Y}.
+
+* etf2ly: single line GF field.
+
+1.3.90.mb1
+===========
+
+* Added an interscorelinefill paper variable. Set to a positive number 
+  in order to stretch the inter-line spacing to fill the full pages,
+  except for the last page (where it would look really ugly).
+
 1.3.89.jcn1
 ===========
 
diff --git a/Documentation/header.html.in b/Documentation/header.html.in
index 1d72d57683..9ec9553da7 100644
--- a/Documentation/header.html.in
+++ b/Documentation/header.html.in
@@ -38,7 +38,7 @@ which substitutes some @AT_VARIABLES@ as well.
       <tr><td bgcolor="#e8e8ff"><a href="@INDEX@"><b>Home</b></a></td></tr>
       <tr><td><font size=-1>
         <a href="http://www.cs.uu.nl/~hanwen/lilypond">Development</a><br>
-        <a href="http://appel.lilypond.org/lilypond">Hacking</a><br>
+        <a href="http://appel.lilypond.org/wiki/index.php3?LilyPond">WikiWikiWeb</a><br>
         <a href="http://www.gnu.org">GNU Project</a><br>
         <a href="http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?domain=lilypond">Translations</a><br>
         <a href="http://www.lilypond.org">LilyPond dot org</a><br>
@@ -83,7 +83,7 @@ which substitutes some @AT_VARIABLES@ as well.
 	<a href="@TOP@short-examples.html">Short examples</a><br>
 	<a href="@TOP@long-examples.html">Longer examples</a><br>
 	<a href="http://sca.uwaterloo.ca/Mutopia/">Mutopia Project</a><br>
-	<a href="http://www.geocities.com/Vienna/Studio/1714/scarlattidwn.html">Jonh Sankey</a><br>
+	<a href="http://www.geocities.com/Vienna/Studio/1714/scarlattimus.html">Jonh Sankey</a><br>
 	<a href="http://www4.smart.net/~jcovey/scores/">Jeff Covey</a><br>
 	<a href="http://www.alqualonde.de/lilypond.html">Dirk Lattermann</a><br>
 	<br>
diff --git a/NEWS b/NEWS
index 277bd59a82..86e3b9bb61 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,6 @@
 
 * Point and click functionality using emacs and Xdvi.
 
-* Automatic part combining for orchestral scores.
-
 * Improved design and implementation: Complete rewrite of the
 internals: LilyPond is smaller, cleaner, more flexible, etc.
 
@@ -12,7 +10,7 @@ internals: LilyPond is smaller, cleaner, more flexible, etc.
  - Improved speed (undone for now, by .73 + .74), 
    with comparable memory footprint
 
- - More tweakability using less memory with new property push
+ - More tweakability using less memory with the new `property push'
   mechanism.
 
  - Improved robustness: Lily almost never crashes.
@@ -38,6 +36,6 @@ internals: LilyPond is smaller, cleaner, more flexible, etc.
 
 * Finished ouverture Coriolan as full orchestral score example.
 
-* AsciiScript [check if broken, decide wether to keep]
+* AsciiScript
 
 * Translations into Japanese and Russian
diff --git a/VERSION b/VERSION
index ce0904ffd5..aa99fd3611 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
-PATCH_LEVEL=90
+PATCH_LEVEL=91
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh
index 7bcb13aa39..6d8563d434 100644
--- a/lily/include/side-position-interface.hh
+++ b/lily/include/side-position-interface.hh
@@ -31,11 +31,16 @@
 
    padding -- add this much extra space between victim and support
 
-
+   self-alignment-X -- real number: -1 = left aligned, 0 = center, 1
+     right-aligned in X direction.
+     
+   self-alignment-Y -- like self-alignment-X but for Y axis
+   
    TODO: move  out unrelated callbacks.
 
    TODO: reduce number of methods.
- */
+
+*/
 struct Side_position
 {
 public:
diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index bfb4ff7d84..e3ea3d6501 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -115,9 +115,8 @@ Side_position::aligned_on_self (Score_element *elm, Axis ax)
   s +=  (ax == X_AXIS) ? "X" : "Y";
 
   SCM align (elm->get_elt_property (s.ch_C()));
-  if (isdir_b (align))
+  if (gh_number_p (align))
     {
-      Direction d = to_dir (align);
       Interval ext(elm->extent (ax));
 
       if (ext.empty_b ())
@@ -125,11 +124,11 @@ Side_position::aligned_on_self (Score_element *elm, Axis ax)
 	  programming_error ("I'm empty. Can't align on self");
 	  return 0.0;
 	}
-      else if (d)
+      else
 	{
-	  return - ext[d];
+	  Real lambda = (0.5 + gh_scm2double (align) / 2.0);
+	  return - (lambda * ext[LEFT] + (1 - lambda) * ext[RIGHT]);
 	}
-      return - ext.center ();
     }
   else
     return 0.0;
-- 
2.39.5