CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/13 20:24:49
Modified files:
. : ChangeLog
scm : lily-library.scm output-socket.scm
Log message:
(grob-bbox): don't use inf?
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3876&tr2=1.3877&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily-library.scm.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-socket.scm.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3876 lilypond/ChangeLog:1.3877
--- lilypond/ChangeLog:1.3876 Wed Jul 13 19:31:01 2005
+++ lilypond/ChangeLog Wed Jul 13 20:24:49 2005
@@ -1,5 +1,9 @@
2005-07-13 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/output-socket.scm (grob-bbox): don't use inf?
+
+ * flower/include/rational.hh: add operator bool()
+
* scm/define-music-types.scm (music-descriptions): remove
internal-class-name properties.
Index: lilypond/scm/lily-library.scm
diff -u lilypond/scm/lily-library.scm:1.43 lilypond/scm/lily-library.scm:1.44
--- lilypond/scm/lily-library.scm:1.43 Wed Jul 13 19:41:07 2005
+++ lilypond/scm/lily-library.scm Wed Jul 13 20:24:49 2005
@@ -108,7 +108,7 @@
(set! count 0))
(if (> count 0)
- (set! base (format #f "~a-~a" count)))
+ (set! base (format #f "~a-~a" base count)))
(ly:parser-define! parser 'output-count (1+ count))
@@ -322,6 +322,10 @@
(define-public (interval-widen iv amount)
(cons (- (car iv) amount)
(+ (cdr iv) amount)))
+
+
+(define-public (interval-empty? iv)
+ (> (car iv) (cdr iv)))
(define-public (interval-union i1 i2)
(cons (min (car i1) (car i2))
Index: lilypond/scm/output-socket.scm
diff -u lilypond/scm/output-socket.scm:1.6 lilypond/scm/output-socket.scm:1.7
--- lilypond/scm/output-socket.scm:1.6 Wed Jul 13 18:22:35 2005
+++ lilypond/scm/output-socket.scm Wed Jul 13 20:24:49 2005
@@ -63,17 +63,19 @@
((x-ext (ly:grob-extent grob grob X))
(y-ext (ly:grob-extent grob grob Y))
(x (car offset))
- (y (cdr offset))
- )
+ (y (cdr offset)))
- (map (lambda (x)
- (if (inf? x) 0.0 x))
-
- (list (+ x (car x-ext))
- (+ y (car y-ext))
- (+ x (cdr x-ext))
- (+ y (cdr y-ext)))
- )))
+ (if (interval-empty? x-ext)
+ (set! x-ext '(0 . 0)))
+
+ (if (interval-empty? y-ext)
+ (set! y-ext '(0 . 0)))
+
+ (list (+ x (car x-ext))
+ (+ y (car y-ext))
+ (+ x (cdr x-ext))
+ (+ y (cdr y-ext))
+ )))
(define-public (no-origin)
"nocause\n")
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
