patch::: 1.5.14.jcn3

1.5.14.jcn3

diff --git a/CHANGES b/CHANGES
index dc1a04968eb9b49735d30ff17396542482a5e27b..24cd0fc8badffc617ee65876c5e897d60059a6e0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-1.5.14.jcn2
+1.5.14.jcn3
 ===========
 
+* Some website related fixes (thanks Tiggr).
+
 * Ugly hack in add-html-footer for disabling tutorial and refman links
 in sidebar.
 

diff --git a/VERSION b/VERSION
index da307e624f812220a1274142f79a1a37797d0511..a6361b957b8ab52db329dadbd07b979c574043c6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=14
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py
index 794e59929ec1b6fac3589edf0c908ad8e277eb1d..4bbc0bb2c58416688cf728ffb058cc528d3866cd 100755 (executable)
--- 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 ('<li><a href="%s">%s</a>' % (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-staccato.ly b/input/test/add-staccato.ly
new file mode 100644 (file)
index 0000000..8bf959d
--- /dev/null
+++ b/input/test/add-staccato.ly
@@ -0,0 +1,38 @@
+\header {
+
+texidoc= "Using make-music, you can add various stuff to notes. Here
+is an example how to add staccato dots."
+
+} 
+
+#(define (make-script x)
+  (let ((m (ly-make-music "Articulation_req")))
+     ;;(ly-set-mus-property m 'articulation-type 'staccato)
+     ;; urg
+     (ly-set-mus-property m 'articulation-type x)
+     (ly-set-mus-property m 'script x)
+     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-staccato m)
+   (add-script m "staccato"))
+
+\score {
+  \notes\relative c'' {
+    a b \apply #add-staccato { c c } 
+    a b \apply #add-staccato { c c } 
+  }
+}
+

diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index e3cca2fab9c1fbfd07abb9471fddf705da58c6f1..6b0effff0ea4f21a263af1b7ce84f82579e65f53 100644 (file)
--- 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 9762bb376adb07a580dec1f46fc00bde6127cb07..5b213c03465244557d31c1fe6350821122284928 100644 (file)
--- 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)