CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch: lilypond_2_6
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/09/01 08:43:51
Modified files:
. : ChangeLog
lily : ly-module.cc
scm : output-ps.scm
Log message:
(grob-cause): escape spaces in URLs.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?only_with_tag=lilypond_2_6&tr1=1.3836.2.33&tr2=1.3836.2.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ly-module.cc.diff?only_with_tag=lilypond_2_6&tr1=1.42.2.5&tr2=1.42.2.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?only_with_tag=lilypond_2_6&tr1=1.145&tr2=1.145.2.1&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3836.2.33 lilypond/ChangeLog:1.3836.2.34
--- lilypond/ChangeLog:1.3836.2.33 Wed Aug 31 19:22:41 2005
+++ lilypond/ChangeLog Thu Sep 1 08:43:50 2005
@@ -1,3 +1,7 @@
+2005-09-01 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scm/output-ps.scm (grob-cause): escape spaces in URLs.
+
2005-08-31 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/ly-module.cc (make_stand_in_procs_weak): backport: compat
Index: lilypond/lily/ly-module.cc
diff -u lilypond/lily/ly-module.cc:1.42.2.5 lilypond/lily/ly-module.cc:1.42.2.6
--- lilypond/lily/ly-module.cc:1.42.2.5 Wed Aug 31 19:22:41 2005
+++ lilypond/lily/ly-module.cc Thu Sep 1 08:43:51 2005
@@ -16,7 +16,6 @@
#ifdef MODULE_GC_KLUDGE
Protected_scm anonymous_modules = SCM_EOL;
-
#endif
LY_DEFINE(ly_clear_anonymous_modules, "ly:clear-anonymous-modules",
@@ -236,6 +235,7 @@
{
return;
}
+
SCM old_tab = scm_stand_in_procs;
SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));
Index: lilypond/scm/output-ps.scm
diff -u /dev/null lilypond/scm/output-ps.scm:1.145.2.1
--- /dev/null Thu Sep 1 08:43:52 2005
+++ lilypond/scm/output-ps.scm Thu Sep 1 08:43:51 2005
@@ -0,0 +1,315 @@
+;;;; output-ps.scm -- implement Scheme output interface for PostScript
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;;
+;;;; (c) 1998--2005 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+;;;; Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+;;;; Note: currently misused as testbed for titles with markup, see
+;;;; input/test/title-markup.ly
+;;;;
+;;;; TODO:
+;;;; * %% Papersize in (header ...)
+;;;; * text setting, kerning.
+;;;; * document output-interface
+
+(define-module (scm output-ps)
+ #:re-export (quote)
+
+ ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
+ #:export (unknown
+ blank
+ circle
+ dot
+ beam
+ dashed-slur
+ char
+ setcolor
+ resetcolor
+ named-glyph
+ dashed-line
+ zigzag-line
+ comment
+ repeat-slash
+ placebox
+ bezier-sandwich
+ embedded-ps
+ filledbox
+ round-filled-box
+ text
+ polygon
+ draw-line
+ no-origin))
+
+
+(use-modules (guile)
+ (ice-9 regex)
+ (srfi srfi-1)
+ (srfi srfi-13)
+ (scm framework-ps)
+ (lily))
+
+;;; helper functions, not part of output interface
+(define (escape-parentheses s)
+ (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
+
+(define (ps-encoding text)
+ (escape-parentheses text))
+
+;; FIXME: lily-def
+(define-public (ps-string-def prefix key val)
+ (string-append "/" prefix (symbol->string key) " ("
+ (escape-parentheses val)
+ ") def\n"))
+
+
+(define (ps-number-def prefix key val)
+ (let ((s (if (integer? val)
+ (ly:number->string val)
+ (ly:number->string (exact->inexact val)))))
+ (string-append "/" prefix (symbol->string key) " " s " def\n")))
+
+
+;;;
+;;; Lily output interface, PostScript implementation --- cleanup and docme
+;;;
+
+;;; Output-interface functions
+(define (beam width slope thick blot)
+ (string-append
+ (ly:numbers->string (list slope width thick blot)) " draw_beam" ))
+
+;; two beziers
+(define (bezier-sandwich lst thick)
+ (string-append
+ (string-join (map ly:number-pair->string lst) " ")
+ " "
+ (ly:number->string thick)
+ " draw_bezier_sandwich"))
+
+(define (char font i)
+ (string-append
+ (ps-font-command font) " setfont "
+ "(\\" (ly:inexact->string i 8) ") show"))
+
+(define (circle radius thick fill)
+ (format
+ "~a ~a ~a draw_circle" radius thick
+ (if fill
+ "true "
+ "false ")))
+
+(define (dashed-line thick on off dx dy)
+ (string-append
+ (ly:number->string dx) " "
+ (ly:number->string dy) " "
+ (ly:number->string thick)
+ " [ "
+ (ly:number->string on) " "
+ (ly:number->string off)
+ " ] 0 draw_dashed_line"))
+
+;; what the heck is this interface ?
+(define (dashed-slur thick on off l)
+ (string-append
+ (string-join (map ly:number-pair->string l) " ")
+ " "
+ (ly:number->string thick)
+ " [ "
+ (ly:number->string on)
+ " "
+ (ly:number->string off)
+ " ] 0 draw_dashed_slur"))
+
+(define (dot x y radius)
+ (string-append
+ " "
+ (ly:numbers->string
+ (list x y radius)) " draw_dot"))
+
+(define (draw-line thick x1 y1 x2 y2)
+ (string-append
+ "1 setlinecap 1 setlinejoin "
+ (ly:number->string thick) " setlinewidth "
+ (ly:number->string x1) " "
+ (ly:number->string y1) " moveto "
+ (ly:number->string x2) " "
+ (ly:number->string y2) " lineto stroke"))
+
+(define (embedded-ps string)
+ string)
+
+;; FIXME: use draw_round_box
+(define (filledbox breapth width depth height)
+ (string-append (ly:numbers->string (list breapth width depth height))
+ " draw_box"))
+
+(define (glyph-string
+ postscript-font-name
+ size cid?
+ x-y-named-glyphs)
+
+ (define (encoding-vector-hack glyphs)
+
+ ;; GS fucks up with glyphs that are not in the
+ ;; encoding vector.
+ (define (inner j glyphs)
+ (if (or (null? glyphs) (> j 256))
+ '()
+ (cons (format "dup ~a /~a put\n"
+ j (car glyphs))
+ (inner (1+ j) (cdr glyphs)))))
+
+ (format "256 array 0 1 255 { 1 index exch /.notdef put} for\n ~a
+/EncHack reencode-font /EncHack findfont"
+ (apply string-append (inner 32 glyphs))))
+ ;; END HACK.
+
+ (format #f "gsave 1 output-scale div 1 output-scale div scale
+ /~a ~a ~a scalefont setfont\n~a grestore"
+ postscript-font-name
+ (if cid?
+ " /CIDFont findresource "
+ " findfont")
+
+ size
+ (apply
+ string-append
+ (map (lambda (item)
+ (let*
+ ((x (car item))
+ (y (cadr item))
+ (g (caddr item))
+ (prefix (if (string? g) "/" "")))
+
+ (if (and (= 0.0 x)
+ (= 0.0 y))
+ (format #f " ~a~a glyphshow\n" prefix g)
+ (format #f " ~a ~a rmoveto ~a~a glyphshow\n"
+ x y
+ prefix
+ g))))
+ x-y-named-glyphs))))
+
+(define (grob-cause offset grob)
+ (let* ((cause (ly:grob-property grob 'cause))
+ (music-origin (if (ly:music? cause)
+ (ly:music-property cause 'origin))))
+ (if (not (ly:input-location? music-origin))
+ ""
+ (let* ((location (ly:input-file-line-char-column music-origin))
+ (raw-file (car location))
+ (file (if (is-absolute? raw-file)
+ raw-file
+ (string-append (ly-getcwd) "/" raw-file)))
+ (x-ext (ly:grob-extent grob grob X))
+ (y-ext (ly:grob-extent grob grob Y)))
+
+ (if (and (< 0 (interval-length x-ext))
+ (< 0 (interval-length y-ext)))
+ (format "~a ~a ~a ~a (textedit://~a:~a:~a:~a) mark_URI\n"
+ (+ (car offset) (car x-ext))
+ (+ (cdr offset) (car y-ext))
+ (+ (car offset) (cdr x-ext))
+ (+ (cdr offset) (cdr y-ext))
+ (string-regexp-substitute " " "%20" file)
+ (cadr location)
+ (caddr location)
+ (cadddr location))
+ "")))))
+
+(define (lily-def key val)
+ (let ((prefix "lilypondlayout"))
+ (if (string=?
+ (substring key 0 (min (string-length prefix) (string-length key)))
+ prefix)
+ (string-append "/" key " {" val "} bind def\n")
+ (string-append "/" key " (" val ") def\n"))))
+
+(define (named-glyph font glyph)
+ (string-append
+ (ps-font-command font) " setfont "
+ "/" glyph " glyphshow "))
+
+(define (no-origin)
+ "")
+
+(define (placebox x y s)
+ (string-append
+ (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
+
+(define (polygon points blotdiameter filled?)
+ (string-append
+ (ly:numbers->string points) " "
+ (ly:number->string (/ (length points) 2)) " "
+ (ly:number->string blotdiameter)
+ (if filled? " true " " false ")
+ " draw_polygon"))
+
+(define (repeat-slash wid slope thick)
+ (string-append
+ (ly:numbers->string (list wid slope thick))
+ " draw_repeat_slash"))
+
+;; restore color from stack
+(define (resetcolor)
+ (string-append "setrgbcolor\n"))
+
+(define (round-filled-box x y width height blotdiam)
+ (string-append
+ (ly:numbers->string
+ (list x y width height blotdiam)) " draw_round_box"))
+
+;; save current color on stack and set new color
+(define (setcolor r g b)
+ (string-append "currentrgbcolor "
+ (ly:numbers->string (list r g b))
+ " setrgbcolor\n"))
+
+(define (text font s)
+ ;; (ly:warning (_ "TEXT backend-command encountered in Pango backend"))
+ ;; (ly:warning (_ "Arguments: ~a ~a"" font str))
+
+ (let* ((space-length (cdar (ly:text-dimension font " ")))
+ (space-move (string-append (number->string space-length)
+ " 0.0 rmoveto "))
+ (out-vec (decode-byte-string s)))
+
+ (string-append
+ (ps-font-command font) " setfont "
+ (string-join
+ (vector->list
+ (vector-for-each
+
+ (lambda (sym)
+ (if (eq? sym 'space)
+ space-move
+ (string-append "/" (symbol->string sym) " glyphshow")))
+ out-vec))))))
+
+(define (unknown)
+ "\n unknown\n")
+
+(define (url-link url x y)
+ (format "~a ~a ~a ~a (~a) mark_URI"
+ (car x)
+ (car y)
+ (cdr x)
+ (cdr y)
+ url))
+
+(define (utf8-string pango-font-description string)
+ (ly:warning (_ "utf8-string encountered in PS backend")))
+
+
+
+(define (zigzag-line centre? zzw zzh thick dx dy)
+ (string-append
+ (if centre? "true" "false") " "
+ (ly:number->string zzw) " "
+ (ly:number->string zzh) " "
+ (ly:number->string thick) " "
+ "0 0 "
+ (ly:number->string dx) " "
+ (ly:number->string dy)
+ " draw_zigzag_line"))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
