From: fred <fred>
Date: Sun, 24 Mar 2002 20:06:51 +0000 (+0000)
Subject: lilypond-0.1.48
X-Git-Tag: release/1.5.59~3374
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8b1163964f484e92d04d27bf24e1e4ac52da47a4;p=lilypond.git

lilypond-0.1.48
---

diff --git a/Documentation/Rules.make b/Documentation/Rules.make
index c32f9214ff..dd04ca3604 100644
--- a/Documentation/Rules.make
+++ b/Documentation/Rules.make
@@ -16,7 +16,7 @@ $(outdir)/%.dvi: $(outdir)/%.mudtex
 	mv $(notdir $@) $(outdir)
 
 $(outdir)/%.mudtex: %.doc
-	$(binout)/mudela-book --outdir=$(outdir)/ --outname=$(notdir $@) $<
+	$(binout)/mudela-book --noindex --outdir=$(outdir)/ --outname=$(notdir $@) $<
 
 $(outdir)/%.txt: $(outdir)/%.1
 	troff -man -Tascii $< | grotty -b -u -o > $@
@@ -24,7 +24,7 @@ $(outdir)/%.txt: $(outdir)/%.1
 $(depth)/%.txt: $(outdir)/%.txt
 	cp $< $@
 
-do_pod2html=$(pod2html) --infile $< --outfile=$@
+do_pod2html=$(pod2html) --noindex --infile $< --outfile=$@;  sh $(depth)/bin/add-URLs.sh $@
 # do this for perl 5.003
 # 	do_pod2html=$(pod2html) $<
 # 	mv $(notdir $@) $(outdir)/
diff --git a/VERSION b/VERSION
index cab5f19d38..7936890dac 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 47
+TOPLEVEL_PATCH_LEVEL = 48
 TOPLEVEL_MY_PATCH_LEVEL = 
 
 # use the above to send patches, always empty for released version:
diff --git a/flower/rational.cc b/flower/rational.cc
index 11963238b5..202dd9f0e7 100644
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -1,18 +1,279 @@
 /*
-  rational.cc -- implement Rational related functions
-
+  rational.cc -- implement Rational
+  
   source file of the Flower Library
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
-
+#include <stdlib.h>
 #include "rational.hh"
 #include "string.hh"
+#include "string-convert.hh"  
+#include "libc-extension.hh"
+
+
+Rational::operator bool () const
+{
+  return sign_;
+}
+
+ostream &
+operator << (ostream &o, Rational r)
+{
+  o <<  r.str ();
+  return o;
+}
+
+
+
+Rational
+Rational::truncated () const
+{
+  return Rational(num_ - (num_ % den_), den_);
+}
+
+Rational::Rational ()
+{
+  sign_ = 1;
+  num_ = den_ = 1;
+}
+
+Rational::Rational (int n, int d)
+{
+  sign_ = ::sign (n) * ::sign (d);
+  num_ = abs (n);
+  den_ = abs (d);
+  normalise ();
+}
+
+
+static
+int gcd (int a, int b)
+{
+  int t;
+  while ((t = a % b))
+    {
+      a = b;
+      b = t;
+    }
+  return b;
+}
+
+static
+int lcm (int a, int b)
+{
+  return abs (a*b / gcd (a,b));
+}
+
+void
+Rational::set_infinite (int s)
+{
+  sign_ = ::sign (s) * 2; 
+}
+
+Rational
+Rational::operator - () const
+{
+  Rational r(*this);
+  r.negate ();
+  return r;
+}
+
+void
+Rational::normalise ()
+{
+  if (!sign_)
+    {
+      den_ = 1;
+      num_ = 0;
+      return ;
+    }
+  if (!den_)
+    sign_ = 2;
+  if (!num_)
+    sign_ = 0;
+
+  int g = gcd (num_ , den_);
+
+  num_ /= g;
+  den_ /= g;
+}
+
+int
+Rational::sign () const
+{
+  return ::sign (sign_);
+}
+
+bool
+Rational::infty_b () const
+{
+  return abs (sign_) > 1;
+}
+
+int
+Rational::compare (Rational const &r, Rational const &s)
+{
+  if (r.sign_ < s.sign_)
+    return -1;
+  else if (r.sign_ > s.sign_)
+    return 1;
+  else if (r.infty_b ())
+    return 0;
+
+  return  (r - s).sign ();
+}
+
+int
+compare (Rational const &r, Rational const &s)
+{
+  return Rational::compare (r, s );
+}
+
+Rational &
+Rational::operator += (Rational r)
+{
+  if (infty_b ())
+    ;
+  else if (r.infty_b ())
+    {
+      *this = r;
+    }
+  else 
+    {
+      int n = sign_ * num_ *r.den_ + r.sign_ * den_ * r.num_;
+      int d = den_ * r.den_;
+      sign_ =  ::sign (n) * ::sign(d);
+      num_ = abs (n);
+      den_ = abs (d);
+      normalise ();
+    }
+  return *this;
+}
+    
+
+/*
+  copied from libg++ 2.8.0
+ */ 
+Rational::Rational(double x)
+{
+  num_ = 0;
+  den_ = 1;
+  if (x != 0.0)
+    {
+      sign_ = ::sign (x);
+      x *= sign_;
+
+      const long shift = 15;         // a safe shift per step
+      const double width = 32768.0;  // = 2^shift
+      const int maxiter = 20;        // ought not be necessary, but just in case,
+      // max 300 bits of precision
+      int expt;
+      double mantissa = frexp(x, &expt);
+      long exponent = expt;
+      double intpart;
+      int k = 0;
+      while (mantissa != 0.0 && k++ < maxiter)
+	{
+	  mantissa *= width;
+	  mantissa = modf(mantissa, &intpart);
+	  num_ <<= shift;
+	  num_ += (long)intpart;
+	  exponent -= shift;
+	}
+      if (exponent > 0)
+	num_ <<= exponent;
+      else if (exponent < 0)
+	den_ <<= -exponent;
+    } else {
+      sign_ =  0;
+    }
+  normalise();
+}
+
 
 void
-print_rat (Rational const &m)
+Rational::invert ()
 {
-  cout << String (m) << flush;
+  int r (num_);
+  num_  = den_;
+  den_ = r;
+}
+
+Rational &
+Rational::operator *= (Rational r)
+{
+  sign_ *= ::sign (r.sign_);
+  if (r.infty_b ())
+    {	
+      sign_ = sign () * 2;
+      goto exit_func;
+    }
+
+  num_ *= r.num_;
+  den_ *= r.den_;
+
+  normalise ();
+ exit_func:
+  return *this;
 }
   
+Rational &
+Rational::operator /= (Rational r)
+{
+  r.invert ();
+  return (*this *= r);
+}
+
+void
+Rational::negate ()
+{
+  sign_ *= -1;
+}
+
+Rational&
+Rational::operator -= (Rational r)
+{
+  r.negate ();
+  return (*this += r);
+}
+
+/*
+  be paranoid about overiding libg++ stuff
+ */
+Rational &
+Rational::operator = (Rational const &r)
+{
+  copy (r);
+  return *this;
+}
 
+Rational::Rational (Rational const &r)
+{
+  copy (r);
+}
+
+Rational::operator String () const
+{
+  return str ();
+}
+
+String
+Rational::str () const
+{
+  if (infty_b ())
+    {
+      String s (sign_ > 0 ? "" : "-" );
+      return String (s + "infinity");
+    }
+  String s (num ());
+  if (den () != 1 && num ())
+    s += "/" + String (den ());
+  return s;
+}
+
+int
+sign (Rational r)
+{
+  return r.sign ();
+}
diff --git a/init/feta11.ly b/init/feta11.ly
index f874201e80..373d35af73 100644
--- a/init/feta11.ly
+++ b/init/feta11.ly
@@ -4,38 +4,38 @@
 % input from out/feta11.log
 % name=\symboltables {
     "rests"	 = \table {
-        "0"	"\\wholerest"	-0.00\pt	4.12\pt	-1.72\pt	0.00\pt	
-        "1"	"\\halfrest"	-0.00\pt	4.12\pt	-0.00\pt	1.72\pt	
+        "0"	"\\wholerest"	0.00\pt	4.12\pt	-1.72\pt	0.00\pt	
+        "1"	"\\halfrest"	0.00\pt	4.12\pt	0.00\pt	1.72\pt	
         "0o"	"\\outsidewholerest"	-1.72\pt	5.84\pt	-1.72\pt	0.28\pt	
         "1o"	"\\outsidehalfrest"	-1.72\pt	5.84\pt	-0.28\pt	1.72\pt	
-        "2"	"\\quartrest"	-0.00\pt	2.97\pt	2.06\pt	9.90\pt	
-        "3"	"\\eighthrest"	-0.00\pt	3.67\pt	2.75\pt	7.81\pt	
-        "4"	"\\sixteenthrest"	-0.00\pt	4.27\pt	-0.00\pt	7.81\pt	
-        "5"	"\\thirtysecondrest"	-0.00\pt	4.81\pt	-0.00\pt	10.56\pt	
-        "6"	"\\sixtyfourthrest"	-0.00\pt	5.16\pt	-0.00\pt	13.31\pt	
-        "7"	"\\hundredtwentyeighthrest"	-0.00\pt	5.75\pt	-0.00\pt	16.06\pt	
+        "2"	"\\quartrest"	0.00\pt	2.97\pt	2.06\pt	9.90\pt	
+        "3"	"\\eighthrest"	0.00\pt	3.67\pt	2.75\pt	7.81\pt	
+        "4"	"\\sixteenthrest"	0.00\pt	4.27\pt	0.00\pt	7.81\pt	
+        "5"	"\\thirtysecondrest"	0.00\pt	4.81\pt	0.00\pt	10.56\pt	
+        "6"	"\\sixtyfourthrest"	0.00\pt	5.16\pt	0.00\pt	13.31\pt	
+        "7"	"\\hundredtwentyeighthrest"	0.00\pt	5.75\pt	0.00\pt	16.06\pt	
         }
     "accidentals"	 = \table {
-        "1"	"\\sharp"	-0.00\pt	3.03\pt	-4.12\pt	4.12\pt	
-        "0"	"\\natural"	-0.00\pt	1.83\pt	-4.12\pt	4.12\pt	
+        "1"	"\\sharp"	0.00\pt	3.03\pt	-4.12\pt	4.12\pt	
+        "0"	"\\natural"	0.00\pt	1.83\pt	-4.12\pt	4.12\pt	
         "-1"	"\\flat"	-0.33\pt	2.20\pt	-1.38\pt	5.50\pt	
         "-2"	"\\flatflat"	-0.33\pt	3.99\pt	-1.38\pt	5.50\pt	
-        "2"	"\\sharpsharp"	-0.00\pt	2.75\pt	-1.38\pt	1.38\pt	
+        "2"	"\\sharpsharp"	0.00\pt	2.75\pt	-1.38\pt	1.38\pt	
         }
     "dots"	 = \table {
-        "dot"	"\\dot"	-0.00\pt	1.24\pt	-0.62\pt	0.62\pt	
-        "repeatcolon"	"\\repeatcolon"	-0.00\pt	1.24\pt	-1.38\pt	1.38\pt	
+        "dot"	"\\dot"	0.00\pt	1.24\pt	-0.62\pt	0.62\pt	
+        "repeatcolon"	"\\repeatcolon"	0.00\pt	1.24\pt	-1.38\pt	1.38\pt	
         }
     "balls"	 = \table {
-        "-1"	"\\brevisball"	-0.00\pt	5.50\pt	-1.51\pt	1.51\pt	
+        "-1"	"\\brevisball"	0.00\pt	5.50\pt	-1.51\pt	1.51\pt	
         "-1l"	"\\brevisledger"	-1.38\pt	6.88\pt	-0.28\pt	0.28\pt	
-        "-2"	"\\longaball"	-0.00\pt	5.50\pt	-1.51\pt	1.51\pt	
+        "-2"	"\\longaball"	0.00\pt	5.50\pt	-1.51\pt	1.51\pt	
         "-2l"	"\\longaledger"	-1.38\pt	6.88\pt	-0.28\pt	0.28\pt	
-        "0"	"\\wholeball"	-0.00\pt	5.45\pt	-1.51\pt	1.51\pt	
+        "0"	"\\wholeball"	0.00\pt	5.45\pt	-1.51\pt	1.51\pt	
         "0l"	"\\wholeledger"	-1.36\pt	6.81\pt	-0.28\pt	0.28\pt	
-        "1"	"\\halfball"	-0.00\pt	3.79\pt	-1.51\pt	1.51\pt	
+        "1"	"\\halfball"	0.00\pt	3.79\pt	-1.51\pt	1.51\pt	
         "1l"	"\\halfledger"	-0.95\pt	4.74\pt	-0.28\pt	0.28\pt	
-        "2"	"\\quartball"	-0.00\pt	3.63\pt	-1.51\pt	1.51\pt	
+        "2"	"\\quartball"	0.00\pt	3.63\pt	-1.51\pt	1.51\pt	
         "2l"	"\\quartledger"	-0.91\pt	4.54\pt	-0.28\pt	0.28\pt	
         }
     "scripts"	 = \table {
@@ -46,17 +46,17 @@
         "ustaccatissimo"	"\\ustaccatissimo"	-0.55\pt	0.55\pt	-0.20\pt	2.75\pt	
         "dstaccatissimo"	"\\dstaccatissimo"	-0.55\pt	0.55\pt	-2.75\pt	0.20\pt	
         "tenuto"	"\\tenuto"	-2.47\pt	2.47\pt	-0.17\pt	0.17\pt	
-        "umarcato"	"\\umarcato"	-1.38\pt	1.38\pt	-0.00\pt	3.03\pt	
+        "umarcato"	"\\umarcato"	-1.38\pt	1.38\pt	0.00\pt	3.03\pt	
         "dmarcato"	"\\dmarcato"	-1.38\pt	1.38\pt	-3.03\pt	0.00\pt	
         "open"	"\\ouvert"	-1.10\pt	1.10\pt	-1.38\pt	1.38\pt	
         "stopped"	"\\plusstop"	-1.51\pt	1.51\pt	-1.51\pt	1.51\pt	
-        "upbow"	"\\upbow"	-1.79\pt	1.79\pt	-0.00\pt	5.72\pt	
-        "downbow"	"\\downbow"	-2.06\pt	2.06\pt	-0.00\pt	3.67\pt	
+        "upbow"	"\\upbow"	-1.79\pt	1.79\pt	0.00\pt	5.72\pt	
+        "downbow"	"\\downbow"	-2.06\pt	2.06\pt	0.00\pt	3.67\pt	
         "turn"	"\\turn"	-3.01\pt	3.01\pt	-1.46\pt	1.46\pt	
-        "trill"	"\\trill"	-2.75\pt	2.75\pt	-0.00\pt	6.19\pt	
+        "trill"	"\\trill"	-2.75\pt	2.75\pt	0.00\pt	6.19\pt	
         "upedalheel"	"\\upedalheel"	-1.38\pt	1.38\pt	-1.38\pt	1.83\pt	
         "dpedalheel"	"\\dpedalheel"	-1.38\pt	1.38\pt	-1.83\pt	1.38\pt	
-        "upedaltoe"	"\\upedaltoe"	-1.38\pt	1.38\pt	-0.00\pt	4.12\pt	
+        "upedaltoe"	"\\upedaltoe"	-1.38\pt	1.38\pt	0.00\pt	4.12\pt	
         "dpedaltoe"	"\\dpedaltoe"	-1.38\pt	1.38\pt	-4.12\pt	0.00\pt	
         "flageolet"	"\\flageolet"	-1.47\pt	1.47\pt	-1.47\pt	1.47\pt	
         }
diff --git a/init/feta13.ly b/init/feta13.ly
index 4be008a657..1042f1b70e 100644
--- a/init/feta13.ly
+++ b/init/feta13.ly
@@ -4,38 +4,38 @@
 % input from out/feta13.log
 % name=\symboltables {
     "rests"	 = \table {
-        "0"	"\\wholerest"	-0.00\pt	4.88\pt	-2.03\pt	0.00\pt	
-        "1"	"\\halfrest"	-0.00\pt	4.88\pt	-0.00\pt	2.03\pt	
+        "0"	"\\wholerest"	0.00\pt	4.88\pt	-2.03\pt	0.00\pt	
+        "1"	"\\halfrest"	0.00\pt	4.88\pt	0.00\pt	2.03\pt	
         "0o"	"\\outsidewholerest"	-2.03\pt	6.91\pt	-2.03\pt	0.33\pt	
         "1o"	"\\outsidehalfrest"	-2.03\pt	6.91\pt	-0.33\pt	2.03\pt	
-        "2"	"\\quartrest"	-0.00\pt	3.51\pt	2.44\pt	11.70\pt	
-        "3"	"\\eighthrest"	-0.00\pt	4.33\pt	3.25\pt	9.24\pt	
-        "4"	"\\sixteenthrest"	-0.00\pt	5.04\pt	-0.00\pt	9.24\pt	
-        "5"	"\\thirtysecondrest"	-0.00\pt	5.69\pt	-0.00\pt	12.49\pt	
-        "6"	"\\sixtyfourthrest"	-0.00\pt	6.10\pt	-0.00\pt	15.74\pt	
-        "7"	"\\hundredtwentyeighthrest"	-0.00\pt	6.79\pt	-0.00\pt	18.99\pt	
+        "2"	"\\quartrest"	0.00\pt	3.51\pt	2.44\pt	11.70\pt	
+        "3"	"\\eighthrest"	0.00\pt	4.33\pt	3.25\pt	9.24\pt	
+        "4"	"\\sixteenthrest"	0.00\pt	5.04\pt	0.00\pt	9.24\pt	
+        "5"	"\\thirtysecondrest"	0.00\pt	5.69\pt	0.00\pt	12.49\pt	
+        "6"	"\\sixtyfourthrest"	0.00\pt	6.10\pt	0.00\pt	15.74\pt	
+        "7"	"\\hundredtwentyeighthrest"	0.00\pt	6.79\pt	0.00\pt	18.99\pt	
         }
     "accidentals"	 = \table {
-        "1"	"\\sharp"	-0.00\pt	3.58\pt	-4.88\pt	4.88\pt	
-        "0"	"\\natural"	-0.00\pt	2.17\pt	-4.88\pt	4.88\pt	
+        "1"	"\\sharp"	0.00\pt	3.58\pt	-4.88\pt	4.88\pt	
+        "0"	"\\natural"	0.00\pt	2.17\pt	-4.88\pt	4.88\pt	
         "-1"	"\\flat"	-0.39\pt	2.60\pt	-1.62\pt	6.50\pt	
         "-2"	"\\flatflat"	-0.39\pt	4.71\pt	-1.62\pt	6.50\pt	
-        "2"	"\\sharpsharp"	-0.00\pt	3.25\pt	-1.62\pt	1.62\pt	
+        "2"	"\\sharpsharp"	0.00\pt	3.25\pt	-1.62\pt	1.62\pt	
         }
     "dots"	 = \table {
-        "dot"	"\\dot"	-0.00\pt	1.46\pt	-0.73\pt	0.73\pt	
-        "repeatcolon"	"\\repeatcolon"	-0.00\pt	1.46\pt	-1.62\pt	1.62\pt	
+        "dot"	"\\dot"	0.00\pt	1.46\pt	-0.73\pt	0.73\pt	
+        "repeatcolon"	"\\repeatcolon"	0.00\pt	1.46\pt	-1.62\pt	1.62\pt	
         }
     "balls"	 = \table {
-        "-1"	"\\brevisball"	-0.00\pt	6.50\pt	-1.79\pt	1.79\pt	
+        "-1"	"\\brevisball"	0.00\pt	6.50\pt	-1.79\pt	1.79\pt	
         "-1l"	"\\brevisledger"	-1.62\pt	8.12\pt	-0.33\pt	0.33\pt	
-        "-2"	"\\longaball"	-0.00\pt	6.50\pt	-1.79\pt	1.79\pt	
+        "-2"	"\\longaball"	0.00\pt	6.50\pt	-1.79\pt	1.79\pt	
         "-2l"	"\\longaledger"	-1.62\pt	8.12\pt	-0.33\pt	0.33\pt	
-        "0"	"\\wholeball"	-0.00\pt	6.44\pt	-1.79\pt	1.79\pt	
+        "0"	"\\wholeball"	0.00\pt	6.44\pt	-1.79\pt	1.79\pt	
         "0l"	"\\wholeledger"	-1.61\pt	8.04\pt	-0.33\pt	0.33\pt	
-        "1"	"\\halfball"	-0.00\pt	4.48\pt	-1.79\pt	1.79\pt	
+        "1"	"\\halfball"	0.00\pt	4.48\pt	-1.79\pt	1.79\pt	
         "1l"	"\\halfledger"	-1.12\pt	5.60\pt	-0.33\pt	0.33\pt	
-        "2"	"\\quartball"	-0.00\pt	4.29\pt	-1.79\pt	1.79\pt	
+        "2"	"\\quartball"	0.00\pt	4.29\pt	-1.79\pt	1.79\pt	
         "2l"	"\\quartledger"	-1.07\pt	5.37\pt	-0.33\pt	0.33\pt	
         }
     "scripts"	 = \table {
@@ -46,17 +46,17 @@
         "ustaccatissimo"	"\\ustaccatissimo"	-0.65\pt	0.65\pt	-0.20\pt	3.25\pt	
         "dstaccatissimo"	"\\dstaccatissimo"	-0.65\pt	0.65\pt	-3.25\pt	0.20\pt	
         "tenuto"	"\\tenuto"	-2.92\pt	2.92\pt	-0.20\pt	0.20\pt	
-        "umarcato"	"\\umarcato"	-1.62\pt	1.62\pt	-0.00\pt	3.58\pt	
+        "umarcato"	"\\umarcato"	-1.62\pt	1.62\pt	0.00\pt	3.58\pt	
         "dmarcato"	"\\dmarcato"	-1.62\pt	1.62\pt	-3.58\pt	0.00\pt	
         "open"	"\\ouvert"	-1.30\pt	1.30\pt	-1.62\pt	1.62\pt	
         "stopped"	"\\plusstop"	-1.79\pt	1.79\pt	-1.79\pt	1.79\pt	
-        "upbow"	"\\upbow"	-2.11\pt	2.11\pt	-0.00\pt	6.76\pt	
-        "downbow"	"\\downbow"	-2.44\pt	2.44\pt	-0.00\pt	4.33\pt	
+        "upbow"	"\\upbow"	-2.11\pt	2.11\pt	0.00\pt	6.76\pt	
+        "downbow"	"\\downbow"	-2.44\pt	2.44\pt	0.00\pt	4.33\pt	
         "turn"	"\\turn"	-3.55\pt	3.55\pt	-1.72\pt	1.72\pt	
-        "trill"	"\\trill"	-3.25\pt	3.25\pt	-0.00\pt	7.31\pt	
+        "trill"	"\\trill"	-3.25\pt	3.25\pt	0.00\pt	7.31\pt	
         "upedalheel"	"\\upedalheel"	-1.62\pt	1.62\pt	-1.62\pt	2.17\pt	
         "dpedalheel"	"\\dpedalheel"	-1.62\pt	1.62\pt	-2.17\pt	1.62\pt	
-        "upedaltoe"	"\\upedaltoe"	-1.62\pt	1.62\pt	-0.00\pt	4.88\pt	
+        "upedaltoe"	"\\upedaltoe"	-1.62\pt	1.62\pt	0.00\pt	4.88\pt	
         "dpedaltoe"	"\\dpedaltoe"	-1.62\pt	1.62\pt	-4.88\pt	0.00\pt	
         "flageolet"	"\\flageolet"	-1.73\pt	1.73\pt	-1.73\pt	1.73\pt	
         }
diff --git a/init/feta16.ly b/init/feta16.ly
index c8bcf1ee2d..5017ebf420 100644
--- a/init/feta16.ly
+++ b/init/feta16.ly
@@ -4,38 +4,38 @@
 % input from out/feta16.log
 % name=\symboltables {
     "rests"	 = \table {
-        "0"	"\\wholerest"	-0.00\pt	6.00\pt	-2.50\pt	0.00\pt	
-        "1"	"\\halfrest"	-0.00\pt	6.00\pt	-0.00\pt	2.50\pt	
+        "0"	"\\wholerest"	0.00\pt	6.00\pt	-2.50\pt	0.00\pt	
+        "1"	"\\halfrest"	0.00\pt	6.00\pt	0.00\pt	2.50\pt	
         "0o"	"\\outsidewholerest"	-2.50\pt	8.50\pt	-2.50\pt	0.40\pt	
         "1o"	"\\outsidehalfrest"	-2.50\pt	8.50\pt	-0.40\pt	2.50\pt	
-        "2"	"\\quartrest"	-0.00\pt	4.32\pt	3.00\pt	14.40\pt	
-        "3"	"\\eighthrest"	-0.00\pt	5.33\pt	4.00\pt	11.37\pt	
-        "4"	"\\sixteenthrest"	-0.00\pt	6.21\pt	-0.00\pt	11.37\pt	
-        "5"	"\\thirtysecondrest"	-0.00\pt	7.00\pt	-0.00\pt	15.37\pt	
-        "6"	"\\sixtyfourthrest"	-0.00\pt	7.51\pt	-0.00\pt	19.37\pt	
-        "7"	"\\hundredtwentyeighthrest"	-0.00\pt	8.36\pt	-0.00\pt	23.37\pt	
+        "2"	"\\quartrest"	0.00\pt	4.32\pt	3.00\pt	14.40\pt	
+        "3"	"\\eighthrest"	0.00\pt	5.33\pt	4.00\pt	11.37\pt	
+        "4"	"\\sixteenthrest"	0.00\pt	6.21\pt	0.00\pt	11.37\pt	
+        "5"	"\\thirtysecondrest"	0.00\pt	7.00\pt	0.00\pt	15.37\pt	
+        "6"	"\\sixtyfourthrest"	0.00\pt	7.51\pt	0.00\pt	19.37\pt	
+        "7"	"\\hundredtwentyeighthrest"	0.00\pt	8.36\pt	0.00\pt	23.37\pt	
         }
     "accidentals"	 = \table {
-        "1"	"\\sharp"	-0.00\pt	4.40\pt	-6.00\pt	6.00\pt	
-        "0"	"\\natural"	-0.00\pt	2.67\pt	-6.00\pt	6.00\pt	
+        "1"	"\\sharp"	0.00\pt	4.40\pt	-6.00\pt	6.00\pt	
+        "0"	"\\natural"	0.00\pt	2.67\pt	-6.00\pt	6.00\pt	
         "-1"	"\\flat"	-0.48\pt	3.20\pt	-2.00\pt	8.00\pt	
         "-2"	"\\flatflat"	-0.48\pt	5.80\pt	-2.00\pt	8.00\pt	
-        "2"	"\\sharpsharp"	-0.00\pt	4.00\pt	-2.00\pt	2.00\pt	
+        "2"	"\\sharpsharp"	0.00\pt	4.00\pt	-2.00\pt	2.00\pt	
         }
     "dots"	 = \table {
-        "dot"	"\\dot"	-0.00\pt	1.80\pt	-0.90\pt	0.90\pt	
-        "repeatcolon"	"\\repeatcolon"	-0.00\pt	1.80\pt	-2.00\pt	2.00\pt	
+        "dot"	"\\dot"	0.00\pt	1.80\pt	-0.90\pt	0.90\pt	
+        "repeatcolon"	"\\repeatcolon"	0.00\pt	1.80\pt	-2.00\pt	2.00\pt	
         }
     "balls"	 = \table {
-        "-1"	"\\brevisball"	-0.00\pt	8.00\pt	-2.20\pt	2.20\pt	
+        "-1"	"\\brevisball"	0.00\pt	8.00\pt	-2.20\pt	2.20\pt	
         "-1l"	"\\brevisledger"	-2.00\pt	10.00\pt	-0.40\pt	0.40\pt	
-        "-2"	"\\longaball"	-0.00\pt	8.00\pt	-2.20\pt	2.20\pt	
+        "-2"	"\\longaball"	0.00\pt	8.00\pt	-2.20\pt	2.20\pt	
         "-2l"	"\\longaledger"	-2.00\pt	10.00\pt	-0.40\pt	0.40\pt	
-        "0"	"\\wholeball"	-0.00\pt	7.92\pt	-2.20\pt	2.20\pt	
+        "0"	"\\wholeball"	0.00\pt	7.92\pt	-2.20\pt	2.20\pt	
         "0l"	"\\wholeledger"	-1.98\pt	9.90\pt	-0.40\pt	0.40\pt	
-        "1"	"\\halfball"	-0.00\pt	5.51\pt	-2.20\pt	2.20\pt	
+        "1"	"\\halfball"	0.00\pt	5.51\pt	-2.20\pt	2.20\pt	
         "1l"	"\\halfledger"	-1.38\pt	6.89\pt	-0.40\pt	0.40\pt	
-        "2"	"\\quartball"	-0.00\pt	5.28\pt	-2.20\pt	2.20\pt	
+        "2"	"\\quartball"	0.00\pt	5.28\pt	-2.20\pt	2.20\pt	
         "2l"	"\\quartledger"	-1.32\pt	6.61\pt	-0.40\pt	0.40\pt	
         }
     "scripts"	 = \table {
@@ -46,17 +46,17 @@
         "ustaccatissimo"	"\\ustaccatissimo"	-0.80\pt	0.80\pt	-0.20\pt	4.00\pt	
         "dstaccatissimo"	"\\dstaccatissimo"	-0.80\pt	0.80\pt	-4.00\pt	0.20\pt	
         "tenuto"	"\\tenuto"	-3.60\pt	3.60\pt	-0.24\pt	0.24\pt	
-        "umarcato"	"\\umarcato"	-2.00\pt	2.00\pt	-0.00\pt	4.40\pt	
+        "umarcato"	"\\umarcato"	-2.00\pt	2.00\pt	0.00\pt	4.40\pt	
         "dmarcato"	"\\dmarcato"	-2.00\pt	2.00\pt	-4.40\pt	0.00\pt	
         "open"	"\\ouvert"	-1.60\pt	1.60\pt	-2.00\pt	2.00\pt	
         "stopped"	"\\plusstop"	-2.20\pt	2.20\pt	-2.20\pt	2.20\pt	
-        "upbow"	"\\upbow"	-2.60\pt	2.60\pt	-0.00\pt	8.32\pt	
-        "downbow"	"\\downbow"	-3.00\pt	3.00\pt	-0.00\pt	5.33\pt	
+        "upbow"	"\\upbow"	-2.60\pt	2.60\pt	0.00\pt	8.32\pt	
+        "downbow"	"\\downbow"	-3.00\pt	3.00\pt	0.00\pt	5.33\pt	
         "turn"	"\\turn"	-4.38\pt	4.38\pt	-2.12\pt	2.12\pt	
-        "trill"	"\\trill"	-4.00\pt	4.00\pt	-0.00\pt	9.00\pt	
+        "trill"	"\\trill"	-4.00\pt	4.00\pt	0.00\pt	9.00\pt	
         "upedalheel"	"\\upedalheel"	-2.00\pt	2.00\pt	-2.00\pt	2.67\pt	
         "dpedalheel"	"\\dpedalheel"	-2.00\pt	2.00\pt	-2.67\pt	2.00\pt	
-        "upedaltoe"	"\\upedaltoe"	-2.00\pt	2.00\pt	-0.00\pt	6.00\pt	
+        "upedaltoe"	"\\upedaltoe"	-2.00\pt	2.00\pt	0.00\pt	6.00\pt	
         "dpedaltoe"	"\\dpedaltoe"	-2.00\pt	2.00\pt	-6.00\pt	0.00\pt	
         "flageolet"	"\\flageolet"	-2.13\pt	2.13\pt	-2.13\pt	2.13\pt	
         }
diff --git a/init/feta19.ly b/init/feta19.ly
index 146a35974e..79a0dcd0e1 100644
--- a/init/feta19.ly
+++ b/init/feta19.ly
@@ -4,38 +4,38 @@
 % input from out/feta19.log
 % name=\symboltables {
     "rests"	 = \table {
-        "0"	"\\wholerest"	-0.00\pt	7.12\pt	-2.97\pt	0.00\pt	
-        "1"	"\\halfrest"	-0.00\pt	7.12\pt	-0.00\pt	2.97\pt	
+        "0"	"\\wholerest"	0.00\pt	7.12\pt	-2.97\pt	0.00\pt	
+        "1"	"\\halfrest"	0.00\pt	7.12\pt	0.00\pt	2.97\pt	
         "0o"	"\\outsidewholerest"	-2.97\pt	10.09\pt	-2.97\pt	0.48\pt	
         "1o"	"\\outsidehalfrest"	-2.97\pt	10.09\pt	-0.48\pt	2.97\pt	
-        "2"	"\\quartrest"	-0.00\pt	5.13\pt	3.56\pt	17.10\pt	
-        "3"	"\\eighthrest"	-0.00\pt	6.33\pt	4.75\pt	13.50\pt	
-        "4"	"\\sixteenthrest"	-0.00\pt	7.37\pt	-0.00\pt	13.50\pt	
-        "5"	"\\thirtysecondrest"	-0.00\pt	8.32\pt	-0.00\pt	18.25\pt	
-        "6"	"\\sixtyfourthrest"	-0.00\pt	8.92\pt	-0.00\pt	23.00\pt	
-        "7"	"\\hundredtwentyeighthrest"	-0.00\pt	9.93\pt	-0.00\pt	27.75\pt	
+        "2"	"\\quartrest"	0.00\pt	5.13\pt	3.56\pt	17.10\pt	
+        "3"	"\\eighthrest"	0.00\pt	6.33\pt	4.75\pt	13.50\pt	
+        "4"	"\\sixteenthrest"	0.00\pt	7.37\pt	0.00\pt	13.50\pt	
+        "5"	"\\thirtysecondrest"	0.00\pt	8.32\pt	0.00\pt	18.25\pt	
+        "6"	"\\sixtyfourthrest"	0.00\pt	8.92\pt	0.00\pt	23.00\pt	
+        "7"	"\\hundredtwentyeighthrest"	0.00\pt	9.93\pt	0.00\pt	27.75\pt	
         }
     "accidentals"	 = \table {
-        "1"	"\\sharp"	-0.00\pt	5.23\pt	-7.12\pt	7.12\pt	
-        "0"	"\\natural"	-0.00\pt	3.17\pt	-7.12\pt	7.12\pt	
+        "1"	"\\sharp"	0.00\pt	5.23\pt	-7.12\pt	7.12\pt	
+        "0"	"\\natural"	0.00\pt	3.17\pt	-7.12\pt	7.12\pt	
         "-1"	"\\flat"	-0.57\pt	3.80\pt	-2.38\pt	9.50\pt	
         "-2"	"\\flatflat"	-0.57\pt	6.89\pt	-2.38\pt	9.50\pt	
-        "2"	"\\sharpsharp"	-0.00\pt	4.75\pt	-2.38\pt	2.38\pt	
+        "2"	"\\sharpsharp"	0.00\pt	4.75\pt	-2.38\pt	2.38\pt	
         }
     "dots"	 = \table {
-        "dot"	"\\dot"	-0.00\pt	2.14\pt	-1.07\pt	1.07\pt	
-        "repeatcolon"	"\\repeatcolon"	-0.00\pt	2.14\pt	-2.38\pt	2.38\pt	
+        "dot"	"\\dot"	0.00\pt	2.14\pt	-1.07\pt	1.07\pt	
+        "repeatcolon"	"\\repeatcolon"	0.00\pt	2.14\pt	-2.38\pt	2.38\pt	
         }
     "balls"	 = \table {
-        "-1"	"\\brevisball"	-0.00\pt	9.50\pt	-2.61\pt	2.61\pt	
+        "-1"	"\\brevisball"	0.00\pt	9.50\pt	-2.61\pt	2.61\pt	
         "-1l"	"\\brevisledger"	-2.38\pt	11.88\pt	-0.48\pt	0.48\pt	
-        "-2"	"\\longaball"	-0.00\pt	9.50\pt	-2.61\pt	2.61\pt	
+        "-2"	"\\longaball"	0.00\pt	9.50\pt	-2.61\pt	2.61\pt	
         "-2l"	"\\longaledger"	-2.38\pt	11.88\pt	-0.48\pt	0.48\pt	
-        "0"	"\\wholeball"	-0.00\pt	9.41\pt	-2.61\pt	2.61\pt	
+        "0"	"\\wholeball"	0.00\pt	9.41\pt	-2.61\pt	2.61\pt	
         "0l"	"\\wholeledger"	-2.35\pt	11.76\pt	-0.48\pt	0.48\pt	
-        "1"	"\\halfball"	-0.00\pt	6.54\pt	-2.61\pt	2.61\pt	
+        "1"	"\\halfball"	0.00\pt	6.54\pt	-2.61\pt	2.61\pt	
         "1l"	"\\halfledger"	-1.64\pt	8.18\pt	-0.48\pt	0.48\pt	
-        "2"	"\\quartball"	-0.00\pt	6.27\pt	-2.61\pt	2.61\pt	
+        "2"	"\\quartball"	0.00\pt	6.27\pt	-2.61\pt	2.61\pt	
         "2l"	"\\quartledger"	-1.57\pt	7.84\pt	-0.48\pt	0.48\pt	
         }
     "scripts"	 = \table {
@@ -46,17 +46,17 @@
         "ustaccatissimo"	"\\ustaccatissimo"	-0.95\pt	0.95\pt	-0.20\pt	4.75\pt	
         "dstaccatissimo"	"\\dstaccatissimo"	-0.95\pt	0.95\pt	-4.75\pt	0.20\pt	
         "tenuto"	"\\tenuto"	-4.27\pt	4.27\pt	-0.29\pt	0.29\pt	
-        "umarcato"	"\\umarcato"	-2.38\pt	2.38\pt	-0.00\pt	5.23\pt	
+        "umarcato"	"\\umarcato"	-2.38\pt	2.38\pt	0.00\pt	5.23\pt	
         "dmarcato"	"\\dmarcato"	-2.38\pt	2.38\pt	-5.23\pt	0.00\pt	
         "open"	"\\ouvert"	-1.90\pt	1.90\pt	-2.38\pt	2.38\pt	
         "stopped"	"\\plusstop"	-2.61\pt	2.61\pt	-2.61\pt	2.61\pt	
-        "upbow"	"\\upbow"	-3.09\pt	3.09\pt	-0.00\pt	9.88\pt	
-        "downbow"	"\\downbow"	-3.56\pt	3.56\pt	-0.00\pt	6.33\pt	
+        "upbow"	"\\upbow"	-3.09\pt	3.09\pt	0.00\pt	9.88\pt	
+        "downbow"	"\\downbow"	-3.56\pt	3.56\pt	0.00\pt	6.33\pt	
         "turn"	"\\turn"	-5.20\pt	5.20\pt	-2.51\pt	2.51\pt	
-        "trill"	"\\trill"	-4.75\pt	4.75\pt	-0.00\pt	10.69\pt	
+        "trill"	"\\trill"	-4.75\pt	4.75\pt	0.00\pt	10.69\pt	
         "upedalheel"	"\\upedalheel"	-2.38\pt	2.38\pt	-2.38\pt	3.17\pt	
         "dpedalheel"	"\\dpedalheel"	-2.38\pt	2.38\pt	-3.17\pt	2.38\pt	
-        "upedaltoe"	"\\upedaltoe"	-2.38\pt	2.38\pt	-0.00\pt	7.12\pt	
+        "upedaltoe"	"\\upedaltoe"	-2.38\pt	2.38\pt	0.00\pt	7.12\pt	
         "dpedaltoe"	"\\dpedaltoe"	-2.38\pt	2.38\pt	-7.12\pt	0.00\pt	
         "flageolet"	"\\flageolet"	-2.53\pt	2.53\pt	-2.53\pt	2.53\pt	
         }
diff --git a/init/feta20.ly b/init/feta20.ly
index 13488ac1ca..4651cf1f0b 100644
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -4,38 +4,38 @@
 % input from out/feta20.log
 % name=\symboltables {
     "rests"	 = \table {
-        "0"	"\\wholerest"	-0.00\pt	7.50\pt	-3.12\pt	0.00\pt	
-        "1"	"\\halfrest"	-0.00\pt	7.50\pt	-0.00\pt	3.12\pt	
+        "0"	"\\wholerest"	0.00\pt	7.50\pt	-3.12\pt	0.00\pt	
+        "1"	"\\halfrest"	0.00\pt	7.50\pt	0.00\pt	3.12\pt	
         "0o"	"\\outsidewholerest"	-3.12\pt	10.62\pt	-3.12\pt	0.50\pt	
         "1o"	"\\outsidehalfrest"	-3.12\pt	10.62\pt	-0.50\pt	3.12\pt	
-        "2"	"\\quartrest"	-0.00\pt	5.40\pt	3.75\pt	18.00\pt	
-        "3"	"\\eighthrest"	-0.00\pt	6.67\pt	5.00\pt	14.21\pt	
-        "4"	"\\sixteenthrest"	-0.00\pt	7.76\pt	-0.00\pt	14.21\pt	
-        "5"	"\\thirtysecondrest"	-0.00\pt	8.75\pt	-0.00\pt	19.21\pt	
-        "6"	"\\sixtyfourthrest"	-0.00\pt	9.38\pt	-0.00\pt	24.21\pt	
-        "7"	"\\hundredtwentyeighthrest"	-0.00\pt	10.45\pt	-0.00\pt	29.21\pt	
+        "2"	"\\quartrest"	0.00\pt	5.40\pt	3.75\pt	18.00\pt	
+        "3"	"\\eighthrest"	0.00\pt	6.67\pt	5.00\pt	14.21\pt	
+        "4"	"\\sixteenthrest"	0.00\pt	7.76\pt	0.00\pt	14.21\pt	
+        "5"	"\\thirtysecondrest"	0.00\pt	8.75\pt	0.00\pt	19.21\pt	
+        "6"	"\\sixtyfourthrest"	0.00\pt	9.38\pt	0.00\pt	24.21\pt	
+        "7"	"\\hundredtwentyeighthrest"	0.00\pt	10.45\pt	0.00\pt	29.21\pt	
         }
     "accidentals"	 = \table {
-        "1"	"\\sharp"	-0.00\pt	5.50\pt	-7.50\pt	7.50\pt	
-        "0"	"\\natural"	-0.00\pt	3.33\pt	-7.50\pt	7.50\pt	
+        "1"	"\\sharp"	0.00\pt	5.50\pt	-7.50\pt	7.50\pt	
+        "0"	"\\natural"	0.00\pt	3.33\pt	-7.50\pt	7.50\pt	
         "-1"	"\\flat"	-0.60\pt	4.00\pt	-2.50\pt	10.00\pt	
         "-2"	"\\flatflat"	-0.60\pt	7.25\pt	-2.50\pt	10.00\pt	
-        "2"	"\\sharpsharp"	-0.00\pt	5.00\pt	-2.50\pt	2.50\pt	
+        "2"	"\\sharpsharp"	0.00\pt	5.00\pt	-2.50\pt	2.50\pt	
         }
     "dots"	 = \table {
-        "dot"	"\\dot"	-0.00\pt	2.25\pt	-1.12\pt	1.12\pt	
-        "repeatcolon"	"\\repeatcolon"	-0.00\pt	2.25\pt	-2.50\pt	2.50\pt	
+        "dot"	"\\dot"	0.00\pt	2.25\pt	-1.12\pt	1.12\pt	
+        "repeatcolon"	"\\repeatcolon"	0.00\pt	2.25\pt	-2.50\pt	2.50\pt	
         }
     "balls"	 = \table {
-        "-1"	"\\brevisball"	-0.00\pt	10.00\pt	-2.75\pt	2.75\pt	
+        "-1"	"\\brevisball"	0.00\pt	10.00\pt	-2.75\pt	2.75\pt	
         "-1l"	"\\brevisledger"	-2.50\pt	12.50\pt	-0.50\pt	0.50\pt	
-        "-2"	"\\longaball"	-0.00\pt	10.00\pt	-2.75\pt	2.75\pt	
+        "-2"	"\\longaball"	0.00\pt	10.00\pt	-2.75\pt	2.75\pt	
         "-2l"	"\\longaledger"	-2.50\pt	12.50\pt	-0.50\pt	0.50\pt	
-        "0"	"\\wholeball"	-0.00\pt	9.90\pt	-2.75\pt	2.75\pt	
+        "0"	"\\wholeball"	0.00\pt	9.90\pt	-2.75\pt	2.75\pt	
         "0l"	"\\wholeledger"	-2.48\pt	12.38\pt	-0.50\pt	0.50\pt	
-        "1"	"\\halfball"	-0.00\pt	6.89\pt	-2.75\pt	2.75\pt	
+        "1"	"\\halfball"	0.00\pt	6.89\pt	-2.75\pt	2.75\pt	
         "1l"	"\\halfledger"	-1.72\pt	8.61\pt	-0.50\pt	0.50\pt	
-        "2"	"\\quartball"	-0.00\pt	6.61\pt	-2.75\pt	2.75\pt	
+        "2"	"\\quartball"	0.00\pt	6.61\pt	-2.75\pt	2.75\pt	
         "2l"	"\\quartledger"	-1.65\pt	8.26\pt	-0.50\pt	0.50\pt	
         }
     "scripts"	 = \table {
@@ -46,17 +46,17 @@
         "ustaccatissimo"	"\\ustaccatissimo"	-1.00\pt	1.00\pt	-0.20\pt	5.00\pt	
         "dstaccatissimo"	"\\dstaccatissimo"	-1.00\pt	1.00\pt	-5.00\pt	0.20\pt	
         "tenuto"	"\\tenuto"	-4.50\pt	4.50\pt	-0.30\pt	0.30\pt	
-        "umarcato"	"\\umarcato"	-2.50\pt	2.50\pt	-0.00\pt	5.50\pt	
+        "umarcato"	"\\umarcato"	-2.50\pt	2.50\pt	0.00\pt	5.50\pt	
         "dmarcato"	"\\dmarcato"	-2.50\pt	2.50\pt	-5.50\pt	0.00\pt	
         "open"	"\\ouvert"	-2.00\pt	2.00\pt	-2.50\pt	2.50\pt	
         "stopped"	"\\plusstop"	-2.75\pt	2.75\pt	-2.75\pt	2.75\pt	
-        "upbow"	"\\upbow"	-3.25\pt	3.25\pt	-0.00\pt	10.40\pt	
-        "downbow"	"\\downbow"	-3.75\pt	3.75\pt	-0.00\pt	6.67\pt	
+        "upbow"	"\\upbow"	-3.25\pt	3.25\pt	0.00\pt	10.40\pt	
+        "downbow"	"\\downbow"	-3.75\pt	3.75\pt	0.00\pt	6.67\pt	
         "turn"	"\\turn"	-5.47\pt	5.47\pt	-2.65\pt	2.65\pt	
-        "trill"	"\\trill"	-5.00\pt	5.00\pt	-0.00\pt	11.25\pt	
+        "trill"	"\\trill"	-5.00\pt	5.00\pt	0.00\pt	11.25\pt	
         "upedalheel"	"\\upedalheel"	-2.50\pt	2.50\pt	-2.50\pt	3.33\pt	
         "dpedalheel"	"\\dpedalheel"	-2.50\pt	2.50\pt	-3.33\pt	2.50\pt	
-        "upedaltoe"	"\\upedaltoe"	-2.50\pt	2.50\pt	-0.00\pt	7.50\pt	
+        "upedaltoe"	"\\upedaltoe"	-2.50\pt	2.50\pt	0.00\pt	7.50\pt	
         "dpedaltoe"	"\\dpedaltoe"	-2.50\pt	2.50\pt	-7.50\pt	0.00\pt	
         "flageolet"	"\\flageolet"	-2.67\pt	2.67\pt	-2.67\pt	2.67\pt	
         }
diff --git a/init/feta23.ly b/init/feta23.ly
index e1ad925c23..a1800ec469 100644
--- a/init/feta23.ly
+++ b/init/feta23.ly
@@ -4,38 +4,38 @@
 % input from out/feta23.log
 % name=\symboltables {
     "rests"	 = \table {
-        "0"	"\\wholerest"	-0.00\pt	8.44\pt	-3.52\pt	0.00\pt	
-        "1"	"\\halfrest"	-0.00\pt	8.44\pt	-0.00\pt	3.52\pt	
+        "0"	"\\wholerest"	0.00\pt	8.44\pt	-3.52\pt	0.00\pt	
+        "1"	"\\halfrest"	0.00\pt	8.44\pt	0.00\pt	3.52\pt	
         "0o"	"\\outsidewholerest"	-3.52\pt	11.95\pt	-3.52\pt	0.56\pt	
         "1o"	"\\outsidehalfrest"	-3.52\pt	11.95\pt	-0.56\pt	3.52\pt	
-        "2"	"\\quartrest"	-0.00\pt	6.08\pt	4.22\pt	20.25\pt	
-        "3"	"\\eighthrest"	-0.00\pt	7.50\pt	5.62\pt	15.98\pt	
-        "4"	"\\sixteenthrest"	-0.00\pt	8.73\pt	-0.00\pt	15.98\pt	
-        "5"	"\\thirtysecondrest"	-0.00\pt	9.85\pt	-0.00\pt	21.61\pt	
-        "6"	"\\sixtyfourthrest"	-0.00\pt	10.56\pt	-0.00\pt	27.23\pt	
-        "7"	"\\hundredtwentyeighthrest"	-0.00\pt	11.75\pt	-0.00\pt	32.86\pt	
+        "2"	"\\quartrest"	0.00\pt	6.08\pt	4.22\pt	20.25\pt	
+        "3"	"\\eighthrest"	0.00\pt	7.50\pt	5.62\pt	15.98\pt	
+        "4"	"\\sixteenthrest"	0.00\pt	8.73\pt	0.00\pt	15.98\pt	
+        "5"	"\\thirtysecondrest"	0.00\pt	9.85\pt	0.00\pt	21.61\pt	
+        "6"	"\\sixtyfourthrest"	0.00\pt	10.56\pt	0.00\pt	27.23\pt	
+        "7"	"\\hundredtwentyeighthrest"	0.00\pt	11.75\pt	0.00\pt	32.86\pt	
         }
     "accidentals"	 = \table {
-        "1"	"\\sharp"	-0.00\pt	6.19\pt	-8.44\pt	8.44\pt	
-        "0"	"\\natural"	-0.00\pt	3.75\pt	-8.44\pt	8.44\pt	
+        "1"	"\\sharp"	0.00\pt	6.19\pt	-8.44\pt	8.44\pt	
+        "0"	"\\natural"	0.00\pt	3.75\pt	-8.44\pt	8.44\pt	
         "-1"	"\\flat"	-0.68\pt	4.50\pt	-2.81\pt	11.25\pt	
         "-2"	"\\flatflat"	-0.68\pt	8.16\pt	-2.81\pt	11.25\pt	
-        "2"	"\\sharpsharp"	-0.00\pt	5.62\pt	-2.81\pt	2.81\pt	
+        "2"	"\\sharpsharp"	0.00\pt	5.62\pt	-2.81\pt	2.81\pt	
         }
     "dots"	 = \table {
-        "dot"	"\\dot"	-0.00\pt	2.53\pt	-1.27\pt	1.27\pt	
-        "repeatcolon"	"\\repeatcolon"	-0.00\pt	2.53\pt	-2.81\pt	2.81\pt	
+        "dot"	"\\dot"	0.00\pt	2.53\pt	-1.27\pt	1.27\pt	
+        "repeatcolon"	"\\repeatcolon"	0.00\pt	2.53\pt	-2.81\pt	2.81\pt	
         }
     "balls"	 = \table {
-        "-1"	"\\brevisball"	-0.00\pt	11.25\pt	-3.09\pt	3.09\pt	
+        "-1"	"\\brevisball"	0.00\pt	11.25\pt	-3.09\pt	3.09\pt	
         "-1l"	"\\brevisledger"	-2.81\pt	14.06\pt	-0.56\pt	0.56\pt	
-        "-2"	"\\longaball"	-0.00\pt	11.25\pt	-3.09\pt	3.09\pt	
+        "-2"	"\\longaball"	0.00\pt	11.25\pt	-3.09\pt	3.09\pt	
         "-2l"	"\\longaledger"	-2.81\pt	14.06\pt	-0.56\pt	0.56\pt	
-        "0"	"\\wholeball"	-0.00\pt	11.14\pt	-3.09\pt	3.09\pt	
+        "0"	"\\wholeball"	0.00\pt	11.14\pt	-3.09\pt	3.09\pt	
         "0l"	"\\wholeledger"	-2.78\pt	13.92\pt	-0.56\pt	0.56\pt	
-        "1"	"\\halfball"	-0.00\pt	7.75\pt	-3.09\pt	3.09\pt	
+        "1"	"\\halfball"	0.00\pt	7.75\pt	-3.09\pt	3.09\pt	
         "1l"	"\\halfledger"	-1.94\pt	9.69\pt	-0.56\pt	0.56\pt	
-        "2"	"\\quartball"	-0.00\pt	7.43\pt	-3.09\pt	3.09\pt	
+        "2"	"\\quartball"	0.00\pt	7.43\pt	-3.09\pt	3.09\pt	
         "2l"	"\\quartledger"	-1.86\pt	9.29\pt	-0.56\pt	0.56\pt	
         }
     "scripts"	 = \table {
@@ -46,17 +46,17 @@
         "ustaccatissimo"	"\\ustaccatissimo"	-1.13\pt	1.13\pt	-0.20\pt	5.63\pt	
         "dstaccatissimo"	"\\dstaccatissimo"	-1.13\pt	1.13\pt	-5.63\pt	0.20\pt	
         "tenuto"	"\\tenuto"	-5.06\pt	5.06\pt	-0.34\pt	0.34\pt	
-        "umarcato"	"\\umarcato"	-2.81\pt	2.81\pt	-0.00\pt	6.19\pt	
+        "umarcato"	"\\umarcato"	-2.81\pt	2.81\pt	0.00\pt	6.19\pt	
         "dmarcato"	"\\dmarcato"	-2.81\pt	2.81\pt	-6.19\pt	0.00\pt	
         "open"	"\\ouvert"	-2.25\pt	2.25\pt	-2.81\pt	2.81\pt	
         "stopped"	"\\plusstop"	-3.09\pt	3.09\pt	-3.09\pt	3.09\pt	
-        "upbow"	"\\upbow"	-3.66\pt	3.66\pt	-0.00\pt	11.70\pt	
-        "downbow"	"\\downbow"	-4.22\pt	4.22\pt	-0.00\pt	7.50\pt	
+        "upbow"	"\\upbow"	-3.66\pt	3.66\pt	0.00\pt	11.70\pt	
+        "downbow"	"\\downbow"	-4.22\pt	4.22\pt	0.00\pt	7.50\pt	
         "turn"	"\\turn"	-6.15\pt	6.15\pt	-2.98\pt	2.98\pt	
-        "trill"	"\\trill"	-5.62\pt	5.62\pt	-0.00\pt	12.66\pt	
+        "trill"	"\\trill"	-5.62\pt	5.62\pt	0.00\pt	12.66\pt	
         "upedalheel"	"\\upedalheel"	-2.81\pt	2.81\pt	-2.81\pt	3.75\pt	
         "dpedalheel"	"\\dpedalheel"	-2.81\pt	2.81\pt	-3.75\pt	2.81\pt	
-        "upedaltoe"	"\\upedaltoe"	-2.81\pt	2.81\pt	-0.00\pt	8.44\pt	
+        "upedaltoe"	"\\upedaltoe"	-2.81\pt	2.81\pt	0.00\pt	8.44\pt	
         "dpedaltoe"	"\\dpedaltoe"	-2.81\pt	2.81\pt	-8.44\pt	0.00\pt	
         "flageolet"	"\\flageolet"	-3.00\pt	3.00\pt	-3.00\pt	3.00\pt	
         }
diff --git a/init/feta26.ly b/init/feta26.ly
index eeafb78848..024c623b31 100644
--- a/init/feta26.ly
+++ b/init/feta26.ly
@@ -4,38 +4,38 @@
 % input from out/feta26.log
 % name=\symboltables {
     "rests"	 = \table {
-        "0"	"\\wholerest"	-0.00\pt	9.75\pt	-4.06\pt	0.00\pt	
-        "1"	"\\halfrest"	-0.00\pt	9.75\pt	-0.00\pt	4.06\pt	
+        "0"	"\\wholerest"	0.00\pt	9.75\pt	-4.06\pt	0.00\pt	
+        "1"	"\\halfrest"	0.00\pt	9.75\pt	0.00\pt	4.06\pt	
         "0o"	"\\outsidewholerest"	-4.06\pt	13.81\pt	-4.06\pt	0.65\pt	
         "1o"	"\\outsidehalfrest"	-4.06\pt	13.81\pt	-0.65\pt	4.06\pt	
-        "2"	"\\quartrest"	-0.00\pt	7.02\pt	4.88\pt	23.40\pt	
-        "3"	"\\eighthrest"	-0.00\pt	8.67\pt	6.50\pt	18.47\pt	
-        "4"	"\\sixteenthrest"	-0.00\pt	10.08\pt	-0.00\pt	18.47\pt	
-        "5"	"\\thirtysecondrest"	-0.00\pt	11.38\pt	-0.00\pt	24.97\pt	
-        "6"	"\\sixtyfourthrest"	-0.00\pt	12.20\pt	-0.00\pt	31.47\pt	
-        "7"	"\\hundredtwentyeighthrest"	-0.00\pt	13.58\pt	-0.00\pt	37.97\pt	
+        "2"	"\\quartrest"	0.00\pt	7.02\pt	4.88\pt	23.40\pt	
+        "3"	"\\eighthrest"	0.00\pt	8.67\pt	6.50\pt	18.47\pt	
+        "4"	"\\sixteenthrest"	0.00\pt	10.08\pt	0.00\pt	18.47\pt	
+        "5"	"\\thirtysecondrest"	0.00\pt	11.38\pt	0.00\pt	24.97\pt	
+        "6"	"\\sixtyfourthrest"	0.00\pt	12.20\pt	0.00\pt	31.47\pt	
+        "7"	"\\hundredtwentyeighthrest"	0.00\pt	13.58\pt	0.00\pt	37.97\pt	
         }
     "accidentals"	 = \table {
-        "1"	"\\sharp"	-0.00\pt	7.15\pt	-9.75\pt	9.75\pt	
-        "0"	"\\natural"	-0.00\pt	4.33\pt	-9.75\pt	9.75\pt	
+        "1"	"\\sharp"	0.00\pt	7.15\pt	-9.75\pt	9.75\pt	
+        "0"	"\\natural"	0.00\pt	4.33\pt	-9.75\pt	9.75\pt	
         "-1"	"\\flat"	-0.78\pt	5.20\pt	-3.25\pt	13.00\pt	
         "-2"	"\\flatflat"	-0.78\pt	9.42\pt	-3.25\pt	13.00\pt	
-        "2"	"\\sharpsharp"	-0.00\pt	6.50\pt	-3.25\pt	3.25\pt	
+        "2"	"\\sharpsharp"	0.00\pt	6.50\pt	-3.25\pt	3.25\pt	
         }
     "dots"	 = \table {
-        "dot"	"\\dot"	-0.00\pt	2.92\pt	-1.46\pt	1.46\pt	
-        "repeatcolon"	"\\repeatcolon"	-0.00\pt	2.92\pt	-3.25\pt	3.25\pt	
+        "dot"	"\\dot"	0.00\pt	2.92\pt	-1.46\pt	1.46\pt	
+        "repeatcolon"	"\\repeatcolon"	0.00\pt	2.92\pt	-3.25\pt	3.25\pt	
         }
     "balls"	 = \table {
-        "-1"	"\\brevisball"	-0.00\pt	13.00\pt	-3.58\pt	3.58\pt	
+        "-1"	"\\brevisball"	0.00\pt	13.00\pt	-3.58\pt	3.58\pt	
         "-1l"	"\\brevisledger"	-3.25\pt	16.25\pt	-0.65\pt	0.65\pt	
-        "-2"	"\\longaball"	-0.00\pt	13.00\pt	-3.58\pt	3.58\pt	
+        "-2"	"\\longaball"	0.00\pt	13.00\pt	-3.58\pt	3.58\pt	
         "-2l"	"\\longaledger"	-3.25\pt	16.25\pt	-0.65\pt	0.65\pt	
-        "0"	"\\wholeball"	-0.00\pt	12.87\pt	-3.58\pt	3.58\pt	
+        "0"	"\\wholeball"	0.00\pt	12.87\pt	-3.58\pt	3.58\pt	
         "0l"	"\\wholeledger"	-3.22\pt	16.09\pt	-0.65\pt	0.65\pt	
-        "1"	"\\halfball"	-0.00\pt	8.95\pt	-3.58\pt	3.58\pt	
+        "1"	"\\halfball"	0.00\pt	8.95\pt	-3.58\pt	3.58\pt	
         "1l"	"\\halfledger"	-2.24\pt	11.19\pt	-0.65\pt	0.65\pt	
-        "2"	"\\quartball"	-0.00\pt	8.59\pt	-3.58\pt	3.58\pt	
+        "2"	"\\quartball"	0.00\pt	8.59\pt	-3.58\pt	3.58\pt	
         "2l"	"\\quartledger"	-2.15\pt	10.73\pt	-0.65\pt	0.65\pt	
         }
     "scripts"	 = \table {
@@ -46,17 +46,17 @@
         "ustaccatissimo"	"\\ustaccatissimo"	-1.30\pt	1.30\pt	-0.20\pt	6.50\pt	
         "dstaccatissimo"	"\\dstaccatissimo"	-1.30\pt	1.30\pt	-6.50\pt	0.20\pt	
         "tenuto"	"\\tenuto"	-5.85\pt	5.85\pt	-0.39\pt	0.39\pt	
-        "umarcato"	"\\umarcato"	-3.25\pt	3.25\pt	-0.00\pt	7.15\pt	
+        "umarcato"	"\\umarcato"	-3.25\pt	3.25\pt	0.00\pt	7.15\pt	
         "dmarcato"	"\\dmarcato"	-3.25\pt	3.25\pt	-7.15\pt	0.00\pt	
         "open"	"\\ouvert"	-2.60\pt	2.60\pt	-3.25\pt	3.25\pt	
         "stopped"	"\\plusstop"	-3.58\pt	3.58\pt	-3.58\pt	3.58\pt	
-        "upbow"	"\\upbow"	-4.23\pt	4.23\pt	-0.00\pt	13.52\pt	
-        "downbow"	"\\downbow"	-4.88\pt	4.88\pt	-0.00\pt	8.67\pt	
+        "upbow"	"\\upbow"	-4.23\pt	4.23\pt	0.00\pt	13.52\pt	
+        "downbow"	"\\downbow"	-4.88\pt	4.88\pt	0.00\pt	8.67\pt	
         "turn"	"\\turn"	-7.11\pt	7.11\pt	-3.44\pt	3.44\pt	
-        "trill"	"\\trill"	-6.50\pt	6.50\pt	-0.00\pt	14.62\pt	
+        "trill"	"\\trill"	-6.50\pt	6.50\pt	0.00\pt	14.62\pt	
         "upedalheel"	"\\upedalheel"	-3.25\pt	3.25\pt	-3.25\pt	4.33\pt	
         "dpedalheel"	"\\dpedalheel"	-3.25\pt	3.25\pt	-4.33\pt	3.25\pt	
-        "upedaltoe"	"\\upedaltoe"	-3.25\pt	3.25\pt	-0.00\pt	9.75\pt	
+        "upedaltoe"	"\\upedaltoe"	-3.25\pt	3.25\pt	0.00\pt	9.75\pt	
         "dpedaltoe"	"\\dpedaltoe"	-3.25\pt	3.25\pt	-9.75\pt	0.00\pt	
         "flageolet"	"\\flageolet"	-3.47\pt	3.47\pt	-3.47\pt	3.47\pt	
         }
diff --git a/lily/spring-spacer.cc b/lily/spring-spacer.cc
index bf5a8094a5..91e0ba7048 100644
--- a/lily/spring-spacer.cc
+++ b/lily/spring-spacer.cc
@@ -440,20 +440,22 @@ Spring_spacer::get_ruling_durations(Array<Moment> &shortest_playing_arr,
       scol_l (i)->print ();
     }
   int start_context_i=0;
-  Moment context_shortest = infinity_mom;
+  Moment context_shortest;
+  context_shortest.set_infinite (1);
   context_shortest_arr.set_size(cols.size());
 
   for (int i=0; i < cols.size(); i++)
     {
       Moment now = scol_l (i)->when();
-      Moment shortest_playing = infinity_mom;
+      Moment shortest_playing;
+      shortest_playing.set_infinite (1);
 
       if (scol_l (i)->breakable_b_)
 	{
 	  for (int ji=i; ji >= start_context_i; ji--)
 	    context_shortest_arr[ji] = context_shortest;
 	  start_context_i = i;
-	  context_shortest = infinity_mom;
+	  context_shortest.set_infinite (1);
 	}
       if (scol_l (i)->durations.size())
 	{
@@ -559,13 +561,13 @@ Spring_spacer::calc_idealspacing()
 	  if (! shortest_playing_len)
 	    {
 	      warning (_("Can't find a ruling note at ")
-		       +String (scol_l (i)->when()));
+		       +scol_l (i)->when().str ());
 	      shortest_playing_len = 1;
 	    }
 	  if (! context_shortest)
 	    {
 	      warning(_("No minimum in measure at ")
-		      + String (scol_l (i)->when()));
+		      + scol_l (i)->when().str ());
 	      context_shortest = 1;
 	    }
 	  Moment delta_t = scol_l (i+1)->when() - scol_l (i)->when ();
diff --git a/lily/time-description.cc b/lily/time-description.cc
index 1294c6ca98..1437a7c441 100644
--- a/lily/time-description.cc
+++ b/lily/time-description.cc
@@ -17,9 +17,9 @@ Time_description::str() const
 	s+=String (" (cadenza) ");
   s+= "at ";
   s+=when_;
-  s+="\nmeter " + String (whole_per_measure_/one_beat_) +":" +
-	String (Rational (Rational (1)/one_beat_));
-  s+= "\nposition "+String (bars_i_) + ":"+ whole_in_measure_ +"\n}\n";
+  s+="\nmeter " + (whole_per_measure_/one_beat_).str () +":" +
+	 (Rational (Rational (1)/one_beat_)).str ();
+  s+= "\nposition "+String (bars_i_) + ":"+ whole_in_measure_.str () +"\n}\n";
   return s;
 }
 
diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm
index 72e1d2a8a6..673546fc1b 100644
--- a/make/lelievijver.lsm
+++ b/make/lelievijver.lsm
@@ -1,7 +1,7 @@
 Begin3
 Titel: LilyPond
-Versie: 0.1.47
-Inschrijf datum: 06MAR98
+Versie: 0.1.48
+Inschrijf datum: 12MAR98
 Beschrijving: LilyPond is de muziek typesetter van het GNU Project.  
 		Het programma genereert muziek in zichtbare of 
 		hoorbare vorm uit uit een muzikale definitie file: 
@@ -16,8 +16,8 @@ Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
 	jan@digicash.com (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
-	395k lilypond-0.1.47.tar.gz 
+	395k lilypond-0.1.48.tar.gz 
 Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/
-	395k lilypond-0.1.47.tar.gz 
+	395k lilypond-0.1.48.tar.gz 
 Copi"eer politie: GPL
 End
diff --git a/make/lilypond.lsm b/make/lilypond.lsm
index a0620497c1..74fe198eb2 100644
--- a/make/lilypond.lsm
+++ b/make/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
-Version: 0.1.47
-Entered-date: 06MAR98
+Version: 0.1.48
+Entered-date: 12MAR98
 Description: LilyPond is the GNU Project music typesetter.  The program
 		generates visual or auditive output from a music 
 		definition file: it can typeset formatted sheet music 
@@ -15,8 +15,8 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys)
 	jan@digicash.com (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-	470k lilypond-0.1.47.tar.gz 
+	470k lilypond-0.1.48.tar.gz 
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
-	470k lilypond-0.1.47.tar.gz 
+	470k lilypond-0.1.48.tar.gz 
 Copying-policy: GPL
 End
diff --git a/make/lilypond.spec b/make/lilypond.spec
index 1092351059..1f1c1addb8 100644
--- a/make/lilypond.spec
+++ b/make/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 0.1.47
+Version: 0.1.48
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.47.tar.gz
+Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.48.tar.gz
 Summary: A program for typesetting music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>
@@ -31,8 +31,8 @@ strip lily/out/lilypond mi2mu/out/mi2mu
 make -C Documentation gifs
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
-%doc Documentation/out/ANNOUNCE.txt Documentation/out/AUTHORS.txt Documentation/out/CodingStyle.txt Documentation/out/DEDICATION.txt Documentation/out/INSTALL.txt Documentation/out/MANIFESTO.txt Documentation/out/NEWS.txt Documentation/out/TODO.txt Documentation/out/cadenza.ly.txt Documentation/out/collisions.ly.txt Documentation/out/convert-mudela.txt Documentation/out/faq.txt Documentation/out/font16.ly.txt Documentation/out/font20.ly.txt Documentation/out/gallina.ly.txt Documentation/out/gnu-music.txt Documentation/out/index.txt Documentation/out/internals.txt Documentation/out/language.txt Documentation/out/lilypond.txt Documentation/out/links.txt Documentation/out/literature.txt Documentation/out/ly2dvi.txt Documentation/out/mi2mu.txt Documentation/out/mudela-book.txt Documentation/out/multi.ly.txt Documentation/out/mutopia.txt Documentation/out/other-packages.txt Documentation/out/praeludium-fuga-E.ly.txt Documentation/out/preludes-1.ly.txt Documentation/out/preludes-2.ly.txt Documentation/out/rhythm.ly.txt Documentation/out/scsii-menuetto.ly.txt Documentation/out/standje.ly.txt Documentation/out/twinkle-pop.ly.txt Documentation/out/twinkle.ly.txt Documentation/out/wtk1-fugue2.ly.txt Documentation/out/wtk1-prelude1.ly.txt BUGS TODO NEWS DEDICATION ANNOUNCE README
-%doc input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc 
+%doc Documentation/out/ANNOUNCE.txt Documentation/out/AUTHORS.txt Documentation/out/CodingStyle.txt Documentation/out/DEDICATION.txt Documentation/out/INSTALL.txt Documentation/out/MANIFESTO.txt Documentation/out/NEWS.txt Documentation/out/TODO.txt Documentation/out/convert-mudela.txt Documentation/out/faq.txt Documentation/out/gnu-music.txt Documentation/out/index.txt Documentation/out/internals.txt Documentation/out/language.txt Documentation/out/lilypond.txt Documentation/out/links.txt Documentation/out/literature.txt Documentation/out/ly2dvi.txt Documentation/out/mi2mu.txt Documentation/out/mudela-book.txt Documentation/out/mutopia.txt Documentation/out/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README
+%doc input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc 
 %doc Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/mudela-book