CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/06/07 07:45:33
Modified files:
scm : ps-to-png.scm framework-ps.scm
lily : main.cc
flower : file-path.cc
. : ChangeLog
Log message:
(make-ps-images): Bugfix: `Pages: 1\n' is not
multi-page. Fix .eps regular expression.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/ps-to-png.scm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.257&tr2=1.258&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/file-path.cc.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3730&tr2=1.3731&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3730 lilypond/ChangeLog:1.3731
--- lilypond/ChangeLog:1.3730 Tue Jun 7 05:29:30 2005
+++ lilypond/ChangeLog Tue Jun 7 07:45:32 2005
@@ -1,3 +1,8 @@
+2005-06-07 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * scm/ps-to-png.scm (make-ps-images): Bugfix: `Pages: 1\n' is not
+ multi-page. Fix .eps regular expression.
+
2005-06-07 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/putting.itely: add info on modifying templates.
@@ -11,6 +16,12 @@
2005-06-07 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * lily/main.cc (prepend_env_path): Do not append /, that does not
+ work. Localedir lives in datadir, not in prefix.
+
+ * scm/framework-ps.scm (write-preamble): Remove load-font-via-GS
+ hack for windows.
+
* flower/include/file-cookie.hh: Compile fix.
2005-06-06 Han-Wen Nienhuys <[EMAIL PROTECTED]>
Index: lilypond/flower/file-path.cc
diff -u lilypond/flower/file-path.cc:1.36 lilypond/flower/file-path.cc:1.37
--- lilypond/flower/file-path.cc:1.36 Fri Jun 3 12:52:32 2005
+++ lilypond/flower/file-path.cc Tue Jun 7 07:45:32 2005
@@ -68,13 +68,11 @@
return !S_ISDIR (sbuf.st_mode);
#endif
-
if (FILE *f = fopen (file_name.to_str0 (), "r"))
{
fclose (f);
return true;
}
-
return false;
}
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.257 lilypond/lily/main.cc:1.258
--- lilypond/lily/main.cc:1.257 Fri Jun 3 12:52:31 2005
+++ lilypond/lily/main.cc Tue Jun 7 07:45:32 2005
@@ -284,7 +284,7 @@
{
if (char const* cur = getenv (key))
value += to_string (PATHSEP) + cur;
- if (is_dir (value + "/"))
+ if (is_dir (value))
return sane_putenv (key, value.to_str0 ());
else if (be_verbose_global)
warning (_f ("no such directory: %s", value));
@@ -324,7 +324,7 @@
prefix_directory));
String datadir = argv0_prefix + "/share";
String libdir = argv0_prefix + "/lib";
- String localedir = argv0_prefix + "/locale";
+ String localedir = datadir + "/locale";
String sysconfdir = argv0_prefix + "/etc";
String argv0_lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION;
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.111 lilypond/scm/framework-ps.scm:1.112
--- lilypond/scm/framework-ps.scm:1.111 Tue May 31 13:51:42 2005
+++ lilypond/scm/framework-ps.scm Tue Jun 7 07:45:31 2005
@@ -318,9 +318,7 @@
(lambda (x y) (string<? (cadr x) (cadr y))))))
;; ttftool/fopencookie is broken on Windows,
;; possibly a stack corruption bug.
- (pfas (map (if
- (eq? PLATFORM 'windows) load-font-via-GS load-font)
- font-names)))
+ (pfas (map load-font font-names)))
pfas))
(if load-fonts?
Index: lilypond/scm/ps-to-png.scm
diff -u lilypond/scm/ps-to-png.scm:1.2 lilypond/scm/ps-to-png.scm:1.3
--- lilypond/scm/ps-to-png.scm:1.2 Mon Jun 6 19:25:58 2005
+++ lilypond/scm/ps-to-png.scm Tue Jun 7 07:45:31 2005
@@ -20,10 +20,8 @@
(define (re-sub re sub string)
(regexp-substitute/global #f re string 'pre sub 'post))
-(define (gulp-port port how-much)
- (let*
- ((str (make-string how-much)))
-
+(define (gulp-port port max-length)
+ (let ((str (make-string max-length)))
(read-string!/partial str port)
str))
@@ -66,12 +64,13 @@
(paper-size "a4")
(rename-page-1? #f)
(verbose? #f))
- (let* ((base (basename (re-sub "\.e?ps" "" ps-name)))
+ (let* ((base (basename (re-sub "[.]e?ps" "" ps-name)))
(header (gulp-port (open-file ps-name "r") 10240))
(png1 (string-append base ".png"))
(pngn (string-append base "-page%d.png"))
(pngn-re (re-sub "%d" "[0-9]*" pngn))
- (multi-page? (string-match "\n%%Pages: " header))
+ (multi-page? (and (string-match "\n%%Pages: " header)
+ (not (string-match "\n%%Pages: 1\n" header))))
(output-file (if multi-page? pngn png1))
;;png16m is because Lily produces color nowadays.
(cmd (format #f (if multi-page?
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
