From 67038e80f8c3ae5f5541bd2b853353cf43667365 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:49:15 +0000
Subject: [PATCH] lilypond-0.0.77.jcn1

---
 Documentation/other-packages.pod | 6 +++---
 lily/paper-def.cc                | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Documentation/other-packages.pod b/Documentation/other-packages.pod
index 7d6f3c0b4b..9da5f26af9 100644
--- 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 9d784050cb..4cf44b1f8d 100644
--- 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;
 }
 
 
-- 
2.39.5