From 3799b0e84d9a1db6ca332f06614e6fd1495c2752 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 15 Aug 2005 18:06:06 +0000 Subject: [PATCH] * input/regression/slur-script.ly: Add example of reverting inside-slur for fingering. * scm/define-grobs.scm (DynamicLineSpanner, Fingering, TextScript): Explicitly set inside-slur #f, forcing these out of slur. * lily/slur-engraver.cc (acknowledge_extra_object): Only invoke outside_slur_callback if inside-slur == #f (as opposed to unset). --- ChangeLog | 16 ++++++++++++++++ input/regression/slur-script.ly | 7 +++++-- lily/slur-engraver.cc | 6 +++--- scm/define-grobs.scm | 7 +++++-- tex/GNUmakefile | 9 +-------- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9250d17d3f..a3fa9961b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2005-08-15 Jan Nieuwenhuizen + + * input/regression/slur-script.ly: Add example of reverting + inside-slur for fingering. + + * scm/define-grobs.scm (DynamicLineSpanner, Fingering, + TextScript): Explicitly set inside-slur #f, forcing these out of slur. + + * lily/slur-engraver.cc (acknowledge_extra_object): Only invoke + outside_slur_callback if inside-slur == #f (as opposed to unset). + +2005-08-14 Jan Nieuwenhuizen + + * tex/GNUmakefile (INSTALLATION_FILES): Remove enc symlink setup, + encoding files are already removed. + 2005-08-15 Mats Bengtsson * Documentation/user/advanced-notation.itely (Instrument names): diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index 1ec5a59f87..6eacd8101e 100644 --- a/input/regression/slur-script.ly +++ b/input/regression/slur-script.ly @@ -18,8 +18,11 @@ b(-. d-.) b_1( b b_1_2_3) - c-1_\markup { \italic {"cresc."}}( f c) - c-1( c\f c) + %% Allow Fingering to go inside slur, by reverting the #f value. + \once \revert Fingering #'inside-slur + b( d_1 b) + c_\markup { \italic {"cresc."}}( f c) + c( c\f c) \once \override Script #'padding = #1.2 b-.( b-. \once \override Script #'padding = #1.2 diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 2b9f9d7ddc..58b71d4aa2 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -102,7 +102,7 @@ Slur_engraver::acknowledge_extra_object (Grob_info info) for (int i = end_slurs_.size (); i--;) Slur::add_extra_encompass (end_slurs_[i], e); } - else if (!to_boolean (inside) + else if (inside == SCM_BOOL_F && e->name () != "DynamicText") { Grob *slur = slurs_.size () ? slurs_[0] : 0; @@ -207,8 +207,8 @@ Slur_engraver::stop_translation_timestep () ADD_ACKNOWLEDGER (Slur_engraver, accidental); ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner); -ADD_ACKNOWLEDGER (Slur_engraver, fingering) - ADD_ACKNOWLEDGER (Slur_engraver, note_column); +ADD_ACKNOWLEDGER (Slur_engraver, fingering); +ADD_ACKNOWLEDGER (Slur_engraver, note_column); ADD_ACKNOWLEDGER (Slur_engraver, script); ADD_ACKNOWLEDGER (Slur_engraver, text_script); ADD_ACKNOWLEDGER (Slur_engraver, tie); diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 6d88d78203..9f58f66256 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -461,6 +461,7 @@ (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (staff-padding . 0.1) (padding . 0.6) + (inside-slur . #f) (slur-padding . 0.3) (minimum-space . 1.2) (direction . -1) @@ -515,8 +516,10 @@ . ( (print-function . ,Text_interface::print) - ; sync with TextScript (?) + ;; sync with TextScript (?) + (padding . 0.5) + (inside-slur . #f) (slur-padding . 0.2) (staff-padding . 0.5) (self-alignment-X . 0) @@ -1060,7 +1063,6 @@ ;; space a away. (padding . 0.20) (staff-padding . 0.25) - (slur-padding . 0.5) ;; (script-priority . 0) priorities for scripts, see script.scm (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent)) (before-line-breaking-callback . ,Script_interface::before_line_breaking) @@ -1373,6 +1375,7 @@ (padding . 0.5) (staff-padding . 0.5) (before-line-breaking-callback . ,Script_interface::before_line_breaking) + (inside-slur . #f) (slur-padding . 0.5) (script-priority . 200) ;; todo: add X self alignment? diff --git a/tex/GNUmakefile b/tex/GNUmakefile index 9eca6bc5c7..17cdf42c63 100644 --- a/tex/GNUmakefile +++ b/tex/GNUmakefile @@ -13,15 +13,8 @@ $(outdir)/music-drawing-routines.ps: $(depth)/ps/music-drawing-routines.ps rm -f $@ -ln $< $@ - -# teTeX-2.0.x compatibility. -local-install: - -$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)/tex - (cd $(DESTDIR)$(local_lilypond_datadir)/tex && ln -sf ../fonts/enc .) - local-uninstall: - -rm -f $(DESTDIR)$(local_lilypond_datadir)/tex/enc -rmdir $(DESTDIR)$(local_lilypond_datadir)/tex -all: $(INSTALLATION_FILES) $(INSTALLATION_OUT_FILES1) +all: $(INSTALLATION_FILES) -- 2.39.2