From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 19 Sep 2006 22:40:47 +0000 (+0000)
Subject: (default-script-alist): avoid-slur and
X-Git-Tag: release/2.10.0-2~300
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=485ca7ff67f1ecc5e3727794a428dba644556917;p=lilypond.git

(default-script-alist): avoid-slur and
slur-padding for portato script.
---

diff --git a/ChangeLog b/ChangeLog
index dfc56230c3..18678e2a5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* scm/script.scm (default-script-alist): avoid-slur and
+	slur-padding for portato script.
+
 	* lily/stem-tremolo.cc (translated_stencil): new function. 
 	(height): use new function. Fixes tremolos on whole notes.
 
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index cb3a007d53..f16bf4542a 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -38,14 +38,12 @@ struct Script_tuple
 class Script_engraver : public Engraver
 {
   vector<Script_tuple> scripts_;
-  Spanner *slur_;
 
 protected:
   void stop_translation_timestep ();
   void process_music ();
 
   DECLARE_TRANSLATOR_LISTENER (articulation);
-  DECLARE_ACKNOWLEDGER (slur);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   DECLARE_ACKNOWLEDGER (stem);
   DECLARE_ACKNOWLEDGER (stem_tremolo);
@@ -57,7 +55,6 @@ public:
 
 Script_engraver::Script_engraver ()
 {
-  slur_ = 0;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Script_engraver, articulation);
@@ -234,19 +231,12 @@ Script_engraver::acknowledge_note_column (Grob_info info)
     }
 }
 
-void
-Script_engraver::acknowledge_slur (Grob_info info)
-{
-  slur_ = info.spanner ();
-}
-
 void
 Script_engraver::stop_translation_timestep ()
 {
   scripts_.clear ();
 }
 
-ADD_ACKNOWLEDGER (Script_engraver, slur);
 ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Script_engraver, stem);
 ADD_ACKNOWLEDGER (Script_engraver, note_column);
diff --git a/scm/script.scm b/scm/script.scm
index a83d0a5067..5b24e0455e 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -36,8 +36,9 @@
 	 
 	 ("portato" .
 	  ((script-stencil . (feta . ("uportato" . "dportato")))
+	   (avoid-slur . around)
+	   (slur-padding . 0.3)
 	   (padding . 0.45)
-	   (padding . 0.20)	   
 	   (side-relative-direction . -1)))
 
 	 ("accentus" .