Commit 968487e6 authored by Dave Cooper's avatar Dave Cooper
Browse files

Merge branch 'release/1587p004'

parents 91cfcbf2 774644a6
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:ta2 :description
"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
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140515" :depends-on (:gwl-graphics)
:version "20140615" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -80,9 +80,6 @@
(dolist (slot (the required-input-slots))
(let ((status (the root-object (slot-status slot))))
(when (eql status :unbound) (setq result nil))))
(print-variables result)
result))))
:objects
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tasty :description
"The Gendl Web-based Development Environment (tasty)" :author
"The Gendl\" Web-based Development Environment (tasty)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140515" :depends-on (:tree :gwl-graphics)
:version "20140615" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:translators :description
"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
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140515" :depends-on (:gwl)
:version "20140615" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tree :description
"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
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140515" :depends-on (:gwl-graphics)
:version "20140615" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -138,7 +138,7 @@ If you specify :part-symbol-supplied, do not specify :instance-supplied."))
((:div :class "gdl-object-def")
"(" ((:span :class "gdl-operator") "define-object") " "
((:span :class "gdl-defined-symbol") (str (the part-full-symbol)))
(fmt " (~{~a~^ ~})" (remove 'vanilla-mixin (the mixins-list))))
(fmt " (~{~a~^ ~})" (remove 'gdl::vanilla-mixin (the mixins-list))))
(mapc #'(lambda(section)
(str (with-output-to-string (*html-stream*)
......
......@@ -26,7 +26,9 @@
(append (list :win :windows :regexp)
(remove-duplicates
#-allegro nil
#+allegro (mapcar #'(lambda(pair) (intern (first pair) :keyword)) excl::*autoload-package-name-alist*)
#+allegro (append (mapcar #'(lambda(name) (glisp:intern (glisp:upcase name) :keyword))
(mapcar #'first excl::*autoload-package-name-alist*))
(mapcar #'rest excl::*autoload-package-name-alist*))
)))
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:yadd :description
"The Gendl Yet Another Definition Documenter (yadd)" :author
"The Gendl\" Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140515" :depends-on
:version "20140615" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
;;;; -*- coding: utf-8 -*-
(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/)"
:serial t :version "20140515" :depends-on nil
:serial t :version "20140615" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -23,7 +23,8 @@
;;(defparameter *gendl-version* "1585p002")
;;(defparameter *gendl-version* "1587devo")
(defparameter *gendl-version* "1587p003")
;;(defparameter *gendl-version* "1587p003")
(defparameter *gendl-version* "1587p004")
;;(defparameter *gendl-version* "ql-2013-12")
(defparameter *gendl-patch-level* nil)
......
;;;; -*- coding: utf-8 -*-
(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/)"
:serial t :version "20140515" :depends-on (:glisp)
:serial t :version "20140615" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(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/)"
:serial t :version "20140515" :depends-on (:gwl-graphics)
:serial t :version "20140615" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(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/)"
:serial t :version "20140515" :depends-on
:serial t :version "20140615" :depends-on
(#-gwl :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:robot :description
"The Gendl Simplified Android Robot example " :author
"The Gendl\" Simplified Android Robot example " :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140515" :depends-on (:gwl-graphics)
:version "20140615" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:wire-world :description
"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
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140515" :depends-on
:version "20140615" :depends-on
(#-gwl-graphics :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
;;;; -*- coding: utf-8 -*-
(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
:version "20140515" :depends-on (:gwl-graphics :surf)
:version "20140615" :depends-on (:gwl-graphics :surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -258,8 +258,11 @@
(defun load-user-emacs-glime ()
(when (file-exists-p "~/.emacs-glime") (load-file "~/.emacs-glime"))
(when (file-exists-p "~/.emacs-glime.el") (load-file "~/.emacs-glime.el")))
(when (file-exists-p "~/.emacs-glime.el") (load-file "~/.emacs-glime.el"))
(when (file-exists-p "~/.emacs-gendl") (load-file "~/.emacs-gendl"))
(when (file-exists-p "~/.emacs-gendl.el") (load-file "~/.emacs-gendl.el")))
(load-user-emacs-glime)
(ignore-errors
(require 'package)
......@@ -309,8 +312,11 @@
(defun agdl8e () (interactive)
(gdl-devo (get-executable 'agdl8)))
(defun agdle () (interactive)
(gdl-devo (get-executable 'agdl)))
(defun gdle () (interactive)
(gdl-devo (get-executable 'gdle)))
(gdl-devo (get-executable 'gdl)))
(defun gdl-devo (executable)
(interactive)
......@@ -334,6 +340,17 @@
(end-of-buffer)))
;;
;; Establish input methodf I.A.S.T diacritics
;;
(load-file (concat *gendl-home* "emacs/sa-translit.el"))
(register-input-method
"sa-translit" "Sanskrit Transliteration" 'quail-use-package
"sa-translit" "Converts Harvard-Kyoto and ITRANS scheme to IAST diacritics."
(concat *gendl-home* "emacs/sa-translit.el"))
;; A. REFERENCES
;;
......
(quail-define-package
"sa-translit" "Sanskrit Transliteration" "sa-translit" t
"Insert IAST with composite key prefixes.
" nil t nil nil nil nil nil nil nil nil t)
(quail-define-rules
("_a" ?ā)
("_A" ?Ā)
("_i" ?ī)
("_I" ?Ī)
("_u" ?ū)
("_U" ?Ū)
("!r" ?)
("_!r" ?)
("!R" ?)
("_!R" ?)
("!l" ?)
("!L" ?)
("_!l" ?)
("_!L" ?)
("!m" ?)
("!M" ?)
(".m" ?)
(".M" ?)
("!h" ?)
("!H" ?)
(".n" ?)
(".N" ?)
("~n" ?ñ)
("~N" ?Ñ)
("!t" ?)
("!T" ?)
("!d" ?)
("!D" ?)
("!n" ?)
("!N" ?)
("'s" ?ś)
("'S" ?Ś)
("!s" ?)
("!S" ?)
)
......@@ -34,7 +34,6 @@
(:pdf `(pdf:with-saved-state (pdf:translate (get-x ,center) (get-y ,center)) ,@body))
(:dxf `(let ((*dxf-translation* (add-vectors (subseq ,center 0 2) *dxf-translation*))) ,@body))
(:raphael `(let ((*raphael-translation* (add-vectors (subseq ,center 0 2) *raphael-translation*))) ,@body))))
(define-lens (pdf base-drawing)()
......@@ -45,12 +44,11 @@
(let ((view-center (if (the user-center)
(scalar*vector (the user-scale) (the user-center))
(make-point 0 0 0))))
(pdf:with-saved-state
(when view (unless *fixed-scale?* (pdf:scale (the-object view view-scale-total)
(the-object view view-scale-total))))
(mapc #'(lambda(child-view)
(let ((width (the-object child-view width))
(length (the-object child-view length))
......@@ -261,47 +259,13 @@
(define-lens (jpeg base-drawing)()
:output-functions
((cad-output
()
(let ((temp-dir (glisp:temporary-folder))
(temp-name (format nil "~a-~a" (glisp:get-pid) (gensym))))
(let ((temp-pdf (make-pathname :directory (pathname-directory temp-dir)
:device (pathname-device temp-dir)
:name temp-name
:type "pdf"))
(temp-jpeg (make-pathname :directory (pathname-directory temp-dir)
:device (pathname-device temp-dir)
:name temp-name
:type "jpg")))
(with-format-slots (page-width page-length foreground-color background-color)
(with-format (pdf temp-pdf :page-width page-width :page-length page-length
:foreground-color foreground-color :background-color background-color)
(write-the cad-output)))
(let ((command
(format nil "\"~a\" -q -sDEVICE=~a \"-sOutputFile=~a\" -dTextAlphaBits=~a -dGraphicsAlphaBits=~a -dSAFER -dBATCH -dNOPAUSE \"~a\""
*gs-path* "jpeg" temp-jpeg *gs-text-alpha-bits*
*gs-graphics-alpha-bits* temp-pdf)))
(glisp:run-gs command))
(when *stream*
(with-open-file (image-stream temp-jpeg :element-type '(unsigned-byte 8))
(do ((val (read-byte image-stream nil nil)
(read-byte image-stream nil nil)))
((null val))
(write-byte val *stream*))))
(delete-file temp-pdf)
(delete-file temp-jpeg))))))
(defparameter *command* nil)
(define-lens (png base-drawing)()
(define-lens (raster base-drawing)()
:output-functions
((cad-output
()
......@@ -321,6 +285,39 @@
(with-format (pdf temp-pdf :page-width page-width :page-length page-length
:background-color background-color :foreground-color foreground-color) (write-the cad-output)))
;;
;; FLAG -- try this list form of the command on all
;; implementations, get it working that way, and remove this
;; compiler conditional.
;;
;;#+clozure
(let ((command
(if (or (null *gs-path*)
(and (or (stringp *gs-path*)
(pathnamep *gs-path*))
(not (probe-file *gs-path*))))
(error "Gnu Ghostscript executable not found. It is set to ~s.~%" *gs-path*)
(list (format nil "~a" *gs-path*)
"-q"
(format nil "-sDEVICE=~a" (write-the gs-device))
(format nil "-sOutputFile=~a" temp-png)
(format nil "-dTextAlphaBits=~a" *gs-text-alpha-bits*)
(format nil "-dGraphicsAlphaBits=~a" *gs-graphics-alpha-bits*)
"-dSAFER"
"-dBATCH"
"-dNOPAUSE"
(namestring temp-pdf)))))
(multiple-value-bind (output error result)
(uiop:run-program command
:ignore-error-status t
:error-output :string
:output :string)
(declare (ignore output))
(unless (zerop result)
(error "Ghostscript threw result code ~s with error: ~a~%" result error))))
#+nil
(let ((command
(format nil "\"~a\" -q -sDEVICE=~a \"-sOutputFile=~a\" -dTextAlphaBits=~a -dGraphicsAlphaBits=~a -dSAFER -dBATCH -dNOPAUSE \"~a\""
*gs-path* "png16m" temp-png *gs-text-alpha-bits*
......@@ -339,8 +336,17 @@
(delete-file temp-png))))))
(defparameter *current-vrml-requests* nil)
(define-lens (png base-drawing)()
:output-functions
((gs-device () "png16m")))
(define-lens (jpeg base-drawing)()
:output-functions
((gs-device () "jpeg")))
;;;; -*- coding: utf-8 -*-
(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
:version "20140515" :depends-on (:glisp)
:version "20140615" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
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