CVSROOT: /cvsroot/lilypond Module name: lilypond Branch: Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/18 13:02:04
Modified files: . : ChangeLog input/regression: slur-script.ly Log message: remove padding tweaks. Add comment strings. CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4032&tr2=1.4033&r1=text&r2=text http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/slur-script.ly.diff?tr1=1.15&tr2=1.16&r1=text&r2=text Patches: Index: lilypond/ChangeLog diff -u lilypond/ChangeLog:1.4032 lilypond/ChangeLog:1.4033 --- lilypond/ChangeLog:1.4032 Thu Aug 18 12:55:19 2005 +++ lilypond/ChangeLog Thu Aug 18 13:02:03 2005 @@ -1,5 +1,8 @@ 2005-08-18 Han-Wen Nienhuys <[EMAIL PROTECTED]> + * input/regression/slur-script.ly: remove padding tweaks. Add + comment strings. + * lily/note-spacing.cc (get_spacing): remove kludge for EOL wide time sigs and related stuff. Index: lilypond/input/regression/slur-script.ly diff -u lilypond/input/regression/slur-script.ly:1.15 lilypond/input/regression/slur-script.ly:1.16 --- lilypond/input/regression/slur-script.ly:1.15 Thu Aug 18 09:55:08 2005 +++ lilypond/input/regression/slur-script.ly Thu Aug 18 13:02:04 2005 @@ -1,41 +1,41 @@ \header { - texidoc = "A slur avoids collisions with scripts. Articulations + texidoc = "A slur avoids collisions with scripts. Articulations go inside the slur, dynamic markings go outside the slur. Fingerings and texts are placed either inside or outside. For different configurations, the defaults can be changed, and scripts can be moved manually." - } +} \version "2.6.0" \layout { - indent = 0\mm - raggedright = ##t + indent = 0\mm + raggedright = ##t } \relative { - b4-.( b-. b-.) - b(-. d-.) + b4-.( b-. b-.) + b(-. d-.) + + b_1( f'_1_2_3 c_3_4_5 a) - b_1( f'_1_2_3 c_3_4_5 a) - b( f'\p b,) - - %% Do not force dynamics outside slur, only avoid collisions. - \override DynamicLineSpanner #'avoid-slur = #'around - \override DynamicLineSpanner #'padding = #0.4 - b( e\p e\f b) - - %% Do not avoid collisions. - \override DynamicLineSpanner #'avoid-slur = #'() - \revert DynamicLineSpanner #'padding - b( d\p d\f b) - - c_\markup { \italic {"cresc."}}( c c) - \once \override Script #'padding = #1.2 - b-.( b-. - \once \override Script #'padding = #1.2 - b-.) - e='16[-.( f-.)] + \override DynamicLineSpanner #'avoid-slur = #'outside + b(^"dyn outside" b f'\p b,) + + %% Do not force dynamics outside slur, only avoid collisions. + \override DynamicLineSpanner #'avoid-slur = #'around + b(^"dyn around" e\p e\f b) + + %% Do not avoid collisions. + \override DynamicLineSpanner #'avoid-slur = #'() + b(^"no avoid" d\p d\f b) + + c_\markup { \italic {"cresc."}}( c c) + \once \override Script #'padding = #1.2 + b-.( b-. + \once \override Script #'padding = #1.2 + b-.) + e='16[-.( f-.)] } _______________________________________________ Lilypond-cvs mailing list Lilypond-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-cvs