From 2a243bcb9e9b64282f33773a1fce64380fbb1dd2 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 01:20:47 +0000 Subject: [PATCH] lilypond-1.5.5 --- Documentation/user/converters.itely | 2 +- Documentation/user/glossary.tely | 22 ++++---- Documentation/user/internals.itely | 2 +- Documentation/user/preface.itely | 2 +- Documentation/user/refman.itely | 32 ++++++----- input/bugs/barline.ly | 2 +- input/bugs/rest-melisma.ly | 2 +- input/example-3.ly | 2 +- input/regression/auto-change.ly | 2 +- input/regression/beam-cross-staff.ly | 2 +- input/regression/grace-sync.ly | 2 +- input/regression/hara-kiri-short.ly | 4 +- input/regression/lyric-combine.ly | 2 +- input/regression/staff-margin.ly | 2 +- input/template/README | 4 +- input/test/extra-staff.ly | 4 +- input/test/follow-thread.ly | 2 +- input/test/hara-kiri-switch.ly | 2 +- input/test/hara-kiri.ly | 2 +- input/test/nested-groups.ly | 2 +- input/twinkle.ly | 2 +- lily/bar-engraver.cc | 2 +- lily/include/score.hh | 2 +- lily/include/staff-symbol.hh | 8 +-- lily/include/system-start-delimiter.hh | 2 +- lily/instrument-name-engraver.cc | 2 +- lily/line-spanner.cc | 2 +- lily/mark-engraver.cc | 8 +-- lily/parser.yy | 72 ++++++++++++------------- lily/span-arpeggio-engraver.cc | 2 +- lily/span-bar-engraver.cc | 4 +- lily/spanner.cc | 2 +- ly/engraver-init.ly | 2 +- ly/params-init.ly | 2 +- mf/feta-toevallig.mf | 10 ++-- ps/lilyponddefs.ps | 2 +- scm/translator-description.scm | 20 +++---- scm/translator-property-description.scm | 4 +- 38 files changed, 126 insertions(+), 118 deletions(-) diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely index 7609ed2ca2..05e31d59ff 100644 --- a/Documentation/user/converters.itely +++ b/Documentation/user/converters.itely @@ -284,7 +284,7 @@ print warranty and copyright. Mup2ly comes with absolutely @strong{NO WARRANTY} @refbugs -Currently, only plain notes (pitches, durations), voices and staffs are +Currently, only plain notes (pitches, durations), voices and staves are converted. Written by @email{Jan Nieuwenhuizen,janneke@@gnu.org}, based on pmx2ly. diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 3abaec6594..c17523bf93 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -157,11 +157,15 @@ the duration of the long a. is proportionate to that of the main note. \property Score.TextScript \set #'font-style = #'large r -{ \property Grace.Stem \override #'flag-style = #"" - \grace g16 } +{ \property Voice.Stem \override #'flag-style = #"" + \grace g16 + \property Voice.Stem \revert #'flag-style + } fis8 e16 fis -{ \property Grace.Stem \override #'flag-style = #"" - \grace a16 } +{ \property Voice.Stem \override #'flag-style = #"" + \grace a16 + \property Voice.Stem \revert #'flag-style + } g8 fis16 g | a4 \bar "||" } \notes\relative c'' { r g16 () fis e fis a () g fis g | a4 \bar "||" } @@ -321,7 +325,7 @@ ES: llave, corchete I: graffa, F: accolade, D: Klammer, Klavierklammer, Akkolade, Chorklammer, NL: accolade, teksthaak, DK: klamme, S: klammer, N: -Symbol at the start of a system connecting staffs. Curly braces are used +Symbol at the start of a system connecting staves. Curly braces are used for connecting piano staves, angular brackets for connecting parts in an orchestral or choral score. @@ -1219,7 +1223,7 @@ S: ackolad, b@"ojd klammer, N: . @w{@ar{}@strong{brace}} -A combination of two staffs with a brace. Usually used for piano music. +A combination of two staves with a brace. Usually used for piano music. @item grave ES: grave, I: grave, F: grave, D: grave, langsam, traurig, NL: grave, ernstig, DK: grave, S: grave, N: @@ -2241,9 +2245,9 @@ notehead. ES: pentagrama, I: pentagramma, rigo (musicale), F: port@'ee, D: Notensystem, NL: (noten)balk; partij, DK: nodesystem, S: notsystem, N: . -pl. staves or staffs. A series of (normally 5) horizontal lines upon and -between which the musical notes are written, thus indicating (in connection -with a @w{@ar{}@strong{clef}}) their pitch. Staffs for +pl. staves. A series of (normally 5) horizontal lines upon and between +which the musical notes are written, thus indicating (in connection +with a @w{@ar{}@strong{clef}}) their pitch. Staves for @w{@ar{}@strong{percussion}} instruments may have fewer lines. @item stem diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely index 053bd3e048..030961124e 100644 --- a/Documentation/user/internals.itely +++ b/Documentation/user/internals.itely @@ -303,7 +303,7 @@ properties. A grob is often associated with a symbol, but some grobs do not print any symbols. They take care of grouping objects. For example, there is a -separate grob that stacks staffs vertically. The @code{NoteCollision} +separate grob that stacks staves vertically. The @code{NoteCollision} is also an abstract grob: it only moves around chords, but doesn't print anything. diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely index fc9f87b12b..44469af50c 100644 --- a/Documentation/user/preface.itely +++ b/Documentation/user/preface.itely @@ -48,7 +48,7 @@ with a parser-first, bottom-up rewrite called mpp95 (which totally failed, obviously). After long and hard thinking, I came up with an algorithm for the -horizontal spacing of multiple staffs (april 1996) I coded it (and did +horizontal spacing of multiple staves (april 1996) I coded it (and did not test it). After starting with this fundamental piece, I slowly added the stages which come before spacing, and after. A half year later, I had a first working version, (october 1996). I announced diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 809565998e..3deccc35ce 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1350,7 +1350,11 @@ stem. @lilypond[fragment,verbatim] \relative c'' { \grace c8 c4 \grace { [c16 c16] } c4 - \grace { \property Grace.Stem \override #'flag-style = #'() c16 } c4 + \grace { + \property Voice.Stem \override #'flag-style = #'() + c16 + \property Voice.Stem \revert #'flag-style + } c4 } @end lilypond @@ -1602,7 +1606,7 @@ Folded repeats offer little more over simultaneous music. However, it is to be expected that more functionality -- especially for the MIDI backend -- will be implemented at some point in the future. -Volta repeats are printed over all staffs in a score. You must turn them +Volta repeats are printed over all staves in a score. You must turn them off explicitly, for example by doing @example \property Staff.VoltaBracket = \turnOff @@ -1717,11 +1721,11 @@ with slashes, and repeating that measure with percents. @menu -* Rhythmic staffs:: +* Rhythmic staves:: @end menu -@node Rhythmic staffs -@subsection Rhythmic staffs +@node Rhythmic staves +@subsection Rhythmic staves Sometimes you might want to show only the rhythm of a melody. This can be done with the rhythmic staff. All pitches of notes on such a staff @@ -1739,9 +1743,9 @@ are squashed, and the staff itself looks has a single staff line: @node Piano music @section Piano music -Piano music is an odd type of notation. Piano staffs are two normal -staffs coupled with a brace. The staffs are largely independent, but -sometimes voices can cross between the two staffs. The +Piano music is an odd type of notation. Piano staves are two normal +staves coupled with a brace. The staves are largely independent, but +sometimes voices can cross between the two staves. The @code{PianoStaff} is especially built to handle this cross-staffing behavior. In this section we discuss the @code{PianoStaff} and some other pianistic peculiarities. @@ -1792,7 +1796,7 @@ terminating too soon. @cindex manual staff switches @cindex staff switch, manual -Voices can be switched between staffs manually, using the following command: +Voices can be switched between staves manually, using the following command: @example \translator Staff = @var{staffname} @var{music} @end example @@ -1858,8 +1862,8 @@ You can specify an arpeggio sign on a chord by attaching an \context Voice @end lilypond -When an arpeggio crosses staffs in piano music, you attach an arpeggio -to the chords in both staffs, and set +When an arpeggio crosses staves in piano music, you attach an arpeggio +to the chords in both staves, and set @code{PianoStaff.connectArpeggios}. @lilypond[fragment,relative,verbatim] @@ -2370,7 +2374,7 @@ problems in orchestral music. * Sound output for transposing instruments:: * Multi measure rests:: * Automatic part combining:: -* Hara kiri staffs:: +* Hara kiri staves:: @end menu @c . {Rehearsal marks} @@ -2622,8 +2626,8 @@ measure. @cindex @code{Voice_engraver} @cindex @code{A2_engraver} -@node Hara kiri staffs -@subsection Hara kiri staffs +@node Hara kiri staves +@subsection Hara kiri staves In orchestral scores, staff lines that only have rests are usually removed. This saves some space. LilyPond also supports this through the hara diff --git a/input/bugs/barline.ly b/input/bugs/barline.ly index e8e8742637..aaf7ad5841 100644 --- a/input/bugs/barline.ly +++ b/input/bugs/barline.ly @@ -1,6 +1,6 @@ \header { -texidoc= "Staffs that end half way a system should end at the bar line."; +texidoc= "Staves that end half way a system should end at the bar line."; } melody = \notes \relative c' { diff --git a/input/bugs/rest-melisma.ly b/input/bugs/rest-melisma.ly index 3d2aafbb8a..9ebb3ef1f6 100644 --- a/input/bugs/rest-melisma.ly +++ b/input/bugs/rest-melisma.ly @@ -1,5 +1,5 @@ \header { -texidoc="slur or long note on other staffs fool lily into extending melisma" +texidoc="slur or long note on other staves fool lily into extending melisma" } \score { < diff --git a/input/example-3.ly b/input/example-3.ly index 8f55b57e77..8a445f1dbb 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -18,7 +18,7 @@ two = \notes\relative c{ \midi{} } -% A full example with two staffs +% A full example with two staves % % Type: % diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 0d1c584848..e377fbf3cf 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -2,7 +2,7 @@ \header{ texidoc=" -Auto change piano staff switches voices between up and down staffs +Auto change piano staff switches voices between up and down staves automatically rests are switched along with the coming note. " } diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index f1febee2b5..bff2c9c9bf 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,7 +1,7 @@ \version "1.3.146" \header{ texidoc=" -Beams can be typeset over fixed distance aligned staffs, beam +Beams can be typeset over fixed distance aligned staves, beam beautification doesn't really work, but knees do. Beams should be behave well, wherever the switching point is. " diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index 419ccdeb14..4ce8fa85b8 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,5 +1,5 @@ \header { - texidoc = "grace notes in different voices/staffs are synchronized." + texidoc = "grace notes in different voices/staves are synchronized." } \score {\notes < \context Staff { c2 diff --git a/input/regression/hara-kiri-short.ly b/input/regression/hara-kiri-short.ly index ecf8f21d54..313e0dd4f4 100644 --- a/input/regression/hara-kiri-short.ly +++ b/input/regression/hara-kiri-short.ly @@ -1,8 +1,8 @@ \version "1.3.146" \header{ texidoc=" -Hara kiri staffs kill themselves if they are empty. This example really -contains two staffs, but the second contains only spaces, and is +Hara kiri staves kill themselves if they are empty. This example really +contains two staves, but the second contains only spaces, and is therefore removed. Also, any staff brackets and braces are removed. " } diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 874d5aac1a..76c3b7cf25 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -6,7 +6,7 @@ dumped. Lyrics will not be set over rests. You can have melismata either by setting a property melismaBusy, or by setting automaticMelismas (which will set melismas during slurs and ties). If you want a different order than first Music, then Lyrics, you must -precook a chord of staffs/lyrics and label those. Of course +precook a chord of staves/lyrics and label those. Of course @code{\rhythm} ignores any other rhythms in the piece. Hyphens and extenders do not assume anything about lyric lengths, so they continue to work. diff --git a/input/regression/staff-margin.ly b/input/regression/staff-margin.ly index 7d89536e93..a36d1722dc 100644 --- a/input/regression/staff-margin.ly +++ b/input/regression/staff-margin.ly @@ -3,7 +3,7 @@ texidoc=" Staff margins are also markings attached to barlines. They should be left of the staff, and be centered vertically wrt the staff. They may -be on normal staffs, but also on compound staffs, like the PianoStaff +be on normal staves, but also on compound staves, like the PianoStaff " } diff --git a/input/template/README b/input/template/README index b3c24f9b3f..7964ec496d 100644 --- a/input/template/README +++ b/input/template/README @@ -4,7 +4,7 @@ * Better comment-out most header entries, or move to template/title.ly altogether? -* Naming conventions for voices/staffs +* Naming conventions for voices/staves (think: \autochange, \partcombine)? * Add (commented-out) stuff like \time 3/4 @@ -35,7 +35,7 @@ melody with lyrics and chords = melody-lyrics-chords.ly piano = piano.ly piano with several voices = piano-4-voices.ly - piano with lyrics (between staffs) = piano-lyrics.ly + piano with lyrics (between staves) = piano-lyrics.ly piano with melody and lyrics = piano-melody-lyrics.ly TODO (Choral templates, anyone?) diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index be86a4b121..766ff6686e 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -3,7 +3,7 @@ (Message vers:9) To: Adrian Mariano cc: gnu-music-discuss@gnu.org -Subject: Re: Switching from one staff to two staffs +Subject: Re: Switching from one staff to two staves Reply-To: janneke@gnu.org In-reply-to: Your message of "Tue, 19 Jan 1999 12:27:10 EST." <199901191727.MAA29757@avalanche.cam.cornell.edu> @@ -13,7 +13,7 @@ From: Jan Nieuwenhuizen On Tuesday, 19 January 1999, Adrian Mariano writes: > I want to typeset something which starts out with just one staff and then -> harmony comes in and there are two staffs. I can't figure out how to do +> harmony comes in and there are two staves. I can't figure out how to do > this. I get an extra blank staff during the second section (using > Lily 1.1.15): diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly index aa9de31a8c..5e020d18e7 100644 --- a/input/test/follow-thread.ly +++ b/input/test/follow-thread.ly @@ -1,7 +1,7 @@ \header{ texidoc=" -Theads can be traced automagically when they switch staffs by setting +Theads can be traced automagically when they switch staves by setting property @code{followVoice}. " } diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index fd83125d12..f738d1048c 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -18,7 +18,7 @@ staffOne = \context Staff = one < > voiceTwo = \notes \relative c' { - % we must have a Thread context before we can switch staffs + % we must have a Thread context before we can switch staves % in this case, the notes before the switching will do that % implicitely \context Thread diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 978c98ff00..0058297c1c 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,7 +1,7 @@ \version "1.3.146" \header { -texidoc = "Hara kiri staffs disappear when empty " +texidoc = "Hara kiri staves disappear when empty " } diff --git a/input/test/nested-groups.ly b/input/test/nested-groups.ly index 69e289a477..ea4b69d55a 100644 --- a/input/test/nested-groups.ly +++ b/input/test/nested-groups.ly @@ -3,7 +3,7 @@ texidoc=" In InnerStaffGroup and InnerChoirStaff, the brackets should be shiftet leftwards. " filename = "nested-groups.ly" -description = "Test of nested staff groups and choirstaffs" +description = "Test of nested staff groups and choirstaves" enteredby = "RZ" copyright = "public domain" Tested = "Nested StaffGroups" diff --git a/input/twinkle.ly b/input/twinkle.ly index d801410f40..c6726d473f 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -17,7 +17,7 @@ traditional song in various languages. %} %{ -Tested Features: lyrics, interleaving lyrics and staffs, repeats, +Tested Features: lyrics, interleaving lyrics and staves, repeats, auto beaming, adding lyrics to notes, hyphens %} diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 0108cf961a..f298b9f667 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -88,7 +88,7 @@ Bar_engraver::typeset_bar () } /* - lines may only be broken if there is a barline in all staffs + lines may only be broken if there is a barline in all staves */ void Bar_engraver::stop_translation_timestep () diff --git a/lily/include/score.hh b/lily/include/score.hh index 7c25235490..78dc4ccabd 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -19,7 +19,7 @@ /// the total music def of one movement class Score: public Input { public: - /// paper_, staffs_ and commands_ form the problem definition. + /// paper_, staves_ and commands_ form the problem definition. Link_array def_p_arr_; SCM music_; Scheme_hash_table * header_p_; diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh index d8bb51dc71..2bc13a4e90 100644 --- a/lily/include/staff-symbol.hh +++ b/lily/include/staff-symbol.hh @@ -1,5 +1,5 @@ /* - staffsym.hh -- declare Staff_symbol + staff-symbol.hh -- declare Staff_symbol source file of the GNU LilyPond music typesetter @@ -7,8 +7,8 @@ */ -#ifndef STAFFSYM_HH -#define STAFFSYM_HH +#ifndef STAFF_SYMBOL_HH +#define STAFF_SYMBOL_HH #include "lily-guile.hh" @@ -25,4 +25,4 @@ public: static bool has_interface (Grob*); static void set_interface (Grob*); }; -#endif // STAFFSYM_HH +#endif // STAFF_SYMBOL_HH diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh index 1b05be028d..1d6029e15c 100644 --- a/lily/include/system-start-delimiter.hh +++ b/lily/include/system-start-delimiter.hh @@ -14,7 +14,7 @@ #include "lily-proto.hh" /* - Braces/brackets across staffs. + Braces/brackets across staves. */ class System_start_delimiter { diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 54b7ccdcf8..c98bbdd7e9 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -96,7 +96,7 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i) return; /* - Hang the instrument names on the staffs, but not on the alignment + Hang the instrument names on the staves, but not on the alignment groups enclosing that staff. The alignment has no real location, but is only a vehicle for the placement routine it contains, and therefore the location of its refpoint won't be very useful. diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index d4bc8b318d..2a12e91486 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -158,7 +158,7 @@ Line_spanner::broken_trend_offset (Grob *me, Direction dir) Warning: this thing is a cross-staff object, so it should have empty Y-dimensions. (If not, you risk that this is called from the staff-alignment - routine, via molecule_extent. At this point, the staffs aren't + routine, via molecule_extent. At this point, the staves aren't separated yet, so it doesn't work cross-staff. */ diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index f0abdbc711..faaa30c800 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -59,7 +59,7 @@ Mark_engraver::Mark_engraver () void Mark_engraver::initialize () { - daddy_trans_l_->set_property ("staffsFound", SCM_EOL); // ugh: sharing with barnumber grav. + daddy_trans_l_->set_property ("stavesFound", SCM_EOL); // ugh: sharing with barnumber grav. } @@ -70,10 +70,10 @@ Mark_engraver::acknowledge_grob (Grob_info inf) if (Staff_symbol::has_interface (s) || to_boolean (s->get_grob_property ("invisible-staff"))) { - SCM sts = get_property ("staffsFound"); + SCM sts = get_property ("stavesFound"); SCM thisstaff = inf.elem_l_->self_scm (); if (scm_memq (thisstaff, sts) == SCM_BOOL_F) - daddy_trans_l_->set_property ("staffsFound", gh_cons (thisstaff, sts)); + daddy_trans_l_->set_property ("stavesFound", gh_cons (thisstaff, sts)); } else if (text_p_ && Bar::has_interface (s)) { @@ -90,7 +90,7 @@ Mark_engraver::stop_translation_timestep () { if (text_p_) { - text_p_->set_grob_property ("side-support-elements" , get_property ("staffsFound")); + text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound")); typeset_grob (text_p_); text_p_ =0; } diff --git a/lily/parser.yy b/lily/parser.yy index b9f4793d2c..5019a8d8a2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -409,7 +409,7 @@ lilypond_header: */ assignment: STRING { - THIS->remember_spot (); + THIS->push_spot (); } /* cont */ '=' identifier_init { @@ -535,7 +535,7 @@ translator_spec_body: */ score_block: SCORE { - THIS->remember_spot (); + THIS->push_spot (); } /*cont*/ '{' score_body '}' { THIS->pop_spot (); @@ -806,7 +806,7 @@ Composite_music: chm->set_spot (*$3->origin ()); } | GRACE Music { -#if 0 +#if 1 /* The other version is for easier debugging of Sequential_music_iterator in combination with grace notes. @@ -856,7 +856,7 @@ Composite_music: $$ = csm; } | TIMES { - THIS->remember_spot (); + THIS->push_spot (); } /* CONTINUED */ fraction Music @@ -1076,18 +1076,19 @@ scalar: request_chord: - pre_requests simple_element post_requests { - Music_sequence *l = dynamic_cast ($2); + pre_requests { + THIS->push_spot (); + } /*cont */ simple_element post_requests { + Music_sequence *l = dynamic_cast ($3); if (l) { for (int i=0; i < $1->size (); i++) l->append_music ($1->elem (i)); - for (int i=0; i < $3->size (); i++) - l->append_music ($3->elem (i)); + for (int i=0; i < $4->size (); i++) + l->append_music ($4->elem (i)); } else programming_error ("Need Sequence to add music to"); - $$ = $2; - + $$ = $3; } | command_element ; @@ -1675,6 +1676,8 @@ tremolo_type: simple_element: pitch exclamations questions optional_notemode_duration { + + Input i = THIS->pop_spot (); if (!THIS->lexer_p_->note_state_b ()) THIS->parser_error (_ ("Have to be in Note mode for notes")); @@ -1691,40 +1694,36 @@ simple_element: Simultaneous_music*v = new Request_chord (SCM_EOL); v->set_mus_property ("elements", gh_list (n->self_scm (), SCM_UNDEFINED)); -/* -FIXME: location is one off, since ptich & duration don't contain origin refs. -*/ - v->set_spot (THIS->here_input ()); - n->set_spot (THIS->here_input ()); - + v->set_spot (i); + n->set_spot (i); $$ = v; } | RESTNAME optional_notemode_duration { - SCM e = SCM_UNDEFINED; - if (ly_scm2string ($1) =="s") - { /* Space */ - Skip_req * skip_p = new Skip_req; - skip_p->set_mus_property ("duration" ,$2); - - skip_p->set_spot (THIS->here_input ()); + Input i = THIS->pop_spot (); + SCM e = SCM_UNDEFINED; + if (ly_scm2string ($1) =="s") { + /* Space */ + Skip_req * skip_p = new Skip_req; + skip_p->set_mus_property ("duration" ,$2); + skip_p->set_spot (i); e = skip_p->self_scm (); - } - else - { - Rest_req * rest_req_p = new Rest_req; - rest_req_p->set_mus_property ("duration", $2); - rest_req_p->set_spot (THIS->here_input ()); + } + else { + Rest_req * rest_req_p = new Rest_req; + rest_req_p->set_mus_property ("duration", $2); + rest_req_p->set_spot (i); e = rest_req_p->self_scm (); } - Simultaneous_music* velt_p = new Request_chord (SCM_EOL); + Simultaneous_music* velt_p = new Request_chord (SCM_EOL); velt_p-> set_mus_property ("elements", gh_list (e,SCM_UNDEFINED)); - velt_p->set_spot (THIS->here_input ()); - + velt_p->set_spot (i); - $$ = velt_p; + $$ = velt_p; } | MULTI_MEASURE_REST optional_notemode_duration { + Input i = THIS->pop_spot (); + Skip_req * sk = new Skip_req; sk->set_mus_property ("duration", $2); Span_req *sp1 = new Span_req; @@ -1748,19 +1747,20 @@ FIXME: location is one off, since ptich & duration don't contain origin refs. $$->set_mus_property ("elements", ms); } | STRING optional_notemode_duration { + Input i = THIS->pop_spot (); Lyric_req* lreq_p = new Lyric_req; lreq_p->set_mus_property ("text", $1); lreq_p->set_mus_property ("duration",$2); - lreq_p->set_spot (THIS->here_input ()); + lreq_p->set_spot (i); Simultaneous_music* velt_p = new Request_chord (SCM_EOL); velt_p->set_mus_property ("elements", gh_list (lreq_p->self_scm (), SCM_UNDEFINED)); - $$= velt_p; - } | chord { + Input i = THIS->pop_spot (); + if (!THIS->lexer_p_->chord_state_b ()) THIS->parser_error (_ ("Have to be in Chord mode for chords")); $$ = $1; diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 5608a0cb60..674debdd16 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -16,7 +16,7 @@ /** - Make arpeggios that span multiple staffs. Catch arpeggios, and span a + Make arpeggios that span multiple staves. Catch arpeggios, and span a Span_arpeggio over them if we find more than two arpeggios. */ class Span_arpeggio_engraver : public Engraver diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 9d110e8a63..1d8cdfc0c8 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -16,9 +16,9 @@ /** - Make bars that span multiple "staffs". Catch bars, and span a + Make bars that span multiple "staves". Catch bars, and span a Span_bar over them if we find more than 2 bars. Vertical alignment - of staffs changes the appearance of spanbars. It is up to the + of staves changes the appearance of spanbars. It is up to the aligner (Vertical_align_engraver, in this case, to add extra dependencies to the spanbars. diff --git a/lily/spanner.cc b/lily/spanner.cc index 15f0ad8a8c..32ae0ed5c1 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -362,7 +362,7 @@ extend_spanner_over_elements (SCM value, SCM extremal_pair) points to. TODO: maybe be more specific. Most probably fucks up if someone sets - a pointer to the staffsymbol in S + a pointer to the staff symbol in S */ void extend_spanner_over_elements (Grob*s) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 729a926b01..9717e3c5e2 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -39,7 +39,7 @@ StaffContext=\translator { % explicitly set instrument, so we don't get % weird effects when doing instrument names for - % piano staffs + % piano staves instrument = ##f instr = ##f diff --git a/ly/params-init.ly b/ly/params-init.ly index 39574c1b40..f406588183 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -8,7 +8,7 @@ papersizename = \papersize papersize = \papersize % FIXME -% direct PostScript line height for single line staffs +% direct PostScript line height for single line staves lineheight = 14 paperfile = \papersize + "-init.ly" diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index 21bacb3044..9eeafb828d 100644 --- a/mf/feta-toevallig.mf +++ b/mf/feta-toevallig.mf @@ -26,7 +26,7 @@ fet_begingroup("accidentals"); % a square pen). [Wanske] does not mention this, so we'll just ignore % this fact % -fet_beginchar("Default Sharp" , "1", "sharp"); +fet_beginchar("Sharp" , "1", "sharp"); set_char_box(0, 1.1 staff_space#, 1.5 staff_space#, 1.5 staff_space#); @@ -82,7 +82,7 @@ fet_beginchar("Default Sharp" , "1", "sharp"); labels(1,2,3,4); fet_endchar; -fet_beginchar( "Default Natural", "0", "natural") +fet_beginchar( "Natural", "0", "natural") set_char_box(0, 8/12 staff_space#, 1.5 staff_space#, 1.5 staff_space#); save interbeam, interstem, beamheight, beamwidth, @@ -203,13 +203,13 @@ enddef; % % unfortunately, 600dpi is not enough to show the brush of the stem. % -fet_beginchar("Default Flat", "-1", "flat") +fet_beginchar("Flat", "-1", "flat") set_char_box(1.2 stafflinethickness#, .8 staff_space#, .5 staff_space#, 2 staff_space#); draw_meta_flat(0, w, 1/3 staff_space); fet_endchar; -fet_beginchar("Default Double Flat", "-2", "flatflat") +fet_beginchar("Double Flat", "-2", "flatflat") save left_wid, overlap, right_wid; left_wid = .7; right_wid = .8; @@ -220,7 +220,7 @@ fet_beginchar("Default Double Flat", "-2", "flatflat") right_wid *staff_space, 1/3 staff_space); fet_endchar; -fet_beginchar("Default Double Sharp", "2", "sharpsharp") +fet_beginchar("Double Sharp", "2", "sharpsharp") set_char_box(0, staff_space#, .5 staff_space#, .5 staff_space#); save klaverblad, klaversteel; diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps index 114d0beaaa..69112106cb 100644 --- a/ps/lilyponddefs.ps +++ b/ps/lilyponddefs.ps @@ -17,7 +17,7 @@ % FIXME % urg, read from paper block -% fixed base line skip value, for single line staffs +% fixed base line skip value, for single line staves /base-line-skip lilypondpaperlineheight def diff --git a/scm/translator-description.scm b/scm/translator-description.scm index f53a0a0ebe..ef856df048 100644 --- a/scm/translator-description.scm +++ b/scm/translator-description.scm @@ -163,7 +163,7 @@ stemRightBeamCount. '(BarLine) '( whichBar - staffsFound + stavesFound ))) @@ -172,7 +172,7 @@ stemRightBeamCount. (engraver-description "Bar_number_engraver" "A bar number is created whenever measurePosition is zero. It is -put on top of all staffs, and appears only at left side of the staff." +put on top of all staves, and appears only at left side of the staff." '(BarNumber) '( currentBarNumber @@ -344,7 +344,7 @@ If omitted, then dots appear on top of the notes. '( rehearsalMark - staffsFound + stavesFound ))) @@ -690,7 +690,7 @@ everything in the second thread. 'Timing_engraver (engraver-description "Timing_engraver" - " Responsible for synchronizing timing information from staffs. + " Responsible for synchronizing timing information from staves. Normally in @code{Score}. In order to create polyrhythmic music, this engraver should be removed from @code{Score} and placed in @code{Staff}." @@ -794,8 +794,8 @@ everything in the second thread. ") (GrandStaff . " Contains @code{Staff} or @code{RhythmicStaff} contexts. It adds a - brace on the left side, grouping the staffs together. The bar - lines of the contained staffs are connected vertically. It can + brace on the left side, grouping the staves together. The bar + lines of the contained staves are connected vertically. It can contain @code{Staff} contexts.") (PianoStaff . " @@ -805,13 +805,13 @@ everything in the second thread. (StaffGroup . " Contains @code{Staff} or @code{RhythmicStaff} contexts. Adds a - bracket on the left side, grouping the staffs together. The bar - lines of the contained staffs are connected vertically. It can + bracket on the left side, grouping the staves together. The bar + lines of the contained staves are connected vertically. It can contain @code{Staff}, @code{RhythmicStaff}, @code{GrandStaff}, or @code{Lyrics} contexts. ") (ChoirStaff . " - Identical to @code{StaffGroup} except that the contained staffs + Identical to @code{StaffGroup} except that the contained staves are not connected vertically. ") (Score . " @@ -819,7 +819,7 @@ everything in the second thread. contain a @code{Score} context. This context handles the administration of time signatures. It also makes sure that items such as clefs, time signatures, and key-signatures are aligned - across staffs. It can contain @code{Lyrics}, @code{Staff}, + across staves. It can contain @code{Lyrics}, @code{Staff}, @code{RhythmicStaff}, @code{GrandStaff}, @code{StaffGroup}, and @code{ChoirStaff} contexts. diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index f5aacffd24..22c77623d3 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -128,7 +128,7 @@ this much extra octavation. Values of 7 and -7 are common.") (translator-property-description 'combineParts boolean? "try to combine parts?") (translator-property-description 'connectArpeggios boolean? " If set, connect all arpeggios that are found. In this way, you can make -arpeggios that cross staffs. +arpeggios that cross staves. ") (translator-property-description 'createKeyOnClefChange boolean? "Print a key signature whenever the clef is changed.") (translator-property-description 'crescendoText markup? "Text to print at start of non-hairpin crecscendo, ie: @samp{cresc.}") @@ -294,7 +294,7 @@ help with debugging large scores.") (translator-property-description 'split-interval boolean? "set if part-combiner separated voices based on splitInterval.") (translator-property-description 'squashedPosition integer? " Vertical position of squashing for Pitch_squash_engraver.") -(translator-property-description 'staffsFound list? "list of all staff-symbols found.") +(translator-property-description 'stavesFound list? "list of all staff-symbols found.") (translator-property-description 'stanza string? "Stanza `number' to print at start of a verse. Use in LyricsVoice context.") -- 2.39.5