November 2005 - gsharp-cvs@common-lisp.net

[gsharp-cvs] CVS update: gsharp/INSTALL
by rstrandh＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv7682 Modified Files: INSTALL Log Message: Added font compilation to INSTALL instructions Date: Tue Nov 1 18:58:26 2005 Author: rstrandh Index: gsharp/INSTALL diff -u gsharp/INSTALL:1.2 gsharp/INSTALL:1.3 --- gsharp/INSTALL:1.2 Tue Nov 1 18:37:01 2005 +++ gsharp/INSTALL Tue Nov 1 18:58:26 2005 @@ -1,3 +1,9 @@ +;;; Compile the fonts + +$ (cd Fonts; make) + +;;; Start the lisp system + ;;; Load the gsharp.asd file or make sure the directory in which it ;;; lives is in the asdf:*central-registry* list of directories

1 0

[gsharp-cvs] CVS update: gsharp/Doc/gsharp.tex
by rstrandh＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv7647 Modified Files: gsharp.tex Log Message: Updated install instructions to conform to reality. Date: Tue Nov 1 18:56:52 2005 Author: rstrandh Index: gsharp/Doc/gsharp.tex diff -u gsharp/Doc/gsharp.tex:1.4 gsharp/Doc/gsharp.tex:1.5 --- gsharp/Doc/gsharp.tex:1.4 Sat Jul 24 08:41:54 2004 +++ gsharp/Doc/gsharp.tex Tue Nov 1 18:56:51 2005 @@ -105,16 +105,22 @@ we have not decided exactly in what form the releases will be made available to the public. -For now, you have to use CMUCL (perhaps SBCL will work as well, but it -has not been tested) with a core image that contains {\clim} and -MK:DEFSYSTEM. Start {\lisp}, load the file \texttt{system.lisp} into -the running {\lisp} image and then type: +First make the fonts. In the \texttt{Fonts} subdirectory, type +\texttt{make}. -\texttt{(operate-on-system :gsharp :compile)} +For now, you have to use a Lisp system that runs McCLIM comfortably +(SBCL, CMUCL, OpenMCL) with a core image that contains {\clim} and +ASDF. Start {\lisp}, load the file \texttt{gsharp.asd} into +the running {\lisp} image and then type: + +\texttt{(asdf:operate 'asdf:load-op :gsharp)} which will compile and load all the files. To start {\gs} type -\texttt{(gsharp::run-gsharp)} +\texttt{(gsharp::gsharp)} + +Instead of loading the ASDF file manually, you could put it in a +directory that is in the list \texttt{asdf:*central-registry*}. \section{The different editing panes}

1 0

[gsharp-cvs] CVS update: gsharp/INSTALL
by rstrandh＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv6921 Modified Files: INSTALL Log Message: Updated INSTALL instructions Date: Tue Nov 1 18:37:01 2005 Author: rstrandh Index: gsharp/INSTALL diff -u gsharp/INSTALL:1.1.1.1 gsharp/INSTALL:1.2 --- gsharp/INSTALL:1.1.1.1 Mon Feb 16 16:46:05 2004 +++ gsharp/INSTALL Tue Nov 1 18:37:01 2005 @@ -1,12 +1,13 @@ -;;; Load the system definition file +;;; Load the gsharp.asd file or make sure the directory in which it +;;; lives is in the asdf:*central-registry* list of directories -(load "system.lisp") +(load "gsharp.asd") ;;; Compile and load the system -(operate-on-system :gsharp :compile) -(operate-on-system :gsharp :load) +(asdf:operate 'asdf:load-op :gsharp) ;;; Run Gsharp -(gsharp::run-gsharp) +(gsharp::gsharp) +

1 0

[gsharp-cvs] CVS update: gsharp/gsharp.asd gsharp/system.lisp
by rstrandh＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv5400 Added Files: gsharp.asd Removed Files: system.lisp Log Message: Replacing system.lisp with gsharp.asd Date: Tue Nov 1 18:19:52 2005 Author: rstrandh

1 0

[gsharp-cvs] CVS update: gsharp/esa.lisp
by crhodes＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv5196 Modified Files: esa.lisp Log Message: Make menus work. Basically copy the body of McCLIM's READ-FRAME-COMMAND :AROUND method into the ESA toplevel Date: Tue Nov 1 10:50:16 2005 Author: crhodes Index: gsharp/esa.lisp diff -u gsharp/esa.lisp:1.7 gsharp/esa.lisp:1.8 --- gsharp/esa.lisp:1.7 Sat Oct 29 00:16:37 2005 +++ gsharp/esa.lisp Tue Nov 1 10:50:16 2005 @@ -212,7 +212,7 @@ (defun process-gestures-or-command (frame command-table) (with-input-context - (`(command :command-table ,(command-table (car (windows frame))))) + (`(or menu-item (command :command-table ,(command-table (car (windows frame)))))) (object) (let ((gestures '())) (multiple-value-bind (numarg numargp) @@ -234,7 +234,18 @@ (execute-frame-command frame command) (return))) (t nil)))))) - (t + (menu-item + (let ((command (command-menu-item-value object))) + (unless (listp command) + (setq command (list command))) + (when (and (typep (frame-standard-input frame) 'interactor-pane) + (member *unsupplied-argument-marker* command :test #'eq)) + (setq command + (command-line-read-remaining-arguments-for-partial-command + (frame-command-table frame) (frame-standard-input frame) + command 0))) + (execute-frame-command frame command))) + (command (execute-frame-command frame object)))) (defmethod redisplay-frame-panes :around ((frame esa-frame-mixin) &key force-p)

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp
by rstrandh＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv29573 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Removed the function MAKE-INITIALIZED-SEGMENT Date: Tue Nov 1 01:23:27 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.18 gsharp/buffer.lisp:1.19 --- gsharp/buffer.lisp:1.18 Mon Oct 31 22:16:03 2005 +++ gsharp/buffer.lisp Tue Nov 1 01:23:26 2005 @@ -745,19 +745,18 @@ (buffer :initform nil :initarg :buffer :accessor buffer) (layers :initform '() :initarg :layers :accessor layers))) -(defmethod initialize-instance :after ((s segment) &rest args) +(defmethod initialize-instance :after ((s segment) &rest args &key staff) (declare (ignore args)) - (loop for layer in (layers s) - do (setf (segment layer) s))) + (with-slots (layers) s + (when (null layers) + (assert (not (null staff))) + (push (make-layer "Default layer" staff) layers)) + (loop for layer in layers + do (setf (segment layer) s)))) (defmethod print-object :after ((s segment) stream) (format stream ":layers ~W " (layers s))) -(defun make-initialized-segment (staff) - (let ((segment (make-instance 'segment))) - (add-layer (make-layer "Default layer" staff) segment) - segment)) - (defun read-segment-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'segment (read-delimited-list #\] stream t))) @@ -861,12 +860,9 @@ (format stream ":staves ~W :segments ~W :min-width ~W :spacing-style ~W :right-edge ~W :left-offset ~W :left-margin ~W " staves segments min-width spacing-style right-edge left-offset left-margin))) -(defun make-empty-buffer () - (make-instance 'buffer)) - (defun make-initialized-buffer () - (let ((buffer (make-empty-buffer))) - (add-segment (make-initialized-segment (car (staves buffer))) buffer 0) + (let ((buffer (make-instance 'buffer))) + (add-segment (make-instance 'segment :staff (car (staves buffer))) buffer 0) buffer)) (defun read-buffer-v3 (stream char n) @@ -911,7 +907,7 @@ (setf segments (delete segment segments :test #'eq)) ;; make sure there is one segment left (unless segments - (add-segment (make-initialized-segment (car (staves buffer))) buffer 0))) + (add-segment (make-instance 'segment :staff (car (staves buffer))) buffer 0))) (setf buffer nil))) (define-condition staff-already-in-buffer (gsharp-condition) () Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.34 gsharp/gui.lisp:1.35 --- gsharp/gui.lisp:1.34 Mon Oct 31 22:16:04 2005 +++ gsharp/gui.lisp Tue Nov 1 01:23:26 2005 @@ -367,13 +367,13 @@ (define-gsharp-command (com-insert-segment-before :name t) () (let ((cursor (cursor *application-frame*))) - (insert-segment-before (make-initialized-segment (car (staves (buffer *application-frame*)))) + (insert-segment-before (make-instance 'segment :staff (car (staves (buffer *application-frame*)))) cursor) (backward-segment cursor))) (define-gsharp-command (com-insert-segment-after :name t) () (let ((cursor (cursor *application-frame*))) - (insert-segment-after (make-initialized-segment (car (staves (buffer *application-frame*)))) + (insert-segment-after (make-instance 'segment :staff (car (staves (buffer *application-frame*)))) cursor) (forward-segment cursor))) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.20 gsharp/packages.lisp:1.21 --- gsharp/packages.lisp:1.20 Mon Oct 31 22:16:04 2005 +++ gsharp/packages.lisp Tue Nov 1 01:23:26 2005 @@ -55,10 +55,9 @@ #:slice #:segment #:slices #:sliceno #:head #:body #:tail #:make-layer #:buffer - #:make-empty-buffer #:make-initialized-buffer + #:make-initialized-buffer #:layers #:nb-layers #:layerno #:add-layer #:remove-layer #:segment - #:make-initialized-segment #:segments #:nb-segments #:segmentno #:staves #:find-staff #:add-segment #:remove-segment #:add-staff-before-staff #:add-staff-after-staff

1 0