diff --git a/base/source/genworks.lisp b/base/source/genworks.lisp index c763fc1bcb16d31466efe9a728c7e1be4190290d..fef619158abac20aae3df8a6e642c09b1c4597ad 100644 --- a/base/source/genworks.lisp +++ b/base/source/genworks.lisp @@ -40,11 +40,12 @@ (ignore-errors (funcall (read-from-string "asdf:system-source-directory") "base")) (if (typep error 'error) (warn "~&ASDF is loaded, but :base is not registered. glisp:*genworks-source-home* remains unknown and set to nil.~%") - (setq *genworks-source-home* - (make-pathname :name nil - :type nil - :directory (butlast (butlast (pathname-directory base-home))) - :defaults base-home))))))) + (when base-home + (setq *genworks-source-home* + (make-pathname :name nil + :type nil + :directory (butlast (butlast (pathname-directory base-home))) + :defaults base-home)))))))) (set-genworks-source-home-if-known) diff --git a/emacs/gdl.el b/emacs/gdl.el index a71940dfffb2c5a6dcdd4f911632dd215c68e974..7446e571d51a062f5cf2aeb9d4588ddc3d0092d7 100644 --- a/emacs/gdl.el +++ b/emacs/gdl.el @@ -408,22 +408,27 @@ -(defun mac-switch-meta nil - "switch meta between Option and Command" - (interactive) - (if (eq mac-option-modifier nil) - (progn - (setq mac-option-modifier 'meta) - (setq mac-command-modifier 'hyper)) - (progn - (setq mac-option-modifier nil) - (setq mac-command-modifier 'meta)))) + +;;(defun mac-switch-meta nil +;; "switch meta between Option and Command" +;; (interactive) +;; (if (eq mac-option-modifier nil) +;; (progn +;; (setq mac-option-modifier 'meta) +;; (setq mac-command-modifier 'control)) +;; (progn +;; (setq mac-option-modifier nil) +;; (setq mac-command-modifier 'meta)))) + +(defun mac-switch-meta nil + "make option key behave as meta" + (setq mac-option-modifier 'meta)) (when (eql system-type 'darwin) - (mac-switch-meta) (mac-switch-meta)) + ;; A. REFERENCES ;; ;; diff --git a/geom-base/drawing/source/lenses.lisp b/geom-base/drawing/source/lenses.lisp index bc6db8c030607c553046442e8a0f87bde9a90725..6c7cd48a8fb2f90b124220da788bdaa1bbde9a6d 100644 --- a/geom-base/drawing/source/lenses.lisp +++ b/geom-base/drawing/source/lenses.lisp @@ -122,28 +122,29 @@ :output-functions ((cad-output () - (set-format-slot view self) - (let ((center (the center))(view-center (scalar*vector (the view-scale-total) - (keyed-transform*vector (the view-transform) - (the view-center))))) - (with-translated-state (:dxf center) - (with-format-slots (view) - (set-format-slot view nil) - (dolist (cache (list-elements (the annotation-caches))) - (write-the-object cache object cad-output) (write-the-object cache lines-and-curves)) - (set-format-slot view view)) - (dolist (cache (list-elements (the object-caches))) + (let ((*dxf-entity-id* (or *dxf-entity-id* 107))) + (set-format-slot view self) + (let ((center (the center))(view-center (scalar*vector (the view-scale-total) + (keyed-transform*vector (the view-transform) + (the view-center))))) + (with-translated-state (:dxf center) + (with-format-slots (view) + (set-format-slot view nil) + (dolist (cache (list-elements (the annotation-caches))) + (write-the-object cache object cad-output) (write-the-object cache lines-and-curves)) + (set-format-slot view view)) + (dolist (cache (list-elements (the object-caches))) - (write-the-object cache object cad-output)) - ;; - ;; FLAG - look into capturing this translate in the - ;; vertex-array-2d-scaled in view-object-cache. so it will - ;; become unecessary here. - ;; - (with-translated-state (:dxf (make-vector (- (get-x view-center)) - (- (get-y view-center)))) - (dolist (cache (list-elements (the object-caches))) - (write-the-object cache lines-and-curves)))))))) + (write-the-object cache object cad-output)) + ;; + ;; FLAG - look into capturing this translate in the + ;; vertex-array-2d-scaled in view-object-cache. so it will + ;; become unecessary here. + ;; + (with-translated-state (:dxf (make-vector (- (get-x view-center)) + (- (get-y view-center)))) + (dolist (cache (list-elements (the object-caches))) + (write-the-object cache lines-and-curves))))))))) ;;