From 39e82b792ff85043adac9e22038560be14d834ee Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 18 Aug 2005 13:02:04 +0000 Subject: [PATCH] remove padding tweaks. Add comment strings. --- ChangeLog | 3 ++ input/regression/slur-script.ly | 50 ++++++++++++++++----------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index df9c082ef7..7a0dfb3911 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-08-18 Han-Wen Nienhuys + * 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. diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index e0399ba7c5..8eb12d5ab9 100644 --- a/input/regression/slur-script.ly +++ b/input/regression/slur-script.ly @@ -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-.)] } -- 2.39.5