CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/27 12:00:15
Modified files:
. : ChangeLog
scm : framework-tex.scm lily.scm output-svg.scm
Log message:
(circle): support circle.
(bracket): stub for bracket.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3667&tr2=1.3668&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-tex.scm.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.346&tr2=1.347&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-svg.scm.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3667 lilypond/ChangeLog:1.3668
--- lilypond/ChangeLog:1.3667 Fri May 27 11:03:14 2005
+++ lilypond/ChangeLog Fri May 27 12:00:13 2005
@@ -1,5 +1,8 @@
2005-05-27 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/output-svg.scm (circle): support circle.
+ (bracket): stub for bracket.
+
* scripts/lilypond-book.py (main): make sure --psfonts warning is
correct.
2005-05-26 Graham Percival <[EMAIL PROTECTED]>
Index: lilypond/scm/framework-tex.scm
diff -u lilypond/scm/framework-tex.scm:1.80 lilypond/scm/framework-tex.scm:1.81
--- lilypond/scm/framework-tex.scm:1.80 Wed Apr 27 13:00:50 2005
+++ lilypond/scm/framework-tex.scm Fri May 27 12:00:15 2005
@@ -162,7 +162,7 @@
(define (header-end)
(string-append
"\\def\\scaletounit{ "
- (number->string (lily-unit->bigpoint-factor))
+ (number->string lily-unit->bigpoint-factor)
" mul }%\n"
"\\ifx\\lilypondstart\\undefined\n"
" \\input lilyponddefs\n"
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.346 lilypond/scm/lily.scm:1.347
--- lilypond/scm/lily.scm:1.346 Fri May 27 11:03:15 2005
+++ lilypond/scm/lily.scm Fri May 27 12:00:15 2005
@@ -405,7 +405,6 @@
(exit 1))
(exit 0)))))
-
(define (gui-no-files-handler)
(let* ((ly (string-append (ly:effective-prefix) "/ly/"))
;; FIXME: soft-code, localize
Index: lilypond/scm/output-svg.scm
diff -u lilypond/scm/output-svg.scm:1.26 lilypond/scm/output-svg.scm:1.27
--- lilypond/scm/output-svg.scm:1.26 Tue Apr 12 22:49:25 2005
+++ lilypond/scm/output-svg.scm Fri May 27 12:00:15 2005
@@ -270,11 +270,10 @@
(stroke-linecap . "round")
(stroke-width . ,thick)
(stroke . "black")
- ;;'(fill . "black")
(x1 . ,x1)
- (y1 . ,y1)
+ (y1 . ,(- y1))
(x2 . ,x2)
- (y2 . ,y2))
+ (y2 . ,(- y2)))
alist)))
(define (dashed-line thick on off dx dy)
@@ -301,17 +300,17 @@
`(transform . ,(format #f "translate (~f, ~f)"
x (- y)))))
-
-(define (polygon coords blot-diameter)
- (entity 'polygon ""
- '(stroke-linejoin . "round")
- '(stroke-linecap . "round")
- `(stroke-width . ,blot-diameter)
- '(stroke . "black")
- ;;'(fill . "black")
- `(points . ,(string-join
- (map offset->point (ly:list->offsets '() coords))))
- ))
+(define (polygon coords blot-diameter is-filled)
+ (entity
+ 'polygon ""
+ '(stroke-linejoin . "round")
+ '(stroke-linecap . "round")
+ `(stroke-width . ,blot-diameter)
+ `(fill . ,(if is-filled "black" "none"))
+ '(stroke . "black")
+ `(points . ,(string-join
+ (map offset->point (ly:list->offsets '() coords))))
+ ))
(define (round-filled-box breapth width depth height blot-diameter)
(entity 'rect ""
@@ -330,8 +329,23 @@
`(ry . ,(/ blot-diameter 2))
))
+(define (circle radius thick is-filled)
+ (entity
+ 'circle ""
+ '(stroke-linejoin . "round")
+ '(stroke-linecap . "round")
+ `(fill . ,(if is-filled "black" "none"))
+ `(stroke . "black")
+ `(stroke-width . ,thick)
+ `(r . ,radius)))
+
(define (text font string)
(dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
(define (utf8-string pango-font-description string)
(dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))
+
+(define (bracket arch_angle arch_width arch_height height arch_thick thick)
+ ;; FIXME.
+ ""
+ )
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
