From 8fd4b846d009549dcaeccdec227683cabe3affa2 Mon Sep 17 00:00:00 2001 From: hanwen Date: Sat, 31 Jul 2004 19:29:02 +0000 Subject: [PATCH] * input/test/trills.ly: remove. * input/test/transposition.ly: remove. * input/test/to-xml.ly: move to no-notation. * buildscripts/lilypond-profile.sh: change zsh bomb to warning. * lily/ledger-line-spanner.cc (print): use staff variable, not me. Fixes ledger lines on differently sized staves. * input/test/rhythm-excercise.ly: remove file. * lily/stem.cc (dim_callback): only do something if visible. Fixes spurious flag not found warning for 128th rest. * input/test/rest-dot-positions.ly: remove --- ChangeLog | 20 +++++ buildscripts/lilypond-profile.sh | 28 ++----- input/{test => no-notation}/to-xml.ly | 0 input/test/rest-dot-positions.ly | 59 ------------- input/test/rests.ly | 57 ++++++------- input/test/rhythm-excercise.ly | 19 ----- input/test/spanner-after-break-tweak.ly | 16 ++-- input/test/staff-size.ly | 27 +++--- input/test/staff-space.ly | 2 +- input/test/transposition.ly | 55 ------------ input/test/trill.ly | 7 +- input/test/trills.ly | 107 ------------------------ lily/ledger-line-spanner.cc | 2 +- lily/stem.cc | 11 ++- 14 files changed, 87 insertions(+), 323 deletions(-) rename input/{test => no-notation}/to-xml.ly (100%) delete mode 100644 input/test/rest-dot-positions.ly delete mode 100644 input/test/rhythm-excercise.ly delete mode 100644 input/test/transposition.ly delete mode 100644 input/test/trills.ly diff --git a/ChangeLog b/ChangeLog index bbdbe6d601..0c49faebdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,25 @@ 2004-07-31 Han-Wen Nienhuys + * input/test/trills.ly: remove. + + * input/test/transposition.ly: remove. + + * input/test/to-xml.ly: move to no-notation. + + * buildscripts/lilypond-profile.sh: change zsh bomb to warning. + + * lily/ledger-line-spanner.cc (print): use staff variable, not + me. Fixes ledger lines on differently sized staves. + + * input/test/rhythm-excercise.ly: remove file. + + * lily/stem.cc (dim_callback): only do something if visible. Fixes + spurious flag not found warning for 128th rest. + + * input/regression/rest-dot-position.ly: new file. + + * input/test/rest-dot-positions.ly: remove + * lily/staff-symbol-referencer.cc (get_position): emergency fallback: use coordinate * 2. diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh index 339b7b0361..da3e1dc153 100644 --- a/buildscripts/lilypond-profile.sh +++ b/buildscripts/lilypond-profile.sh @@ -9,17 +9,20 @@ -# workaround for ZSH posix $0-problem -# for zsh: start removing here + +# In ZSH, $0 is set to the script name, regardless of whether sourced +# or run in a subshell. if [ -n "$ZSH_NAME" ] ; then - echo "You are running this script under zsh. Edit this script by hand. " + echo "Make sure that this script is sourced, ie. run as " echo - echo "(failed to source lilypond-profile)" + echo " . lilypond-profile" + echo "" + echo "Continuing anyway ..." return 2 fi -if [ `basename "$0"` = "lilypond-profile" ] ; then +if [ -z "$ZSH_NAME" -a `basename "$0"` = "lilypond-profile" ] ; then cat >/dev/stderr <> - } - \paper{} -} - diff --git a/input/test/rests.ly b/input/test/rests.ly index 2be6168479..201189eeed 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -8,36 +8,31 @@ Rests may be used in various styles. " } -% FIXME: Currently, this file produces "warning: flag `d-3' not found" -% errors (and similar for "d7") from Stem::flag(). This is should not -% happen, since there are no notes/stems in this example. - -\score { - \context Staff \relative c { - \set Score.timing = ##f - \override Staff.Rest #'style = #'mensural - r\maxima^"Rest style = \#'mensural" - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar empty \break - - \override Staff.Rest #'style = #'neo_mensural - r\maxima^"Rest style = \#'neo\\_mensural" - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar empty \break - - \override Staff.Rest #'style = #'classical - r\maxima^"Rest style = \#'classical" - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar empty \break - - \override Staff.Rest #'style = #'default - r\maxima^"Rest style = \#'default" - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \break - } - \paper { - indent = 0.0 - raggedright = ##t - } +\paper { + indent = 0.0 + raggedright = ##t +} + +\context Staff \relative c { + \set Score.timing = ##f + \override Staff.Rest #'style = #'mensural + r\maxima^\markup \typewriter { mensural } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'neo_mensural + r\maxima^\markup \typewriter { neo_mensural } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'classical + r\maxima^\markup \typewriter { classical } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'default + r\maxima^\markup \typewriter { default } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + } diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly deleted file mode 100644 index 817c446ef9..0000000000 --- a/input/test/rhythm-excercise.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.3.8" -\header { texidoc = "@cindex Rhythm Exercise -Rythmic exercises may be produced by removing the @code{Clef} engraver, -putting all notes to the same pitch and using transparent staff lines. -" -} - -\score { { c4 c4 c8[ c8] c2 c2 } - - \paper { - \context { \Staff - \override StaffSymbol #'transparent = ##t - \consists Pitch_squash_engraver - \remove Clef_engraver - } - raggedright= ##t - } -} - diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly index 599101c99a..a6f1528afe 100644 --- a/input/test/spanner-after-break-tweak.ly +++ b/input/test/spanner-after-break-tweak.ly @@ -12,23 +12,19 @@ after the line break in this example is moved around. " #(define (my-callback grob) (let* ( (o (ly:grob-original grob)) - (b (if (ly:grob? o) (ly:spanner-broken-into o) '() )) - ) + (b (if (ly:grob? o) (ly:spanner-broken-into o) '() ))) ;; Call the equivalent of Tie::after_line_breaking ;; if you're using this for other grob-types. (if (and (>= (length b) 2) (eq? (car (last-pair b)) grob)) - (ly:grob-set-property! grob 'extra-offset '(-2 . -1)) - ) - )) + (ly:grob-set-property! grob 'extra-offset '(-2 . 5)) + ))) -#(debug-enable 'backtrace) +\paper { raggedright = ##t } -\score { \relative c'' { +\relative c'' { \override Tie #'after-line-breaking-callback = - #my-callback + #my-callback c1 ~ \break c2 ~ c } - \paper { raggedright = ##t } - } diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index acd4717aa1..527757d253 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -7,20 +7,17 @@ must be scaled." } -\score { - \relative c' << - \new Staff \relative c'' { - \dynamicDown c,,4 \ff c c c - } - \new Staff \with { - fontSize = #-1 - \override StaffSymbol #'staff-space = #(magstep -1) - } { - \clef bass - c8 c c c c c c c - } - >> - \paper { raggedright = ##t} -} +\paper { raggedright = ##t} + +\relative c' << +% \new Staff \relative c'' { \dynamicDown c4 \ff c c c } + \new Staff \with { + fontSize = #-3 + \override StaffSymbol #'staff-space = #(magstep -3) + } { + \clef bass + c8 c c c c c c c + } +>> diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly index 74eb2ce32e..65295852ee 100644 --- a/input/test/staff-space.ly +++ b/input/test/staff-space.ly @@ -1,7 +1,7 @@ \version "2.3.8" \header{ texidoc ="@cindex Staff Space -By just increasing @code{staff-space} on a staff, you may produce strange +By just increasing @code{staff-space} on a staff, you can produce strange results. " } diff --git a/input/test/transposition.ly b/input/test/transposition.ly deleted file mode 100644 index b11b5eb903..0000000000 --- a/input/test/transposition.ly +++ /dev/null @@ -1,55 +0,0 @@ - -\version "2.3.8" - -\header{ texidoc = "@cindex Transposition -Transposing has also an effect key signature, if it is given using -@code{\key}. If @code{keySignature} is set explicitly instead, -the key signature is not transposed." - - } - -% should the explicitly set key signature transpose also? -HJJ - -vOne = \relative c''{ - \clef"violin" - \key d \major - \time 2/4 - d4 d | - \key fis \major - fis4 fis | - \key es \major - c4 c | -} - -vTwo = \transpose c d { \vOne } - -vThree = \relative c''{ - \clef"violin" -% keysignature fis cis - \set Staff.keySignature = #'((0 . 2)(3 . 2)) - \time 2/4 - d4 d | -% keysignature bes es fis - \set Staff.keySignature = #'((3 . 2)(2 . -2)(6 . -2)) - fis4 fis | -% keysignature fis cis gis dis ais eis - \set Staff.keySignature = #'((2 . -2)(5 . -2)(1 . 2)(4 . 2)(0 . 2)(3 . 2)) - cis4 ais4 | -} - - -vFour = \transpose c d \vThree - -\score { - \context StaffGroup << - \new Staff \vOne - \new Staff \vTwo - \new Staff \vThree - \new Staff \vFour - >> - \paper { linewidth= 130.\mm raggedright = ##t } -} - - - - diff --git a/input/test/trill.ly b/input/test/trill.ly index 4a1e3be2e5..5042e9c51c 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -6,9 +6,10 @@ spanner style. " } +\paper { raggedright = ##t} -\score { - \context RhythmicStaff { + +{ \stemDown \override Stem #'transparent = ##t \override TextSpanner #'dash-fraction = #0.0 @@ -24,8 +25,6 @@ spanner style. \override TextSpanner #'edge-text = #(cons (make-musicglyph-markup "scripts-trill") "") a\startTextSpan b c a\stopTextSpan - } - \paper { raggedright = ##t} } diff --git a/input/test/trills.ly b/input/test/trills.ly deleted file mode 100644 index 990dff0334..0000000000 --- a/input/test/trills.ly +++ /dev/null @@ -1,107 +0,0 @@ -\version "2.3.8" - -\header { - texidoc="@cindex Trills -Trills, pralls and turns may also be written out in full. Here the -D'Anglebert system (1689) is shown." - -} - -%{ - -taken from : - -title="Marques des agr\\'ements et leur signification" - composer="D'Anglebert" - year="1689" - -%} - -invisible = \override NoteHead #'transparent = ##t -visible = \revert NoteHead #'transparent - - - -\score { - << - \context GrandStaff << - \new Staff \relative c'' { - \time 1/4 - c4\prall - \time 3/8 - c4.^\lineprall - c4.\downprall - c4.\upprall - \time 5/8 - c4\turn c4.\upprall - d4\turn b4.\downprall - \time 3/4 - b4 c^\turn d - \time 1/4 - <<{ d4}\\ - { - \override Script #'extra-offset = #'(-0.8 . 2.0) - b_\turn}>> -%{ FIXME \comma does not exist - \startHorizScript - - c^\comma - \time 3/8 - c4.^\comma - b8 c4_\comma - c8 b4_\comma - b8 c4^\comma _\comma - \endHorizScript -%} - \time 2/2 \slurDown - <<{c2}{s4 \invisible d1*1/4 ( \visible }>> e2) - <<{a,2}{s4 \invisible b1*1/4 ( \visible }>> d2) - <<{a2}{s4 \invisible b1*1/4 ( \visible }>> d2) - \time 3/4 - d2^\prallup e4 - } - \new Lyrics \lyrics { - "Tremblement"4 - "Tremblement"4. - "Cadence" - "autre" - "Double"4 "cadence"4. -%{ "autre"4 _4. - _4 "sans tremblement"2 - "sur une tierce"4 - "Pinc\\'e"4 - "autre"4. - "Cheute ou Port de" - "en descendant" - "Cheute et pinc\\'e" - "Coul\\'e Sur 2 notes"1 - "autre" - "autre" - "Double cadence"2. -%} - - } - \new Lyrics \lyrics { - "simple"4 - "appuy\\'e"4. -%{ \skip 1*3 - \skip 4 \skip 4. - "voix et montant" - \skip 2. - "de suite"1 -%} - } - \new Staff \relative c'' { - % autobeamer has som problems here - d32[ \repeat unfold 3 { c d } c] - d8 ~ d32[\repeat unfold 3 { c32 d } c] - d32 c b c \repeat unfold 4 { d32 c } - b32 c d c \repeat unfold 4 { d32 c } - c32[( b a16 b c)] - b32[ \repeat unfold 5 { c d32 } c] - } - >> - >> - \paper{ } -} - diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc index 6506eb0e2a..179c6e0e3e 100644 --- a/lily/ledger-line-spanner.cc +++ b/lily/ledger-line-spanner.cc @@ -199,7 +199,7 @@ Ledger_line_spanner::print (SCM smob) // create ledgers for note heads Real ledgerlinethickness = Staff_symbol::get_ledger_line_thickness (staff); - Real halfspace = Staff_symbol::staff_space (me)/2; + Real halfspace = Staff_symbol::staff_space (staff)/2; for (int i = heads.size (); i--; ) { Item *h = dynamic_cast (heads[i]); diff --git a/lily/stem.cc b/lily/stem.cc index 5aa8844849..6a2acc434d 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -623,12 +623,19 @@ Stem::dim_callback (SCM e, SCM ax) Axis a = (Axis) ly_scm2int (ax); assert (a == X_AXIS); Grob *me = unsmob_grob (e); - Interval r (0, 0); - if (unsmob_grob (me->get_property ("beam")) || abs (duration_log (me)) <= 2) + + Interval r; + + if (is_invisible (me)) + { + r.set_empty (); + } + else if (unsmob_grob (me->get_property ("beam")) || abs (duration_log (me)) <= 2) ; // TODO! else r = flag (me).extent (X_AXIS) + thickness (me)/2; + return ly_interval2scm (r); } -- 2.39.5