value)))
(est-eval-value-as-S-exp value)))
-(defun est-eval-value-as-image-resource (value)
+(defun est-eval-value-as-image-resource (value &optional accept-full-image)
(let ((name (concord-object-get value 'name)))
- (if (concord-object-get value 'image-offset-x)
- (list 'img (list* :src (or (concord-object-get value '=location@iiif)
- (concord-object-get value '=location))
- (if name
- (list :alt name))))
- name)))
+ (cond
+ ((concord-object-get value 'image-offset-x)
+ (list 'img (list* :src (or (concord-object-get value '=location@iiif)
+ (concord-object-get value '=location))
+ (if name
+ (list :alt name))))
+ )
+ (accept-full-image
+ (list 'img (list* :src (concord-object-get value '=location)
+ (if name
+ (list :alt name))))
+ )
+ (t
+ name))))
+
+(defun est-eval-value-as-glyph-image (value)
+ (let ((image-resource (car (concord-object-get value '->image-resource))))
+ (est-eval-value-as-image-resource image-resource)))
+
+(defun est-eval-value-as-image-object (value)
+ (let ((image-resource (car (concord-object-get value '->image-resource))))
+ (list 'object (list :object value)
+ (est-eval-value-as-image-resource
+ image-resource 'accept-full-image))))
;; (defun est-journal-volume-object-get-volume-format (spec feature)
;; (when (integerp spec)
((eq genre 'image-resource)
(est-eval-value-as-image-resource value)
)
+ ((eq genre 'glyph-image)
+ (est-eval-value-as-glyph-image value)
+ )
(t
(setq genre-o (concord-decode-object '=id genre 'genre))
(or (and genre-o
(mapconcat #'char-to-string ret ""))
(est-eval-value-as-object value))))
+(defun est-eval-value-as-location (value)
+ (let (ret)
+ (if (and (concord-object-p value)
+ (setq ret (concord-object-get value '=location)))
+ (list 'object (list :object value)
+ ret)
+ (est-eval-value-as-object value))))
+
+(defun est-eval-value-as-name (value)
+ (let (ret)
+ (if (and (concord-object-p value)
+ (setq ret (concord-object-get value 'name)))
+ (list 'object (list :object value)
+ ret)
+ (est-eval-value-as-object value))))
+
(defun est-eval-value-as-HEX (value)
(if (integerp value)
(list 'HEX nil (format "%X" value))
(error (format "%s" value)))
(format "%s" value)))
+(defun est-eval-value-as-location-list (value &optional separator subtype)
+ (if (and (listp value)
+ (listp (cdr value)))
+ (condition-case nil
+ (let (props)
+ (if separator
+ (setq props (list :separator separator)))
+ (if subtype
+ (setq props (list* :subtype subtype props)))
+ (list* 'list props
+ (mapcar #'est-eval-value-as-location value)))
+ (error (format "%s" value)))
+ (format "%s" value)))
+
+(defun est-eval-value-as-name-list (value &optional separator subtype)
+ (if (and (listp value)
+ (listp (cdr value)))
+ (condition-case nil
+ (let (props)
+ (if separator
+ (setq props (list :separator separator)))
+ (if subtype
+ (setq props (list* :subtype subtype props)))
+ (list* 'list props
+ (mapcar #'est-eval-value-as-name value)))
+ (error (format "%s" value)))
+ (format "%s" value)))
+
+(defun est-eval-value-as-image-list (value &optional separator subtype)
+ (if (and (listp value)
+ (listp (cdr value)))
+ (condition-case nil
+ (let (props)
+ (if separator
+ (setq props (list :separator separator)))
+ (if subtype
+ (setq props (list* :subtype subtype props)))
+ (list* 'image-list props
+ (mapcar #'est-eval-value-as-image-object value)))
+ (error (format "%s" value)))
+ (format "%s" value)))
+
(defun est-eval-value-as-composition-list (value &optional separator subtype)
(if (and (listp value)
(listp (cdr value)))
'(:subtype unordered-list)
'(:separator " "))
(mapcar (lambda (creator)
- (est-eval-list
- '((value (:feature <-creator)))
- creator nil))
+ (if (concord-object-p creator)
+ (est-eval-list
+ '((value (:feature <-creator)))
+ creator nil)
+ (est-eval-value-default creator)))
value))
(est-eval-value-default value)))
(est-eval-value-as-object-list value " "))
((eq format 'char-list)
(est-eval-value-as-char-list value nil))
+ ((eq format 'location-list)
+ (est-eval-value-as-location-list value nil))
+ ((eq format 'name-list)
+ (est-eval-value-as-name-list value nil))
+ ((eq format 'image-list)
+ (est-eval-value-as-image-list value nil))
((eq format 'unordered-list)
(est-eval-value-as-object-list value nil 'unordered-list))
((eq format 'unordered-composition-list)