Use Emacs comment convention (";; " instead of ";") in several files

[lilypond.git] / scm / song.scm

diff --git a/scm/song.scm b/scm/song.scm
index 71eb03d72f4b5aa17ed5f5902c98798fdac5f2fb..21cff9cfeddcd439772bbb6e8b27fe264d4f5532 100644 (file)
--- a/scm/song.scm
+++ b/scm/song.scm
@@ -45,7 +45,7 @@
 ;; The resulting base octave is sum of *base-octave* and
 ;; *base-octave-shift*.  This is done to work around a Festival bug
 ;; causing Festival to segfault or produce invalid pitch on higher pitches.
-;(define *base-octave-shift* -2)
+;; (define *base-octave-shift* -2)
 (define *base-octave-shift* (make-parameter 0))
 
 ;; The coeficient by which the notes just before \breath are shortened.
@@ -134,10 +134,7 @@
 (define *tempo-compression* #f)
 
 (define (duration->number duration)
-  (let* ((log (ly:duration-log duration))
-         (dots (ly:duration-dot-count duration))
-         (factor (ly:duration-factor duration)))
-    (exact->inexact (* (expt 2 (- log)) (+ 1 (/ dots 2)) (/ (car factor) (cdr factor))))))
+  (exact->inexact (ly:moment-main (ly:duration-length duration))))
 
 (define (tempo->beats music)
   (let* ((tempo-spec (find-child-named music 'SequentialMusic))
@@ -262,9 +259,10 @@
   )
 
 (defstruct score-notes
-  note/rest-list ; list of note and rest instances
-  (verse-block-list '()) ; lyrics attached to notes -- multiple elements are
-                         ; possible for multiple stanzas
+  note/rest-list                        ; list of note and rest instances
+  (verse-block-list '())                ; lyrics attached to notes -- multiple
+                                        ; elements are possible for
+                                        ; multiple stanzas
   )
 
 (defstruct note