From 089079b71577d7e435c70f9cfa8f1833169872b7 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 28 May 2006 22:13:20 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ lily/grob.cc | 7 +++---- scm/framework-ps.scm | 3 +++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf7d1f3394..b2820535f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-05-29 Han-Wen Nienhuys + + * 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 * buildscripts/output-distance.py (main): new function. diff --git a/lily/grob.cc b/lily/grob.cc index d66bc37208..15eb1f9212 100644 --- 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 23b8d04ac8..3a95c5166d 100644 --- 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)) -- 2.39.2