X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=262674314985c4f88d6e8522e4a690a3acfa8493;hb=c0d7503d6636b6d5adb762258fdb20c1b4ceb53a;hp=a62baf0c40c78bdc072eefaf00f1b9c25f0a65f8;hpb=cda49a13fa66d935f4d7db644364cc741b9c1c4c;p=hyperobject.git
diff --git a/views.lisp b/views.lisp
index a62baf0..2626743 100644
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: views.lisp,v 1.3 2002/11/29 05:05:29 kevin Exp $
+;;;; $Id: views.lisp,v 1.4 2002/11/29 23:14:31 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
@@ -40,7 +40,7 @@
(xmlvalue-func '())
(classname (class-name cl))
(package (symbol-package (class-name cl)))
- (references nil))
+ (hyperlinks nil))
(declare (ignore classname))
(check-type (slot-value cl 'print-slots) list)
(dolist (slot-name (slot-value cl 'print-slots))
@@ -88,15 +88,15 @@
(string-append fmtstr-html-labels html-label-str)
(string-append fmtstr-xml-labels xml-label-str)
- (if (slot-value slot 'reference)
+ (if (slot-value slot 'hyperlink)
(progn
(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>")
- (push (make-instance 'reference :name name
- :lookup (slot-value slot 'reference))
- references))
+ (push (make-instance 'hyperlink :name name
+ :lookup (slot-value slot 'hyperlink))
+ hyperlinks))
(progn
(string-append fmtstr-html-ref html-str)
(string-append fmtstr-xml-ref xml-str)
@@ -115,7 +115,7 @@
(setq xmlvalue-func (append xmlvalue-func plain-value-func)))
)))
- (setf (slot-value cl 'references) references)
+ (setf (slot-value cl 'hyperlinks) hyperlinks)
(if value-func
(setq value-func `(lambda (x) (values ,@value-func)))
@@ -320,7 +320,7 @@
:fmtstr-labels nil
:page-name "disp-func1"
:href-head nil :href-end nil :ampersand nil)
- (:documentation "Formatting for a linked reference"))
+ (:documentation "Formatting for a linked hyperlink"))
(defclass html-link-ref (link-ref)
()
@@ -478,8 +478,8 @@
(multiple-value-list
(funcall (funcall (obj-data-value-func fmt) x) x))))
- ;; make list of reference link fields for printing to refstr template
- (dolist (ref (hyperobject-class-references x))
+ ;; make list of hyperlink link fields for printing to refstr template
+ (dolist (ref (hyperobject-class-hyperlinks x))
(let ((link-start
(make-link-start x (link-ref fmt) (name ref) (lookup ref)
(nth (position (name ref)
@@ -505,7 +505,7 @@
(defgeneric make-ref-data-str (obj fmt &optional label))
(defmethod make-ref-data-str (x (fmt textformat) &optional (label nil))
- "Return fmt string for that contains ~a slots for reference link start and end"
+ "Return fmt string for that contains ~a slots for hyperlink link start and end"
(unless (link-ref fmt)
(error "fmt does not contain a link-ref"))
(let ((refstr