Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

[lilypond.git] / ly / spanners-init.ly

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 3e1eae9c7d74ced1ab7e64a7b099be6381d63395..6e5bc48b0e6fcfa1b8e03fb67133c59255100762 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.10.0"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -9,26 +9,31 @@ decr = #(make-span-event 'DecrescendoEvent START)
 enddecr = #(make-span-event 'DecrescendoEvent STOP)
 endcr = #(make-span-event 'CrescendoEvent STOP) 
 
+
 startTextSpan = #(make-span-event 'TextSpanEvent START)
 stopTextSpan = #(make-span-event 'TextSpanEvent STOP)
 
 
-% TODO: junkme!
-cresc = \notes {
+startTrillSpan = #(make-span-event 'TrillSpanEvent START)
+stopTrillSpan = #(make-span-event 'TrillSpanEvent STOP)
+
+
+% STOP: junkme!
+cresc =  {
   #(ly:export (make-event-chord (list cr)))
   \set crescendoText = \markup { \italic "cresc." }
-  \set crescendoSpanner = #'dashed-line
+  \set crescendoSpanner = #'text
 }
 
 
-dim = \notes {
+dim =  {
   #(ly:export (make-event-chord (list decr)))
 
   \set decrescendoText = \markup { \italic "dim." }
-  \set decrescendoSpanner = #'dashed-line
+  \set decrescendoSpanner = #'text
 }
 
-enddim = \notes {
+enddim =  {
   #(ly:export (make-event-chord (list enddecr)))
   \unset decrescendoText 
   \unset decrescendoSpanner 
@@ -36,7 +41,7 @@ enddim = \notes {
 
 % ah, this is handy: maybe drop resetting of properties in
 % dynamic-engraver ?
-endcresc = \notes {
+endcresc =  {
   #(ly:export (make-event-chord (list endcr)))
   \unset crescendoText 
   \unset crescendoSpanner 
@@ -46,21 +51,43 @@ endcresc = \notes {
 
 setTextCresc = {
     \set crescendoText = \markup { \italic "cresc." }
-    \set crescendoSpanner = #'dashed-line
+    \set crescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
+
 setTextDecresc = {
-    \set crescendoText = \markup { \italic "decr." }
-    \set crescendoSpanner = #'dashed-line
+    \set decrescendoText = \markup { \italic "decresc." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
+
+setTextDecr = {
+    \set decrescendoText = \markup { \italic "decr." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
+}
+
 setTextDim = {
-    \set crescendoText = \markup { \italic "dim." }
-    \set crescendoSpanner = #'dashed-line
+    \set decrescendoText = \markup { \italic "dim." }
+    \set decrescendoSpanner = #'text
+    \override DynamicTextSpanner #'style = #'dashed-line
 }
+
 setHairpinCresc = {
     \unset crescendoText 
     \unset crescendoSpanner 
 }
 
+setHairpinDecresc = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
+
+setHairpinDim = {
+    \unset decrescendoText 
+    \unset decrescendoSpanner 
+}
+
 
 
 % better name sustainstart/stop? 
@@ -76,3 +103,5 @@ sostenutoUp = #(make-span-event 'SostenutoEvent STOP)
 %crescpoco = \set crescendoText = "cresc. poco a poco"
 %decresc = \set crescendoText = "decr."
 %dim = \set crescendoText = "dim."
+
+newSpacingSection = #(make-event-chord (list (make-music 'SpacingSectionEvent)))