patch::: 0.0.68pre.jcn1: Re: patsen?

[lilypond.git] / lily / paper-def.cc

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 1b3a74b2a5f581636d1e6eca6a2841ae41b97ea5..18158eba08a107f77503c937c27e76306b4ccdb8 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -1,3 +1,11 @@
+/*
+  paper-def.cc -- implement Paper_def
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
 #include <math.h>
 #include "misc.hh"
 #include "paper-def.hh"
@@ -7,10 +15,6 @@
 
 
 
-// golden ratio
-const Real PHI = (1+sqrt(5))/2;
-
-// see  Roelofs, p. 57
 Real
 Paper_def::duration_to_dist(Moment d)
 {
@@ -32,7 +36,7 @@ Paper_def::Paper_def(Lookup *l)
     linewidth = 15 *CM_TO_PT;          // in cm for now
     whole_width = 8 * note_width();
     geometric_ = sqrt(2);
-    outfile = "lelie.out";
+    outfile = "lelie.tex";
 }
 
 Paper_def::~Paper_def()
@@ -57,15 +61,20 @@ Paper_def::set(Lookup*l)
 }
 
 Real
-Paper_def::interline() const
+Paper_def::interline_f() const
 {
     return lookup_p_->ball(4).dim.y.length();
 }
 
 Real
-Paper_def::internote() const
+Paper_def::interbeam_f() const
+{
+    return lookup_p_->interbeam_f();
+}
+Real
+Paper_def::internote_f() const
 {
-    return lookup_p_->internote();
+    return lookup_p_->internote_f();
 }
 Real
 Paper_def::note_width()const