X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=ml-class.lisp;h=525ff16cfd69f08bdd44c217a9d0ab227bf40ca6;hb=30b4f8d91af2bb031e8d4ef7d5a38492739de2bf;hp=740e610d9a1e935e9feb22592ea59ff5e1082ef9;hpb=0e5343fda28c559f11e003805727f4c625d178f3;p=kmrcl.git diff --git a/ml-class.lisp b/ml-class.lisp index 740e610..525ff16 100644 --- a/ml-class.lisp +++ b/ml-class.lisp @@ -11,12 +11,13 @@ ;;;; in Text, HTML, and XML formats. This includes hyperlinking ;;;; capability and sub-objects. ;;;; -;;;; $Id: ml-class.lisp,v 1.2 2002/10/06 13:30:17 kevin Exp $ +;;;; $Id: ml-class.lisp,v 1.4 2002/10/10 16:23:48 kevin Exp $ ;;;; -;;;; This file, part of Kmrcl, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; -;;;; Kmrcl users are granted the rights to distribute and use this software -;;;; as governed by the terms of the GNU General Public License. +;;;; KMRCL users are granted the rights to distribute and use this software +;;;; as governed by the terms of the Lisp Lesser GNU Public License +;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* (in-package :kmrcl) @@ -148,47 +149,47 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (if first-field (setq first-field nil) (progn - (gu:string-append fmtstr-text " ") - (gu:string-append fmtstr-html " ") - (gu:string-append fmtstr-xml " ") - (gu:string-append fmtstr-text-labels " ") - (gu:string-append fmtstr-html-labels " ") - (gu:string-append fmtstr-xml-labels " ") - (gu:string-append fmtstr-html-ref " ") - (gu:string-append fmtstr-xml-ref " ") - (gu:string-append fmtstr-html-ref-labels " ") - (gu:string-append fmtstr-xml-ref-labels " "))) + (string-append fmtstr-text " ") + (string-append fmtstr-html " ") + (string-append fmtstr-xml " ") + (string-append fmtstr-text-labels " ") + (string-append fmtstr-html-labels " ") + (string-append fmtstr-xml-labels " ") + (string-append fmtstr-html-ref " ") + (string-append fmtstr-xml-ref " ") + (string-append fmtstr-html-ref-labels " ") + (string-append fmtstr-xml-ref-labels " "))) (setq html-str value-fmt) (setq xml-str (concatenate 'string "<" namestr-lower ">" value-fmt "" namestr-lower ">")) (setq html-label-str (concatenate 'string "" namestr-lower " " value-fmt)) (setq xml-label-str (concatenate 'string " <" namestr-lower ">" value-fmt "" namestr-lower ">")) - (gu:string-append fmtstr-text value-fmt) - (gu:string-append fmtstr-html html-str) - (gu:string-append fmtstr-xml xml-str) - (gu:string-append fmtstr-text-labels namestr-lower " " value-fmt) - (gu:string-append fmtstr-html-labels html-label-str) - (gu:string-append fmtstr-xml-labels xml-label-str) + (string-append fmtstr-text value-fmt) + (string-append fmtstr-html html-str) + (string-append fmtstr-xml xml-str) + (string-append fmtstr-text-labels namestr-lower " " value-fmt) + (string-append fmtstr-html-labels html-label-str) + (string-append fmtstr-xml-labels xml-label-str) (if (find name ref-fields :key #'car) (progn - (gu:string-append fmtstr-html-ref "<~~a>" value-fmt "~~a>") - (gu:string-append fmtstr-xml-ref "<~~a>" value-fmt "~~a>") - (gu:string-append fmtstr-html-ref-labels "" namestr-lower " <~~a>" value-fmt "~~a>") - (gu:string-append fmtstr-xml-ref-labels " <~~a>" value-fmt "~~a>")) + (string-append fmtstr-html-ref "<~~a>" value-fmt "~~a>") + (string-append fmtstr-xml-ref "<~~a>" value-fmt "~~a>") + (string-append fmtstr-html-ref-labels "" namestr-lower " <~~a>" value-fmt "~~a>") + (string-append fmtstr-xml-ref-labels " <~~a>" value-fmt "~~a>")) (progn - (gu:string-append fmtstr-html-ref html-str) - (gu:string-append fmtstr-xml-ref xml-str) - (gu:string-append fmtstr-html-ref-labels html-label-str) - (gu:string-append fmtstr-xml-ref-labels xml-label-str))) + (string-append fmtstr-html-ref html-str) + (string-append fmtstr-xml-ref xml-str) + (string-append fmtstr-html-ref-labels html-label-str) + (string-append fmtstr-xml-ref-labels xml-label-str))) (if formatter (setq plain-value-func - (list `(,formatter (,(gu:concat-symbol-pkg + (list `(,formatter (,(concat-symbol-pkg :umlisp namestr) x)))) (setq plain-value-func - (list `(,(gu:concat-symbol-pkg + (list `(,(concat-symbol-pkg :umlisp namestr) x)))) (setq value-func (append value-func plain-value-func)) @@ -243,10 +244,10 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (eval-when (:compile-toplevel :load-toplevel :execute) (defun ml-class-title (obj) - (gu:awhen (slot-value (class-of obj) 'title) - (if (consp gu:it) - (car gu:it) - gu:it)))) + (awhen (slot-value (class-of obj) 'title) + (if (consp it) + (car it) + it)))) (defun ml-class-subobjects-lists (obj) (slot-value (class-of obj) 'subobjects-lists)) @@ -393,7 +394,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (defclass xmlformat (textformat) () - (:default-initargs :file-start-str "" ; (gu:std-xml-header) + (:default-initargs :file-start-str "" ; (std-xml-header) :list-start-indent t :list-start-fmtstr "<~a>