Juergens patch.

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

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 47750ece1344b79cf5bc5bb00229e96bb7292047..6ff4c9ceba655ce6bc9ccb4e2153a064ab9a9b5a 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "1.5.49"
+\version "1.7.3"
 
 stemUp = \property Voice.Stem \set #'direction = #1
 stemDown = \property Voice.Stem \set #'direction = #-1 
@@ -10,6 +10,10 @@ slurUp   = \property Voice.Slur \set #'direction = #1
 slurDown = \property Voice.Slur \set #'direction = #-1
 slurBoth = \property Voice.Slur \revert #'direction 
 
+phrasingSlurUp   = \property Voice.PhrasingSlur \set #'direction = #1
+phrasingSlurDown = \property Voice.PhrasingSlur \set #'direction = #-1
+phrasingSlurBoth = \property Voice.PhrasingSlur \revert #'direction 
+
 shiftOn  = \property Voice.NoteColumn \set #'horizontal-shift = #1
 shiftOnn  = \property Voice.NoteColumn \set #'horizontal-shift = #2
 shiftOnnn  = \property Voice.NoteColumn \set #'horizontal-shift = #3
@@ -62,20 +66,21 @@ tupletBoth = {
 
 
 
-cadenzaOn = \property Score.timing = ##f
+cadenzaOn = \property Timing.timing = ##f
 cadenzaOff = {
-  \property Score.timing = ##t
-  \property Score.measurePosition = #(make-moment 0 1)
+  \property Timing.timing = ##t
+  \property Timing.measurePosition = #(ly:make-moment 0 1)
 }
 
-newpage = {
+newpage = \notes
+{
   \break
   % urg, only works for TeX output
   \context Score \outputproperty #(make-type-checker 'paper-column-interface)
     #'between-system-string = #"\\newpage"
 }
 
-% dynamic dir?  text script, articulation script dir?  
+% dynamic ly:dir?  text script, articulation script ly:dir?    
 oneVoice = #(context-spec-music (make-voice-props-revert) "Voice")
 voiceOne = #(context-spec-music (make-voice-props-set 0) "Voice")
 voiceTwo = #(context-spec-music (make-voice-props-set 1) "Voice")
@@ -125,21 +130,19 @@ emptyText = \property Voice.TextScript \set #'no-spacing-rods  = ##t
 showStaffSwitch = \property Voice.followVoice = ##t
 hideStaffSwitch = \property Voice.followVoice = ##f
 
-% FIXME: Move this docu (to where?)
-
 % accidentals as they were common in the 18th century.
 defaultAccidentals = {
-  \property Score.extraNatural = ##t
-  \property Score.autoAccidentals = #'(Staff (same-octave . 0))
-  \property Score.autoCautionaries = #'()
+  \property Current.extraNatural = ##t
+  \property Current.autoAccidentals = #'(Staff (same-octave . 0))
+  \property Current.autoCautionaries = #'()
 }
 
 % accidentals in voices instead of staves.
 % Notice that accidentals from one voice do NOT get cancelled in other voices
 voiceAccidentals = {
-  \property Score.extraNatural = ##t
-  \property Score.autoAccidentals = #'(Voice (same-octave . 0))
-  \property Score.autoCautionaries = #'()
+  \property Current.extraNatural = ##t
+  \property Current.autoAccidentals = #'(Voice (same-octave . 0))
+  \property Current.autoCautionaries = #'()
   
 }
 
@@ -147,38 +150,38 @@ voiceAccidentals = {
 % This includes all the default accidentals, but accidentals also needs cancelling
 % in other octaves and in the next measure.
 modernAccidentals = {
-  \property Score.extraNatural = ##f
-  \property Score.autoAccidentals = #'(Staff (same-octave . 0) (any-octave . 0) (same-octave . 1))
-  \property Score.autoCautionaries = #'()  
+  \property Current.extraNatural = ##f
+  \property Current.autoAccidentals = #'(Staff (same-octave . 0) (any-octave . 0) (same-octave . 1))
+  \property Current.autoCautionaries = #'()  
 }
 
 % the accidentals that Stone adds to the old standard as cautionaries
 modernCautionaries = {
-  \property Score.extraNatural = ##f
-  \property Score.autoAccidentals = #'(Staff (same-octave . 0))
-  \property Score.autoCautionaries = #'(Staff (any-octave . 0) (same-octave . 1))  
+  \property Current.extraNatural = ##f
+  \property Current.autoAccidentals = #'(Staff (same-octave . 0))
+  \property Current.autoCautionaries = #'(Staff (any-octave . 0) (same-octave . 1))  
 }
 
 % Multivoice accidentals to be read both by musicians playing one voice
 % and musicians playing all voices.
 % Accidentals are typeset for each voice, but they ARE cancelled across voices.
 modernVoiceAccidentals = {
-  \property Staff.extraNatural = ##f
-  \property Staff.autoAccidentals = #'(
+  \property Current.extraNatural = ##f
+  \property Current.autoAccidentals = #'(
     Voice (same-octave . 0) (any-octave . 0) (same-octave . 1)
     Staff (same-octave . 0) (any-octave . 0) (same-octave . 1)
   )
-  \property Staff.autoCautionaries = #'()  
+  \property Current.autoCautionaries = #'()  
 }
 
 % same as modernVoiceAccidental eccept that all special accidentals are typeset
 % as cautionaries
 modernVoiceCautionaries = {
-  \property Staff.extraNatural = ##f
-  \property Staff.autoAccidentals = #'(
+  \property Current.extraNatural = ##f
+  \property Current.autoAccidentals = #'(
     Voice (same-octave . 0) 
   )
-  \property Staff.autoCautionaries = #'(
+  \property Current.autoCautionaries = #'(
     Voice (any-octave . 0) (same-octave . 1)
     Staff (same-octave . 0) (any-octave . 0) (same-octave . 1)
   )  
@@ -187,18 +190,18 @@ modernVoiceCautionaries = {
 % stone's suggestions for accidentals on grand staff.
 % Accidentals are cancelled across the staves in the same grand staff as well
 pianoAccidentals = {
-  \property GrandStaff.autoAccidentals = #'(
+  \property Current.autoAccidentals = #'(
     Staff (same-octave . 0) (any-octave . 0) (same-octave . 1)
     GrandStaff (any-octave . 0) (same-octave . 1)
   )
-  \property GrandStaff.autoCautionaries = #'()  
+  \property Current.autoCautionaries = #'()  
 }
 
 pianoCautionaries = {
-  \property GrandStaff.autoAccidentals = #'(
+  \property Current.autoAccidentals = #'(
     Staff (same-octave . 0)
   )
-  \property GrandStaff.autoCautionaries = #'(
+  \property Current.autoCautionaries = #'(
     Staff (any-octave . 0) (same-octave . 1)
     GrandStaff (any-octave . 0) (same-octave . 1)
   )  
@@ -209,8 +212,8 @@ pianoCautionaries = {
 % printed only once and are in effect until overridden, possibly many
 % measures later.
 noResetKey = {
-  \property Score.autoAccidentals = #'(Staff (same-octave . #t))
-  \property Score.autoCautionaries = #'()
+  \property Current.autoAccidentals = #'(Staff (same-octave . #t))
+  \property Current.autoCautionaries = #'()
 }
 
 % do not set localKeySignature when a note alterated differently from
@@ -219,8 +222,8 @@ noResetKey = {
 % remembered for the duration of a measure.
 % accidentals not being remembered, causing accidentals always to be typeset relative to the time signature
 forgetAccidentals = {
-  \property Score.autoAccidentals = #'(Staff (same-octave . -1))
-  \property Score.autoCautionaries = #'()  
+  \property Current.autoAccidentals = #'(Staff (same-octave . -1))
+  \property Current.autoCautionaries = #'()  
 }
 
 
@@ -235,3 +238,8 @@ turnOff = #'()
 % cross-staff brackets are desired. 
 
 arpeggioBracket = #(lambda (grob) (Arpeggio::brew_chord_bracket grob))
+arpeggio = #(make-music-by-name 'ArpeggioEvent)
+glissando = #(make-music-by-name 'GlissandoEvent)
+
+setMmRestFermata =
+  \once \property Voice.MultiMeasureRestNumber \override #'text = #'(music "scripts-ufermata")