X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=ml-class.lisp;fp=ml-class.lisp;h=2376f0abbee6876fa0864d7353cdff44f293954a;hb=bb23129ae7ddabcbcb09c718545f69a52a8d1eaf;hp=6be17c146cca41866ee0f314f1fb36b13270459b;hpb=fd834629ba860f91bda943a94a363a650079dff8;p=kmrcl.git diff --git a/ml-class.lisp b/ml-class.lisp index 6be17c1..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.15 2002/10/16 16:18:27 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 ;;;; @@ -197,7 +197,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (setq html-str (concatenate 'string "" value-fmt "")) (setq xml-str (concatenate 'string "<" namestr-lower ">" value-fmt "")) - (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 "")) (string-append fmtstr-text value-fmt) @@ -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