From: Jan Nieuwenhuizen Date: Mon, 13 Mar 2000 22:23:44 +0000 (+0100) Subject: patch::: 1.3.32.jcn2 X-Git-Tag: release/1.3.33~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=64dbfeeee49c65d8c7141a51251cdb70aa187bd2;p=lilypond.git patch::: 1.3.32.jcn2 1.3.32.jcn2 =========== * Made some small fixes to Coriolan. --- diff --git a/CHANGES b/CHANGES index b2578a395b..c17fb87d7d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.3.32.jcn2 +=========== + +* Made some small fixes to Coriolan. + 1.3.32.jcn1 =========== diff --git a/VERSION b/VERSION index 422bfe697d..9c56fc10a7 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=32 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/staff-margin.ly b/input/bugs/staff-margin.ly new file mode 100644 index 0000000000..1275f6926a --- /dev/null +++ b/input/bugs/staff-margin.ly @@ -0,0 +1,38 @@ +voice = \notes\relative c'{ + \property Staff.instrument = "Voice" + \property Staff.instr = "V." + + % Staff_margin_engraver kan be `fixed' by doing a silly request: + %\bar ".|"; + + c1\break c \bar "|."; +} + +soprano = \notes\relative c'{ + \property Staff.instrument = "Soprano" + \property Staff.instr = "S." + c1 c \bar "|."; +} + +tenor = \notes \relative c'{ + \property Staff.instrument = "Tenor" + \property Staff.instr = "T." + c1 c +} + +\score +{ + \context StaffGroup< + \context Staff = "voice" \voice + \context GrandStaff< + \context Staff = "soprano" \soprano + \context Staff = "tenor" \tenor + > + > + + \paper { + indent = 50.0\mm; + linewidth = 100.0\mm; + \translator { \StaffContext \consists Staff_margin_engraver; } + } +} diff --git a/ly/engraver.ly b/ly/engraver.ly index 1d7eb0285b..93ca721d07 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -305,6 +305,12 @@ HaraKiriStaffContext = \translator { \consists "Staff_margin_engraver"; \accepts "Voice"; }; +%{ + The HaraKiriStaffContexts doesn't override \name, + so it is still named `Staff'. + + %\translator { \HaraKiriStaffContext } +%} OrchestralPartStaffContext = \translator { \StaffContext diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 449279bdb9..b6beb3d4b7 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -25,6 +25,7 @@ $clarinetti_staff = \context Staff = clarinetti < \notes \context Staff=clarinetti < \time 4/4; \key F; + \skip 1*341; \bar "|."; \context VoiceOne=clarinettoi \$clarinetto1 \context VoiceTwo=clarinettoii diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly index e75dd8e970..9c059b4e02 100644 --- a/mutopia/Coriolan/coriolan-paper.ly +++ b/mutopia/Coriolan/coriolan-paper.ly @@ -1,9 +1,17 @@ \paper{ \paper_sixteen + + %% + \translator { \VoiceContext \remove "Dynamic_engraver"; } + \translator { \VoiceContext \name "VoiceOne"; - \consists "Line_number_engraver"; + + %% + \remove "Dynamic_engraver"; + + %%\consists "Line_number_engraver"; verticalDirection = #1 stemVerticalDirection = #1 dynamicDirection = #-1 @@ -11,7 +19,7 @@ \translator { \VoiceContext \name "VoiceTwo"; - \consists "Line_number_engraver"; + %%\consists "Line_number_engraver"; verticalDirection = #-1 stemVerticalDirection = #-1 \remove "Dynamic_engraver"; diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 24f89ce987..3c2043625c 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -1,7 +1,8 @@ \header{ filename = "coriolan.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; +title = "Ouverture"; +subtitle = "Coriolan"; +opus = "Op. 62"; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; @@ -41,20 +42,21 @@ ottoni = \context StaffGroup = otonni_group < $timpani_g = \context StaffGroup = timpani_group < \$timpani_staff + % HaraKiri mustn't work on first page \context Staff = urgtimpany \notes{ \skip 1*34; } > -$violini = \context GrandStaff = violini_group < +violini = \context GrandStaff = violini_group < \$violino1_staff \$violino2_staff > -$violi = \context GrandStaff = violi_group < +violi = \context GrandStaff = violi_group < \$viola1_staff \$viola2_staff > -$bassi = \context GrandStaff = bassi_group < +bassi = \context GrandStaff = bassi_group < \$violoncello_staff \$contrabasso_staff > @@ -69,10 +71,10 @@ archi = \context StaffGroup = archi_group < \score{ < %%? \property Score . textStyle = "italic" - \$legni - \$ottoni + \legni + \ottoni \$timpani_g - \$archi + \archi > \include "coriolan-paper.ly" \include "coriolan-midi.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index f98f981fcf..7db4bc7308 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -24,6 +24,7 @@ $corni_staff = \context Staff = corni < %\notes \context Voice=corni < \notes \context Staff=corni < \time 4/4; + \skip 1*341; \bar "|."; \context VoiceOne=cornoi \$corno1 \context VoiceTwo=cornoii diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 484f5e1337..7168dfece5 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -10,6 +10,9 @@ copyright = "public domain"; \version "1.3.4"; flauto1 = \notes \relative c { + % do silly bar request to fix Staff_margin_engraver + \bar ".|"; + R1 *2 | c'''4-.\ff r r2 | R1 *3 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 335a15a56c..7bc4c0f93d 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -14,6 +14,6 @@ copyright = "public domain"; global = \notes { \time 4/4; \key es; - \skip 1*314; + \skip 1*314; \bar "|."; } diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index d8071553e7..7bf17458f0 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -19,7 +19,7 @@ violoncello = \notes \relative c { c'1\ff ~ | c | f,4-. r r2 | - \property Staff.instr = #"Vc. \& Cb." + \property Staff.instr = #"Vc. \\& Cb." r1 | c'1\ff ~ | c |