lilypond-0.0.77.jcn1

diff --git a/Documentation/other-packages.pod b/Documentation/other-packages.pod
index 7d6f3c0b4b056cb337f8b6021e1fd730c5a9e229..9da5f26af94695c6daab864db525f9ef77568cba 100644 (file)
--- a/Documentation/other-packages.pod
+++ b/Documentation/other-packages.pod
@@ -14,9 +14,9 @@ packages. Feel free to add info (and mail it to me).
 An alpha version notation editor for X in Scheme. Source available on
 request.
 
-=item Rosegarden, http://www.math.bath.ac.uk/~masjpf/rose.html
+=item Rosegarden, http://www.bath.ac.uk/~masjpf/rose.html
 
-A Notation editor/Sequencer for X (win95 port underway). Outputs musictex.
+A Notation editor/Sequencer for X (windows95 port underway). Outputs musictex.
 
 =item Common Notation,
 http://www-ccrma.stanford.edu/CCRMA/Software/cmn/cmn.html
@@ -91,7 +91,7 @@ Described in Computer vol 29(6). Shareware
 
 Notation editor for W95 and Mac
 
-=item Sibelius, http://www.acorn.co.uk/developers/sibelius
+=item Sibelius, http://www.acorn.co.uk/developers/sibelius/Home
 
 Notation/engraving on Acorn machines. 
 

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 9d784050cb9b3ce07572fe86de8d24ed69f41802..4cf44b1f8d9b2f8f9ad505c7c0ebc7be9b4898a7 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -41,10 +41,8 @@ Paper_def::linewidth_f() const
 Real
 Paper_def::duration_to_dist(Moment d)
 {
-    if (!d)
-       return 0;
-    
-    return get_var("unitspace")  * pow(get_var("geometric"), log_2(d));
+    Real dur_f = (d) ?pow(get_var("geometric"), log_2(d)) : 0;
+    return get_var("basicspace") + get_var("unitspace")  * dur_f;
 }