X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=ml-class.lisp;h=2376f0abbee6876fa0864d7353cdff44f293954a;hb=bb23129ae7ddabcbcb09c718545f69a52a8d1eaf;hp=c3d20406c47b2c816bee4473e7e0db5d601170c1;hpb=c15cf85d501d4787024dfbd01af69ce1ba836e36;p=kmrcl.git
diff --git a/ml-class.lisp b/ml-class.lisp
index c3d2040..2376f0a 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.13 2002/10/16 05:57:12 kevin Exp $
+;;;; $Id: ml-class.lisp,v 1.16 2002/10/16 17:37:18 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)
@@ -669,7 +669,9 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(let ((nobjs (length objs)))
(fmt-list-start (car objs) fmt strm indent nobjs)
(dolist (obj objs)
- (unless (and english-only-function (not (funcall english-only-function obj)))
+ (unless (and english-only-function
+ (multiple-value-bind (eng term) (funcall english-only-function obj)
+ (and term (not eng))))
(fmt-obj-start obj fmt strm indent)
(fmt-obj-data obj fmt strm (1+ indent) label refvars)
(if subobjects