* lily/slur.cc (outside_slur_callback): only calculate offsets if

consider[k] is true.

* scm/output-ps.scm (grob-cause): put numbers to ~$ (Thanks Johannes!)

diff --git a/ChangeLog b/ChangeLog
index b3456ddd33426e1dfebcec1e69ae98153f92911f..979ac56f14826d2689220013c336df3ba09fa9df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-03-07    <hanwen@xs4all.nl>
+2006-03-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/slur.cc (outside_slur_callback): only calculate offsets if
+       consider[k] is true.
+
+       * scm/output-ps.scm (grob-cause): put numbers to ~$ (Thanks Johannes!)
 
        * lily/spacing-basic.cc (standard_breakable_column_spacing): also
        consider columns that have originals.  Unifies spacing for mm

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index a022660b647a8c7fe62ba23317bf87d1e852e56c..8b6cd4b414bcfa955430dfac4874bf53dd203c5b 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -153,13 +153,13 @@ Slur_engraver::acknowledge_tuplet_number (Grob_info info)
 void
 Slur_engraver::acknowledge_script (Grob_info info)
 {
-  acknowledge_extra_object (info);
+  if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+    acknowledge_extra_object (info);
 }
 
 void
 Slur_engraver::acknowledge_text_script (Grob_info info)
 {
-  //  if (!info.grob ()->internal_has_interface (ly_symbol2scm ("DynamicText")))
   acknowledge_extra_object (info);
 }
 

diff --git a/lily/slur.cc b/lily/slur.cc
index 94e13fe027a1b0ac450162e8942187924fb5b615..e482763a5bff05dd9fb2ba3e7248955e248cce99 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -210,7 +210,6 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
            : ((fabs (bezext[RIGHT] - x) < EPS)
               ? curve.control_[3][Y_AXIS]
               : curve.get_other_coordinate (X_AXIS, x));
-         consider[k] = true;
 
          /* Request shift if slur is contained script's Y, or if
             script is inside slur and avoid == outside.  */
@@ -221,13 +220,11 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
     }
 
   Real avoidance_offset = 0.0;
-  if (do_shift)
-    {
-      for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
-       avoidance_offset = dir * (max (dir * avoidance_offset,
-                            dir * (ys[k] - yext[-dir] + dir * slur_padding)));
-    }
-
+  for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
+    if (consider[k]) 
+      avoidance_offset = dir * (max (dir * avoidance_offset,
+                                    dir * (ys[k] - yext[-dir] + dir * slur_padding)));
+  
   return scm_from_double (scm_to_double (offset_scm) + avoidance_offset);
 }
 

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 6b7a86bfbb701b37433eb63d5a5e1f12705cf209..4898de5d96ae4e8f38459eff186362287a446662 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -175,10 +175,10 @@
          (if (and (< 0 (interval-length x-ext))
                   (< 0 (interval-length y-ext)))
              (format "~$ ~$ ~$ ~$ (textedit://~a:~a:~a:~a) mark_URI\n"
-                     (ly:number->string (+ (car offset) (car x-ext)))
-                     (ly:number->string (+ (cdr offset) (car y-ext)))
-                     (ly:number->string (+ (car offset) (cdr x-ext)))
-                     (ly:number->string (+ (cdr offset) (cdr y-ext)))
+                     (+ (car offset) (car x-ext))
+                     (+ (cdr offset) (car y-ext))
+                     (+ (car offset) (cdr x-ext))
+                     (+ (cdr offset) (cdr y-ext))
 
                      ;; TODO
                      ;;full escaping.