(Invoking lilypond): Bugfix.

diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely
index 40334bbaeda14c8b18d6409e9972dc75f42f712f..7fcc0bcd8e05b8a3ca606c53dcaf9bcf314ddb08 100644 (file)
--- a/Documentation/user/invoking.itely
+++ b/Documentation/user/invoking.itely
@@ -70,7 +70,7 @@ for @TeX{} output, to be processed with La@TeX{}
 @item scm
  for a dump of the raw, internal Scheme-based drawing commands.
 @cindex Scheme dump
-@end itemize 
+@end table
  
 @cindex output format, setting
 

diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index a3bbe590d976ba62e5274f6ab436e7e01a5c557f..1063f5c76a3f4cddf524c6cca0ea9dbb813d4eec 100644 (file)
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -282,15 +282,12 @@ work than classifying the pitches."
        ((get-step 6 pitches) (set! main-name (get-step 6 pitches)))
        ((get-step 5 pitches) (set! main-name (get-step 5 pitches)))
        ((get-step 4 pitches) (set! main-name (get-step 4 pitches)))
-       ((get-step 3 pitches) (set! main-name (get-step 3 pitches)))
-       )
-       
-       (let*
-          (
-           (3-diff? (lambda (x y)
-                      (= (- (pitch-step y) (pitch-step x)) 2)))
-           (split (split-at-predicate 3-diff? (remove-uptil-step 5 pitches)))
-           )
+       ((get-step 3 pitches) (set! main-name (get-step 3 pitches))))
+
+       (let* ((3-diff? (lambda (x y)
+                        (= (- (pitch-step y) (pitch-step x)) 2)))
+             (split (split-at-predicate
+                     3-diff? (remove-uptil-step 5 pitches))))
         (set! alterations (append alterations (car split)))
         (set! add-steps (append add-steps (cdr split)))
         (set! alterations (delq main-name alterations))
@@ -309,11 +306,7 @@ work than classifying the pitches."
                      (map is-natural-alteration? alterations)))
             (begin
               (set! main-name (last alterations))
-              (set! alterations '())
-              ))
-
-        (ignatzek-format-chord-name root prefixes main-name alterations add-steps suffixes bass-note)
-        )))
-       ))
-  
+              (set! alterations '())))
 
+        (ignatzek-format-chord-name
+         root prefixes main-name alterations add-steps suffixes bass-note))))))

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 8cc796b8978a5b32d298d72b6d3a947b26cdb9a8..32b44fddec7a50e67713f032b7e68ca52814634d 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -199,30 +199,31 @@ found."
     (else
      (set-car! acc (cons (car lst) (car acc)))
      (set-cdr! acc (cdr lst))
-     acc))
-   (let* ((c (cons '() '())))
-     (inner-split predicate lst  c)
-     (set-car! c (reverse! (car c)))
-     c)))
+     acc)))
+ 
+ (let* ((c (cons '() '())))
+   (inner-split predicate lst  c)
+   (set-car! c (reverse! (car c)))
+   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))
   "
-  ;; " Emacs is broken
-  (define (split-one sep?  lst acc)
-    "Split off the first parts before separator and return both parts."
-    (if (null? lst)
-       (cons acc '())
-       (if (sep? (car lst))
-           (cons acc (cdr lst))
-           (split-one sep? (cdr lst) (cons (car lst) acc)))))
-  
-  (if (null? lst)
-      '()
-      (let* ((c (split-one sep? lst '())))
-       (cons (reverse! (car c) '()) (split-list (cdr c) sep?)))))
+   ;; " Emacs is broken
+   (define (split-one sep?  lst acc)
+     "Split off the first parts before separator and return both parts."
+     (if (null? lst)
+        (cons acc '())
+        (if (sep? (car lst))
+            (cons acc (cdr lst))
+            (split-one sep? (cdr lst) (cons (car lst) acc)))))
+   
+   (if (null? lst)
+       '()
+       (let* ((c (split-one sep? lst '())))
+        (cons (reverse! (car c) '()) (split-list (cdr c) sep?)))))
 
 (define-public (offset-add a b)
   (cons (+ (car a) (car b))