From 5acde4e06c126bf5f69c029602f3ce914f84bd6a Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:50:17 +0000 Subject: [PATCH] lilypond-1.1.47 --- Documentation/tex/refman.yo | 19 ++++++++-- NEWS | 21 ++++++++++- input/test/mark.ly | 2 +- input/test/tuplet.fly | 43 +++++++++++++++++++++++ lily/include/ly-symbols.hh | 1 + lily/include/tuplet-spanner.hh | 6 +--- lily/tuplet-engraver.cc | 13 +++++++ lily/tuplet-spanner.cc | 64 +++++++++++++++++++++++----------- ly/property.ly | 20 +++++------ mutopia/N.W.Gade/brass.ly | 56 ++++++++++++++--------------- mutopia/N.W.Gade/global.ly | 5 +-- mutopia/N.W.Gade/global.tex | 4 ++- mutopia/N.W.Gade/score.ly | 53 ++++++++++++++++------------ 13 files changed, 214 insertions(+), 93 deletions(-) create mode 100644 input/test/tuplet.fly diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 121f41f66d..5711ca323b 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -1525,13 +1525,28 @@ and -2. dit(code(abbrev)) Set length for tremolo to be used if no length is explicitly specified. -GONE dit(code(markScriptPadding)) Determines the extra space added between +dit(code(tupletDirection)) Determines the direction of triplets and +other tuplets. Set to code(\down) to force them below the staff, +code(\up) to force them above, or code(\free) to let LilyPond decide. + +dit(code(tupletVisibility)) Determines whether tuplets of notes are +labelled. Setting to 0 shows nothing; setting to 1 shows a number; +setting to 2 shows a number and a bracket if there is no beam; setting +to 3 shows a number, and if there is no beam it adds a bracket; +setting to 4 shows both a number and a bracket unconditionally. The +code(pletoff) and code(pleton) identifiers set the property to 0 and 3, +respectively. + +dit(code(markScriptPadding)) Determines the extra space added between the mark and the closest staff line or note. -GONE dit(code(markDirection)) Determines if marks should be printed above +dit(code(markDirection)) Determines if marks should be printed above or below the staff. Set to code(\up) to print marks above the staff; set to code(\down) to print marks below the staff. +dit(code(articulationScriptPadding)) Determines the extra space added +between articulation marks, such as staccato, tenuto, trill, up/down +bow or fermata, and the closest staff line or note. ) subsubsubsect(Staff properties) diff --git a/NEWS b/NEWS index 4b1694fbf5..a44a11ac86 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,27 @@ +pl 46.mb2 + - Reintroduced the tupletVisibility property. Same values as + the old version (pletvisibility), see the Reference Manual. + Note: does not work correctly with automatic beams. + - Added a tupletDirection property. + +pl 46.uu1 + - bf: {} in texts. + +pl 45.hwn2 + - more doc updates. + + +pl 46.mb1 + - Added property articulationScriptPadding + - N.W.Gade: layout fixes + +********* + pl 45.hwn1 - Audio broadcast & acknowledge. - more advanced spacing for prefatory matter - tuplet appearance tweaking - + - bf: ChoirStaff pl 45.uu1 - glossary fixes (thanks Dirk). diff --git a/input/test/mark.ly b/input/test/mark.ly index 6d0f2aac3f..5dd835a96d 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -24,7 +24,7 @@ two = \notes\relative c{ markScriptPadding = "4.0"; markHangOn = "Bar"; markHangDepth = "1"; -% markDirection = \diown; +% markDirection = \down; } } } diff --git a/input/test/tuplet.fly b/input/test/tuplet.fly new file mode 100644 index 0000000000..92ac4d4739 --- /dev/null +++ b/input/test/tuplet.fly @@ -0,0 +1,43 @@ +\property Voice.textEmptyDimension = 1 +\property Voice.textScriptPadding = 10 +\property Voice.tupletVisibility = 0 +\times2/3{c'4^"tupletVisibility = 0" d e} \times2/3{[f8 g a]} + \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 1 +\times2/3{c,4^"tupletVisibility = 1" d e} \times2/3{[f8 g a]} + \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 2 +\times2/3{c,4^"tupletVisibility = 2" d e} \times2/3{[f8 g a]} + \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 3 +\times2/3{c,4^"tupletVisibility = 3" d e} \times2/3{[f8 g a]} + \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 4 +\times2/3{c,4^"tupletVisibility = 4" d e} \times2/3{[f8 g a]} + \times2/3{b16 c d} c8 | \break + +\property Voice.tupletDirection = \down +\property Voice.tupletVisibility = 0 +\times2/3{c,4^"tupletDirection = \\textbackslash{}down" d e} + \times2/3{[[f8 g a]]} \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 1 +\times2/3{c,4 d e} \times2/3{[f8 g a]} \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 2 +\times2/3{c,4 d e} \times2/3{[f8 g a]} \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 3 +\times2/3{c,4 d e} \times2/3{[f8 g a]} \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 4 +\times2/3{c,4 d e} \times2/3{[f8 g a]} \times2/3{b16 c d} c8 |\break + +\property Voice.tupletDirection = \up +\property Voice.tupletVisibility = 0 +\times2/3{c,4^"tupletDirection = \\textbackslash{}up" d e} + \times2/3{[[f8 g a]]} \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 1 +\times2/3{c,4 d e} \times2/3{[f8 g a]} \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 2 +\times2/3{c,4 d e} \times2/3{[f8 g a]} \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 3 +\times2/3{c,4 d e} \times2/3{[f8 g a]} \times2/3{b16 c d} c8 | +\property Voice.tupletVisibility = 4 +\times2/3{c,4 d e} \times2/3{[f8 g a]} \times2/3{b16 c d} c8 | diff --git a/lily/include/ly-symbols.hh b/lily/include/ly-symbols.hh index 18135bbf89..fafa503ad9 100644 --- a/lily/include/ly-symbols.hh +++ b/lily/include/ly-symbols.hh @@ -57,6 +57,7 @@ DECLARE_LY_SYMBOL(text); DECLARE_LY_SYMBOL(transparent); DECLARE_LY_SYMBOL(tuplet); DECLARE_LY_SYMBOL(tuplet_thick); +DECLARE_LY_SYMBOL(tuplet_visibility); DECLARE_LY_SYMBOL(visibility_lambda); DECLARE_LY_SYMBOL(volta); DECLARE_LY_SYMBOL(volta_thick); diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index c66009c7cf..2faa3bcd48 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -28,11 +28,7 @@ public: String number_str_; - /* - junk us. - */ - bool bracket_visibility_b_; - bool num_visibility_b_; + bool parallel_beam_b_; protected: Link_array beam_l_arr_; diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 51832adf9d..347ed70c43 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -34,12 +34,25 @@ Tuplet_engraver::do_try_music (Music *r) void Tuplet_engraver::do_process_requests () { + int dir = 0; + Scalar prop = get_property ("tupletDirection", 0); + if (prop.isnum_b()) + dir = (int)prop; + int visibility = 3; + prop = get_property ("tupletVisibility", 0); + if (prop.isnum_b()) + visibility = (int)prop; + for (int i= started_span_p_arr_.size (); i < time_scaled_music_arr_.size (); i++) { Tuplet_spanner* glep = new Tuplet_spanner; started_span_p_arr_.push (glep); glep->number_str_ = to_str (time_scaled_music_arr_[i]->den_i_); + glep->set_elt_property(tuplet_visibility_scm_sym, + gh_int2scm (visibility)); + if (dir != 0) + glep->set_elt_property(dir_forced_scm_sym, gh_int2scm (dir)); announce_element (Score_element_info (glep, time_scaled_music_arr_ [i])); } } diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc index 9ff1e89bde..1383acbb1d 100644 --- a/lily/tuplet-spanner.cc +++ b/lily/tuplet-spanner.cc @@ -19,8 +19,7 @@ Tuplet_spanner::Tuplet_spanner () { - bracket_visibility_b_ = true; - num_visibility_b_ = true; + parallel_beam_b_ = false; } /* @@ -31,36 +30,52 @@ Tuplet_spanner::do_brew_molecule_p () const { Molecule* mol_p = new Molecule; + // Default behaviour: number always, bracket when no beam! + bool bracket_visibility = !parallel_beam_b_; + bool number_visibility = true; + SCM visibility_sym =get_elt_property (tuplet_visibility_scm_sym); + if (visibility_sym != SCM_BOOL_F) + { + /* Property values: + 0 show nothing + 1 show number + 2 show (number and bracket)-if-no-beam + 3 show number, and bracket-if-no-beam + 4 show number, and bracket + */ + int value = gh_scm2int (SCM_CDR(visibility_sym)); + bracket_visibility = (value == 4 || (value > 1 && !parallel_beam_b_)); + number_visibility = (value > 2 || value == 1 || + (value == 2 && !parallel_beam_b_)); + } + if (column_arr_.size ()){ Real ncw = column_arr_.top ()->extent (X_AXIS).length (); + Real w = extent (X_AXIS).length () + ncw; Molecule num (lookup_l ()->text ("italic", number_str_)); num.align_to (X_AXIS, CENTER); + num.translate_axis (w/2, X_AXIS); Real interline = paper_l ()->get_realvar (interline_scm_sym); + Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_] + - column_arr_[0]->extent (Y_AXIS) [dir_]; + num.align_to (Y_AXIS, CENTER); + num.translate_axis (dir_ * interline, Y_AXIS); + + num.translate_axis (dy/2, Y_AXIS); + - if (beam_l_arr_.size () == 1 && !bracket_visibility_b_) + /* if (beam_l_arr_.size () == 1 && !bracket_visibility) { - Beam *beam_l = beam_l_arr_[0]; - Directional_spanner* ds = dynamic_cast(beam_l); - num.translate_axis (dir_ * interline, Y_AXIS); - num.translate (ds->center ()); - num.translate_axis (ncw, X_AXIS); } - - if (bracket_visibility_b_) + */ + if (bracket_visibility) { - Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_] - - column_arr_[0]->extent (Y_AXIS) [dir_]; - Real w = extent (X_AXIS).length () + ncw; - num.align_to (Y_AXIS, CENTER); - num.translate_axis (dir_ * interline, Y_AXIS); - - num.translate (Offset (w/2, dy/2)); mol_p->add_molecule (lookup_l ()->plet (dy, w, dir_)); } - if (num_visibility_b_) + if (number_visibility) { mol_p->add_molecule (num); } @@ -91,11 +106,11 @@ Tuplet_spanner::do_post_processing () if (!broken_b () && spanned_drul_[LEFT]->column_l () == beam_l->spanned_drul_[LEFT]->column_l () && spanned_drul_[RIGHT]->column_l () == beam_l->spanned_drul_[RIGHT]->column_l ()) - bracket_visibility_b_ = false; + parallel_beam_b_ = true; } - if (column_arr_.size () == 1) - bracket_visibility_b_ = false; + // if (column_arr_.size () == 1) + // bracket_visibility_b_ = false; } void @@ -113,6 +128,13 @@ Direction Tuplet_spanner::get_default_dir () const { Direction d = UP; + SCM dir_sym =get_elt_property (dir_forced_scm_sym); + if (dir_sym != SCM_BOOL_F) { + d= (Direction) gh_scm2int (SCM_CDR(dir_sym)); + if (d != CENTER) + return d; + } + for (int i=0; i < column_arr_.size (); i ++) { if (column_arr_[i]->dir () < 0) diff --git a/ly/property.ly b/ly/property.ly index ede2be764d..7aa173d0b4 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -132,15 +132,15 @@ slurdotted = %{ for grace note hack, see input/test/grace.ly %} -pletoff = { - \property Voice.pletvisibility = 0 +tupletoff = { + \property Voice.tupletVisibility = 0 } -pleton = { - \property Voice.pletvisibility = 3 +tupleton = { + \property Voice.tupletVisibility = 3 } tiny = { \property Voice.fontSize= "-2" - \pletoff %urg + \tupletoff %urg } small = { @@ -149,7 +149,7 @@ small = { normalsize = { \property Voice.fontSize= "0" - \pleton %urg + \tupleton %urg } %{ @@ -164,20 +164,20 @@ grace = { \tiny % it would be so cool not to have to specify these factors each time... % :-( - \property Voice.pletvisibility = 0 + \property Voice.tupletVisibility = 0 \[1/16 } graceat = \melodic { \normalsize - \property Voice.pletvisibility = 0 + \property Voice.tupletVisibility = 0 \] \[31/32 } ecarg = \melodic { - \property Voice.pletvisibility = 0 + \property Voice.tupletVisibility = 0 \] - \property Voice.pletvisibility = 3 + \property Voice.tupletVisibility = 3 } %} diff --git a/mutopia/N.W.Gade/brass.ly b/mutopia/N.W.Gade/brass.ly index a4439356a1..a7320929c4 100644 --- a/mutopia/N.W.Gade/brass.ly +++ b/mutopia/N.W.Gade/brass.ly @@ -36,7 +36,7 @@ r \tiny g8 \f *1/2 \normalsize d'2 \> ( *7/8| [g,8. a16 g8. a16 \! g8. ) a16 ] | g4 r r | R2. | -r4 r^\fermata r8^\fermata r | +r4 r r8 r | R2*8 | d'8-. \pp r c-. r | d r c g | @@ -200,7 +200,7 @@ c4 r8 g ( | ) e'4 r8 g,8 ( | ) c4 r | R2 | -e4 \fz r^\fermata +e4 \fz r } corIhelp=\notes\relative c''' { @@ -208,10 +208,10 @@ corIhelp=\notes\relative c''' { \tiny s2.*32 | -s2*33 | +s2*33 | \stemup r4 r8 [g16^"oboe" \p ( a ] | [ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] | -[ ) f8-. e16 ( f ] ) e8-. s | +[ ) f8-. e16 ( f ] ) e8-. s | \stemboth s2*66 | [f,,16^"Vlc." ( g f g][f g f8 ] | ) e4 r | @@ -262,7 +262,7 @@ r r [g,16 ( \p d' e d ] | R2. | [g8. ( a16 g8. a16 g8. a16] | [g8._"dim." a16 ] g4. a8 | -[g8. a16] ) g4^\fermata \pp r8^\fermata r | +[g8. a16] ) g4 \pp r8 r | R2*8 | g8-. \pp r c,-. r | g'-. r c,-. r | @@ -406,7 +406,7 @@ e4 r8 g ( | ) c,4 r8 g'8 ( | ) e4 r | R2 | -c'4-. \fz r^\fermata +c'4-. \fz r } trpI=\notes\relative c'' { @@ -416,7 +416,7 @@ trpI=\notes\relative c'' { [d8. ( \f e16 ] ) d2 | R2.*30 | -r4 r^\fermata r8 ^\fermata r | +r4 r r8 r | R2*12 | g,2 \f ~ | g4 r | @@ -514,7 +514,7 @@ d-. r | d-. r | g, r | R2 | -g4 \fz r^\fermata +g4 \fz r } trpIhelp=\notes\relative c'' { @@ -522,23 +522,23 @@ trpIhelp=\notes\relative c'' { s2.*32 | s2*9 | -r4 r8 c-.^"Clar. I" | +r4^"Clar. I" r8 c-. | [bes-. a-. g-. f-. ] | [e-. d-. c-. ] r8 | s2*23 | -r4 r8 g''8^"Cor. I" ( | +r4^"Cor. I" r8 g''8 ( | ) g,4. g8 ( | [) d' d16 ( e ] )d8 s | s2*75 | -r4 r8 c-.^"Clar. I" | +r4^"Clar. I" r8 c-. | [bes-. a-. g-. f-. ] | [e-. d-. c-. ] s8 | s2*25 -r4 r8 a''^"Oboe" | +r4^"Oboe" r8 a'' | a-. [ gis-. gis-. \< g-.] | [g-. fis-. \! fis-. f-. ] | s2*53 | -r4 r8 [c'16^"Flauto" ( d] | +r4^"Flauto" r8 [c'16 ( d] | ) c8 [b16 ( c ] ) b8 [bes16 ( c ] | )bes8 [a16 ( bes ] ) a8 [c16 ( d] | ) c8 [b16 ( c ] ) b8 [bes16 ( c ] | @@ -550,22 +550,22 @@ trpIIhelp=\notes\relative c'' { s2.*32 | s2*9 | -r4 r8 c-.^"Clar. I" | +r4^"Clar. I" r8 c-. | [bes-. a-. g-. f-. ] | [e-. d-. c-. ] r8 | s2*23 | -r4 r8 g''8^"Cor. I" ( | +r4^"Cor. I" r8 g''8 ( | ) g,4. g8 ( | [) d' d16 ( e ] )d8 s | s2*75 | -r4 r8 c-.^"Clar. I" | +r4^"Clar. I" r8 c-. | [bes-. a-. g-. f-. ] | [e-. d-. c-. ] s8 | s2*28 -r4 g'8^"Trp. I" \f r | +r4^"Trp. I" g'8 \f r | [d'-. d16 ( e ] ) d8 r | s2*51 | -r4 r8 [c'16^"Flauto" ( d] | +r4^"Flauto" r8 [c'16 ( d] | ) c8 [b16 ( c ] ) b8 [bes16 ( c ] | )bes8 [a16 ( bes ] ) a8 [c16 ( d] | ) c8 [b16 ( c ] ) b8 [bes16 ( c ] | @@ -578,7 +578,7 @@ trpII=\notes\relative c' { \property Staff."midiInstrument" = "trumpet" R2.*31 | -r4 r^\fermata r8 ^\fermata r | +r4 r r8 r | R2*12 | g2 \f ~ | g4 r | @@ -671,7 +671,7 @@ g-. r | g-. r | g r | R2 | -g4 \fz r^\fermata +g4 \fz r } timpani=\notes\relative c, { @@ -698,7 +698,7 @@ c2.:32 | c2.:32 | c2.:32 | c4 r r | -r r^\fermata r8^\fermata r | +r r r8 r | R2*12 | f,2:32 \f ~ | f4 r | @@ -709,7 +709,7 @@ R2 | f8 r r4 | R2*14 | \context Staff <{\voiceone \clef "treble"; - r4^"Tri." r8 e''' | + r4^"Trg." r8 e''' | [e e e e ] | [e e e g,, ] | % In reality: e e e e | e g r r4 | @@ -769,7 +769,7 @@ R2*3 | c'4 \fz r | R2*10 | \context Staff <{\voiceone \clef "treble"; - r4^"Tri." r8 e'' | + r4^"Trg." r8 e'' | [e e e e ] | [e e e g,, ] | % In reality: e e e e | e4 g4 r4 | @@ -840,7 +840,7 @@ f2:32 ~ | f2:32 ~ | f8 r r4 | r2 | -f4 \fz r^\fermata +f4 \fz r } timphelp=\notes\relative c' { @@ -850,7 +850,7 @@ timphelp=\notes\relative c' { [c8. ( d16] ) c2 | s2.*30 | s2*9 | -r4 r8 \clef "treble"; c'-.^"Clar. I" | +r4^"Clar. I" r8 \clef "treble"; c'-. | [bes-. a-. g-. f-. ] | [e-. d-. c-. ] r8 \clef "bass"; | s2*24 | @@ -858,15 +858,15 @@ s2*24 | %[ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] | %[ ) f8-. e16 ( f ] ) e8-. \clef "bass"; s | s2*77 | -r4 r8 \clef "treble"; c'-.^"Clar. I" | +r4^"Clar. I" r8 \clef "treble"; c'-. | [bes-. a-. g-. f-. ] | [e-. d-. c-. ] r8 \clef "bass"; | s2*28 -%r4 r8 \clef "treble"; a''^"Oboe" | +%r4^"Oboe" r8 \clef "treble"; a'' | %a-. [ gis-. gis-. \< g-.] | %[g-. fis-. \! fis-. ] \clef "bass"; s8 | s2*57 | -r4 r8 \clef "treble"; bes'^"Vi. I" ( | +r4^"Vi. I" r8 \clef "treble"; bes' ( | ) bes'4. d,8 ( | ) d'4. c,8 ( | ) c'4. e,8 ( | diff --git a/mutopia/N.W.Gade/global.ly b/mutopia/N.W.Gade/global.ly index 135997817d..f2de39bfbe 100644 --- a/mutopia/N.W.Gade/global.ly +++ b/mutopia/N.W.Gade/global.ly @@ -2,10 +2,11 @@ globalNoKey=\notes { \time 3/4; \skip 2.*31; -s2 s8 \bar "||"; \break +s4 s4^\fermata s8^\fermata \bar "||"; \break s8 \time 2/4; -\skip 2*225; +\skip 2*224; +s4 s4^\fermata \bar "|."; } diff --git a/mutopia/N.W.Gade/global.tex b/mutopia/N.W.Gade/global.tex index 0fa5588102..5046499d6e 100644 --- a/mutopia/N.W.Gade/global.tex +++ b/mutopia/N.W.Gade/global.tex @@ -19,7 +19,7 @@ % Modified from lilypond/tex/headers.tex: \advance\topmargin-5mm \advance\headsep-4mm -\addtolength{\textheight}{12mm} +\addtolength{\textheight}{17mm} \advance\footskip-3mm \usepackage{fancyheadings} @@ -33,6 +33,7 @@ % Modified from lilypond/tex/titledefs.tex: \def\makelilytitle{% + \vspace*{-10mm}% \begin{center} \bfseries \ifx\mudelanull\thetitle\else\sethuge{\thetitle}\\ \fi @@ -57,4 +58,5 @@ % {\flushleft\setLarge{\normalfont\scshape\thepiece}} {\flushleft\setLarge{\textbf\thepiece}} \leavevmode + \enlargethispage*{5mm} } diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly index 25902f259e..64fa9c6fbe 100644 --- a/mutopia/N.W.Gade/score.ly +++ b/mutopia/N.W.Gade/score.ly @@ -19,32 +19,32 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \score{ < \context StaffGroup = wood < - \context Staff = flauto < + \context Voice = flauto < \property Staff.instrument = "Flauto" \property Staff.instr = "Fl." \global \marks \flauto > - \context Staff = oboe < + \context Voice = oboe < \property Staff.instrument = "Oboe" \property Staff.instr = "Ob." \global \oboe > - \context Staff = clarI < + \context Voice = clarI < \property Staff.instrument = "Clarinetto I" \property Staff.instr = "Cl. I" \globalNoKey \clarI > - \context Staff = clarII < + \context Voice = clarII < \property Staff.instrument = "Clarinetto II" \property Staff.instr = "Cl. II" \globalNoKey \clarII > - \context Staff = fagotto < + \context Voice = fagotto < \property Staff.instrument = "Fagotto" \property Staff.instr = "Fg." \global @@ -53,55 +53,67 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + > \context StaffGroup = brass < \context Staff = cor < - \globalNoKey \property Staff.instrument = "2 Corni in F" \property Staff.instr = "Cor." - \context Voice = corI { \stemup \corI } - \context Voice = corII { \stemdown \corII } + \context Voice = corI < + \globalNoKey + \stemup \property Voice.dynamicDir = \up + \corI + > + \context Voice = corII { + \stemdown \property Voice.dynamicDir = \down + \corII + } > \context Staff = trp < - \globalNoKey \property Staff.instrument = "2 Trp. in B\\textflat " \property Staff.instr = "Trp." - \context Voice = trpI { \stemup \trpI } - \context Voice = trpII { \stemdown \trpII } + \context Voice = trpI < + \globalNoKey + \stemup \property Voice.dynamicDir = \up + \trpI + > + \context Voice = trpII { + \stemdown \property Voice.dynamicDir = \down + \trpII + } > > - \context StaffGroup = percussion <\context Staff = timpani < + \context StaffGroup = percussion <\context Voice = timpani < \property Staff.instrument = "Timp. \& Triang." - \property Staff.instr = "Timp. \& Triang." + \property Staff.instr = "Tmp \& Trg" \global \timpani > > \context StaffGroup = strings < \context GrandStaff = violins < - \context Staff = viI < + \context Voice = viI < \property Staff.instrument = "Violin I" \property Staff.instr = "Vi. I" \global \viI > - \context Staff = viII < + \context Voice = viII < \property Staff.instrument = "Violin II" \property Staff.instr = "Vi. II" \global \viII > > - \context Staff = vla < + \context Voice = vla < \property Staff.instrument = "Viola" \property Staff.instr = "Vla." \global \vla > - \context Staff = vlc < + \context Voice = vlc < \property Staff.instrument = "Violoncello" \property Staff.instr = "Vlc" \global \vlc > - \context Staff = cb < + \context Voice = cb < \property Staff.instrument = "Contrabasso" \property Staff.instr = "C.B." \global @@ -116,6 +128,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \translator { \OrchestralScoreContext minVerticalAlign = 2.5*\staffheight; + barNumberScriptPadding = "12.0"; } \translator { \StaffContext \consists "Staff_margin_engraver"; @@ -123,10 +136,6 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + textstyle = "italic"; textScriptPadding = 5.0; textEmptyDimension = 1; -% oldTieBehavior = 1; - } - \translator { \VoiceContext - oldTieBehavior = 1; } } } -- 2.39.5