reformat.

diff --git a/ChangeLog b/ChangeLog
index b547a325375448c3db34317a0420874b83f1324e..e9af8fbcc7da6776cb2ee8c3131f40cb44e15b05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-06-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/x11-color.scm: reformat. 
+
        * lily/ledger-line-engraver.cc (acknowledge_grob): create new
        LedgerLineSpanner if new StaffSymbol is found. 
 

diff --git a/scm/x11-color.scm b/scm/x11-color.scm
index e738d35d670050545a81443b23011558ad7625eb..f90ddc0a0ebe8cc86c0709b2f6537dc58eab8bed 100644 (file)
--- a/scm/x11-color.scm
+++ b/scm/x11-color.scm
@@ -666,41 +666,36 @@
          (DarkCyan 0 0.54509803921568623 0.54509803921568623)
          (DarkMagenta 0.54509803921568623 0 0.54509803921568623)
          (DarkRed 0.54509803921568623 0 0)
-         (LightGreen 0.56470588235294117 0.93333333333333335 0.56470588235294117))))
+         (LightGreen 0.56470588235294117 0.93333333333333335 0.56470588235294117)
+
+         )))
+
+    
     (lambda (arg)
       (let* 
-         ((arg-sym 
-           (if 
-            (string? arg)
-            (if 
-             (string-index arg #\ )
-             (begin
-               (string-capitalize! arg)
-               (let
-                   ((arg-list (string-split arg #\ )))
-                 (string->symbol 
-                  (let append-all ((x arg-list))
-                    (if 
-                     (null? x)
-                     ""
-                     (string-append (car x) (append-all (cdr x))))))))
-             (string->symbol arg))
-            arg))
+         ((arg-sym (if (string? arg)
+                       (if (string-index arg #\ )
+                           (let
+                               ((arg-list (string-split (string-capitalize arg) #\ )))
+
+                             (string->symbol 
+                              (let append-all ((x arg-list))
+                                (if (null? x)
+                                    ""
+                                    (string-append (car x) (append-all (cdr x)))))))
+                           
+                           (string->symbol arg))
+                       arg))
+          
           (temp (hashq-ref x11-color-table arg-sym)))
-       (if
-        temp
-        temp
-        (let*
-            ((temp-1         
-              (assq-ref
-               x11-color-list
-               arg-sym))
-             (temp
-              (if
-               temp-1
-               temp-1
-               '(0 0 0))))
-          (hashq-create-handle! x11-color-table arg-sym temp)
-          temp))))))
+       
+       (if temp
+           temp
+           (let*
+               ((temp-1 (assq-ref x11-color-list arg-sym))
+                (temp (if temp-1 temp-1 '(0 0 0))))
+             
+             (hashq-create-handle! x11-color-table arg-sym temp)
+             temp))))))
 
 (define-public x11-color (make-x11-color-handler))