From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 27 Dec 2004 09:43:59 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.14~351
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d983c03ae234308c7b284f42e00aff40fd93e14c;p=lilypond.git

*** empty log message ***
---

diff --git a/scm/beam.scm b/scm/beam.scm
index 87739bbbcd..97a1f2ce34 100644
--- a/scm/beam.scm
+++ b/scm/beam.scm
@@ -94,7 +94,7 @@
 	  (ly:warn "Error in beam quanting found. Want ~S 0 found ~S."
 		   (procedure-name comparison) slope-sign)
 	  (set! (ly:grob-property beam 'quant-score)
-		(format "~S 0" (procedure-name comparison) )))
+		(format "~S 0" (procedure-name comparison))))
 	(set! (ly:grob-property beam 'quant-score) ""))))
 
 (define-public (check-quant-callbacks l r)
diff --git a/scm/chord-generic-names.scm b/scm/chord-generic-names.scm
index 7a1ff18932..91a99534b1 100644
--- a/scm/chord-generic-names.scm
+++ b/scm/chord-generic-names.scm
@@ -134,7 +134,7 @@ input/test/dpncnt.ly).
     (if (pair? exceptions)
 	(let* ((e (car exceptions))
 	       (e-pitches (car e)))
-	  (if (equal? e-pitches (take pitches (length e-pitches) ))
+	  (if (equal? e-pitches (take pitches (length e-pitches)))
 	      e
 	      (partial-match (cdr exceptions))))
 	#f))
@@ -160,8 +160,8 @@ input/test/dpncnt.ly).
 	 ;; kludge alert: replace partial matched lower part of all with
 	 ;; 'normal' pitches from full
 	 ;; (all pitches)
-	 (all (append (take full (length partial-pitches) )
-		      (drop pitches (length partial-pitches) )))
+	 (all (append (take full (length partial-pitches))
+		      (drop pitches (length partial-pitches))))
 	
 	 (highest (last all))
 	 (missing (list-minus full (map pitch-unalter all)))
diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index af8b06b6e6..2c63a7d4e9 100644
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -65,10 +65,10 @@
     (make-line-markup
      (list
       (string-append
-       (list-ref '("c" "d" "e" "f" "g" "a" "h" "b")  (car n-a) )
+       (list-ref '("c" "d" "e" "f" "g" "a" "h" "b")  (car n-a))
        (if (or (equal? (car n-a) 2) (equal? (car n-a) 5))
-	   (list-ref '( "ses"  "s" "" "is" "isis") (+ 2 (/ (cdr n-a) 2) ))
-	   (list-ref '("eses" "es" "" "is" "isis") (+ 2 (/ (cdr n-a) 2) ))))))))
+	   (list-ref '( "ses"  "s" "" "is" "isis") (+ 2 (/ (cdr n-a) 2)))
+	   (list-ref '("eses" "es" "" "is" "isis") (+ 2 (/ (cdr n-a) 2)))))))))
 
 ;; fixme we should standardize on omit-root (or the other one.)
 ;; perhaps the  default should also be reversed --hwn
diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index aecf2acb02..287c452288 100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -76,7 +76,7 @@
 (ly:add-interface
  'only-prebreak-interface
  "Kill this grob after the line breaking process."
- '() )
+ '())
 
 (ly:add-interface
  'piano-pedal-interface
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index edad8f922a..343f261a6e 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -415,7 +415,7 @@
 	(direction . -1)
 	
 	(meta . ((interfaces . (dynamic-interface axis-group-interface
-						  side-position-interface spanner-interface)))) ))
+						  side-position-interface spanner-interface))))))
 
     (LeftEdge
      . (
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index c8e05e405e..5c1c745d3b 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -148,7 +148,7 @@ determines the space between each markup in @var{args}."
 
     (if (markup? m)
 	(interpret-markup layout props m)
-	(ly:make-stencil '()  '(1 . -1) '(1 . -1) ))))
+	(ly:make-stencil '()  '(1 . -1) '(1 . -1)))))
 
 
 (def-markup-command (on-the-fly layout props procedure arg) (symbol? markup?)
@@ -463,7 +463,7 @@ and/or @code{extra-offset} properties. "
                     (apply ly:stencil-add
                            (map (lambda (x)
                                   (ly:stencil-translate-axis
-                                   dot  (* (+ 1 (* 2 x)) dotwid) X) )
+                                   dot  (* (+ 1 (* 2 x)) dotwid) X))
                                 (iota dot-count 1)))))
          (flaggl (and (> log 2)
                       (ly:stencil-translate
@@ -611,7 +611,7 @@ will put extra space between A and B, on top of the space that is
 normally inserted before elements on a line.
 "
   (if (> amount 0)
-      (ly:make-stencil "" (cons 0 amount) '(-1 . 1) )
+      (ly:make-stencil "" (cons 0 amount) '(-1 . 1))
       (ly:make-stencil "" (cons amount amount) '(-1 . 1))))
 
 (def-markup-command (override layout props new-prop arg) (pair? markup?)
@@ -693,7 +693,7 @@ around the markup."
 the elements marked in @var{indices}, which is a list of numbers."
 
   (define (sublist lst start stop)
-    (take (drop lst start) (- (1+ stop) start)) )
+    (take (drop lst start) (- (1+ stop) start)))
 
   (define (stencil-list-extent ss axis)
     (cons
diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index 8a828b4a8c..442a225b55 100644
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -12,8 +12,11 @@
 	 (docfunc (lambda (pr)
 		    (property->texi
 		     'backend pr grob-description)))
-	 (iprops (filter (lambda (x) (object-property x 'backend-internal) ) props))
-	 (uprops (filter (lambda (x) (not (object-property x 'backend-internal)) ) props))
+	 (iprops (filter (lambda (x) (object-property x 'backend-internal))
+			 props))
+	 (uprops (filter
+		  (lambda (x) (not (object-property x 'backend-internal)))
+		  props))
 	 (user-propdocs (map docfunc uprops))
 	 (internal-propdocs (map docfunc iprops)))
 
@@ -62,7 +65,7 @@
 	       (map ref-ify
 		    (sort 
 		     (map symbol->string
-			  (hashq-ref iface->grob-table (car interface) '() ))
+			  (hashq-ref iface->grob-table (car interface) '()))
 		     string<?)))))))
 
 (define (grob-alist->texi alist)
@@ -134,7 +137,7 @@ node."
 ;;;;;;;;;;;;;;;;
 
 (define (lookup-interface name)
-  (let* ((entry (hashq-ref (ly:all-grob-interfaces) name '() )))
+  (let* ((entry (hashq-ref (ly:all-grob-interfaces) name '())))
     (if (equal? entry #f)
 	(error "Unknown interface" name))
     entry))
diff --git a/scm/document-markup.scm b/scm/document-markup.scm
index 65f0e5e0dc..0ffbdc53ef 100644
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -6,7 +6,7 @@
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (doc-markup-function func)
-  (let* ((doc-str  (procedure-documentation func) )
+  (let* ((doc-str  (procedure-documentation func))
 	 (f-name (symbol->string (procedure-name  func)))
 	 (c-name (regexp-substitute/global #f "-markup$" f-name  'pre "" 'post))
 	 (sig (object-property func 'markup-signature))
@@ -43,7 +43,7 @@
    (apply string-append
 	  
 	  (map doc-markup-function
-	       (sort markup-function-list markup-function<?) ) )
+	       (sort markup-function-list markup-function<?)))
    "\n@end table"))
 
 (define (markup-doc-node)
diff --git a/scm/document-translation.scm b/scm/document-translation.scm
index 9aa54b4f8e..192f39f69a 100644
--- a/scm/document-translation.scm
+++ b/scm/document-translation.scm
@@ -157,7 +157,7 @@
 		    (cdr (assoc 'consists context-desc))))
 	 (props (cdr (assoc 'property-ops context-desc)))
 	 (grobs  (context-grobs context-desc))
-	 (grob-refs (map (lambda (x) (ref-ify x)) grobs)) )
+	 (grob-refs (map (lambda (x) (ref-ify x)) grobs)))
 
     (make <texi-node>
       #:name name
diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 82649a53ac..e545248e88 100644
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -36,11 +36,11 @@
 
 (display
  (backend-properties-doc-string all-user-grob-properties)
- (open-output-file "layout-properties.tely") )
+ (open-output-file "layout-properties.tely"))
 
 (display
  (translation-properties-doc-string all-user-translation-properties)
- (open-output-file "context-properties.tely") )
+ (open-output-file "context-properties.tely"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff --git a/scm/font.scm b/scm/font.scm
index 955021c40d..54126715a3 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -47,7 +47,7 @@
        (list
 	"Font-size-family: \n"
 	(slot-ref leaf 'default-size) 
-	(slot-ref leaf 'size-vector) )))
+	(slot-ref leaf 'size-vector))))
 
 (define-method (display (node <Font-tree-node>) port)
 
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index b6bdb22368..b5d91fe99c 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -20,13 +20,13 @@
   (if (ly:get-option 'safe)
       (regexp-substitute/global
        #f "\\\\"
-       (regexp-substitute/global #f "([{}])" s 'pre  "\\" 1 'post )
+       (regexp-substitute/global #f "([{}])" s 'pre  "\\" 1 'post)
        'pre "$\\backslash$" 'post)
       s))
 
 (define (symbol->tex-key sym)
   (regexp-substitute/global
-   #f "_" (sanitize-tex-string (symbol->string sym)) 'pre "X" 'post) )
+   #f "_" (sanitize-tex-string (symbol->string sym)) 'pre "X" 'post))
 
 (define (tex-number-def prefix key number)
   (string-append
diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 211503981c..6a41b3f666 100644
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -246,25 +246,26 @@ with magnification @varr{mag} of the string @var{text}."
    (if (not (null? barre-list))
      (let* ((string1 (caar barre-list))
             (string2 (cadar barre-list))
-            (fret    (caddar barre-list))
+            (fret (caddar barre-list))
             (barre-type (chain-assoc-get 'barre-type props 'curved))
             (scale-dot-radius (* size dot-radius))
             (barre-vertical-offset (chain-assoc-get 'barre-vertical-offset props 0.5))
-            ; 2 is 1 for empty fret at bottom of figure + 1 for interval (top-fret - fret + 1) -- not an arbitrary constant
-            (dot-center-y (* size (- (+ 2 (- (cadr fret-range) fret))dot-position) ))
-            (bottom (+  dot-center-y (* barre-vertical-offset scale-dot-radius)))
+            ;; 2 is 1 for empty fret at bottom of figure + 1 for interval (top-fret - fret + 1) -- not an arbitrary constant
+            (dot-center-y (* size
+			     (- (+ 2 (- (cadr fret-range) fret)) dot-position)))
+            (bottom (+ dot-center-y (* barre-vertical-offset scale-dot-radius)))
             (left (* size (- string-count string1)))
             (right (* size (- string-count string2)))
-;            (bezier-thick (chain-assoc-get 'bezier-thickness props 0.1))
+;;            (bezier-thick (chain-assoc-get 'bezier-thickness props 0.1))
             (bezier-thick 0.1)
-;            (bezier-height (chain-assoc-get 'bezier-height props 0.5))
+;;            (bezier-height (chain-assoc-get 'bezier-height props 0.5))
             (bezier-height 0.5)
             (bezier-list (make-bezier-sandwich-list left right bottom (* size bezier-height) (* size bezier-thick)))
             (barre-stencil (if (eq? barre-type 'straight)
                               (ly:make-stencil (list 'draw-line (* size dot-radius) left dot-center-y right dot-center-y)
                                                (cons left right)
                                                (cons (- dot-center-y scale-dot-radius) (+ dot-center-y scale-dot-radius))) 
-                              (ly:make-stencil (list 'bezier-sandwich `(quote ,bezier-list) (* size bezier-thick) )
+                              (ly:make-stencil (list 'bezier-sandwich `(quote ,bezier-list) (* size bezier-thick))
                                   (cons left right)
                                   (cons bottom (+ bottom (* size bezier-height)))))))
         (if (not (null? (cdr barre-list)))
@@ -505,7 +506,7 @@ Note:  There is no limit to the number of fret indications per string.
                  
 (define (get-numeric-from-key keystring)
  "Get the numeric value from a key  of the form k:val"
-    (string->number (substring keystring 2  (string-length keystring) )))
+    (string->number (substring keystring 2 (string-length keystring))))
   
 (define (numerify mylist)
  "Convert string values to numeric or character"
diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 32b44fddec..fc02af4f68 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -207,7 +207,7 @@ found."
    c))
 
 (define-public (split-list lst sep?)
-   "(display (split-list '(a b c / d e f / g) (lambda (x) (equal? x '/))) )
+   "(display (split-list '(a b c / d e f / g) (lambda (x) (equal? x '/))))
    =>
    ((a b c) (d e f) (g))
   "
diff --git a/scm/lily.scm b/scm/lily.scm
index 1e907d6936..b8e3cfc077 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -237,7 +237,7 @@ predicates. Print a message at LOCATION if any predicate failed."
 
 (define gc-protect-stat-count 0)
 (define-public (dump-gc-protects)
-  (set! gc-protect-stat-count (1+ gc-protect-stat-count) )
+  (set! gc-protect-stat-count (1+ gc-protect-stat-count))
   (let* ((protects (sort
 		    (hash-table->alist (ly:protects))
 		    (lambda (a b)
diff --git a/scm/midi.scm b/scm/midi.scm
index 70a4d7c0b0..ed82a5a525 100644
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -56,7 +56,7 @@
 	 )
        instrument-equalizer-alist))
 
-;; (name . program+32768*(channel10 ? 1 : 0) )
+;; (name . program+32768*(channel10 ? 1 : 0))
 (define instrument-names-alist '())
 (set! instrument-names-alist
       (append
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 3048acebea..f4bee703a2 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -734,7 +734,7 @@ use GrandStaff as a context. "
       ;; as cautionaries
       ((equal? style 'modern-voice-cautionary)
        (set-accidentals-properties #f
-				   '(Voice (same-octave . 0) )
+				   '(Voice (same-octave . 0))
 				   '(Voice (any-octave . 0) (same-octave . 1)
 					   Staff (same-octave . 0) (any-octave . 0) (same-octave . 1))
 				   context))
@@ -790,6 +790,6 @@ use GrandStaff as a context. "
   
   (let* ((skip
 	  (make-multi-measure-rest
-	   (ly:make-duration 0 0) '() )))
+	   (ly:make-duration 0 0) '())))
     (ly:music-compress skip (ly:music-length mus))
     skip))
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 6234339c13..6172b8cb2e 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -5,6 +5,7 @@
 ;;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
+
 ;;; Tablature functions, by Jiba (jiba@tuxfamily.org)
 
 ;; The TabNoteHead stem attachment function.
@@ -24,16 +25,16 @@
   (let* ((note-collums (ly:grob-property grob 'note-columns))
          (note-column1 (cadr note-collums))
          (note-column2 (car  note-collums))
-         (note1        (car (ly:grob-property note-column1 'note-heads)))
-         (note2        (car (ly:grob-property note-column2 'note-heads)))
-	 (text1  (ly:grob-property note1 'text))
-	 (text2  (ly:grob-property note2 'text))
-         (fret1        (if (string? text1) (string->number text1) 0))
-         (fret2        (if (string? text2) (string->number text2) 0))
-         (letter       (cond
-			((< fret1 fret2) "H")
-			((> fret1 fret2) "P")
-			(else ""))))
+         (note1 (car (ly:grob-property note-column1 'note-heads)))
+         (note2 (car (ly:grob-property note-column2 'note-heads)))
+	 (text1 (ly:grob-property note1 'text))
+	 (text2 (ly:grob-property note2 'text))
+         (fret1 (if (string? text1) (string->number text1) 0))
+         (fret2 (if (string? text2) (string->number text2) 0))
+         (letter (cond
+		  ((< fret1 fret2) "H")
+		  ((> fret1 fret2) "P")
+		  (else ""))))
     (let* ((slur
 	    ;; (Slur::print grob)
 
@@ -52,34 +53,31 @@
                   -2.0)))
 	
         (ly:stencil-set-extent! text 0 (cons x x))
-        (ly:stencil-align-to! text 0 1))) ) )
+        (ly:stencil-align-to! text 0 1)))))
 
-					;      (ly:stencil-combine-at-edge slur 1 1 text -0.6)
+;; (ly:stencil-combine-at-edge slur 1 1 text -0.6)
 
 
 
 (define-public guitar-tunings '(4 -1 -5 -10 -15 -20))
 
-					; end of tablature functions
+;;; end of tablature functions
 
 
 (define-public (make-stencil-boxer line-thick x-padding y-padding callback)
   "Makes a routine that adds a box around the grob parsed as argument"
   (define (stencil-boxer grob)
-    (let*
-	(
-	 (mol    (callback grob))
-	 (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding))
-	 (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding))
-	 (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick)
-					  (cons 0 line-thick)))
-	 (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext)))
-
+    (let* ((mol (callback grob))
+	   (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding))
+	   (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding))
+	   (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick)
+					    (cons 0 line-thick)))
+	   (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext)))
+      
       (set! mol (ly:stencil-combine-at-edge mol 0 1 y-rule x-padding))
       (set! mol (ly:stencil-combine-at-edge mol 0 -1 y-rule x-padding))
       (set! mol (ly:stencil-combine-at-edge mol 1 1 x-rule 0))  
       (set! mol (ly:stencil-combine-at-edge mol 1 -1 x-rule 0))
-      
       mol))
   stencil-boxer)
 
@@ -230,7 +228,7 @@ centered, X==1 is at the right, X == -1 is at the left."
 
     (if (equal? result #f)
 	(ly:warn "Unknown bar glyph: `~S'" glyph)
-	(index-cell (cdr result) dir))) )
+	(index-cell (cdr result) dir))))
 
 (define-public (shift-right-at-line-begin g)
   "Shift an item to the right, but only at the start of the line."
diff --git a/scm/output-pdf.scm b/scm/output-pdf.scm
index 8ee7363c41..6cc3a1f751 100644
--- a/scm/output-pdf.scm
+++ b/scm/output-pdf.scm
@@ -34,7 +34,7 @@
   (moveto (+ x (car currentpoint)) (+ y (cdr currentpoint))))
 (define (lineto x y)
   (set! currentpoint (cons x y))
-  (string-append (showcp) "lst "))
+  (string-append (showcp) "l "))
 (define (lineto-pair pair)
   (lineto (car pair) (cdr pair)))
 (define (rlineto x y)
diff --git a/scm/output-pdftex.scm b/scm/output-pdftex.scm
index e8378aeacb..9dfb6040ae 100644
--- a/scm/output-pdftex.scm
+++ b/scm/output-pdftex.scm
@@ -216,4 +216,4 @@
 (define (no-origin) "")
 
 (define-public (pdftex-output-expression expr port)
-  (display (eval expr this-module) port) )
+  (display (eval expr this-module) port))
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index ea29cff999..db74518d94 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -230,7 +230,7 @@
   ;; extract the hsbw for /space from the font.
   (let* ((space-length (cdar (ly:text-dimension font " "))) 
 	 (commands '())
-	 (add-command (lambda (x) (set! commands (cons x commands)))) )
+	 (add-command (lambda (x) (set! commands (cons x commands)))))
 
     (string-fold
      (lambda (chr word)
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index ccfc71329a..ac4283c7a1 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -209,7 +209,7 @@ is what have collected so far, and has ascending page numbers."
 		     lines)
 		    (if (= (length lines) 1)
 			'((0 .  0))
-			'())) ))
+			'()))))
 	 (real-extents
 	  (list->vector
 	   (append
@@ -217,7 +217,7 @@ is what have collected so far, and has ascending page numbers."
 	     (lambda (sys) (ly:paper-system-extent sys Y)) lines)
 	    (if (= (length lines) 1)
 		'((0 .  0))
-		'()) )))
+		'()))))
 	 (no-systems (vector-length real-extents))
 	 (topskip (interval-end (vector-ref real-extents 0)))
 	 (space-left (- page-height
diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index 2679c195e7..989b3c2884 100644
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -26,7 +26,7 @@
   (display (events x) file)
   (display " active = " file)
   (display (span-state x) file)
-  (display "\n" file) )
+  (display "\n" file))
 
 (define-method (note-events (vs <Voice-state>))
   (define (f? x)
@@ -35,7 +35,7 @@
 
 (define-method (previous-voice-state (vs <Voice-state>))
   (let ((i (slot-ref vs 'vector-index))
-	(v (slot-ref vs 'state-vector)) )
+	(v (slot-ref vs 'state-vector)))
     (if (< 0 i)
 	(vector-ref v (1- i))
 	#f)))
@@ -57,7 +57,7 @@
   (display (configuration x) f)
   (if (synced? x)
       (display " synced "))
-  (display "\n" f) )
+  (display "\n" f))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -73,8 +73,8 @@
 				    #:tuning (cdar v)
 				    #:events (map car (cdr v))))
 				evl))))
-    (do ( (i 0 (1+ i)) )
-	( (= i (vector-length vec)) vec)
+    (do ((i 0 (1+ i)))
+	((= i (vector-length vec)) vec)
       (slot-set! (vector-ref vec i) 'vector-index i)
       (slot-set! (vector-ref vec i) 'state-vector vec))))
 
@@ -499,7 +499,7 @@ the mark when there are no spanners active."
 
 (define-public (add-quotable name mus)
   (set! noticed '())
-  (let* ((tab (eval 'musicQuotes (current-module) ))
+  (let* ((tab (eval 'musicQuotes (current-module)))
 	 (context (ly:run-translator (context-spec-music mus 'Voice)
 				     part-combine-listener))
 	 (first-voice-handle (last-pair noticed)))
diff --git a/scm/script.scm b/scm/script.scm
index 74631d0b8d..a9e5762510 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -75,7 +75,7 @@
 	   (direction .  1)))
 	 ("stopped" .
 	  ((script-stencil . (feta . ("stopped" . "stopped")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("staccato" .
 	  ((script-stencil . (feta . ("staccato" . "staccato")))
 	   (side-relative-direction .  -1)
@@ -98,7 +98,7 @@
 	 ("upbow" .
 	  ((script-stencil . (feta . ("upbow" . "upbow")))
 	   (inside-slur . #f)
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("downbow" .
 	  ((script-stencil . (feta . ("downbow" . "downbow")))
 	   (inside-slur . #f)
@@ -109,70 +109,70 @@
 	  )
 	 ("rheel" .
 	  ((script-stencil . (feta . ("dpedalheel" . "dpedalheel")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("ltoe" .
 	  ((script-stencil . (feta . ("upedaltoe" . "upedaltoe")))
-	   (direction  . -1) ))
+	   (direction  . -1)))
 	 ("rtoe" .
 	  ((script-stencil . (feta . ("dpedaltoe" . "dpedaltoe")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("turn" .
 	  ((script-stencil . (feta . ("turn" . "turn")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("open" .
 	  ((script-stencil . (feta . ("open" . "open")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("flageolet" .
 	  ((script-stencil . (feta . ("flageolet" . "flageolet")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("reverseturn" .
 	  ((script-stencil . (feta . ("reverseturn" . "reverseturn")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("trill" .
 	  ((script-stencil . (feta . ("trill" . "trill")))
 	   (direction . 1)
 	   (priority . 2000)))
 	 ("prall" .
 	  ((script-stencil . (feta . ("prall" . "prall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("mordent" .
 	  ((script-stencil . (feta . ("mordent" . "mordent")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("prallprall" .
 	  ((script-stencil . (feta . ("prallprall" . "prallprall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("prallmordent" .
 	  ((script-stencil . (feta . ("prallmordent" . "prallmordent")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("upprall" .
 	  ((script-stencil . (feta . ("upprall" . "upprall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("downprall" .
 	  ((script-stencil . (feta . ("downprall" . "downprall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("upmordent" .
 	  ((script-stencil . (feta . ("upmordent" . "upmordent")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("downmordent" .
 	  ((script-stencil . (feta . ("downmordent" . "downmordent")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("lineprall" .
 	  ((script-stencil . (feta . ("lineprall" . "lineprall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("pralldown" .
 	  ((script-stencil . (feta . ("pralldown" . "pralldown")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("prallup" .
 	  ((script-stencil . (feta . ("prallup" . "prallup")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("segno" .
 	  ((script-stencil . (feta . ("segno" . "segno")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("coda" .
 	  ((script-stencil . (feta . ("coda" . "coda")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("varcoda" .
 	  ((script-stencil . (feta . ("varcoda" . "varcoda")))
-	   (direction  . 1) )))
+	   (direction  . 1))))
        default-script-alist)
       )