* 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).

diff --git a/ChangeLog b/ChangeLog
index 9250d17d3fdf9c4e32d29abfd14a5ca5c3b25da0..a3fa9961b97bf49a183d703a594758310909320a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-08-15  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * 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  <janneke@gnu.org>
+
+       * tex/GNUmakefile (INSTALLATION_FILES): Remove enc symlink setup,
+       encoding files are already removed.
+
 2005-08-15  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * Documentation/user/advanced-notation.itely (Instrument names):

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index 1ec5a59f876d75e6239325d06df5ace95c891a8d..6eacd8101edeff719ed4b466967adc0ac4ef5065 100644 (file)
--- 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 2b9f9d7ddc5350728e2cadc54cd41d15170e7e27..58b71d4aa2aa6696aef1e0bee557eabe7ac3689c 100644 (file)
--- 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 6d88d7820342932a8fa17a334ef1807b80fd7111..9f58f662567d3af3f9c3a06d709f5a1825c4418b 100644 (file)
--- 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 9eca6bc5c7e3506523376ad5a3b679ec677cd390..17cdf42c631d85a4db00bd174421217f05367064 100644 (file)
--- 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)