gsharp-cvs

gsharp-cvs@common-lisp.net

396 discussions

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

19 Jul '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv3761 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Staff types, staves, and clef types are now presentation types. Add staff commands prompt for existing staff and name, type, clef types, etc. for staff to insert. We still do not verify that staff name is unique. We also need to add completion for staff names. Updated documentation and release notes to reflect changes. Date: Sun Jul 18 23:23:53 2004 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.3 gsharp/buffer.lisp:1.4 --- gsharp/buffer.lisp:1.3 Wed Jul 14 11:07:33 2004 +++ gsharp/buffer.lisp Sun Jul 18 23:23:53 2004 @@ -64,38 +64,40 @@ ;;; ;;; Staff -(defgeneric clef (staff)) - (defclass staff () - ((name :accessor name :initarg :name :initform "default") - (clef :accessor clef :initarg :clef :initform nil) + ((name :accessor name :initarg :name :initform "default"))) + +(defgeneric clef (fiveline-staff)) + +(defclass fiveline-staff (staff) + ((clef :accessor clef :initarg :clef :initform nil) (keysig :accessor keysig :initarg :keysig :initform (make-array 7 :initial-element :natural)))) -(defmethod print-object ((s staff) stream) +(defmethod print-object ((s fiveline-staff) stream) (with-slots (name clef keysig) s (format stream "[= :name ~W :clef ~W :keysig ~W ] " name clef keysig))) -(defun make-staff (&optional (clef (make-clef :treble))) - (make-instance 'staff :clef clef)) +(defun make-fiveline-staff (name &optional (clef (make-clef :treble))) + (make-instance 'fiveline-staff :name name :clef clef)) -(defun read-staff-v2 (stream char n) +(defun read-fiveline-staff-v2 (stream char n) (declare (ignore char n)) (let ((clef (read stream nil nil t)) (keysig (read stream nil nil t))) (skip-until-close-bracket stream) - (make-instance 'staff :clef clef :keysig keysig))) + (make-instance 'fiveline-staff :clef clef :keysig keysig))) (set-dispatch-macro-character #\[ #\= - #'read-staff-v2 + #'read-fiveline-staff-v2 *gsharp-readtable-v2*) -(defun read-staff-v3 (stream char n) +(defun read-fiveline-staff-v3 (stream char n) (declare (ignore char n)) - (apply #'make-instance 'staff (read-delimited-list #\] stream t))) + (apply #'make-instance 'fiveline-staff (read-delimited-list #\] stream t))) (set-dispatch-macro-character #\[ #\= - #'read-staff-v3 + #'read-fiveline-staff-v3 *gsharp-readtable-v3*) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -830,7 +832,7 @@ (defclass buffer () ((segments :initform '() :initarg :segments :accessor segments) - (staves :initform (list (make-staff)) :initarg :staves :accessor staves) + (staves :initform (list (make-fiveline-staff "default")) :initarg :staves :accessor staves) (min-width :initform *default-min-width* :initarg :min-width :accessor min-width) (spacing-style :initform *default-spacing-style* :initarg :spacing-style :accessor spacing-style) (right-edge :initform *default-right-edge* :initarg :right-edge :accessor right-edge) @@ -930,13 +932,25 @@ (when errorp (assert staff () 'staff-not-in-buffer)) staff)) -(defmethod add-new-staff-to-buffer (staff-name (buffer buffer)) - (assert (not (find-staff staff-name buffer nil)) () 'staff-already-in-buffer) +(defun add-staff-before (newstaff staff staves) + (assert (not (null staves))) + (if (eq staff (car staves)) + (cons newstaff staves) + (cons (car staves) (add-staff-before newstaff staff (cdr staves))))) + +(defmethod add-staff-before-staff (staff newstaff (buffer buffer)) (setf (staves buffer) - (append (staves buffer) (list (make-instance 'staff - :clef (make-clef :treble) - :name staff-name))))) + (add-staff-before newstaff staff (staves buffer)))) + +(defun add-staff-after (newstaff staff staves) + (assert (not (null staves))) + (if (eq staff (car staves)) + (push newstaff (cdr staves)) + (add-staff-after newstaff staff (cdr staves)))) +(defmethod add-staff-after-staff (staff newstaff (buffer buffer)) + (add-staff-after newstaff staff (staves buffer))) + (defmethod rename-staff (staff-name (staff staff) (buffer buffer)) (assert (not (find-staff staff-name buffer nil)) () 'staff-already-in-buffer) (setf (name staff) staff-name)) @@ -947,16 +961,15 @@ (declare (ignore condition)) (format stream "Staff in use")))) -(defmethod remove-staff-from-buffer (staff-name (buffer buffer)) - (let ((staff (find-staff staff-name buffer))) - (assert (notany (lambda (segment) - (some (lambda (layer) - (member staff (staves layer))) - (layers segment))) - (segments buffer)) - () 'staff-in-use) - (setf (staves buffer) - (delete staff (staves buffer) :test #'eq)))) +(defmethod remove-staff-from-buffer (staff (buffer buffer)) + (assert (notany (lambda (segment) + (some (lambda (layer) + (member staff (staves layer))) + (layers segment))) + (segments buffer)) + () 'staff-in-use) + (setf (staves buffer) + (delete staff (staves buffer) :test #'eq))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.11 gsharp/gui.lisp:1.12 --- gsharp/gui.lisp:1.11 Sat Jul 17 01:21:13 2004 +++ gsharp/gui.lisp Sun Jul 18 23:23:53 2004 @@ -998,11 +998,88 @@ ;;; ;;; Adding, deleting, and modifying staves -(define-gsharp-command (com-add-staff :name t) ((name 'string)) - (add-new-staff-to-buffer name (buffer *gsharp-frame*))) +(define-presentation-method accept + ((type fiveline-staff) stream (view textual-view) &key) + (multiple-value-bind (staff success string) + (complete-input stream + (lambda (so-far mode) + (complete-from-possibilities + so-far + (staves (buffer *gsharp-frame*)) + '() + :action mode + :predicate (lambda (obj) (typep obj 'fiveline-staff)) + :name-key #'name + :value-key #'identity))) + (declare (ignore string)) + (if success + staff + (error "no such staff name")))) ; FIXME add a gsharp error here. -(define-gsharp-command (com-delete-staff :name t) ((name 'string)) - (remove-staff-from-buffer name (buffer *gsharp-frame*))) +(defun symbol-name-lowcase (symbol) + (string-downcase (symbol-name symbol))) + +(define-presentation-type staff-type ()) + +(define-presentation-method accept + ((type staff-type) stream (view textual-view) &key) + (multiple-value-bind (type success string) + (complete-input stream + (lambda (so-far mode) + (complete-from-possibilities + so-far + '(:fiveline) + '() + :action mode + :predicate (lambda (obj) (declare (ignore obj)) t) + :name-key #'symbol-name-lowcase + :value-key #'identity))) + (declare (ignore string)) + (if success + type + (error "no such staff type")))) + +(define-presentation-type clef-type ()) + +(define-presentation-method accept + ((type clef-type) stream (view textual-view) &key) + (multiple-value-bind (type success string) + (complete-input stream + (lambda (so-far mode) + (complete-from-possibilities + so-far + '(:treble :bass :c :percussion) + '() + :action mode + :predicate (lambda (obj) (declare (ignore obj)) t) + :name-key #'symbol-name-lowcase + :value-key #'identity))) + (declare (ignore string)) + (if success + type + (error "no such staff type")))) + +(defun acquire-new-staff () + (let ((name (accept 'string :prompt "Staff name")) + (type (accept 'staff-type :prompt "Type"))) + (ecase type + (:fiveline (let ((clef (accept 'clef-type :prompt "Clef")) + (line (accept 'integer :prompt "Line"))) + (make-fiveline-staff name (make-clef clef line))))))) + +(define-gsharp-command (com-add-staff-before :name t) () + (add-staff-before-staff (accept 'staff :prompt "Before staff") + (acquire-new-staff) + (buffer *gsharp-frame*))) + +(define-gsharp-command (com-add-staff-after :name t) () + (add-staff-after-staff (accept 'staff :prompt "After staff") + (acquire-new-staff) + (buffer *gsharp-frame*))) + +(define-gsharp-command (com-delete-staff :name t) () + (remove-staff-from-buffer (accept 'staff :prompt "Staff") + (buffer *gsharp-frame*))) (define-gsharp-command (com-rename-staff :name t) ((name 'string)) (let ((buffer (buffer *gsharp-frame*)) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.4 gsharp/packages.lisp:1.5 --- gsharp/packages.lisp:1.4 Fri Jul 16 06:19:25 2004 +++ gsharp/packages.lisp Sun Jul 18 23:23:53 2004 @@ -36,7 +36,7 @@ (:use :common-lisp :gsharp-utilities) (:shadow #:rest) (:export #:clef #:make-clef #:name #:lineno - #:staff #:make-staff #:gsharp-condition + #:staff #:fiveline-staff #:make-fiveline-staff #:gsharp-condition #:pitch #:accidentals #:dots #:cluster #:note #:make-note #:note-less #:note-equal #:bar #:notehead #:rbeams #:lbeams #:dots #:element #:notes @@ -54,7 +54,7 @@ #:make-empty-segment #:make-initialized-segment #:segments #:nb-segments #:segmentno #:staves #:find-staff #:add-segment #:remove-segment - #:add-new-staff-to-buffer + #:add-staff-before-staff #:add-staff-after-staff #:remove-staff-from-buffer #:rename-staff #:add-staff-to-layer

1 0

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

17 Jul '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv23040 Modified Files: gui.lisp Log Message: A '() somehow got forgotten after #-cmu Date: Sat Jul 17 01:21:13 2004 Author: rstrandh Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.10 gsharp/gui.lisp:1.11 --- gsharp/gui.lisp:1.10 Fri Jul 16 06:21:47 2004 +++ gsharp/gui.lisp Sat Jul 17 01:21:13 2004 @@ -328,7 +328,7 @@ (lambda (so-far mode) (complete-from-possibilities so-far - #+cmu (ext:ambiguous-files so-far) #-cmu + #+cmu (ext:ambiguous-files so-far) #-cmu '() '() :action mode :predicate (lambda (obj) (declare (ignore obj)) t)

1 0

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

16 Jul '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv1888 Modified Files: gui.lisp Log Message: allow gsharp to compile under non-cmucl. Since this code is probably going to be removed anyway, we can bypass best practice restrictions from <http://www-jcsu.jesus.cam.ac.uk/~csr21/papers/features.pdf>. Date: Fri Jul 16 06:21:47 2004 Author: crhodes Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.9 gsharp/gui.lisp:1.10 --- gsharp/gui.lisp:1.9 Wed Jul 14 11:07:33 2004 +++ gsharp/gui.lisp Fri Jul 16 06:21:47 2004 @@ -327,7 +327,9 @@ (complete-input stream (lambda (so-far mode) (complete-from-possibilities - so-far (ext:ambiguous-files so-far) '() + so-far + #+cmu (ext:ambiguous-files so-far) #-cmu + '() :action mode :predicate (lambda (obj) (declare (ignore obj)) t) :name-key #'namestring

1 0

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

16 Jul '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv3361 Modified Files: packages.lisp Log Message: Unclean! Unclean! Sanitize the packages so that we can refer to types called REST and functions called NUMBER without violating ANSI 11.1.2.1.2. Also define a "compatibility layer" for our new symbols. Date: Fri Jul 16 06:19:25 2004 Author: crhodes Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.3 gsharp/packages.lisp:1.4 --- gsharp/packages.lisp:1.3 Wed Jul 14 11:07:33 2004 +++ gsharp/packages.lisp Fri Jul 16 06:19:25 2004 @@ -34,6 +34,7 @@ (defpackage :gsharp-buffer (:use :common-lisp :gsharp-utilities) + (:shadow #:rest) (:export #:clef #:make-clef #:name #:lineno #:staff #:make-staff #:gsharp-condition #:pitch #:accidentals #:dots #:cluster #:note @@ -66,6 +67,8 @@ (defpackage :gsharp-numbering (:use :gsharp-utilities :gsharp-buffer :clim-lisp) + (:shadowing-import-from :gsharp-buffer #:rest) + (:shadow #:number) (:export #:number #:number-all)) (defpackage :obseq @@ -78,7 +81,9 @@ #:cost-less #:obseq-solve #:obseq-interval)) (defpackage :gsharp-measure - (:use :common-lisp :gsharp-buffer :gsharp-utilities :obseq) + (:use :common-lisp :gsharp-numbering :gsharp-buffer :gsharp-utilities :obseq) + (:shadowing-import-from :gsharp-numbering #:number) + (:shadowing-import-from :gsharp-buffer #:rest) (:export #:mark-modified #:modified-p #:duration #:measure #:measure-min-dist #:measure-coeff #:measure-start-times #:measure-bar-pos #:measure-seg-pos #:measure-bars #:measures @@ -116,6 +121,7 @@ (defpackage :score-pane (:use :clim :clim-extensions :clim-lisp :sdl :gsharp-buffer) + (:shadowing-import-from :gsharp-buffer #:rest) (:export #:draw-staff #:draw-stem #:draw-right-stem #:draw-left-stem #:draw-ledger-line #:draw-bar-line #:draw-beam #:staff-step #:draw-notehead #:draw-accidental #:draw-clef #:draw-rest #:draw-dot @@ -130,6 +136,8 @@ (:export #:beaming-single #:beaming-double)) (defpackage :gsharp-cursor + (:shadowing-import-from :gsharp-buffer #:rest) + (:shadowing-import-from :gsharp-numbering #:number) (:use :gsharp-utilities :gsharp-buffer :gsharp-numbering :clim-lisp) (:export #:gsharp-cursor #:make-cursor #:end-of-bar-p #:beginning-of-bar-p #:insert-element #:delete-element @@ -156,6 +164,7 @@ (defpackage :gsharp-drawing (:use :clim :clim-lisp :gsharp-buffer :gsharp-measure :gsharp-cursor :gsharp-utilities :sdl :score-pane :gsharp-beaming :obseq) + (:shadowing-import-from :gsharp-buffer #:rest) (:export #:draw-buffer)) (defpackage :midi @@ -176,4 +185,18 @@ (defpackage :gsharp (:use :clim :clim-lisp :gsharp-buffer :gsharp-cursor :gsharp-drawing :gsharp-numbering - :gsharp-measure :score-pane :sdl :midi)) + :gsharp-measure :score-pane :sdl :midi) + (:shadowing-import-from :gsharp-numbering #:number) + (:shadowing-import-from :gsharp-buffer #:rest)) + +(in-package :gsharp-numbering) +(deftype number () 'cl:number) +(setf (find-class 'number) (find-class 'cl:number)) + +(in-package :gsharp-buffer) +(defun rest (list) + (cl:rest list)) +(define-compiler-macro rest (list) + `(cl:rest ,list)) +(define-setf-expander rest (list &environment env) + (get-setf-expansion `(cl:rest ,list) env))

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/drawing.lisp gsharp/gui.lisp gsharp/packages.lisp gsharp/score-pane.lisp
by Robert Strandh 14 Jul '04

14 Jul '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv18228 Modified Files: buffer.lisp drawing.lisp gui.lisp packages.lisp score-pane.lisp Log Message: General: removed presentation test code. in gui.lisp Staves as presentations: draw-staff now also takes a staff object as an argument so that we can use the CLIM present function inside draw-staff. added present method for a staff object on a textual view. modified com-inssert-layer-after to take no arguments, but instead to use accept to gather a staff object. Redisplay: pane is no longer cleared after each interaction, so redisplay is much smoother. Filename completion: added completable-pathname presentation type and an accept method for this type. The accept method uses a CMUCL-specific function (ext:ambiguous-files) to complete prefix pathnames. Contributions for other Lisp systems to make this work would be welcome. modified com-load-file and com-save-buffer-as to take no arguments, but instead to use accept to gather its file name. This modification probably should not have been necessary, as CLIM ought to use accept to gather unsupplied arguments, no? Date: Wed Jul 14 11:07:34 2004 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.2 gsharp/buffer.lisp:1.3 --- gsharp/buffer.lisp:1.2 Mon Feb 16 08:08:00 2004 +++ gsharp/buffer.lisp Wed Jul 14 11:07:33 2004 @@ -72,7 +72,6 @@ (keysig :accessor keysig :initarg :keysig :initform (make-array 7 :initial-element :natural)))) - (defmethod print-object ((s staff) stream) (with-slots (name clef keysig) s (format stream "[= :name ~W :clef ~W :keysig ~W ] " name clef keysig))) Index: gsharp/drawing.lisp diff -u gsharp/drawing.lisp:1.4 gsharp/drawing.lisp:1.5 --- gsharp/drawing.lisp:1.4 Fri Feb 20 00:39:03 2004 +++ gsharp/drawing.lisp Wed Jul 14 11:07:33 2004 @@ -9,6 +9,10 @@ ;; nil indicates that accidental has not been placed yet (accidental-position :initform nil :accessor accidental-position))) +(define-presentation-method present + (staff (type staff) stream (view textual-view) &key) + (format stream "[staff ~a]" (name staff))) + (defmethod draw-staff-and-clef (pane (staff staff) x1 x2) (when (clef staff) (draw-clef pane (name (clef staff)) (+ x1 10) (lineno (clef staff))) @@ -30,7 +34,7 @@ for x from (+ x1 10 (staff-step 8)) by (staff-step 2.5) while (eq (aref (keysig staff) pitch) :sharp) do (draw-accidental pane :sharp x (+ line yoffset))))) - (draw-staff pane x1 x2)) + (draw-staff staff pane x1 x2)) (defun line-cost (measures method) (reduce (lambda (x y) (combine-cost method x y)) measures :initial-value nil)) Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.8 gsharp/gui.lisp:1.9 --- gsharp/gui.lisp:1.8 Fri Feb 27 01:34:30 2004 +++ gsharp/gui.lisp Wed Jul 14 11:07:33 2004 @@ -117,7 +117,7 @@ (setf *commands* *global-command-table*) (when *kbd-macro-recording-p* (setf *kbd-macro-funs* '() *kbd-macro-recording-p* nil)))) - (redisplay-gsharp-panes *gsharp-frame* :force-p t)))) + (redisplay-frame-panes *gsharp-frame*)))) (define-application-frame gsharp () ((buffer :initarg :buffer :accessor buffer) @@ -129,6 +129,7 @@ (score (make-pane 'score-pane :width 700 :height 900 :name "score" + :display-time :no-clear :display-function 'display-score)) (state (make-pane 'score-pane :width 50 :height 200 @@ -198,41 +199,6 @@ for dx from (+ right 5) by 5 do (draw-dot pane (+ xpos dx) 4))))))))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; -;;; Presentation tests for now - -(define-presentation-type bla ()) - -(define-presentation-type blabla () :inherit-from 'bla) - -(define-presentation-method present (object (type bla) stream view &key) - (declare (ignore view)) - (write-string object stream)) - -(define-presentation-type hello ()) - -(define-presentation-method present (object (type hello) stream view &key) - (declare (ignore object view)) - (draw-line* stream 10 40 40 40)) - -(defmethod medium-draw-line* (stream x1 y1 x2 y2) - (declare (ignore x1 y1 x2 y2)) - (format stream "[a line]")) - -(define-gsharp-command com-accept-x ((x 'bla)) - (format *error-output* "~a~%" x)) - -(define-gsharp-command com-accept-y ((y 'blabla)) - (format *error-output* "~a~%" y)) - -(define-gsharp-command com-accept-z ((z 'hello)) - (format *error-output* "~a~%" z)) - -;;; Presentation tests for now -;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (defun draw-the-cursor (pane x) (let* ((state (input-state *gsharp-frame*)) (staff (staff state)) @@ -346,8 +312,36 @@ (input-state *gsharp-frame*) input-state (staves (car (layers (car (segments buffer))))) (list staff)))) -(define-gsharp-command (com-load-file :name t) ((filename 'string :prompt "File Name")) - (let* ((buffer (read-everything filename)) +(define-presentation-type completable-pathname () + :inherit-from 'pathname) + +(define-condition file-not-found (gsharp-condition) () + (:report + (lambda (condition stream) + (declare (ignore condition)) + (format stream "File nont found")))) + +(define-presentation-method accept + ((type completable-pathname) stream (view textual-view) &key) + (multiple-value-bind (pathname success string) + (complete-input stream + (lambda (so-far mode) + (complete-from-possibilities + so-far (ext:ambiguous-files so-far) '() + :action mode + :predicate (lambda (obj) (declare (ignore obj)) t) + :name-key #'namestring + :value-key #'identity)) + :allow-any-input t) + (declare (ignore success)) + (or pathname string))) + +(define-gsharp-command (com-load-file :name t) () + (let* ((stream (frame-standard-input *gsharp-frame*)) + (filename (handler-case (accept 'completable-pathname :stream stream + :prompt "File Name") + (simple-parse-error () (error 'file-not-found)))) + (buffer (read-everything filename)) (staff (car (staves buffer))) (input-state (make-input-state staff)) (cursor (make-initial-cursor buffer))) @@ -356,10 +350,14 @@ (cursor *gsharp-frame*) cursor) (number-all (buffer *gsharp-frame*)))) -(define-gsharp-command (com-save-buffer-as :name t) ((filename 'string :prompt "File Name")) - (with-open-file (stream filename :direction :output) - (save-buffer-to-stream (buffer *gsharp-frame*) stream) - (message "Saved buffer to ~A~%" filename))) +(define-gsharp-command (com-save-buffer-as :name t) () + (let* ((stream (frame-standard-input *gsharp-frame*)) + (filename (handler-case (accept 'completable-pathname :stream stream + :prompt "File Name") + (simple-parse-error () (error 'file-not-found))))) + (with-open-file (stream filename :direction :output) + (save-buffer-to-stream (buffer *gsharp-frame*) stream) + (message "Saved buffer to ~A~%" filename)))) (define-gsharp-command (com-quit :name t) () (frame-exit *application-frame*)) @@ -445,9 +443,10 @@ (setf (staff (input-state *gsharp-frame*)) staff)))))) -(define-gsharp-command (com-insert-layer-after :name t) ((staff-name 'string :prompt "Staff")) +(define-gsharp-command (com-insert-layer-after :name t) () (let ((cursor (cursor *gsharp-frame*)) - (staff (find-staff staff-name (buffer *gsharp-frame*)))) + (staff (accept 'staff :prompt "Staff"))) +;;; (staff (find-staff staff-name (buffer *gsharp-frame*)))) (if (not staff) (message "No such staff in buffer~%") (progn (insert-layer-after (make-initialized-layer) cursor) @@ -456,7 +455,6 @@ (add-staff-to-layer staff layer) (setf (staff (input-state *gsharp-frame*)) staff)))))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.2 gsharp/packages.lisp:1.3 --- gsharp/packages.lisp:1.2 Mon Feb 16 08:08:00 2004 +++ gsharp/packages.lisp Wed Jul 14 11:07:33 2004 @@ -115,7 +115,7 @@ #:128th-rest #:measure-rest #:double-whole-rest)) (defpackage :score-pane - (:use :clim :clim-extensions :clim-lisp :sdl) + (:use :clim :clim-extensions :clim-lisp :sdl :gsharp-buffer) (:export #:draw-staff #:draw-stem #:draw-right-stem #:draw-left-stem #:draw-ledger-line #:draw-bar-line #:draw-beam #:staff-step #:draw-notehead #:draw-accidental #:draw-clef #:draw-rest #:draw-dot Index: gsharp/score-pane.lisp diff -u gsharp/score-pane.lisp:1.3 gsharp/score-pane.lisp:1.4 --- gsharp/score-pane.lisp:1.3 Thu Apr 8 20:42:12 2004 +++ gsharp/score-pane.lisp Wed Jul 14 11:07:33 2004 @@ -407,13 +407,16 @@ (loop for staff-line in (slot-value record 'staff-lines) do (replay-output-record staff-line stream region x-offset y-offset))) -(defun draw-staff (pane x1 x2) - (multiple-value-bind (left right) (bar-line-offsets *font*) - (loop for staff-step from 0 by 2 - repeat 5 do - (present (make-instance 'staff-line :x1 (+ x1 left) :staff-step staff-step :x2 (+ x2 right)) - 'staff-line :stream pane)))) -;;; (draw-staff-line pane (+ x1 left) staff-step (+ x2 right)))) +(define-presentation-method present + (staff (type staff) stream (view textual-view) &key) + (format stream "[staff ~a]" (name staff))) + +(defun draw-staff (staff pane x1 x2) + (with-output-as-presentation (pane staff 'staff) + (multiple-value-bind (left right) (bar-line-offsets *font*) + (loop for staff-step from 0 by 2 + repeat 5 + do (draw-staff-line pane (+ x1 left) staff-step (+ x2 right)))))) ;;;;;;;;;;;;;;;;;; stem

1 0

[gsharp-cvs] CVS update: gsharp/score-pane.lisp
by Robert Strandh 09 Apr '04

09 Apr '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv21751 Modified Files: score-pane.lisp Log Message: Applied patch to display of C-clef sent by James Bielman. Date: Thu Apr 8 23:42:13 2004 Author: rstrandh Index: gsharp/score-pane.lisp diff -u gsharp/score-pane.lisp:1.2 gsharp/score-pane.lisp:1.3 --- gsharp/score-pane.lisp:1.2 Wed Feb 25 17:24:56 2004 +++ gsharp/score-pane.lisp Thu Apr 8 23:42:12 2004 @@ -249,7 +249,7 @@ (ecase name (:treble +glyph-g-clef+) (:bass +glyph-f-clef+) - (:c +glyph-f-clef+))) + (:c +glyph-c-clef+))) ;;;;;;;;;;;;;;;;;; rest

1 0

[gsharp-cvs] CVS update: gsharp/Doc/buffer.tex gsharp/Doc/gsharp.tex
by Robert Strandh 02 Apr '04

02 Apr '04

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv31042 Modified Files: gsharp.tex Added Files: buffer.tex Log Message: This is a first partial attempt at a specification of the buffer protocols. Having a good specification for those protocols will allow us to substitute better implementations, for instance as soon as the flexichain library becomes available. At the moment, I only wrote the simple ones like `clef' and `staff'. It will get messier for major container classes like `bar', `segment', etc. In particular, how cursors are managed needs to be specified in detail. Now might also be the time to question the wisdom of having notes be read-only, something that complicated the code for ties as indicated by Christophe Rhodes. Date: Fri Apr 2 12:13:35 2004 Author: rstrandh Index: gsharp/Doc/gsharp.tex diff -u gsharp/Doc/gsharp.tex:1.2 gsharp/Doc/gsharp.tex:1.3 --- gsharp/Doc/gsharp.tex:1.2 Tue Feb 24 00:30:47 2004 +++ gsharp/Doc/gsharp.tex Fri Apr 2 12:13:35 2004 @@ -478,6 +478,8 @@ possibility. %====================================================== +\inputtex{buffer.tex} +%====================================================== \chapter{The Layout algorithm} \section{Purpose}

1 0

[gsharp-cvs] CVS update: gsharp/Fonts/charmap.mf gsharp/Fonts/ties.mf
by Robert Strandh 26 Mar '04

26 Mar '04

Update of /project/gsharp/cvsroot/gsharp/Fonts In directory common-lisp.net:/tmp/cvs-serv22368 Modified Files: charmap.mf ties.mf Log Message: Added the rest of the tie glyphs. Date: Fri Mar 26 09:25:35 2004 Author: rstrandh Index: gsharp/Fonts/charmap.mf diff -u gsharp/Fonts/charmap.mf:1.3 gsharp/Fonts/charmap.mf:1.4 --- gsharp/Fonts/charmap.mf:1.3 Thu Mar 25 07:53:16 2004 +++ gsharp/Fonts/charmap.mf Fri Mar 26 09:25:34 2004 @@ -120,3 +120,103 @@ global_variable(numeric)(small_tie_eight_down)(160) global_variable(numeric)(small_tie_eight_down_light)(161) +global_variable(numeric)(large_tie_line_one_up)(162) +global_variable(numeric)(large_tie_line_one_up_light)(163) +global_variable(numeric)(large_tie_line_two_up)(164) +global_variable(numeric)(large_tie_line_two_up_light)(165) +global_variable(numeric)(large_tie_line_three_up)(166) +global_variable(numeric)(large_tie_line_three_up_light)(167) +global_variable(numeric)(large_tie_line_four_up)(168) +global_variable(numeric)(large_tie_line_four_up_light)(169) +global_variable(numeric)(large_tie_line_five_up)(170) +global_variable(numeric)(large_tie_line_five_up_light)(171) +global_variable(numeric)(large_tie_line_six_up)(172) +global_variable(numeric)(large_tie_line_six_up_light)(173) +global_variable(numeric)(large_tie_line_seven_up)(174) +global_variable(numeric)(large_tie_line_seven_up_light)(175) +global_variable(numeric)(large_tie_line_eight_up)(176) +global_variable(numeric)(large_tie_line_eight_up_light)(177) +global_variable(numeric)(large_tie_line_nine_up)(178) +global_variable(numeric)(large_tie_line_nine_up_light)(179) +global_variable(numeric)(large_tie_line_ten_up)(180) +global_variable(numeric)(large_tie_line_ten_up_light)(181) +global_variable(numeric)(large_tie_line_left_up)(182) +global_variable(numeric)(large_tie_line_left_up_light)(183) +global_variable(numeric)(large_tie_line_right_up)(184) +global_variable(numeric)(large_tie_line_right_up_light)(185) + +global_variable(numeric)(large_tie_space_one_up)(186) +global_variable(numeric)(large_tie_space_one_up_light)(187) +global_variable(numeric)(large_tie_space_two_up)(188) +global_variable(numeric)(large_tie_space_two_up_light)(189) +global_variable(numeric)(large_tie_space_three_up)(190) +global_variable(numeric)(large_tie_space_three_up_light)(191) +global_variable(numeric)(large_tie_space_four_up)(192) +global_variable(numeric)(large_tie_space_four_up_light)(193) +global_variable(numeric)(large_tie_space_five_up)(194) +global_variable(numeric)(large_tie_space_five_up_light)(195) +global_variable(numeric)(large_tie_space_six_up)(196) +global_variable(numeric)(large_tie_space_six_up_light)(197) +global_variable(numeric)(large_tie_space_seven_up)(198) +global_variable(numeric)(large_tie_space_seven_up_light)(199) +global_variable(numeric)(large_tie_space_eight_up)(200) +global_variable(numeric)(large_tie_space_eight_up_light)(201) +global_variable(numeric)(large_tie_space_nine_up)(202) +global_variable(numeric)(large_tie_space_nine_up_light)(203) +global_variable(numeric)(large_tie_space_ten_up)(204) +global_variable(numeric)(large_tie_space_ten_up_light)(205) +global_variable(numeric)(large_tie_space_left_up)(206) +global_variable(numeric)(large_tie_space_left_up_light)(207) +global_variable(numeric)(large_tie_space_right_up)(208) +global_variable(numeric)(large_tie_space_right_up_light)(209) + +global_variable(numeric)(large_tie_line_one_down)(210) +global_variable(numeric)(large_tie_line_one_down_light)(211) +global_variable(numeric)(large_tie_line_two_down)(212) +global_variable(numeric)(large_tie_line_two_down_light)(213) +global_variable(numeric)(large_tie_line_three_down)(214) +global_variable(numeric)(large_tie_line_three_down_light)(215) +global_variable(numeric)(large_tie_line_four_down)(216) +global_variable(numeric)(large_tie_line_four_down_light)(217) +global_variable(numeric)(large_tie_line_five_down)(218) +global_variable(numeric)(large_tie_line_five_down_light)(219) +global_variable(numeric)(large_tie_line_six_down)(220) +global_variable(numeric)(large_tie_line_six_down_light)(221) +global_variable(numeric)(large_tie_line_seven_down)(222) +global_variable(numeric)(large_tie_line_seven_down_light)(223) +global_variable(numeric)(large_tie_line_eight_down)(224) +global_variable(numeric)(large_tie_line_eight_down_light)(225) +global_variable(numeric)(large_tie_line_nine_down)(226) +global_variable(numeric)(large_tie_line_nine_down_light)(227) +global_variable(numeric)(large_tie_line_ten_down)(228) +global_variable(numeric)(large_tie_line_ten_down_light)(229) +global_variable(numeric)(large_tie_line_left_down)(230) +global_variable(numeric)(large_tie_line_left_down_light)(231) +global_variable(numeric)(large_tie_line_right_down)(232) +global_variable(numeric)(large_tie_line_right_down_light)(233) + +global_variable(numeric)(large_tie_space_one_down)(234) +global_variable(numeric)(large_tie_space_one_down_light)(235) +global_variable(numeric)(large_tie_space_two_down)(236) +global_variable(numeric)(large_tie_space_two_down_light)(237) +global_variable(numeric)(large_tie_space_three_down)(238) +global_variable(numeric)(large_tie_space_three_down_light)(239) +global_variable(numeric)(large_tie_space_four_down)(240) +global_variable(numeric)(large_tie_space_four_down_light)(241) +global_variable(numeric)(large_tie_space_five_down)(242) +global_variable(numeric)(large_tie_space_five_down_light)(243) +global_variable(numeric)(large_tie_space_six_down)(244) +global_variable(numeric)(large_tie_space_six_down_light)(245) +global_variable(numeric)(large_tie_space_seven_down)(246) +global_variable(numeric)(large_tie_space_seven_down_light)(247) +global_variable(numeric)(large_tie_space_eight_down)(248) +global_variable(numeric)(large_tie_space_eight_down_light)(249) +global_variable(numeric)(large_tie_space_nine_down)(250) +global_variable(numeric)(large_tie_space_nine_down_light)(251) +global_variable(numeric)(large_tie_space_ten_down)(252) +global_variable(numeric)(large_tie_space_ten_down_light)(253) +global_variable(numeric)(large_tie_space_left_down)(254) +global_variable(numeric)(large_tie_space_left_down_light)(255) +global_variable(numeric)(large_tie_space_right_down)(256) +global_variable(numeric)(large_tie_space_right_down_light)(257) + Index: gsharp/Fonts/ties.mf diff -u gsharp/Fonts/ties.mf:1.2 gsharp/Fonts/ties.mf:1.3 --- gsharp/Fonts/ties.mf:1.2 Thu Mar 25 07:53:16 2004 +++ gsharp/Fonts/ties.mf Fri Mar 26 09:25:35 2004 @@ -2,15 +2,13 @@ local_variable(numeric)(tie_thickness) (round(0.33 * staff_line_distance)); - local_variable(numeric)(top) - (round(0.33 * staff_line_distance)-1); - local_variable(numeric)(bot) - (round(0.33 * staff_line_distance)); local_variable(numeric)(small_tie_height) (round(0.5 * staff_line_distance)); save small_tie_up; def small_tie_up(expr width) = + local_variable(numeric)(top) + (round(0.33 * staff_line_distance)-1); fill ((0, top){right} .. (width, top-small_tie_height) -- (width-1, top-small_tie_height) .. @@ -24,20 +22,14 @@ save small_tie_up_light; def small_tie_up_light(expr width) = - fill ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle) - scaled magnification; + small_tie_up(width); stripes(width, 2*tie_thickness); enddef; save small_tie_down; def small_tie_down(expr width) = + local_variable(numeric)(bot) + (round(0.33 * staff_line_distance)); fill ((0, -bot){right} .. (width, small_tie_height-bot) -- (width-1, small_tie_height-bot) .. @@ -51,15 +43,7 @@ save small_tie_down_light; def small_tie_down_light(expr width) = - fill ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle) - scaled magnification; + small_tie_down(width); stripes(width, 2*tie_thickness) enddef; @@ -190,5 +174,571 @@ begin_character(small_tie_eight_down_light) small_tie_down_light(round(2.67 * staff_line_distance)); end_character; + + local_variable(numeric)(large_tie_line_height) + (round(0.5 * staff_line_distance)); + + local_variable(numeric)(large_tie_space_height) + (round(0.5 * staff_line_distance)); + + save large_tie_up; + def large_tie_up(expr width_multiplier, height) = + local_variable(numeric)(top) + (round(0.33 * staff_line_distance)-1); + local_variable(numeric)(width) + (round(width_multiplier * staff_line_distance)); + fill ((0, top){right} .. + (width, top-height) -- + (width-1, top-height) .. + (0.3*width, top-tie_thickness) .. + (0, top-tie_thickness) .. + (-0.3*width, top-tie_thickness) .. + (-(width-1), top-height) -- + (-width, top-height) .. cycle) + scaled magnification; + enddef; + + save large_tie_up_light; + def large_tie_up_light(expr width, height) = + large_tie_up(width, height); + stripes(width, 2*height); + enddef; + + save large_tie_line_up; + def large_tie_line_up(expr width_multiplier) = + large_tie_up(width_multiplier, round(1.0 * staff_line_distance)); + enddef; + + save large_tie_line_up_light; + def large_tie_line_up_light(expr width_multiplier) = + large_tie_up_light(width_multiplier, round(1.0 * staff_line_distance)); + enddef; + + begin_character(large_tie_line_one_up) + large_tie_line_up(2.0); + end_character; + + begin_character(large_tie_line_one_up_light) + large_tie_line_up_light(2.0); + end_character; + + begin_character(large_tie_line_two_up) + large_tie_line_up(2.33); + end_character; + + begin_character(large_tie_line_two_up_light) + large_tie_line_up_light(2.33); + end_character; + + begin_character(large_tie_line_three_up) + large_tie_line_up(2.67); + end_character; + + begin_character(large_tie_line_three_up_light) + large_tie_line_up_light(2.67); + end_character; + + begin_character(large_tie_line_four_up) + large_tie_line_up(3.0); + end_character; + + begin_character(large_tie_line_four_up_light) + large_tie_line_up_light(3.0); + end_character; + + begin_character(large_tie_line_five_up) + large_tie_line_up(3.33); + end_character; + + begin_character(large_tie_line_five_up_light) + large_tie_line_up_light(3.33); + end_character; + + begin_character(large_tie_line_six_up) + large_tie_line_up(3.67); + end_character; + + begin_character(large_tie_line_six_up_light) + large_tie_line_up_light(3.67); + end_character; + + begin_character(large_tie_line_seven_up) + large_tie_line_up(4.0); + end_character; + + begin_character(large_tie_line_seven_up_light) + large_tie_line_up_light(4.0); + end_character; + + begin_character(large_tie_line_eight_up) + large_tie_line_up(4.33); + end_character; + + begin_character(large_tie_line_eight_up_light) + large_tie_line_up_light(4.33); + end_character; + + begin_character(large_tie_line_nine_up) + large_tie_line_up(4.67); + end_character; + + begin_character(large_tie_line_nine_up_light) + large_tie_line_up_light(4.67); + end_character; + + begin_character(large_tie_line_ten_up) + large_tie_line_up(5.0); + end_character; + + begin_character(large_tie_line_ten_up_light) + large_tie_line_up_light(5.0); + end_character; + + begin_character(large_tie_line_left_up) + large_tie_line_up(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (6 * staff_line_distance, -2 * staff_line_distance) -- + (6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + end_character; + + begin_character(large_tie_line_left_up_light) + large_tie_line_up(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (6 * staff_line_distance, -2 * staff_line_distance) -- + (6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + stripes(6 * staff_line_distance, 2 * staff_line_distance); + end_character; + + begin_character(large_tie_line_right_up) + large_tie_line_up(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (-6 * staff_line_distance, -2 * staff_line_distance) -- + (-6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + end_character; + + begin_character(large_tie_line_right_up_light) + large_tie_line_up(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (-6 * staff_line_distance, -2 * staff_line_distance) -- + (-6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + stripes(6 * staff_line_distance, 2 * staff_line_distance); + end_character; + + save large_tie_space_up; + def large_tie_space_up(expr width_multiplier) = + large_tie_up(width_multiplier, round(1.33 * staff_line_distance)); + enddef; + + save large_tie_space_up_light; + def large_tie_space_up_light(expr width_multiplier) = + large_tie_up_light(width_multiplier, round(1.33 * staff_line_distance)); + enddef; + + begin_character(large_tie_space_one_up) + large_tie_space_up(2.0); + end_character; + + begin_character(large_tie_space_one_up_light) + large_tie_space_up_light(2.0); + end_character; + + begin_character(large_tie_space_two_up) + large_tie_space_up(2.33); + end_character; + + begin_character(large_tie_space_two_up_light) + large_tie_space_up_light(2.33); + end_character; + + begin_character(large_tie_space_three_up) + large_tie_space_up(2.67); + end_character; + + begin_character(large_tie_space_three_up_light) + large_tie_space_up_light(2.67); + end_character; + + begin_character(large_tie_space_four_up) + large_tie_space_up(3.0); + end_character; + + begin_character(large_tie_space_four_up_light) + large_tie_space_up_light(3.0); + end_character; + + begin_character(large_tie_space_five_up) + large_tie_space_up(3.33); + end_character; + + begin_character(large_tie_space_five_up_light) + large_tie_space_up_light(3.33); + end_character; + + begin_character(large_tie_space_six_up) + large_tie_space_up(3.67); + end_character; + + begin_character(large_tie_space_six_up_light) + large_tie_space_up_light(3.67); + end_character; + + begin_character(large_tie_space_seven_up) + large_tie_space_up(4.0); + end_character; + + begin_character(large_tie_space_seven_up_light) + large_tie_space_up_light(4.0); + end_character; + + begin_character(large_tie_space_eight_up) + large_tie_space_up(4.33); + end_character; + + begin_character(large_tie_space_eight_up_light) + large_tie_space_up_light(4.33); + end_character; + + begin_character(large_tie_space_nine_up) + large_tie_space_up(4.67); + end_character; + + begin_character(large_tie_space_nine_up_light) + large_tie_space_up_light(4.67); + end_character; + + begin_character(large_tie_space_ten_up) + large_tie_space_up(5.0); + end_character; + + begin_character(large_tie_space_ten_up_light) + large_tie_space_up_light(5.0); + end_character; + + begin_character(large_tie_space_left_up) + large_tie_space_up(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (6 * staff_line_distance, -2 * staff_line_distance) -- + (6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + end_character; + + begin_character(large_tie_space_left_up_light) + large_tie_space_up(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (6 * staff_line_distance, -2 * staff_line_distance) -- + (6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + stripes(6 * staff_line_distance, 2 * staff_line_distance); + end_character; + + begin_character(large_tie_space_right_up) + large_tie_space_up(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (-6 * staff_line_distance, -2 * staff_line_distance) -- + (-6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + end_character; + + begin_character(large_tie_space_right_up_light) + large_tie_space_up(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (-6 * staff_line_distance, -2 * staff_line_distance) -- + (-6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + stripes(6 * staff_line_distance, 2 * staff_line_distance); + end_character; + + save large_tie_down; + def large_tie_down(expr width_multiplier, height) = + local_variable(numeric)(bot) + (round(0.33 * staff_line_distance)); + local_variable(numeric)(width) + (round(width_multiplier * staff_line_distance)); + fill ((0, -bot){right} .. + (width, height-bot) -- + (width-1, height-bot) .. + (0.3*width, tie_thickness-bot) .. + (0, tie_thickness-bot) .. + (-0.3*width, tie_thickness-bot) .. + (-(width-1), height-bot) -- + (-width, height-bot) .. cycle) + scaled magnification; + enddef; + + save large_tie_down_light; + def large_tie_down_light(expr width, height) = + large_tie_down(width, height); + stripes(width, 2*height); + enddef; + + save large_tie_line_down; + def large_tie_line_down(expr width_multiplier) = + large_tie_down(width_multiplier, round(1.0 * staff_line_distance)); + enddef; + + save large_tie_line_down_light; + def large_tie_line_down_light(expr width_multiplier) = + large_tie_down_light(width_multiplier, round(1.0 * staff_line_distance)); + enddef; + + begin_character(large_tie_line_one_down) + large_tie_line_down(2.0); + end_character; + + begin_character(large_tie_line_one_down_light) + large_tie_line_down_light(2.0); + end_character; + + begin_character(large_tie_line_two_down) + large_tie_line_down(2.33); + end_character; + + begin_character(large_tie_line_two_down_light) + large_tie_line_down_light(2.33); + end_character; + + begin_character(large_tie_line_three_down) + large_tie_line_down(2.67); + end_character; + + begin_character(large_tie_line_three_down_light) + large_tie_line_down_light(2.67); + end_character; + + begin_character(large_tie_line_four_down) + large_tie_line_down(3.0); + end_character; + + begin_character(large_tie_line_four_down_light) + large_tie_line_down_light(3.0); + end_character; + + begin_character(large_tie_line_five_down) + large_tie_line_down(3.33); + end_character; + + begin_character(large_tie_line_five_down_light) + large_tie_line_down_light(3.33); + end_character; + + begin_character(large_tie_line_six_down) + large_tie_line_down(3.67); + end_character; + + begin_character(large_tie_line_six_down_light) + large_tie_line_down_light(3.67); + end_character; + + begin_character(large_tie_line_seven_down) + large_tie_line_down(4.0); + end_character; + + begin_character(large_tie_line_seven_down_light) + large_tie_line_down_light(4.0); + end_character; + + begin_character(large_tie_line_eight_down) + large_tie_line_down(4.33); + end_character; + + begin_character(large_tie_line_eight_down_light) + large_tie_line_down_light(4.33); + end_character; + + begin_character(large_tie_line_nine_down) + large_tie_line_down(4.67); + end_character; + + begin_character(large_tie_line_nine_down_light) + large_tie_line_down_light(4.67); + end_character; + + begin_character(large_tie_line_ten_down) + large_tie_line_down(5.0); + end_character; + + begin_character(large_tie_line_ten_down_light) + large_tie_line_down_light(5.0); + end_character; + + begin_character(large_tie_line_left_down) + large_tie_line_down(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (6 * staff_line_distance, -2 * staff_line_distance) -- + (6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + end_character; + + begin_character(large_tie_line_left_down_light) + large_tie_line_down(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (6 * staff_line_distance, -2 * staff_line_distance) -- + (6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + stripes(6 * staff_line_distance, 2 * staff_line_distance); + end_character; + + begin_character(large_tie_line_right_down) + large_tie_line_down(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (-6 * staff_line_distance, -2 * staff_line_distance) -- + (-6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + end_character; + + begin_character(large_tie_line_right_down_light) + large_tie_line_down(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (-6 * staff_line_distance, -2 * staff_line_distance) -- + (-6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + stripes(6 * staff_line_distance, 2 * staff_line_distance); + end_character; + + save large_tie_space_down; + def large_tie_space_down(expr width_multiplier) = + large_tie_down(width_multiplier, round(1.33 * staff_line_distance)); + enddef; + + save large_tie_space_down_light; + def large_tie_space_down_light(expr width_multiplier) = + large_tie_down_light(width_multiplier, round(1.33 * staff_line_distance)); + enddef; + + begin_character(large_tie_space_one_down) + large_tie_space_down(2.0); + end_character; + + begin_character(large_tie_space_one_down_light) + large_tie_space_down_light(2.0); + end_character; + + begin_character(large_tie_space_two_down) + large_tie_space_down(2.33); + end_character; + + begin_character(large_tie_space_two_down_light) + large_tie_space_down_light(2.33); + end_character; + + begin_character(large_tie_space_three_down) + large_tie_space_down(2.67); + end_character; + + begin_character(large_tie_space_three_down_light) + large_tie_space_down_light(2.67); + end_character; + + begin_character(large_tie_space_four_down) + large_tie_space_down(3.0); + end_character; + + begin_character(large_tie_space_four_down_light) + large_tie_space_down_light(3.0); + end_character; + + begin_character(large_tie_space_five_down) + large_tie_space_down(3.33); + end_character; + + begin_character(large_tie_space_five_down_light) + large_tie_space_down_light(3.33); + end_character; + + begin_character(large_tie_space_six_down) + large_tie_space_down(3.67); + end_character; + + begin_character(large_tie_space_six_down_light) + large_tie_space_down_light(3.67); + end_character; + + begin_character(large_tie_space_seven_down) + large_tie_space_down(4.0); + end_character; + + begin_character(large_tie_space_seven_down_light) + large_tie_space_down_light(4.0); + end_character; + + begin_character(large_tie_space_eight_down) + large_tie_space_down(4.33); + end_character; + + begin_character(large_tie_space_eight_down_light) + large_tie_space_down_light(4.33); + end_character; + + begin_character(large_tie_space_nine_down) + large_tie_space_down(4.67); + end_character; + + begin_character(large_tie_space_nine_down_light) + large_tie_space_down_light(4.67); + end_character; + + begin_character(large_tie_space_ten_down) + large_tie_space_down(5.0); + end_character; + + begin_character(large_tie_space_ten_down_light) + large_tie_space_down_light(5.0); + end_character; + + begin_character(large_tie_space_left_down) + large_tie_space_down(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (6 * staff_line_distance, -2 * staff_line_distance) -- + (6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + end_character; + + begin_character(large_tie_space_left_down_light) + large_tie_space_down(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (6 * staff_line_distance, -2 * staff_line_distance) -- + (6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + stripes(6 * staff_line_distance, 2 * staff_line_distance); + end_character; + + begin_character(large_tie_space_right_down) + large_tie_space_down(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (-6 * staff_line_distance, -2 * staff_line_distance) -- + (-6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + end_character; + + begin_character(large_tie_space_right_down_light) + large_tie_space_down(5.0); + erase fill ((0, -2 * staff_line_distance) -- + (-6 * staff_line_distance, -2 * staff_line_distance) -- + (-6 * staff_line_distance, 2 * staff_line_distance) -- + (0, 2 * staff_line_distance) -- cycle) + scaled magnification; + stripes(6 * staff_line_distance, 2 * staff_line_distance); + end_character; + + endgroup;

1 0

[gsharp-cvs] CVS update: gsharp/sdl.lisp gsharp/gf.lisp
by Robert Strandh 26 Mar '04

26 Mar '04

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv30061 Modified Files: sdl.lisp gf.lisp Log Message: Make it possible for the gf file loader to handle fonts with more than 256 characters. Date: Fri Mar 26 09:24:11 2004 Author: rstrandh Index: gsharp/sdl.lisp diff -u gsharp/sdl.lisp:1.3 gsharp/sdl.lisp:1.4 --- gsharp/sdl.lisp:1.3 Thu Feb 19 00:57:22 2004 +++ gsharp/sdl.lisp Fri Mar 26 09:24:11 2004 @@ -168,9 +168,9 @@ *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 - (setf (aref glyphs (gf-char-no char)) - (make-instance 'glyph :gf-char char))) + (loop for char in (gf-font-chars gf-font) + do (setf (aref glyphs (gf-char-no char)) + (make-instance 'glyph :gf-char char))) (make-instance 'font :staff-line-distance staff-line-distance :gf-font gf-font Index: gsharp/gf.lisp diff -u gsharp/gf.lisp:1.1.1.1 gsharp/gf.lisp:1.2 --- gsharp/gf.lisp:1.1.1.1 Mon Feb 16 10:46:11 2004 +++ gsharp/gf.lisp Fri Mar 26 09:24:11 2004 @@ -78,9 +78,10 @@ (paint-command d)) (defun boc-command (char-no prev-char min-m max-m min-n max-n) - (declare (ignore prev-char)) (push (make-instance 'gf-char - :char-no char-no + :char-no (if (= prev-char -1) + char-no + (+ 256 (gf-char-no (find char-no *chars* :key #'gf-char-no)))) :min-m min-m :max-m max-m :min-n min-n :max-n max-n) *chars*) (setf *current-matrix* (make-array `(,(1+ (- max-n min-n)) ,(1+ (- max-m min-m))) @@ -178,10 +179,10 @@ (defun parse-gf-stream (*gf-stream*) (let ((*current-font* nil) (*chars* '())) - (loop for command-code = (u1) then (u1) do - (cond ((<= command-code 63) (paint-command command-code)) - ((<= 74 command-code 238) (new-row-command command-code)) - (t (funcall (aref *commands* command-code)))) + (loop for command-code = (u1) then (u1) + do (cond ((<= command-code 63) (paint-command command-code)) + ((<= 74 command-code 238) (new-row-command command-code)) + (t (funcall (aref *commands* command-code)))) until (= command-code 249) finally (return *current-font*))))

1 0

[gsharp-cvs] CVS update: gsharp/Fonts/charmap.mf gsharp/Fonts/ties.mf
by Robert Strandh 25 Mar '04

25 Mar '04

Update of /project/gsharp/cvsroot/gsharp/Fonts In directory common-lisp.net:/tmp/cvs-serv31120 Modified Files: charmap.mf ties.mf Log Message: Code factoring for small ties. Introduced light glyphs for small ties. Date: Thu Mar 25 07:53:16 2004 Author: rstrandh Index: gsharp/Fonts/charmap.mf diff -u gsharp/Fonts/charmap.mf:1.2 gsharp/Fonts/charmap.mf:1.3 --- gsharp/Fonts/charmap.mf:1.2 Thu Mar 25 01:48:56 2004 +++ gsharp/Fonts/charmap.mf Thu Mar 25 07:53:16 2004 @@ -87,20 +87,36 @@ global_variable(numeric)(flags_up_five_light)(129) global_variable(numeric)(small_tie_one_up)(130) +global_variable(numeric)(small_tie_one_up_light)(131) global_variable(numeric)(small_tie_two_up)(132) +global_variable(numeric)(small_tie_two_up_light)(133) global_variable(numeric)(small_tie_three_up)(134) +global_variable(numeric)(small_tie_three_up_light)(135) global_variable(numeric)(small_tie_four_up)(136) +global_variable(numeric)(small_tie_four_up_light)(137) global_variable(numeric)(small_tie_five_up)(138) +global_variable(numeric)(small_tie_five_up_light)(139) global_variable(numeric)(small_tie_six_up)(140) +global_variable(numeric)(small_tie_six_up_light)(141) global_variable(numeric)(small_tie_seven_up)(142) +global_variable(numeric)(small_tie_seven_up_light)(143) global_variable(numeric)(small_tie_eight_up)(144) +global_variable(numeric)(small_tie_eight_up_light)(145) global_variable(numeric)(small_tie_one_down)(146) +global_variable(numeric)(small_tie_one_down_light)(147) global_variable(numeric)(small_tie_two_down)(148) +global_variable(numeric)(small_tie_two_down_light)(149) global_variable(numeric)(small_tie_three_down)(150) +global_variable(numeric)(small_tie_three_down_light)(151) global_variable(numeric)(small_tie_four_down)(152) +global_variable(numeric)(small_tie_four_down_light)(153) global_variable(numeric)(small_tie_five_down)(154) +global_variable(numeric)(small_tie_five_down_light)(155) global_variable(numeric)(small_tie_six_down)(156) +global_variable(numeric)(small_tie_six_down_light)(157) global_variable(numeric)(small_tie_seven_down)(158) +global_variable(numeric)(small_tie_seven_down_light)(159) global_variable(numeric)(small_tie_eight_down)(160) +global_variable(numeric)(small_tie_eight_down_light)(161) Index: gsharp/Fonts/ties.mf diff -u gsharp/Fonts/ties.mf:1.1 gsharp/Fonts/ties.mf:1.2 --- gsharp/Fonts/ties.mf:1.1 Thu Mar 25 01:48:56 2004 +++ gsharp/Fonts/ties.mf Thu Mar 25 07:53:16 2004 @@ -9,244 +9,186 @@ local_variable(numeric)(small_tie_height) (round(0.5 * staff_line_distance)); + save small_tie_up; + def small_tie_up(expr width) = + fill ((0, top){right} .. + (width, top-small_tie_height) -- + (width-1, top-small_tie_height) .. + (0.5*width, top-tie_thickness) .. + (0, top-tie_thickness) .. + (-0.5*width, top-tie_thickness) .. + (-(width-1), top-small_tie_height) -- + (-width, top-small_tie_height) .. cycle) + scaled magnification; + enddef; + + save small_tie_up_light; + def small_tie_up_light(expr width) = + fill ((0, top){right} .. + (width, top-small_tie_height) -- + (width-1, top-small_tie_height) .. + (0.5*width, top-tie_thickness) .. + (0, top-tie_thickness) .. + (-0.5*width, top-tie_thickness) .. + (-(width-1), top-small_tie_height) -- + (-width, top-small_tie_height) .. cycle) + scaled magnification; + stripes(width, 2*tie_thickness); + enddef; + + save small_tie_down; + def small_tie_down(expr width) = + fill ((0, -bot){right} .. + (width, small_tie_height-bot) -- + (width-1, small_tie_height-bot) .. + (0.5*width, tie_thickness-bot) .. + (0, tie_thickness-bot) .. + (-0.5*width, tie_thickness-bot) .. + (-(width-1), small_tie_height-bot) -- + (-width, small_tie_height-bot) .. cycle) + scaled magnification; + enddef; + + save small_tie_down_light; + def small_tie_down_light(expr width) = + fill ((0, -bot){right} .. + (width, small_tie_height-bot) -- + (width-1, small_tie_height-bot) .. + (0.5*width, tie_thickness-bot) .. + (0, tie_thickness-bot) .. + (-0.5*width, tie_thickness-bot) .. + (-(width-1), small_tie_height-bot) -- + (-width, small_tie_height-bot) .. cycle) + scaled magnification; + stripes(width, 2*tie_thickness) + enddef; + begin_character(small_tie_one_up) - local_variable(numeric)(width) - (round(0.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(0.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_one_up_light) + small_tie_up_light(round(0.33 * staff_line_distance)); end_character; begin_character(small_tie_two_up) - local_variable(numeric)(width) - (round(0.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(0.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_two_up_light) + small_tie_up_light(round(0.67 * staff_line_distance)); end_character; begin_character(small_tie_three_up) - local_variable(numeric)(width) - (round(1.0 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(1.0 * staff_line_distance)); + end_character; + + begin_character(small_tie_three_up_light) + small_tie_up_light(round(1.0 * staff_line_distance)); end_character; begin_character(small_tie_four_up) - local_variable(numeric)(width) - (round(1.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(1.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_four_up_light) + small_tie_up_light(round(1.33 * staff_line_distance)); end_character; begin_character(small_tie_five_up) - local_variable(numeric)(width) - (round(1.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(1.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_five_up_light) + small_tie_up_light(round(1.67 * staff_line_distance)); end_character; begin_character(small_tie_six_up) - local_variable(numeric)(width) - (round(2.0 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(2.0 * staff_line_distance)); + end_character; + + begin_character(small_tie_six_up_light) + small_tie_up_light(round(2.0 * staff_line_distance)); end_character; begin_character(small_tie_seven_up) - local_variable(numeric)(width) - (round(2.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(2.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_seven_up_light) + small_tie_up_light(round(2.33 * staff_line_distance)); end_character; begin_character(small_tie_eight_up) - local_variable(numeric)(width) - (round(2.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(2.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_eight_up_light) + small_tie_up_light(round(2.67 * staff_line_distance)); end_character; begin_character(small_tie_one_down) - local_variable(numeric)(width) - (round(0.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(0.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_one_down_light) + small_tie_down_light(round(0.33 * staff_line_distance)); end_character; begin_character(small_tie_two_down) - local_variable(numeric)(width) - (round(0.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(0.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_two_down_light) + small_tie_down_light(round(0.67 * staff_line_distance)); end_character; begin_character(small_tie_three_down) - local_variable(numeric)(width) - (round(1.0 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(1.0 * staff_line_distance)); + end_character; + + begin_character(small_tie_three_down_light) + small_tie_down_light(round(1.0 * staff_line_distance)); end_character; begin_character(small_tie_four_down) - local_variable(numeric)(width) - (round(1.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(1.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_four_down_light) + small_tie_down_light(round(1.33 * staff_line_distance)); end_character; begin_character(small_tie_five_down) - local_variable(numeric)(width) - (round(1.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(1.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_five_down_light) + small_tie_down_light(round(1.67 * staff_line_distance)); end_character; begin_character(small_tie_six_down) - local_variable(numeric)(width) - (round(2.0 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(2.0 * staff_line_distance)); + end_character; + + begin_character(small_tie_six_down_light) + small_tie_down_light(round(2.0 * staff_line_distance)); end_character; begin_character(small_tie_seven_down) - local_variable(numeric)(width) - (round(2.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(2.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_seven_down_light) + small_tie_down_light(round(2.33 * staff_line_distance)); end_character; begin_character(small_tie_eight_down) - local_variable(numeric)(width) - (round(2.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(2.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_eight_down_light) + small_tie_down_light(round(2.67 * staff_line_distance)); end_character; endgroup;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

gsharp-cvs