gsharp-cvs

gsharp-cvs@common-lisp.net

396 discussions

[gsharp-cvs] CVS gsharp
by crhodes 18 Oct '07

18 Oct '07

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv30948 Modified Files: gsharp.asd packages.lisp Log Message: Add MusicXML support. Initial work from Brian Gruber (funded by Google's Summer of Code); subsequent development by Christophe Rhodes. It's far from perfect now, but it needs checking in so that people can play with it. It adds dependencies (puri and cxml) to gsharp; if this is a problem, we could make gsharp-mxml a separate system. Git logs (from git tree at <http://www-jcsu.jesus.cam.ac.uk/~csr21/git/gsharp-mxml/.git>) follow: commit 994cd15ec9f480be41515e699f22e7de1687d0ca Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Mon Sep 24 13:19:41 2007 +0100 Add a restart to the same-duration case. It's not good enough, but it allows interactive fixing key signatures in the middle of the bar. commit cdc2098fac5399303e9515bc81ea65020ec8f109 Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Wed Sep 19 11:07:28 2007 +0100 Only add durations from rhythmic elements. commit acc6cb410cd55dfe59eb30fe608b101a62651ae9 Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Wed Sep 19 10:45:12 2007 +0100 Whoops. Fix export of notes with no displayed accidentals (from overzealous alteration of CASE -> ECASE commit dd8d72cac434a8c5a1932aa46db6447e08d9b6ad Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Wed Sep 19 10:41:09 2007 +0100 Support for longs in MusicXML (import and export) commit eab440b56b086e766dbd405a3fea44d9976f1a1f Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Wed Sep 19 09:16:07 2007 +0100 Long ("lunga") patch from HEAD commit 8cb34a4879ebb4dce06d8b99da761dfa6ad24cf9 Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Tue Sep 18 15:43:51 2007 +0100 Support semi- and sesqui- accidentals commit 6ba8208d1f8475552a95f35a5e896248110b0efd Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Tue Sep 18 15:25:16 2007 +0100 Really support breves (and breve rests) -- on output too. commit a9c36278de0145c12f34123a29815809030b97c2 Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Tue Sep 18 15:17:09 2007 +0100 Slightly batched commit (several changes). * support :breve noteheads * better stringcase macro (and use it) * temporarily hack in "full" = "breve" for Goldsmiths use * use ECASE in one or two places to remove compiler warnings. commit 3a3b980576f0d09ddee4de12f6f7b260932a5552 Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Tue Sep 18 15:14:54 2007 +0100 Slightly friendlier (with friends like this...) Import and Export commands. Sets the filepath and name of the buffer on import; sensible export default pathname. commit 7d72a2a4a28f9668271189ebaf862518ada34877 Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Tue Sep 18 15:13:31 2007 +0100 Whitespace commit b497d6f5111f20f5e8ac9a059578d3caaab1b832 Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Mon Sep 17 21:33:29 2007 +0100 space requirements fix from HEAD commit 65d173efbcfa78e5edaf1adb9bceb0f7d619002d Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Mon Sep 17 12:04:08 2007 +0100 Update to Brian Gruber's version of 17th September commit 91d98d9e2a8d69418edd264ab6293a2f1dbc5a9f Author: Christophe Rhodes <csr21(a)omega.localdomain> Date: Mon Sep 17 11:54:53 2007 +0100 Brian Gruber's patch of August 20th --- /project/gsharp/cvsroot/gsharp/gsharp.asd 2007/07/11 15:28:13 1.16 +++ /project/gsharp/cvsroot/gsharp/gsharp.asd 2007/10/18 15:02:47 1.17 @@ -20,7 +20,7 @@ :defaults *gsharp-directory*)) collect `(:file ,(pathname-name p) :pathname ,p)))))) -(gsharp-defsystem (:gsharp :depends-on (:mcclim :flexichain :midi)) +(gsharp-defsystem (:gsharp :depends-on (:mcclim :flexichain :midi :puri :cxml)) "packages" "utilities" "mf" @@ -38,4 +38,6 @@ "modes" "play" "gui" - "fontview") + "fontview" + "Mxml/mxml" + "Mxml/commands") --- /project/gsharp/cvsroot/gsharp/packages.lisp 2007/08/07 11:06:09 1.62 +++ /project/gsharp/cvsroot/gsharp/packages.lisp 2007/10/18 15:02:47 1.63 @@ -177,6 +177,10 @@ #:play-segment #:play-buffer)) +(defpackage :gsharp-mxml + (:use :cl :gsharp-buffer :gsharp-measure) + (:shadowing-import-from :gsharp-buffer #:rest)) + (defpackage :gsharp (:use :clim :clim-lisp :gsharp-utilities :esa :esa-buffer :esa-io :gsharp-buffer :gsharp-cursor :gsharp-drawing :gsharp-numbering

1 0

[gsharp-cvs] CVS gsharp/Mxml/mxml-dtds
by crhodes 18 Oct '07

18 Oct '07

Update of /project/gsharp/cvsroot/gsharp/Mxml/mxml-dtds In directory clnet:/tmp/cvs-serv30700/Mxml/mxml-dtds Log Message: Directory /project/gsharp/cvsroot/gsharp/Mxml/mxml-dtds added to the repository

1 0

[gsharp-cvs] CVS gsharp/Mxml/tests
by crhodes 18 Oct '07

18 Oct '07

Update of /project/gsharp/cvsroot/gsharp/Mxml/tests In directory clnet:/tmp/cvs-serv30659/Mxml/tests Log Message: Directory /project/gsharp/cvsroot/gsharp/Mxml/tests added to the repository

1 0

[gsharp-cvs] CVS gsharp/Mxml
by crhodes 18 Oct '07

18 Oct '07

Update of /project/gsharp/cvsroot/gsharp/Mxml In directory clnet:/tmp/cvs-serv30616/Mxml Log Message: Directory /project/gsharp/cvsroot/gsharp/Mxml added to the repository

1 0

[gsharp-cvs] CVS gsharp
by crhodes 18 Sep '07

18 Sep '07

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv16629 Modified Files: buffer.lisp drawing.lisp gui.lisp score-pane.lisp sdl.lisp Log Message: Support long ("lunga") notes and rests. It's a bit weird, because the lunga has the same notehead as a breve, but also has a stem; so having a NOTEHEAD of :long is a bit of a misnomer. Hey ho. --- /project/gsharp/cvsroot/gsharp/buffer.lisp 2007/09/14 15:57:21 1.52 +++ /project/gsharp/cvsroot/gsharp/buffer.lisp 2007/09/18 21:19:03 1.53 @@ -195,9 +195,9 @@ ;;; ;;; The staff is a staff object. ;;; -;;; Head can be :breve, :whole, :half, :filled, or nil. A value of -;;; nil means that the notehead is determined by that of the cluster -;;; to which the note belongs. +;;; Head can be :long, :breve, :whole, :half, :filled, or nil. A +;;; value of nil means that the notehead is determined by that of the +;;; cluster to which the note belongs. ;;; ;;; Accidentals can be :natural :flat :double-flat :sharp or :double-sharp. ;;; The default is :natural. Whether a note is actually displayed @@ -217,7 +217,7 @@ (pitch :initarg :pitch :reader pitch :type (integer 0 127)) (staff :initarg :staff :reader staff :type staff) (head :initform nil :initarg :head :reader head - :type (or (member :breve :whole :half :filled) null)) + :type (or (member :long :breve :whole :half :filled) null)) (accidentals :initform :natural :initarg :accidentals :reader accidentals ;; FIXME: we want :TYPE ACCIDENTAL here but need to ;; sort out order of definition for that to be useful. @@ -231,7 +231,7 @@ (defun make-note (pitch staff &rest args &key head (accidentals :natural) dots) (declare (type (integer 0 127) pitch) (type staff staff) - (type (or (member :breve :whole :half :filled) null) head) + (type (or (member :long :breve :whole :half :filled) null) head) ;; FIXME: :TYPE ACCIDENTAL #+nil #+nil (type (member :natural :flat :double-flat :sharp :double-sharp) @@ -418,6 +418,7 @@ (defmethod undotted-duration ((element rhythmic-element)) (ecase (notehead element) + (:long 4) (:breve 2) (:whole 1) (:half 1/2) @@ -540,7 +541,7 @@ (defun make-cluster (&rest args &key (notehead :filled) (lbeams 0) (rbeams 0) (dots 0) (xoffset 0) notes (stem-direction :auto)) - (declare (type (member :breve :whole :half :filled) notehead) + (declare (type (member :long :breve :whole :half :filled) notehead) (type (integer 0 5) lbeams) (type (integer 0 5) rbeams) (type (integer 0 3) dots) @@ -627,7 +628,7 @@ (dots 0) (xoffset 0)) (declare (type staff staff) (type integer staff-pos) - (type (member :breve :whole :half :filled) notehead) + (type (member :long :breve :whole :half :filled) notehead) (type (integer 0 5) lbeams) (type (integer 0 5) rbeams) (type (integer 0 3) dots) @@ -673,7 +674,7 @@ &key (notehead :filled) (lbeams 0) (rbeams 0) (dots 0) (xoffset 0)) (declare (type staff staff) - (type (member :breve :whole :half :filled) notehead) + (type (member :long :breve :whole :half :filled) notehead) (type (integer 0 5) lbeams) (type (integer 0 5) rbeams) (type (integer 0 3) dots) --- /project/gsharp/cvsroot/gsharp/drawing.lisp 2007/09/14 15:48:05 1.83 +++ /project/gsharp/cvsroot/gsharp/drawing.lisp 2007/09/18 21:19:03 1.84 @@ -325,7 +325,7 @@ (elements (elements bar))) (and (null (cdr elements)) (typep element 'rest) - (member (notehead element) '(:breve :whole))))) + (member (notehead element) '(:long :breve :whole))))) (defun compute-measure-coordinates (measure x y force) (loop with timelines = (timelines measure) --- /project/gsharp/cvsroot/gsharp/gui.lisp 2007/09/17 20:30:59 1.86 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2007/09/18 21:19:03 1.87 @@ -754,10 +754,11 @@ (define-duration-altering-command com-rotate-notehead () (setf (notehead element) (ecase (notehead element) + (:breve :long) (:whole :breve) (:half :whole) (:filled :half) - (:breve :filled))))) + (:long :filled))))) (define-gsharp-command com-rotate-stem-direction () (setf (stem-direction (cur-cluster)) @@ -1302,10 +1303,11 @@ (define-gsharp-command com-istate-rotate-notehead () (setf (notehead (input-state *application-frame*)) (ecase (notehead (input-state *application-frame*)) + (:breve :long) (:whole :breve) (:half :whole) (:filled :half) - (:breve :filled)))) + (:long :filled)))) (define-gsharp-command com-istate-rotate-stem-direction () (setf (stem-direction (input-state *application-frame*)) --- /project/gsharp/cvsroot/gsharp/score-pane.lisp 2007/09/14 15:48:05 1.38 +++ /project/gsharp/cvsroot/gsharp/score-pane.lisp 2007/09/18 21:19:03 1.39 @@ -132,7 +132,7 @@ (defun draw-notehead (stream name x staff-step) (sdl::draw-shape stream *font* (ecase name - (:breve :breve-notehead) + ((:breve :long) :breve-notehead) (:whole :whole-notehead) (:half :half-notehead) (:filled :filled-notehead)) @@ -175,6 +175,7 @@ (defun draw-rest (stream duration x staff-step) (sdl::draw-shape stream *font* (ecase duration + (4 :long-rest) (2 :breve-rest) (1 :whole-rest) (1/2 :half-rest) --- /project/gsharp/cvsroot/gsharp/sdl.lisp 2007/09/14 15:48:05 1.36 +++ /project/gsharp/cvsroot/gsharp/sdl.lisp 2007/09/18 21:19:03 1.37 @@ -1352,6 +1352,12 @@ ;;; ;;; Rests +(defmethod compute-design ((font font) (shape (eql :long-rest))) + (with-slots ((sld staff-line-distance) (slt staff-line-thickness) + notehead-width xoffset yoffset) font + (translate (xyscale +unit-square+ (/ notehead-width 2) (* 2 sld)) + (complex xoffset (+ yoffset (- (* 0.5 slt))))))) + (defmethod compute-design ((font font) (shape (eql :breve-rest))) (with-slots ((sld staff-line-distance) (slt staff-line-thickness) notehead-width xoffset yoffset) font

1 0

[gsharp-cvs] CVS gsharp
by crhodes 17 Sep '07

17 Sep '07

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv21920 Modified Files: gui.lisp Log Message: More likely space requirements handling. (More likely to actually work, that is. Thanks to Athas and hefner for the ideas and the debugging patience.) --- /project/gsharp/cvsroot/gsharp/gui.lisp 2007/09/14 15:52:57 1.85 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2007/09/17 20:30:59 1.86 @@ -203,9 +203,9 @@ (draw-the-cursor pane (current-cursor) (cursor-element (current-cursor)) (last-note (input-state *application-frame*))) (multiple-value-bind (minx miny maxx maxy) - (bounding-rectangle* pane) + (bounding-rectangle* (stream-output-history pane)) (declare (ignore minx maxx)) - (change-space-requirements pane :height (- maxy miny)))))) + (change-space-requirements pane :height (+ maxy miny)))))) (defmethod window-clear ((pane score-pane:score-pane)) (let ((output-history (stream-output-history pane)))

1 0

[gsharp-cvs] CVS gsharp
by crhodes 14 Sep '07

14 Sep '07

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv14769 Modified Files: buffer.lisp Log Message: Allow clefs to be put on lines 0 and 8 of a staff. (Necessary for the Soprano C clef, found in early music). Note that key signature display code will probably have to be reworked to cater for such outlandish clefs. --- /project/gsharp/cvsroot/gsharp/buffer.lisp 2007/09/14 15:48:05 1.51 +++ /project/gsharp/cvsroot/gsharp/buffer.lisp 2007/09/14 15:57:21 1.52 @@ -59,11 +59,11 @@ (defclass clef (gsharp-object name-mixin) ((print-character :allocation :class :initform #\K) (lineno :reader lineno :initarg :lineno - :type (or (integer 2 6) null)))) + :type (or (integer 0 8) null)))) (defun make-clef (name &key lineno) (declare (type (member :treble :treble8 :bass :c :percussion) name) - (type (or (integer 2 6) null) lineno)) + (type (or (integer 0 8) null) lineno)) (when (null lineno) (setf lineno (ecase name

1 0

[gsharp-cvs] CVS gsharp
by crhodes 14 Sep '07

14 Sep '07

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv14666 Modified Files: gui.lisp Log Message: Reverse the notehead rotation order for C-r. I apologise if this destroys someone's finger macros, but the current order is too illogical in the default state. --- /project/gsharp/cvsroot/gsharp/gui.lisp 2007/09/14 15:48:05 1.84 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2007/09/14 15:52:57 1.85 @@ -754,10 +754,10 @@ (define-duration-altering-command com-rotate-notehead () (setf (notehead element) (ecase (notehead element) - (:breve :whole) - (:whole :half) - (:half :filled) - (:filled :breve))))) + (:whole :breve) + (:half :whole) + (:filled :half) + (:breve :filled))))) (define-gsharp-command com-rotate-stem-direction () (setf (stem-direction (cur-cluster)) @@ -1302,10 +1302,10 @@ (define-gsharp-command com-istate-rotate-notehead () (setf (notehead (input-state *application-frame*)) (ecase (notehead (input-state *application-frame*)) - (:breve :whole) - (:whole :half) - (:half :filled) - (:filled :breve)))) + (:whole :breve) + (:half :whole) + (:filled :half) + (:breve :filled)))) (define-gsharp-command com-istate-rotate-stem-direction () (setf (stem-direction (input-state *application-frame*))

1 0

[gsharp-cvs] CVS gsharp
by crhodes 14 Sep '07

14 Sep '07

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv13687 Modified Files: buffer.lisp drawing.lisp gui.lisp score-pane.lisp sdl.lisp Log Message: Support for breves and breve rests. --- /project/gsharp/cvsroot/gsharp/buffer.lisp 2007/07/12 16:04:49 1.50 +++ /project/gsharp/cvsroot/gsharp/buffer.lisp 2007/09/14 15:48:05 1.51 @@ -195,9 +195,9 @@ ;;; ;;; The staff is a staff object. ;;; -;;; Head can be :whole, :half, :filled, or nil. A value of nil means -;;; that the notehead is determined by that of the cluster to which the -;;; note belongs. +;;; Head can be :breve, :whole, :half, :filled, or nil. A value of +;;; nil means that the notehead is determined by that of the cluster +;;; to which the note belongs. ;;; ;;; Accidentals can be :natural :flat :double-flat :sharp or :double-sharp. ;;; The default is :natural. Whether a note is actually displayed @@ -217,7 +217,7 @@ (pitch :initarg :pitch :reader pitch :type (integer 0 127)) (staff :initarg :staff :reader staff :type staff) (head :initform nil :initarg :head :reader head - :type (or (member :whole :half :filled) null)) + :type (or (member :breve :whole :half :filled) null)) (accidentals :initform :natural :initarg :accidentals :reader accidentals ;; FIXME: we want :TYPE ACCIDENTAL here but need to ;; sort out order of definition for that to be useful. @@ -231,7 +231,7 @@ (defun make-note (pitch staff &rest args &key head (accidentals :natural) dots) (declare (type (integer 0 127) pitch) (type staff staff) - (type (or (member :whole :half :filled) null) head) + (type (or (member :breve :whole :half :filled) null) head) ;; FIXME: :TYPE ACCIDENTAL #+nil #+nil (type (member :natural :flat :double-flat :sharp :double-sharp) @@ -418,6 +418,7 @@ (defmethod undotted-duration ((element rhythmic-element)) (ecase (notehead element) + (:breve 2) (:whole 1) (:half 1/2) (:filled (/ (expt 2 (+ 2 (max (rbeams element) @@ -539,7 +540,7 @@ (defun make-cluster (&rest args &key (notehead :filled) (lbeams 0) (rbeams 0) (dots 0) (xoffset 0) notes (stem-direction :auto)) - (declare (type (member :whole :half :filled) notehead) + (declare (type (member :breve :whole :half :filled) notehead) (type (integer 0 5) lbeams) (type (integer 0 5) rbeams) (type (integer 0 3) dots) @@ -626,7 +627,7 @@ (dots 0) (xoffset 0)) (declare (type staff staff) (type integer staff-pos) - (type (member :whole :half :filled) notehead) + (type (member :breve :whole :half :filled) notehead) (type (integer 0 5) lbeams) (type (integer 0 5) rbeams) (type (integer 0 3) dots) @@ -672,7 +673,7 @@ &key (notehead :filled) (lbeams 0) (rbeams 0) (dots 0) (xoffset 0)) (declare (type staff staff) - (type (member :whole :half :filled) notehead) + (type (member :breve :whole :half :filled) notehead) (type (integer 0 5) lbeams) (type (integer 0 5) rbeams) (type (integer 0 3) dots) --- /project/gsharp/cvsroot/gsharp/drawing.lisp 2007/08/07 11:06:09 1.82 +++ /project/gsharp/cvsroot/gsharp/drawing.lisp 2007/09/14 15:48:05 1.83 @@ -325,7 +325,7 @@ (elements (elements bar))) (and (null (cdr elements)) (typep element 'rest) - (eq (notehead element) :whole)))) + (member (notehead element) '(:breve :whole))))) (defun compute-measure-coordinates (measure x y force) (loop with timelines = (timelines measure) @@ -984,7 +984,7 @@ (loop for group in groups do (draw-notes pane group (dots element) (notehead element) dot-xoffset) (draw-ledger-lines pane x group)) - (unless (eq (notehead element) :whole) + (unless (member (notehead element) '(:whole :breve)) (if (eq direction :up) (score-pane:draw-right-stem pane x --- /project/gsharp/cvsroot/gsharp/gui.lisp 2007/08/07 14:00:09 1.83 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2007/09/14 15:48:05 1.84 @@ -139,7 +139,7 @@ (score-pane:with-vertical-score-position (pane 100) (let ((xpos 30)) (score-pane:draw-notehead pane (notehead state) xpos 4) - (when (not (eq (notehead state) :whole)) + (when (not (member (notehead state) '(:whole :breve))) (when (or (eq (stem-direction state) :auto) (eq (stem-direction state) :down)) (when (eq (notehead state) :filled) @@ -753,10 +753,11 @@ (setf (rbeams element) (max (1- (rbeams element)) 0))) (define-duration-altering-command com-rotate-notehead () (setf (notehead element) - (ecase (notehead element) - (:whole :half) - (:half :filled) - (:filled :whole))))) + (ecase (notehead element) + (:breve :whole) + (:whole :half) + (:half :filled) + (:filled :breve))))) (define-gsharp-command com-rotate-stem-direction () (setf (stem-direction (cur-cluster)) @@ -1301,9 +1302,10 @@ (define-gsharp-command com-istate-rotate-notehead () (setf (notehead (input-state *application-frame*)) (ecase (notehead (input-state *application-frame*)) + (:breve :whole) (:whole :half) (:half :filled) - (:filled :whole)))) + (:filled :breve)))) (define-gsharp-command com-istate-rotate-stem-direction () (setf (stem-direction (input-state *application-frame*)) --- /project/gsharp/cvsroot/gsharp/score-pane.lisp 2007/07/27 22:34:31 1.37 +++ /project/gsharp/cvsroot/gsharp/score-pane.lisp 2007/09/14 15:48:05 1.38 @@ -132,6 +132,7 @@ (defun draw-notehead (stream name x staff-step) (sdl::draw-shape stream *font* (ecase name + (:breve :breve-notehead) (:whole :whole-notehead) (:half :half-notehead) (:filled :filled-notehead)) @@ -174,6 +175,7 @@ (defun draw-rest (stream duration x staff-step) (sdl::draw-shape stream *font* (ecase duration + (2 :breve-rest) (1 :whole-rest) (1/2 :half-rest) (1/4 :quarter-rest) --- /project/gsharp/cvsroot/gsharp/sdl.lisp 2007/08/20 07:14:35 1.35 +++ /project/gsharp/cvsroot/gsharp/sdl.lisp 2007/09/14 15:48:05 1.36 @@ -662,6 +662,23 @@ (translate (scale *filled-path* staff-line-distance) (complex xoffset yoffset)))) +(defmethod compute-design ((font font) (shape (eql :breve-notehead))) + (with-slots (xoffset yoffset (sld staff-line-distance) stem-thickness) font + (let ((top (translate (xyscale (translate +unit-square+ #c(0 0.5)) + (* sld 1.5) (* sld (- 0.53 0.25))) + (* sld #c(0 0.25)))) + (bot (translate (xyscale (translate +unit-square+ #c(0 -0.5)) + (* sld 1.5) (* sld (- 0.53 0.25))) + (* sld #c(0 -0.25)))) + (left (translate (xyscale +unit-square+ stem-thickness (* 1.3 sld)) + (+ (* sld #c(-0.75 0)) (/ stem-thickness 2)))) + (right (translate (xyscale +unit-square+ stem-thickness (* 1.3 sld)) + (- (* sld #c(0.75 0)) (/ stem-thickness 2))))) + (translate + (reduce #'clim:region-union + (list top bot left right)) + (complex xoffset yoffset))))) + (defmethod compute-design ((font font) (shape (eql :whole-notehead))) (with-slots (xoffset yoffset (sld staff-line-distance)) font (let ((op (scale (superellipse #c(0.75 0.0) #c(0.0 0.53) @@ -1335,6 +1352,12 @@ ;;; ;;; Rests +(defmethod compute-design ((font font) (shape (eql :breve-rest))) + (with-slots ((sld staff-line-distance) (slt staff-line-thickness) + notehead-width xoffset yoffset) font + (translate (xyscale +unit-square+ (/ notehead-width 2) sld) + (complex xoffset (+ yoffset (+ (* 0.5 sld)) (- (* 0.5 slt))))))) + (defmethod compute-design ((font font) (shape (eql :whole-rest))) (with-slots ((sld staff-line-distance) (slt staff-line-thickness) notehead-width xoffset yoffset) font

1 0

[gsharp-cvs] CVS gsharp
by rstrandh 30 Aug '07

30 Aug '07

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv12476 Modified Files: measure.lisp Log Message: Fixed the problem with stem direction for a beam group. It was just a typo: instead of calling bot-note-pos to get the position of the bottom note of each cluster, top-note-pos was called. --- /project/gsharp/cvsroot/gsharp/measure.lisp 2007/08/29 15:42:57 1.37 +++ /project/gsharp/cvsroot/gsharp/measure.lisp 2007/08/30 03:04:56 1.38 @@ -215,7 +215,7 @@ (bot-note-pos (loop for element in elements when (non-empty-cluster-p element) - minimize (top-note-pos element)))) + minimize (bot-note-pos element)))) (if (>= (- top-note-pos 4) (- 4 bot-note-pos)) :down :up))))) (loop for element in elements when (non-empty-cluster-p element)

1 0

← Newer
1
2
3
4
5
6
7
8
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

gsharp-cvs