From 833e0f68c777431a95feca9083f111a81d0dc426 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 6 Jun 2005 16:29:19 +0000 Subject: [PATCH] reformat. --- ChangeLog | 2 ++ scm/x11-color.scm | 61 ++++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index b547a32537..e9af8fbcc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-06-06 Han-Wen Nienhuys + * 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 e738d35d67..f90ddc0a0e 100644 --- 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)) -- 2.39.2