X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=ml-class.lisp;h=6be17c146cca41866ee0f314f1fb36b13270459b;hb=fd834629ba860f91bda943a94a363a650079dff8;hp=949190b71bdf1e99208a56dcc2cfba3ea8d4c25c;hpb=3497e18db2a0c64a2595ae8305c15f3069858daa;p=kmrcl.git
diff --git a/ml-class.lisp b/ml-class.lisp
index 949190b..6be17c1 100644
--- a/ml-class.lisp
+++ b/ml-class.lisp
@@ -11,7 +11,7 @@
;;;; in Text, HTML, and XML formats. This includes hyperlinking
;;;; capability and sub-objects.
;;;;
-;;;; $Id: ml-class.lisp,v 1.12 2002/10/14 20:55:12 kevin Exp $
+;;;; $Id: ml-class.lisp,v 1.15 2002/10/16 16:18:27 kevin Exp $
;;;;
;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@ -195,9 +195,9 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(string-append fmtstr-html-ref-labels " ")
(string-append fmtstr-xml-ref-labels " ")))
- (setq html-str value-fmt)
+ (setq html-str (concatenate 'string "" value-fmt ""))
(setq xml-str (concatenate 'string "<" namestr-lower ">" value-fmt "" namestr-lower ">"))
- (setq html-label-str (concatenate 'string "" namestr-lower " " value-fmt))
+ (setq html-label-str (concatenate 'string "" namestr-lower " " value-fmt))
(setq xml-label-str (concatenate 'string " <" namestr-lower ">" value-fmt "" namestr-lower ">"))
(string-append fmtstr-text value-fmt)
@@ -211,7 +211,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(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-html-ref-labels "" namestr-lower " <~~a>" value-fmt "~~a>")
(string-append fmtstr-xml-ref-labels " <~~a>" value-fmt "~~a>"))
(progn
(string-append fmtstr-html-ref html-str)
@@ -324,6 +324,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(defparameter *default-htmlrefformat* nil)
(defparameter *default-xmlformat* nil)
(defparameter *default-xmlrefformat* nil)
+(defparameter *default-ie-xmlrefformat* nil)
(defparameter *default-nullformat* nil)
(defparameter *default-init-format?* nil)
@@ -334,6 +335,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(setq *default-htmlrefformat* (make-instance 'htmlrefformat))
(setq *default-xmlformat* (make-instance 'xmlformat))
(setq *default-xmlrefformat* (make-instance 'xmlrefformat))
+ (setq *default-ie-xmlrefformat* (make-instance 'ie-xmlrefformat))
(setq *default-nullformat* (make-instance 'nullformat))
(setq *default-init-format?* t))
@@ -342,7 +344,9 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(:html *default-htmlformat*)
(:htmlref *default-htmlrefformat*)
(:xml *default-xmlformat*)
+ (:xml *default-xmlformat*)
(:xmlref *default-xmlrefformat*)
+ (:ie-xmlref *default-ie-xmlrefformat*)
(:null *default-nullformat*)
(otherwise *default-textformat*)))
@@ -472,10 +476,17 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(defclass xml-link-ref (link-ref)
()
(:default-initargs :fmtstr #'ml-class-fmtstr-xml-ref
- :fmtstr-labels #'ml-class-fmtstr-xml-ref-labels
- :href-head "xmllink xlink:type=\"simple\" xlink:href="
- :href-end "xmllink"
- :ampersand "&"))
+ :fmtstr-labels #'ml-class-fmtstr-xml-ref-labels
+ :href-head "xmllink xlink:type=\"simple\" xlink:href="
+ :href-end "xmllink"
+ :ampersand "&")
+ (:documentation "Mozilla's and W3's idea of a link with XML"))
+
+(defclass ie-xml-link-ref (xml-link-ref)
+ ()
+ (:default-initargs :href-head "html:a href="
+ :href-end "html:a" )
+ (:documentation "Internet Explorer's idea of a link with XML"))
(defclass htmlrefformat (htmlformat)
@@ -486,6 +497,10 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
()
(:default-initargs :link-ref (make-instance 'xml-link-ref)))
+(defclass ie-xmlrefformat (xmlformat)
+ ()
+ (:default-initargs :link-ref (make-instance 'ie-xml-link-ref)))
+
;;; File Start and Ends