From: hanwen Date: Mon, 1 May 2006 19:33:29 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.8.2~9^2~41 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ee72080f3016a12cdadc7b741983806944c3b4ad;p=lilypond.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 6b314d91a0..2792696198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ 2006-05-01 Han-Wen Nienhuys + * scripts/GNUmakefile (SEXECUTABLES): remove lilypond-ps2png.scm + * buildscripts/lilypond-words.py (F): indent fix. * input/regression/tie-arpeggio-collision.ly: new file. diff --git a/scripts/lilypond-ps2png.scm b/scripts/lilypond-ps2png.scm deleted file mode 100644 index 6fce50ba66..0000000000 --- a/scripts/lilypond-ps2png.scm +++ /dev/null @@ -1,104 +0,0 @@ -#!@GUILE@ \ --e main -s -!# -;;;; lilypond-ps2png.scm -- Convert PostScript file to PNG images using GS -;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 2005--2006 Jan Nieuwenhuizen - -(use-modules - (ice-9 getopt-long) - (ice-9 regex) - (srfi srfi-13)) - -(define PROGRAM-NAME "lilypond-ps2png") -(define TOPLEVEL-VERSION "@TOPLEVEL_VERSION@") -(define DATADIR "@datadir@") -(define COMPILE-TIME-PREFIX - (format #f "~a/lilypond/~a" DATADIR TOPLEVEL-VERSION)) - -(define paper-size "a4") -(define resolution 90) -(define verbose? #f) -(define rename-page-1 #f) - -;; argv0 relocation -- do in wrapper? -(define LILYPONDPREFIX - (or (getenv "LILYPONDPREFIX") - (let* ((bindir (dirname (car (command-line)))) - (prefix (dirname bindir)) - (lilypond-prefix - (if (eq? prefix (dirname DATADIR)) COMPILE-TIME-PREFIX - (format #f "~a/share/lilypond/~a" - prefix TOPLEVEL-VERSION)))) - lilypond-prefix))) - -;; gettext wrapper for guile < 1.7.2 -(if (defined? 'gettext) - (define-public _ gettext) - (define-public (_ x) x)) - -(define (show-version port) - (format port "~a (GNU LilyPond) ~a \n" PROGRAM-NAME TOPLEVEL-VERSION)) - -(define (show-help port) - (format port (_ "Usage: lilypond-ps2png FILE - -Convert PostScript file to PNG images. - -Options: - -h, --help show this help - -P, --paper-size=PAPER use paper size PAPER - -R, --resolution=RES use resolution RES - -V, --verbose be verbose - -v, --version show version -"))) - -(define (parse-options args) - (let* ((options (getopt-long args - '((help (single-char #\h)) - (verbose (single-char #\V)) - (version (single-char #\v)) - (paper-size (single-char #\P) (value #t)) - ;; compatibility - (papersize (value #t)) - (resolution (single-char #\R) (value #t))))) - (files (cdr (assq '() options)))) - (if (assq 'help options) - (begin - (show-version (current-output-port)) - (show-help (current-output-port)) - (exit 0))) - (if (assq 'version options) - (begin (show-version (current-output-port)) (exit 0))) - (if (assq 'verbose options) - (begin - (set! verbose? #t) - (debug-enable 'debug) - (debug-enable 'backtrace))) - - (let ((o (or (assq-ref 'paper-size options) - (assq-ref 'papersize options)))) - (if o (set! paper-size o))) - (let ((o (assq-ref 'resolution options))) - (if o (set! resolution o))) - (show-version (current-error-port)) - files)) - -(define (main args) - (let ((files (parse-options args))) - (if (= (length files) 0) - (begin - (show-help (current-error-port)) - (exit 2))) - (set! %load-path (cons LILYPONDPREFIX %load-path)) - (primitive-eval '(use-modules (scm ps-to-png))) - (for-each - (lambda - (x) - (let ((png-files - (make-ps-images x resolution paper-size rename-page-1 verbose?))) - (format (current-error-port) (_ "Wrote `~a'") (string-join png-files)) - (newline (current-error-port)))) - files)))