;;; TODO:
;;;
+;;; * check: blot+scaling
;;; * Figure out and fix font scaling and character placement
;;; * EC font package: add missing X font directories and AFMs
;;; * User-interface, keybindings
;;; - allow GnomeCanvas or `toplevel' GtkWindow to be created
;;; outside of LilyPond
;;; - lilylib.
-;;; * Release schedule and packaging of dependencies. This hack
-;;; depends on several CVS and TLA development sources. In the works.
+;;; * Release schedule and packaging of dependencies.
+;;; - g-wrap-1.9.3 is already in incoming.
+;;; - guile-gnome-platform-2.8.0 will probably be packaged early 2005.
;;; You need:
;;;
-;;; * Rotty's g-wrap >= 1.9.3 (or TLA)
-;;; * guile-gnome-platform >= 2.7.95 (or TLA)
+;;; * Rotty's g-wrap >= 1.9.3
+;;; * guile-gnome-platform >= 2.7.97
;;; * pango >= 1.6.0
;;;
;;; See also: guile-gtk-general@gnu.org
;;; Try it
;;;
-;;; [* Get cvs and tla]
-;;;
;;; * Install gnome/gtk and libffi development stuff
;;;
-;;; * Install pango, g-wrap and guile-gnome from CVS or arch:
+;;; * Install [pango, g-wrap and] guile-gnome from source,
;;; see buildscripts/guile-gnome.sh
;;;
;;; * Build LilyPond with gui support: configure --enable-gui
(gnome gtk)
(gnome gw canvas))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Wrappers from guile-gnome TLA
-;;; guile-gnome-devel@gnu.org--2004
-;;; http://arch.gna.org/guile-gnome/archive-2004
-;;;
-;;; janneke@gnu.org--2004-gnome
-;;; http://lilypond.org/~janneke/{arch}/2004-gnome
-;;;
-(if (not (defined? '<gnome-canvas-path-def>))
- (begin
- (define-class <gnome-canvas-path-def> (<gobject>)
- (closure #:init-value (gnome-canvas-path-def-new)
- #:init-keyword #:path-def
- #:getter get-def #:setter set-def))
-
- (define-method (moveto (this <gnome-canvas-path-def>) x y)
- (gnome-canvas-path-def-moveto (get-def this) x y))
- (define-method (curveto (this <gnome-canvas-path-def>) x1 y1 x2 y2 x3 y3)
- (gnome-canvas-path-def-curveto (get-def this) x1 y1 x2 y2 x3 y3))
- (define-method (lineto (this <gnome-canvas-path-def>) x y)
- (gnome-canvas-path-def-lineto (get-def this) x y))
- (define-method (closepath (this <gnome-canvas-path-def>))
- (gnome-canvas-path-def-closepath (get-def this)))
- (define-method (reset (this <gnome-canvas-path-def>))
- (gnome-canvas-path-def-reset (get-def this)))
-
- (define -set-path-def set-path-def)
- (define -get-path-def get-path-def)
-
- (define-method (set-path-def (this <gnome-canvas-shape>)
- (def <gnome-canvas-path-def>))
- (-set-path-def this (get-def def)))
-
- (define-method (get-path-def (this <gnome-canvas-shape>))
- (make <gnome-canvas-path-def> #:path-def (-get-path-def this)))))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; globals
(if #f
(apply stderr (cons string rest))))
-(define (list->offsets accum coords)
- (if (null? coords)
- accum
- (cons (cons (car coords) (cadr coords))
- (list->offsets accum (cddr coords)))))
-
(define (utf8 i)
(cond
((< i #x80) (list (integer->char i)))
(list (+ #xe0 x)
(+ #x80 (quotient y #x40))
(+ #x80 (modulo y #x40))))))
- (else FIXME)))
-
-(define (integer->utf8-string font integer)
+ (else (begin (stderr "programming-error: utf-8 too big:~x\n" i)
+ (list (integer->char 32))))))
+
+(define (integer->utf8-string integer)
(list->string (utf8 integer)))
-(define (char->utf8-string font char)
- (list->string (utf8 (char->unicode-index font char))))
-
-(define (string->utf8-string font string)
+(define (char->utf8-string char)
+ (list->string (utf8 (char->integer char))))
+
+(define (string->utf8-string string)
(apply
string-append
- (map (lambda (x) (char->utf8-string font x)) (string->list string))))
+ (map (lambda (x) (char->utf8-string x)) (string->list string))))
(define (music-font? font)
(let ((encoding (ly:font-encoding font))
(family (font-family font)))
(or (memq encoding '(fetaMusic fetaBraces))
- (string=? (substring family 0 (min (string-length family) 9))
- "bigcheese"))))
+ (string=? (substring family 0 (min (string-length family) 10))
+ "emmentaler"))))
+
+;; FIXME
+(define-public (otf-name-mangling font family)
+ ;; Hmm, family is emmentaler20/26?
+ (if (string=? (substring family 0 (min (string-length family) 10))
+ "emmentaler")
+ (string-append "LilyPond " (substring family 10))
+ (if (string=? family "aybabtu")
+ "LilyPondBraces"
+ family)))
+
+(define (pango-font-name font)
+ (debugf "FONT-NAME:~S:~S\n" (ly:font-name font) (ly:font-design-size font))
+ (debugf "FONT-FAMILY:~S:~S\n" (font-family font) (otf-name-mangling font (font-family font)))
+ (otf-name-mangling font (font-family font)))
+
+(define (pango-font-size font)
+ (let* ((designsize (ly:font-design-size font))
+ (magnification (* (ly:font-magnification font)))
+
+ ;;font-name: "GNU-LilyPond-feta-20"
+ ;;font-file-name: "feta20"
+ ;;pango-font-name: "lilypond-feta, regular 32"
+ ;;OPS:2.61
+ ;;scaling:29.7046771653543
+ ;;magnification:0.569055118110236
+ ;;design:20.0
+
+ ;; ugh, experimental sizing
+ ;; where does factor ops come from?
+ ;; Hmm, design size: 26/20
+ (ops 2.60)
+
+ (scaling (* ops magnification designsize)))
+ (debugf "OPS:~S\n" ops)
+ (debugf "scaling:~S\n" scaling)
+ (debugf "magnification:~S\n" magnification)
+ (debugf "design:~S\n" designsize)
+
+ scaling))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Wrappers from guile-gnome TLA
+;;; guile-gnome-devel@gnu.org--2004
+;;; http://arch.gna.org/guile-gnome/archive-2004
+;;;
+;;; janneke@gnu.org--2004-gnome
+;;; http://lilypond.org/~janneke/{arch}/2004-gnome
+;;;
+(if (not (defined? '<gnome-canvas-path-def>))
+ (begin
+ (define-class <gnome-canvas-path-def> (<gobject>)
+ (closure #:init-value (gnome-canvas-path-def-new)
+ #:init-keyword #:path-def
+ #:getter get-def #:setter set-def))
+
+ (define-method (moveto (this <gnome-canvas-path-def>) x y)
+ (gnome-canvas-path-def-moveto (get-def this) x y))
+ (define-method (curveto (this <gnome-canvas-path-def>) x1 y1 x2 y2 x3 y3)
+ (gnome-canvas-path-def-curveto (get-def this) x1 y1 x2 y2 x3 y3))
+ (define-method (lineto (this <gnome-canvas-path-def>) x y)
+ (gnome-canvas-path-def-lineto (get-def this) x y))
+ (define-method (closepath (this <gnome-canvas-path-def>))
+ (gnome-canvas-path-def-closepath (get-def this)))
+ (define-method (reset (this <gnome-canvas-path-def>))
+ (gnome-canvas-path-def-reset (get-def this)))
+
+ (define -set-path-def set-path-def)
+ (define -get-path-def get-path-def)
+
+ (define-method (set-path-def (this <gnome-canvas-shape>)
+ (def <gnome-canvas-path-def>))
+ (-set-path-def this (get-def def)))
+
+ (define-method (get-path-def (this <gnome-canvas-shape>))
+ (make <gnome-canvas-path-def> #:path-def (-get-path-def this)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; stencil outputters
bezier))
(define (square-beam width slope thick blot)
- (let*
- ((def (make <gnome-canvas-path-def>))
- (y (* (- width) slope))
- (props (make <gnome-canvas-bpath>
- #:parent (canvas-root)
- #:fill-color "black"
- #:outline-color "black"
- #:width-units 0.0)))
+ (let* ((def (make <gnome-canvas-path-def>))
+ (y (* (- width) slope))
+ (props (make <gnome-canvas-bpath>
+ #:parent (canvas-root)
+ #:fill-color "black"
+ #:outline-color "black"
+ #:width-units 0.0)))
(reset def)
(moveto def 0 0)
(closepath def)
(set-path-def props def)
props))
-
+
;; two beziers
(define (bezier-sandwich lst thick)
(let* ((def (make <gnome-canvas-path-def>))
;; cl cr r l 0 1 2 3
;; cr cl l r 4 5 6 7
- (moveto def (car (list-ref lst 3)) (- (cdr (list-ref lst 3))))
- (curveto def (car (list-ref lst 0)) (- (cdr (list-ref lst 0)))
+ (moveto def (car (list-ref lst 3)) (- (cdr (list-ref lst 3))))
+ (curveto def (car (list-ref lst 0)) (- (cdr (list-ref lst 0)))
(car (list-ref lst 1)) (- (cdr (list-ref lst 1)))
(car (list-ref lst 2)) (- (cdr (list-ref lst 2))))
- (lineto def (car (list-ref lst 7)) (- (cdr (list-ref lst 7))))
- (curveto def (car (list-ref lst 4)) (- (cdr (list-ref lst 4)))
+ (lineto def (car (list-ref lst 7)) (- (cdr (list-ref lst 7))))
+ (curveto def (car (list-ref lst 4)) (- (cdr (list-ref lst 4)))
(car (list-ref lst 5)) (- (cdr (list-ref lst 5)))
(car (list-ref lst 6)) (- (cdr (list-ref lst 6))))
- (lineto def (car (list-ref lst 3)) (- (cdr (list-ref lst 3))))
+ (lineto def (car (list-ref lst 3)) (- (cdr (list-ref lst 3))))
(closepath def)
(set-path-def bezier def)
bezier))
(define (char font i)
- (text font (ly:font-index-to-charcode (integer->char i))))
+ (text font (ly:font-index-to-charcode font i)))
+
+(define (dashed-line thick on off dx dy)
+ (draw-line thick 0 0 dx dy))
+
+(define (draw-line thick x1 y1 x2 y2)
+ (let* ((def (make <gnome-canvas-path-def>))
+ (props (make <gnome-canvas-bpath>
+ #:parent (canvas-root)
+ #:fill-color "black"
+ #:outline-color "black"
+ #:width-units thick)))
+ (reset def)
+ (moveto def x1 (- y1))
+ (lineto def x2 (- y2))
+ (set-path-def props def)
+ props))
;; FIXME: naming
(define (filledbox breapth width depth height)
#:fill-color "black"
#:join-style 'miter))
+;; FIXME: the framework-gnome backend needs to see every item that
+;; gets created. All items created here must should be put in a group
+;; that gets returned.
+(define (glyph-string font postscript-font-name x-y-named-glyphs)
+ (for-each
+ (lambda (x)
+
+ ;; UGR, glyph names not found
+ (stderr "GLYPH:~S\n" (caddr x))
+ (stderr "ID:~S\n" (ly:font-glyph-name-to-charcode font (caddr x)))
+ (placebox (car x) (cadr x)
+ (make <gnome-canvas-text>
+ #:parent (canvas-root)
+ #:x 0.0 #:y 0.0
+ #:anchor 'west
+ ;;#:font postscript-font-name
+ #:font (pango-font-name font)
+ #:size-points 12
+ #:size-set #t
+ #:text
+ (integer->utf8-string
+ (ly:font-glyph-name-to-charcode font (caddr x))))))
+ x-y-named-glyphs))
+
(define (grob-cause grob)
grob)
(define (horizontal-line x1 x2 thickness)
(filledbox (- x1) (- x2 x1) (* .5 thickness) (* .5 thickness)))
+(define (named-glyph font name)
+ (text font (ly:font-glyph-name-to-charcode font name)))
+
(define (placebox x y expr)
(let ((item expr))
;;(if item
item)
#f)))
-(define (dashed-line thick on off dx dy)
- (draw-line thick 0 0 dx dy))
-
-(define (draw-line thick fx fy tx ty)
- (let*
- ((def (make <gnome-canvas-path-def>))
- (props (make <gnome-canvas-bpath>
- #:parent (canvas-root)
- #:fill-color "black"
- #:outline-color "black"
- #:width-units thick)))
+(define (polygon coords blot-diameter)
+ (let* ((def (make <gnome-canvas-path-def>))
+ (props (make <gnome-canvas-bpath>
+ #:parent (canvas-root)
+ #:fill-color "black"
+ #:outline-color "black"
+ #:join-style 'round)
+ #:width-units blot-diameter)
+ (points (ly:list->offsets '() coords))
+ (last-point (car (last-pair points))))
- (reset def)
- (moveto def fx (- fy))
- (lineto def tx (- ty))
- (set-path-def props def)
- props))
-
-(define (named-glyph font name)
- (text font (ly:font-glyph-name-to-charcode font name)))
-
-(define (polygon coords blotdiameter)
- (let*
- ((def (make <gnome-canvas-path-def>))
- (props (make <gnome-canvas-bpath>
- #:parent (canvas-root)
- #:fill-color "black"
- #:outline-color "black"
- #:width-units blotdiameter))
- (points (list->offsets '() coords))
- (last-point (car (last-pair points))))
-
(reset def)
(moveto def (car last-point) (cdr last-point))
- (for-each (lambda (x)
- (lineto def (car x) (cdr x))
- ) points)
+ (for-each (lambda (x) (lineto def (car x) (cdr x))) points)
(closepath def)
(set-path-def props def)
props))
-
(define (round-filled-box breapth width depth height blot-diameter)
(let ((r (/ blot-diameter 2)))
(define (text font s)
- (define (pango-font-name font)
- (stderr "FONT-NAME:~S:~S\n" (ly:font-name font) (ly:font-design-size font))
- (otf-name-mangling font (font-family font)))
-
- (define (pango-font-size font)
- (let* ((designsize (ly:font-design-size font))
- (magnification (* (ly:font-magnification font)))
-
- ;;font-name: "GNU-LilyPond-feta-20"
- ;;font-file-name: "feta20"
- ;;pango-font-name: "lilypond-feta, regular 32"
- ;;OPS:2.61
- ;;scaling:29.7046771653543
- ;;magnification:0.569055118110236
- ;;design:20.0
-
- ;; ugh, experimental sizing
- ;; where does factor ops come from?
- ;; Hmm, design size: 26/20
- (ops 2.60)
-
- (scaling (* ops magnification designsize)))
- (debugf "OPS:~S\n" ops)
- (debugf "scaling:~S\n" scaling)
- (debugf "magnification:~S\n" magnification)
- (debugf "design:~S\n" designsize)
-
- scaling))
-
(make <gnome-canvas-text>
#:parent (canvas-root)
;; ugh, experimental placement corections
#:size-points (pango-font-size font)
#:size-set #t
#:text (if (integer? s)
- (integer->utf8-string font s)
- (string->utf8-string font s))))
+ (integer->utf8-string s)
+ (string->utf8-string s))))
+
projects / lilypond.git / blobdiff