diff --git a/clog.asd b/clog.asd index dd78260..1cf335d 100644 --- a/clog.asd +++ b/clog.asd @@ -11,11 +11,9 @@ :pathname "source/" :depends-on (#:clack #:websocket-driver #:alexandria #:hunchentoot #:cl-ppcre #:bordeaux-threads #:trivial-open-browser #:parse-float - #:3BMD #:colorize #:sqlite #:lack-middleware-static #:mgl-pax #:quri) :components ((:file "clog-connection") (:file "clog") - (:file "clog-docs") (:file "clog-utilities") (:file "clog-base") (:file "clog-element") @@ -35,6 +33,11 @@ (:file "clog-web") (:file "clog-helpers"))) +(asdf:defsystem #:clog/docs + :depends-on (#:clog #:3BMD #:colorize) + :pathname "source/" + :components ((:file "clog-docs"))) + (asdf:defsystem #:clog/tools :depends-on (#:clog) :pathname "tools/" diff --git a/doc/clog-manual.html b/doc/clog-manual.html index 3e80250..7d0ea2b 100644 --- a/doc/clog-manual.html +++ b/doc/clog-manual.html @@ -465,7 +465,7 @@ if str is NIL returns empty string otherwise returns nil.

@@ -473,7 +473,7 @@ if str is NIL returns empty string otherwise returns nil.

@@ -481,7 +481,7 @@ if str is NIL returns empty string otherwise returns nil.

@@ -489,7 +489,7 @@ if str is NIL returns empty string otherwise returns nil.

@@ -1331,10 +1331,10 @@ spell checking if Editable is also true.

'Value' of a Form Tag. (See clog-form.lisp)

-

+

@@ -1489,10 +1489,10 @@ content not visible on the screen due to overflow.

CLOG-Element - Styles

-

+

@@ -1505,10 +1505,10 @@ properteries represent just the content or the border, marging, padding, scroll and conent area as a whole. The default is content-box

-

+

@@ -1520,10 +1520,10 @@ scroll and conent area as a whole. The default is content-box

if the right or left side of block should be clear of any 'floated' Element.

-

+

@@ -1535,10 +1535,10 @@ if the right or left side of block should be clear of any 'floated' Element.

elements wrap around it.

-

+

@@ -1642,10 +1642,10 @@ and basis

flex-basis (default :auto = use width or height) for CLOG-ELEMENT

-

+

@@ -1656,10 +1656,10 @@ flex-basis (default :auto = use width or height) for CLOG-ELEMENTGet/Setf direction of flexbox packing.

-

+

@@ -1766,10 +1766,10 @@ flex-basis (default :auto = use width or height) for CLOG-ELEMENTGet/Setf grid-row-end.

-

+

@@ -1780,10 +1780,10 @@ flex-basis (default :auto = use width or height) for CLOG-ELEMENTGet/Setf align items in a flexbox/grid on column axis.

-

+

@@ -1795,10 +1795,10 @@ flex-basis (default :auto = use width or height) for CLOG-ELEMENT -

+

@@ -1810,10 +1810,10 @@ in a flexbox/grid.

on opposite sides of each other or grid on column axis.

-

+

@@ -1824,10 +1824,10 @@ on opposite sides of each other or grid on column axis.

Get/Setf justify items in a grid on row axis.

-

+

@@ -1838,10 +1838,10 @@ on opposite sides of each other or grid on column axis.

Get/Setf override align this item in grid on row axis.

-

+

@@ -1853,10 +1853,10 @@ on opposite sides of each other or grid on column axis.

flexbox or grid on row access.

-

+

@@ -1868,10 +1868,10 @@ flexbox or grid on row access.

an element's box. The default is visible - no clipping.

-

+

@@ -1883,10 +1883,10 @@ an element's box. The default is visible - no clipping.

an element's box for X. The default is Visible - no clipping.

-

+

@@ -1908,10 +1908,10 @@ Note: z-index only works on Elements with Position Type of absolute, relative and fixed.

-

+

@@ -1923,10 +1923,10 @@ Note: z-index only works on Elements with Position Type of absolute, resizeable sets if element can be resized by user.

-

+

@@ -2119,10 +2119,10 @@ margin.

Get/Setf opacity.

-

+

@@ -2159,10 +2159,10 @@ margin.

left/right/center/top/bottom | %x %y | x y

-

+

@@ -2174,10 +2174,10 @@ left/right/center/top/bottom | %x %y | x y

is relative to origin of: padding-box|border-box|content-box

-

+

@@ -2189,10 +2189,10 @@ is relative to origin of: padding-box|border-box|content-box

[ repeat | space | round | no-repeat ][]{1,2}

-

+

@@ -2213,10 +2213,10 @@ underneath its border box, padding box, or content box.

auto | w h | % = cover of parent | contain

-

+

@@ -2260,10 +2260,10 @@ line-width - size or medium|thin|thick|length|initial|inherit

Get/Setf text-shadow.

-

+

@@ -2345,22 +2345,22 @@ A list of standard cursor types can be found at: http://www.w3schools.com/cssref/pr_class_cursor.asp

-

+

-

+

-

+

@@ -2379,10 +2379,10 @@ A list of standard cursor types can be found at:

Set font.

-

+

@@ -2393,10 +2393,10 @@ A list of standard cursor types can be found at:

Get/Setf text-alignment.

-

+

@@ -2824,10 +2824,10 @@ browser width).

CLOG-Section - Class for CLOG Inline Sections

-

+

@@ -2850,10 +2850,10 @@ browser width).

CLOG-Phrase - Class for CLOG Inline Phrases

-

+

@@ -2893,10 +2893,10 @@ browser width).

and if :AUTO-PLACE (default t) place-inside-bottom-of CLOG-OBJ

-

+

@@ -2907,10 +2907,10 @@ and if :AUTO-PLACE (default t) place-inside-bottom-of CLOG-OB

Get/Setf list list-kind.

-

+

@@ -3239,9 +3239,9 @@ and if :AUTO-PLACE (default t) place-inside-bottom-of CLOG-OB

Create a new CLOG-Panel as child of CLOG-OBJ. Optionally you can set the :X, :Y, :WIDTH and :HEIGHT (in :UNITS defulting to :px, if set to nil unit type must be provided for -x,y,width and height), BORDER-STYLE (see BORDER-STYLE-TYPE), +x,y,width and height), BORDER-STYLE (see BORDER-STYLE-TYPE), BORDER-WIDTH, BORDER-COLOR, :POSITIONING (default is :FIXED) (see -POSITIONING-TYPE), :OVERFLOW (default is :CLIP) with :CONTENT (default +POSITIONING-TYPE), :OVERFLOW (default is :CLIP) with :CONTENT (default "") and :RESIZABLE defaults to :NONE. Additional css styles can be set in :STYLE (default "") if :AUTO-PLACE (default t) place-inside-bottom-of CLOG-OBJ. If hidden is true visiblep is set to @@ -3389,10 +3389,10 @@ selector. For example:

CLOG-Form - Class for organizing Form Elements in to a From

-

+

@@ -3498,10 +3498,10 @@ text/plain

elements.

-

+

@@ -3718,10 +3718,10 @@ the File form element type.

Get/Setf form element checkedp.

-

+

@@ -4094,10 +4094,10 @@ optionally fill in with contents of data-list.

https://developer.mozilla.org/en-US/docs/Web/CSS/font

-

+

@@ -4108,10 +4108,10 @@ https://developer.mozilla.org/en-US/docs/Web/CSS/font

Set text alignment style

-

+

@@ -5139,7 +5139,7 @@ Calls on-input with t if confirmed or nil if canceled.

:select a-list ((label name)) a third value can be added "selected" :text value (any text input types also work :email, :tel, etc. - see FORM-ELEMENT-TYPE)

+ see FORM-ELEMENT-TYPE)

Calls on-input after OK or Cancel with an a-list of field name to value if confirmed or nil if canceled.

@@ -5333,10 +5333,10 @@ composit-location is called on the object of that content. If hidden is t then then the visiblep propetery will be set to nil on creation.

-

+

@@ -5679,7 +5679,7 @@ is placed in DOM at top of OBJ instead of bottom of OBJFORM-ELEMENT-TYPE)

+ see FORM-ELEMENT-TYPE)

Calls on-input after OK or Cancel with an a-list of field name to value if confirmed or nil if canceled. CANCEL-TEXT is only displayed if modal is t

@@ -5986,10 +5986,10 @@ very limitted to just open a new tab with url unless is a localhost url.

Close connection to browser with out closing browser.

-

+

@@ -6292,7 +6292,7 @@ If ON-FULL-SCREEN-CHANGE-HANDLER is nil unbind the event.

diff --git a/source/clog-docs.lisp b/source/clog-docs.lisp index 8cc9f68..d650677 100644 --- a/source/clog-docs.lisp +++ b/source/clog-docs.lisp @@ -9,7 +9,52 @@ (in-package :clog) ;;; Various defsections defined in clog.lisp that are specific to -;;; documentation. +;;; documentation and documentation helpers + +;;;;;;;;;;;;;;;; +;; load-world ;; +;;;;;;;;;;;;;;;; + +(defun load-world () + (load "source/clog.lisp") + (load "source/clog-docs.lisp") + (load "source/clog-base.lisp") + (load "source/clog-element.lisp") + (load "source/clog-element-common.lisp") + (load "source/clog-canvas.lisp") + (load "source/clog-form.lisp") + (load "source/clog-window.lisp") + (load "source/clog-navigator.lisp") + (load "source/clog-document.lisp") + (load "source/clog-location.lisp") + (load "source/clog-system.lisp") + (load "source/clog-utilities.lisp") + (load "source/clog-body.lisp") + (load "source/clog-helpers.lisp")) + +;;;;;;;;;;;;;;;;;;;; +;; make-mark-down ;; +;;;;;;;;;;;;;;;;;;;; + +(defun make-mark-down () + (load-world) + (describe clog:@CLOG-MANUAL)) + +;;;;;;;;;;;;;;; +;; make-html ;; +;;;;;;;;;;;;;;; + +(defun make-html () + (load-world) + (mgl-pax:update-asdf-system-html-docs clog:@CLOG-MANUAL :clog)) + +;;;;;;;;;;;;;;;; +;; make-world ;; +;;;;;;;;;;;;;;;; + +(defun make-world () + (make-html) + (asdf:compile-system :clog)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Exports - clog documentation sections diff --git a/source/clog-form.lisp b/source/clog-form.lisp index 412559d..398ca44 100644 --- a/source/clog-form.lisp +++ b/source/clog-form.lisp @@ -41,7 +41,7 @@ ;; create-form ;; ;;;;;;;;;;;;;;;;; -(deftype from-method-type () '(members :get :post :none)) +(deftype form-method-type () '(members :get :post :none)) (defgeneric create-form (clog-obj &key action method target class html-id auto-place) diff --git a/source/clog-helpers.lisp b/source/clog-helpers.lisp index 35b0a2d..e2eff72 100644 --- a/source/clog-helpers.lisp +++ b/source/clog-helpers.lisp @@ -6,7 +6,7 @@ ;;;; clog-helpers.lisp ;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Various helpers for learning CLOG +;;; Various helpers for CLOG (cl:in-package :clog) @@ -112,48 +112,3 @@ clog-user:*body* to last window openned to /repl." :if-does-not-exist if-does-not-exist :external-format external-format) t)) - -;;;;;;;;;;;;;;;; -;; load-world ;; -;;;;;;;;;;;;;;;; - -(defun load-world () - (load "source/clog.lisp") - (load "source/clog-docs.lisp") - (load "source/clog-base.lisp") - (load "source/clog-element.lisp") - (load "source/clog-element-common.lisp") - (load "source/clog-canvas.lisp") - (load "source/clog-form.lisp") - (load "source/clog-window.lisp") - (load "source/clog-navigator.lisp") - (load "source/clog-document.lisp") - (load "source/clog-location.lisp") - (load "source/clog-system.lisp") - (load "source/clog-utilities.lisp") - (load "source/clog-body.lisp") - (load "source/clog-helpers.lisp")) - -;;;;;;;;;;;;;;;;;;;; -;; make-mark-down ;; -;;;;;;;;;;;;;;;;;;;; - -(defun make-mark-down () - (load-world) - (describe clog:@CLOG-MANUAL)) - -;;;;;;;;;;;;;;; -;; make-html ;; -;;;;;;;;;;;;;;; - -(defun make-html () - (load-world) - (mgl-pax:update-asdf-system-html-docs clog:@CLOG-MANUAL :clog)) - -;;;;;;;;;;;;;;;; -;; make-world ;; -;;;;;;;;;;;;;;;; - -(defun make-world () - (make-html) - (asdf:compile-system :clog)) diff --git a/source/clog.lisp b/source/clog.lisp index 7e28f98..18d7a8f 100644 --- a/source/clog.lisp +++ b/source/clog.lisp @@ -261,7 +261,7 @@ embedded in a native template application.)" (z-index generic-function) (resizable-type type) (resizable generic-function) - (position-type type) + (positioning-type type) (positioning generic-function) (position-top generic-function) (position-left generic-function) @@ -817,6 +817,7 @@ embedded in a native template application.)" (save-body-to-file function) "Functions for Compilation and Documentation" + ;; contained in clog-docs.lisp (load-world function) (make-mark-down function) (make-html function)