Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv15652

Modified Files: modes.lisp Log Message: Removed all the :shift modifiers because they are no longer necessary thanks to Troels Henriksen fixing McCLIM.

--- /project/gsharp/cvsroot/gsharp/modes.lisp 2008/02/09 16:58:35 1.28 +++ /project/gsharp/cvsroot/gsharp/modes.lisp 2008/04/29 07:54:24 1.29 @@ -23,8 +23,8 @@

(set-key 'com-insert-barline 'global-gsharp-table '(#|))

-(set-key 'com-end-of-score 'global-gsharp-table '((#> :shift :meta))) -(set-key 'com-beginning-of-score 'global-gsharp-table '((#< :shift :meta))) +(set-key 'com-end-of-score 'global-gsharp-table '((#> :meta))) +(set-key 'com-beginning-of-score 'global-gsharp-table '((#< :meta)))

;;; FIXME where are the corresponding commands? (set-key 'com-left 'global-gsharp-table '((#\l :meta))) @@ -61,8 +61,8 @@ (set-key 'com-insert-keysig 'melody-table '(#\K))

(set-key 'com-more-sharps 'melody-table '((## :meta))) -(set-key 'com-more-sharps 'melody-table '((## :meta :shift))) -(set-key 'com-more-flats 'melody-table '((#@ :meta :shift))) +(set-key 'com-more-sharps 'melody-table '((## :meta))) +(set-key 'com-more-flats 'melody-table '((#@ :meta)))

;;; the rhythmic table contains command that are specific ;;; to rhythmic elements @@ -88,9 +88,9 @@ (set-key 'com-sharper 'cluster-table '((##))) (set-key 'com-flatter 'cluster-table '(#@)) (set-key 'com-microsharper 'cluster-table '((## :control))) -(set-key 'com-microsharper 'cluster-table '((## :control :shift))) ;; mcclim bug workaround +(set-key 'com-microsharper 'cluster-table '((## :control))) +(set-key 'com-microflatter 'cluster-table '((#@ :control))) (set-key 'com-microflatter 'cluster-table '((#@ :control))) -(set-key 'com-microflatter 'cluster-table '((#@ :control :shift))) ;; mcclim bug workaround (set-key 'com-add-note-c 'cluster-table '(#\C)) (set-key 'com-add-note-d 'cluster-table '(#\D)) (set-key 'com-add-note-e 'cluster-table '(#\E)) @@ -107,8 +107,8 @@ (set-key 'com-toggle-tenuto 'cluster-table '(#\t)) (set-key 'com-current-increment 'cluster-table '((#\p))) (set-key 'com-current-decrement 'cluster-table '((#\n))) -(set-key 'com-octave-up 'cluster-table '((#\U :shift :meta))) -(set-key 'com-octave-down 'cluster-table '((#\D :shift :meta))) +(set-key 'com-octave-up 'cluster-table '((#\U :meta))) +(set-key 'com-octave-down 'cluster-table '((#\D :meta)))

;;; lyrics mode table

@@ -134,67 +134,67 @@ do (set-key (make-insert-fun i) 'lyrics-table`((,c))))

;;; try some latin prefix mode for national characters -(set-key (make-insert-fun 192) 'lyrics-table '((:dead--grave) (#\A :shift))) -(set-key (make-insert-fun 193) 'lyrics-table '((:dead--acute) (#\A :shift))) -(set-key (make-insert-fun 194) 'lyrics-table '((:dead--circumflex :shift) (#\A :shift))) -(set-key (make-insert-fun 195) 'lyrics-table '((:dead--tilde :shift) (#\A :shift))) -(set-key (make-insert-fun 196) 'lyrics-table '((:dead--diaeresis :shift) (#\A :shift))) -(set-key (make-insert-fun 197) 'lyrics-table '((:dead-above-ring) (#\A :shift))) -(set-key (make-insert-fun 198) 'lyrics-table '((:dead-above-ring) (#\E :shift))) -(set-key (make-insert-fun 199) 'lyrics-table '((:dead-above-ring) (#\C :shift))) -(set-key (make-insert-fun 200) 'lyrics-table '((:dead--grave) (#\E :shift))) -(set-key (make-insert-fun 201) 'lyrics-table '((:dead--acute) (#\E :shift))) -(set-key (make-insert-fun 202) 'lyrics-table '((:dead--circumflex :shift) (#\E :shift))) -(set-key (make-insert-fun 203) 'lyrics-table '((:dead--diaeresis :shift) (#\E :shift))) -(set-key (make-insert-fun 204) 'lyrics-table '((:dead--grave) (#\I :shift))) -(set-key (make-insert-fun 205) 'lyrics-table '((:dead--acute) (#\I :shift))) -(set-key (make-insert-fun 206) 'lyrics-table '((:dead--circumflex :shift) (#\I :shift))) -(set-key (make-insert-fun 207) 'lyrics-table '((:dead--diaeresis :shift) (#\I :shift))) -(set-key (make-insert-fun 208) 'lyrics-table '((:dead-above-ring) (#\D :shift))) -(set-key (make-insert-fun 209) 'lyrics-table '((:dead--tilde :shift) (#\N :shift))) -(set-key (make-insert-fun 210) 'lyrics-table '((:dead--grave) (#\O :shift))) -(set-key (make-insert-fun 211) 'lyrics-table '((:dead--acute) (#\O :shift))) -(set-key (make-insert-fun 212) 'lyrics-table '((:dead--circumflex :shift) (#\O :shift))) -(set-key (make-insert-fun 213) 'lyrics-table '((:dead--tilde :shift) (#\O :shift))) -(set-key (make-insert-fun 214) 'lyrics-table '((:dead--diaeresis :shift) (#\O :shift))) - -(set-key (make-insert-fun 216) 'lyrics-table '((:dead-above-ring) (#\O :shift))) -(set-key (make-insert-fun 217) 'lyrics-table '((:dead--grave) (#\U :shift))) -(set-key (make-insert-fun 218) 'lyrics-table '((:dead--acute) (#\U :shift))) -(set-key (make-insert-fun 219) 'lyrics-table '((:dead--circumflex :shift) (#\U :shift))) -(set-key (make-insert-fun 220) 'lyrics-table '((:dead--diaeresis :shift) (#\U :shift))) -(set-key (make-insert-fun 221) 'lyrics-table '((:dead--acute) (#\Y :shift))) +(set-key (make-insert-fun 192) 'lyrics-table '((:dead--grave) (#\A))) +(set-key (make-insert-fun 193) 'lyrics-table '((:dead--acute) (#\A))) +(set-key (make-insert-fun 194) 'lyrics-table '((:dead--circumflex) (#\A))) +(set-key (make-insert-fun 195) 'lyrics-table '((:dead--tilde) (#\A))) +(set-key (make-insert-fun 196) 'lyrics-table '((:dead--diaeresis) (#\A))) +(set-key (make-insert-fun 197) 'lyrics-table '((:dead-above-ring) (#\A))) +(set-key (make-insert-fun 198) 'lyrics-table '((:dead-above-ring) (#\E))) +(set-key (make-insert-fun 199) 'lyrics-table '((:dead-above-ring) (#\C))) +(set-key (make-insert-fun 200) 'lyrics-table '((:dead--grave) (#\E))) +(set-key (make-insert-fun 201) 'lyrics-table '((:dead--acute) (#\E))) +(set-key (make-insert-fun 202) 'lyrics-table '((:dead--circumflex) (#\E))) +(set-key (make-insert-fun 203) 'lyrics-table '((:dead--diaeresis) (#\E))) +(set-key (make-insert-fun 204) 'lyrics-table '((:dead--grave) (#\I))) +(set-key (make-insert-fun 205) 'lyrics-table '((:dead--acute) (#\I))) +(set-key (make-insert-fun 206) 'lyrics-table '((:dead--circumflex) (#\I))) +(set-key (make-insert-fun 207) 'lyrics-table '((:dead--diaeresis) (#\I))) +(set-key (make-insert-fun 208) 'lyrics-table '((:dead-above-ring) (#\D))) +(set-key (make-insert-fun 209) 'lyrics-table '((:dead--tilde) (#\N))) +(set-key (make-insert-fun 210) 'lyrics-table '((:dead--grave) (#\O))) +(set-key (make-insert-fun 211) 'lyrics-table '((:dead--acute) (#\O))) +(set-key (make-insert-fun 212) 'lyrics-table '((:dead--circumflex) (#\O))) +(set-key (make-insert-fun 213) 'lyrics-table '((:dead--tilde) (#\O))) +(set-key (make-insert-fun 214) 'lyrics-table '((:dead--diaeresis) (#\O))) + +(set-key (make-insert-fun 216) 'lyrics-table '((:dead-above-ring) (#\O))) +(set-key (make-insert-fun 217) 'lyrics-table '((:dead--grave) (#\U))) +(set-key (make-insert-fun 218) 'lyrics-table '((:dead--acute) (#\U))) +(set-key (make-insert-fun 219) 'lyrics-table '((:dead--circumflex) (#\U))) +(set-key (make-insert-fun 220) 'lyrics-table '((:dead--diaeresis) (#\U))) +(set-key (make-insert-fun 221) 'lyrics-table '((:dead--acute) (#\Y)))

(set-key (make-insert-fun 224) 'lyrics-table '((:dead--grave) (#\a))) (set-key (make-insert-fun 225) 'lyrics-table '((:dead--acute) (#\a))) -(set-key (make-insert-fun 226) 'lyrics-table '((:dead--circumflex :shift) (#\a))) -(set-key (make-insert-fun 227) 'lyrics-table '((:dead--tilde :shift) (#\a))) -(set-key (make-insert-fun 228) 'lyrics-table '((:dead--diaeresis :shift) (#\a))) +(set-key (make-insert-fun 226) 'lyrics-table '((:dead--circumflex) (#\a))) +(set-key (make-insert-fun 227) 'lyrics-table '((:dead--tilde) (#\a))) +(set-key (make-insert-fun 228) 'lyrics-table '((:dead--diaeresis) (#\a))) (set-key (make-insert-fun 229) 'lyrics-table '((:dead-above-ring) (#\a))) (set-key (make-insert-fun 230) 'lyrics-table '((:dead-above-ring) (#\e))) -(set-key (make-insert-fun 231) 'lyrics-table '((:dead--tilde :shift) (#\c))) +(set-key (make-insert-fun 231) 'lyrics-table '((:dead--tilde) (#\c))) (set-key (make-insert-fun 232) 'lyrics-table '((:dead--grave) (#\e))) (set-key (make-insert-fun 233) 'lyrics-table '((:dead--acute) (#\e))) -(set-key (make-insert-fun 234) 'lyrics-table '((:dead--circumflex :shift) (#\e))) -(set-key (make-insert-fun 235) 'lyrics-table '((:dead--diaeresis :shift) (#\e))) +(set-key (make-insert-fun 234) 'lyrics-table '((:dead--circumflex) (#\e))) +(set-key (make-insert-fun 235) 'lyrics-table '((:dead--diaeresis) (#\e))) (set-key (make-insert-fun 236) 'lyrics-table '((:dead--grave) (#\i))) (set-key (make-insert-fun 237) 'lyrics-table '((:dead--acute) (#\i))) -(set-key (make-insert-fun 238) 'lyrics-table '((:dead--circumflex :shift) (#\i))) -(set-key (make-insert-fun 239) 'lyrics-table '((:dead--diaeresis :shift) (#\i))) +(set-key (make-insert-fun 238) 'lyrics-table '((:dead--circumflex) (#\i))) +(set-key (make-insert-fun 239) 'lyrics-table '((:dead--diaeresis) (#\i)))

(set-key (make-insert-fun 242) 'lyrics-table '((:dead--grave) (#\o))) (set-key (make-insert-fun 243) 'lyrics-table '((:dead--acute) (#\o))) -(set-key (make-insert-fun 244) 'lyrics-table '((:dead--circumflex :shift) (#\o))) -(set-key (make-insert-fun 245) 'lyrics-table '((:dead--tilde :shift) (#\o))) -(set-key (make-insert-fun 246) 'lyrics-table `((:dead--diaeresis :shift) (#\o))) +(set-key (make-insert-fun 244) 'lyrics-table '((:dead--circumflex) (#\o))) +(set-key (make-insert-fun 245) 'lyrics-table '((:dead--tilde) (#\o))) +(set-key (make-insert-fun 246) 'lyrics-table `((:dead--diaeresis) (#\o)))

(set-key (make-insert-fun 248) 'lyrics-table '((:dead-above-ring) (#\o))) (set-key (make-insert-fun 249) 'lyrics-table '((:dead--grave) (#\u))) (set-key (make-insert-fun 250) 'lyrics-table '((:dead--acute) (#\u))) -(set-key (make-insert-fun 251) 'lyrics-table '((:dead--circumflex :shift) (#\u))) -(set-key (make-insert-fun 252) 'lyrics-table '((:dead--diaeresis :shift) (#\u))) +(set-key (make-insert-fun 251) 'lyrics-table '((:dead--circumflex) (#\u))) +(set-key (make-insert-fun 252) 'lyrics-table '((:dead--diaeresis) (#\u))) (set-key (make-insert-fun 253) 'lyrics-table '((:dead--acute) (#\y)))

-(set-key (make-insert-fun 255) 'lyrics-table '((:dead--diaeresis :shift) (#\y))) +(set-key (make-insert-fun 255) 'lyrics-table '((:dead--diaeresis) (#\y)))