From: Han-Wen Nienhuys Date: Sun, 25 May 2003 21:51:24 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/1.7.20~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2a719420d9e59237d91f7b634f6ecd2aeb90b206;p=lilypond.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index e61776292b..61d67494e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,7 +56,7 @@ 2003-05-23 Han-Wen Nienhuys * ly/engraver-init.ly (HaraKiriStaffContext): use - FrenchStaffContext instead. + RemoveEmptyStaffContext instead. * Documentation/user/refman.itely: updates diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 64f600bc6a..6d9be20cc1 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -3995,16 +3995,15 @@ This saves some space. This style is called `French Score'. @syntax -This is supported through the @code{FrenchStaff}. This staff is +This is supported through the @code{RemoveEmptyStaff}. This staff is removed when it turns out empty (or containing multimeasure rests) after the line-breaking process. - For @internalsref{Lyrics}, @internalsref{LyricsVoice}, @internalsref{ChordNames} and @internalsref{FiguredBass}, this is switched on by default. For normal staffs, it is available as a specialized @internalsref{Staff} context, with the name variable -@code{\FrenchStaffContext}. Observe how the second staff in this +@code{\RemoveEmptyStaffContext}. Observe how the second staff in this example disappears in the second line. @lilypond[verbatim] @@ -4015,7 +4014,7 @@ example disappears in the second line. > \paper { linewidth = 6.\cm - \translator { \FrenchStaffContext } + \translator { \RemoveEmptyStaffContext } } } @end lilypond @@ -4047,7 +4046,7 @@ output. @cindex Petrucci @cindex mensural -[TODO: write introduction on ancient notation] +@c [TODO: write introduction on ancient notation] @menu * Ancient note heads:: diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index ae41668526..4f69b459dd 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header { texidoc = "Hara kiri should not upset fixed distance alignment like in pianostaff. In this example the middle staff is harakiried." } @@ -12,7 +12,7 @@ texidoc = "Hara kiri should not upset fixed distance alignment like in pianostaf > \paper { \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext } } } diff --git a/input/regression/hara-kiri-short.ly b/input/regression/hara-kiri-short.ly index 0f5398f706..98745ecb50 100644 --- a/input/regression/hara-kiri-short.ly +++ b/input/regression/hara-kiri-short.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header{ texidoc=" Hara kiri staves kill themselves if they are empty. This example really @@ -39,7 +39,7 @@ zagers = \context StaffGroup < \paper{ linewidth = 80.0\mm - \translator { \HaraKiriStaffContext } + \translator { \RemoveEmptyStaffContext } %uh? } diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly index 77ba918c1f..a1c7ec844f 100644 --- a/input/regression/pc-mmrest.ly +++ b/input/regression/pc-mmrest.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header { texidoc="Multi measure rests of second voice should not disappear." } @@ -47,7 +47,7 @@ two = \notes \relative c'' { \consists Bar_engraver } \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext \remove Multi_measure_rest_engraver \remove Bar_engraver } diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 977124e4d6..406d1a35c0 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header { title = "ancient font test" date = "2002" @@ -284,7 +284,7 @@ lowerStaff = \context MensuralStaff = lowerStaff < clefOctavation = #0 } \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext \accepts MensuralVoice \accepts GregorianVoice } diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index 1995ce5798..0b15c0045c 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" % Ugh, we need to override some LaTeX titling stuff @@ -134,7 +134,7 @@ violoncello = \notes \relative c' { indent=100.0\mm linewidth=150.0\mm \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext } \translator { \OrchestralScoreContext diff --git a/input/test/equaliser.ly b/input/test/equaliser.ly index 2337e8a98f..8f7670635e 100644 --- a/input/test/equaliser.ly +++ b/input/test/equaliser.ly @@ -2,7 +2,7 @@ \header { texidoc = "The full orchestra plays a notes, where groups stop one after another. USe this to tune equalizer settings. " } -\version "1.7.18" +\version "1.7.19" flauti = \notes \relative c' { \property Staff.midiInstrument = #"flute" @@ -142,7 +142,7 @@ violoncello = \notes \relative c' { indent=100.0\mm linewidth=150.0\mm \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext } } \midi { diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index 7e8683a022..0584fd8cbb 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header { title = "Gregorian Scripts" date = "2003" @@ -92,7 +92,7 @@ cantus = \notes \relative c' { Custos \set #'adjust-if-on-staffline = ##t } \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext \accepts VaticanaVoice } \translator { diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index 16bbe2b3d7..1a8d8111c9 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -2,7 +2,7 @@ \header { texidoc = "some instruments (notably: cello and double bass) are alternatively written on one and two staves. This is the way to do it:" } -\version "1.7.18" +\version "1.7.19" voiceOne = \notes \relative c'' { @@ -49,7 +49,7 @@ grandstaff = \context GrandStaff = one < linewidth=80.0\mm \translator { \VoiceContext autoBeaming = ##f } - \translator { \HaraKiriStaffContext } + \translator { \RemoveEmptyStaffContext } \translator { \OrchestralScoreContext skipBars = ##t } } } diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index d0cd7fd7cb..7256c2052a 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header { texidoc = "Hara kiri staves disappear when empty " @@ -90,7 +90,7 @@ zagers = \context GrandStaff < > \paper{ linewidth = 100.0\mm - \translator { \HaraKiriStaffContext } + \translator { \RemoveEmptyStaffContext } %uh? \translator { \OrchestralScoreContext } % \translator { \OrchestralPartStaffContext } diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index 726b596483..216cc72c9e 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header { title = "mensural ligature test" date = "2002" @@ -70,7 +70,7 @@ voice = \notes \transpose c c' { clefOctavation = #-0 } \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext \accepts MensuralVoice } \translator { diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 7c217714c5..76ff1a0ab6 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header{ latexpackages="graphicx" } @@ -108,7 +108,7 @@ c1 | c2 c | c c | R1*5 RestCollision \override #'maximum-rest-count = #1 %% FIXME marginScriptHorizontalAlignment = #1 } - \translator { \HaraKiriStaffContext + \translator { \RemoveEmptyStaffContext } } } diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly index 696e75f9a8..43d0a7f67e 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \score{ \context PianoStaff < @@ -21,7 +21,7 @@ textheight = 295.0\mm linewidth = 180.0\mm - \translator{ \HaraKiriStaffContext } + \translator{ \RemoveEmptyStaffContext } % % The Voice combine hierarchy % @@ -39,7 +39,7 @@ \accepts "VoiceCombineThread" } \translator{ - \HaraKiriStaffContext + \RemoveEmptyStaffContext \consists "Mark_engraver" \name "VoiceCombineStaff" \accepts "VoiceCombineVoice" @@ -59,7 +59,7 @@ \consists "Thread_devnull_engraver" } \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext \name "StaffCombineStaff" \accepts "StaffCombineVoice" @@ -76,7 +76,7 @@ \accepts "VoiceCombineStaff" \accepts "StaffCombineStaff" } - \translator{ \HaraKiriStaffContext } + \translator{ \RemoveEmptyStaffContext } \translator { \ScoreContext diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly index eec15c2c2e..32db7e5316 100644 --- a/input/test/part-combine-score.ly +++ b/input/test/part-combine-score.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header { texidoc="Template for part-combining orchestral scores" @@ -216,7 +216,7 @@ archiGroup = \context StaffGroup = archi_group < textheight = 285.0\mm linewidth = 190.0\mm - \translator{ \HaraKiriStaffContext } + \translator{ \RemoveEmptyStaffContext } % % The Voice combine hierarchy % @@ -234,7 +234,7 @@ archiGroup = \context StaffGroup = archi_group < \accepts "VoiceCombineThread" } \translator{ - \HaraKiriStaffContext + \RemoveEmptyStaffContext \consists "Mark_engraver" \name "VoiceCombineStaff" \accepts "VoiceCombineVoice" @@ -254,7 +254,7 @@ archiGroup = \context StaffGroup = archi_group < \consists "Thread_devnull_engraver" } \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext \name "StaffCombineStaff" \accepts "StaffCombineVoice" @@ -272,7 +272,7 @@ archiGroup = \context StaffGroup = archi_group < \accepts "VoiceCombineStaff" \accepts "StaffCombineStaff" } - \translator{ \HaraKiriStaffContext } + \translator{ \RemoveEmptyStaffContext } \translator { %\ScoreContext diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index d56664f0e6..02ec43a466 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \score{ \context PianoStaff < @@ -31,7 +31,7 @@ textheight = 295.0\mm linewidth = 180.0\mm - \translator{ \HaraKiriStaffContext } + \translator{ \RemoveEmptyStaffContext } % % The Voice combine hierarchy % @@ -49,7 +49,7 @@ \accepts "VoiceCombineThread" } \translator{ - \HaraKiriStaffContext + \RemoveEmptyStaffContext \consists "Mark_engraver" \name "VoiceCombineStaff" \accepts "VoiceCombineVoice" @@ -69,7 +69,7 @@ \consists "Thread_devnull_engraver" } \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext \name "StaffCombineStaff" \accepts "StaffCombineVoice" @@ -86,7 +86,7 @@ \accepts "VoiceCombineStaff" \accepts "StaffCombineStaff" } - \translator{ \HaraKiriStaffContext } + \translator{ \RemoveEmptyStaffContext } \translator { \ScoreContext diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly index 082f851269..6bd55a18a4 100644 --- a/input/test/vaticana.ly +++ b/input/test/vaticana.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.19" \header { title = "vaticana ligature test" date = "2003" @@ -75,7 +75,7 @@ verba = \context Lyrics = verba \lyrics { Custos \set #'adjust-if-on-staffline = ##t } \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext \accepts VaticanaVoice } \translator { diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 6172fbaa1e..805b3757b0 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -362,7 +362,7 @@ ChordNamesContext = \translator { } -FrenchStaffContext = \translator { +RemoveEmptyStaffContext = \translator { \StaffContext \remove "Axis_group_engraver" \consistsend "Hara_kiri_engraver" @@ -373,7 +373,7 @@ FrenchStaffContext = \translator { Beam \override #'auto-knee-gap = #'() } -HaraKiriStaffContext = \translator { \FrenchStaffContext } +HaraKiriStaffContext = \translator { \RemoveEmptyStaffContext } ScoreContext = \translator { \type Score_engraver diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 822207cf9d..ec66a08af6 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1188,12 +1188,12 @@ if 1: if 1: def conv(str): - if re.search( r'\\GraceContext'): + if re.search( r'\\GraceContext', str): sys.stderr.write ("GraceContext has been removed") sys.stderr.write ("please use #(add-to-grace-init .. )") raise FatalConversionError() - str = re.sub ('HaraKiriStaffContext', 'FrenchStaffContext', str) + str = re.sub ('HaraKiriStaffContext', 'RemoveEmptyStaffContext', str) return str conversions.append (((1,7,19), conv,"remove GraceContext"))