* scm/framework-ps.scm (write-preamble): redefine mark_URI to nop

for -dno-point-and-click

* lily/grob.cc (get_print_stencil): don't read
point_and_click_global to determine whether to set grob-cause.

diff --git a/ChangeLog b/ChangeLog
index cf7d1f3394386d46b13c844c66578c4cf8e8a9f9..b2820535f244eac0ed933467ad8026799d78d18c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-29  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * scm/framework-ps.scm (write-preamble): redefine mark_URI to nop
+       for -dno-point-and-click
+
+       * lily/grob.cc (get_print_stencil): don't read
+       point_and_click_global to determine whether to set grob-cause.
+
 2006-05-28  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * buildscripts/output-distance.py (main): new function.

diff --git a/lily/grob.cc b/lily/grob.cc
index d66bc37208d9fd59f04372c55790262e78319230..15eb1f9212b80da980ffbdcd8707e09de6a789e1 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -114,14 +114,13 @@ Grob::get_print_stencil () const
       else
        {
          SCM expr = m->expr ();
-         if (point_and_click_global)
-           expr = scm_list_3 (ly_symbol2scm ("grob-cause"),
-                              self_scm (), expr);
+         expr = scm_list_3 (ly_symbol2scm ("grob-cause"),
+                            self_scm (), expr);
 
          retval = Stencil (m->extent_box (), expr);
        }
       SCM rot = get_property ("rotation");
-      if (rot != SCM_EOL)
+      if (scm_is_pair (rot))
        {
          Real angle = scm_to_double (scm_car (rot));
          Real x = scm_to_double (scm_cadr (rot));

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 23b8d04ac8d76c7d7268cf65d21e61905a64d881..3a95c5166dea6f9c2fd19dd857d1e667bbb02154 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -430,6 +430,9 @@
   (display (procset "music-drawing-routines.ps") port)
   (display (procset "lilyponddefs.ps") port)
 
+  (if (not (ly:get-option 'point-and-click))
+      (display "/mark_URI { pop pop pop pop pop } bind def\n" port)) 
+
   (display "%%EndProlog\n" port)
   
   (display "%%BeginSetup\ninit-lilypond-parameters\n%%EndSetup\n\n" port))