;;; 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.
+;;; * 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.1 (or TLA)
-;;; * guile-gnome-platform >= 2.5.992 (or TLA)
-;;; * pango >= 1.5.2 (or CVS)
+;;; * 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
;;;
;;; * Supposing that LilyPond was built in ~/cvs/savannah/lilypond,
-;;; tell fontconfig about the feta fonts dir:
+;;; tell fontconfig about the feta fonts dir and run fc-cache
"
cat > ~/.fonts.conf << EOF
<fontconfig>
<dir>~/cvs/savannah/lilypond/mf/out</dir>
+<dir>/usr/share/texmf/fonts/type1/public/ec-fonts-mftraced</dir>
</fontconfig>
EOF
+fc-cache
"
;;; or copy all your .pfa/.pfb's to ~/.fonts if your fontconfig
;;; already looks there for fonts. Check if it works by doing:
(use-modules
(guile)
+ (ice-9 regex)
(srfi srfi-13)
(lily)
- (gnome gtk))
+ (gnome gtk)
+ (gnome gw canvas))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; globals
-;; The name of the module will change to `canvas' rsn
-(if (resolve-module '(gnome gw canvas))
- (use-modules (gnome gw canvas))
- (use-modules (gnome gw libgnomecanvas)))
+;;; set by framework-gnome.scm
+(define canvas-root #f)
+(define output-scale #f)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; helper functions
+
+(define (stderr string . rest)
+ (apply format (cons (current-error-port) (cons string rest)))
+ (force-output (current-error-port)))
+
+(define (debugf string . rest)
+ (if #f
+ (apply stderr (cons string rest))))
+
+(define (utf8 i)
+ (cond
+ ((< i #x80) (list (integer->char i)))
+ ((< i #x800) (map integer->char
+ (list (+ #xc0 (quotient i #x40))
+ (+ #x80 (modulo i #x40)))))
+ ((< i #x10000)
+ (let ((x (quotient i #x1000))
+ (y (modulo i #x1000)))
+ (map integer->char
+ (list (+ #xe0 x)
+ (+ #x80 (quotient y #x40))
+ (+ #x80 (modulo y #x40))))))
+ (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 char)
+ (list->string (utf8 (char->integer char))))
+
+(define (string->utf8-string string)
+ (apply
+ string-append
+ (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) 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
(define-method (get-path-def (this <gnome-canvas-shape>))
(make <gnome-canvas-path-def> #:path-def (-get-path-def this)))))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; globals
-
-;; junkme
-(define system-origin '(0 . 0))
-
-;;; set by framework-gnome.scm
-(define canvas-root #f)
-(define output-scale #f)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; helper functions
-
-(define (stderr string . rest)
- (apply format (cons (current-error-port) (cons string rest)))
- (force-output (current-error-port)))
-
-(define (debugf string . rest)
- (if #f
- (apply stderr (cons string rest))))
-
-(define (utf8 i)
- (cond
- ((< i #x80) (list (integer->char i)))
- ((< i #x800) (map integer->char
- (list (+ #xc0 (quotient i #x40))
- (+ #x80 (modulo i #x40)))))
- ((< i #x10000)
- (let ((x (quotient i #x1000))
- (y (modulo i #x1000)))
- (map integer->char
- (list (+ #xe0 x)
- (+ #x80 (quotient y #x40))
- (+ #x80 (modulo y #x40))))))
- (else FIXME)))
-
-(define (custom-utf8 i)
- (if (< i 80)
- (utf8 i)
- (utf8 (+ #xee00 i))))
-
-(define (string->utf8-string string)
- (list->string
- (apply append (map utf8 (map char->integer (string->list string))))))
-
-(define (char->utf8-string char)
- (list->string (utf8 (char->integer char))))
-
-(define (draw-rectangle x1 y1 x2 y2 color width-units)
- (make <gnome-canvas-rect>
- #:parent (canvas-root) #:x1 x1 #:y1 y1 #:x2 x2 #:y2 y2
- #:fill-color color #:width-units width-units))
-
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; stencil outputters
;;;
(ly:all-stencil-expressions)
(ly:all-output-backend-commands)))
+(define (beam width slope thick blot)
+ (define cursor '(0 . 0))
+ (define (rmoveto def x y)
+ (set! cursor (cons (+ x (car cursor)) (+ y (cdr cursor))))
+ (moveto def (car cursor) (cdr cursor)))
+ (define (rlineto def x y)
+ (set! cursor (cons (+ x (car cursor)) (+ y (cdr cursor))))
+ (lineto def (car cursor) (cdr cursor)))
+ (let* ((def (make <gnome-canvas-path-def>))
+ (bezier (make <gnome-canvas-bpath>
+ #:parent (canvas-root)
+ #:fill-color "black"
+ #:outline-color "black"
+ #:width-units blot
+ #:join-style 'round))
+ (t (- thick blot))
+ (w (- width blot))
+ (h (* w slope)))
+
+ (reset def)
+ (rmoveto def (/ blot 2) (/ t 2))
+ (rlineto def w (- h))
+ (rlineto def 0 (- t))
+ (rlineto def (- w) h)
+ (rlineto def 0 t)
+ (closepath def)
+ (set-path-def bezier def)
+ 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)))
+
+ (reset def)
+ (moveto def 0 0)
+ (lineto def width y)
+ (lineto def width (- y thick))
+ (lineto def 0 (- thick))
+ (lineto 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>))
#:parent (canvas-root)
#:fill-color "black"
#:outline-color "black"
- #:width-units thick)))
+ #:width-units thick
+ #:join-style 'round)))
(reset def)
-
+
+ ;; FIXME: LST is pre-mangled for direct ps stack usage
;; 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 (utf8 i)))
- (text font (list->string (list (integer->char i))))); (utf8 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)
+ (make <gnome-canvas-rect>
+ #:parent (canvas-root)
+ #:x1 (- breapth) #:y1 depth #:x2 width #:y2 (- 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)
+
+;; WTF is this in every backend?
+(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)
- (debugf "item: ~S\n" expr)
(let ((item expr))
;;(if item
;; FIXME ugly hack to skip #unspecified ...
(if (and item (not (eq? item (if #f #f))))
(begin
- (move item
- (* output-scale (+ (car system-origin) x))
- (* output-scale (- (car system-origin) y)))
+ (move item (* output-scale x) (* output-scale (- y)))
(affine-relative item output-scale 0 0 output-scale 0 0)
item)
#f)))
-(define (round-filled-box breapth width depth height blot-diameter)
- ;; FIXME: no rounded corners on rectangle...
- ;; FIXME: blot?
- (draw-rectangle (- breapth) depth width (- height) "black" blot-diameter))
-
-(define pango-font-name-alist
- '(("GNU-LilyPond-feta-20" . "lilypond-feta, regular 32")
- ("GNU-LilyPond-feta-nummer-5.5" . "lilypond-feta-nummer, regular 32")
- ("GNU-LilyPond-feta-din-14" . "lilypond-feta-din, 25")
- ("GNU-LilyPond-feta-14.14" . "lilypond-feta, regular 25")
- ("GNU-LilyPond-feta-12.6" . "lilypond-feta, regular 22")
- ("GNU-LilyPond-feta-braces-f-90" . "LilyPond-feta-braces-f, 32")
- ))
-
-(define (pango-font-name font)
- (let ((pango-font (assoc-get (ly:font-name font) pango-font-name-alist #f)))
- (if pango-font
- pango-font
- (begin
- (stderr "font-name: ~S\n" (ly:font-name font))
- ;; TODO s/filename/file-name/
- (stderr "font-filename: ~S\n" (ly:font-filename font))
- (stderr "pango-font-size: ~S\n" (pango-font-size font))
- "ecrm12"))))
-
-(define (pango-font-size font)
- (let* ((designsize (ly:font-design-size font))
- (magnification (* (ly:font-magnification font)))
-
- ;; experimental sizing:
- ;; where does factor come from?
- ;;
- ;; 0.435 * (12 / 20) = 0.261
- ;; 2.8346456692913/ 0.261 = 10.86071137659501915708
- ;;(ops (* 0.435 (/ 12 20) (* output-scale pixels-per-unit)))
- ;; for size-points
- (ops 2.61)
-
- (scaling (* ops magnification designsize)))
- (debugf "OPS:~S\n" ops)
- (debugf "scaling:~S\n" scaling)
- (debugf "magnification:~S\n" magnification)
- (debugf "design:~S\n" designsize)
+(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))))
- scaling))
+ (reset def)
+ (moveto def (car last-point) (cdr last-point))
+ (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)))
+ (make <gnome-canvas-rect>
+ #:parent (canvas-root)
+ #:x1 (- r breapth) #:y1 (- depth r) #:x2 (- width r) #:y2 (- r height)
+ #:fill-color "black"
+ #:outline-color "black"
+ #:width-units blot-diameter
+ #:join-style 'round)))
-;;font-name: "GNU-LilyPond-feta-20"
-;;font-filename: "feta20"
-;;pango-font-name: "lilypond-feta, regular 32"
-;;OPS:2.61
-;;scaling:29.7046771653543
-;;magnification:0.569055118110236
-;;design:20.0
+(define (text font s)
-(define (text font string)
(make <gnome-canvas-text>
#:parent (canvas-root)
-
- #:anchor 'west
- #:x 0.0 #:y 0.0
-
+ ;; ugh, experimental placement corections
+ ;; #:x 0.0 #:y 0.0
+ #:x 0.0 #:y (if (music-font? font) 0.15 0.69)
+ #:anchor (if (music-font? font) 'west 'south-west)
#:font (pango-font-name font)
-
#:size-points (pango-font-size font)
- ;;#:size ...
#:size-set #t
-
- ;;apparently no effect :-(
- ;;#:scale 1.0
- ;;#:scale-set #t
-
- #:fill-color "black"
- #:text (if (string? string)
- (string->utf8-string string)
- (char->utf8-string (car string)))))
-
-(define (filledbox a b c d)
- (round-filled-box a b c d 0.001))
-
-;; WTF is this in every backend?
-(define (horizontal-line x1 x2 thickness)
- (filledbox (- x1) (- x2 x1) (* .5 thickness) (* .5 thickness)))
-
-;;(define (define-origin file line col)
-;; (if (procedure? point-and-click)
-;; (list 'location line col file)))
+ #:text (if (integer? s)
+ (integer->utf8-string s)
+ (string->utf8-string s))))
-(define (grob-cause grob)
- grob)
projects / lilypond.git / blobdiff