[cells-cvs] CVS cells/gui-geometry

[ktilton]

Update of /project/cells/cvsroot/cells/gui-geometry
In directory clnet:/tmp/cvs-serv2216/gui-geometry

Modified Files:
	defpackage.lisp geo-family.lisp geometer.lisp 
Log Message:
evolving geometry; refinement of test case 01c-cascade

--- /project/cells/cvsroot/cells/gui-geometry/defpackage.lisp	2006/06/04 13:19:59	1.1
+++ /project/cells/cvsroot/cells/gui-geometry/defpackage.lisp	2006/06/05 00:01:22	1.2
@@ -17,4 +17,46 @@
 (defpackage #:gui-geometry
   (:nicknames #:geo)
   (:use #:common-lisp #:utils-kt #:cells)
-  (:export #:geometer #:px #:py #:ll #:lt #:lr #:lb))
\ No newline at end of file
+  (:export #:geometer #:geo-zero-tl #:geo-inline
+    #:px #:py #:ll #:lt #:lr #:lb
+    #:u96ths #:udots #:uinches #:uin #:upoints #:upts #:u8ths #:u16ths #:u32nds
+    #:mkr #:v2-move #:l-height #:mkv2 #:^offset-within #:inset-lr #:v2-v #:v2-h
+    #:r-bounds 
+    #:lb 
+    #:cs-target-res 
+    #:nr-make 
+    #:r-contains 
+    #:collapsed 
+    #:g-box 
+    #:v2-in-rect-ratio 
+    #:v2-xlate 
+    #:v2-in-rect 
+    #:v2-add 
+    #:v2-subtract 
+    #:log2scr 
+    #:^lr-width 
+    #:px-maintain-pr 
+    #:outset 
+    #:py-maintain-pb 
+    #:cs-logical-dpi 
+    #:px-maintain-pl 
+    #:py-maintain-pt 
+    #:scr2log 
+    #:inset-width 
+    #:inset-height 
+    #:res-to-res 
+    #:logical-to-screen-point 
+    #:nres-to-res 
+    #:cs-logical-screen-resolution 
+    #:outl 
+    #:with-r-bounds 
+    #:r-inset 
+    #:ncopy-rect 
+    #:l 
+    #:r-height 
+    #:r-width 
+    #:r-top 
+    #:r-right 
+    #:r-bottom 
+    #:r-left 
+    #:l-width ))
--- /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp	2006/06/04 13:19:59	1.1
+++ /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp	2006/06/05 00:01:22	1.2
@@ -55,16 +55,6 @@
                                    (c? (px-maintain-pl
                                         (^prior-sib-pr self (spacing .parent)))))))))))
 
-(defmodel geo-stack (geo-inline)
-  ()
-  (:default-initargs
-      :orientation :vertical))
-
-(defmodel geo-row (geo-inline)
-  ()
-  (:default-initargs
-      :orientation :horizontal))
-
 (defmacro a-stack ((&rest stack-args) &body dd-kids)
   `(mk-part ,(copy-symbol 'a-stack) (geo-inline)
       , at stack-args
--- /project/cells/cvsroot/cells/gui-geometry/geometer.lisp	2006/06/04 13:19:59	1.1
+++ /project/cells/cvsroot/cells/gui-geometry/geometer.lisp	2006/06/05 00:01:22	1.2
@@ -30,6 +30,10 @@
    (w-box :cell nil :initform (mkr 0 0 0 0) :accessor w-box
      :documentation "bbox in window coordinate system")))
 
+(defmethod collapsed (other)
+  (declare (ignore other))
+  nil)
+
 ;;-------- Zero-zero Top Left ----------------------------
 ;;
 (defmodel geo-zero-tl (family)