May 2006 - gsharp-cvs@common-lisp.net - mailman3.common-lisp.net

[gsharp-cvs] CVS gsharp
by crhodes 22 May '06

22 May '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv5529 Modified Files: gui.lisp modes.lisp Log Message: Movement by measure, bound to M-C-f and M-C-b. --- /project/gsharp/cvsroot/gsharp/gui.lisp 2006/05/14 07:51:27 1.60 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2006/05/22 13:39:30 1.61 @@ -842,6 +842,22 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; +;;; motion by measure + +(define-gsharp-command com-forward-measure ((count 'integer :prompt "Number of Measures")) + (let ((cursor (current-cursor))) + (loop repeat count do + (loop do (forward-element cursor) + until (end-of-bar-p cursor)))) + +(define-gsharp-command com-backward-measure ((count 'integer :prompt "Number of Measures")) + (let ((cursor (current-cursor))) + (loop repeat count do + (loop do (backward-element cursor) + until (beginning-of-bar-p cursor)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; ;;; delete commands (defun go-to-beginning-of-bar (cursor) --- /project/gsharp/cvsroot/gsharp/modes.lisp 2006/05/14 07:49:55 1.12 +++ /project/gsharp/cvsroot/gsharp/modes.lisp 2006/05/22 13:39:30 1.13 @@ -5,7 +5,10 @@ (set-key `(com-forward-element ,*numeric-argument-marker*) 'global-gsharp-table '((#\f :control))) (set-key `(com-backward-element ,*numeric-argument-marker*) 'global-gsharp-table '((#\b :control))) +(set-key `(com-forward-measure ,*numeric-argument-marker*) 'global-gsharp-table '((#\f :control :meta))) +(set-key `(com-backward-measure ,*numeric-argument-marker*) 'global-gsharp-table '((#\b :control :meta))) (set-key `(com-delete-element ,*numeric-argument-marker*) 'global-gsharp-table '((#\d :control))) + (set-key 'com-insert-measure-bar 'global-gsharp-table '(#\|)) (set-key 'com-erase-element 'global-gsharp-table '((#\h :control)))

1 0

[gsharp-cvs] CVS gsharp/Scores
by crhodes 14 May '06

14 May '06

Update of /project/gsharp/cvsroot/gsharp/Scores In directory clnet:/tmp/cvs-serv27325 Added Files: cris.gsh Log Message: Les Cris De Paris. (100k of save file for two lines of four-part harmony might be considered a bit much...) --- /project/gsharp/cvsroot/gsharp/Scores/cris.gsh 2006/05/14 17:49:58 NONE +++ /project/gsharp/cvsroot/gsharp/Scores/cris.gsh 2006/05/14 17:49:58 1.1 G#V4 [GSHARP-BUFFER:BUFFER :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 30 :left-margin 20 :staves (#1=[GSHARP-BUFFER:FIVELINE-STAFF :name "default staff" :clef [GSHARP-BUFFER:CLEF :name :TREBLE :lineno 2 ] :keysig [GSHARP-BUFFER:KEY-SIGNATURE :xoffset 0 :staff #1# :alterations #(:NATURAL :NATURAL :NATURAL :NATURAL :NATURAL :NATURAL :NATURAL) ] ] #2=[GSHARP-BUFFER:FIVELINE-STAFF :name "alt" :clef [GSHARP-BUFFER:CLEF :name :TREBLE8 :lineno 2 ] :keysig [GSHARP-BUFFER:KEY-SIGNATURE :xoffset 0 :staff #2# :alterations #(:NATURAL :NATURAL :NATURAL :NATURAL :NATURAL :NATURAL :NATURAL) ] ] #3=[GSHARP-BUFFER:FIVELINE-STAFF :name "ten" :clef [GSHARP-BUFFER:CLEF :name :TREBLE8 :lineno 2 ] :keysig [GSHARP-BUFFER:KEY-SIGNATURE :xoffset 0 :staff #3# :alterations #(:NATURAL :NATURAL :NATURAL :NATURAL :NATURAL :NATURAL :NATURAL) ] ] #4=[GSHARP-BUFFER:FIVELINE-STAFF :name "bass" :clef [GSHARP-BUFFER:CLEF :name :BASS :lineno 6 ] :keysig [GSHARP-BUFFER:KEY-SIGNATURE :xoffset 0 :staff #4# :alterations #(:NATURAL :NATURAL :NATURAL :NATURAL :NATURAL :NATURAL :NATURAL) ] ]) :segments ([GSHARP-BUFFER:SEGMENT :layers ([GSHARP-BUFFER:MELODY-LAYER :name "bass" :staves (#4#) :head [GSHARP-BUFFER:SLICE :bars ([GSHARP-BUFFER:MELODY-BAR :elements COMMON-LISP:NIL ]) ] :body [GSHARP-BUFFER:SLICE :bars ([GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 21 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 :tie-right COMMON-LISP:T ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 21 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 :tie-left COMMON-LISP:T ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 21 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 25 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 24 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 :tie-right COMMON-LISP:T ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 24 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 :tie-left COMMON-LISP:T ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:REST :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :staff #4# :staff-pos 4 ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 22 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 22 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 22 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 24 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 :tie-right COMMON-LISP:T ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 24 :staff #4# :head :WHOLE :accidentals :NATURAL :dots 0 :tie-left COMMON-LISP:T ]) ] [GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 23 :staff #4# :head :FILLED :accidentals :NATURAL :dots 0 ]) ] [GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 22 :staff #4# :head :FILLED :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :HALF :rbeams 0 :lbeams 0 :dots 1 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 21 :staff #4# :head :FILLED :accidentals :NATURAL :dots 0 ]) ] [GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 22 :staff #4# :head :FILLED :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 23 :staff #4# :head :HALF :accidentals :NATURAL :dots 0 ]) ] [GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 24 :staff #4# :head :HALF :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 23 :staff #4# :head :HALF :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 22 :staff #4# :head :HALF :accidentals :NATURAL :dots 0 ]) ]) ]) ] :tail [GSHARP-BUFFER:SLICE :bars ([GSHARP-BUFFER:MELODY-BAR :elements COMMON-LISP:NIL ]) ] ] [GSHARP-BUFFER:MELODY-LAYER :name "ten" :staves (#3#) :head [GSHARP-BUFFER:SLICE :bars ([GSHARP-BUFFER:MELODY-BAR :elements COMMON-LISP:NIL ]) ] :body [GSHARP-BUFFER:SLICE :bars ([GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 25 :staff #3# :head :WHOLE :accidentals :NATURAL :dots 0 :tie-right COMMON-LISP:T ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 25 :staff #3# :head :WHOLE :accidentals :NATURAL :dots 0 :tie-left COMMON-LISP:T ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 28 :staff #3# :head :WHOLE :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([GSHARP-BUFFER:NOTE :pitch 27 :staff #3# :head :WHOLE :accidentals :NATURAL :dots 0 ]) ]) ] [GSHARP-BUFFER:MELODY-BAR :elements ([GSHARP-BUFFER:CLUSTER :xoffset 0 :notehead :HALF :rbeams 0 :lbeams 0 :dots 1 [935 lines skipped]

1 0

[gsharp-cvs] CVS gsharp
by crhodes 14 May '06

14 May '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv4923 Modified Files: gui.lisp Log Message: Scrolling. * change space requirements after drawing to a score pane * intercept window-clear on score panes, so as not to reset sheet transformations, viewport positions, and so on, but just to clear the output record and draw in background ink. --- /project/gsharp/cvsroot/gsharp/gui.lisp 2006/03/02 09:29:44 1.59 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2006/05/14 07:51:27 1.60 @@ -167,7 +167,18 @@ (score-pane:with-score-pane pane (draw-buffer pane buffer (current-cursor) (left-margin buffer) 100) - (gsharp-drawing::draw-the-cursor pane (current-cursor) (cursor-element (current-cursor)) (last-note (input-state *application-frame*)))))) + (gsharp-drawing::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) + (declare (ignore minx maxx)) + (change-space-requirements pane :height (- maxy miny)))))) + +(defmethod window-clear ((pane score-pane:score-pane)) + (let ((output-history (stream-output-history pane))) + (with-bounding-rectangle* (left top right bottom) output-history + (medium-clear-area (sheet-medium pane) left top right bottom)) + (clear-output-record output-history)) + (window-erase-viewport pane)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;

1 0

[gsharp-cvs] CVS gsharp
by crhodes 14 May '06

14 May '06

Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv4781 Modified Files: modes.lisp Log Message: Use the ESA help table. (Note that since we define a command for C-h, the default esa bindings are shadowed. The extended commands work, though.) --- /project/gsharp/cvsroot/gsharp/modes.lisp 2006/02/20 20:19:37 1.11 +++ /project/gsharp/cvsroot/gsharp/modes.lisp 2006/05/14 07:49:55 1.12 @@ -1,7 +1,7 @@ (in-package :gsharp) (define-command-table global-gsharp-table - :inherit-from (global-esa-table esa-io-table keyboard-macro-table)) + :inherit-from (global-esa-table esa-io-table keyboard-macro-table help-table)) (set-key `(com-forward-element ,*numeric-argument-marker*) 'global-gsharp-table '((#\f :control))) (set-key `(com-backward-element ,*numeric-argument-marker*) 'global-gsharp-table '((#\b :control)))

1 0