* ly/engraver-init.ly (EasyNotation): remove OrchestralScoreContext

* lily/rest.cc: add direction to rest properties.

diff --git a/ChangeLog b/ChangeLog
index 2dda116c80947d837f19ed14baffd59009b752b7..54c6568f886820e3617d832864cc07399d5601d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-05-28  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * ly/engraver-init.ly (EasyNotation): remove OrchestralScoreContext
+
+       * lily/rest.cc: add direction to rest properties.
+
        * lily/include/output-def.hh: new file, move from
        music-output-def.hh
 

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 7dd1919387392dfa8211a5e6787780493ce1cd29..0bdf91ab4b52e9b0d6de190a43f45d8f6b10df29 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -138,7 +138,7 @@ violoncello = \notes \relative c' {
          \RemoveEmptyStaffContext
       }
       \context {
-         \OrchestralScore
+         \Score
          \override TimeSignature #'style = #'C
       }
   }

diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index ea2d9f08c35d9dd5fbbd6432283161cc061a827e..9ae1ddc752764863ed70dc59db7e49e814975f6f 100644 (file)
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -31,7 +31,7 @@ Staff context.
 % setup for Request->Element conversion. Guru-only
 %
 
-MyStaffContext=\context {
+MyStaff =\context {
        \type "Engraver_group_engraver"
        \name Staff
 
@@ -72,7 +72,7 @@ MyStaffContext=\context {
 }
 
 
-MyVoiceContext = \context {
+MyVoice = \context {
        \type "Engraver_group_engraver"
        \name Voice
 
@@ -135,7 +135,7 @@ MyVoiceContext = \context {
 }
 
 
-MyStaffContext = \context {
+MyStaff = \context {
     \MyStaff
     \consists "Staff_symbol_engraver"
 }
@@ -148,7 +148,7 @@ MyStaffContext = \context {
             }
 }
 
-MyStaffContext = \context {
+MyStaff = \context {
     \MyStaff
       \consists "Clef_engraver"
     \remove "Pitch_squash_engraver"
@@ -162,7 +162,7 @@ MyStaffContext = \context {
             }
 }
 
-MyVoiceContext = \context {
+MyVoice = \context {
     \MyVoice
     \consists "Stem_engraver"
     }
@@ -175,7 +175,7 @@ MyVoiceContext = \context {
             }
 }
 
-MyVoiceContext = \context {
+MyVoice = \context {
     \MyVoice
        \consists "Beam_engraver"
 }
@@ -188,7 +188,7 @@ MyVoiceContext = \context {
             }
 }
 
-MyVoiceContext= \context {
+MyVoice= \context {
     \MyVoice
     \consists "Phrasing_slur_engraver"
     \consists "Slur_engraver"
@@ -204,7 +204,7 @@ MyVoiceContext= \context {
             }
 }
 
-MyStaffContext = \context {
+MyStaff = \context {
     \MyStaff
  \consists "Bar_engraver"
     \consists "Time_signature_engraver"
@@ -219,10 +219,10 @@ MyStaffContext = \context {
             }
 }
 
-MyStaffContext = \context
- { \MyStaff
- \consists "Accidental_engraver"    
-     \consists "Key_engraver"
+MyStaff = \context {
+    \MyStaff
+    \consists "Accidental_engraver"    
+    \consists "Key_engraver"
 }
 \score {
   \topVoice

diff --git a/lily/rest.cc b/lily/rest.cc
index 63b8e55d54745b49e16565a2f2a44727ca7b8cbb..c5939d2a290f48cbd8348e798fbf4ff4d5657cd9 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -173,5 +173,5 @@ Rest::polyphonic_offset_callback (SCM smob, SCM)
 
 ADD_INTERFACE (Rest,"rest-interface",
   "A rest symbol.",
-  "style minimum-distance");
+  "style direction minimum-distance");
 

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index a64089ab491412705e294cff5ede2f119b8aa566..41e483d9abf178fd4161d274d9496a4c01a09811 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -559,10 +559,6 @@ AncientRemoveEmptyStaffContext = \context {
     
 }
 
-OrchestralScoreContext = \context {
-       \Score
-}
-
 EasyNotation = \context {      % TODO: why \context override? 
        \Score
        \override NoteHead #'print-function = #Note_head::brew_ez_stencil

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 83035a911af8490748abb87a6132c1543a0addc9..f1a402901a9ea7ea02f1dd5672f40845b2fb9961 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2089,6 +2089,7 @@ conversions.append (((2, 3, 1), conv,
                     '''\\apply -> \\applymusic'''))
 
 def conv (str):
+       str = re.sub (r'\\OrchestralScoreContext', '\\Score', str)
        def func(m):
                if m.group(1) not in ['RemoveEmptyStaff',
                                      'AncientRemoveEmptyStaffContext',
@@ -2097,6 +2098,7 @@ def conv (str):
                else:
                        return m.group (0)
                
+               
        str = re.sub (r'\\([a-zA-Z]+)Context\b', func, str)
 
        str = re.sub ('ly:paper-lookup', 'ly:output-def-lookup', str)