X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=6d48331f6bac72096e211fc3923b69079e6f68d8;hb=4755ad70494ea2e7e8849a5982861ef5cc4bb659;hp=04f7f360f90b6038a965fdc12d80eb474435da47;hpb=5945f8760445ad1f8639db5f037729512c390ffe;p=chise%2Fest.git
diff --git a/cwiki-view.el b/cwiki-view.el
index 04f7f36..6d48331 100644
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -68,8 +68,9 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
without-header
logical-feature chise-wiki-displayed-features
parents
- GlyphWiki-id HNG-card ret object-spec
- width height base-image x y w h)
+ GlyphWiki-id HNG-card HNG-card-id HNG-card-cobj ret object-spec
+ item-code page char-num glyph-image-id
+ width height image-cobj base-image x y w h)
(if (eq level 0)
(setq level 1
without-header nil)
@@ -127,6 +128,8 @@ li { margin: 0 0 0 2em; }
z-index: 1;
}
+.value .image-list img { height: 320px; vertical-align: top; }
+
.list .tooltip:hover .tooltiptext {
visibility: visible;
}
@@ -188,10 +191,14 @@ li { margin: 0 0 0 2em; }
genre rdf-uri-object)
"")))
(when (setq parents (www-get-feature-value object '<-denotational))
+ (if (characterp parents)
+ (setq parents (list parents)))
(princ (format "
%s %s
\n
\n"
(www-format-value-as-char-list parents)
(www-format-feature-name '->denotational lang))))
(when (setq parents (www-get-feature-value object '<-subsumptive))
+ (if (characterp parents)
+ (setq parents (list parents)))
(princ (format "%s %s
\n
\n"
(www-format-value-as-char-list parents)
(www-format-feature-name '->subsumptive lang))))
@@ -271,6 +278,50 @@ li { margin: 0 0 0 2em; }
(format "
"
ret ret)))
)
+ ((or (and (eq genre 'glyph-image)
+ (setq image-cobj
+ (car (concord-object-get object '->image-resource))))
+ (and (eq genre 'character)
+ (setq ret (www-format-encode-string
+ (est-format-object object 'readable)))
+ (string-match
+ "
image-resource)))
+ ))
+ (if (and (setq ret (concord-object-get image-cobj '=location@iiif))
+ (setq base-image
+ (car (concord-object-get image-cobj '<-image-segment))))
+ (princ
+ (format "
"
+ (www-uri-encode-object base-image)
+ (concord-object-get image-cobj 'image-offset-x)
+ (concord-object-get image-cobj 'image-offset-y)
+ (concord-object-get image-cobj 'image-width)
+ (concord-object-get image-cobj 'image-height)
+ ret ret))
+ (setq ret (concord-object-get image-cobj '=location))
+ (princ (format "
"
+ ret ret)))
+ )
((and (eq genre 'hng-card)
(setq ret (concord-object-get object '=hng-card))
(setq ret (symbol-name ret))
@@ -278,7 +329,7 @@ li { margin: 0 0 0 2em; }
(princ
(format
"
"
ret
(string-to-int (match-string 1 ret))
@@ -287,12 +338,15 @@ style=\"height: 480px;\" />"
(t
(setq ret (www-format-encode-string
(est-format-object object 'readable)))
- (setq HNG-card
- (if (string-match
- "
%s%s\n"
level
@@ -331,6 +385,18 @@ size=\"30\" maxlength=\"30\" value=\"%s\">)
genre genre
(decode-uri-string uri-object 'utf-8-mcs-er))
'utf-8-mcs-er)))
+ (when (and HNG-card-id
+ (eq genre 'character)
+ (setq HNG-card-cobj
+ (concord-decode-object
+ '=id HNG-card-id
+ 'hng-card)))
+ (put-char-attribute object 'sources@HNG/card (list HNG-card-cobj))
+ (if (setq ret (concord-object-get
+ HNG-card-cobj
+ '->glyph-image@zinbun/takuhon))
+ (put-char-attribute object 'sources@zinbun/takuhon ret))
+ )
(setq object-spec
(cond
(uri-feature-name
@@ -421,56 +487,45 @@ size=\"30\" maxlength=\"30\" value=\"%s\">)
"\n"
"
\n"))
(when (eq genre 'character)
- (princ
- "\n")
+ encoded-object-for-form))
+ (princ
+ (www-format-encode-string
+ "ã\u542Bã\u6F22\u5B57ã\u63A2ã"))
+ (princ " \n")
+ (princ "\n")
- (princ
- "\n")
- )
+ encoded-object-for-form))
+ (princ
+ (www-format-encode-string
+ "ã\u542Bã HNG ã®\u6F22\u5B57ã\u63A2ã"))
+ (princ " \n")
+ (princ "\n")
+ ))
(princ
(if (= level 1)
"\n"