[cells-cvs] CVS cells/gui-geometry

[ktilton]

Update of /project/cells/cvsroot/cells/gui-geometry
In directory cl-net:/tmp/cvs-serv22971/gui-geometry

Modified Files:
	defpackage.lisp geo-family.lisp geometer.lisp 
Log Message:
Just trying to get a patch in for record-caller

--- /project/cells/cvsroot/cells/gui-geometry/defpackage.lisp	2008/01/29 04:29:54	1.7
+++ /project/cells/cvsroot/cells/gui-geometry/defpackage.lisp	2008/10/12 01:21:09	1.8
@@ -16,7 +16,7 @@
 
 (defpackage #:gui-geometry
   (:nicknames #:geo)
-  (:use #:common-lisp #:utils-kt #:cells)
+  (:use #:common-lisp #:excl #:utils-kt #:cells)
   (:export #:geometer #:geo-zero-tl #:geo-inline #:a-stack #:a-row
     #:px #:py #:ll #:lt #:lr #:lb #:pl #:pt #:pr #:pb
     #:^px #:^py #:^ll #:^lt #:^lr #:^lb #:^lb-height
--- /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp	2008/06/16 12:38:04	1.14
+++ /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp	2008/10/12 01:21:09	1.15
@@ -17,7 +17,7 @@
 (in-package :gui-geometry)
 
 (export! geo-inline-lazy ^px-self-centered justify py-maintain-pt
-                       ^prior-sib-pb spacing lr-maintain-pr)
+  ^prior-sib-pb spacing lr-maintain-pr orientation)
 
 ;--------------- geo-inline -----------------------------
 ;
@@ -146,7 +146,10 @@
              (setf pl 0
                pt (+ max-pb (downs (^spacing-vt))))
              
-           collect (cons pl pt) into pxys
+           collect (cons (+ pl (case (justify self)
+                                 (:center (/ (- kw (l-width k)) 2))
+                                 (:right (- kw (l-width k)))
+                                 (otherwise 0))) pt) into pxys
            do (incf pl (+ kw (^spacing-hz)))
              (setf max-pb (min max-pb (+ pt (downs (l-height k)))))
            finally (return (cons max-pb pxys)))))
--- /project/cells/cvsroot/cells/gui-geometry/geometer.lisp	2008/04/22 10:11:50	1.15
+++ /project/cells/cvsroot/cells/gui-geometry/geometer.lisp	2008/10/12 01:21:09	1.16
@@ -61,7 +61,7 @@
 
 ;---------- gOffset -------------------
 
-(export! offset-within)
+(export! offset-within inset-lb)
 ;
 (defun offset-within (inner outer &optional dbg)
   (declare (ignorable dbg))
@@ -212,6 +212,9 @@
 (defun inset-lb (self)
    (+ (lb self) (outset self)))
 
+(defun inset-lt (self)
+  (downs (lt self) (outset self)))
+
 (defun inset-height (self)
    (- (l-height self) (outset self) (outset self)))
 
@@ -219,7 +222,7 @@
 
 ;----------------------------------
 
-(export! geo-kid-wrap)
+(export! geo-kid-wrap inset-lt)
 
 (defun geo-kid-wrap (self bound)
   (funcall (ecase bound ((pl pb) '-)((pr pt) '+))