2002-07-29 Rune Zedeler <rune@zedeler.dk>

	* ly/engraver-init.ly: Add alias "Current" to all contexts.

	* ly/property-init.ly: Use "Current" context in all
	accidental-macros. TODO: Do the same in some of the other macros?

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 0436a5e60fc907f08e0bf1b97534812b027353ab..3cee9a56ebad19d98032ea96969cd37cbd9ffdcb 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -48,6 +48,7 @@ StaffContext=\translator {
        instr = ##f
          
        \accepts "Voice"
+       \alias "Current"
 }
 
 
@@ -61,6 +62,7 @@ StaffContainerContext = \translator {
 
        \accepts Staff
        \name StaffContainer
+       \alias "Current"
 }
 
 InnerChoirStaffContext = \translator {
@@ -77,6 +79,7 @@ InnerChoirStaffContext = \translator {
        \accepts "PianoStaff"
        \accepts "Lyrics"
        \accepts "ChordNames"
+       \alias "Current"
 }
 ChoirStaffContext = \translator {
        \InnerChoirStaffContext
@@ -118,6 +121,7 @@ RhythmicStaffContext=\translator{
        \consists "Instrument_name_engraver"
        \consistsend "Axis_group_engraver"
        \accepts "Voice"
+       \alias "Current"
 }
 
 
@@ -168,6 +172,7 @@ VoiceContext = \translator {
 
        \consists "Skip_req_swallow_translator"
        \accepts Thread % bug if you leave out this!
+       \alias "Current"
 }
 
 ThreadContext = \translator{
@@ -182,6 +187,7 @@ ThreadContext = \translator{
        \consists "Note_head_line_engraver"
        \consists "Output_property_engraver"    
 
+       \alias "Current"
 }
 
 
@@ -196,6 +202,7 @@ GrandStaffContext=\translator{
        systemStartDelimiter = #'SystemStartBrace
 
        \accepts "Staff"
+       \alias "Current"
 }
 
 PianoStaffContext = \translator{
@@ -234,6 +241,7 @@ InnerStaffGroupContext= \translator {
        \accepts "TabStaff"     
        \accepts "Lyrics"
        \accepts "ChordNames"
+       \alias "Current"
 }
 StaffGroupContext = \translator {
        \InnerStaffGroupContext
@@ -261,6 +269,7 @@ LyricsVoiceContext= \translator{
        \consists "Skip_req_swallow_translator"
        phrasingPunctuation = #".,:!?\""
        
+       \alias "Current"
 }
 NoteNamesContext = \translator {
        \type "Engraver_group_engraver"
@@ -274,6 +283,7 @@ NoteNamesContext = \translator {
        
        \consists "Note_name_engraver"
        \consists "Separating_line_group_engraver"
+       \alias "Current"
 }
 
 LyricsContext = \translator {
@@ -288,6 +298,7 @@ LyricsContext = \translator {
        verticalExtent = ##f 
        
        \accepts "LyricsVoice"
+       \alias "Current"
 }
 
 
@@ -306,7 +317,8 @@ ChordNamesContext = \translator {
        minimumVerticalExtent = ##f
        extraVerticalExtent = ##f
        verticalExtent = ##f 
-       }
+       \alias "Current"
+}
 
 
 
@@ -314,6 +326,7 @@ StupidScore = \translator {
        \type "Score_engraver"
        \name Score
        \consists "Note_heads_engraver"
+       \alias "Current"
 }
 
 
@@ -432,6 +445,7 @@ ScoreContext = \translator {
        barCheckSynchronize = ##t
 
        \grobdescriptions #all-grob-descriptions
+       \alias "Current"
 }
 
 OrchestralScoreContext= \translator {
@@ -445,6 +459,7 @@ EasyNotation =  \translator {
 % retain for compatibility reasons (FIXME: convert-ly)
 GraceContext = \translator {
        \type "Engraver_group_engraver"
+       \alias "Current"
 }
 
 FiguredBassContext = \translator {
@@ -452,6 +467,7 @@ FiguredBassContext = \translator {
        \name FiguredBass 
        \consists "Figured_bass_engraver"       
        \consistsend "Axis_group_engraver"
+       \alias "Current"
 }
 
 

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 47750ece1344b79cf5bc5bb00229e96bb7292047..ef50703f2faea65f381646cf16e75b6f0ee00391 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -129,17 +129,17 @@ hideStaffSwitch = \property Voice.followVoice = ##f
 
 % 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 +147,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 +187,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 +209,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 +219,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 = #'()  
 }