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"