Merge branch 'release/unstable' into HEAD

diff --git a/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly
index 94cbe288d7bca1cf8b299fc5cda26d25867a2797..2193220390f5eabe015bd99e6eaea70cfee34e30 100644 (file)
--- a/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly
+++ b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly
@@ -1,14 +1,13 @@
-%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
-%% and then run scripts/auxiliar/makelsr.py
-%%
-%% This file is in the public domain.
-\version "2.14.0"
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.15.27
+\version "2.15.27"
 
 \header {
-  lsrtags = "pitches"
-
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 En una música que tenga muchas apariciones de la
@@ -23,6 +22,8 @@ de Gustav Holst.
 "
   doctitlees = "Crear una secuencia de notas a distintas alturas"
 
+  lsrtags = "pitches"
+
   texidoc = "
 In music that contains many occurrences of the same sequence of notes
 at different pitches, the following music function may prove useful.
@@ -34,39 +35,11 @@ Planets.
   doctitle = "Creating a sequence of notes on various pitches"
 } % begin verbatim
 
-#(define (make-note-req p d)
-   (make-music 'NoteEvent
-              'duration d
-              'pitch p))
-
-#(define (make-note p d)
-   (make-music 'EventChord
-              'elements (list (make-note-req p d))))
-
-#(define (make-triplet elt)
-   (make-music 'TimeScaledMusic
-              'denominator 3
-              'numerator 2
-              'element elt))
 
 rhythm =
-#(define-music-function (parser location note) (ly:music?)
-   "Make the rhythm in Mars (the Planets) at the given note's pitch"
-   (let ((p (ly:music-property
-             (car (ly:music-property note 'elements))
-             'pitch)))
-     (make-sequential-music
-      (list
-       (make-triplet (make-sequential-music
-                      (list
-                       (make-note p (ly:make-duration 3 0 2 3))
-                       (make-note p (ly:make-duration 3 0 2 3))
-                       (make-note p (ly:make-duration 3 0 2 3)))))
-       (make-note p (ly:make-duration 2 0))
-       (make-note p (ly:make-duration 2 0))
-       (make-note p (ly:make-duration 3 0))
-       (make-note p (ly:make-duration 3 0))
-       (make-note p (ly:make-duration 2 0))))))
+#(define-music-function (parser location p) (ly:pitch?)
+   "Make the rhythm in Mars (the Planets) at the given pitch"
+  #{ \times 2/3 { $p 8 $p $p } $p 4 $p $p 8 $p $p 4 #})
 
 \new Staff {
   \time 5/4

diff --git a/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly b/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly
new file mode 100644 (file)
index 0000000..1a50195
--- /dev/null
+++ b/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly
@@ -0,0 +1,27 @@
+\version "2.15.27"
+
+\header {
+  lsrtags = "pitches"
+
+  texidoc = "
+In music that contains many occurrences of the same sequence of notes
+at different pitches, the following music function may prove useful.
+It takes a note, of which only the pitch is used.   This example
+creates the rhythm used throughout Mars, from Gustav Holst's The
+Planets.
+
+"
+  doctitle = "Creating a sequence of notes on various pitches"
+}
+
+rhythm =
+#(define-music-function (parser location p) (ly:pitch?)
+   "Make the rhythm in Mars (the Planets) at the given pitch"
+  #{ \times 2/3 { $p 8 $p $p } $p 4 $p $p 8 $p $p 4 #})
+
+\new Staff {
+  \time 5/4
+  \rhythm c'
+  \rhythm c''
+  \rhythm g
+}

diff --git a/VERSION b/VERSION
index 4a9cc9438e0ffaeb87bd3fb5bb8de3eec6c0f1de..11c4cdefde1ea1a7c12b8af3e3acd5ee2716e0ac 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=15
-PATCH_LEVEL=27
+PATCH_LEVEL=28
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.14.2
-VERSION_DEVEL=2.15.26
+VERSION_DEVEL=2.15.27