CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/11 20:41:04
Modified files:
. : ChangeLog
lily : lookup.cc paper-outputter-scheme.cc
stencil-expression.cc
scm : define-stencil-commands.scm output-gnome.scm
output-ps.scm output-svg.scm output-tex.scm
stencil.scm
Added files:
scm : framework-socket.scm output-socket.scm
Log message:
* lily/lookup.cc (filled_box): express filled_box with
round_filled_box
* lily/paper-outputter-scheme.cc (LY_DEFINE): take port argument.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3867&tr2=1.3868&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lookup.cc.diff?tr1=1.186&tr2=1.187&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-outputter-scheme.cc.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/stencil-expression.cc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-socket.scm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-socket.scm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-stencil-commands.scm.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-gnome.scm.diff?tr1=1.93&tr2=1.94&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-svg.scm.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-tex.scm.diff?tr1=1.93&tr2=1.94&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/stencil.scm.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3867 lilypond/ChangeLog:1.3868
--- lilypond/ChangeLog:1.3867 Mon Jul 11 13:30:56 2005
+++ lilypond/ChangeLog Mon Jul 11 20:41:01 2005
@@ -1,5 +1,8 @@
2005-07-11 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/lookup.cc (filled_box): express filled_box with
+ round_filled_box
+
* scm/midi.scm (paper-book-write-midis): new function. Write all
performances in numbered MIDI files.
Index: lilypond/lily/lookup.cc
diff -u lilypond/lily/lookup.cc:1.186 lilypond/lily/lookup.cc:1.187
--- lilypond/lily/lookup.cc:1.186 Sat May 28 13:43:23 2005
+++ lilypond/lily/lookup.cc Mon Jul 11 20:41:03 2005
@@ -124,14 +124,7 @@
Stencil
Lookup::filled_box (Box b)
{
- SCM at = (scm_list_n (ly_symbol2scm ("filledbox"),
- scm_make_real (-b[X_AXIS][LEFT]),
- scm_make_real (b[X_AXIS][RIGHT]),
- scm_make_real (-b[Y_AXIS][DOWN]),
- scm_make_real (b[Y_AXIS][UP]),
- SCM_UNDEFINED));
-
- return Stencil (b, at);
+ return round_filled_box (b, 0.0);
}
/*
Index: lilypond/lily/paper-outputter-scheme.cc
diff -u lilypond/lily/paper-outputter-scheme.cc:1.8
lilypond/lily/paper-outputter-scheme.cc:1.9
--- lilypond/lily/paper-outputter-scheme.cc:1.8 Mon Jul 11 11:51:42 2005
+++ lilypond/lily/paper-outputter-scheme.cc Mon Jul 11 20:41:03 2005
@@ -24,8 +24,14 @@
String f = ly_scm2string (format);
+ String output_name = "<unknown>";
+
+ SCM port_name = scm_port_filename (port);
+ if (scm_is_string (port_name))
+ output_name = ly_scm2string (port_name);
+
message (_f ("Layout output to `%s'...",
- ly_scm2string (scm_port_filename (port)).to_str0 ()));
+ output_name.to_str0 ()));
progress_indication ("\n");
Paper_outputter *po = new Paper_outputter (port, f);
Index: lilypond/lily/stencil-expression.cc
diff -u lilypond/lily/stencil-expression.cc:1.1
lilypond/lily/stencil-expression.cc:1.2
--- lilypond/lily/stencil-expression.cc:1.1 Mon May 30 23:38:46 2005
+++ lilypond/lily/stencil-expression.cc Mon Jul 11 20:41:03 2005
@@ -12,7 +12,7 @@
#include "protected-scm.hh"
-static Protected_scm heads;
+static Protected_scm heads = SCM_EOL;
void register_stencil_head (SCM symbol)
{
Index: lilypond/scm/define-stencil-commands.scm
diff -u lilypond/scm/define-stencil-commands.scm:1.3
lilypond/scm/define-stencil-commands.scm:1.4
--- lilypond/scm/define-stencil-commands.scm:1.3 Tue May 31 18:50:04 2005
+++ lilypond/scm/define-stencil-commands.scm Mon Jul 11 20:41:03 2005
@@ -17,7 +17,6 @@
dashed-slur
dot
draw-line
- filledbox
glyph-string
named-glyph
polygon
Index: lilypond/scm/output-gnome.scm
diff -u lilypond/scm/output-gnome.scm:1.93 lilypond/scm/output-gnome.scm:1.94
--- lilypond/scm/output-gnome.scm:1.93 Sat May 28 13:43:24 2005
+++ lilypond/scm/output-gnome.scm Mon Jul 11 20:41:03 2005
@@ -292,13 +292,6 @@
(set-path-def props def)
props))
-;; FIXME: naming
-(define (filledbox breapth width depth height)
- (make <gnome-canvas-rect>
- #:parent (canvas-root)
- #:x1 (- breapth) #:y1 depth #:x2 width #:y2 (- height)
- #:fill-color "black"
- #:join-style 'miter))
;; FIXME: the framework-gnome backend needs to see every item that
;; gets created. All items created here must should be put in a group
Index: lilypond/scm/output-ps.scm
diff -u lilypond/scm/output-ps.scm:1.145 lilypond/scm/output-ps.scm:1.146
--- lilypond/scm/output-ps.scm:1.145 Wed Jun 8 13:07:11 2005
+++ lilypond/scm/output-ps.scm Mon Jul 11 20:41:03 2005
@@ -34,7 +34,6 @@
placebox
bezier-sandwich
embedded-ps
- filledbox
round-filled-box
text
polygon
@@ -139,10 +138,6 @@
(define (embedded-ps string)
string)
-;; FIXME: use draw_round_box
-(define (filledbox breapth width depth height)
- (string-append (ly:numbers->string (list breapth width depth height))
- " draw_box"))
(define (glyph-string
postscript-font-name
Index: lilypond/scm/output-svg.scm
diff -u lilypond/scm/output-svg.scm:1.31 lilypond/scm/output-svg.scm:1.32
--- lilypond/scm/output-svg.scm:1.31 Thu Jun 30 10:34:00 2005
+++ lilypond/scm/output-svg.scm Mon Jul 11 20:41:04 2005
@@ -282,9 +282,6 @@
(define (dashed-line thick on off dx dy)
(draw-line thick 0 0 dx dy `(style . ,(format "stroke-dasharray:~a,~a;" on
off))))
-(define (filledbox breapth width depth height)
- (round-filled-box breapth width depth height 0))
-
(define (named-glyph font name)
(dispatch
`(fontify ,font ,(entity 'tspan
Index: lilypond/scm/output-tex.scm
diff -u lilypond/scm/output-tex.scm:1.93 lilypond/scm/output-tex.scm:1.94
--- lilypond/scm/output-tex.scm:1.93 Mon Jun 6 14:40:39 2005
+++ lilypond/scm/output-tex.scm Mon Jul 11 20:41:04 2005
@@ -33,7 +33,6 @@
repeat-slash
placebox
bezier-sandwich
- filledbox
round-filled-box
text
setcolor
@@ -130,16 +129,6 @@
(define (bezier-sandwich lst thick)
(embedded-ps (list 'bezier-sandwich `(quote ,lst) thick)))
-(define (filledbox breapth width depth height)
- (if (and #f (defined? 'ps-testing))
- (embedded-ps
- (string-append (ly:numbers->string (list breapth width depth height))
- " draw_box" ))
- (string-append "\\lyvrule{"
- (ly:number->string (- breapth)) "}{"
- (ly:number->string (+ breapth width)) "}{"
- (ly:number->string depth) "}{"
- (ly:number->string height) "}")))
(define (round-filled-box x y width height blotdiam)
(embedded-ps (list 'round-filled-box x y width height blotdiam)))
Index: lilypond/scm/stencil.scm
diff -u lilypond/scm/stencil.scm:1.20 lilypond/scm/stencil.scm:1.21
--- lilypond/scm/stencil.scm:1.20 Wed Apr 13 00:15:06 2005
+++ lilypond/scm/stencil.scm Mon Jul 11 20:41:04 2005
@@ -53,8 +53,8 @@
"Make a filled box."
(ly:make-stencil
- (list 'filledbox (- (car xext)) (cdr xext)
- (- (car yext)) (cdr yext))
+ (list 'round-filled-box (- (car xext)) (cdr xext)
+ (- (car yext)) (cdr yext) 0.0)
xext yext))
(define-public (make-circle-stencil radius thickness fill)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
