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

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

27 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv8801 Modified Files: gui.lisp Log Message: Now that it is possible to start a second Gsharp after the first one exits, make the quit command call frame-exit in both CMUCL and SBCL. Date: Fri Feb 27 04:34:30 2004 Author: rstrandh Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.7 gsharp/gui.lisp:1.8 --- gsharp/gui.lisp:1.7 Fri Feb 27 04:27:42 2004 +++ gsharp/gui.lisp Fri Feb 27 04:34:30 2004 @@ -362,8 +362,7 @@ (message "Saved buffer to ~A~%" filename))) (define-gsharp-command (com-quit :name t) () - #+cmu (unix::unix-exit) - #+sbcl (frame-exit *application-frame*)) + (frame-exit *application-frame*)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;

1 0

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

27 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv26137 Modified Files: gui.lisp Log Message: Changed the implementation of keyboard macros to store functions instead of keys. Once we get numeric arguments, we must store thunks that call the commands with appropriate arguments. Date: Fri Feb 27 04:27:42 2004 Author: rstrandh Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.6 gsharp/gui.lisp:1.7 --- gsharp/gui.lisp:1.6 Thu Feb 19 03:50:27 2004 +++ gsharp/gui.lisp Fri Feb 27 04:27:42 2004 @@ -100,22 +100,22 @@ (defvar *gsharp-frame*) (defparameter *kbd-macro-recording-p* nil) -(defparameter *kbd-macro-keys* '()) +(defparameter *kbd-macro-funs* '()) (defmethod dispatch-event :around ((pane score-pane) (event key-press-event)) (when (keyboard-event-character event) (let* ((key (list (keyboard-event-character event) (event-modifier-state event))) (command (gethash key *commands*))) - (when *kbd-macro-recording-p* (push key *kbd-macro-keys*)) (cond ((hash-table-p command) (setf *commands* command)) ((fboundp command) + (when *kbd-macro-recording-p* (push command *kbd-macro-funs*)) (handler-case (funcall command) (gsharp-condition (condition) (format *error-output* "~a~%" condition))) (setf *commands* *global-command-table*)) (t (format *error-output* "no command for ~a~%" key) (setf *commands* *global-command-table*) - (when *kbd-macro-recording-p* (setf *kbd-macro-keys* '() + (when *kbd-macro-recording-p* (setf *kbd-macro-funs* '() *kbd-macro-recording-p* nil)))) (redisplay-gsharp-panes *gsharp-frame* :force-p t)))) @@ -1058,19 +1058,13 @@ (define-gsharp-command com-start-kbd-macro () (message "defining keyboad macro~%") (setf *kbd-macro-recording-p* t - *kbd-macro-keys* '())) + *kbd-macro-funs* '())) (define-gsharp-command com-end-kbd-macro () (message "keyboad macro defined~%") (setf *kbd-macro-recording-p* nil - *kbd-macro-keys* (nreverse (cddr *kbd-macro-keys*)))) + *kbd-macro-funs* (nreverse (cdr *kbd-macro-funs*)))) (define-gsharp-command com-call-last-kbd-macro () - (loop with commands = *global-command-table* - for key in *kbd-macro-keys* do - (let ((command (gethash key commands))) - (cond ((hash-table-p command) (setf commands command)) - ((fboundp command) - (handler-case (funcall command) - (gsharp-condition (condition) (format *error-output* "~a~%" condition)))) - (t (message "no command for ~a~%" key)))))) + (handler-case (mapc #'funcall *kbd-macro-funs*) + (gsharp-condition (condition) (format *error-output* "~a~%" condition))))

1 0

[gsharp-cvs] CVS update: gsharp/score-pane.lisp
by Christophe Rhodes 25 Feb '04

25 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv28640 Modified Files: score-pane.lisp Log Message: fix for pixmaps bogusly being cached across different connections to the X server. (as seen on gsharp-devel "Problem of second gsharp" on 2004-02-25). Date: Wed Feb 25 17:24:56 2004 Author: crhodes Index: gsharp/score-pane.lisp diff -u gsharp/score-pane.lisp:1.1.1.1 gsharp/score-pane.lisp:1.2 --- gsharp/score-pane.lisp:1.1.1.1 Mon Feb 16 10:46:21 2004 +++ gsharp/score-pane.lisp Wed Feb 25 17:24:56 2004 @@ -1,7 +1,11 @@ (in-package :score-pane) (defclass score-pane (application-pane) - ((pixmaps :initform (make-hash-table :test #'eq) :reader pane-pixmaps))) + ((pixmaps :initform (make-hash-table :test #'eq) :reader pane-pixmaps) + (darker-gray-progressions :initform (make-array 10 :initial-element nil :adjustable t) + :reader darker-gray-progressions) + (lighter-gray-progressions :initform (make-array 10 :initial-element nil :adjustable t) + :reader lighter-gray-progressions))) (defmethod dispatch-event :before ((pane score-pane) (event pointer-enter-event)) (let ((port (port pane))) @@ -474,10 +478,8 @@ (when (stream-drawing-p *pane*) (medium-draw-rectangle* medium x1 y1 x2 y2 t)))) -(defparameter *darker-gray-progressions* - (make-array 10 :initial-element nil :adjustable t)) -(defparameter *lighter-gray-progressions* - (make-array 10 :initial-element nil :adjustable t)) +(defvar *darker-gray-progressions*) +(defvar *lighter-gray-progressions*) ;;; don't delete this yet, since I don't know how the other one will work out. ;; (defun ensure-gray-progressions (index) @@ -563,7 +565,7 @@ (defclass upward-beam-output-record (beam-output-record) ()) -(defmethod replay-output-record ((record upward-beam-output-record) stream +(defmethod replay-output-record ((record upward-beam-output-record) (stream score-pane) &optional (region +everywhere+) (x-offset 0) (y-offset 0)) (declare (ignore x-offset y-offset region)) @@ -572,15 +574,17 @@ (let ((medium (sheet-medium stream))) (let ((*light-glyph* (not (eq ink +black+)))) (with-drawing-options (medium :ink ink) - ;; we replay with the identity tranformation, so - ;; we have to draw the other way - (draw-downward-beam medium x1 (1- y2) (1- (+ y1 thickness)) thickness - (/ (- x2 x1) (- y2 y1 thickness))))))))) + (let ((*lighter-gray-progressions* (lighter-gray-progressions stream)) + (*darker-gray-progressions* (darker-gray-progressions stream))) + ;; we replay with the identity tranformation, so + ;; we have to draw the other way + (draw-downward-beam medium x1 (1- y2) (1- (+ y1 thickness)) thickness + (/ (- x2 x1) (- y2 y1 thickness)))))))))) (defclass downward-beam-output-record (beam-output-record) ()) -(defmethod replay-output-record ((record downward-beam-output-record) stream +(defmethod replay-output-record ((record downward-beam-output-record) (stream score-pane) &optional (region +everywhere+) (x-offset 0) (y-offset 0)) (declare (ignore x-offset y-offset region)) @@ -589,10 +593,12 @@ (let ((medium (sheet-medium stream))) (let ((*light-glyph* (not (eq ink +black+)))) (with-drawing-options (medium :ink ink) - ;; we replay with the identity tranformation, so - ;; we have to draw the other way - (draw-upward-beam medium x1 (1- (+ y1 thickness)) (1- y2) thickness - (/ (- x2 x1) (- y2 y1 thickness))))))))) + (let ((*lighter-gray-progressions* (lighter-gray-progressions stream)) + (*darker-gray-progressions* (darker-gray-progressions stream))) + ;; we replay with the identity tranformation, so + ;; we have to draw the other way + (draw-upward-beam medium x1 (1- (+ y1 thickness)) (1- y2) thickness + (/ (- x2 x1) (- y2 y1 thickness)))))))))) (defun draw-sloped-beam (medium x1 y1 x2 y2 thickness inverse-slope) (let ((transformation (medium-transformation *pane*))) @@ -658,6 +664,8 @@ (let ((pixmap (gensym)) (mirror (gensym))) `(let* ((*pane* ,pane) + (*lighter-gray-progressions* (lighter-gray-progressions pane)) + (*darker-gray-progressions* (darker-gray-progressions pane)) (,pixmap (allocate-pixmap *pane* 800 900)) (,mirror (sheet-direct-mirror *pane*))) (draw-rectangle* ,pixmap 0 0 800 900 :filled t :ink +white+)

1 0

[gsharp-cvs] CVS update: gsharp/Doc/release-notes.tex
by Christophe Rhodes 25 Feb '04

25 Feb '04

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv28640/Doc Modified Files: release-notes.tex Log Message: fix for pixmaps bogusly being cached across different connections to the X server. (as seen on gsharp-devel "Problem of second gsharp" on 2004-02-25). Date: Wed Feb 25 17:24:56 2004 Author: crhodes Index: gsharp/Doc/release-notes.tex diff -u gsharp/Doc/release-notes.tex:1.3 gsharp/Doc/release-notes.tex:1.4 --- gsharp/Doc/release-notes.tex:1.3 Fri Feb 20 01:06:20 2004 +++ gsharp/Doc/release-notes.tex Wed Feb 25 17:24:56 2004 @@ -24,6 +24,7 @@ \subsection{Bug fixes from 0.2} \begin{itemize} +\item fixed a bug in pixmap cacheing \item fixed pathname-related problems for MIDI and fonts. \item fixed annoying bug that ruined the spacing of unevenly timed music.

1 0

[gsharp-cvs] CVS update: gsharp/Doc/gsharp.bib gsharp/Doc/Makefile gsharp/Doc/gsharp.tex
by Robert Strandh 23 Feb '04

23 Feb '04

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv11457 Modified Files: Makefile gsharp.tex Added Files: gsharp.bib Log Message: Added bibliography. Modified the Makefile to compile Bibtex file. Date: Tue Feb 24 00:30:47 2004 Author: rstrandh Index: gsharp/Doc/Makefile diff -u gsharp/Doc/Makefile:1.1.1.1 gsharp/Doc/Makefile:1.2 --- gsharp/Doc/Makefile:1.1.1.1 Mon Feb 16 10:46:21 2004 +++ gsharp/Doc/Makefile Tue Feb 24 00:30:47 2004 @@ -16,6 +16,7 @@ $(NAME).dvi: $(TEXFILES) $(PSTEX_T) $(VERBATIM) latex $< makeindex $(NAME) + bibtex gsharp latex $< $(NAME).ps: $(NAME).dvi $(PSTEX) @@ -27,7 +28,6 @@ clean: rm -f *.aux *.log *~ -spotless: - make clean - rm -f *.ps *.dvi *.pstex *.pstex_t *.toc *.idx *.ilg *.ind +spotless: clean + rm -f *.ps *.dvi *.pstex *.pstex_t *.toc *.idx *.ilg *.ind *.bbl Index: gsharp/Doc/gsharp.tex diff -u gsharp/Doc/gsharp.tex:1.1.1.1 gsharp/Doc/gsharp.tex:1.2 --- gsharp/Doc/gsharp.tex:1.1.1.1 Mon Feb 16 10:46:26 2004 +++ gsharp/Doc/gsharp.tex Tue Feb 24 00:30:47 2004 @@ -800,5 +800,16 @@ Talk about frames, panes, streams, etc. +\nocite{ross-1987} \nocite{haken-1993} \nocite{haken-1995} +\nocite{aho-hopcroft-ullman} \nocite{blostein-1991} +\nocite{blostein-1994} \nocite{gourlay-1987-spacing} +\nocite{gourlay-1987-formatting} \nocite{hegazy-1987} +\nocite{hegazy-1987-breaking} \nocite{rader-1996} \nocite{tex} + + \printindex + +\newpage +\bibliographystyle{alpha} +\bibliography{gsharp} \end{document}

1 0

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

20 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv21473 Modified Files: drawing.lisp Log Message: Introduced new function `compute-min-dist' in order to factor previously duplicated code. Date: Fri Feb 20 03:39:03 2004 Author: rstrandh Index: gsharp/drawing.lisp diff -u gsharp/drawing.lisp:1.3 gsharp/drawing.lisp:1.4 --- gsharp/drawing.lisp:1.3 Mon Feb 16 12:38:10 2004 +++ gsharp/drawing.lisp Fri Feb 20 03:39:03 2004 @@ -49,13 +49,16 @@ (defvar *cursor* nil) +(defun compute-min-dist (measures) + (let ((min-dists (mapcar (lambda (measure) + (reduce #'min (gsharp-measure::abs-rel + (measure-start-times measure)))) + measures))) + (reduce #'min min-dists))) + (defun compute-widths (measures method) - (let* ((compress (compute-compress-factor measures method)) - (min-dists (mapcar (lambda (measure) - (reduce #'min (gsharp-measure::abs-rel - (measure-start-times measure)))) - measures)) - (min-dist (reduce #'min min-dists))) + (let ((compress (compute-compress-factor measures method)) + (min-dist (compute-min-dist measures))) (loop for measure in measures collect (/ (nat-width method (measure-coeff measure) min-dist) compress)))) @@ -81,12 +84,8 @@ (with-light-glyphs pane (draw-bar pane bar x width time-alist draw-cursor)))))) (defun draw-system (pane measures x widths method staves draw-cursor) - (let* ((compress (compute-compress-factor measures method)) - (min-dists (mapcar (lambda (measure) - (reduce #'min (gsharp-measure::abs-rel - (measure-start-times measure)))) - measures)) - (min-dist (reduce #'min min-dists))) + (let ((compress (compute-compress-factor measures method)) + (min-dist (compute-min-dist measures))) (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/Doc/release-notes.tex
by Robert Strandh 20 Feb '04

20 Feb '04

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv12480 Modified Files: release-notes.tex Log Message: Updated release notes according to recent fixes. Date: Fri Feb 20 01:06:20 2004 Author: rstrandh Index: gsharp/Doc/release-notes.tex diff -u gsharp/Doc/release-notes.tex:1.2 gsharp/Doc/release-notes.tex:1.3 --- gsharp/Doc/release-notes.tex:1.2 Mon Feb 16 11:08:01 2004 +++ gsharp/Doc/release-notes.tex Fri Feb 20 01:06:20 2004 @@ -5,8 +5,9 @@ \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 An Emacs-style keyboard macro facility has been added. +\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. @@ -23,6 +24,9 @@ \subsection{Bug fixes from 0.2} \begin{itemize} +\item fixed pathname-related problems for MIDI and fonts. +\item fixed annoying bug that ruined the spacing of unevenly timed + music. \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

1 0

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

19 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv22319 Modified Files: gui.lisp Log Message: Forgot to save buffer before committing. Date: Thu Feb 19 03:50:27 2004 Author: rstrandh Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.5 gsharp/gui.lisp:1.6 --- gsharp/gui.lisp:1.5 Thu Feb 19 01:39:41 2004 +++ gsharp/gui.lisp Thu Feb 19 03:50:27 2004 @@ -1063,7 +1063,7 @@ (define-gsharp-command com-end-kbd-macro () (message "keyboad macro defined~%") (setf *kbd-macro-recording-p* nil - *kbd-macro-keys* (nreverse *kbd-macro-keys*))) + *kbd-macro-keys* (nreverse (cddr *kbd-macro-keys*)))) (define-gsharp-command com-call-last-kbd-macro () (loop with commands = *global-command-table*

1 0

[gsharp-cvs] CVS update: gsharp/Doc/commands.tex
by Robert Strandh 19 Feb '04

19 Feb '04

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv9894 Modified Files: commands.tex Log Message: Added keyboard macros to reference manual. Date: Thu Feb 19 01:48:09 2004 Author: rstrandh Index: gsharp/Doc/commands.tex diff -u gsharp/Doc/commands.tex:1.1.1.1 gsharp/Doc/commands.tex:1.2 --- gsharp/Doc/commands.tex:1.1.1.1 Mon Feb 16 10:46:23 2004 +++ gsharp/Doc/commands.tex Thu Feb 19 01:48:08 2004 @@ -174,3 +174,17 @@ & & (currently wipes the current buffer)\\ \hline \end{tabular} + +\section{Keyboard macros} + +\begin{tabular}{|l|l|l|} +\hline +Key & Command name & Description\\ +\hline +C-x ( & Start Keyboard Macro & Start recording keystrokes \\ + & & for later execution \\ +C-x ) & End Keyboard Macro & Stop recording keystrokes \\ +C-x e & Call Last Keyboard Macro & Execute recorded keystrokes \\ +\hline +\end{tabular} +

1 0

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

19 Feb '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv24530 Modified Files: gui.lisp Log Message: Added Emacs-style keboard macro facility. Date: Thu Feb 19 01:39:41 2004 Author: rstrandh Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.4 gsharp/gui.lisp:1.5 --- gsharp/gui.lisp:1.4 Wed Feb 18 13:16:16 2004 +++ gsharp/gui.lisp Thu Feb 19 01:39:41 2004 @@ -11,6 +11,7 @@ (defparameter *x-command-table* (make-hash-table :test #'equal)) (defparameter *i-command-table* (make-hash-table :test #'equal)) (defparameter *ix-command-table* (make-hash-table :test #'equal)) +(defparameter *c-x-command-table* (make-hash-table :test #'equal)) (defparameter *commands* *global-command-table*) (defun add-command (gesture command table) @@ -64,6 +65,7 @@ (add-command '(#\n :meta) 'com-next-layer *global-command-table*) (add-command '(#\x) *x-command-table* *global-command-table*) (add-command '(#\i) *i-command-table* *global-command-table*) +(add-command '(#\x :control) *c-x-command-table* *global-command-table*) ;;; i command table (add-command '(#\.) 'com-istate-more-dots *i-command-table*) @@ -83,6 +85,13 @@ (add-command '(#\[) 'com-fewer-lbeams *x-command-table*) (add-command '(#\]) 'com-fewer-rbeams *x-command-table*) +;;; c-x-command-table +(add-command '(#$ :shift) 'com-start-kbd-macro *c-x-command-table*) +(add-command '(#\() 'com-start-kbd-macro *c-x-command-table*) +(add-command '(#$ :shift) 'com-end-kbd-macro *c-x-command-table*) +(add-command '(#\)) 'com-end-kbd-macro *c-x-command-table*) +(add-command '(#\e) 'com-call-last-kbd-macro *c-x-command-table*) + (defmethod redisplay-gsharp-panes (frame &key force-p) (loop for pane in (frame-current-panes frame) do (when (typep pane 'score-pane) @@ -90,18 +99,24 @@ (defvar *gsharp-frame*) +(defparameter *kbd-macro-recording-p* nil) +(defparameter *kbd-macro-keys* '()) + (defmethod dispatch-event :around ((pane score-pane) (event key-press-event)) (when (keyboard-event-character event) (let* ((key (list (keyboard-event-character event) (event-modifier-state event))) (command (gethash key *commands*))) + (when *kbd-macro-recording-p* (push key *kbd-macro-keys*)) (cond ((hash-table-p command) (setf *commands* command)) ((fboundp command) (handler-case (funcall command) (gsharp-condition (condition) (format *error-output* "~a~%" condition))) (setf *commands* *global-command-table*)) (t (format *error-output* "no command for ~a~%" key) - (setf *commands* *global-command-table*))) + (setf *commands* *global-command-table*) + (when *kbd-macro-recording-p* (setf *kbd-macro-keys* '() + *kbd-macro-recording-p* nil)))) (redisplay-gsharp-panes *gsharp-frame* :force-p t)))) (define-application-frame gsharp () @@ -1038,3 +1053,24 @@ ((eq (aref keysig 4) :natural) (setf (aref keysig 4) :flat)) ((eq (aref keysig 0) :natural) (setf (aref keysig 0) :flat)) ((eq (aref keysig 3) :natural) (setf (aref keysig 3) :flat))))) + +;;; macro processing +(define-gsharp-command com-start-kbd-macro () + (message "defining keyboad macro~%") + (setf *kbd-macro-recording-p* t + *kbd-macro-keys* '())) + +(define-gsharp-command com-end-kbd-macro () + (message "keyboad macro defined~%") + (setf *kbd-macro-recording-p* nil + *kbd-macro-keys* (nreverse *kbd-macro-keys*))) + +(define-gsharp-command com-call-last-kbd-macro () + (loop with commands = *global-command-table* + for key in *kbd-macro-keys* do + (let ((command (gethash key commands))) + (cond ((hash-table-p command) (setf commands command)) + ((fboundp command) + (handler-case (funcall command) + (gsharp-condition (condition) (format *error-output* "~a~%" condition)))) + (t (message "no command for ~a~%" key))))))

1 0