mcclim-cvs January 2007

mcclim-cvs@common-lisp.net

7 participants
67 discussions

[mcclim-cvs] CVS mcclim
by crhodes 10 Jan '07

10 Jan '07

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv25795 Modified Files: builtin-commands.lisp presentations.lisp presentation-defs.lisp Log Message: Mostly fix AND and OR presentation types in STUPID-SUBTYPEP (used for translator applicability) and PRESENTATION-SUBTYPEP. Add some tests for predefined presentation types. --- /project/mcclim/cvsroot/mcclim/builtin-commands.lisp 2006/11/08 01:18:22 1.25 +++ /project/mcclim/cvsroot/mcclim/builtin-commands.lisp 2007/01/10 11:19:01 1.26 @@ -93,9 +93,15 @@ (t nil global-command-table :gesture :select :tester ((presentation context-type) - (presentation-subtypep (presentation-type presentation) - context-type)) - :tester-definitive t + ;; see the comments around DEFUN PRESENTATION-SUBTYPEP + ;; for some of the logic behind this. Only when + ;; PRESENTATION-SUBTYPEP is unsure do we test the object + ;; itself for PRESENTATION-TYPEP. + (multiple-value-bind (yp sp) + (presentation-subtypep (presentation-type presentation) + context-type) + (or yp (not sp)))) + :tester-definitive nil :menu nil :documentation ((object presentation context-type frame event window x y stream) (let* ((type (presentation-type presentation)) @@ -116,6 +122,10 @@ :stream stream :sensitive nil))))) (object presentation) + ;; returning (PRESENTATION-TYPE PRESENTATION) as the ptype is + ;; formally undefined, as this means that the translator returns a + ;; presentation type which is not PRESENTATION-SUBTYPEP the + ;; translator's TO-TYPE. (values object (presentation-type presentation))) (define-presentation-action presentation-menu --- /project/mcclim/cvsroot/mcclim/presentations.lisp 2006/12/13 19:35:01 1.78 +++ /project/mcclim/cvsroot/mcclim/presentations.lisp 2007/01/10 11:19:01 1.79 @@ -1419,30 +1419,50 @@ (eq super-meta *standard-object-class*)))) do (funcall function super-meta)))) +;;; This is to implement the requirement on presentation translators +;;; for doing subtype calculations without reference to type +;;; parameters. We are generous in that we return T when we are +;;; unsure, to give translator testers a chance to accept or reject +;;; the translator. This is essentially +;;; (multiple-value-bind (yesp surep) +;;; (presentation-subtypep maybe-subtype type) +;;; (or yesp (not surep))) +;;; except faster. (defun stupid-subtypep (maybe-subtype type) "Return t if maybe-subtype is a presentation subtype of type, regardless of parameters." - (when (or (eq maybe-subtype nil) - (eq type t) - (equal maybe-subtype type)) + (when (or (eq maybe-subtype nil) (eq type t)) + (return-from stupid-subtypep t)) + (when (eql maybe-subtype type) (return-from stupid-subtypep t)) (let ((maybe-subtype-name (presentation-type-name maybe-subtype)) (type-name (presentation-type-name type))) - (when (eq type-name 'or) - (loop for or-type in (decode-parameters type) - when (stupid-subtypep maybe-subtype or-type) - do (return-from stupid-subtypep t) - finally (return-from stupid-subtypep nil))) - (let ((subtype-meta (get-ptype-metaclass maybe-subtype-name)) - (type-meta (get-ptype-metaclass type-name))) - (unless (and subtype-meta type-meta) - (return-from stupid-subtypep nil)) - (map-over-ptype-superclasses #'(lambda (super) - (when (eq type-meta super) - (return-from stupid-subtypep t))) - maybe-subtype-name) - nil))) - + (cond + ;; see DEFUN PRESENTATION-SUBTYPEP for some caveats + ((eq maybe-subtype-name 'or) + (let ((or-types (decode-parameters maybe-subtype))) + (every (lambda (x) (stupid-subtypep x type)) or-types))) + ((eq type-name 'and) + (stupid-subtypep maybe-subtype (car (decode-parameters type)))) + ((eq type-name 'or) + (let ((or-types (decode-parameters type))) + (some (lambda (x) (stupid-subtypep maybe-subtype x)) or-types))) + ((eq maybe-subtype-name 'and) + ;; this clause is actually not conservative, but probably in a + ;; way that no-one will complain about too much. Basically, we + ;; will only return T if the first type in the AND (which is + ;; treated specially by CLIM) is subtypep the maybe-supertype + (stupid-subtypep (car (decode-parameters maybe-subtype)) type)) + (t + (let ((subtype-meta (get-ptype-metaclass maybe-subtype-name)) + (type-meta (get-ptype-metaclass type-name))) + (unless (and subtype-meta type-meta) + (return-from stupid-subtypep nil)) + (map-over-ptype-superclasses #'(lambda (super) + (when (eq type-meta super) + (return-from stupid-subtypep t))) + maybe-subtype-name) + nil))))) (defun find-presentation-translators (from-type to-type command-table) (let* ((command-table (find-command-table command-table)) --- /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2007/01/09 03:39:09 1.67 +++ /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2007/01/10 11:19:01 1.68 @@ -162,31 +162,126 @@ (block presentation-subtypep ,@body)))))))) +;;; PRESENTATION-SUBTYPEP suffers from some of the same problems as +;;; CL:SUBTYPEP, most (but sadly not all) of which were solved in +;;; H. Baker "A Decision Procedure for SUBTYPEP"; additionally, it +;;; suffers from the behaviour being underspecified, as CLIM +;;; documentation did not have the years of polish that CLtS did. +;;; +;;; So you might wonder why, instead of copying or using directly some +;;; decent Public Domain subtype code (such as that found in SBCL, +;;; implementing CL:SUBTYPEP), there's this slightly wonky +;;; implementation here. Well, some of the answer lies in the fact +;;; that the subtype relationships answered by this predicate are not +;;; in fact analogous to CL's type system. The major use of +;;; PRESENTATION-SUBTYPEP seems to be for determining whether a +;;; presentation is applicable as input to a translator (including the +;;; default translator, transforming an object to itself); actually, +;;; the first step is taken by STUPID-SUBTYPEP, but that I believe is +;;; simply intended to be a short-circuiting conservative version of +;;; PRESENTATION-SUBTYPEP. +;;; +;;; Most presentation types in CLIM are hierarchically arranged by +;;; single-inheritance, and SUBTYPEP relations on the hierarchy are +;;; easy to determine: simply walk up the hierarchy until you find the +;;; putative supertype (in which case the answer is T, T unless the +;;; type's parameters are wrong) or you find the universal supertype +;;; (in which case the answer is NIL, T. There are numerous wrinkles, +;;; however... +;;; +;;; (1) the NIL presentation type is the universal subtype, breaking +;;; the single-inheritance of the hierarchy. This isn't too bad, +;;; because it can be special-cased. +;;; +;;; (2) union types can be constructed, destroying the +;;; single-inheritance hierarchy (when used as a subtype). +;;; +;;; (3) union types can give rise to ambiguity. For example, is the +;;; NUMBER presentation type subtypep (OR REAL COMPLEX)? What +;;; about (INTEGER 3 6) subtypep (OR (INTEGER 3 4) (INTEGER 5 6))? +;;; Is (OR A B) subtypep (OR B A)? The answer to this last +;;; question is not obvious, as the two types have different +;;; ACCEPT behaviour if A and B have any Lisp objects in common, +;;; even if the presentation types are hierarchically unrelated... +;;; +;;; (4) intersection types can be constructed, destroying the +;;; single-inheritance hierarchy (when used as a supertype). This +;;; is partially mitigated by the explicit documentation that the +;;; first type in the AND type's parameters is privileged and +;;; treated specially by ACCEPT. +;;; +;;; Given these difficulties, I'm aiming for roughly expected +;;; behaviour from STUPID- and PRESENTATION-SUBTYPEP, rather than +;;; something which has a comprehensive understanding of presentation +;;; types and the Lisp object universe (as this would be unachievable +;;; anyway: the user can write arbitrary PRESENTATION-TYPEP +;;; functions); PRESENTATION-SUBTYPEP should not be thought of as a +;;; predicate over sets of Lisp objects, but simply a formal predicate +;;; over a graph of names. This gives rise to the implementation +;;; below for OR and AND types, and the hierarchical walk for all +;;; other types. CSR, 2007-01-10 (defun presentation-subtypep (type maybe-supertype) - (when (equal type maybe-supertype) + ;; special shortcuts: the universal subtype is privileged (and + ;; doesn't in fact fit into a hierarchical lattice); the universal + ;; supertype is easy to identify. + (when (or (eql type nil) (eql maybe-supertype t)) + (return-from presentation-subtypep (values t t))) + (when (eql type maybe-supertype) (return-from presentation-subtypep (values t t))) (with-presentation-type-decoded (super-name super-parameters) - maybe-supertype - (when (eq super-name 'or) - (loop for or-type in super-parameters - when (presentation-subtypep type or-type) - do (return-from presentation-subtypep (values t t)) - finally (return-from presentation-subtypep (values nil t)))) - (when (eq super-name 'satisfies) - (return-from presentation-subtypep (values nil nil))) - (with-presentation-type-decoded (sub-name sub-parameters) - type - (when (eq sub-name 'and) - (loop for and-type in sub-parameters - with subtypep and knownp - with answer-knownp = t - do (multiple-value-setq (subtypep knownp) - (presentation-subtypep and-type maybe-supertype)) - if subtypep - do (return-from presentation-subtypep (values t t)) - else ; track whether we know the answer - do (setf answer-knownp (and answer-knownp knownp)) - finally (return-from presentation-subtypep (values nil answer-knownp))))) + maybe-supertype + (with-presentation-type-decoded (type-name type-parameters) + type + (cond + ;; DO NOT BE TEMPTED TO REARRANGE THESE CLAUSES + ((eq type-name 'or) + (dolist (or-type type-parameters + (return-from presentation-subtypep (values t t))) + (multiple-value-bind (yesp surep) + (presentation-subtypep or-type maybe-supertype) + (unless yesp + (return-from presentation-subtypep (values yesp surep)))))) + ((eq super-name 'and) + (let ((result t)) + (dolist (and-type super-parameters + (return-from presentation-subtypep (values result result))) + (cond + ((and (consp and-type) (eq (car and-type) 'satisfies)) + (setq result nil)) + ((and (consp and-type) (eq (car and-type) 'not)) + (multiple-value-bind (yp sp) + (presentation-subtypep type (cadr and-type)) + (if yp + (return-from presentation-subtypep (values nil t)) + (setq result nil)))) + (t (multiple-value-bind (yp sp) + (presentation-subtypep type and-type) + (unless yp + (if sp + (return-from presentation-subtypep (values nil t)) + (setq result nil))))))))) + ((eq super-name 'or) + (assert (not (eq type-name 'or))) + ;; FIXME: this would be the right method were it not for the + ;; fact that there can be unions 'in disguise' in the + ;; subtype; examples: + ;; (PRESENTATION-SUBTYPEP 'NUMBER '(OR REAL COMPLEX)) + ;; (PRESENTATION-SUBTYPEP '(INTEGER 3 6) + ;; '(OR (INTEGER 2 5) (INTEGER 4 7))) + ;; Sorry about that. + (let ((surep t)) + (dolist (or-type super-parameters + (return-from presentation-subtypep (values nil surep))) + (multiple-value-bind (yp sp) + (presentation-subtypep type or-type) + (cond + (yp (return-from presentation-subtypep (values t t))) + ((not sp) (setq surep nil))))))) + ((eq type-name 'and) + (assert (not (eq super-name 'and))) + (multiple-value-bind (yp sp) + (presentation-subtypep (car type-parameters) maybe-supertype) + (return-from presentation-subtypep (values yp yp)))))) (map-over-presentation-type-supertypes #'(lambda (name massaged) (when (eq name super-name) @@ -2172,18 +2267,14 @@ :acceptably acceptably :for-context-type for-context-type)) -(define-presentation-method accept ((type and) - (stream input-editing-stream) - (view textual-view) - &key) - (let* ((subtype (first types)) - (value (accept subtype - :stream stream - :view view - :prompt nil))) - (unless (presentation-typep value type) - (simple-parse-error "Input type is not of type ~S" type)) - value)) +(define-presentation-method accept + ((type and) (stream input-editing-stream) (view textual-view) &rest args &key) + (let ((subtype (first types))) + (multiple-value-bind (obj ptype) + (apply-presentation-generic-function accept subtype stream view args) + (unless (presentation-typep obj type) + (simple-parse-error "Input object ~S is not of type ~S" obj type)) + obj))) (define-presentation-type-abbreviation token-or-type (tokens type) `(or (member-alist ,tokens) ,type))

1 0

[mcclim-cvs] CVS mcclim/Tests
by crhodes 10 Jan '07

10 Jan '07

Update of /project/mcclim/cvsroot/mcclim/Tests In directory clnet:/tmp/cvs-serv25795/Tests Added Files: presentation-types.lisp Log Message: Mostly fix AND and OR presentation types in STUPID-SUBTYPEP (used for translator applicability) and PRESENTATION-SUBTYPEP. Add some tests for predefined presentation types. --- /project/mcclim/cvsroot/mcclim/Tests/presentation-types.lisp 2007/01/10 11:19:01 NONE +++ /project/mcclim/cvsroot/mcclim/Tests/presentation-types.lisp 2007/01/10 11:19:01 1.1 (in-package :clim-tests) (defparameter *presentation-type-supertypes* '(;; 23.8.1 (t) ;; NIL is a special case (null t) (boolean t) (symbol t) (keyword symbol t) (blank-area t) ;; 23.8.2 (number t) (complex number t) (real number t) (rational real number t) (integer rational real number t) (ratio rational real number t) (float real number t) ;; 23.8.3 (character t) (string t) ;; 23.8.4 (pathname t) ;; 23.8.5 ((completion nil) t) ;; not allowed abbreviations ;; (member t) ((member-sequence nil) t) ((member-alist nil) t) ((subset-completion nil) t) ;; (subset t) ((subset-sequence nil) t) ((subset-alist nil) t) ;; 23.8.6 ((sequence t) t) (sequence-enumerated t) ;; 23.8.7 ;; OR, AND ;; 23.8.8 ;; ((token-or-type nil t) t) ((null-or-type t) t) ((type-or-string t) t) ;; 23.8.9 (expression t) (form expression t))) (defun expect-t-t (type supertype) (multiple-value-bind (yesp surep) (presentation-subtypep type supertype) (assert yesp) (assert surep)) #+mcclim ;; we can do this because *presentation-type-supertypes* doesn't do ;; clever things with type parameters (assert (climi::stupid-subtypep type supertype))) (defun expect-nil-t (type supertype) (multiple-value-bind (yesp surep) (presentation-subtypep type supertype) (assert (not yesp)) (assert surep)) #+mcclim (assert (not (climi::stupid-subtypep type supertype)))) (defun expect-nil-nil (type supertype) (multiple-value-bind (yesp surep) (presentation-subtypep type supertype) (assert (not yesp)) (assert (not surep))) ;; stupid-subtypep must be conservative in what it reports as ;; possibly acceptable. #+mcclim (assert (climi::stupid-subtypep type supertype))) (loop for (type . supertypes) in *presentation-type-supertypes* do (expect-t-t type type) do (expect-t-t nil type) ;; if presentation types were "real" (FIXME: work out what ;; "real" means) types, then this wouldn't actually be true. ;; However, PRESENTATION-SUBTYPEP works by walking up the type ;; lattice until it finds a match, and only then checks the type ;; parameters. So even though presentation types (or ;; abbreviations) like (MEMBER) actually denote the empty set, ;; they are not PRESENTATION-SUBTYPEP NIL. do (expect-nil-t type nil) do (mapcar (lambda (x) (expect-t-t type x)) supertypes)) (loop for (type) in *presentation-type-supertypes* do (expect-t-t type `(and ,type)) do (expect-t-t `(and ,type) type) do (expect-t-t `(and ,type) `(and ,type)) do (expect-t-t type `(or ,type)) do (expect-t-t `(or ,type) type) do (expect-t-t `(or ,type) `(or ,type)) do (expect-t-t `(or ,type) `(and ,type)) do (expect-t-t `(and ,type) `(or ,type))) (defun constantly-t (object) (declare (ignore object)) t) (loop for (type) in *presentation-type-supertypes* do (expect-t-t `(and ,type (satisfies constantly-t)) type) do (expect-nil-nil type `(and ,type (satisfies constantly-t))) do (expect-t-t `(and ,type (not nil)) type) do (expect-nil-nil type `(and ,type (not nil)))) (expect-t-t '(or integer symbol) '(or integer symbol)) (expect-t-t '(or integer symbol) '(or symbol integer)) (expect-t-t '(or real complex) 'number) #+nil (expect-t-t 'number '(or real complex))

1 0

[mcclim-cvs] CVS mcclim
by rgoldman 09 Jan '07

09 Jan '07

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv12180 Modified Files: presentation-defs.lisp Log Message: A partial fix to add support for AND and SATISFIES in presentation-subtypep, where they were previously not supported. Christophe has a better one to replace this with soon. Also added an accept method for AND types. --- /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2007/01/06 12:50:38 1.66 +++ /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2007/01/09 03:39:09 1.67 @@ -172,6 +172,21 @@ when (presentation-subtypep type or-type) do (return-from presentation-subtypep (values t t)) finally (return-from presentation-subtypep (values nil t)))) + (when (eq super-name 'satisfies) + (return-from presentation-subtypep (values nil nil))) + (with-presentation-type-decoded (sub-name sub-parameters) + type + (when (eq sub-name 'and) + (loop for and-type in sub-parameters + with subtypep and knownp + with answer-knownp = t + do (multiple-value-setq (subtypep knownp) + (presentation-subtypep and-type maybe-supertype)) + if subtypep + do (return-from presentation-subtypep (values t t)) + else ; track whether we know the answer + do (setf answer-knownp (and answer-knownp knownp)) + finally (return-from presentation-subtypep (values nil answer-knownp))))) (map-over-presentation-type-supertypes #'(lambda (name massaged) (when (eq name super-name) @@ -1526,10 +1541,17 @@ ;; XXX: We can only visually represent the pathname if it has a name ;; - making it wild is a compromise. If the pathname is completely ;; blank, we leave it as-is, though. + + ;; The above comment was meant to indicate that if the pathname had + ;; neither a name NOR a directory, then it couldn't be visually + ;; represented. Some discussion has ensued on the possbility of + ;; emitting something like "A pathname of type <foo>" + ;; [2007/01/08:rpg] (let ((pathname (if (equal object #.(make-pathname)) object (merge-pathnames object (make-pathname :name :wild))))) - (princ pathname stream))) + (princ object stream)) + ) (define-presentation-method present ((object string) (type pathname) stream (view textual-view) @@ -2150,6 +2172,19 @@ :acceptably acceptably :for-context-type for-context-type)) +(define-presentation-method accept ((type and) + (stream input-editing-stream) + (view textual-view) + &key) + (let* ((subtype (first types)) + (value (accept subtype + :stream stream + :view view + :prompt nil))) + (unless (presentation-typep value type) + (simple-parse-error "Input type is not of type ~S" type)) + value)) + (define-presentation-type-abbreviation token-or-type (tokens type) `(or (member-alist ,tokens) ,type))

1 0

[mcclim-cvs] CVS mcclim/Doc/Guided-Tour
by rgoldman 09 Jan '07

09 Jan '07

Update of /project/mcclim/cvsroot/mcclim/Doc/Guided-Tour In directory clnet:/tmp/cvs-serv11339 Added Files: file-browser.lisp-type-abbrev Log Message: Alternative version of file-browser, more elegant, but relies on features not working yet in McCLIM. --- /project/mcclim/cvsroot/mcclim/Doc/Guided-Tour/file-browser.lisp-type-abbrev 2007/01/09 03:28:19 NONE +++ /project/mcclim/cvsroot/mcclim/Doc/Guided-Tour/file-browser.lisp-type-abbrev 2007/01/09 03:28:19 1.1 (eval-when (:compile-toplevel) (asdf:oos 'asdf:load-op :clim) (asdf:oos 'asdf:load-op :clim-clx)) (eval-when (:compile-toplevel :load-toplevel :execute) (asdf:oos 'asdf:load-op :cl-fad)) (in-package :clim-user) ; LTAG-start:file-browser-all (define-application-frame file-browser () ((active-files :initform nil :accessor active-files)) (:panes (file-browser :application :display-function '(dirlist-display-files) ;; Call the display-function whenever the command ;; loop makes a ``full-cycle'' :display-time :command-loop) (interactor :interactor)) (:layouts (default (vertically () file-browser interactor)))) (define-presentation-type-abbreviation dir-pathname () '((and pathname (satisfies cl-fad:directory-pathname-p)) :description "Directory")) (defmethod dirlist-display-files ((frame file-browser) pane) ;; Clear old displayed entries (clear-output-record (stream-output-history pane)) (dolist (file (active-files frame)) ;; Instead of write-string, we use present so that the link to ;; object file and the semantic information that file is ;; pathname is retained. (present file 'pathname ;; (if (cl-fad:directory-pathname-p file) 'dir-pathname 'pathname) :stream pane) (terpri pane))) ;;; shouldn't this bletch if it is given an argument that is a ;;; well-formed directory name, but for a directory that doesn't ;;; exist? cl-fad:directory-exists-p is relevant ;;; here... [2007/01/07:rpg] (define-file-browser-command (com-edit-directory :name "Edit Directory") ((dir 'dir-pathname)) ;; the following was a previous attempt to deal with the oddities of ;; CL pathnames. Unfortunately, it does not work properly with all ;; lisp implementations. Because of these oddities, we really need ;; a layer like cl-fad to keep things straight. [2007/01/05:rpg] ;;; (let ((dir (make-pathname :directory (pathname-directory dir) ;;; :name :wild :type :wild :version :wild ;;; :defaults dir))) (setf (active-files *application-frame*) (cl-fad:list-directory dir))) (define-presentation-to-command-translator pathname-to-edit-command ((and pathname (satisfies cl-fad:directory-pathname-p)) ; source presentation-type com-edit-directory ; target-command file-browser ; command-table :gesture :select ; use this translator for pointer clicks :documentation "Edit this path") ; used in context menu (object) ; argument List (list object)) ; arguments for target-command (define-file-browser-command (com-quit :name t) () (frame-exit *application-frame*) ) (defmethod adopt-frame :after (frame-manager (frame file-browser)) (declare (ignore frame-manager)) (execute-frame-command frame `(com-edit-directory ,(make-pathname :directory '(:absolute))))) ; LTAG-end

1 0

[mcclim-cvs] CVS mcclim/Doc/Guided-Tour
by rgoldman 09 Jan '07

09 Jan '07

Update of /project/mcclim/cvsroot/mcclim/Doc/Guided-Tour In directory clnet:/tmp/cvs-serv16242 Modified Files: file-browser.lisp Log Message: This is a version of the file-browser example application that works, unlike the one that was previously available. Unfortunately, it doesn't work *well*, because McCLIM's support for AND and SATISFIES presentation-types is incomplete. I am unable to work on this more for the near future, so am committing the working-but-unsatisfactory version. --- /project/mcclim/cvsroot/mcclim/Doc/Guided-Tour/file-browser.lisp 2006/01/30 16:14:01 1.1 +++ /project/mcclim/cvsroot/mcclim/Doc/Guided-Tour/file-browser.lisp 2007/01/09 00:11:39 1.2 @@ -2,6 +2,9 @@ (asdf:oos 'asdf:load-op :clim) (asdf:oos 'asdf:load-op :clim-clx)) +(eval-when (:compile-toplevel :load-toplevel :execute) + (asdf:oos 'asdf:load-op :cl-fad)) + (in-package :clim-user) ; LTAG-start:file-browser-all @@ -18,6 +21,9 @@ file-browser interactor)))) +(define-presentation-type dir-pathname () + :inherit-from 'pathname) + (defmethod dirlist-display-files ((frame file-browser) pane) ;; Clear old displayed entries (clear-output-record (stream-output-history pane)) @@ -26,27 +32,39 @@ ;; Instead of write-string, we use present so that the link to ;; object file and the semantic information that file is ;; pathname is retained. - (present file 'pathname :stream pane) + (present file + (if (cl-fad:directory-pathname-p file) 'dir-pathname 'pathname) + :stream pane) (terpri pane))) (define-file-browser-command (com-edit-directory :name "Edit Directory") - ((dir 'pathname)) - (let ((dir (make-pathname :directory (pathname-directory dir) - :name :wild :type :wild :version :wild - :defaults dir))) + ((dir 'dir-pathname)) + ;; the following was a previous attempt to deal with the oddities of + ;; CL pathnames. Unfortunately, it does not work properly with all + ;; lisp implementations. Because of these oddities, we really need + ;; a layer like cl-fad to keep things straight. [2007/01/05:rpg] +;;; (let ((dir (make-pathname :directory (pathname-directory dir) +;;; :name :wild :type :wild :version :wild +;;; :defaults dir))) (setf (active-files *application-frame*) - (directory dir)))) + (cl-fad:list-directory dir))) (define-presentation-to-command-translator pathname-to-edit-command - (pathname ; source presentation-type + (dir-pathname ; source presentation-type com-edit-directory ; target-command file-browser ; command-table :gesture :select ; use this translator for pointer clicks :documentation "Edit this path") ; used in context menu (object) ; argument List - (list object)) ; arguments for target-command + (list object)) ; arguments for target-command + +(define-file-browser-command (com-quit :name t) () + (frame-exit *application-frame*) + ) (defmethod adopt-frame :after (frame-manager (frame file-browser)) + (declare (ignore frame-manager)) (execute-frame-command frame - `(com-edit-directory ,(make-pathname :directory '(:absolute))))) + `(com-edit-directory ,(make-pathname :directory '(:absolute))))) + ; LTAG-end \ No newline at end of file

1 0

[mcclim-cvs] CVS mcclim/Spec/src
by rgoldman 08 Jan '07

08 Jan '07

Update of /project/mcclim/cvsroot/mcclim/Spec/src In directory clnet:/tmp/cvs-serv31520/src Modified Files: bboxes.tex bordered-output.tex clim.tex designs.tex drawing-options.tex graph-formatting.tex graphics.tex regions.tex table-formatting.tex Added Files: border-example.pdf bounding-box.pdf corner-circle.pdf correct-circle.pdf design-classes.pdf different-ellipses.pdf graph-example.pdf horizontal-lines.pdf inscribed-circle.pdf line-cap-shapes.pdf line-joint-shapes.pdf region-composition.pdf region-normalization.pdf region-structure.pdf table-example.pdf thick-lines.pdf thin-lines.pdf two-triangles.pdf Log Message: Absent any objections, I have modified the Spec LaTeX source so that it works with pdflatex as well as normal latex. In the process, I have added a number of pdf equivalents of epsi files, and changed clim.tex to use graphicx instead of epsfig. As a side-benefit, I tweaked the pdflatex so that hyperlinks are added. --- /project/mcclim/cvsroot/mcclim/Spec/src/bboxes.tex 2000/12/11 06:59:59 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/bboxes.tex 2007/01/08 01:30:25 1.2 @@ -34,7 +34,7 @@ \end{verbatim} \begin{figure} -\centerline{\epsfig{file=bounding-box.epsi}} +\centerline{\includegraphics{bounding-box}} \caption{\label{output-record-bbox} The bounding rectangle of an output record.} \end{figure} --- /project/mcclim/cvsroot/mcclim/Spec/src/bordered-output.tex 2000/12/11 06:59:59 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/bordered-output.tex 2007/01/08 01:30:25 1.2 @@ -25,7 +25,7 @@ \end{verbatim} \begin{figure} -\centerline{\epsfig{file=border-example.epsi}} +\centerline{\includegraphics{border-example}} \caption{\label{border-example} Examples of bordered output.} \end{figure} --- /project/mcclim/cvsroot/mcclim/Spec/src/clim.tex 2000/12/11 06:59:59 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/clim.tex 2007/01/08 01:30:25 1.2 @@ -4,7 +4,9 @@ % --SWM \pagestyle{headings} \usepackage{makeidx} -\usepackage{epsfig} +% replaced with using graphics package [2007/01/05:rpg] +%\usepackage{epsfig} +\usepackage{graphicx} \makeatletter \renewenvironment{theindex}% @@ -17,6 +19,22 @@ {\end{small}\clearpage} \makeatother +%% added to try to make nice bookmarks in PDF... [2005/04/12:rpg] +\ifx\pdfoutput\undefined \csname newcount\endcsname\pdfoutput \fi +\ifcase\pdfoutput \else +\usepackage[pdftex]{hyperref} +\fi + +%% added to try to make nice bookmarks in PDF... [2005/04/12:rpg] +\ifx\pdfoutput\undefined \csname newcount\endcsname\pdfoutput \fi +\ifcase\pdfoutput \DeclareGraphicsExtensions{.epsi}\DeclareGraphicsRule{epsi}{eps}{*}{} +\fi + +% \DeclareGraphicsExtensions{.pdf,.epsi} +% % \DeclareGraphicsRule{epsi}{eps}{*}{} + +% \DeclareGraphicsRule{epsi}{eps}{*}{} + %\usepackage{times} %% For PDF --- /project/mcclim/cvsroot/mcclim/Spec/src/designs.tex 2000/12/11 07:00:00 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/designs.tex 2007/01/08 01:30:25 1.2 @@ -216,7 +216,7 @@ each other. \begin{figure} -\centerline{\epsfig{file=design-classes.epsi}} +\centerline{\includegraphics{design-classes}} \caption{\label{design-classes} The class structure for all designs and regions. Entries in bold correspond to real CLIM classes.} \end{figure} --- /project/mcclim/cvsroot/mcclim/Spec/src/drawing-options.tex 2000/12/11 07:00:00 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/drawing-options.tex 2007/01/08 01:30:25 1.2 @@ -486,7 +486,7 @@ window system, so not all platforms will necessarily fully support it. \begin{figure} -\centerline{\epsfig{file=line-joint-shapes.epsi}} +\centerline{\includegraphics{line-joint-shapes}} \caption{Line joint shapes.} \end{figure} @@ -499,7 +499,7 @@ system, so not all platforms will necessarily fully support it. \begin{figure} -\centerline{\epsfig{file=line-cap-shapes.epsi}} +\centerline{\includegraphics{line-cap-shapes}} \caption{Line cap shapes.} \end{figure} --- /project/mcclim/cvsroot/mcclim/Spec/src/graph-formatting.tex 2000/12/11 07:00:00 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/graph-formatting.tex 2007/01/08 01:30:27 1.2 @@ -31,7 +31,7 @@ \end{verbatim} \begin{figure} -\centerline{\epsfig{file=graph-example.epsi}} +\centerline{\includegraphics{graph-example}} \caption{\label{graph-example} Example of graph formatting.} \end{figure} --- /project/mcclim/cvsroot/mcclim/Spec/src/graphics.tex 2000/12/11 07:00:00 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/graphics.tex 2007/01/08 01:30:27 1.2 @@ -231,7 +231,7 @@ implementations should attempt to draw in this case. \begin{figure} -\centerline{\epsfig{file=two-triangles.epsi}} +\centerline{\includegraphics{two-triangles}} \caption{\label{two-triangles} Pixel assignment with boundary on decision points.} \end{figure} @@ -247,7 +247,7 @@ pick only two of the four points, leading to an undesirable lopsided figure. \begin{figure} -\centerline{\epsfig{file=corner-circle.epsi}} +\centerline{\includegraphics{corner-circle}} \caption{\label{corner-circle} Choosing any two of the shaded pixels causes asymmetry.} \end{figure} @@ -265,7 +265,7 @@ \end{verbatim} \begin{figure} -\centerline{\epsfig{file=inscribed-circle.epsi}} +\centerline{\includegraphics{inscribed-circle}} \caption{\label{inscribed-circle} Two forms of a circle inscribed in a rectangle.} \end{figure} @@ -275,7 +275,7 @@ attempt to draw. \begin{figure} -\centerline{\epsfig{file=correct-circle.epsi}} +\centerline{\includegraphics{correct-circle}} \caption{\label{correct-circle} An aesthetically pleasing circle.} \end{figure} @@ -301,7 +301,7 @@ tilted rectangle, the left as the ``thinnest visible'' line. \begin{figure} -\centerline{\epsfig{file=thin-lines.epsi}} +\centerline{\includegraphics{thin-lines}} \caption{\label{thin-lines} Two examples of lines of thickness 1.} \end{figure} @@ -312,7 +312,7 @@ Figure~\ref{thick-lines} are both reasonable. \begin{figure} -\centerline{\epsfig{file=thick-lines.epsi}} +\centerline{\includegraphics{thick-lines}} \caption{\label{thick-lines} Two examples of lines of thickness 2.} \end{figure} @@ -326,7 +326,7 @@ simpler to draw rectilinear borders around rectilinear areas. \begin{figure} -\centerline{\epsfig{file=horizontal-lines.epsi}} +\centerline{\includegraphics{horizontal-lines}} \caption{\label{horizontal-lines} Two possible definitions of horizontal lines. Left figure is X11 definition.} \end{figure} --- /project/mcclim/cvsroot/mcclim/Spec/src/regions.tex 2000/12/11 07:00:00 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/regions.tex 2007/01/08 01:30:27 1.2 @@ -267,7 +267,7 @@ \begin{figure} -\centerline{\epsfig{file=region-normalization.epsi}} +\centerline{\includegraphics{region-normalization}} \caption{Normalization of rectangular region sets.} \end{figure} @@ -319,7 +319,7 @@ \begin{figure} -\centerline{\epsfig{file=region-composition.epsi}} +\centerline{\includegraphics{region-composition}} \caption{Examples of region union, intersection, and difference.} \end{figure} @@ -352,7 +352,7 @@ classes to a separately loadable module (via \cl{provide} and \cl{require}).} \begin{figure} -\centerline{\epsfig{file=region-structure.epsi}} +\centerline{\includegraphics{region-structure}} \caption{The class structure for all regions.} \end{figure} @@ -721,7 +721,7 @@ and correspond to the semi-axes of the ellipse. \begin{figure} -\centerline{\epsfig{file=different-ellipses.epsi}} +\centerline{\includegraphics{different-ellipses}} \caption{Different vectors may specify the same ellipse.} \end{figure} --- /project/mcclim/cvsroot/mcclim/Spec/src/table-formatting.tex 2000/12/11 07:00:00 1.1 +++ /project/mcclim/cvsroot/mcclim/Spec/src/table-formatting.tex 2007/01/08 01:30:27 1.2 @@ -29,7 +29,7 @@ \end{verbatim} \begin{figure} -\centerline{\epsfig{file=table-example.epsi}} +\centerline{\includegraphics{table-example}} \caption{\label{table-example} Example of tabular output.} \end{figure} --- /project/mcclim/cvsroot/mcclim/Spec/src/border-example.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/border-example.pdf 2007/01/08 01:30:28 1.1 %PDF-1.2 %Çì¢ 5 0 obj <</Length 6 0 R/Filter /FlateDecode>> stream xPËn0ŒïWì±9ÔµcàØJQÏIý.Ð@qbøý.R¥œŽ²¥Õzvf|CÎòé¬µp0·xz]A8Ã Ä×R8|1ðtJ1GóS`¢1U)£b<ºénï]~×!âØÄ-ª¶; øîCY¹ÀÁÀ4GÚ×@ìYOe2Uœf+"ÃÛ{GµíÉAüõ±¯méG:2MÜ<lÚ2Sè@J¥ÜòáÖ ò9ÏŠß/þ2ÿõüïAtŠX<w%Æ)ÌúæmÓUåÝW&ODAŠÈà[7iá±ôw9endstream endobj 6 0 obj 249 endobj 4 0 obj <</Type/Page/MediaBox [0 0 612 792] /Rotate 0/Parent 3 0 R /Resources<</ProcSet[/PDF /Text] /Font 8 0 R >> /Contents 5 0 R >> endobj 3 0 obj << /Type /Pages /Kids [ 4 0 R ] /Count 1 >> endobj 1 0 obj <</Type /Catalog /Pages 3 0 R >> endobj 8 0 obj <</R7 7 0 R>> endobj 7 0 obj <</BaseFont/Courier/Type/Font /Subtype/Type1>> endobj 2 0 obj <</Producer(ESP Ghostscript 815.01) /CreationDate(D:20070105111927) /ModDate(D:20070105111927) /Title(border-example.ps) /Creator(Ghostscript ps2epsi from border-example.ps) /Author(ga)>>endobj xref 0 9 0000000000 65535 f 0000000553 00000 n 0000000692 00000 n 0000000494 00000 n 0000000353 00000 n 0000000015 00000 n 0000000334 00000 n 0000000630 00000 n 0000000601 00000 n trailer << /Size 9 /Root 1 0 R /Info 2 0 R /ID [(xQUÍnS!CCn7uþ|)(xQUÍnS!CCn7uþ|)] >> startxref 894 %%EOF --- /project/mcclim/cvsroot/mcclim/Spec/src/bounding-box.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/bounding-box.pdf 2007/01/08 01:30:28 1.1 %PDF-1.2 %Çì¢ 5 0 obj <</Length 6 0 R/Filter /FlateDecode>> stream xÕSÁnÛ0œë+xLåDJ¢€cvëæ[ÑC8^ÄYÓÃþ~€ìdØ°õ:6 §'Ú|ä£Á#·g^×÷í}ÒíÆ |s;çác H@9y8õîó(R+3JÔ QáàžLLìK%8Ô^&ŠbQrÂIUPñ[HÌÉºÄP1Pcc1&ñ>[¬25·ª)f¢GÕO¥fûóVë*ýÿŽÒæÿæÌµ#šæfXUEK¢ý÷Ö&ºI¥%"ny'LÁpµtZ_øÚä{Vh©šŽndŸ²?ûú/²[gÈ«ÌÕ°o]ÓÕIvóå|Ÿâ{Ö}»ó²>À]çÞŒÏ1Åº#¯¢[HA5$š±ÐÜâãñëžÙ:±>¯Æaß/»ÏîŸs,2µQóÖ Ã&°]Ž_OB¶°äWÅ¿KQGÒæh·;¿À²Ç@nã·ðåžÿ>GXåM·ÛsÓñŒ:ÛçsÀò©{§º^¥öù"$ØôÃ©ï_`u²t`×ýš?žvãÁýr÷šendstream endobj 6 0 obj 466 endobj 4 0 obj <</Type/Page/MediaBox [0 0 612 792] /Rotate 0/Parent 3 0 R /Resources<</ProcSet[/PDF /Text] /Font 9 0 R >> /Contents 5 0 R >> endobj 3 0 obj << /Type /Pages /Kids [ 4 0 R ] /Count 1 >> endobj 1 0 obj <</Type /Catalog /Pages 3 0 R >> endobj 9 0 obj <</R7 7 0 R/R8 8 0 R>> endobj 7 0 obj <</BaseFont/Courier/Type/Font /Subtype/Type1>> endobj 8 0 obj <</BaseFont/Courier-Oblique/Type/Font /Subtype/Type1>> endobj 2 0 obj <</Producer(ESP Ghostscript 815.01) /CreationDate(D:20070105111927) /ModDate(D:20070105111927) /Title(bounding-box.ps) /Creator(Ghostscript ps2epsi from bounding-box.ps) /Author(ga)>>endobj xref 0 10 0000000000 65535 f 0000000770 00000 n 0000000988 00000 n 0000000711 00000 n 0000000570 00000 n 0000000015 00000 n 0000000551 00000 n 0000000856 00000 n 0000000918 00000 n 0000000818 00000 n trailer << /Size 10 /Root 1 0 R /Info 2 0 R /ID [(~kÖ\)@CÍc`+,p)(~kÖ\)@CÍc`+,p)] >> startxref 1186 %%EOF --- /project/mcclim/cvsroot/mcclim/Spec/src/corner-circle.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/corner-circle.pdf 2007/01/08 01:30:28 1.1 %PDF-1.2 %Çì¢ 5 0 obj <</Length 6 0 R/Filter /FlateDecode>> stream x¥œ®Ü6F{=Ê€°ÂÕR;Þ7XÄAla7~}S€4óQ¢ïÎ%ÏáðWºûmvÝöoŸ&·ðüïäçÿŠÝì¹ŸŽÿßÿŸLÞ»ápÓ4ŠyHç nÖ}\FÛ>®ÃaLÓæ1-Cºn/7]·wmÛ»1McÇŽéº=?ŒzÑ6rcÆ4iÒÛöÖÑÅ»V÷:, Y²2b·}åÑU»Ö}]GÃ¥!ËCV~µ4Œ4×Ñ0diÈòuÔÛŸ¿·ÆçÇÃÛ|uó__¡tzµ:S\R³O(3)ËÄV<§umÓÛOžË<§Z²«ö{9©Õs:o+(¶£çô¹ì±\H¶ÇV§ž¬©,ÓâšüÌÇê[UVŸmÂ¡âtõœÎm UV]kmÔÑ€N*€k}Âü£<¢¿NÛeÞ/õþR.öç2õ£iÓÁÿéo¯ýy{Ÿæé¿Ë,ÙÏrK.PfJKXËvó¥ùñ~ûÀ¿?ŸN>ŠOõÃ±7Iü~ä¯MHdKo$rê]šV±Þ±úS ê²·šõ»=Œ;ÇðÖ$Xœßjââ»8kBî$ùÔ0$á;IøÎD ÜIÎIì£UG|'I>'±;€®¿7©oo7YÏIì^çSúòNrîÉ¹6ó¥>Ì¶ëŽw©õ.åºÉùR»e©õ.I³ÄŸCŸ5Kè»d¡»Y¢fñ}YÂY(ŽgýöÓ³/Gÿîo£;¢ôIV²ÞÌ±}ñØÞûgïßêö&ùfÉÖ€ÿ|%Kn&IÇô÷ ß¬è8 žß¯e/+·õßJOÆ'äÉxB>÷Æ{äñø¬xZ`YYÞÙúuµ%ÕRÇ[R-u<'ã ùh|DÞïwÆ;à³âhQXee€ÙÎTKoIµÔñd|B'ä£ñyoŒGÞïÏg Ea=Ö¥öšVÛLkµÍ$pRç8Ô9Ø9ß9N6%£!&òlŒŠ÷vÐVÛÌ^kIà€Î!pšs"8±s<8Ÿs8lJFCLäÙxMáìµ¶=œÖ6ÀICàPçDpbçxp|ç8p:Ù È³ñàìµ¶=œÖ6ÀICàPçDpbçxp|ç8p:Ù È³ñ>ÁÙkm3{zm&:À¡ÎàÄÎñàøÎqà8t²) 1Agã5œþ-åµÍìéµ¶Nê:';Çã;ÇãÐÉŠd4ÄA×ô+œÖ6³§×Úf8©sêNìø[¥_áìµÖlJFCLäÙø#ý§é'R·fendstream endobj 6 0 obj 1102 endobj 4 0 obj <</Type/Page/MediaBox [0 0 612 792] /Rotate 0/Parent 3 0 R /Resources<</ProcSet[/PDF /Text] /Font 8 0 R >> /Contents 5 0 R >> endobj 3 0 obj << /Type /Pages /Kids [ 4 0 R ] /Count 1 >> endobj 1 0 obj <</Type /Catalog /Pages 3 0 R >> endobj 8 0 obj <</R7 7 0 R>> endobj 7 0 obj <</BaseFont/Courier/Type/Font /Subtype/Type1>> endobj 2 0 obj <</Producer(ESP Ghostscript 815.01) /CreationDate(D:20070105111928) /ModDate(D:20070105111928) /Title(corner-circle.ps) /Creator(Ghostscript ps2epsi from corner-circle.ps) /Author(ga)>>endobj xref 0 9 0000000000 65535 f 0000001407 00000 n 0000001546 00000 n 0000001348 00000 n 0000001207 00000 n 0000000015 00000 n 0000001187 00000 n 0000001484 00000 n 0000001455 00000 n trailer << /Size 9 /Root 1 0 R /Info 2 0 R /ID [(3ON\),²À¢ÚtçÖá)(3ON\),²À¢ÚtçÖá)] >> startxref 1746 %%EOF --- /project/mcclim/cvsroot/mcclim/Spec/src/correct-circle.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/correct-circle.pdf 2007/01/08 01:30:28 1.1 %PDF-1.2 %Çì¢ 5 0 obj <</Length 6 0 R/Filter /FlateDecode>> stream x¥Í®Ü6F÷~ /ÓEý¢Œ t}{ç MÑ wlòú±eüdk5FuéÏûÎÙ-~vû¿úþüÜÂó¿ÿVv³·œðñÿç?Ó·É{7l1MC:ºeà¥{Œ¶ÃŠ1ÍC:íhxvî:d³»¶ÃŠ1ÍcZt9épRNúÒ]ìqÒ×vÓ4ŠyLË.'íWúÒ]ìÑ¹¶ÃŠ1ÍcZô~ÒëèB_ë,ŒvÃ¥!ËCVFì~^yt)/Ír^×n²4dyÄîÃÒð"\»aÈÒuó_ÏíËöqÔ«ÏKq£²_¢ÌzSìÅsjË©vðsÁÇ7²Úz4SªçÔc!bèszßÎq{f±s<ê5mïÉ/öÏíè{µ]èô;\)Çšè±ä ®œtr¬oSmO÷ïo¬/ÛÅ~ß~maåàÜ¥ÿoË?&_þ^Ìõíù1yLÿìçÇ¶K.ÐÍ°n§_(ÍéÓüÇãûôõ1œ-šCöòÕ![ÌËÒ!ÙäI$-±uÂj1Ö1VtB¹êR¿:Ã»soCå(õËCB\<ãgCÐ$Û}Ð$IøN>'=H"w€sûj§Lï$Éç$vã×!åíå!ë9Ýë|Q^^²í{rk.ÃäüD)³Ì:¥Ô·Šl×MÎn?jÛ¹%iØOaÈÂw³°f ý,t7KÔ,Ÿ Kx1ãY¿?cäôláö#® ñ¯þÕjC\Ò'Y-Èz3ÇŽ¿÷Ï®?ºê|3dÒ¿%I7€¶!ý}Â÷+mµÝû]x{ÞŠŽrQ>h/µOÈñ|4>"ï÷È;ãðYñŽ(,À²²\Ù}µ&ÕRûGR-µOÈñ|4>"ï÷È;ãðYñŽ(,À²²-i¶=ÕRûGR-µOÈñ|4>"ï÷È;ãðYñŽ(,À²²-i9Tjµa¶Nê:';Çã;ÇãÐÉŠd4ÄA×ôÞ6Új[©éµ¶Nê:';Çã;ÇãÐÉŠd4ÄA×ôö^k[©éµ¶Nê:';Çã;ÇãÐÉŠd4ÄA×ô{¯µÔôZÛJ'uCÁãÁñãÀqèdS2b ÏÆkú{¯µÔôZÛJ'uCÁãÁñãÀqèdS2b ÏÆkzœ×ÚVjzm%:À¡ÎàÄÎñàøÎqà8t²) 1Agã5ý {¯µÔôZÛJ'uCÁãÁñãÀqèdS2b ÏÆ·ôoÓo¥uÂendstream endobj 6 0 obj 1089 endobj 4 0 obj <</Type/Page/MediaBox [0 0 612 792] /Rotate 0/Parent 3 0 R /Resources<</ProcSet[/PDF /Text] /Font 8 0 R >> /Contents 5 0 R >> endobj 3 0 obj << /Type /Pages /Kids [ 4 0 R ] /Count 1 >> endobj 1 0 obj <</Type /Catalog /Pages 3 0 R >> endobj 8 0 obj <</R7 7 0 R>> endobj 7 0 obj <</BaseFont/Courier/Type/Font /Subtype/Type1>> endobj 2 0 obj <</Producer(ESP Ghostscript 815.01) /CreationDate(D:20070105111928) /ModDate(D:20070105111928) /Title(correct-circle.ps) /Creator(Ghostscript ps2epsi from correct-circle.ps) /Author(ga)>>endobj xref 0 9 0000000000 65535 f 0000001394 00000 n 0000001533 00000 n 0000001335 00000 n 0000001194 00000 n 0000000015 00000 n 0000001174 00000 n 0000001471 00000 n 0000001442 00000 n trailer << /Size 9 /Root 1 0 R /Info 2 0 R /ID [(Î2iB&óá,æ/X²')(Î2iB&óá,æ/X²')] >> startxref 1735 %%EOF --- /project/mcclim/cvsroot/mcclim/Spec/src/design-classes.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/design-classes.pdf 2007/01/08 01:30:28 1.1 %PDF-1.2 %Çì¢ 5 0 obj <</Length 6 0 R/Filter /FlateDecode>> stream xµK0÷ü /É××6~l+UºÝšJ<* Í¿¯ æÒ©Ô*¢|{ïñåžÿ-ÎAí÷œD0<Aþ§8£Yôá«Ds²§0òQ(Xh$9`(;GñÑtå©>d?í)5J@h,%C SXQvâ¢©ÖGñRc ©¯%tÑnm¥ÀLKaeºnk0·ªµïcÜ\ò¢ìß)qÊãÖÊŠ>|ÏŸÜÀ(«ñxªÕPíZÿh®õÑl[Ta®à7?Ææiß^Mk (Í°fqÝ`[ µá2ŽNîE0EoÓŸäý³S&\â0ßKSœUemBcrSaZ?3UU^ú²È«$o§¢SjkÜD}iÊº?$)óÖäÃŽ¶!!:³%·á¶ŠèóúT ]¥SÆDØU7<NÄ)ŽQð.Œ€3}°®©èQÓ¥]ëò©iÏþÆž°7V'kÈmížkªò8Ý*Ä}×]u-ÜÍú)ì«ö*#aûAC"#Ií*$Ú*ú6#;ØvÑIpÀÁâ3¡Ù@`ñ 4èV3#aw>ÄbàÀà3!jr=ë±çTSv5ÀÒ¬4A,µf4ûH±õ¢Óu90h&Ä-J?Ü]êXùýL`o®Y£CÍæZBµ&4õ<¥çÀù{ßëyÎYñ çíQï³Ú± ÝÝÕfgCMžca?ýxîóFåÖgB÷æ 4{ïNPK GÏÿÌùþ«|Þ3ûCô@Næ8endstream endobj 6 0 obj 660 endobj 4 0 obj <</Type/Page/MediaBox [0 0 612 792] /Rotate 0/Parent 3 0 R /Resources<</ProcSet[/PDF /Text] /Font 9 0 R >> /Contents 5 0 R >> endobj 3 0 obj << /Type /Pages /Kids [ 4 0 R ] /Count 1 >> endobj 1 0 obj <</Type /Catalog /Pages 3 0 R >> endobj 9 0 obj <</R8 8 0 R/R7 7 0 R>> endobj 8 0 obj <</BaseFont/Courier/Type/Font /Subtype/Type1>> endobj 7 0 obj <</BaseFont/Courier-Bold/Type/Font /Subtype/Type1>> endobj 2 0 obj <</Producer(ESP Ghostscript 815.01) /CreationDate(D:20070105111928) /ModDate(D:20070105111928) /Title(design-classes.ps) /Creator(Ghostscript ps2epsi from design-classes.ps) /Author(ga)>>endobj xref 0 10 0000000000 65535 f 0000000964 00000 n 0000001179 00000 n 0000000905 00000 n 0000000764 00000 n 0000000015 00000 n 0000000745 00000 n 0000001112 00000 n 0000001050 00000 n 0000001012 00000 n trailer << /Size 10 /Root 1 0 R /Info 2 0 R /ID [(\r¥>!õ¹gÓ/T5XfX)(\r¥>!õ¹gÓ/T5XfX)] >> startxref 1381 %%EOF --- /project/mcclim/cvsroot/mcclim/Spec/src/different-ellipses.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/different-ellipses.pdf 2007/01/08 01:30:28 1.1 %PDF-1.2 %Çì¢ 5 0 obj <</Length 6 0 R/Filter /FlateDecode>> stream xmKnä0D÷>N ð#RÒ ²r& ³U®R=¶ÜÈ"hvU©È×ÿdLàóÿã{#H?Š¿€· µiîŽ#dÖôm¬bÞr¥8«Úg¥Ü1!p4ÇP!SRí57Jœ¹ßÀ aÊa@d7p±xÆaæ:ÌXŒ¹y«òè£%Þ¯2ÌLœŽlÖÆ×c/Žîkkî«%Š§I!}n(ãÁ.m*œ÷P*øâOóVÍàV³øäÏ«DdøÔÐâT)#Ýî*ÍÅ}Š*°Ú$×ÞžÅbÖ6|äç÷]ÕºGÛœ Ï±÷/ë0xÓ3-iáL7ÎtåúàL7ÎtâLÎûn iM'Ðký4Ý0ô8]µR` í¡ªîÛÛ±ÇKšÌá³ý)0ŒH/Ô³z«ÒöêÆU^ÝUÜ)?!°,œvp_nK÷ÒËDê>aØ ¹¢dÖyÓ2/y@ 9ñ1cóßó1_£œ¶2æãÄØ ìööyYàÀÌ7¬0«Ä>æþ|ÝÏ>7Þ1· ;é<Óë)}9«hªTf:ÍåHH¯p€·5q6 œõ-þc~ß~ ""Ùendstream endobj 6 0 obj 504 endobj 4 0 obj <</Type/Page/MediaBox [0 0 612 792] /Parent 3 0 R /Resources<</ProcSet[/PDF] >> /Contents 5 0 R >> endobj 3 0 obj << /Type /Pages /Kids [ 4 0 R ] /Count 1 >> endobj 1 0 obj <</Type /Catalog /Pages 3 0 R >> endobj 2 0 obj <</Producer(ESP Ghostscript 815.01) /CreationDate(D:20070105111928) /ModDate(D:20070105111928) /Title(different-ellipses.ps) /Creator(Ghostscript ps2epsi from different-ellipses.ps) /Author(ga)>>endobj xref 0 7 0000000000 65535 f 0000000781 00000 n 0000000829 00000 n 0000000722 00000 n 0000000608 00000 n 0000000015 00000 n 0000000589 00000 n trailer << /Size 7 /Root 1 0 R /Info 2 0 R /ID [(h¿9]G\)[ÿ4Ý\r)(h¿9]G\)[ÿ4Ý\r)] >> startxref 1039 %%EOF --- /project/mcclim/cvsroot/mcclim/Spec/src/graph-example.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/graph-example.pdf 2007/01/08 01:30:28 1.1 %PDF-1.2 %Çì¢ 5 0 obj <</Length 6 0 R/Filter /FlateDecode>> stream xu±Â0Dw7Ú¡!qS')B,,-ù"eá÷qÓe°}ï.ºµ2š§·Ì!A>±?.Ëë#y_Æ°°íWF(¡«U3ÆíÊø"å1älË TÂaŒ@a2»²<Y.Ù"RAûg«Z#9ÅYÒrÐIÉ·žFÀèÈ[LRX{)p^m¶&ä[?{ŸCìÄœØþï×~ÌIïàoYHªendstream endobj 6 0 obj 192 [53 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/horizontal-lines.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/horizontal-lines.pdf 2007/01/08 01:30:28 1.1 [116 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/inscribed-circle.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/inscribed-circle.pdf 2007/01/08 01:30:28 1.1 [186 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/line-cap-shapes.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/line-cap-shapes.pdf 2007/01/08 01:30:28 1.1 [238 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/line-joint-shapes.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/line-joint-shapes.pdf 2007/01/08 01:30:28 1.1 [291 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/region-composition.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/region-composition.pdf 2007/01/08 01:30:28 1.1 [410 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/region-normalization.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/region-normalization.pdf 2007/01/08 01:30:28 1.1 [474 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/region-structure.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/region-structure.pdf 2007/01/08 01:30:28 1.1 [545 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/table-example.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/table-example.pdf 2007/01/08 01:30:28 1.1 [608 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/thick-lines.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/thick-lines.pdf 2007/01/08 01:30:28 1.1 [673 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/thin-lines.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/thin-lines.pdf 2007/01/08 01:30:28 1.1 [742 lines skipped] --- /project/mcclim/cvsroot/mcclim/Spec/src/two-triangles.pdf 2007/01/08 01:30:28 NONE +++ /project/mcclim/cvsroot/mcclim/Spec/src/two-triangles.pdf 2007/01/08 01:30:28 1.1 [805 lines skipped]

1 0

[mcclim-cvs] CVS mcclim/Apps/Scigraph/scigraph
by thenriksen 07 Jan '07

07 Jan '07

Update of /project/mcclim/cvsroot/mcclim/Apps/Scigraph/scigraph In directory clnet:/tmp/cvs-serv21709/Apps/Scigraph/scigraph Modified Files: demo-frame.lisp Log Message: >From graph-data.lisp: ; in clim, NIL == FILLED --- /project/mcclim/cvsroot/mcclim/Apps/Scigraph/scigraph/demo-frame.lisp 2003/10/31 11:35:37 1.1 +++ /project/mcclim/cvsroot/mcclim/Apps/Scigraph/scigraph/demo-frame.lisp 2007/01/07 19:58:13 1.2 @@ -117,7 +117,7 @@ :color :salmon :symbologies (list :line-symbol) :data-symbol :circle - :pattern :filled + :pattern nil :equation '(* (sin (* a x)) (sin (* b x))) :variable 'x :min 0 :max 10 :increment .1 :parameters '((a 2) (b 3))))

1 0

[mcclim-cvs] CVS mcclim/Apps/Scigraph/dwim
by thenriksen 07 Jan '07

07 Jan '07

Update of /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim In directory clnet:/tmp/cvs-serv21482/Apps/Scigraph/dwim Modified Files: load-dwim.lisp Log Message: Make sure the output directory exists before compiling. --- /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/load-dwim.lisp 2006/10/28 17:11:31 1.4 +++ /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/load-dwim.lisp 2007/01/07 19:54:52 1.5 @@ -119,6 +119,7 @@ (binary (make-pathname :defaults bin-dir :name name :type (file-type-for-binaries)))) + (ensure-directories-exist bin-dir) (when (or (not (probe-file binary)) (< (file-write-date binary) (file-write-date source))) (compile-file source :output-file binary))

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 07 Jan '07

07 Jan '07

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv21388 Modified Files: panes.lisp Log Message: >From the spec: "Returns the viewport region of the CLIM stream pane window. If the window is not scrollable, and hence has no viewport, this will region [sic] `sheet-region' of window." --- /project/mcclim/cvsroot/mcclim/panes.lisp 2006/12/23 11:42:43 1.176 +++ /project/mcclim/cvsroot/mcclim/panes.lisp 2007/01/07 19:53:05 1.177 @@ -27,7 +27,7 @@ ;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;;; Boston, MA 02111-1307 USA. -;;; $Id: panes.lisp,v 1.176 2006/12/23 11:42:43 ahefner Exp $ +;;; $Id: panes.lisp,v 1.177 2007/01/07 19:53:05 thenriksen Exp $ (in-package :clim-internals) @@ -2543,7 +2543,8 @@ (stream-replay pane)) (defmethod window-viewport ((pane clim-stream-pane)) - (pane-viewport-region pane)) + (or (pane-viewport-region pane) + (sheet-region pane))) (defmethod window-erase-viewport ((pane clim-stream-pane)) (with-bounding-rectangle* (x1 y1 x2 y2) (or (pane-viewport-region pane)

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 07 Jan '07

07 Jan '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv21022/Drei Modified Files: lisp-syntax-swank.lisp Log Message: Handle :not-available return value from `swank::arglist' (makes it work on CLISP). --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp 2006/11/08 01:15:33 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp 2007/01/07 19:48:16 1.2 @@ -95,7 +95,9 @@ (defmethod arglist ((image swank-local-image) symbol) (declare (ignore image)) - (swank::arglist symbol)) + (let ((arglist (swank::arglist symbol))) + (unless (eq arglist :not-available) + arglist))) (defmethod simple-completions ((image swank-local-image) string default-package) (declare (ignore image))

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

mcclim-cvs January 2007