CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/12 20:46:25
Modified files:
. : ChangeLog THANKS
scm : define-grobs.scm define-markup-commands.scm
framework-scm.scm framework-socket.scm
output-socket.scm
Log message:
* scm/define-markup-commands.scm (justify-field): add.
* scm/define-grobs.scm (all-grob-descriptions): decrease font size.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3868&tr2=1.3869&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.131&tr2=1.132&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.211&tr2=1.212&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-scm.scm.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-socket.scm.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-socket.scm.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3868 lilypond/ChangeLog:1.3869
--- lilypond/ChangeLog:1.3868 Mon Jul 11 20:41:01 2005
+++ lilypond/ChangeLog Tue Jul 12 20:46:24 2005
@@ -1,3 +1,9 @@
+2005-07-12 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scm/define-markup-commands.scm (justify-field): add.
+
+ * scm/define-grobs.scm (all-grob-descriptions): decrease font size.
+
2005-07-11 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/lookup.cc (filled_box): express filled_box with
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.131 lilypond/THANKS:1.132
--- lilypond/THANKS:1.131 Fri Jul 8 18:08:23 2005
+++ lilypond/THANKS Tue Jul 12 20:46:24 2005
@@ -22,6 +22,12 @@
+BUG HUNTERS/SUGGESTIONS
+
+Erlend Aasland
+
+
+
Release 2.6
***********
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.211 lilypond/scm/define-grobs.scm:1.212
--- lilypond/scm/define-grobs.scm:1.211 Sun Jul 10 11:25:24 2005
+++ lilypond/scm/define-grobs.scm Tue Jul 12 20:46:24 2005
@@ -1236,6 +1236,7 @@
. (
(print-function . ,Text_interface::print)
(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+ (font-size . -2)
(stem-attachment-function . ,tablature-stem-attachment-function)
(font-series . bold)
(meta . ((interfaces
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.101
lilypond/scm/define-markup-commands.scm:1.102
--- lilypond/scm/define-markup-commands.scm:1.101 Fri Jul 8 20:46:41 2005
+++ lilypond/scm/define-markup-commands.scm Tue Jul 12 20:46:24 2005
@@ -507,7 +507,24 @@
(def-markup-command (justify-string layout props arg) (string?)
"Justify a string. Paragraphs may be separated with double newlines"
(wordwrap-string layout props #t arg))
-
+
+
+(def-markup-command (wordwrap-field layout props symbol) (symbol?)
+ (let* ((m (chain-assoc-get symbol props)))
+ (if (string? m)
+ (interpret-markup layout props
+ (list wordwrap-string-markup m))
+ (ly:make-stencil '() '(1 . -1) '(1 . -1)))))
+
+(def-markup-command (justify-field layout props symbol) (symbol?)
+ (let* ((m (chain-assoc-get symbol props)))
+ (if (string? m)
+ (interpret-markup layout props
+ (list justify-string-markup m))
+ (ly:make-stencil '() '(1 . -1) '(1 . -1)))))
+
+
+
(def-markup-command (combine layout props m1 m2) (markup? markup?)
"Print two markups on top of each other."
(let* ((s1 (interpret-markup layout props m1))
Index: lilypond/scm/framework-scm.scm
diff -u lilypond/scm/framework-scm.scm:1.3 lilypond/scm/framework-scm.scm:1.4
--- lilypond/scm/framework-scm.scm:1.3 Tue Apr 12 22:49:25 2005
+++ lilypond/scm/framework-scm.scm Tue Jul 12 20:46:24 2005
@@ -25,6 +25,8 @@
(pretty-print (ly:stencil-expr page) file))
(ly:paper-book-pages book))))
+(define-public output-classic-framework output-framework)
+
(define-public (convert-to-ps . args) #t)
(define-public (convert-to-pdf . args) #t)
Index: lilypond/scm/framework-socket.scm
diff -u lilypond/scm/framework-socket.scm:1.1
lilypond/scm/framework-socket.scm:1.2
--- lilypond/scm/framework-socket.scm:1.1 Mon Jul 11 20:41:03 2005
+++ lilypond/scm/framework-socket.scm Tue Jul 12 20:46:24 2005
@@ -13,19 +13,18 @@
(define-public (output-framework channel book scopes fields )
(let*
- (
- (ctor-arg (if (string? channel)
+ ((ctor-arg (if (string? channel)
(open-output-file (format "~a.socket" channel))
channel))
(outputter (ly:make-paper-outputter
ctor-arg
- "socket")))
-
- (for-each
- (lambda (page)
- (ly:outputter-dump-stencil outputter page))
- (ly:paper-book-pages book))))
+ "socket"))
+ (systems (ly:paper-book-systems book)))
+ (if (pair? systems)
+ (ly:outputter-dump-stencil outputter
+ (ly:paper-system-stencil (car systems))))
+ ))
(define-public output-classic-framework output-framework)
Index: lilypond/scm/output-socket.scm
diff -u lilypond/scm/output-socket.scm:1.1 lilypond/scm/output-socket.scm:1.2
--- lilypond/scm/output-socket.scm:1.1 Mon Jul 11 20:41:03 2005
+++ lilypond/scm/output-socket.scm Tue Jul 12 20:46:24 2005
@@ -19,23 +19,70 @@
(ly:all-stencil-expressions))
+
+(define-public (draw-line thick x1 y1 x2 y2)
+ (format "drawline ~a ~a ~a ~a ~a"
+ thick x1 y2 x2 y2))
+
+
(define-public (named-glyph font glyph)
- (format "~a ~a glyphshow" glyph
- (ly:font-name font)))
+ (format "glyphshow ~a \"~a\" ~a"
+ (ly:font-glyph-name-to-charcode font glyph)
+ (ly:font-name font)
+ (modified-font-metric-font-scaling font)
+ ))
(define-public (placebox x y s)
- (format "place at ~a ~a: ~a\n" x y s))
+ (format "at ~a ~a ~a\n" x y s))
-(define-public (round-filled-box x y width height blotdiam)
- (format "~a ~a ~a ~a ~a draw_round_box"
- x y width height blotdiam
+(define-public (round-filled-box breapth width depth height blot-diameter)
+ (format "draw_round_box ~a ~a ~a ~a ~a"
+ breapth width depth height blot-diameter
))
+(define (music-cause grob)
+ (let*
+ ((cause (ly:grob-property grob 'cause)))
+
+ (cond
+ ((ly:music? cause) cause)
+ ((ly:grob? cause) (music-cause cause))
+ (else
+ #f))))
+
+(define (grob-bbox grob offset)
+ (let*
+ ((x-ext (ly:grob-extent grob grob X))
+ (y-ext (ly:grob-extent grob grob Y))
+ (x (car offset))
+ (y (cdr offset))
+ )
+
+ (list (+ x (car x-ext))
+ (+ y (car y-ext))
+ (+ x (cdr x-ext))
+ (+ y (cdr y-ext)))
+ ))
+
+(define-public (no-origin)
+ "nocause\n")
+
+(define-public (grob-cause offset grob)
+ (let*
+ ((cause (music-cause grob)))
+ (if (and cause (integer? (ly:music-property cause 'input-tag)))
+ (apply format
+ (append
+ (list "cause ~a ~a ~a ~a ~a\n" (ly:music-property cause
'input-tag))
+ (grob-bbox grob offset)
+ ))
+ "")))
+
(define-public (glyph-string
postscript-font-name
size cid?
x-y-named-glyphs)
- (format "~a ~a text: ~a " postscript-font-name size
+ (format "text \"~a\" ~a ~a " postscript-font-name size
(string-join (map (lambda (xyn) (caddr xyn))
x-y-named-glyphs))))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
