CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/06 16:29:19
Modified files:
. : ChangeLog
scm : x11-color.scm
Log message:
reformat.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3723&tr2=1.3724&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/x11-color.scm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3723 lilypond/ChangeLog:1.3724
--- lilypond/ChangeLog:1.3723 Mon Jun 6 16:09:28 2005
+++ lilypond/ChangeLog Mon Jun 6 16:29:19 2005
@@ -1,5 +1,7 @@
2005-06-06 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/x11-color.scm: reformat.
+
* lily/ledger-line-engraver.cc (acknowledge_grob): create new
LedgerLineSpanner if new StaffSymbol is found.
Index: lilypond/scm/x11-color.scm
diff -u lilypond/scm/x11-color.scm:1.2 lilypond/scm/x11-color.scm:1.3
--- lilypond/scm/x11-color.scm:1.2 Fri May 6 16:54:12 2005
+++ lilypond/scm/x11-color.scm Mon Jun 6 16:29:19 2005
@@ -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))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
