gsharp-cvs June 2006

gsharp-cvs@common-lisp.net

2 participants
49 discussions

[gsharp-cvs] CVS gsharp/Fonts
by rstrandh 05 Jun '06

05 Jun '06

Update of /project/gsharp/cvsroot/gsharp/Fonts In directory clnet:/tmp/cvs-serv9215/Fonts Removed Files: Makefile accents.mf accidentals.mf beams.mf c_clef.mf charmap.mf clefs.mf dot.mf double-flat.mf double-sharp.mf eighth_rest.mf f_clef.mf flags.mf flat.mf g_clef.mf half_rest.mf macros.mf natural.mf noteheads.mf quarter_rest.mf rests.mf sdl.mf sharp.mf ties.mf viewer.lisp whole_rest.mf Log Message: Removed files related to old font system.

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 05 Jun '06

05 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv8356 Modified Files: gsharp.asd packages.lisp score-pane.lisp sdl.lisp Removed Files: gf.lisp Log Message: Removed references to old font system, including the file gf.lisp. --- /project/gsharp/cvsroot/gsharp/gsharp.asd 2006/06/05 00:26:18 1.11 +++ /project/gsharp/cvsroot/gsharp/gsharp.asd 2006/06/05 00:53:40 1.12 @@ -23,7 +23,6 @@ (gsharp-defsystem (:gsharp :depends-on (:mcclim :flexichain :esa)) "packages" "utilities" - "gf" "bezier" "mf" "sdl" --- /project/gsharp/cvsroot/gsharp/packages.lisp 2006/06/05 00:26:18 1.53 +++ /project/gsharp/cvsroot/gsharp/packages.lisp 2006/06/05 00:53:40 1.54 @@ -4,15 +4,6 @@ (:export #:ninsert-element #:define-added-mixin #:unicode-to-char #:char-to-unicode)) -(defpackage :gf - (:use :common-lisp) - (:export #:parse-gf-file #:gf-font-comment #:gf-font-chars #:gf-font-design-size - #:gf-font-checksum #:gf-font-horizontal-ratio #:gf-font-vertical-ratio - #:gf-font-min-column #:gf-font-max-column - #:gf-font-min-row #:gf-font-max-row - #:gf-char-no #:gf-char-min-m #:gf-char-max-m - #:gf-char-min-n #:gf-char-max-n #:gf-char-matrix)) - (defpackage :mf (:use :cl) (:export #:make-bezier-segment #:bezier-segment @@ -34,12 +25,12 @@ #:left #:right #:up #:down)) (defpackage :sdl - (:use :common-lisp :gf :mf) + (:use :common-lisp :mf) (:export #:glyph #:staff-line-distance #:staff-line-offsets #:stem-offsets #:bar-line-offsets #:ledger-line-x-offsets #:ledger-line-y-offsets #:notehead-right-offsets #:notehead-left-offsets - #:load-font #:glyph-offsets #:suspended-note-offset + #:make-font #:glyph-offsets #:suspended-note-offset #:beam-offsets #:beam-hang-sit-offset)) (defpackage :score-pane --- /project/gsharp/cvsroot/gsharp/score-pane.lisp 2006/06/05 00:26:18 1.28 +++ /project/gsharp/cvsroot/gsharp/score-pane.lisp 2006/06/05 00:53:41 1.29 @@ -155,38 +155,6 @@ (defun staff-step (n) (* n (/ (staff-line-distance *font*) 2))) -;;; Given a pane, a glyph number, an x position (measured in pixels) -;;; and a y position (measured in staff steps), draw the glyph -;;; at the position in the pane. -;;; The font is organized so that the normal glyph is immediately -;;; followed by a light version of the glyph. Hence, we add 1 -;;; to the glyph number if a light version is desired. -;;; It appears that the resulting y-coordinate (in pixels) has the -;;; same sign as the staff-step argument, which suggests that this -;;; function must be called with a negated staff-step. It might be -;;; better to have this function do the negation. -(defun draw-antialiased-glyph (pane glyph-no x staff-step) - (let* ((extra (if *light-glyph* 1 0)) - (matrix (glyph *font* (+ glyph-no extra))) - (pixmap (pane-pixmap pane matrix))) - (multiple-value-bind (dx dy) (glyph-offsets *font* (+ glyph-no extra)) - (let ((x1 (+ x dx)) - (y1 (- dy (staff-step staff-step)))) - (draw-pixmap* pane pixmap x1 y1))))) - -;;;;;;;;;;;;;;;;;; helper macro - -;;; This macro is currently not used. (And probably never will be -;;; used, now that we raster our own bezier curves.) -(defmacro define-pixmap-recording ((draw-name args) &body body) - `(defun ,draw-name (pane ,@args x staff-step) - (let* ((extra (if *light-glyph* 1 0)) - (glyph-no ,@body) - (matrix (glyph *font* (+ glyph-no extra))) - (pixmap (pane-pixmap pane matrix))) - (multiple-value-bind (dx dy) (glyph-offsets *font* (+ glyph-no extra)) - (draw-pixmap* pane pixmap (+ x dx) (- dy (staff-step staff-step))))))) - ;;;;;;;;;;;;;;;;;; notehead (define-presentation-type notehead () :options (name x staff-step)) @@ -701,7 +669,7 @@ `(let ((,size-var ,size)) (unless (aref *fonts* ,size-var) (setf (aref *fonts* ,size-var) - (load-font ,size-var))) + (make-font ,size-var))) (let ((*font* (aref *fonts* ,size-var))) ,@body)))) --- /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/03 22:03:08 1.25 +++ /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/05 00:53:41 1.26 @@ -1,16 +1,5 @@ (in-package :sdl) -(defvar *fonts-directory* - (merge-pathnames (make-pathname :directory '(:relative "Fonts")) - (make-pathname :directory (pathname-directory *load-truename*)))) - -(defgeneric glyph (font glyph-no)) -(defgeneric glyph-offsets (font glyph-no) - (:documentation "Return two values, DX and DY to be added to the reference point of -a glyph in order to obtain its upper-left corner. If (as is usually the case) -the reference point is somewhere inside the bounding box of the glyph, this -means that both the values returned are negative")) - (defgeneric staff-line-distance (font)) (defgeneric staff-line-offsets (font)) (defgeneric stem-offsets (font)) @@ -33,8 +22,7 @@ point of a hanging or sitting beam respectively")) (defclass font () - ((gf-font :initarg :gf-font :reader gf-font) - ;; The distance in pixels between the upper edge of two + (;; The distance in pixels between the upper edge of two ;; adjacent staff lines. (staff-line-distance :initarg :staff-line-distance :reader staff-line-distance) ;; An integer value indicating how many non-white pixels are @@ -120,8 +108,7 @@ (beam-offset-down) (beam-offset-up) (beam-hang-sit-offset :reader beam-hang-sit-offset) - (designs :initform (make-hash-table :test #'eq)) - (glyphs :initarg :glyphs :reader glyphs))) + (designs :initform (make-hash-table :test #'eq)))) (defmethod initialize-instance :after ((font font) &rest initargs &key &allow-other-keys) (declare (ignore initargs)) @@ -200,53 +187,6 @@ (let ((beam-thickness (- beam-offset-down beam-offset-up))) (/ (- beam-thickness staff-line-thickness) 2))))) -(defgeneric gf-char (glyph)) -(defgeneric pixmap (glyph)) -(defgeneric (setf pixmap) (glyph pixmap)) - -(defclass glyph () - ((gf-char :initarg :gf-char :reader gf-char) - (x-offset) - (y-offset) - (pixmap :initform nil :initarg :pixmap :accessor pixmap))) - -(defmethod initialize-instance :after ((glyph glyph) &rest initargs &key &allow-other-keys) - (declare (ignore initargs)) - (with-slots (gf-char x-offset y-offset) glyph - (setf x-offset (floor (gf-char-min-m gf-char) 4) - ;; adding 1 to gv-char-max-n is necessary because - ;; of a discrepancy between the GF documentation - ;; and the GF file format - y-offset (- (ceiling (1+ (gf-char-max-n gf-char)) 4))))) - -(defmethod glyph ((font font) glyph-no) - (with-slots (gf-char pixmap) (aref (glyphs font) glyph-no) - (let ((left (floor (gf-char-min-m gf-char) 4)) - (right (ceiling (1+ (gf-char-max-m gf-char)) 4)) - (down (floor (gf-char-min-n gf-char) 4)) - ;; adding 1 to gv-char-max-n is necessary because - ;; of a discrepancy between the GF documentation - ;; and the GF file format - (up (ceiling (1+ (gf-char-max-n gf-char)) 4)) - (matrix (gf-char-matrix gf-char))) - (unless pixmap - (setf pixmap (make-array (list (- up down) (- right left)) - :element-type '(unsigned-byte 8) - :initial-element 16)) - (loop for r from 0 below (car (array-dimensions matrix)) - for y downfrom (gf-char-max-n gf-char) by 1 do - (loop for c from 0 below (cadr (array-dimensions matrix)) - for x from (gf-char-min-m gf-char) do - (decf (aref pixmap - (- up (ceiling (1+ y) 4)) - (- (floor x 4) left)) - (aref matrix r c)))))) - pixmap)) - -(defmethod glyph-offsets ((font font) glyph-no) - (with-slots (x-offset y-offset) (aref (glyphs font) glyph-no) - (values x-offset y-offset))) - ;;; the DOWN staff line offset is a nonnegative integer, and the UP ;;; staff line offset is a negative integer. This way, both of them ;;; should be ADDED to a reference y value to obtain the lower and @@ -294,19 +234,8 @@ (with-slots (beam-offset-down beam-offset-up) font (values beam-offset-down beam-offset-up))) -(defun load-font (staff-line-distance) - (let* ((gf-font (parse-gf-file (merge-pathnames - (format nil "sdl~a.gf" staff-line-distance) - *fonts-directory*))) - (maxchar (reduce #'max (gf-font-chars gf-font) :key #'gf-char-no)) - (glyphs (make-array (list (1+ maxchar)) :initial-element nil))) - (loop for char in (gf-font-chars gf-font) - do (setf (aref glyphs (gf-char-no char)) - (make-instance 'glyph :gf-char char))) - (make-instance 'font - :staff-line-distance staff-line-distance - :gf-font gf-font - :glyphs glyphs))) +(defun make-font (staff-line-distance) + (make-instance 'font :staff-line-distance staff-line-distance)) (defgeneric xyscale (thing kx ky))

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 05 Jun '06

05 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv4321 Modified Files: score-pane.lisp packages.lisp gsharp.asd Removed Files: charmap.lisp Log Message: Removed code (which was not used anyway) for drawing stacks of notes. I intend to do that differently anyway, by having special versions of glyphs for individual noteheads that have other noteheads above or below. Removed references to old GF glyphs of the form +glyph-xxx+. Removed the file charmap.lisp that contained glyph numbers in GF file. --- /project/gsharp/cvsroot/gsharp/score-pane.lisp 2006/06/03 21:26:07 1.27 +++ /project/gsharp/cvsroot/gsharp/score-pane.lisp 2006/06/05 00:26:18 1.28 @@ -174,41 +174,6 @@ (y1 (- dy (staff-step staff-step)))) (draw-pixmap* pane pixmap x1 y1))))) -;;; Given a pane, an x position (measured in pixels) a y position -;;; (measured in staff steps), a glyph to draw a the bottom of the stack -;;; a glyph to draw at the top of the stack, a glyph to draws in the middle -;;; of the stack, and the number of elements of the stack, draw the stack -;;; by first drawing the lower glyph, then the intermediate glyphs, and -;;; finally the upper glyph. -;;; It appears that this function increases the staff step in each iteration, -;;; which seems incomptible with the way draw-antialiased-glyph appears to work. -;;; This function is currently used only by the three draw-xxx-stack functions, -;;; which in turn are currently not used. -(defun draw-stack (pane glyph-lower glyph-upper glyph-two x staff-step how-many) - (draw-antialiased-glyph pane glyph-lower x staff-step) - (loop for ss from staff-step by 2 - repeat (1- how-many) do - (draw-antialiased-glyph pane glyph-two x ss)) - (draw-antialiased-glyph pane glyph-upper x (+ staff-step (* 2 (1- how-many))))) - -;;; Draw a stack of whole-note noteheads -;;; This function is currently not used. -(defun draw-whole-stack (pane x staff-step how-many) - (draw-stack pane +glyph-whole-lower+ +glyph-whole-upper+ +glyph-whole-two+ - x staff-step how-many)) - -;;; draw a stack of half-note noteheads -;;; This function is currently not used. -(defun draw-half-stack (pane x staff-step how-many) - (draw-stack pane +glyph-half-lower+ +glyph-half-upper+ +glyph-half-two+ - x staff-step how-many)) - -;;; draw a stack of filled noteheads. -;;; This function is currently not used. -(defun draw-filled-stack (pane x staff-step how-many) - (draw-stack pane +glyph-filled-lower+ +glyph-filled-upper+ +glyph-filled-two+ - x staff-step how-many)) - ;;;;;;;;;;;;;;;;;; helper macro ;;; This macro is currently not used. (And probably never will be --- /project/gsharp/cvsroot/gsharp/packages.lisp 2006/06/05 00:06:16 1.52 +++ /project/gsharp/cvsroot/gsharp/packages.lisp 2006/06/05 00:26:18 1.53 @@ -40,99 +40,7 @@ #:ledger-line-x-offsets #:ledger-line-y-offsets #:notehead-right-offsets #:notehead-left-offsets #:load-font #:glyph-offsets #:suspended-note-offset - #:beam-offsets #:beam-hang-sit-offset - #:+glyph-whole+ #:+glyph-whole-upper+ #:+glyph-whole-lower+ #:+glyph-whole-two+ - #:+glyph-half+ #:+glyph-half-upper+ #:+glyph-half-lower+ #:+glyph-half-two+ - #:+glyph-filled+ #:+glyph-filled-upper+ #:+glyph-filled-lower+ #:+glyph-filled-two+ - #:+glyph-sharp+ #:+glyph-natural+ #:+glyph-flat+ #:+glyph-double-sharp+ - #:+glyph-double-flat+ #:+glyph-g-clef+ #:+glyph-f-clef+ #:+glyph-c-clef+ - #:+glyph-dot+ #:+glyph-whole-rest+ #:+glyph-half-rest+ #:+glyph-quarter-rest+ - #:+glyph-eighth-rest+ #:+glyph-sixteenth-rest+ #:+glyph-thirtysecondth-rest+ - #:+glyph-sixtyfourth-rest+ #:+glyph-onehundredandtwentyeigth-rest+ - #:+glyph-flags-down-one+ #:+glyph-flags-down-two+ #:+glyph-flags-down-three+ - #:+glyph-flags-down-four+ #:+glyph-flags-down-five+ #:+glyph-flags-up-one+ - #:+glyph-flags-up-two+ #:+glyph-flags-up-three+ #:+glyph-flags-up-four+ - #:+glyph-flags-up-five+ - #:+glyph-small-tie-one-up+ - #:+glyph-small-tie-one-up-light+ - #:+glyph-small-tie-two-up+ - #:+glyph-small-tie-two-up-light+ - #:+glyph-small-tie-three-up+ - #:+glyph-small-tie-three-up-light+ - #:+glyph-small-tie-four-up+ - #:+glyph-small-tie-four-up-light+ - #:+glyph-small-tie-five-up+ - #:+glyph-small-tie-five-up-light+ - #:+glyph-small-tie-six-up+ - #:+glyph-small-tie-six-up-light+ - #:+glyph-small-tie-seven-up+ - #:+glyph-small-tie-seven-up-light+ - #:+glyph-small-tie-eight-up+ - #:+glyph-small-tie-eight-up-light+ - #:+glyph-small-tie-one-down+ - #:+glyph-small-tie-one-down-light+ - #:+glyph-small-tie-two-down+ - #:+glyph-small-tie-two-down-light+ - #:+glyph-small-tie-three-down+ - #:+glyph-small-tie-three-down-light+ - #:+glyph-small-tie-four-down+ - #:+glyph-small-tie-four-down-light+ - #:+glyph-small-tie-five-down+ - #:+glyph-small-tie-five-down-light+ - #:+glyph-small-tie-six-down+ - #:+glyph-small-tie-six-down-light+ - #:+glyph-small-tie-seven-down+ - #:+glyph-small-tie-seven-down-light+ - #:+glyph-small-tie-eight-down+ - #:+glyph-small-tie-eight-down-light+ - #:+glyph-large-tie-one-up+ - #:+glyph-large-tie-one-up-light+ - #:+glyph-large-tie-two-up+ - #:+glyph-large-tie-two-up-light+ - #:+glyph-large-tie-three-up+ - #:+glyph-large-tie-three-up-light+ - #:+glyph-large-tie-four-up+ - #:+glyph-large-tie-four-up-light+ - #:+glyph-large-tie-five-up+ - #:+glyph-large-tie-five-up-light+ - #:+glyph-large-tie-six-up+ - #:+glyph-large-tie-six-up-light+ - #:+glyph-large-tie-seven-up+ - #:+glyph-large-tie-seven-up-light+ - #:+glyph-large-tie-eight-up+ - #:+glyph-large-tie-eight-up-light+ - #:+glyph-large-tie-nine-up+ - #:+glyph-large-tie-nine-up-light+ - #:+glyph-large-tie-ten-up+ - #:+glyph-large-tie-ten-up-light+ - #:+glyph-large-tie-left-up+ - #:+glyph-large-tie-left-up-light+ - #:+glyph-large-tie-right-up+ - #:+glyph-large-tie-right-up-light+ - #:+glyph-large-tie-one-down+ - #:+glyph-large-tie-one-down-light+ - #:+glyph-large-tie-two-down+ - #:+glyph-large-tie-two-down-light+ - #:+glyph-large-tie-three-down+ - #:+glyph-large-tie-three-down-light+ - #:+glyph-large-tie-four-down+ - #:+glyph-large-tie-four-down-light+ - #:+glyph-large-tie-five-down+ - #:+glyph-large-tie-five-down-light+ - #:+glyph-large-tie-six-down+ - #:+glyph-large-tie-six-down-light+ - #:+glyph-large-tie-seven-down+ - #:+glyph-large-tie-seven-down-light+ - #:+glyph-large-tie-eight-down+ - #:+glyph-large-tie-eight-down-light+ - #:+glyph-large-tie-nine-down+ - #:+glyph-large-tie-nine-down-light+ - #:+glyph-large-tie-ten-down+ - #:+glyph-large-tie-ten-down-light+ - #:+glyph-large-tie-left-down+ - #:+glyph-large-tie-left-down-light+ - #:+glyph-large-tie-right-down+ - #:+glyph-large-tie-right-down-light+)) + #:beam-offsets #:beam-hang-sit-offset)) (defpackage :score-pane (:use :clim :clim-extensions :clim-lisp :sdl :esa) --- /project/gsharp/cvsroot/gsharp/gsharp.asd 2006/06/05 00:06:16 1.10 +++ /project/gsharp/cvsroot/gsharp/gsharp.asd 2006/06/05 00:26:18 1.11 @@ -27,7 +27,6 @@ "bezier" "mf" "sdl" - "charmap" "score-pane" "buffer" "numbering"

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 05 Jun '06

05 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv2507 Removed Files: glyphs.lisp postscript.lisp Log Message: Removed useless files.

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 05 Jun '06

05 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv2358 Modified Files: packages.lisp gsharp.asd Log Message: Removed entry "glyphs.lisp" which contained glyphs from Common Music Notaion and that we are now sure that we will not need. Removed entry "postscript.lisp" because we are now sure that we will not need it. --- /project/gsharp/cvsroot/gsharp/packages.lisp 2006/05/29 19:55:24 1.51 +++ /project/gsharp/cvsroot/gsharp/packages.lisp 2006/06/05 00:06:16 1.52 @@ -231,32 +231,6 @@ #:timeline #:timelines #:elasticity #:smallest-gap #:elasticity-function)) -(defpackage :gsharp-postscript - (:use :clim :clim-lisp) - (:export #:postscript-path #:make-postscript-path - #:draw-design #:medium-draw-design - #:newpath #:lineto #:curveto #:moveto - #:rlineto #:circle)) - -(defpackage :gsharp-glyphs - (:use :clim :clim-lisp :gsharp-postscript) - (:export #:treble-clef #:percussion-clef #:c-clef #:bass-clef #:turn - #:mordent #:double-mordent #:trill-section #:trill-sections - #:arpeggio #:arpeggios #:tr #:accent #:tnecca #:breath-mark - #:caesura #:fermata #:upside-down-fermata #:repeat-sign - #:upper-bracket #:lower-bracket #:segno #:coda #:pedal-off - #:ped #:left-paren #:right-paren #:wedge #:down-bow #:up-bow - #:zero #:one #:two #:three #:four #:five #:six #:seven - #:eight #:nine #:common-time #:cut-time #:plus #:sharp #:flat - #:double-sharp #:natural #:double-flat #:f #:p #:lig-p #:m - #:n #:niente #:subito #:z #:s #:r #:double-whole-note - #:whole-note #:half-note #:quarter-note #:diamond #:diamond-1 - #:filled-diamond-1 #:rhythmx #:circled-x #:slash #:mslash - #:triangle #:square #:8th-flag-up #:extend-flag-up - #:8th-flag-down #:extend-flag-down #:whole-rest #:half-rest - #:quarter-rest #:8th-rest #:16th-rest #:32nd-rest #:64th-rest - #:128th-rest #:measure-rest #:double-whole-rest)) - (defpackage :gsharp-beaming (:use :common-lisp) (:export #:beaming-single #:beaming-double)) --- /project/gsharp/cvsroot/gsharp/gsharp.asd 2006/05/29 19:55:24 1.9 +++ /project/gsharp/cvsroot/gsharp/gsharp.asd 2006/06/05 00:06:16 1.10 @@ -33,8 +33,6 @@ "numbering" "Obseq/obseq" "measure" - "postscript" - "glyphs" "beaming" "elasticity" "drawing"

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 03 Jun '06

03 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv19234 Modified Files: sdl.lisp Log Message: Fixed the flags. --- /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/03 05:40:07 1.24 +++ /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/03 22:03:08 1.25 @@ -1322,7 +1322,6 @@ extreme-point & extreme-point ++ (c (- (round (* 0.88 sld)) st) (* -2.5 sld)) up ++ - (c (* 0.75 sld) (* -2.5 sld)) up ++ (c 0 (* -1.3 sld)) & (c 0 (* -1.3 sld)) -- (c 0 0))))) @@ -1333,7 +1332,6 @@ extreme-point & extreme-point ++ (c (- (round (* 0.88 sld)) st) (* -2.5 sld)) up ++ - (c (* 0.75 sld) (* -2.6 sld)) up ++ (direction #c(-1 2)) (c 0 (* (- -1.3 0.625) sld)) & (c 0 (* (- -1.3 0.625) sld)) -- (c 0 (* -1.4 sld))))))

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 03 Jun '06

03 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv12624 Modified Files: score-pane.lisp Log Message: Fixed the y offset of stems wrt the reference point of the notehead which generated ugly PS output. --- /project/gsharp/cvsroot/gsharp/score-pane.lisp 2006/06/02 14:11:10 1.26 +++ /project/gsharp/cvsroot/gsharp/score-pane.lisp 2006/06/03 21:26:07 1.27 @@ -429,13 +429,11 @@ (defun draw-right-stem (pane x y1 y2) (multiple-value-bind (dx dy) (notehead-right-offsets *font*) - (declare (ignore dy)) - (draw-stem pane (+ x dx) y1 y2))) + (draw-stem pane (+ x dx) (- y1 dy) y2))) (defun draw-left-stem (pane x y1 y2) (multiple-value-bind (dx dy) (notehead-left-offsets *font*) - (declare (ignore dy)) - (draw-stem pane (+ x dx) y1 y2))) + (draw-stem pane (+ x dx) (- y1 dy) y2))) ;;;;;;;;;;;;;;;;;; ledger line

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 03 Jun '06

03 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv23201 Modified Files: sdl.lisp Log Message: Improved F-clef. This gave me the opportunity to use the Metafont `curl' operator for the first time. --- /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/03 04:59:56 1.23 +++ /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/03 05:40:07 1.24 @@ -666,7 +666,7 @@ (xc (+ xa bigdot-diameter)) (yc ya) (xd xb) (xe (* 0.85 sld)) (ye (- sld (* 2.0 staff-line-thickness))) - (xf (round (* 1.5 sld))) (yf (- 0.5 sld)) + (xf (round (* 1.5 sld))) (yf (- 0.3 sld)) (xg 0.0) (yg (* -2.5 sld)) (xh (+ xf (round (* 0.5 sld)))) (yh yf) (xi sld) (yi sld) @@ -679,12 +679,12 @@ left (c xd yd) & (c xd yd) ++ (c xe ye) right ++ - (c xf yf) down ++ + (c xf yf) (direction #c(-0.2 -1)) ++ (curl 3) (c xg yg) & (c xg yg) -- (c xg (1- yg)) & - (c xg (1- yg)) ++ - (c xh yh) up ++ + (c xg (1- yg)) (curl 3) ++ + (c xh yh) (direction #c(0.2 1)) ++ (c xi yi) left ++ cycle))) (clim:region-union (translate p (c 0 staff-line-thickness))

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 03 Jun '06

03 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv18042 Modified Files: sdl.lisp Log Message: Increase the size of the dot slightly. --- /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/03 04:45:42 1.22 +++ /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/03 04:59:56 1.23 @@ -761,12 +761,14 @@ ;;; both vertically and horizontally. ;;; Ross says the dot should be roughly a third of the staff line -;;; distance. We count on anti aliasing to save us from too ugly a -;;; result when the edges do not fall on pixel boundaries. +;;; distance, but in his examples, it is closer to half a staff line +;;; distance. Compromise by using 0.4. We count on anti aliasing to +;;; save us from too ugly a result when the edges do not fall on pixel +;;; boundaries. (defmethod compute-design ((font font) (shape (eql :dot))) (with-slots (yoffset staff-line-distance) font - (let ((diameter (* 0.33 staff-line-distance))) + (let ((diameter (* 0.4 staff-line-distance))) (translate (scale +full-circle+ diameter) (complex yoffset yoffset)))))

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 03 Jun '06

03 Jun '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv16278 Modified Files: sdl.lisp Log Message: Fixed the reference point of the whole and half rests. --- /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/02 13:17:35 1.21 +++ /project/gsharp/cvsroot/gsharp/sdl.lisp 2006/06/03 04:45:42 1.22 @@ -1225,18 +1225,20 @@ ;;; Rests (defmethod compute-design ((font font) (shape (eql :whole-rest))) - (with-slots ((sld staff-line-distance) notehead-width xoffset yoffset) font + (with-slots ((sld staff-line-distance) (slt staff-line-thickness) + notehead-width xoffset yoffset) font (flet ((c (x y) (complex x y))) - (translate (xyscale (translate +unit-square+ #c(-0.5 0)) + (translate (xyscale +unit-square+ notehead-width (* 0.5 sld)) - (c xoffset (+ yoffset (* 0.5 sld))))))) + (c xoffset (+ yoffset sld (- (* 0.25 sld)) (- (* 0.5 slt)))))))) (defmethod compute-design ((font font) (shape (eql :half-rest))) - (with-slots ((sld staff-line-distance) notehead-width xoffset yoffset) font + (with-slots ((sld staff-line-distance) (slt staff-line-thickness) + notehead-width xoffset yoffset) font (flet ((c (x y) (complex x y))) - (translate (xyscale (translate +unit-square+ #c(-0.5 0)) + (translate (xyscale +unit-square+ notehead-width (* 0.5 sld)) - (c xoffset yoffset))))) + (c xoffset (+ yoffset (* 0.25 sld) (* 0.5 slt))))))) (defmethod compute-design ((font font) (shape (eql :quarter-rest))) (with-slots ((sld staff-line-distance) stem-thickness) font

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

gsharp-cvs June 2006