Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 0220f410491b54f772b4337c3e24bc774e830f6a..a2c7b04e108a627a2dff8c98026ebbb09ebebe8d 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -584,6 +584,7 @@ the pitch range that a musical instrument is capable of playing.
 @section anacrusis
 
 @c  TODO: add more languages for anacrusis
+ES: anacrusa
 F: anacrouse
 
 An anacrusis (also known as pickup or upbeat) is an incomplete measure
@@ -3823,7 +3824,7 @@ FI: neljännesosatauko.
 @node quintuplet
 @section quintuplet
 
-ES: cinquillo,
+ES: cinquillo, quintillo.
 I: quintina,
 F: quintolet,
 D: Quintole,

diff --git a/input/lsr/expressive/tempo-mark-scheme-function.ly b/input/lsr/expressive/tempo-mark-scheme-function.ly
new file mode 100644 (file)
index 0000000..cc93964
--- /dev/null
+++ b/input/lsr/expressive/tempo-mark-scheme-function.ly
@@ -0,0 +1,24 @@
+\version "2.10.12"
+
+\header { texidoc = "
+This is a Scheme function which prints a tempo mark such as
+    Fast (♩= 222)
+" }
+
+tempoMark =
+    #(define-music-function (parser location prependText notevalue appendText) (string? string? string?)
+        #{
+            \mark \markup
+            { \line { $prependText " (" \fontsize #-2 \general-align #Y #DOWN \note #$notevalue #1 $appendText ) } }
+        #})
+
+theMusic =
+{
+    \once \override Score.RehearsalMark #'self-alignment-X = #-1
+    \time 4/4 \tempoMark "Fast" "4" "= 220-222" s1    
+}
+
+\score
+{
+    \theMusic
+}