X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/1d51a2eea8537084e9e681c297422047ae858989..cbf858b77436d8f8162b3bcf3cd46b0a52101b81:/src/packages.lisp

diff --git a/src/packages.lisp b/src/packages.lisp
dissimilarity index 86%
index ba61e89..c67c325 100644
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,106 +1,79 @@
-(defpackage :lisp-on-lines
-  (:use :arnesi
-	;:iterate
-	;:meta-model
-	:common-lisp
-	;:it.bese.ucw
-	;:clsql
-	:contextl)
-  (:nicknames :lol :mewa)
-
-  #+nil(:shadowing-import-from
-   :ucw
-   :parent)
-  
-  #+nil(:shadowing-import-from
-   :iterate
-   :with)
-
-#+nil  (:shadowing-import-from
-   :clsql
-   :time-difference
-   :make-time
-   :time-ymd
-   :date-ymd
-   :date
-   :get-time
-   :time-element
-   :time+
-   :date-element)
-  
-  (:export
-
-   #:find-description
-   #:ensure-description
-   #:define-description
-
-   #:define-display
-   #:display
-   #:*display*
-   #:*object*
-   
-   #:find-attribute
-   #:attribute-label
-
-
-
-   ;;;; CLSQL meta-model/default attributes definers
-   ;;;; TODO: should be moved to meta-model,
-   ;;;; with lol specific function implemented like the
-   ;;;; CLOS meta-model
-   :define-view-for-table
-   :define-views-for-database
-
-
-   ;;;; The LoL 3 displays
-   #:defdisplay
-   #:defdescription
-   #:defattribute
-   #:display
-   #:display*
-   #:display-using-description
-   #:display-attribute
-   #:call-display
-
-   #:standard-attribute
-   #:attribute.name
-
-;;;; Standard Layers
-
-   #:editor
-   #:one-line
-   #:as-string
-   #:as-table
-;;;; Wrapping layers
-   #:wrap-div
-   #:wrap-link
-   
-   #:show-attribute-labels
-   ;;;; "Lines", the newest creation.
-   :defline
-
-   ;;;; A macro shortcut for creating ucw actions
-   :action
-
-   ;;;; Mewa Exports
-   :find-occurence
-
-   ;;attributes
-   :attributes
-   :attribute-value
-   :define-attributes
-   :with-default-attributes
-   :set-default-attributes
-   :set-attribute
-   :find-attribute
-
-   ;; Some CRUD
-   #:crud
-   #:crud-editor
-   #:crud-viewer
-   #:crud-summary
-   #:crud-database
-   #:instance))
-
-(cl:defpackage #:lol-test
-  (:use :cl :lisp-on-lines :stefil :contextl))
\ No newline at end of file
+(defpackage #:lisp-on-lines
+  (:use 
+   #:contextl
+   #:closer-common-lisp
+
+   #:alexandria)
+  (:nicknames #:lol)
+  (:export
+
+   
+;; Descriptions
+   #:*description*
+   #:description
+   #:defdescription
+   #:find-description   
+   #:current-description
+   #:description-of
+   #:define-description
+   #:defining-description
+   #:described-object
+   #:with-described-object
+   #:funcall-with-described-object
+   #:described-class
+   #:described-standard-class
+   #:with-active-descriptions
+   #:with-inactive-descriptions
+
+
+   ;; Displays
+   #:define-display
+   #:display
+   #:display-using-description
+   #:display-attribute-label
+   #:*display*
+   #:*object*
+   
+   ;; Attributes
+   #:find-attribute
+   #:attribute
+   #:attributes
+   #:attribute-object
+   #:attribute-label
+   #:attribute-delimiter
+   #:attribute-setter
+   #:attribute-slot-name
+   #:label
+   #:attribute-active-p
+   #:attribute-function
+   #:attribute-value
+   #:display-attribute-value
+   #:active-attributes
+   #:attribute-delimiter
+   #:standard-attribute
+   #:funcall-with-attribute-context
+   #:with-attribute-context
+
+   ;; Standard Library
+   
+   ;; editing
+   #:editable
+   #:attribute-editor
+   #:string-attribute-editor
+   #:number-attribute-editor
+   #:password-attribute-editor
+   #:password
+
+   ;; :validation
+   #:validation
+   #:validate
+   #:validp
+
+   ;; CLOS
+   #:slot-definition-attribute
+
+   ;; html
+   #:display-html-attribute-editor
+   #:make-attribute-value-writer))
+
+