Commit e9b560e3 authored by Dave Cooper's avatar Dave Cooper
Browse files

merged from feature/book

parents 01c36b10 5bdb2c31
...@@ -14,8 +14,14 @@ bin ...@@ -14,8 +14,14 @@ bin
*.idx *.idx
*.log *.log
*.toc *.toc
<<<<<<< HEAD
*.ind *.ind
*.ilg *.ilg
=======
*.ilg
*.ind
*.out
>>>>>>> feature/book
configure.el configure.el
systems.txt systems.txt
......
(:gwl-graphics) "(:gwl-graphics #-allegro :cl-html-parse)"
...@@ -107,7 +107,7 @@ This list defaults to standard internal and test packages" ...@@ -107,7 +107,7 @@ This list defaults to standard internal and test packages"
(title "GDL Reference Documentation") (title "GDL Reference Documentation")
(dom-chapter `((:chapter :title "Gendl Reference") (dom-chapter `((:chapter :title "Reference for GDL Objects and Operators")
,@(mapcar #'(lambda(package) ,@(mapcar #'(lambda(package)
`((:section :title ,(the-object package strings-for-display-verbose)) `((:section :title ,(the-object package strings-for-display-verbose))
(:p ,@(remove nil (the-object package dom-section))))) (:p ,@(remove nil (the-object package dom-section)))))
...@@ -311,9 +311,8 @@ loaderImg: '/static/gwl/tasty-unpix/loader.gif',loaderText: 'Narrowing Down...'} ...@@ -311,9 +311,8 @@ loaderImg: '/static/gwl/tasty-unpix/loader.gif',loaderText: 'Narrowing Down...'}
package-form :type 'package-form)) package-form :type 'package-form))
:functions :functions
(("Void. Prints to *html-stream* a bulleted list for each of the three categories of docs in the package." (("List in GDL dom authoring format. Suitable for filling in a section of output document." dom-section
dom-section ()
nil
(mapcar #'(lambda(child) (mapcar #'(lambda(child)
(the-object child dom-subsections)) (the-object child dom-subsections))
(the children)) (the children))
......
...@@ -28,20 +28,22 @@ ...@@ -28,20 +28,22 @@
:computed-slots :computed-slots
(;; FLAG JB-090817 added default header content with links to style-sheet and icons (;; FLAG JB-090817 added default header content with links to style-sheet and icons
("Contains default header contents for yadd html files. ("String of valid HTML. Contains default header contents for yadd
This computed-slot is available in all children of this object. It contains links html files. This computed-slot is available in all children of this
to default header content of a HTML generated yadd page. This contains a object. It contains links to default header content of a HTML
link to the favicon.ico and a link to a default CSS sheet. All these elements can be generated yadd page. This contains a link to the favicon.ico and a
found in the *gdl-install-dir*/static/gwl/ directories." link to a default CSS sheet. All these elements can be found in the
default-header-content (html *gdl-install-dir*/static/gwl/ directories."
default-header-content (html
((:link :href "/static/gwl/images/favicon.ico" ((:link :href "/static/gwl/images/favicon.ico"
:type "image/x-icon" :rel "icon")))) :type "image/x-icon" :rel "icon"))))
("Contains standard jQuery files to include in the header for additional search funcionality. ("String of valid HTML. Contains standard jQuery files to include
This computed-slot contains javascript files, found in the *gdl-install-dir* in the header for additional search funcionality. This computed-slot
and used throughout the yadd pages for the generation of automatic search forms (like the master-index). contains javascript files, found in the *gdl-install-dir* and used
The javascript loaded is jquery." throughout the yadd pages for the generation of automatic search
additional-header-js (with-cl-who-string () forms (like the master-index). The javascript loaded is jquery."
additional-header-js (with-cl-who-string ()
;; ;;
;; FLAG -- base jquery should come with base-ajax-sheet. ;; FLAG -- base jquery should come with base-ajax-sheet.
;; ;;
...@@ -76,7 +78,7 @@ The javascript loaded is jquery." ...@@ -76,7 +78,7 @@ The javascript loaded is jquery."
(:i "User Code Packages copyright &copy; their respective authors")))))) (:i "User Code Packages copyright &copy; their respective authors"))))))
:functions :functions
((dom-body () "") ((dom-body () `((:p "")))
(compute-url (compute-url
() ()
...@@ -261,12 +263,12 @@ The javascript loaded is jquery." ...@@ -261,12 +263,12 @@ The javascript loaded is jquery."
(remove nil (remove nil
`(:item `(:item
(:index ,(format nil "~a" (the-object documentation symbol))) (:index ,(format nil "~a" (the-object documentation symbol)))
,(format nil "~a~a" (:label ,(format nil "prim:~(~a~)" (the-object documentation symbol)))
(the-object documentation symbol) (:textbf ,(format nil "~a~a"
(if (the-object documentation :macro?) (the-object documentation symbol)
" [Macro]" "")) (if (the-object documentation :macro?)
" [Macro]" "")))
,(the-object documentation dom-body)))) ,@(the-object documentation dom-body))))
documentations)))))) documentations))))))
......
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
(in-package :common-lisp-user) (in-package :common-lisp-user)
#+allegro
(eval-when (:compile-toplevel :load-toplevel :execute)
(require :phtml))
(gwl:define-package :yadd (gwl:define-package :yadd
(:documentation #.(glisp:system-description :yadd)) (:documentation #.(glisp:system-description :yadd))
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
"The Gendl™ Yet Another Definition Documenter (yadd)" :author "The Gendl™ Yet Another Definition Documenter (yadd)" :author
"Dave Cooper and Genworks International" :license "Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)" "Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130822" :depends-on (:gwl-graphics) :serial t :version "20130822" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#+asdf-encoding :encoding #+asdf-encoding :utf-8 #+asdf-encoding :encoding #+asdf-encoding :utf-8
:components :components
((:file "source/package") (:file "source/genworks") ((:file "source/package") (:file "source/genworks")
......
(in-package :gdl-user)
(define-object box-assembly-1 (base-object)
:computed-slots ((length 10)
(width (* (the length) +phi+))
(height (* (the width) +phi+)))
:objects ((box :type 'box)))
(in-package :gdl-user)
(define-object display-color (base-object)
:input-slots ((number-of-boxes 5))
:computed-slots ((length 10)
(width (* (the length) +phi+))
(height (* (the width) +phi+))
(color-list (list :red :orange :yellow :blue :indigo :violet)))
:objects ((boxes :type 'box
:sequence (:size (the number-of-boxes))
:display-controls (list :color (or (nth (the-child index)
(the color-list)) :black)
:line-thickness 2)
:center (translate (the center)
:right (* (the width) (the-child index))))))
(in-package :gdl-user)
(define-object positioned-boxes (base-object)
:computed-slots ((length 10)
(width (* (the length) +phi+))
(height (* (the width) +phi+)))
:objects ((box-1 :type 'box)
(box-2 :type 'box
:center (make-point (the width) 0 0))))
(in-package :gdl-user)
(define-object positioned-by-index (base-object)
:input-slots ((number-of-boxes 5))
:computed-slots ((length 10)
(width (* (the length) +phi+))
(height (* (the width) +phi+)))
:objects ((boxes :type 'box
:sequence (:size (the number-of-boxes))
:center (make-point (* (the width) (the-child index))
0 0))))
(in-package :gdl-user)
(define-object tower-assembly (base-object)
:input-slots
((base-height 10)
(height-deviation 5)
(number-of-towers 5))
:objects
((towers :type 'tower
:sequence (:size (the number-of-towers))
:height (+ (* (the-child index) (the height-deviation))
(the base-height))
:center (translate (the center) :right (* (twice
(twice (the-child width)))
(the-child index))))))
(in-package :gdl-user)
(define-object tower (base-object)
:input-slots
((height 42)
(block-height 1)
(width +phi+)
(length (* (the width) +phi+)))
:computed-slots
((number-of-blocks (floor (the height)
(the block-height))))
:objects
((blocks :type 'box
:sequence (:size (the number-of-blocks))
:length (the length)
:height (the block-height)
:width (the width)
:center (translate (the center) :up
(* (the-child height)
(the-child index)))
:orientation (alignment :rear (rotate-vector-d
(the (face-normal-vector :rear))
(twice (the-child index))
(the (face-normal-vector :top)))))))
(in-package :gdl-user)
(define-object translate-by-index (base-object)
:input-slots ((number-of-boxes 5))
:computed-slots ((length 10)
(width (* (the length) +phi+))
(height (* (the width) +phi+)))
:objects ((boxes :type 'box
:sequence (:size (the number-of-boxes))
:center (translate (the center)
:right (* (the width) (the-child index))))))
(in-package :gdl-user)
(define-object vertical-cylinder (base-object)
:objects
((horizontal-cylinder :type 'cylinder
:display-controls (list :color :green)
:length 10 :radius 3)
(vertical-cylinder :type 'cylinder
:length 10 :radius 3
:display-controls (list :color :red)
:orientation (alignment :rear
(the (face-normal-vector :top))))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment