February 2004 - gsharp-cvs@common-lisp.net

[gsharp-cvs] CVS update: gsharp/sdl.lisp
by Robert Strandh 19 Feb '04

19 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv21441 Modified Files: sdl.lisp Log Message: Fixed the :relative problem according to Andras Simon. Date: Thu Feb 19 00:57:22 2004 Author: rstrandh Index: gsharp/sdl.lisp diff -u gsharp/sdl.lisp:1.2 gsharp/sdl.lisp:1.3 --- gsharp/sdl.lisp:1.2 Mon Feb 16 13:50:20 2004 +++ gsharp/sdl.lisp Thu Feb 19 00:57:22 2004 @@ -1,7 +1,7 @@ (in-package :sdl) (defvar *fonts-directory* - (merge-pathnames (make-pathname :directory '(relative "Fonts")) + (merge-pathnames (make-pathname :directory '(:relative "Fonts")) (make-pathname :directory (pathname-directory *load-truename*)))) (defgeneric glyph (font glyph-no))

1 0

[gsharp-cvs] CVS update: gsharp/gui.lisp
by Christophe Rhodes 18 Feb '04

18 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv14720 Modified Files: gui.lisp Log Message: Workaround the :shift problem with #\# commands: add an unshifted variant. Date: Wed Feb 18 13:16:16 2004 Author: crhodes Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.3 gsharp/gui.lisp:1.4 --- gsharp/gui.lisp:1.3 Mon Feb 16 13:43:54 2004 +++ gsharp/gui.lisp Wed Feb 18 13:16:16 2004 @@ -50,8 +50,10 @@ (add-command '(#\.) 'com-more-dots *global-command-table*) (add-command '(#\[) 'com-more-lbeams *global-command-table*) (add-command '(#\]) 'com-more-rbeams *global-command-table*) +(add-command '(#\#) 'com-sharper *global-command-table*) (add-command '(#\# :shift) 'com-sharper *global-command-table*) (add-command '(#\@ :shift) 'com-flatter *global-command-table*) +(add-command '(#\# :meta) 'com-more-sharps *global-command-table*) (add-command '(#\# :meta :shift) 'com-more-sharps *global-command-table*) (add-command '(#\@ :meta :shift) 'com-more-flats *global-command-table*) (add-command '(#\u :meta) 'com-up *global-command-table*)

1 0

[gsharp-cvs] CVS update: gsharp/midi.lisp
by Christophe Rhodes 18 Feb '04

18 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv13115 Modified Files: midi.lisp Log Message: Fix for MIDI files already existing: make WITH-MIDI-INPUT/OUTPUT slightly more flexible, and specify :if-exists :supersede Date: Wed Feb 18 13:15:46 2004 Author: crhodes Index: gsharp/midi.lisp diff -u gsharp/midi.lisp:1.1.1.1 gsharp/midi.lisp:1.2 --- gsharp/midi.lisp:1.1.1.1 Mon Feb 16 10:46:18 2004 +++ gsharp/midi.lisp Wed Feb 18 13:15:46 2004 @@ -105,16 +105,18 @@ (write-fixed-length-quantity (ash quantity -8) (1- nb-bytes)) (write-bytes (logand quantity #xff)))) -(defmacro with-midi-input (filename &body body) - "execute body with *midi-input* assigned to a stream from filename" - `(with-open-file (*midi-input* ,filename - :direction :input :element-type '(unsigned-byte 8)) +(defmacro with-midi-input ((pathname &rest open-args &key &allow-other-keys) &body body) + "execute body with *midi-input* assigned to a stream from pathname" + `(with-open-file (*midi-input* ,pathname + :direction :input :element-type '(unsigned-byte 8) + ,@open-args) ,@body)) -(defmacro with-midi-output (filename &body body) - "execute body with *midi-output* assigned to a stream from filename" - `(with-open-file (*midi-output* ,filename - :direction :output :element-type '(unsigned-byte 8)) +(defmacro with-midi-output ((pathname &rest open-args &key &allow-other-keys) &body body) + "execute body with *midi-output* assigned to a stream from pathname" + `(with-open-file (*midi-output* ,pathname + :direction :output :element-type '(unsigned-byte 8) + ,@open-args) ,@body)) (defun read-variable-length-quantity () @@ -225,7 +227,7 @@ (defun read-midi-file (filename) "read an entire Midifile from the file with name given as argument" (setf *time* 0) - (with-midi-input filename + (with-midi-input (filename) (let ((type (read-fixed-length-quantity 4)) (length (read-fixed-length-quantity 4)) (format (read-fixed-length-quantity 2)) @@ -241,7 +243,7 @@ collect (read-track)))))) (defun write-midi-file (midifile filename) - (with-midi-output filename + (with-midi-output (filename :if-exists :supersede) (write-fixed-length-quantity +header-mthd+ 4) (write-fixed-length-quantity +header-mthd-length+ 4) (with-slots (format division tracks) midifile

1 0

[gsharp-cvs] CVS update: CVSROOT/config
by root 17 Feb '04

17 Feb '04

Update of /project/gsharp/cvsroot/CVSROOT In directory common-lisp.net:/tmp/CVSROOT Modified Files: config Log Message: changing lockdir Date: Tue Feb 17 08:01:02 2004 Author: root Index: CVSROOT/config diff -u CVSROOT/config:1.1 CVSROOT/config:1.2 --- CVSROOT/config:1.1 Wed Feb 11 10:22:54 2004 +++ CVSROOT/config Tue Feb 17 08:01:01 2004 @@ -2,7 +2,7 @@ #SystemAuth=no # Put CVS lock files in this directory rather than directly in the repository. -#LockDir=/var/lock/cvs +LockDir=/var/lock/gsharp # Set `TopLevelAdmin' to `yes' to create a CVS directory at the top # level of the new working directory when using the `cvs checkout'

1 0

[gsharp-cvs] CVS update: gsharp/system.lisp
by Christophe Rhodes 16 Feb '04

16 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv7473 Modified Files: system.lisp Log Message: Make GSHARP-DEFSYSTEM define systems for both mk-defsystem and asdf if both are present in the image in question Date: Mon Feb 16 13:50:59 2004 Author: crhodes Index: gsharp/system.lisp diff -u gsharp/system.lisp:1.2 gsharp/system.lisp:1.3 --- gsharp/system.lisp:1.2 Mon Feb 16 11:08:00 2004 +++ gsharp/system.lisp Mon Feb 16 13:50:59 2004 @@ -3,22 +3,22 @@ (defparameter *gsharp-directory* (directory-namestring *load-truename*)) (defmacro gsharp-defsystem ((module &key depends-on) &rest components) - `(defsystem ,module - :source-pathname *gsharp-directory* - ,@(and depends-on `(:depends-on ,depends-on)) - :components (:serial ,@components))) - -#+asdf -(defmacro gsharp-defsystem ((module &key depends-on) &rest components) - `(asdf:defsystem ,module - ,@(and depends-on `(:depends-on ,depends-on)) - :serial t - :components (,@(loop for c in components - for p = (merge-pathnames - (parse-namestring c) - (make-pathname :type "lisp" - :defaults *gsharp-directory*)) - collect `(:file ,(pathname-name p) :pathname ,p))))) + `(progn + #+mk-defsystem + (mk:defsystem ,module + :source-pathname *gsharp-directory* + ,@(and depends-on `(:depends-on ,depends-on)) + :components (:serial ,@components)) + #+asdf + (asdf:defsystem ,module + ,@(and depends-on `(:depends-on ,depends-on)) + :serial t + :components (,@(loop for c in components + for p = (merge-pathnames + (parse-namestring c) + (make-pathname :type "lisp" + :defaults *gsharp-directory*)) + collect `(:file ,(pathname-name p) :pathname ,p)))))) (gsharp-defsystem (:gsharp) "packages"

1 0

[gsharp-cvs] CVS update: gsharp/sdl.lisp
by Christophe Rhodes 16 Feb '04

16 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv11405 Modified Files: sdl.lisp Log Message: add *FONTS-DIRECTORY* to allow running GSharp when not in the gsharp directory; essentially, we address the path relative to the path of sdl.lisp or sdl.fasl (note: may break if this is subjected to Debian's common-lisp-controller) One remaining LOOP BY -1 that slipped through the net Date: Mon Feb 16 13:50:20 2004 Author: crhodes Index: gsharp/sdl.lisp diff -u gsharp/sdl.lisp:1.1.1.1 gsharp/sdl.lisp:1.2 --- gsharp/sdl.lisp:1.1.1.1 Mon Feb 16 10:46:21 2004 +++ gsharp/sdl.lisp Mon Feb 16 13:50:20 2004 @@ -1,5 +1,9 @@ (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)) (defgeneric staff-line-distance (font)) @@ -113,7 +117,7 @@ :element-type '(unsigned-byte 8) :initial-element 16)) (loop for r from 0 below (car (array-dimensions matrix)) - for y from (gf-char-max-n gf-char) by -1 do + 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 @@ -159,7 +163,9 @@ (- notehead-right-x-offset notehead-left-x-offset))) (defun load-font (staff-line-distance) - (let* ((gf-font (parse-gf-file (format nil "Fonts/sdl~a.gf" 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

1 0

[gsharp-cvs] CVS update: gsharp/gui.lisp
by Christophe Rhodes 16 Feb '04

16 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv4973 Modified Files: gui.lisp Log Message: Make the sbcl version of run-program search through $PATH for timidity Date: Mon Feb 16 13:43:55 2004 Author: crhodes Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.2 gsharp/gui.lisp:1.3 --- gsharp/gui.lisp:1.2 Mon Feb 16 11:08:00 2004 +++ gsharp/gui.lisp Mon Feb 16 13:43:54 2004 @@ -567,7 +567,7 @@ #+cmu (ext:run-program "timidity" '("test.mid")) #+sbcl - (sb-ext:run-program "timidity" '("test.mid")) + (sb-ext:run-program "timidity" '("test.mid") :search t) #-(or cmu sbcl) (error "write compatibility layer for RUN-PROGRAM"))) @@ -583,7 +583,7 @@ #+cmu (ext:run-program "timidity" '("test.mid")) #+sbcl - (sb-ext:run-program "timidity" '("test.mid")) + (sb-ext:run-program "timidity" '("test.mid") :search t) #-(or cmu sbcl) (error "write compatibility layer for RUN-PROGRAM")))

1 0

[gsharp-cvs] CVS update: gsharp/drawing.lisp
by Robert Strandh 16 Feb '04

16 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv20560 Modified Files: drawing.lisp Log Message: Fixed the annoying bug that sometimes made spacing completely wrong in the presence of dotted notes. Had to fix it twice, though, because there is code duplication in there. Some factoring would be a good idea at some point. Date: Mon Feb 16 12:38:11 2004 Author: rstrandh Index: gsharp/drawing.lisp diff -u gsharp/drawing.lisp:1.2 gsharp/drawing.lisp:1.3 --- gsharp/drawing.lisp:1.2 Mon Feb 16 11:08:00 2004 +++ gsharp/drawing.lisp Mon Feb 16 12:38:10 2004 @@ -51,11 +51,11 @@ (defun compute-widths (measures method) (let* ((compress (compute-compress-factor measures method)) - (start-times (sort (remove-duplicates - (apply #'append (mapcar #'measure-start-times - measures))) - #'<)) - (min-dist (reduce #'min (gsharp-measure::abs-rel start-times)))) + (min-dists (mapcar (lambda (measure) + (reduce #'min (gsharp-measure::abs-rel + (measure-start-times measure)))) + measures)) + (min-dist (reduce #'min min-dists))) (loop for measure in measures collect (/ (nat-width method (measure-coeff measure) min-dist) compress)))) @@ -82,11 +82,11 @@ (defun draw-system (pane measures x widths method staves draw-cursor) (let* ((compress (compute-compress-factor measures method)) - (start-times (sort (remove-duplicates - (apply #'append (mapcar #'measure-start-times - measures))) - #'<)) - (min-dist (reduce #'min (gsharp-measure::abs-rel start-times)))) + (min-dists (mapcar (lambda (measure) + (reduce #'min (gsharp-measure::abs-rel + (measure-start-times measure)))) + measures)) + (min-dist (reduce #'min min-dists))) (loop for measure in measures for width in widths do (draw-measure pane measure min-dist compress x method draw-cursor)

1 0

[gsharp-cvs] CVS update: gsharp/Scores/alundavisan.gsh gsharp/Scores/bach181.gsh gsharp/Scores/bach262.gsh gsharp/Scores/blomsteroffret.gsh gsharp/Scores/clusters.gsh gsharp/Scores/rapsoden-sjunger.gsh gsharp/Scores/smaland.gsh gsharp/Scores/tomtegubbar.gsh gsharp/Scores/vinter-adjo.gsh
by Robert Strandh 16 Feb '04

16 Feb '04

Update of /project/gsharp/cvsroot/gsharp/Scores In directory common-lisp.net:/tmp/cvs-serv24224/Scores Modified Files: alundavisan.gsh bach181.gsh bach262.gsh blomsteroffret.gsh clusters.gsh rapsoden-sjunger.gsh smaland.gsh tomtegubbar.gsh vinter-adjo.gsh Log Message: Updates since 0.2 release. Date: Mon Feb 16 11:08:02 2004 Author: rstrandh Index: gsharp/Scores/alundavisan.gsh diff -u gsharp/Scores/alundavisan.gsh:1.1.1.1 gsharp/Scores/alundavisan.gsh:1.2 --- gsharp/Scores/alundavisan.gsh:1.1.1.1 Mon Feb 16 10:46:44 2004 +++ gsharp/Scores/alundavisan.gsh Mon Feb 16 11:08:02 2004 @@ -42,4 +42,4 @@ [% :notehead :FILLED :rbeams 0 :lbeams 1 :dots 0 :stem-direction :AUTO :notes ([N :pitch 27 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] [| :elements ([% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([N :pitch 29 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([N :pitch 28 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] - [- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :staff #1# :staff-pos 4 ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :staff #1# :staff-pos 4 ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 30 ] Index: gsharp/Scores/bach181.gsh diff -u gsharp/Scores/bach181.gsh:1.1.1.1 gsharp/Scores/bach181.gsh:1.2 --- gsharp/Scores/bach181.gsh:1.1.1.1 Mon Feb 16 10:46:48 2004 +++ gsharp/Scores/bach181.gsh Mon Feb 16 11:08:02 2004 @@ -191,4 +191,4 @@ [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 25 :staff #3# :head :FILLED :accidentals :SHARP :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 26 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 19 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] - [| :elements ([% :notehead :HALF :rbeams 0 :lbeams 0 :dots 1 :stem-direction :DOWN :notes ([N :pitch 22 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 21 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [| :elements ([% :notehead :HALF :rbeams 0 :lbeams 0 :dots 1 :stem-direction :DOWN :notes ([N :pitch 22 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 21 :spacing-style 0.4 :right-edge 700 :left-offset 30 ] Index: gsharp/Scores/bach262.gsh diff -u gsharp/Scores/bach262.gsh:1.1.1.1 gsharp/Scores/bach262.gsh:1.2 --- gsharp/Scores/bach262.gsh:1.1.1.1 Mon Feb 16 10:46:52 2004 +++ gsharp/Scores/bach262.gsh Mon Feb 16 11:08:02 2004 @@ -206,4 +206,4 @@ [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 20 :staff #3# :head :FILLED :accidentals :FLAT :dots 0 ] ) ] ) ] [| :elements ([% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 23 :staff #3# :head :FILLED :accidentals :FLAT :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 24 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] - [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 20 :staff #3# :head :FILLED :accidentals :FLAT :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 21 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 20 :staff #3# :head :FILLED :accidentals :FLAT :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 21 :spacing-style 0.4 :right-edge 700 :left-offset 30 ] Index: gsharp/Scores/blomsteroffret.gsh diff -u gsharp/Scores/blomsteroffret.gsh:1.1.1.1 gsharp/Scores/blomsteroffret.gsh:1.2 --- gsharp/Scores/blomsteroffret.gsh:1.1.1.1 Mon Feb 16 10:46:57 2004 +++ gsharp/Scores/blomsteroffret.gsh Mon Feb 16 11:08:02 2004 @@ -237,4 +237,4 @@ [| :elements ([% :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 19 :staff #3# :head :FILLED :accidentals :SHARP :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 19 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] [| :elements ([% :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 18 :staff #3# :head :FILLED :accidentals :SHARP :dots 0 ] ) ] - [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 18 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 18 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 30 ] Index: gsharp/Scores/clusters.gsh diff -u gsharp/Scores/clusters.gsh:1.1.1.1 gsharp/Scores/clusters.gsh:1.2 --- gsharp/Scores/clusters.gsh:1.1.1.1 Mon Feb 16 10:46:57 2004 +++ gsharp/Scores/clusters.gsh Mon Feb 16 11:08:02 2004 @@ -17,4 +17,4 @@ [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([N :pitch 30 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] [N :pitch 31 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] [N :pitch 33 :staff #1# :head :FILLED :accidentals :SHARP :dots 0 ] - [N :pitch 36 :staff #1# :head :FILLED :accidentals :SHARP :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [N :pitch 36 :staff #1# :head :FILLED :accidentals :SHARP :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 30 ] Index: gsharp/Scores/rapsoden-sjunger.gsh diff -u gsharp/Scores/rapsoden-sjunger.gsh:1.1.1.1 gsharp/Scores/rapsoden-sjunger.gsh:1.2 --- gsharp/Scores/rapsoden-sjunger.gsh:1.1.1.1 Mon Feb 16 10:47:05 2004 +++ gsharp/Scores/rapsoden-sjunger.gsh Mon Feb 16 11:08:02 2004 @@ -191,15 +191,14 @@ [N :pitch 28 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] [| :elements ([- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :staff #1# :staff-pos -6 ] [% :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 24 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] - [N :pitch 28 :staff #1# :head :FILLED :accidentals :FLAT :dots 0 ] ) ] - [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([- :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :staff #1# :staff-pos 4 ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :UP :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :UP :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :UP :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :UP :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :UP :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :UP :notes NIL ] ) ] + [N :pitch 28 :staff #1# :head :FILLED :accidentals :FLAT :dots 0 ] ) ] ) ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] [| :elements ([- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :staff #1# :staff-pos -12 ] [% :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 25 :staff #1# :head :HALF :accidentals :FLAT :dots 0 ] [N :pitch 27 :staff #1# :head :HALF :accidentals :FLAT :dots 0 ] ) ] @@ -355,16 +354,16 @@ [% :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 15 :staff #3# :head :FILLED :accidentals :FLAT :dots 0 ] [N :pitch 19 :staff #3# :head :FILLED :accidentals :FLAT :dots 0 ] ) ] [- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :staff #3# :staff-pos 0 ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] - [| :elements ([% :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes NIL ] ) ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] + [| :elements NIL ] [| :elements ([- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :staff #3# :staff-pos 0 ] [% :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :stem-direction :DOWN :notes ([N :pitch 19 :staff #3# :head :FILLED :accidentals :FLAT :dots 0 ] ) ] [- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :staff #3# :staff-pos 0 ] ) ] - [| :elements ([- :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :staff #3# :staff-pos 0 ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [| :elements ([- :notehead :WHOLE :rbeams 0 :lbeams 0 :dots 0 :xoffset 0 :staff #3# :staff-pos 0 ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 30 :left-margin 20 ] Index: gsharp/Scores/smaland.gsh diff -u gsharp/Scores/smaland.gsh:1.1.1.1 gsharp/Scores/smaland.gsh:1.2 --- gsharp/Scores/smaland.gsh:1.1.1.1 Mon Feb 16 10:47:08 2004 +++ gsharp/Scores/smaland.gsh Mon Feb 16 11:08:02 2004 @@ -129,4 +129,4 @@ [% :notehead :FILLED :rbeams 1 :lbeams 0 :dots 1 :stem-direction :AUTO :notes ([N :pitch 29 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] [% :notehead :FILLED :rbeams 2 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([N :pitch 29 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :AUTO :notes ([N :pitch 29 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] - [- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :staff #1# :staff-pos 4 ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :staff #1# :staff-pos 4 ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 30 ] Index: gsharp/Scores/tomtegubbar.gsh diff -u gsharp/Scores/tomtegubbar.gsh:1.1.1.1 gsharp/Scores/tomtegubbar.gsh:1.2 --- gsharp/Scores/tomtegubbar.gsh:1.1.1.1 Mon Feb 16 10:47:12 2004 +++ gsharp/Scores/tomtegubbar.gsh Mon Feb 16 11:08:02 2004 @@ -116,4 +116,4 @@ [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 26 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 27 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] [| :elements ([% :notehead :HALF :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 28 :staff #3# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] - [- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :staff #3# :staff-pos 4 ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [- :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :staff #3# :staff-pos 4 ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 30 ] Index: gsharp/Scores/vinter-adjo.gsh diff -u gsharp/Scores/vinter-adjo.gsh:1.1.1.1 gsharp/Scores/vinter-adjo.gsh:1.2 --- gsharp/Scores/vinter-adjo.gsh:1.1.1.1 Mon Feb 16 10:47:14 2004 +++ gsharp/Scores/vinter-adjo.gsh Mon Feb 16 11:08:02 2004 @@ -65,4 +65,4 @@ [| :elements ([% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 25 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 26 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] [% :notehead :FILLED :rbeams 0 :lbeams 0 :dots 0 :stem-direction :DOWN :notes ([N :pitch 27 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] - [| :elements ([% :notehead :HALF :rbeams 0 :lbeams 0 :dots 1 :stem-direction :DOWN :notes ([N :pitch 28 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 70 ] + [| :elements ([% :notehead :HALF :rbeams 0 :lbeams 0 :dots 1 :stem-direction :DOWN :notes ([N :pitch 28 :staff #1# :head :FILLED :accidentals :NATURAL :dots 0 ] ) ] ) ] ) ] :tail [/ :bars ([| :elements NIL ] ) ] ] ) ] ) :min-width 17 :spacing-style 0.4 :right-edge 700 :left-offset 30 ]

1 0

[gsharp-cvs] CVS update: gsharp/Doc/model.tex gsharp/Doc/plans.tex gsharp/Doc/release-notes.tex
by Robert Strandh 16 Feb '04

16 Feb '04

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv24224/Doc Modified Files: model.tex plans.tex release-notes.tex Log Message: Updates since 0.2 release. Date: Mon Feb 16 11:08:02 2004 Author: rstrandh Index: gsharp/Doc/model.tex diff -u gsharp/Doc/model.tex:1.1.1.1 gsharp/Doc/model.tex:1.2 --- gsharp/Doc/model.tex:1.1.1.1 Mon Feb 16 10:46:28 2004 +++ gsharp/Doc/model.tex Mon Feb 16 11:08:01 2004 @@ -45,7 +45,7 @@ corresponding roughly to a \emph{voice} \index{voice} or a \emph{part} \index{part} of the music. -The difference between a layer and a part ({gs} does not know about +The difference between a layer and a part ({\gs} does not know about parts) is that a layer has a particular \emph{instrument} \index{instrument} assigned to it, whereas a part can have several different instruments, for instance when the same musician plays Index: gsharp/Doc/plans.tex diff -u gsharp/Doc/plans.tex:1.1.1.1 gsharp/Doc/plans.tex:1.2 --- gsharp/Doc/plans.tex:1.1.1.1 Mon Feb 16 10:46:31 2004 +++ gsharp/Doc/plans.tex Mon Feb 16 11:08:01 2004 @@ -90,8 +90,86 @@ the notes of the element. \end{itemize} +\subsection{Other minor projects} + +\begin{itemize} +\item multi-buffer, multi-frame +\item display additional information around current element (beaming + information, stem information (auto or not)), etc +\end{itemize} + \section{Major projects} +\subsection{Improved spacing algorithm} + +There are two aspects of the spacing algorithm: + +\begin{enumerate} +\item Determining how to divide a sequence of measures into pages and + lines based on the amount of space each measure will require on a + given line, +\item Rendering the page(s) actually visible by the user at any given + time. +\end{enumerate} + +We can spend relatively much time on rendering since it is supposedly +only done for a small fraction of the entire score and relatively +little time on dividing sequences of measures into pages and lines. +Also, we can accept a rough estimate of the space that a measure needs +for the purpose of dividing into pages and lines, whereas the +rendering phase needs to be very precise so as to avoid overlapping +characters. + +For rendering, we can assume that we have a bunch of \emph{lines}, +each one being a \emph{sequence of measures}. For this phase, one +idea would be to compute an \emph{elasticity function} for each +measure indicating how willing it is to stretch or compress given that +a certain force is applied to it. In fact it would indicate the width +as a function of force applied. Such a function would be piecewise +linear with rational coordinates to avoid rounding errors. The +elasticity function of a line would be the sum of the elasticity +functions of the measures of the line, again a piecewise linear +function. The combined function would then be solved for the line +length which gives a force to be applied to each measure (elementary +mechanics give that each measure in the sequence would have the same +force applied to it). To render each measure, that force would be +applied to it. + +The problem with dividing a sequence of measures into lines and pages +is that the elasticity function depends on the context. Specifically, +the \emph{natural width} (the width that the measure would take when +given a force of 0) depends on the smallest distance between two +adjacent time lines \emph{of all of the time lines in all of the +measures on a line}. This gets messy, since currently, we depend on +the cost function of a line to be combined in constant time, i.e., the +cost function of a line with a new measure added to the beginning or +to the end of it is possible to compute in constant time from the cost +function of the existing line and that of the new measure. Either I +am being to conservative here, and we can afford to spend more time +computing the cost function of a line, or else, we need to find an +approximation of the elasticity function that will combine in constant +time. This is hard to know until we have tested {\gs} on large +scores, and until we have implemented the page-breaking algorithm (as +opposed to the line-breaking algorithm that we now have). An example +of an approximation of the elasticity function would be to use the +current estimate with an additional value called \emph{additional +constant space}. The cost combination function would add the constant +spaces required by each measure as long as newly added measures have +the same smallest time-line distance (min-dist). As soon as a measure +with smaller min-dist is added to the line, the additional constant +space of the existing line is set to 0. The assumption is that the +existing line is going to have to expand as a result of the smaller +min-dist which will eliminate the need for the additional constant +space. Adding a measure with a larger min-dist than that of the +existing line would simply ignore the additional constant space of +that measure. Again, the assumption is that the new measure will have +to expand so that the additional space will not be needed. + +The additional constant spaced of a measure would be computed as if it +would be inserted into a line having the same min-dist as the measure +itself. Such space would include space for lyrics, accidentals of +complicated clusters, etc. + \subsection{Menu items with arguments} This is a {\clim} project. Currently {\clim} does not know how to @@ -141,3 +219,41 @@ \item Pages with an arbitrary number of pages, but the number must be of the form $n = ax + b$. \end{itemize} + +\subsection{Other major projects} + +\begin{itemize} +\item presentations everywhere (note heads, clusters, beam groups). +\item context menus on notes, etc +\item allow mouse-based input of new notes by making staff steps + around cursor into presentations. Move pointer to horizontal + location of cursor after interaction. +\item allow mouse-based addition and deletion of notes in existing + clusters by making staff steps around cluster into presentations +\item make sure user can use either keyboard or mouse without changing + too often +\item add new views of score, especially to manipulate staves, + brackets, braces, instruments, etc. +\item perhaps hide interactor by default and use something like M-x to + make it visible. +\item use output recording (hierarchical records) to reorganize pixmaps + and to substitute combined pixmaps. +\end{itemize} + +\section{McCLIM issues and projects} + +\begin{itemize} +\item add better system for Emacs-style commands and key + bindings +\item fix problem of input focus being retained (also a + problem for Goatee) +\item make sure gestures work as announced +\item perhaps make it possible to use something like M-x to change + input focus +\item make setf of frame-layout work +\item multiple top-level frames (as in Franz CLIM). +\item remove compilation warnings in McCLIM +\item remove dead code +\item remove reasons for remarks such as XXX:, FIXME, etc, or at least + put a name in their place +\end{itemize} \ No newline at end of file Index: gsharp/Doc/release-notes.tex diff -u gsharp/Doc/release-notes.tex:1.1.1.1 gsharp/Doc/release-notes.tex:1.2 --- gsharp/Doc/release-notes.tex:1.1.1.1 Mon Feb 16 10:46:31 2004 +++ gsharp/Doc/release-notes.tex Mon Feb 16 11:08:01 2004 @@ -1,5 +1,34 @@ \chapter{Release notes} +\section{Release 0.3 (2003-??-??)} + +\subsection{Features added from 0.2} + +\begin{itemize} +\item right edge of staff is no longer hard wired. +\item left margin is now a parameter of the buffer (and on disk). +\item x-position of first measure on line now depends on the size of + the key signature. This means that wide key signatures no longer + overlap with notes of the first measure on the line. +\item Improved MIDI generation making it no longer necessary to pad +measures with empty clusters. +\item Fixed a problem that made {\gs} crash on new versions of + McCLIM (thanks to Andy Hefner for figuring this out). +\item {\gs} can now use asdf instead of mk:defystem (thanks to + Christophe Rhodes). +\item {\gs} now runs on SBCL as well as on CMUCL (thanks to Christophe + Rhodes). +\end{itemize} + +\subsection{Bug fixes from 0.2} + +\begin{itemize} +\item last sharp sign in key signature with seven sharp signs is now + drawn. +\item fixed conformance bugs in some \texttt{loop} constructs (thanks to + Christophe Rhodes). +\end{itemize} + \section{Release 0.2 (2003-09-06)} \subsection{Features added from 0.1}

1 0