CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch: lilypond_2_6
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/04 20:29:41
Modified files:
scm : framework-ps.scm
lily : main.cc
. : ChangeLog
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?only_with_tag=lilypond_2_6&tr1=1.125&tr2=1.125.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?only_with_tag=lilypond_2_6&tr1=1.264.2.1&tr2=1.264.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?only_with_tag=lilypond_2_6&tr1=1.3836.2.18&tr2=1.3836.2.19&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3836.2.18 lilypond/ChangeLog:1.3836.2.19
--- lilypond/ChangeLog:1.3836.2.18 Thu Aug 4 15:57:47 2005
+++ lilypond/ChangeLog Thu Aug 4 20:29:41 2005
@@ -1,3 +1,9 @@
+2005-07-25 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * lily/main.cc (sane_setenv)[!ARGV0_RELOCATION]: Also define.
+ (setup_guile_env): Use it instead of nonstandard setenv. Fixes
+ mingw build. Backport.
+
2005-08-04 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/beam.cc (shift_region_to_valid): prevent division by
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.264.2.1 lilypond/lily/main.cc:1.264.2.2
--- lilypond/lily/main.cc:1.264.2.1 Thu Jul 28 12:07:31 2005
+++ lilypond/lily/main.cc Thu Aug 4 20:29:40 2005
@@ -259,7 +259,6 @@
printf (_ (WARRANTY).to_str0 ());
}
-#if ARGV0_RELOCATION
static int
sane_putenv (char const* key, String value, bool overwrite = true)
{
@@ -272,6 +271,7 @@
return -1;
}
+#if ARGV0_RELOCATION
static int
set_env_file (char const* key, String value)
{
@@ -737,16 +737,16 @@
overwrite = false;
}
- setenv ("GUILE_MIN_YIELD_1", yield, overwrite);
- setenv ("GUILE_MIN_YIELD_2", yield, overwrite);
- setenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite);
+ sane_putenv ("GUILE_MIN_YIELD_1", yield, overwrite);
+ sane_putenv ("GUILE_MIN_YIELD_2", yield, overwrite);
+ sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite);
char *mb16 = "16777216";
char *mb1 = "1048576";
- setenv ("SCM_DEFAULT_INIT_HEAP_SIZE_1", mb16, 0);
- setenv ("SCM_DEFAULT_INIT_HEAP_SIZE_2", mb1, 0);
+ sane_putenv ("SCM_DEFAULT_INIT_HEAP_SIZE_1", mb16, 0);
+ sane_putenv ("SCM_DEFAULT_INIT_HEAP_SIZE_2", mb1, 0);
}
int
Index: lilypond/scm/framework-ps.scm
diff -u /dev/null lilypond/scm/framework-ps.scm:1.125.2.1
--- /dev/null Thu Aug 4 20:29:41 2005
+++ lilypond/scm/framework-ps.scm Thu Aug 4 20:29:40 2005
@@ -0,0 +1,570 @@
+;;
+;; framework-ps.scm -- structure for PostScript output
+;;
+;; source file of the GNU LilyPond music typesetter
+;;
+;; (c) 2004--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+(define-module (scm framework-ps))
+
+;;; this is still too big a mess.
+
+(use-modules (ice-9 regex)
+ (ice-9 string-fun)
+ (ice-9 format)
+ (guile)
+ (srfi srfi-1)
+ (srfi srfi-13)
+ (lily))
+
+
+(define framework-ps-module (current-module))
+
+;;(define pdebug stderr)
+(define (pdebug . rest) #f)
+
+(define mm-to-bigpoint
+ (/ 72 25.4))
+
+(define-public (ps-font-command font)
+ (let* ((name (munge-lily-font-name (ly:font-file-name font)))
+ (magnify (ly:font-magnification font)))
+
+ (string-append
+ "magfont"
+ (string-regexp-substitute "[ /%]" "_" name)
+ "m" (string-encode-integer (inexact->exact (round (* 1000 magnify)))))))
+
+(define (tex-font? fontname)
+ (or
+ (equal? (substring fontname 0 2) "cm")
+ (equal? (substring fontname 0 2) "ec")))
+
+(define (define-fonts paper)
+ (define font-list (ly:paper-fonts paper))
+ (define (define-font command fontname scaling)
+ (string-append
+ "/" command " { /" fontname " findfont "
+ (ly:number->string scaling) " output-scale div scalefont } bind def\n"))
+
+ (define (standard-tex-font? x)
+ (or (equal? (substring x 0 2) "ms")
+ (equal? (substring x 0 2) "cm")))
+
+ (define (font-load-command font)
+ (let* ((specced-font-name (ly:font-name font))
+ (fontname (if specced-font-name
+ (munge-lily-font-name specced-font-name)
+ (ly:font-file-name font)))
+ (command (ps-font-command font))
+
+ ;; FIXME -- see (ps-font-command )
+ (plain (ps-font-command font))
+ (designsize (ly:font-design-size font))
+ (magnification (* (ly:font-magnification font)))
+ (ops (ly:output-def-lookup paper 'outputscale))
+ (scaling (* ops magnification designsize)))
+
+ ;; Bluesky pfbs have UPCASE names (sigh.)
+ ;; FIXME - don't support Bluesky?
+ (if (standard-tex-font? fontname)
+ (set! fontname (string-upcase fontname)))
+ (if (equal? fontname "unknown")
+ (display (list font fontname)))
+ (define-font plain fontname scaling)))
+
+ (apply string-append
+ (map (lambda (x) (font-load-command x))
+ (filter (lambda (x) (not (ly:pango-font? x)))
+ font-list))))
+
+;; FIXME: duplicated in other output backends
+;; FIXME: silly interface name
+(define (output-variables layout)
+ ;; FIXME: duplicates output-layout's scope-entry->string, mostly
+ (define (value->string val)
+ (cond
+ ((string? val) (string-append "(" val ")"))
+ ((symbol? val) (symbol->string val))
+ ((number? val) (number->string val))
+ (else "")))
+
+ (define (output-entry ps-key ly-key)
+ (string-append
+ "/" ps-key " "
+ (value->string (ly:output-def-lookup layout ly-key)) " def\n"))
+
+ (string-append
+ "/lily-output-units "
+ (number->string mm-to-bigpoint)
+ " def %% millimeter\n"
+ (output-entry "staff-line-thickness" 'linethickness)
+ (output-entry "line-width" 'linewidth)
+ (output-entry "paper-size" 'papersizename)
+ (output-entry "staff-height" 'staffheight) ;junkme.
+ "/output-scale "
+ (number->string (ly:output-def-lookup layout 'outputscale))
+ " def\n"
+ (output-entry "page-height" 'vsize)
+ (output-entry "page-width" 'hsize)))
+
+(define (dump-page outputter page page-number page-count landscape?)
+ (ly:outputter-dump-string
+ outputter
+ (string-append
+ "%%Page: "
+ (number->string page-number) " " (number->string page-count) "\n"
+
+ "%%BeginPageSetup\n"
+ (if landscape?
+ "page-width output-scale lily-output-units mul mul 0 translate 90
rotate\n"
+ "")
+ "%%EndPageSetup\n"
+
+ "start-page { "
+ "set-ps-scale-to-lily-scale "
+ "\n"))
+ (ly:outputter-dump-stencil outputter page)
+ (ly:outputter-dump-string outputter "} stop-system \nshowpage\n"))
+
+(define (supplies-or-needs paper load-fonts?)
+ (define (extract-names font)
+ (if (ly:pango-font? font)
+ (map car (ly:pango-font-physical-fonts font))
+ (list (munge-lily-font-name (ly:font-name font)))))
+
+ (let* ((fonts (ly:paper-fonts paper))
+ (names (apply append (map extract-names fonts))))
+
+ (apply string-append
+ (map (lambda (f)
+ (format
+ (if load-fonts?
+ "%%DocumentSuppliedResources: font ~a\n"
+ "%%DocumentNeededResources: font ~a\n")
+ f))
+ (uniq-list (sort names string<?))))))
+
+(define (eps-header paper bbox load-fonts?)
+ (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
+ "%%Creator: LilyPond\n"
+ "%%BoundingBox: "
+ (string-join (map ly:number->string bbox) " ") "\n"
+ "%%Orientation: "
+ (if (eq? (ly:output-def-lookup paper 'landscape) #t)
+ "Landscape\n"
+ "Portrait\n")
+ (supplies-or-needs paper load-fonts?)
+ "%%EndComments\n"))
+
+(define (page-header paper page-count load-fonts?)
+ (string-append "%!PS-Adobe-3.0\n"
+ "%%Creator: LilyPond\n"
+ "%%Pages: " (number->string page-count) "\n"
+ "%%PageOrder: Ascend\n"
+ "%%Orientation: "
+ (if (eq? (ly:output-def-lookup paper 'landscape) #t)
+ "Landscape\n"
+ "Portrait\n")
+ "%%DocumentPaperSizes: "
+ (ly:output-def-lookup paper 'papersizename) "\n"
+ (supplies-or-needs paper load-fonts?)
+ "%%EndComments\n"))
+
+(define (procset file-name)
+ (string-append
+ (format
+ "%%BeginResource: procset (~a) 1 0
+~a
+%%EndResource
+"
+ file-name (cached-file-contents file-name))))
+
+(define (setup paper)
+ (string-append
+ "\n"
+ "%%BeginSetup\n"
+ (define-fonts paper)
+ (output-variables paper)
+ "%%EndSetup\n"))
+
+(define-public (munge-lily-font-name name)
+ (regexp-substitute/global #f "([eE]mmentaler|[aA]ybabtu)"
+ name 'pre "PFA" 1 'post))
+
+(define (cff-font? font)
+ (let*
+ ((cff-string (ly:otf-font-table-data font "CFF ")))
+ (> (string-length cff-string) 0)))
+
+(define-public (ps-embed-cff body font-set-name version)
+ (let* ((binary-data
+ (string-append
+ (format "/~a ~s StartData " font-set-name (string-length body))
+ body))
+
+ (header
+ (format
+ "%%BeginResource: font ~a
+%!PS-Adobe-3.0 Resource-FontSet
+%%DocumentNeededResources: ProcSet (FontSetInit)
+%%Title: (FontSet/~a)
+%%Version: ~s
+%%EndComments
+%%IncludeResource: ProcSet (FontSetInit)
+%%BeginResource: FontSet (~a)
+/FontSetInit /ProcSet findresource begin
+%%BeginData: ~s Binary Bytes
+"
+ font-set-name font-set-name version font-set-name
+ (string-length binary-data)))
+ (footer "\n%%EndData
+%%EndResource
+%%EOF
+%%EndResource\n"))
+
+ (string-append
+ header
+ binary-data
+ footer)))
+
+
+(define (write-preamble paper load-fonts? port)
+
+ (define (load-font-via-GS font-name-filename)
+ (define (ps-load-file name)
+ (format
+ (if (string? name)
+ "(~a) (r) file .loadfont\n"
+ "% fontfile ~a could not be found\n")
+ name))
+
+ (let* ((font (car font-name-filename))
+ (name (cadr font-name-filename))
+ (file-name (caddr font-name-filename))
+ (bare-file-name (ly:find-file file-name)))
+
+ (cons
+ (munge-lily-font-name name)
+ (cond
+ ((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
+ (ps-load-file (ly:find-file
+ (format "~a.pfa" (munge-lily-font-name file-name)))))
+ ((string? bare-file-name)
+ (ps-load-file (munge-lily-font-name file-name)))
+ (else
+ (ly:warning (_ "don't know how to embed ~S=~S") name file-name)
+ "")))))
+
+ ;; ugh. posix /windows/mingw?
+ (define (path-join a b)
+ (if (equal? a "")
+ b
+ (string-append a "/" b)))
+
+ (define (dir-listing dir-name)
+ (define (dir-helper dir lst)
+ (let ((e (readdir dir)))
+ (if (eof-object? e) lst (dir-helper dir (cons e lst)))))
+ (reverse (dir-helper (opendir dir-name) '())))
+
+ (define (handle-mac-font name filename)
+ (let*
+ ((dir-name (tmpnam))
+ (files '())
+ (status 0)
+ (embed #f))
+
+
+ (mkdir dir-name #o700)
+
+ (set! status (ly:system
+ (format "cd ~a && fondu -force '~a'" dir-name filename)))
+
+ (set! files (dir-listing dir-name))
+
+ (for-each
+ (lambda (f)
+ (if (and (not embed)
+ (string-match (string-append name "\\.") f))
+ (set! embed
+ (font-file-as-ps-string name (path-join dir-name f))))
+
+ (if (or (equal? "." f)
+ (equal? ".." f))
+ #t
+ (delete-file (path-join dir-name f))))
+ files)
+ (rmdir dir-name)
+
+ (if (not embed)
+ (begin
+ (set! embed "% failed \n")
+ (ly:warning (_ "Couldn't extract file matching ~a from ~a") name
filename)))
+ embed))
+
+ (define (font-file-as-ps-string name file-name)
+ (let*
+ ((downcase-file-name (string-downcase file-name)))
+
+ (cond
+ ((and file-name (string-match "\\.pfa" downcase-file-name))
+ (cached-file-contents file-name))
+ ((and file-name (string-match "\\.pfb" downcase-file-name))
+ (ly:pfb->pfa file-name))
+ ((and file-name (string-match "\\.ttf" downcase-file-name))
+ (ly:ttf->pfa file-name))
+ ((and file-name (string-match "\\.otf" downcase-file-name))
+ (ps-embed-cff (ly:otf->cff file-name) name 0))
+ (else
+ (ly:warning (_ "don't know how to embed ~S=~S") name file-name)
+ "")
+ )))
+
+ (define (load-font font-name-filename)
+ (let* ((font (car font-name-filename))
+ (name (cadr font-name-filename))
+ (file-name (caddr font-name-filename))
+ (bare-file-name (ly:find-file file-name)))
+
+ (cons
+ (munge-lily-font-name name)
+ (cond
+ ((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
+ (cached-file-contents
+ (format "~a.pfa" (munge-lily-font-name file-name))))
+ ((and
+ (eq? PLATFORM 'darwin)
+ bare-file-name (string-match "\\.dfont" bare-file-name))
+ (handle-mac-font name bare-file-name))
+
+ ((and
+ (eq? PLATFORM 'darwin)
+ bare-file-name (= (stat:size (stat bare-file-name)) 0))
+ (handle-mac-font name bare-file-name))
+
+ ((and font (cff-font? font))
+ (ps-embed-cff (ly:otf-font-table-data font "CFF ")
+ name
+ 0))
+
+ (bare-file-name (font-file-as-ps-string name bare-file-name))
+ (else
+ (ly:warning (_ "don't know how to embed font ~s ~s ~s")
+ name file-name font))))))
+
+
+ (define (load-fonts paper)
+ (let* ((fonts (ly:paper-fonts paper))
+ (all-font-names
+ (map
+ (lambda (font)
+ (cond
+ ((string? (ly:font-file-name font))
+ (list (list
+ font
+ (ly:font-name font)
+ (ly:font-file-name font))))
+ ((ly:pango-font? font)
+ (map
+ (lambda (name-psname-pair)
+ (list #f
+ (car name-psname-pair)
+ (cdr name-psname-pair)))
+ (ly:pango-font-physical-fonts font)))
+
+ (else
+ (ly:font-sub-fonts font))))
+
+ fonts))
+ (font-names
+ (uniq-list
+ (sort (apply append all-font-names)
+ (lambda (x y) (string<? (cadr x) (cadr y))))))
+
+
+ (font-loader (if (ly:get-option 'gs-font-load)
+ load-font-via-GS
+ load-font))
+
+ (pfas (map font-loader font-names)))
+ pfas))
+
+ (if load-fonts?
+ (for-each
+ (lambda (f)
+ (format port "\n%%BeginFont: ~a\n" (car f))
+ (display (cdr f) port)
+ (display "\n%%EndFont\n" port))
+ (load-fonts paper)))
+
+ (display (setup paper) port)
+
+ ;; adobe note 5002: should initialize variables before loading routines.
+ (display (procset "music-drawing-routines.ps") port)
+ (display (procset "lilyponddefs.ps") port)
+ (display "init-lilypond-parameters\n" port))
+
+(define-public (output-framework basename book scopes fields)
+ (let* ((filename (format "~a.ps" basename))
+ (outputter (ly:make-paper-outputter filename "ps"))
+ (paper (ly:paper-book-paper book))
+ (pages (ly:paper-book-pages book))
+ (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
+ (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
+ (page-count (length pages))
+ (port (ly:outputter-port outputter)))
+
+ (output-scopes scopes fields basename)
+ (display (page-header paper page-count #t) port)
+ (write-preamble paper #t port)
+
+ (for-each
+ (lambda (page)
+ (set! page-number (1+ page-number))
+ (dump-page outputter page page-number page-count landscape?))
+ pages)
+
+ (display "%%Trailer\n%%EOF\n" port)
+ (ly:outputter-close outputter)
+ (postprocess-output book framework-ps-module filename
+ (ly:output-formats))))
+
+(if (not (defined? 'nan?))
+ (define (nan? x) #f))
+
+(if (not (defined? 'inf?))
+ (define (inf? x) #f))
+
+(define-public (dump-stencil-as-EPS paper dump-me filename load-fonts?)
+ (define (mm-to-bp-box mmbox)
+ (let* ((scale (ly:output-def-lookup paper 'outputscale))
+ (box (map
+ (lambda (x)
+ (inexact->exact
+ (round (* x scale mm-to-bigpoint)))) mmbox)))
+
+ (list (car box) (cadr box)
+ (max (1+ (car box)) (caddr box))
+ (max (1+ (cadr box)) (cadddr box)))))
+
+ (let* ((outputter (ly:make-paper-outputter (format "~a.eps" filename) "ps"))
+ (port (ly:outputter-port outputter))
+ (xext (ly:stencil-extent dump-me X))
+ (yext (ly:stencil-extent dump-me Y))
+ (bbox
+ (map
+ (lambda (x)
+ (if (or (nan? x) (inf? x)
+ ;; FIXME: huh?
+ (equal? (format #f "~S" x) "+#.#")
+ (equal? (format #f "~S" x) "-#.#"))
+ 0.0 x))
+ (list (car xext) (car yext) (cdr xext) (cdr yext))))
+ (rounded-bbox (mm-to-bp-box bbox))
+ (port (ly:outputter-port outputter))
+ (header (eps-header paper rounded-bbox load-fonts?)))
+
+ (display header port)
+ (write-preamble paper load-fonts? port)
+ (display "start-system { set-ps-scale-to-lily-scale \n" port)
+ (ly:outputter-dump-stencil outputter dump-me)
+ (display "} stop-system\n%%Trailer\n%%EOF\n" port)
+ (ly:outputter-close outputter)))
+
+(define-public (output-preview-framework basename book scopes fields)
+ (let* ((paper (ly:paper-book-paper book))
+ (systems (ly:paper-book-systems book))
+ (scale (ly:output-def-lookup paper 'outputscale))
+ (to-dump-systems '()))
+
+ ;; skip booktitles.
+ (if (and
+ (not
+ (ly:get-option 'preview-include-book-title))
+ (< 1 (length systems))
+ (ly:paper-system-title? (list-ref systems 0))
+ (ly:paper-system-title? (list-ref systems 1)))
+ (set! systems (cdr systems)))
+
+ (for-each
+ (lambda (sys)
+ (if (or
+ (ly:paper-system-title? sys)
+ (not (pair? to-dump-systems))
+ (ly:paper-system-title? (car to-dump-systems)))
+ (set! to-dump-systems (cons sys to-dump-systems))))
+ systems)
+
+ (dump-stencil-as-EPS
+ paper
+ (stack-stencils Y DOWN 0.0
+ (map ly:paper-system-stencil (reverse to-dump-systems)))
+ (format "~a.preview" basename)
+ #t)
+
+ (postprocess-output book framework-ps-module
+ (format "~a.preview.eps" basename)
+ (cons "png" (ly:output-formats)))))
+(if #f
+ (define-public (output-preview-framework basename book scopes fields)
+
+ (let* ((paper (ly:paper-book-paper book))
+ (systems (ly:paper-book-systems book))
+ (scale (ly:output-def-lookup paper 'outputscale))
+ (titles (take-while ly:paper-system-title? systems))
+ (non-title (find (lambda (x)
+ (not (ly:paper-system-title? x))) systems))
+ (dump-me
+ (stack-stencils Y DOWN 0.0
+ (map ly:paper-system-stencil
+ (append titles (list non-title))))))
+ (output-scopes scopes fields basename)
+ (dump-stencil-as-EPS paper dump-me
+ (format "~a.preview" basename)
+ #t)
+
+ (postprocess-output book framework-ps-module
+ (format "~a.preview.eps" basename)
+ (ly:output-formats)))))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define-public (convert-to-pdf book name)
+ (let* ((defs (ly:paper-book-paper book))
+ (papersizename (ly:output-def-lookup defs 'papersizename)))
+
+ (if (equal? (basename name ".ps") "-")
+ (ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
+ (postscript->pdf (if (string? papersizename) papersizename "a4")
+ name))))
+
+(define-public (convert-to-png book name)
+ (let* ((defs (ly:paper-book-paper book))
+ (defs-resolution (ly:output-def-lookup defs 'pngresolution))
+ (resolution (if (number? defs-resolution)
+ defs-resolution
+ (ly:get-option 'resolution)))
+ (papersizename (ly:output-def-lookup defs 'papersizename)))
+
+ (postscript->png resolution
+ (if (string? papersizename) papersizename "a4")
+ name)))
+
+(define-public (convert-to-dvi book name)
+ (ly:warning (_ "can't generate ~S using the postscript back-end") "DVI"))
+
+(define-public (convert-to-tex book name)
+ (ly:warning (_ "can't generate ~S using the postscript back-end") "TeX"))
+
+(define-public (convert-to-ps book name)
+ #t)
+
+(define-public (output-classic-framework basename book scopes fields)
+
+ (ly:error (_ "\nThe PostScript backend does not support the 'classic'
+framework. Use the EPS backend instead,
+
+ lilypond -b eps <file>
+
+or remove the lilypond-book specific settings from the input.
+")))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
