From ea6d4bf680169cfed9e4b37004c18ac86f8b1365 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 01:21:42 +0000 Subject: [PATCH] lilypond-1.5.15 --- buildscripts/mutopia-index.py | 6 ++- input/test/add-text-script.ly | 39 +++++++++----------- mutopia/E.Satie/petite-ouverture-a-danser.ly | 2 - 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py index 794e59929e..4bbc0bb2c5 100644 --- a/buildscripts/mutopia-index.py +++ b/buildscripts/mutopia-index.py @@ -152,7 +152,11 @@ def gen_list(inputs, filename): if file_exist_b(filename): l.write ('
  • %s' % (filename, desc)) size=os.stat(filename)[stat.ST_SIZE] - l.write (' (%s %dk)' % (type, (size + 512) / 1024)) + kB=(size + 512) / 1024 + if kB: + l.write (' (%s %dkB)' % (type, kB)) + else: + l.write (' (%s %dcharacters)' % (type, size)) pictures = ['jpeg', 'png', 'xpm'] l.write ('\n') diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index e3cca2fab9..6b0effff0e 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -8,29 +8,26 @@ In general, first do a display of the music you want ot create, then write a function that will build the structure for you." } -#(define (make-script x) - (let* ( (m (ly-make-music "Text_script_req")) - ) - +#(define (make-text-script x) + (let ((m (ly-make-music "Text_script_req"))) (ly-set-mus-property m 'text-type 'finger) (ly-set-mus-property m 'text x) - m - )) + m)) -#(define (add-script m x) - (if (equal? (ly-music-name m) "Request_chord") - (ly-set-mus-property m 'elements - (cons (make-script x) (ly-get-mus-property m 'elements))) - - (let* ( (es (ly-get-mus-property m 'elements)) - (e (ly-get-mus-property m 'element)) ) - (map (lambda (y) (add-script y x)) es) - (if (music? e) - (add-script e x)) - ) - ) - m -) +#(define (add-text-script m x) + (if (equal? (ly-music-name m) "Request_chord") + (ly-set-mus-property m 'elements + (cons (make-text-script x) + (ly-get-mus-property m 'elements))) + + (let ((es (ly-get-mus-property m 'elements)) + (e (ly-get-mus-property m 'element)) ) + (map (lambda (y) (add-text-script y x)) es) + (if (music? e) + (add-text-script e x)))) + m) -\score { \apply #(lambda (x) (add-script x "6") (display x) x ) \notes { c4-3 } } +\score { + \apply #(lambda (x) (add-script x "6") (display x) x ) \notes { c4-3 } +} diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index 9762bb376a..5b213c0346 100644 --- a/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -147,8 +147,6 @@ lower = \context Staff \notes \relative c{ > \paper { - textheight = 295.\mm - \translator{ \OrchestralScoreContext } \translator{ \VoiceContext Slur \override #'attachment = #'(stem . stem) -- 2.39.5