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

Merge branch 'release/1587p001' into devo

parents 8725b605 17c1c652
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"The Gendl™ (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)" "The Gendl™ (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
:author "John McCarthy" :license :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on (:gwl-graphics) :version "20140424" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"The Gendl™ Web-based Development Environment (tasty)" :author "The Gendl™ Web-based Development Environment (tasty)" :author
"John McCarthy" :license "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on (:tree :gwl-graphics) :version "20140424" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"The Gendl™ Translators to/from XML and potentially other high-level KBE and Knowledge formats" "The Gendl™ Translators to/from XML and potentially other high-level KBE and Knowledge formats"
:author "John McCarthy" :license :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on (:gwl) :version "20140424" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"The Gendl™ Tree component used by Tasty and potentially as a UI component on its own" "The Gendl™ Tree component used by Tasty and potentially as a UI component on its own"
:author "John McCarthy" :license :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on (:gwl-graphics) :version "20140424" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"The Gendl™ Yet Another Definition Documenter (yadd)" :author "The Gendl™ Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on :version "20140424" :depends-on
(:gwl-graphics #-allegro :cl-html-parse) (:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:base :description (asdf:defsystem #:base :description
"The Gendl™ Base Core Kernel Engine" :author "John McCarthy" "The Gendl™ Base Core Kernel Engine" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140416" :depends-on nil :serial t :version "20140424" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
;; ;;
;; Copyright 2002-2011 Genworks International ;; Copyright 2002-2011 Genworks International
;; ;;
;; This source file is part of the General-purpose Declarative ;; This source file is part of the General-purpose Declarative
;; Language project (GDL). ;; Language project (GDL).
;; ;;
;; This source file contains free software: you can redistribute it ;; This source file contains free software: you can redistribute it
;; and/or modify it under the terms of the GNU Affero General Public ;; and/or modify it under the terms of the GNU Affero General Public
;; License as published by the Free Software Foundation, either ;; License as published by the Free Software Foundation, either
;; version 3 of the License, or (at your option) any later version. ;; version 3 of the License, or (at your option) any later version.
;; ;;
;; This source file is distributed in the hope that it will be useful, ;; This source file is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; Affero General Public License for more details. ;; Affero General Public License for more details.
;; ;;
;; You should have received a copy of the GNU Affero General Public ;; You should have received a copy of the GNU Affero General Public
;; License along with this source file. If not, see ;; License along with this source file. If not, see
;; <http://www.gnu.org/licenses/>. ;; <http://www.gnu.org/licenses/>.
;; ;;
(in-package :gdl) (in-package :gdl)
(defmacro defaulting (form &optional default) (defmacro defaulting (form &optional default)
"Lisp object. Returns a default value if the reference-chain is not handled. "Lisp object. Returns a default value if the reference-chain is not handled.
Note: Defaulting is currently implemented with ignore-errors, so it will return the default value :arguments (form \"Reference-chain with the or the-object\"
regardless of whether the reference-chain is actually not handled or throws some other error. default \"Lisp expression. Default value to return if reference-chain cannot be handled.\")"
(let ((value (gensym)) (error (gensym)))
This will be updated in a future GDL release only to return the default if the reference-chain `(multiple-value-bind (,value ,error) (ignore-errors ,form)
is actually not handled, and to throw any other errors normally. (cond ((and ,error (typep ,error 'error)
(let ((string (glisp:replace-regexp (format nil "~a" ,error)
:arguments (form \"Reference-chain with the or the-object\" (format nil "~%") " ")))
default \"Lisp expression. Default value to return if reference-chain cannot be handled.\")" (or (and (search "attempt to call" string)
(let ((value (gensym)) (error (gensym))) (search "gdl-slots::" string))
`(multiple-value-bind (,value ,error) (ignore-errors ,form) (search "nor any of its ancestor instances could handle the" string)
(cond ((and ,error (typep ,error 'error) (search "which is the root object, could not handle the" string)))) ,default)
(let ((string (format nil "~a" ,error))) ((typep ,error 'error) (error ,error))
(or (and (search "attempt to call" string) (t ,value)))))
(search "gdl-slots::" string))
(search "nor any of its ancestor instances could handle the" string)
(search "which is the root object, could not handle the" string)))) ,default)
((typep ,error 'error) (error ,error))
(t ,value)))))
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
(in-package :gdl) (in-package :gdl)
;;(defparameter *gendl-version* "1585p002") ;;(defparameter *gendl-version* "1585p002")
(defparameter *gendl-version* "1587devo") ;;(defparameter *gendl-version* "1587devo")
(defparameter *gendl-version* "1587p002")
;;(defparameter *gendl-version* "ql-2013-12") ;;(defparameter *gendl-version* "ql-2013-12")
(defparameter *gendl-patch-level* nil) (defparameter *gendl-patch-level* nil)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:cl-lite :description (asdf:defsystem #:cl-lite :description
"The Gendl™ Compile-and-Load Lite Utility" :author "John McCarthy" "The Gendl™ Compile-and-Load Lite Utility" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140416" :depends-on (:glisp) :serial t :version "20140424" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:bus :description (asdf:defsystem #:bus :description
"The Gendl™ Wireframe School Bus Demo" :author "John McCarthy" "The Gendl™ Wireframe School Bus Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140416" :depends-on nil :serial t :version "20140424" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:ledger :description (asdf:defsystem #:ledger :description
"The Gendl™ Ledger Bookkeeping Demo" :author "John McCarthy" "The Gendl™ Ledger Bookkeeping Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140416" :depends-on :serial t :version "20140424" :depends-on
(#-gwl :gwl) (#-gwl :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"The Gendl™ Simplified Android Robot example " :author "The Gendl™ Simplified Android Robot example " :author
"John McCarthy" :license "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on nil :version "20140424" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"The Gendl™ Wire-World demo and test-case for wireframe tessellation and X3D output" "The Gendl™ Wire-World demo and test-case for wireframe tessellation and X3D output"
:author "John McCarthy" :license :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on :version "20140424" :depends-on
(#-gwl-graphics :gwl-graphics) (#-gwl-graphics :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:examples :description (asdf:defsystem #:examples :description
"The Gendl™ examples Subsystem" :author "John McCarthy" :license "The Gendl™ examples Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on (:gwl-graphics :surf) :version "20140424" :depends-on (:gwl-graphics :surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -135,6 +135,7 @@ ...@@ -135,6 +135,7 @@
(defun gdl () (interactive) (gendl 'gdl)) (defun gdl () (interactive) (gendl 'gdl))
(defun agdl8 () (interactive) (gendl 'agdl8)) (defun agdl8 () (interactive) (gendl 'agdl8))
(defun agdl () (interactive) (gendl 'agdl))
(defun glime () (interactive) (gendl)) (defun glime () (interactive) (gendl))
(defun gdl-quit () (interactive) (slime-quit-lisp)) (defun gdl-quit () (interactive) (slime-quit-lisp))
......
...@@ -135,7 +135,7 @@ and <tt>nil</tt> are supported. The default is nil" ...@@ -135,7 +135,7 @@ and <tt>nil</tt> are supported. The default is nil"
(:right (translate (lastcar (the leader-path)) :right (the text-gap))) (:right (translate (lastcar (the leader-path)) :right (the text-gap)))
(:left (translate (lastcar (the leader-path)) :left (+ (the text-gap) (the-child width))))) (:left (translate (lastcar (the leader-path)) :left (+ (the text-gap) (the-child width)))))
:strings (or (ensure-list (the strings)) (ensure-list (the text))) :strings (or (ensure-list (the strings)) (ensure-list (the text)))
:pass-down (font outline-shape-type character-size dxf-text-x-scale dxf-size-ratio dxf-font dxf-offset)))) :pass-down (onclick-function font outline-shape-type character-size dxf-text-x-scale dxf-size-ratio dxf-font dxf-offset))))
......
...@@ -359,5 +359,6 @@ and end-point." ...@@ -359,5 +359,6 @@ and end-point."
(the leader-start))) (the leader-start)))
(the orientation)) (the orientation))
:pass-down (font character-size text-x-scale justification outline-shape-type underline? :pass-down (font character-size text-x-scale justification outline-shape-type underline?
dxf-text-x-scale dxf-size-ratio dxf-font dxf-offset)))) dxf-text-x-scale dxf-size-ratio dxf-font dxf-offset
onclick-function))))
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:geom-base :description (asdf:defsystem #:geom-base :description
"The Gendl™ Wireframe Geometry" :author "John McCarthy" :license "The Gendl™ Wireframe Geometry" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140416" :depends-on (:glisp) :version "20140424" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
......
...@@ -215,6 +215,7 @@ is specified), so it is necessary to explicitly give either start or center for ...@@ -215,6 +215,7 @@ is specified), so it is necessary to explicitly give either start or center for
:text (nth (the-child index) (the string-list)) :text (nth (the-child index) (the string-list))
:pass-down (character-size text-x-scale font underline? width :pass-down (character-size text-x-scale font underline? width
dxf-text-x-scale dxf-font dxf-offset dxf-size-ratio dxf-text-x-scale dxf-font dxf-offset dxf-size-ratio
onclick-function
) )
:start (translate (the start) :start (translate (the start)
:front (* (the-child index)(the leading)) :front (* (the-child index)(the leading))
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:glisp :description (asdf:defsystem #:glisp :description
"The Gendl™ Common Lisp Portability" :author "John McCarthy" "The Gendl™ Common Lisp Portability" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140416" :depends-on :serial t :version "20140424" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat) (:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
......
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