CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/06/06 07:57:06
Modified files:
scripts : lilypond-invoke-editor.scm
scm : editor.scm backend-library.scm
. : THANKS ChangeLog
Added files:
scripts : lilypond-ps2png.scm
scm : ps-to-png.scm
Removed files:
scripts : lilypond-ps2png.py
Log message:
(editor-command-template-alist): Add syn
editor (Jaap [de Vos]).
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-ps2png.scm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-invoke-editor.scm.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/ps-to-png.scm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/editor.scm.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/backend-library.scm.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.119&tr2=1.120&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3717&tr2=1.3718&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3717 lilypond/ChangeLog:1.3718
--- lilypond/ChangeLog:1.3717 Sat Jun 4 11:59:23 2005
+++ lilypond/ChangeLog Mon Jun 6 07:57:06 2005
@@ -1,3 +1,19 @@
+2005-06-06 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * scm/editor.scm (editor-command-template-alist): Add syn
+ editor (Jaap [de Vos]).
+
+2005-06-05 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * scripts/lilypond-ps2png.scm:
+ * scm/ps-to-png.scm: New file.
+
+ * scm/backend-library.scm (postscript->png): Use it.
+
+ * scripts/lilypond-ps-to-png.py: Remove file.
+
+ * python/lilylib.py (get_bbox, make_ps_images): Remove.
+
2005-06-03 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/auto-beam-engraver.cc (acknowledge_grob): remove dead code.
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.119 lilypond/THANKS:1.120
--- lilypond/THANKS:1.119 Fri Jun 3 19:23:22 2005
+++ lilypond/THANKS Mon Jun 6 07:57:06 2005
@@ -83,6 +83,7 @@
Richard Schoeller
Rob Platt
Roman Stöckl-Schmidt
+Russ Jorgensen
Stephen McCarthy
Sven Axelsson
Tapio Tuovila
Index: lilypond/scm/backend-library.scm
diff -u lilypond/scm/backend-library.scm:1.30
lilypond/scm/backend-library.scm:1.31
--- lilypond/scm/backend-library.scm:1.30 Fri Jun 3 19:23:23 2005
+++ lilypond/scm/backend-library.scm Mon Jun 6 07:57:06 2005
@@ -33,7 +33,7 @@
"\""))
(define-public (postscript->pdf papersizename name)
- (let* ((pdf-name (string-append (basename name ".ps") ".pdf" ))
+ (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
(cmd (format #f
"gs\
-dSAFER\
@@ -66,28 +66,17 @@
(ly:system cmd)
(if (running-from-gui?) (delete-file name))))
-(define-public (postscript->png resolution papersizename name)
- (let* ((prefix (ly:effective-prefix))
-
- ;; run the source, if we are in the build-directory
- (ps2png-source (if prefix
- (format "~a/scripts/lilypond-ps2png.py" prefix)
- "lilypond-ps2png"))
- (cmd (format #f
- "~a --resolution=~S --papersize=~a~a ~S"
- (if (file-exists? ps2png-source)
- (format "python ~a" ps2png-source)
- "lilypond-ps2png")
- resolution
- (sanitize-command-option papersizename)
- (if (ly:get-option 'verbose) " --verbose " "")
- name)))
+(use-modules (scm ps-to-png))
+(define-public (postscript->png resolution paper-size-name name)
;; Do not try to guess the name of the png file,
;; GS produces PNG files like BASE-page%d.png.
;;(ly:message (_ "Converting to `~a'...")
;; (string-append (basename name ".ps") "-page1.png" )))
+ (let ((paper-size (sanitize-command-option paper-size-name))
+ (verbose? (ly:get-option 'verbose))
+ (rename-page-1? #f))
(ly:message (_ "Converting to ~a...") "PNG")
- (ly:system cmd)
+ (make-ps-images name resolution paper-size rename-page-1? verbose?)
(ly:progress "\n")))
(define-public (postprocess-output paper-book module filename formats)
Index: lilypond/scm/editor.scm
diff -u lilypond/scm/editor.scm:1.10 lilypond/scm/editor.scm:1.11
--- lilypond/scm/editor.scm:1.10 Fri Jun 3 22:26:03 2005
+++ lilypond/scm/editor.scm Mon Jun 6 07:57:06 2005
@@ -36,6 +36,7 @@
("nedit" . "nc -noask +%(line)s %(file)s")
("gedit" . "gedit +%(line)s %(file)s")
("jedit" . "jedit -reuseview %(file)s +line:%(line)s")
+ ("syn" . "syn -line %(line)s -col %(column)s %(file)s")
("lilypad" . "lilypad +%(line)s:%(column)s %(file)s")))
(define (get-command-template alist editor)
Index: lilypond/scripts/lilypond-invoke-editor.scm
diff -u lilypond/scripts/lilypond-invoke-editor.scm:1.6
lilypond/scripts/lilypond-invoke-editor.scm:1.7
--- lilypond/scripts/lilypond-invoke-editor.scm:1.6 Mon May 23 19:18:58 2005
+++ lilypond/scripts/lilypond-invoke-editor.scm Mon Jun 6 07:57:06 2005
@@ -44,11 +44,11 @@
(define (show-help port)
(format port (_ "Usage: lilypond-invoke-editor [textedit://]FILE:LINE:COLUMN
-Visit a file and position the cursor
+Visit a file and position the cursor.
Options:
- -h,--help show this help
- -v,--version show version
+ -h, --help show this help
+ -v, --version show version
")))
(define (parse-options args)
@@ -66,9 +66,6 @@
(show-version (current-error-port))
files))
-;;(define (re-sub re sub string)
-;; (let ((sub-string (if (string? sub) sub (sub re))))
-;; (regexp-substitute/global #f re string 'pre sub-string 'post)))
(define (re-sub re sub string)
(regexp-substitute/global #f re string 'pre sub 'post))
@@ -120,7 +117,7 @@
(if (not (= (length files) 1))
(begin
(show-help (current-error-port))
- (exit 1)))
+ (exit 2)))
(set! %load-path (cons LILYPONDPREFIX %load-path))
(primitive-eval '(use-modules (scm editor)))
(let* ((uri (car files))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
