CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Mats Bengtsson <[EMAIL PROTECTED]>      05/08/11 11:17:00

Modified files:
        .              : ChangeLog 
        scm            : define-markup-commands.scm 

Log message:
        * 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!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3988&tr2=1.3989&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.109&tr2=1.110&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3988 lilypond/ChangeLog:1.3989
--- lilypond/ChangeLog:1.3988   Wed Aug 10 22:17:40 2005
+++ lilypond/ChangeLog  Thu Aug 11 11:17:00 2005
@@ -1,3 +1,8 @@
+2005-08-11  Mats Bengtsson  <[EMAIL PROTECTED]>
+
+       * scm/define-markup-commands.scm: Improved regexp to search for
+       EPS bounding boxes and corrected call to ly:warning.
+
 2005-08-10  Nicolas Sceaux  <[EMAIL PROTECTED]>
 
        * Documentation/user/programming-interface.itely (Displaying music
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.109 
lilypond/scm/define-markup-commands.scm:1.110
--- lilypond/scm/define-markup-commands.scm:1.109       Wed Aug 10 08:15:40 2005
+++ lilypond/scm/define-markup-commands.scm     Thu Aug 11 11:17:00 2005
@@ -174,7 +174,7 @@
   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 @@
            (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)
                  '()))))
        


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to