* 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!

diff --git a/ChangeLog b/ChangeLog
index cbb02816f363128a71865edec2db47da1e57bc29..04f522432ecc4bd5bb5e30db697214ad404115e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-11  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * scm/define-markup-commands.scm: Improved regexp to search for
+       EPS bounding boxes and corrected call to ly:warning.
+
 2005-08-10  Nicolas Sceaux  <nicolas.sceaux@free.fr>
 
        * Documentation/user/programming-interface.itely (Displaying music

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 5b8fb0b34807b1b77ff07ab74d56ac0358206d8b..88a2a6db8b396633aedf2fc1255f8e76f5898226 100644 (file)
--- 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)
                  '()))))