From 3523e58dc88460bffd160af7d73c5afe9d6eae96 Mon Sep 17 00:00:00 2001 From: matsb Date: Thu, 11 Aug 2005 11:17:00 +0000 Subject: [PATCH] * scm/define-markup-commands.scm: Improved regexp to search for EPS bounding boxes and corrected call to ly:warning. Note that serious problems with the \epsfile command remain! --- ChangeLog | 5 +++++ scm/define-markup-commands.scm | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbb02816f3..04f522432e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-11 Mats Bengtsson + + * scm/define-markup-commands.scm: Improved regexp to search for + EPS bounding boxes and corrected call to ly:warning. + 2005-08-10 Nicolas Sceaux * Documentation/user/programming-interface.itely (Displaying music diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 5b8fb0b348..88a2a6db8b 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -174,7 +174,7 @@ normally inserted before elements on a line. stil) (define bbox-regexp - (make-regexp "%%BoundingBox: ([0-9-]+) ([0-9-]+) ([0-9-]+) ([0-9-]+)")) + (make-regexp "%%BoundingBox:[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)")) (define (get-postscript-bbox string) "Extract the bbox from STRING, or return #f if not present." @@ -201,7 +201,7 @@ one staff-space." (if bbox (map (lambda (x) (/ x 10)) bbox) (begin - (ly:warn (_ "can't find bounding box of `~a'") + (ly:warning (_ "can't find bounding box of `~a'") file-name) '())))) -- 2.39.5