From: Jan Nieuwenhuizen Date: Mon, 29 Jan 2001 14:17:21 +0000 (+0100) Subject: patch::: 1.3.126.jcn1 X-Git-Tag: release/1.3.127~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=304e2fcfec9dff35906b69b2413ad7d9a77f8534;p=lilypond.git patch::: 1.3.126.jcn1 1.3.126.jcn1 ============ * Coriolan fixes and updates. * Bugfix: a2-engraver and *devnull_engraver recognise alternative 'oneXXX' 'twoXXX' naming convention. * Enabled markup text to be used for instrument names. * Bugfix: interface description of System_start_delimiter * Slur attachment fix (thanks, Han-Wen) --- diff --git a/CHANGES b/CHANGES index dda2232cd9..331585b72d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +1.3.126.jcn1 +============ + +* Coriolan fixes and updates. + +* Bugfix: a2-engraver and *devnull_engraver recognise alternative +'oneXXX' 'twoXXX' naming convention. + +* Enabled markup text to be used for instrument names. + +* Bugfix: interface description of System_start_delimiter + +* Slur attachment fix (thanks, Han-Wen) + 1.3.126 ======= * Doco: diff --git a/Documentation/header.html.in b/Documentation/header.html.in index e23d7c22f9..ce6b4db7fc 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -69,11 +69,11 @@ which substitutes some @AT_VARIABLES@ as well. RedHat i386
- LinuxPPC
+ LinuxPPC
Debian Stable
Debian Unstable
Windows Stable
- Windows Testing
+ Windows Unstable

diff --git a/Documentation/index.texi b/Documentation/index.texi index c5c65d9d36..7375740ba6 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -25,8 +25,8 @@ @item @uref{../user/out-www/lilypond/Reference-Manual.html#Reference Manual,LilyPond reference manual} also available in @uref{../user/out-www/lilypond.ps.gz,Postscript} @item LilyPond @uref{../user/out-www/lilypond-internals/lilypond-internals.html,internals} -@item @uref{../user/out-www/lilypond/Features.html#Features, LilyPond features} -work in progress, to me merged with reference manual. +@item @uref{../user/out-www/lilypond/Tricks.html#Tricks, LilyPond features} +and tricks. @item @uref{../user/out-www/glossary.html,A glossary of musical terms}, includes translations. Also available in @uref{../user/out-www/glossary.ps.gz,Postscript}) @item @uref{../user/out-www/lilypond-book.html,lilypond-book}, a tool for diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 444b2a450a..3806e59c09 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1834,9 +1834,17 @@ style. To create tremolo beams on a single note, simply attach `@code{:}@var{length}' to the note itself. -@lilypond[fragment,verbatim,center] - \repeat "tremolo" 8 { c16 d16 } - \repeat "tremolo" 4 { c16 d16 } +@lilypond[verbatim,center] +\score { + \context Voice \notes\relative c' { + \repeat "tremolo" 8 { c16 d16 } + \repeat "tremolo" 4 { c16 d16 } + \repeat "tremolo" 2 { c16 d16 } + } + \paper { + linewidth = 40*\staffspace; + } +} @end lilypond @cindex @code{__} diff --git a/Documentation/user/tricks.itely b/Documentation/user/tricks.itely index 3c29109c93..5e1ac3a3cf 100644 --- a/Documentation/user/tricks.itely +++ b/Documentation/user/tricks.itely @@ -2,6 +2,10 @@ @ignore TODO + * cue notes + * different staff sizes + * font selection + * move some stuff to refman * merge some stuff with refman entries @@ -391,6 +395,24 @@ No staff, no clef, squash pitches @node Markup text @section Markup text + +@ignore + + +#(define text-flat '((font-relative-size . -2 ) (music "accidentals--1"))) + + \property VoiceCombineStaff.instrument = #`((kern . 0.5) (lines + "2 Clarinetti" (rows " (B" ,text-flat ")"))) + + % Ugh, markup burps + \property StaffCombineStaff.instrument = #'((kern . 0.5) + (lines "Violoncello" (rows " e") (rows "Contrabasso"))) + + +@end ignore + + + Metrome hack... [todo: hack this into C++, use \tempo] diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 7f51060fdd..06ec229749 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1019,10 +1019,11 @@ large files: if you're digitizing existing music, you have to synchronize the .ly file, the sheet music on your lap and the sheet music on the screen. The point-and-click mechanism makes it easy to find the origin of an error in the .ly file: @footnote{This feature is -presently only available on X-windows using patched versions of Xdvi -and emacs} when you view the file with Xdvi and click on a note using -control-right button, [checkme], you editor will jump to the spot where -that note was entered. +presently only available on X-windows using patched versions of Xdvi and +emacs} when you view the file with Xdvi and click on a note using +control-mousebutton 1@footnote{If you're using a patched xdvik, the +command is control-mousebutton-2}, your editor will jump to the spot +where that note was entered. More information is in in @ref{Point and click} diff --git a/VERSION b/VERSION index 28b3465d7f..a368ddfc58 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=126 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/guile-state.ly b/input/bugs/guile-state.ly index 2ca522dd5a..e69de29bb2 100644 --- a/input/bugs/guile-state.ly +++ b/input/bugs/guile-state.ly @@ -1,77 +0,0 @@ -\header{ -texidoc="Real header: the slurBeginAttachment setting still lives in the -second example, breaking the cross staff broken slur. -"; -} - -\header{ -texidoc=" -Slurs can be forced to always attach to note heads. -"; -} - - -\score{ - \notes \relative c''{ - \property Voice.VerticalDirection = #1 - \property Voice.slurBeginAttachment = #'head - \property Voice.slurEndAttachment = #'head - g16()g()g()g()d'()d()d()d - } - \paper{ - indent = 0.0; - linewidth = 60.0\mm; - } -} - -\header{ -texidoc=" -The same goes for slurs. They behave decently when broken across -linebreak. -"; -} - -\score{ - \context PianoStaff < - \context Staff=one \notes\relative c'{ -%{ - \stemUp \slurUp - c4( c \translator Staff=two c )c | - \translator Staff=one - \stemUp \slurUp - c4( c \translator Staff=two c )c | - \stemUp \slurUp - c4( c \translator Staff=one c )c | - \translator Staff=two - \stemUp \slurUp - c4( c \translator Staff=one c )c | - \translator Staff=two - \stemUp \slurUp - c4( \translator Staff=one c c )c | -%} - r2 - \translator Staff=two - \stemUp \slurUp - c4( \translator Staff=one c - \break - c )c - r2 - -%{ - \stemDown \slurDown - d4( \translator Staff=two c c \translator Staff=one )d - \translator Staff=two - \stemUp \slurUp - c4( \translator Staff=one c c \translator Staff=two )c - r1 -%} - } - \context Staff=two \notes\relative c'{ - \clef bass; - s1 s1 %s1 s1 s1 s1 s1 s1 s1 s1 - } - > - \paper { indent = 0.; linewidth = 40.*\staffspace; } -} - -\version "1.3.110"; diff --git a/input/bugs/score-dynamics.ly b/input/bugs/score-dynamics.ly new file mode 100644 index 0000000000..2c4a6500e1 --- /dev/null +++ b/input/bugs/score-dynamics.ly @@ -0,0 +1,119 @@ +% dynamics collide with staff + +\header { +texidoc="Template for part-combining orchestral scores"; +} + + +End = { \skip 1*6; } +violoncello = \notes\relative c'' { + c1\ff d e \break + c1\ff d e \break +} + +contrabasso = \notes\relative c'' { + c1\pp d e + c2\pp c d1 e +} + +flautiStaff = \notes \context VoiceCombineStaff = flauti < + \context VoiceCombineVoice=oneBassi \End + \context VoiceCombineVoice=twoBassi \End + \context VoiceCombineVoice=Flauti \partcombine VoiceCombineVoice + \context VoiceCombineThread=oneFlauti \violoncello + \context VoiceCombineThread=twoFlauti \contrabasso +> + + +\score { + < + \flautiStaff + + \context PianoStaff = bassi_group \notes < + \context StaffCombineStaff=oneBassi \End + \context StaffCombineStaff=twoBassi \End + + \context StaffCombineStaff=oneBassi \partcombine StaffCombineStaff + \context StaffCombineVoice=oneBassi \violoncello + \context StaffCombineVoice=twoBassi \contrabasso + > + + > + \paper{ + % \paperSixteen + + %textheight = 290.0\mm; + %linewidth = 195.0\mm; + textheight = 285.0\mm; + linewidth = 190.0\mm; + + \translator{ \HaraKiriStaffContext } + % + % The Voice combine hierarchy + % + \translator{ + \ThreadContext + \name "VoiceCombineThread"; + \consists "Rest_engraver"; + } + \translator{ + \VoiceContext + \name "VoiceCombineVoice"; + soloText = #"I." + soloIIText = #"II." + \remove "Rest_engraver"; + \accepts "VoiceCombineThread"; + } + \translator{ + \HaraKiriStaffContext + \consists "Mark_engraver"; + \name "VoiceCombineStaff"; + \accepts "VoiceCombineVoice"; + } + + % + % The Staff combine hierarchy + % + \translator{ + \ThreadContext + \name "StaffCombineThread"; + } + \translator{ + \VoiceContext + \name "StaffCombineVoice"; + \accepts "StaffCombineThread"; + \consists "Thread_devnull_engraver"; + } + \translator { + \HaraKiriStaffContext + \name "StaffCombineStaff"; + \accepts "StaffCombineVoice"; + + soloADue = ##t + soloText = #"" + soloIIText = #"" + % This is non-conventional, but currently it is + % the only way to tell the difference. + aDueText = #"\\`a2" + splitInterval = #'(1 . 0) + changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + } + \translator { + \StaffGroupContext + \accepts "VoiceCombineStaff"; + \accepts "StaffCombineStaff"; + } + \translator{ \HaraKiriStaffContext } + + \translator { + %\ScoreContext + \OrchestralScoreContext + \accepts "VoiceCombineStaff"; + \accepts "StaffCombineStaff"; + TimeSignature \override #'style = #'C + skipBars = ##t + BarNumber \override #'padding = #3 + RestCollision \override #'maximum-rest-count = #1 + } + } +} diff --git a/input/bugs/time.ly b/input/bugs/time.ly new file mode 100644 index 0000000000..8311227ebe --- /dev/null +++ b/input/bugs/time.ly @@ -0,0 +1,8 @@ +% Uses old style + +\score { + \notes { + \property Staff.TimeSignature \override #'style = #'oldC4/4 + s1 + } +} diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index 6d941ff971..4da0b5ab7e 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -9,12 +9,15 @@ stems. } \score { - \context Voice \notes\relative c { + \context Voice \notes\relative c' { \repeat "tremolo" 8 { c16 d16 } \repeat "tremolo" 4 { c16 d16 } + \repeat "tremolo" 2 { c16 d16 } } \paper { - linewidth=-1.0; + % ugh, wide + %linewidth = -1.0; + linewidth = 40*\staffspace; } \midi { } } diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly index 319154c2c5..8affccb12a 100644 --- a/input/test/part-combine-score.ly +++ b/input/test/part-combine-score.ly @@ -5,15 +5,17 @@ texidoc="Template for part-combining orchestral scores"; \include "paper16.ly"; % \include "mutopia/Coriolan/coriolan-paper.ly"; +#(define text-flat '((font-relative-size . -2 ) (music "accidentals--1"))) +End = { \skip 1*9; \bar "|."; } flautoI = \notes\relative c'' { c4\pp d e f b,4 d c d r2 e4 f \break - \context Score \outputproperty #(make-type-checker 'paper-column-interface) - #'between-system-string = #"\\eject" + \context Score \outputproperty #(make-type-checker 'paper-column-interface) + #'between-system-string = #"\\eject" c4 d e f c4 r e f @@ -38,8 +40,15 @@ flautoII = \notes\relative c'' { flautiStaff = \notes \context VoiceCombineStaff = flauti < \property VoiceCombineStaff.midiInstrument = #"flute" - \property VoiceCombineStaff.instrument = #"2 Flauti" - \property VoiceCombineStaff.instr = #"Fl." +% \property VoiceCombineStaff.instrument = #"2 Flauti" +% \property VoiceCombineStaff.instr = #"Fl." + + \property VoiceCombineStaff.instrument = #`((kern . 0.5) (lines + "2 Clarinetti" (rows "(B" ,text-flat ")"))) + + \property VoiceCombineStaff.instr = #`((kern . 0.5) (lines + "Cl." (rows "(B" ,text-flat ")"))) + %\global \context VoiceCombineVoice=one \partcombine VoiceCombineVoice \context VoiceCombineThread=one \flautoI @@ -82,7 +91,7 @@ violinoIStaff = \context Staff = oneViolini < \property Staff.instrument = #"Violino I" \property Staff.instr = #"Vl. I" \violinoI - { \skip 1*9; \bar "|."; } + \End > violinoIIStaff = \context Staff = twoViolini < @@ -92,7 +101,7 @@ violinoIIStaff = \context Staff = twoViolini < \property Staff.instrument = #"Violino II" \property Staff.instr = #"Vl. II" \violinoII - { \skip 1*9; \bar "|."; } + \End > violaI = \notes\transpose c, \violinoI @@ -108,7 +117,7 @@ violeGroup = \notes \context VoiceCombineStaff = oneViole < \property VoiceCombineStaff.clefGlyph = #"clefs-C" \property VoiceCombineStaff.clefPosition = #0 \key f \major; - { \skip 1*9; \bar "|."; } + \End \context VoiceCombineVoice=oneViole \partcombine VoiceCombineVoice \context VoiceCombineThread=oneViole \violaI @@ -135,8 +144,11 @@ contrabasso = \notes\relative c { bassiGroup = \context PianoStaff = bassi_group \notes < \context StaffCombineStaff=oneBassi { \property StaffCombineStaff.midiInstrument = #"cello" - %\property StaffCombineStaff.instrument = #"Violoncello\ne\nContrabasso" - \property StaffCombineStaff.instrument = #'(lines "Violoncello" "e" "Contrabasso") + + % Ugh, markup burps + \property StaffCombineStaff.instrument = #'((kern . 0.5) + (lines "Violoncello" (rows " e") (rows "Contrabasso"))) + \property StaffCombineStaff.instr = #"Vc." %\clef "bass"; @@ -145,8 +157,7 @@ bassiGroup = \context PianoStaff = bassi_group \notes < \property StaffCombineStaff.clefPosition = #2 \key es \major; - \skip 1*9; - \bar "|."; + \End } \context StaffCombineStaff=twoBassi { \property StaffCombineStaff.midiInstrument = #"contrabass" @@ -159,8 +170,7 @@ bassiGroup = \context PianoStaff = bassi_group \notes < \property StaffCombineStaff.clefPosition = #2 \key as \major; - \skip 1*9; - \bar "|."; + \End } \context StaffCombineStaff=oneBassi \partcombine StaffCombineStaff @@ -267,10 +277,8 @@ archiGroup = \context StaffGroup = archi_group < \OrchestralScoreContext \accepts "VoiceCombineStaff"; \accepts "StaffCombineStaff"; + TimeSignature \override #'style = #'C skipBars = ##t - - markScriptPadding = #4.0 - BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 } diff --git a/input/tutorial/ly2dvi.ly b/input/tutorial/ly2dvi.ly index a3abb07096..2d0fb5ab03 100644 --- a/input/tutorial/ly2dvi.ly +++ b/input/tutorial/ly2dvi.ly @@ -2,7 +2,7 @@ title = "Two miniatures"; } - #(set point-and-click #t) + #(set! point-and-click #t) \paper { linewidth = -1.0; } diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc index 1a0ab2da2e..5480059806 100644 --- a/lily/a2-engraver.cc +++ b/lily/a2-engraver.cc @@ -15,6 +15,7 @@ #include "side-position-interface.hh" #include "directional-element-interface.hh" + class A2_engraver : public Engraver { public: @@ -51,7 +52,7 @@ A2_engraver::create_grobs () if (solo_adue == SCM_BOOL_T && ((solo == SCM_BOOL_T && state_ != SOLO) || (unison == SCM_BOOL_T && state_ != UNISON - && daddy_trans_l_->id_str_ == "one"))) + && daddy_trans_l_->id_str_.left_str (3) == "one"))) { text_p_ = new Item (get_property ("TextScript")); Side_position::set_axis (text_p_, Y_AXIS); @@ -62,7 +63,7 @@ A2_engraver::create_grobs () if (solo == SCM_BOOL_T) { state_ = SOLO; - if (daddy_trans_l_->id_str_ == "one") + if (daddy_trans_l_->id_str_.left_str (3) == "one") { text = get_property ("soloText"); } @@ -75,7 +76,7 @@ A2_engraver::create_grobs () else if (unison == SCM_BOOL_T) { state_ = UNISON; - if (daddy_trans_l_->id_str_ == "one") + if (daddy_trans_l_->id_str_.left_str (3) == "one") text = get_property ("aDueText"); } @@ -131,8 +132,14 @@ A2_engraver::acknowledge_grob (Grob_info i) if (Stem::has_interface (i.elem_l_) || Slur::has_interface (i.elem_l_) - // || Text_item::has_interface (i.elem_l_) - //|| Hairpin::has_interface (i.elem_l_) + /* + Usually, dynamics are removed by *_devnull_engravers for the + second voice. We don't want all dynamics for the first voice + to be placed above the staff. */ +#if 0 + || i.elem_l_->has_interface (ly_symbol2scm ("dynamic-interface")) + || i.elem_l_->has_interface (ly_symbol2scm ("text-interface")) +#endif ) { /* @@ -144,11 +151,11 @@ A2_engraver::acknowledge_grob (Grob_info i) || (unirhythm == SCM_BOOL_T && split_interval == SCM_BOOL_T && (unison != SCM_BOOL_T || solo_adue != SCM_BOOL_T))) { - if (daddy_trans_l_->id_str_ == "one") + if (daddy_trans_l_->id_str_.left_str (3) == "one") { i.elem_l_->set_grob_property ("direction", gh_int2scm (1)); } - else if (daddy_trans_l_->id_str_ == "two") + else if (daddy_trans_l_->id_str_.left_str (3) == "two") { i.elem_l_->set_grob_property ("direction", gh_int2scm (-1)); } diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index ad7051f04c..4b534dac3c 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -77,7 +77,7 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i) /* FIXME: use markup_p () to check type. */ - if (gh_string_p (s)) + if (gh_string_p (s) || gh_pair_p (s)) create_text (s); } diff --git a/lily/slur.cc b/lily/slur.cc index 425a3b8809..52b96b6e9c 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -37,9 +37,9 @@ void Slur::set_interface (Grob*me) { - /* Ugh, junked this function, but if we don't do this, we somehow - won't be able to write to it */ - me->set_grob_property ("attachment", me->get_grob_property ("attachment")); + /* Copy to mutable list. */ + me->set_grob_property ("attachment", + ly_deep_copy (me->get_grob_property ("attachment"))); } void diff --git a/lily/text-item.cc b/lily/text-item.cc index 5c0d26d348..29538a1f8b 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -50,8 +50,10 @@ or even entries like (tag . (argcount function-to-handle-the-tag )) - - */ + + use baselineskip for setting (lines ...) + +*/ Molecule Text_item::text2molecule (Grob *me, SCM text, SCM alist_chain) diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc index 2599d6b4f2..4487d746ce 100644 --- a/lily/thread-devnull-engraver.cc +++ b/lily/thread-devnull-engraver.cc @@ -25,7 +25,7 @@ ADD_THIS_TRANSLATOR (Thread_devnull_engraver); void Thread_devnull_engraver::acknowledge_grob (Grob_info i) { - if (daddy_trans_l_->id_str_ == "two" + if (daddy_trans_l_->id_str_.left_str (3) == "two" && (to_boolean (get_property ("unison")) || to_boolean (get_property ("unisilence"))) && to_boolean (get_property ("soloADue"))) diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc index 6b5e540363..63d1fde940 100644 --- a/lily/voice-devnull-engraver.cc +++ b/lily/voice-devnull-engraver.cc @@ -34,7 +34,7 @@ static char const *eat_spanners[] = { bool Voice_devnull_engraver::try_music (Music *m) { - if (daddy_trans_l_->id_str_ == "two" + if (daddy_trans_l_->id_str_.left_str (3) == "two" && (to_boolean (get_property ("unison")) || to_boolean (get_property ("unisilence")))) { @@ -69,7 +69,7 @@ static char const *junk_interfaces[] = { void Voice_devnull_engraver::acknowledge_grob (Grob_info i) { - if (daddy_trans_l_->id_str_ == "two" + if (daddy_trans_l_->id_str_.left_str (3) == "two" && (to_boolean (get_property ("unison")) || to_boolean (get_property ("unisilence")))) for (char const **p = junk_interfaces; *p; p++) diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index 32e4749708..f7b7341288 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -40,9 +40,9 @@ else: % input feta-bolletjes; % input feta-banier; % input feta-eindelijk; -% input feta-klef; + input feta-klef; % input feta-toevallig; - input feta-schrift; +% input feta-schrift; % input feta-haak; % input feta-timesig; % input feta-pendaal; diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index fa8d8c7eec..88cf4ea3c8 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -1,14 +1,7 @@ -\header{ -filename = "bassi-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} - \version "1.3.120"; +\include "header.ly" +\include "global.ly" \include "bassi.ly" \score{ diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index ecaa2dd769..6e440d6b9e 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -1,33 +1,21 @@ -\header{ -filename = "bassi.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} - \version "1.3.120"; -\include "global.ly" \include "violoncello.ly" \include "contrabasso.ly" bassiGroup = \context PianoStaff = bassi_group \notes < - %\global \context StaffCombineStaff=oneBassi { \property StaffCombineStaff.midiInstrument = #"cello" - %\property StaffCombineStaff.instrument = #"Violoncello\ne\nContrabasso" - \property StaffCombineStaff.instrument = #'(lines "Violoncello" "e" "Contrabasso") - \property StaffCombineStaff.instr = #"Vc." + \property StaffCombineStaff.instrument = #'((kern . 0.5) + (lines "Violoncello" (rows " e") (rows "Contrabasso"))) + + \property StaffCombineStaff.instr = #"Vc." %\clef "bass"; % Ugh, clef broken in 1.3.125 \property StaffCombineStaff.clefGlyph = #"clefs-F" \property StaffCombineStaff.clefPosition = #2 - \key es \major; - \skip 1*314; - \bar "|."; + \global } \context StaffCombineStaff=twoBassi { \property StaffCombineStaff.midiInstrument = #"contrabass" @@ -38,9 +26,8 @@ bassiGroup = \context PianoStaff = bassi_group \notes < % Ugh, clef broken in 1.3.125 \property StaffCombineStaff.clefGlyph = #"clefs-F" \property StaffCombineStaff.clefPosition = #2 - \key es \major; - \skip 1*314; - \bar "|."; + + \global } \context StaffCombineStaff=oneBassi \partcombine StaffCombineStaff diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly index 34f7f61cf7..99e7919cc0 100644 --- a/mutopia/Coriolan/c-midi.ly +++ b/mutopia/Coriolan/c-midi.ly @@ -1,12 +1,3 @@ -\header{ -filename = "c-midi.ly"; -%title = "Ouverture"; -subtitle = "Coriolan"; -opus = "Op. 62"; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} %% @@ -83,7 +74,7 @@ copyright = "public domain"; \violinoI \violinoII > - \context Staff=violi < + \context Staff=viole < \property VoiceCombineStaff.midiInstrument = #"viola" \violaI \violaII diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index 6b76ced2de..a14cc0cde1 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -1,16 +1,10 @@ -\header{ -filename = "clarinetti-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "clarinetti.ly" + \score{ \clarinettiStaff \include "coriolan-part-combine-paper.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index f04c1c2d3a..64356c25f8 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -1,27 +1,25 @@ -\header{ -filename = "clarinetti.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" -clarinettiStaff = \context VoiceCombineStaff = clarinetti < +clarinettiStaff = \context VoiceCombineStaff = clarinetti < \property VoiceCombineStaff.midiInstrument = #"clarinet" - \property VoiceCombineStaff.instrument = #"2 Clarinetti\n(B\\textflat)" - \property VoiceCombineStaff.instr = #"Cl.\n(B\\textflat)" + + \property VoiceCombineStaff.instrument = #`((kern . 0.5) + (lines "2 Clarinetti" (rows "(B" ,text-flat ")"))) + + \property VoiceCombineStaff.instr = #`((kern . 0.5) + (lines "Cl." (rows "(B" ,text-flat ")"))) + % urg: can't; only My_midi_lexer: () parses pitch? %\property VoiceCombineStaff.transposing = "bes" \property VoiceCombineStaff.transposing = #-2 - \time 4/4; - \notes \key f \major; - \skip 1*314; \bar "|."; + + \Time + \notes { \key f \major; } + \End \context VoiceCombineVoice=one \partcombine VoiceCombineVoice \context VoiceCombineThread=one \clarinettoI \context VoiceCombineThread=two \clarinettoII diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 24231237b4..364137e8e4 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -1,11 +1,3 @@ -\header{ -filename = "clarinetto-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 1c38e5daa8..8d262806ec 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -1,11 +1,3 @@ -\header{ -filename = "clarinetto-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index abb0683f67..4fbb97a923 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -1,11 +1,3 @@ -\header{ -filename = "contrabasso.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly index a9edd675b4..60d89d56e5 100644 --- a/mutopia/Coriolan/coriolan-paper.ly +++ b/mutopia/Coriolan/coriolan-paper.ly @@ -71,9 +71,7 @@ \accepts "VoiceCombineStaff"; \accepts "StaffCombineStaff"; skipBars = ##t - - markScriptPadding = #4.0 - + TimeSignature \override #'style = #'C BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 } diff --git a/mutopia/Coriolan/coriolan-part-combine-paper.ly b/mutopia/Coriolan/coriolan-part-combine-paper.ly index da1f4a06de..74589e23ec 100644 --- a/mutopia/Coriolan/coriolan-part-combine-paper.ly +++ b/mutopia/Coriolan/coriolan-part-combine-paper.ly @@ -68,16 +68,8 @@ \accepts "VoiceCombineStaff"; \accepts "StaffCombineStaff"; skipBars = ##t - - barScriptPadding = #2.0 % dimension \pt - markScriptPadding = #4.0 - - %% urg: in pt? - barNumberScriptPadding = #15 - %% URG: this changes dynamics too - %%textStyle = #"italic" - timeSignatureStyle = #"C" - marginScriptHorizontalAlignment = #1 - maximumRestCount = #1 + TimeSignature \override #'style = #'C + BarNumber \override #'padding = #3 + RestCollision \override #'maximum-rest-count = #1 } } diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly index bdc564dcc8..3b362e9041 100644 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ b/mutopia/Coriolan/coriolan-part-paper.ly @@ -9,15 +9,8 @@ \ScoreContext %\OrchestralScoreContext skipBars = ##t - - barScriptPadding = #2.0 % dimension \pt - markScriptPadding = #4.0 - %% urg: in pt? - barNumberScriptPadding = #15 - %% URG: this changes dynamics too - %%textStyle = #"italic" - timeSignatureStyle = #"C" - marginScriptHorizontalAlignment = #1 + TimeSignature \override #'style = #'C + BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 } } diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index f1544d9525..33e03aad8c 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -1,24 +1,15 @@ %{ run this through: ly2dvi -K coriolan.tex - dvips -O 5mm,0mm -o coriolan.ps coriolan + dvips -O 5mm,0mm -o coriolan.ps coriolan 2> /dev/null %} -#(set point-and-click #t) - -\header{ -filename = "coriolan.ly"; -%title = "Ouverture"; -subtitle = "Coriolan"; -opus = "Op. 62"; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" + \include "paper16.ly" \include "bassi.ly" @@ -29,7 +20,7 @@ copyright = "public domain"; \include "oboi.ly" \include "timpani.ly" \include "trombe.ly" -\include "violi.ly" +\include "viole.ly" \include "violino-1.ly" \include "violino-2.ly" @@ -49,7 +40,7 @@ ottoniGroup = \context StaffGroup = otonni_group < timpaniGroup = \context StaffGroup = timpani_group < \timpaniStaff % Force a staff bracket (?) - \context Staff = timpany { \skip 1*314; } + \context Staff = timpany \End > violiniGroup = \context GrandStaff = violini_group < @@ -59,7 +50,7 @@ violiniGroup = \context GrandStaff = violini_group < archiGroup = \context StaffGroup = archi_group < \violiniGroup - \violiGroup + \violeGroup \bassiGroup > diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 3d018aa1b9..5b0c630a45 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -1,14 +1,7 @@ -\header{ -filename = "corni-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index c2b243d21d..5b2147d374 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -1,27 +1,24 @@ -\header{ -filename = "corni.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; \include "corno-1.ly" \include "corno-2.ly" -corniStaff = \context VoiceCombineStaff = corni < +corniStaff = \context VoiceCombineStaff = corni < \property VoiceCombineStaff.midiInstrument = #"french horn" - \property VoiceCombineStaff.instrument = #"2 Corni\n(E\\textflat)" - \property VoiceCombineStaff.instr = #"Cor.\n(E\\textflat)" + + \property VoiceCombineStaff.instrument = #`((kern . 0.5) + (lines "2 Corni" (rows "(E" ,text-flat ")"))) + + \property VoiceCombineStaff.instr = #`((kern . 0.5) + (lines "Cor." (rows "(E" ,text-flat ")"))) % urg: can't; only My_midi_lexer: () parses pitch? %\property VoiceCombineStaff.transposing = "es" \property VoiceCombineStaff.transposing = #3 - \time 4/4; - \skip 1*314; \bar "|."; + \Time + \notes { \key c \major; } + \End \context VoiceCombineVoice=one \partcombine VoiceCombineVoice \context VoiceCombineThread=one \cornoI \context VoiceCombineThread=two \cornoII diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 8645a9be55..250e8b6c3b 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -1,11 +1,3 @@ -\header{ -filename = "corno-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index bdac886751..6ca40a6be3 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -1,11 +1,3 @@ -\header{ -filename = "corno-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 64b410e892..39c1912d22 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -1,16 +1,10 @@ -\header{ -filename = "fagotti-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "fagotti.ly" + \score{ \fagottiStaff \include "coriolan-part-combine-paper.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 1eba7d32f4..bfd0d1fc3c 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -1,11 +1,3 @@ -\header{ -filename = "fagotti.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 00bc94cdf2..90b9f2d445 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -1,11 +1,3 @@ -\header{ -filename = "fagotto-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; @@ -216,11 +208,11 @@ fagottoI = \notes \relative c { a2\ff g| fis b~| b1\p~| - b~| + b\<~| b~| b| - c2.()bes4| - bes\p(as2)g4| + \!c2.\f\>()bes4| + \!bes\p(as2)g4| g'4(f2)es4| es(d es)c| b r8 d\p d4. d8| diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 02058eafe8..9806c3bffc 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -1,11 +1,3 @@ -\header{ -filename = "fagotto-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; @@ -222,8 +214,6 @@ fagottoII = \notes \relative c { \!f'2\ff e| dis b~| b1\p| - \property VoiceCombineVoice.crescendoText = #"cresc." - \property VoiceCombineVoice.crescendoSpanner = #'dashed-line a\<| g| f| diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index d10be52e05..b78a17ec46 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -1,14 +1,7 @@ -\header{ -filename = "flauti-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index c9b1ce3708..7d894fd715 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -1,11 +1,3 @@ -\header{ -filename = "flauti.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 47c0f51027..c21336a37c 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -1,11 +1,3 @@ -\header{ -filename = "flauto-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; @@ -132,14 +124,14 @@ flautoI = \notes \relative c { \property VoiceCombineVoice.crescendoText = #"cresc." \property VoiceCombineVoice.crescendoSpanner = #'dashed-line r4 r8 ges'\< f4 r8 c| - des4 r r2| + \!des4 r r2| R1*5| f4 r r r8 es| des4 r r r8 c| bes4 r8 e f4 r8 f| g4 r8 g e4 r8 e| R1*4| - \!as,4\ff r8 des8 c4 r8 g| + as,4\ff r8 des8 c4 r8 g| f4 r8 bes as4 r8 es| des4 r8 g f4 r8 f'| f4 r8 f e4 r8 e| diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 7094c0fe1d..7109fd837f 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -1,11 +1,3 @@ -\header{ -filename = "flauto-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index ac7b79ed2c..766949eecc 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -1,17 +1,16 @@ -\header{ -filename = "global.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; -global = \notes { - \time 4/4; - \key es \major; - \skip 1*314; \bar "|."; +Time = \time 4/4; +Key = \notes { \key es \major; } +End = { \skip 1*314; \bar "|."; } + +global = \notes { + \Time + \Key + \End } +#(set! point-and-click #t) +#(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) + diff --git a/mutopia/Coriolan/header.ly b/mutopia/Coriolan/header.ly new file mode 100644 index 0000000000..f483e962a3 --- /dev/null +++ b/mutopia/Coriolan/header.ly @@ -0,0 +1,20 @@ +\header { + title = "Ouverture"; + subtitle = "Coriolan"; + opus = "Op. 62"; + composer = "Ludwig van Beethoven (1770-1827)"; + enteredby = "JCN"; + + % mutopia headers. + mutopiatitle = "Ouverture Coriolan"; + mutopiacomposer = "L.v.Beethoven"; + mutopiaopus = "LvB62"; + style = "baroque"; + maintainername = "Jan Nieuwenhuizen"; + + copyright = "\\\\This music is part of the Mutopia project, http://www.mutopiaproject.org/\\\\It has been typeset and placed in the public domain by " + \maintainername + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; + maintainer = "janneke@gnu.org"; + + tagline = \copyright; + lastupdated = "2001/Jan/29"; +} diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 57bb2540d0..effd0d5ca2 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -1,11 +1,3 @@ -\header{ -filename = "oboe-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 5271901661..12f44e4701 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -1,11 +1,3 @@ -\header{ -filename = "oboe-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 6f5e72c097..aac07ab385 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -1,14 +1,7 @@ -\header{ -filename = "oboi-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 1fd9f653f6..9ae055b36c 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -1,11 +1,3 @@ -\header{ -filename = "oboi.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index 19b2ce721a..4d9a9eb2e8 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -1,14 +1,7 @@ -\header{ -filename = "timpani-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "timpani.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index cf19638a23..f38440325f 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -1,11 +1,3 @@ -\header{ -filename = "timpani.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; @@ -145,14 +137,13 @@ timpani = \notes \relative c { timpaniStaff = \context Staff = timpani < \property Staff.midiInstrument = #"timpani" - \property Staff.instrument = #"2 Timpani\n(C-G)" + \property VoiceCombineStaff.instrument = #'((kern . 0.5) + (lines "2 Timpani" "(C-G)")) \property Staff.instr = #"Timp." \clef "bass"; - \notes< -% \global - \time 4/4; - \context Voice=timpani - \timpani - > + \Time + \notes { \key c \major; } + \context Voice=timpani + \timpani > diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 38041aa359..ca48a00e5a 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -1,16 +1,10 @@ -\header{ -filename = "trombe-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "trombe.ly" + \score{ \trombeStaff \include "coriolan-part-combine-paper.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 48940448b3..9a8745d891 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -1,11 +1,3 @@ -\header{ -filename = "trombe.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; @@ -15,10 +7,14 @@ copyright = "public domain"; trombeStaff = \context VoiceCombineStaff = trombe < \context VoiceCombineStaff=trombe { \property VoiceCombineStaff.midiInstrument = #"trumpet" - \property VoiceCombineStaff.instrument = #"2 Trombe\n(C)" - \property VoiceCombineStaff.instr = #"Tbe.\n(C)" - \skip 1*314; - \bar "|."; + + \property VoiceCombineStaff.instrument = #`((kern . 0.5) + (lines "2 Trombe" (rows "(C)"))) + \property VoiceCombineStaff.instr = #`((kern . 0.5) + (lines "Tbe." (rows "(C)"))) + + \notes { \key c \major; } + \End } \context VoiceCombineVoice=one \partcombine VoiceCombineVoice \context VoiceCombineThread=one \tromboI diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 8875843794..f7aa7cc240 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -1,11 +1,3 @@ -\header{ -filename = "trombo-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index ea3b69f95f..13056eabd5 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -1,11 +1,3 @@ -\header{ -filename = "trombo-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index 956098cd48..17a8073a82 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -1,11 +1,3 @@ -\header{ -filename = "viola-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index c6042e28dc..db61eb7e27 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -1,11 +1,3 @@ -\header{ -filename = "viola-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/viole-part.ly b/mutopia/Coriolan/viole-part.ly new file mode 100644 index 0000000000..37b94deb79 --- /dev/null +++ b/mutopia/Coriolan/viole-part.ly @@ -0,0 +1,13 @@ + +\version "1.3.120"; + +\include "header.ly" +\include "global.ly" +\include "viole.ly" + +\score{ + \violeGroup + \include "coriolan-part-combine-paper.ly" + \include "coriolan-midi.ly" +} + diff --git a/mutopia/Coriolan/viole.ly b/mutopia/Coriolan/viole.ly new file mode 100644 index 0000000000..75a29090af --- /dev/null +++ b/mutopia/Coriolan/viole.ly @@ -0,0 +1,57 @@ + +\version "1.3.120"; + +\include "viola-1.ly" +\include "viola-2.ly" + +%{ +violeGroup = \context PianoStaff = viole_group \notes < + \context StaffCombineStaff=oneViole { + \property StaffCombineStaff.midiInstrument = #"viola" + \property StaffCombineStaff.instrument = #"Viola" + \property StaffCombineStaff.instr = #"Vla." + + %\clef "alto"; + % Ugh, clef broken in 1.3.125 + \property StaffCombineStaff.clefGlyph = #"clefs-C" + \property StaffCombineStaff.clefPosition = #0 + + \global + } + \context StaffCombineStaff=twoViole { + \property StaffCombineStaff.midiInstrument = #"viola" + \property StaffCombineStaff.instrument = #"Viola II" + \property StaffCombineStaff.instr = #"Vla. II" + + %\clef "alto"; + % Ugh, clef broken in 1.3.125 + \property StaffCombineStaff.clefGlyph = #"clefs-C" + \property StaffCombineStaff.clefPosition = #0 + + \global + } + + \context StaffCombineStaff=oneViole \partcombine StaffCombineStaff + \context StaffCombineVoice=one \violaI + \context StaffCombineVoice=two \violaII +> +%} + +violeGroup = \notes \context VoiceCombineStaff = viole < + \context VoiceCombineStaff=viole { + \property VoiceCombineStaff.midiInstrument = #"viola" + \property VoiceCombineStaff.instrument = #"Viola" + \property VoiceCombineStaff.instr = #"Vla." + + %\clef "alto"; + % Ugh, clef broken in 1.3.125 + \property VoiceCombineStaff.clefGlyph = #"clefs-C" + \property VoiceCombineStaff.clefPosition = #0 + + \global + } + \context VoiceCombineVoice=one \partcombine VoiceCombineVoice + \context VoiceCombineThread=one \violaI + \context VoiceCombineThread=two \violaII +> + diff --git a/mutopia/Coriolan/violi-part.ly b/mutopia/Coriolan/violi-part.ly index b18b56b565..e69de29bb2 100644 --- a/mutopia/Coriolan/violi-part.ly +++ b/mutopia/Coriolan/violi-part.ly @@ -1,19 +0,0 @@ -\header{ -filename = "violi-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} - -\version "1.3.120"; - -\include "violi.ly" - -\score{ - \violiGroup - \include "coriolan-part-combine-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/violi.ly b/mutopia/Coriolan/violi.ly index 2e95f3e925..e69de29bb2 100644 --- a/mutopia/Coriolan/violi.ly +++ b/mutopia/Coriolan/violi.ly @@ -1,72 +0,0 @@ -\header{ -filename = "violi.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} - -\version "1.3.120"; - -\include "global.ly" -\include "viola-1.ly" -\include "viola-2.ly" - -%{ -violiGroup = \context PianoStaff = violi_group \notes < - \context StaffCombineStaff=oneVioli { - \property StaffCombineStaff.midiInstrument = #"viola" - \property StaffCombineStaff.instrument = #"Viola" - \property StaffCombineStaff.instr = #"Vla." - - %\clef "alto"; - % Ugh, clef broken in 1.3.125 - \property StaffCombineStaff.clefGlyph = #"clefs-C" - \property StaffCombineStaff.clefPosition = #0 - - \key es \major; - \skip 1*314; - \bar "|."; - } - \context StaffCombineStaff=twoVioli { - \property StaffCombineStaff.midiInstrument = #"viola" - \property StaffCombineStaff.instrument = #"Viola II" - \property StaffCombineStaff.instr = #"Vla. II" - - %\clef "alto"; - % Ugh, clef broken in 1.3.125 - \property StaffCombineStaff.clefGlyph = #"clefs-C" - \property StaffCombineStaff.clefPosition = #0 - - \key es \major; - \skip 1*314; - \bar "|."; - } - - \context StaffCombineStaff=oneVioli \partcombine StaffCombineStaff - \context StaffCombineVoice=one \violaI - \context StaffCombineVoice=two \violaII -> -%} - -violiGroup = \notes \context VoiceCombineStaff = violi < - \context VoiceCombineStaff=violi { - \property VoiceCombineStaff.midiInstrument = #"viola" - \property VoiceCombineStaff.instrument = #"Viola" - \property VoiceCombineStaff.instr = #"Vla." - - %\clef "alto"; - % Ugh, clef broken in 1.3.125 - \property VoiceCombineStaff.clefGlyph = #"clefs-C" - \property VoiceCombineStaff.clefPosition = #0 - - \key es \major; - \skip 1*314; - \bar "|."; - } - \context VoiceCombineVoice=one \partcombine VoiceCombineVoice - \context VoiceCombineThread=one \violaI - \context VoiceCombineThread=two \violaII -> - diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index e3dbb84e84..2253baa977 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -1,14 +1,7 @@ -\header{ -filename = "violino-1-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index 8a3fb34285..2f23ede63e 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -1,11 +1,3 @@ -\header{ -filename = "violino-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index 379bec66e3..d1085fc5a6 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -1,14 +1,7 @@ -\header{ -filename = "violino-2-part.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; +\include "header.ly" \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index 373eb6bdf0..fe84a0e630 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -1,11 +1,3 @@ -\header{ -filename = "violino-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 9f1c746847..837a6bda5b 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -1,11 +1,3 @@ -\header{ -filename = "violoncello.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; -} \version "1.3.120"; @@ -313,7 +305,7 @@ violoncello = \notes \relative c { %200 [b8\<( fis' dis fis ][b fis dis )b!~] | - [b8\p( g' e g][e g e )g] | + [b8( g' e g][e g e )g] | [f(g f g][f g f)g] | \!es!4\fp r e r | f r g r | diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly index fbac2107ea..c8fd2c0c2c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly @@ -12,20 +12,22 @@ information is taken to the extreme. \header{ title = "Solo Cello Suites"; - subtitle = "Suite II"; + subtitle = "Suite II"; opus = "BWV 1008"; composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "JCN"; + instrument = \instrument; % mutopia headers. mutopiatitle = "Solo Cello Suites, Suite II"; mutopiacomposer = "J.S.Bach"; - mutopiaopus = "BWV1008"; + mutopiaopus = "BWV1008"; style = "baroque"; maintainername = "Jan Nieuwenhuizen"; - copyright = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainername + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; + copyright = "\\\\This music is part of the Mutopia project, http://www.mutopiaproject.org/\\\\It has been typeset and placed in the public domain by " + \maintainername + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; + maintainer = "janneke@gnu.org"; - lastupdated = "2001/Jan/28"; + tagline = \copyright; + lastupdated = "2001/Jan/28"; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-cello.ly index a12b5b7236..12474c7766 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-cello.ly @@ -1,8 +1,4 @@ -\header{ -instrument="Cello"; -} - -instrument="cello" - +instr="cello" +instrument="Violoncello" \include "solo-cello-suite-ii.ly" diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly index 2e65093260..09e45eabc8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly @@ -1,7 +1,4 @@ -\header{ -instrument="Alto"; -} - -instrument="viola" +instr="viola" +instrument="Viola" \include "solo-cello-suite-ii.ly" diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly index df83051e23..b592904068 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly @@ -1,20 +1,17 @@ \include "header.ly" -% urg \paper { linewidth = 180.\mm; \translator { \BarNumberingStaffContext } } - -% \include "prelude-" + \instrument + ".ly"; - -i = "prelude-" + \instrument + ".ly" -ii = "allemande-" + \instrument + ".ly" -iii = "courante-" + \instrument + ".ly" -iv = "sarabande-" + \instrument + ".ly" -v = "menuetto-" + \instrument + ".ly" -vi = "gigue-" + \instrument + ".ly" +% \include "prelude-" + \instr + ".ly"; +i = "prelude-" + \instr + ".ly" +ii = "allemande-" + \instr + ".ly" +iii = "courante-" + \instr + ".ly" +iv = "sarabande-" + \instr + ".ly" +v = "menuetto-" + \instr + ".ly" +vi = "gigue-" + \instr + ".ly" \include \i \include \ii diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index ce58750789..cc6de9985d 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -84,10 +84,9 @@ column as start/begin point. Only columns that have grobs or act as bounds are s be at the center of the group after aligning (when using Align_interface::center_on_element). .") (grob-property-description 'chordChanges boolean? "only show changes in chord scheme?.") +(grob-property-description 'bar-line-collapse-height number? "Minimum height of system start delimiter bar-line glyphs. If equal or smaller, the bar-line is removed.") (grob-property-description 'brace-collapse-height number? "Minimum height of system start delimiter brace glyphs. If equal or smaller, the brace is removed.") (grob-property-description 'bracket-collapse-height number? "Minimum height of system start delimiter bracket glyphs. If equal or smaller, the bracket is removed.") -(grob-property-description 'bar-line-collapse-height number? "Minimum height of system start delimiter bar-line glyphs. If equal or smaller, the bar-line is removed.") -(grob-property-description 'brace-collapse-height number? "Minimum height of system start delimiter brace glyph. If equal or smaller, the brace is removed.") (grob-property-description 'column-space-strength number? "relative strength of space following breakable columns (eg. prefatory matter).") (grob-property-description 'columns list? "list of grobs, typically containing paper-columns, list of note-columns.") (grob-property-description 'contains-grace boolean? "Used to widen entries for grace notes.") diff --git a/scm/interface-description.scm b/scm/interface-description.scm index caf6363c92..0806189af7 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -711,8 +711,9 @@ Calc dimensions for the Separating_group_spanner; this has to be (lily-interface 'system-start-delimiter-interface "#'style can be bar-line, bracket or brace" - '(collapse-height thickness arch-height arch-angle arch-thick - arch-width bracket-thick glyph ))) + '(bar-line-collapse-height brace-collapse-height bracket-collapse-height + thickness arch-height arch-angle arch-thick + arch-width bracket-thick glyph ))) (define text-spanner-interface (lily-interface diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index ee0075b092..f0bb67d77e 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -262,6 +262,7 @@ settings. pair of numbers, signifying the time signature. For example #'(4 . 4) is a 4/4time signature.") (translator-property-description 'timing boolean? " Keep administration of measure length, position, bar number, etc? Switch off for cadenzas.") +(translator-property-description 'transposing integer? "Number of semi tones that MIDI output must be transposed.") (translator-property-description 'tremoloFlags integer? "Number of tremolo flags to add if none is specified.") (translator-property-description 'tupletInvisible boolean? " If set to true, tuplet bracket creation is switched off