From: fred Date: Wed, 27 Mar 2002 00:59:54 +0000 (+0000) Subject: lilypond-1.3.145 X-Git-Tag: release/1.5.59~802 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b7924b8f8b5558c73aa2d132704a92fd3b8ebc6f;p=lilypond.git lilypond-1.3.145 --- diff --git a/input/bugs/dynamic-collide.ly b/input/bugs/dynamic-collide.ly index e9aee2cefc..e69de29bb2 100644 --- a/input/bugs/dynamic-collide.ly +++ b/input/bugs/dynamic-collide.ly @@ -1,157 +0,0 @@ - -% dynamics should not collide with staff -% dynamics (of two voices) should not collide with eachother -% strange stem through beam bug in bar 8 on viola staff -% 1-staff-high brace should collapse - -\header { -texidoc="Template for part-combining orchestral scores"; -} - - -End = { \skip 1*8; } - -violaI = \notes\relative c'' { - c1 \break c c c c\break - g4\p\< r r r8 g(| - )c,4 r r r8 c| - [\!f8\sf(\>as f as][f g d)\!g]| - r [es'\p(c)es] r [d(bes)d]| - - -} -violaII = \notes\relative c'' { - c1 c c c c - g4\p\< r r r8 g(| - )c,4 r r r8 c| - [\!f8\sf(\>as f as][f g d)\!g]| - r [c\p(g)c] r [bes(g)bes]| -} - - -violoncello = \notes\relative c { - c4\< c c c - \!c1\pp c c c - \property Voice.crescendoText = #"cresc." - \property Voice.crescendoSpanner = #'dashed-line - [g8\p\<(bes' g bes][d bes g)d~]| - [d8(a' fis a][d a fis)d]| - [\!f!8\sf\>(as f as][f g d)g]| - %75 - \!c,4\p r d r| -} - -contrabasso = \notes\relative c { - d8\< d d d d d d d - \!c1\ff c c c - \property Voice.crescendoText = #"cresc." - \property Voice.crescendoSpanner = #'dashed-line - g4\p\< r r r8 g(| - )c4 r r r8 c(| - \!)b1\sf| - c4\p r d r| -} - -violeStaff = \notes \context Staff = viole < - \context Voice=oneViole < - \property Staff.instrument = #"Viola" - \property Staff.instr = #"Vla." - - \End - > - \context Voice=twoViole < - \property Staff.instrument = #"Viola II" - \property Staff.instr = #"Vla. II" - \End - > - \context Voice=oneViole \partcombine Voice - \context Thread=oneViole \violaI - \context Thread=twoViole \violaII -> - -staffCombinePianoStaffProperties = { - \property PianoStaff.devNullThread = #'() - \property PianoStaff.soloADue = ##t - \property PianoStaff.soloText = #"" - \property PianoStaff.soloIIText = #"" - % This is non-conventional, but currently it is - % the only way to tell the difference. - \property PianoStaff.aDueText = #"\\`a2" - \property PianoStaff.splitInterval = #'(1 . 0) - \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) -} - - -\score { - < - \context StaffGroup < - \violeStaff - - \context PianoStaff = bassi_group \notes < - \staffCombinePianoStaffProperties - \context Staff=oneBassi < \clef bass; - \property Staff.instrument = #'(lines - "Violoncello" " e" "Contrabasso") - - \property Staff.instr = #"Vc." - \End > - \context Staff=twoBassi < \clef bass; - \property Staff.instrument = #"Contrabasso" - \property Staff.instr = #"Cb." - - \End > - - \context Staff=oneBassi \partcombine Staff - \context Voice=oneBassi { \violoncello } - \context Voice=twoBassi { \contrabasso } - > -> - > - \paper { - % \paperSixteen - linewidth = 80 * \staffspace; - textheight = 200 * \staffspace; - \translator{ - \ThreadContext - \consists "Rest_engraver"; - - % Set value for engraver at thread level, - % to override the default that is set in ScoreContext - % for added engraver at Voice level - devNullThread = #'() - } - \translator{ - \VoiceContext - \remove "Rest_engraver"; - - % The staff combine (bassi part) needs a - % thread_devnull_engraver here. - % Instead of maintaining two separate hierarchies, - % we switch add it, but switch it off immideately. - % The staff combine parts switch it on. - % devNullThread = #'never - \consists "Thread_devnull_engraver"; - } - \translator{ - \HaraKiriStaffContext - \consists "Mark_engraver"; - } - \translator { - \OrchestralScoreContext - skipBars = ##t - soloText = #"I." - soloIIText = #"II." - % By default, turn off the Thread_devnull_engraver - % at Voice level - devNullThread = #'never - - % Hmm - currentBarNumber = #218 - BarNumber \override #'padding = #3 - RestCollision \override #'maximum-rest-count = #1 - marginScriptHorizontalAlignment = #1 - TimeSignature \override #'style = #'C - } - } -} - diff --git a/input/bugs/dynamic-switch.ly b/input/bugs/dynamic-switch.ly index 1365e5ea99..c392f4d4cb 100644 --- a/input/bugs/dynamic-switch.ly +++ b/input/bugs/dynamic-switch.ly @@ -1,4 +1,5 @@ +% what's the problem? \score{ \context Staff < \context Voice=one \skip 1; diff --git a/input/bugs/minimal.ly b/input/bugs/minimal.ly index 489cbd14e8..e69de29bb2 100644 --- a/input/bugs/minimal.ly +++ b/input/bugs/minimal.ly @@ -1,12 +0,0 @@ -% minimal what? -% dumps core - - -\score { - \sequential {\clef bass ; } - \paper { -% \translator { \context Score_engraver ; \name "Score"; } - \translator { \type "Score_engraver"; \name "Score"; } - linewidth = 30 * \staffspace; - } -} diff --git a/input/bugs/multiply.ly b/input/bugs/multiply.ly index 85c02dc5c8..6d611c4882 100644 --- a/input/bugs/multiply.ly +++ b/input/bugs/multiply.ly @@ -1,8 +1,14 @@ + + + % ugh: strange order of things, this: % a16 * 1/2 ( % must be % a16 ( * 1/2 +%{ +?? is this a bug? --hwn +%} \score { \context Voice \notes\relative c { diff --git a/input/bugs/pc-direction.ly b/input/bugs/pc-direction.ly index b6e9b2ec4a..aa1327175d 100644 --- a/input/bugs/pc-direction.ly +++ b/input/bugs/pc-direction.ly @@ -1,6 +1,9 @@ % move to regtest once it works? + +% still not workign ? --hwn. + \header { texidoc=" On their own staff, staffcombined voices should be stemboth (not up/down); diff --git a/input/bugs/repeat.ly b/input/bugs/repeat.ly index dde3c8e74a..9a9835f806 100644 --- a/input/bugs/repeat.ly +++ b/input/bugs/repeat.ly @@ -1,3 +1,3 @@ - +% should start with |: \score { \context Staff \notes \repeat volta 3 c1 \alternative { d1 e1 }} diff --git a/input/bugs/sbug.ly b/input/bugs/sbug.ly new file mode 100644 index 0000000000..fae779b608 --- /dev/null +++ b/input/bugs/sbug.ly @@ -0,0 +1,8 @@ +% the \stopped collides with the +%beam. + + +% stopped disappeared ?? +\score { \notes { +\clef "G"; \stemUp [a''8^\stopped a''8_\stopped] +}} diff --git a/input/bugs/script-dir.ly b/input/bugs/script-dir.ly index d8d35df388..e69de29bb2 100644 --- a/input/bugs/script-dir.ly +++ b/input/bugs/script-dir.ly @@ -1,5 +0,0 @@ -\score { - \context Voice \notes\relative c'' { - a-. c-. - } -} diff --git a/input/bugs/script.ly b/input/bugs/script.ly index 1f60ff08ff..8b13789179 100644 --- a/input/bugs/script.ly +++ b/input/bugs/script.ly @@ -1,9 +1 @@ - -% the \stopped collides with the -%beam. - - -\score { \notes { -\clef "G"; \stemUp [a''8^\stopped a''8^\stopped] -}} diff --git a/scm/grob-description.scm b/scm/grob-description.scm index e2bfae8305..ea40dd0cf7 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -613,12 +613,12 @@ (meta . ,(grob-description "SustainPedal" sustain-pedal-interface side-position-interface font-interface)) )) - ; should split in 3 + ;; TODO: should split in 3 (SystemStartDelimiter . ( (molecule-callback . ,System_start_delimiter::brew_molecule) (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking) - ;; ugh, in practice, brace has height of 4.1 staff-spaces - (brace-collapse-height . 4.1) + ;; really 4.0, but 5 to be on safe side. + (brace-collapse-height . 5.0) (bracket-collapse-height . 1) (thickness . 1.6) (arch-height . 1.5) @@ -680,6 +680,7 @@ (break-align-symbol . Time_signature) (visibility-lambda . ,all-visible) (breakable . #t) + (style . C) (font-family . number) (meta . ,(grob-description "TimeSignature" time-signature-interface font-interface)) ))