CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Nicolas Sceaux <[EMAIL PROTECTED]> 05/07/24 12:49:15
Modified files:
scm : define-music-display-methods.scm
Documentation/topdocs: NEWS.tely
. : ChangeLog
Log message:
* Documentation/topdocs/NEWS.tely: new item for \displayLilyMusic
* scm/define-music-display-methods.scm (markup->lily-string):
markup elements can also be strings (without simple-markup
appended)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-music-display-methods.scm.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3918&tr2=1.3919&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3918 lilypond/ChangeLog:1.3919
--- lilypond/ChangeLog:1.3918 Sun Jul 24 01:42:59 2005
+++ lilypond/ChangeLog Sun Jul 24 12:49:14 2005
@@ -1,3 +1,11 @@
+2005-07-24 Nicolas Sceaux <[EMAIL PROTECTED]>
+
+ * Documentation/topdocs/NEWS.tely: new item for \displayLilyMusic
+
+ * scm/define-music-display-methods.scm (markup->lily-string):
+ markup elements can also be strings (without simple-markup
+ appended)
+
2005-07-24 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/context.cc (where_defined): also assign value in
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.49
lilypond/Documentation/topdocs/NEWS.tely:1.50
--- lilypond/Documentation/topdocs/NEWS.tely:1.49 Fri Jul 22 17:52:36 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Sun Jul 24 12:49:14 2005
@@ -32,6 +32,18 @@
@itemize @bullet
+
[EMAIL PROTECTED]
+Music expressions can be displayed, in LilyPond notation, using the
+new @code{\displayLilyMusic} function. For instance:
[EMAIL PROTECTED]
+\displayLilyMusic \transpose c a, { c d e f }
[EMAIL PROTECTED] verbatim
+will print:
[EMAIL PROTECTED]
+{ a, b, cis d }
[EMAIL PROTECTED] verbatim
+
@item
The current bar number may be checked with @code{\barNumberCheck}, eg.
Index: lilypond/scm/define-music-display-methods.scm
diff -u lilypond/scm/define-music-display-methods.scm:1.1
lilypond/scm/define-music-display-methods.scm:1.2
--- lilypond/scm/define-music-display-methods.scm:1.1 Fri Jul 22 18:39:34 2005
+++ lilypond/scm/define-music-display-methods.scm Sun Jul 24 12:49:13 2005
@@ -60,13 +60,15 @@
(else ;; a scheme argument
(format #f "#~a" (scheme-expr->lily-string arg)))))
(define (markup->lily-string-aux expr)
- (let ((cmd (car expr))
- (args (cdr expr)))
- (if (eqv? cmd simple-markup) ;; a simple string
- (format #f "~s" (car args))
- (format #f "\\~a~{ ~a~}"
- (proc->command cmd)
- (map-in-order arg->string args)))))
+ (if (string? expr)
+ (format #f "~s" expr)
+ (let ((cmd (car expr))
+ (args (cdr expr)))
+ (if (eqv? cmd simple-markup) ;; a simple markup
+ (format #f "~s" (car args))
+ (format #f "\\~a~{ ~a~}"
+ (proc->command cmd)
+ (map-in-order arg->string args))))))
(cond ((string? markup-expr)
(format #f "~s" markup-expr))
((eqv? (car markup-expr) simple-markup)
@@ -74,6 +76,7 @@
(else
(format #f "\\markup ~a"
(markup->lily-string-aux markup-expr)))))
+
;;;
;;; pitch names
;;;
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
