From 1897d13e1427e08b31f11e86d0697d9588462d26 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Thu, 17 Mar 2022 18:17:04 +0900 Subject: [PATCH 01/16] Mount `sound@fanqie'. (www-feature-value-format): Use `space-separated-source-list' for `domain-list'. (est-format-object): Accept feature `=title' as the same as `title'. --- cwiki-common.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cwiki-common.el b/cwiki-common.el index aad28dd..4b99b41 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -80,6 +80,8 @@ (mount-char-attribute-table '<-HDIC-SYP@KTB) (mount-char-attribute-table '->HDIC-SYP@KTB) +(mount-char-attribute-table 'sound@fanqie) + (defvar est-hide-cgi-mode nil) (defvar est-view-url-prefix "..") (defvar chise-wiki-view-url "view.cgi") @@ -357,6 +359,8 @@ 'space-separated) ((eq type 'structure) 'space-separated-ids) + ((eq type 'domain-list) + 'space-separated-source-list) ((eq type 'stext) 'wiki-text) )) @@ -817,7 +821,8 @@ (let ((ret (or (if readable (or (concord-object-get object 'name) (concord-object-get object '=name) - (concord-object-get object 'title))) + (concord-object-get object 'title) + (concord-object-get object '=title))) (concord-object-id object)))) (format "%s" ret)))) -- 1.7.10.4 From 3029a82da308526f462cd56f87e6774e02615254 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Tue, 15 Mar 2022 22:08:51 +0900 Subject: [PATCH 02/16] (est-eval-value-as-object): Accept `=title' as the same as `=name'. (est-eval-value-as-sources): New function. (est-eval-apply-value): - Use `est-eval-value-as-sources' instead of `est-eval-value-as-domain-list' for format `space-separated-domain-list'. - Support new format `space-separated-source-list'. --- est-eval.el | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/est-eval.el b/est-eval.el index ef1914f..10ff991 100644 --- a/est-eval.el +++ b/est-eval.el @@ -374,6 +374,7 @@ genre-o 'object-representative-feature)) 'name)) (www-get-feature-value value '=name) + (www-get-feature-value value '=title) (est-eval-value-default value)) )) ))) @@ -721,6 +722,108 @@ value))) (est-eval-value-default value))) +(defun est-eval-value-as-sources (value) + (if (listp value) + (let (unit-str + source item source-objs source0 start end num + source-cobj title) + (list* 'res-list + '(:separator " ") + (mapcar + (lambda (unit) + (setq unit-str + (if (symbolp unit) + (symbol-name unit) + (format "%s" unit))) + (if (string-match "=" unit-str) + (setq source (intern + (substring unit-str 0 (match-beginning 0))) + item (car (read-from-string + (substring unit-str (match-end 0))))) + (setq source unit + item nil)) + (cond + ((and (setq source-cobj (concord-decode-object + '=chise-bib-id source 'bibliography)) + (setq title (concord-object-get source-cobj '=title))) + (setq source-objs + (if item + (list (est-eval-value-as-object source-cobj) + "=" + item) + (list (est-eval-value-as-object source-cobj)))) + ) + ((eq source 'bos) + (setq source-objs + (list + (est-eval-value-as-object + (or (concord-decode-object + '=id item 'book@ruimoku) + (concord-decode-object + '=id item 'article@ruimoku) + unit)))) + ) + ((memq source '(zob1959 zob1968)) + (if (and (symbolp item) + (setq num (symbol-name item)) + (string-match + "^\\([0-9]+\\)-\\([0-9]+\\)$" num)) + (setq start (string-to-number + (match-string 1 num)) + end (string-to-number + (match-string 2 num))) + (setq start item + end item)) + (if (not (numberp start)) + (setq source-objs + (list + (est-eval-value-as-object unit))) + (if (eq source source0) + (setq source-objs + (list + (list 'link + (list :ref + (format "http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/%04d" + start)) + start))) + (setq source0 source) + (setq source-objs + (list + (list 'link + (list :ref + (format "http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/%04d" + start)) + start) + "=" + '(link + (:ref "http://chise.zinbun.kyoto-u.ac.jp/koukotsu/") + "\u4EAC大人\u6587研甲\u9AA8"))) + ) + (setq num (1+ start)) + (while (<= num end) + (setq source-objs + (cons + (list 'link + (list :ref + (format "http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/%04d" + num)) + num) + source-objs)) + (setq num (1+ num))) + (setq source-objs (nreverse source-objs))) + ) + (t + (setq source-objs + (list (est-eval-value-as-object unit))) + )) + (list* 'res-link + (list :separator " " + :source source :item item) + source-objs) + ) + value))) + (est-eval-value-default value))) + (defun est-eval-value-as-daijiten-page-list (value &optional separator subtype) (if (and (listp value) (listp (cdr value))) @@ -910,7 +1013,10 @@ ((eq format 'space-separated-ids) (est-eval-value-as-space-separated-ids value)) ((eq format 'space-separated-domain-list) - (est-eval-value-as-domain-list value)) + ;; (est-eval-value-as-domain-list value) + (est-eval-value-as-sources value)) + ((eq format 'space-separated-source-list) + (est-eval-value-as-sources value)) ((eq format 'space-separated-creator-name-list) (est-eval-value-as-creators-names value)) ((eq format 'unordered-creator-name-list) -- 1.7.10.4 From 00cbcbeb9c81379e1af2bf8e565064d1d7ab8b58 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Fri, 18 Mar 2022 18:13:13 +0900 Subject: [PATCH 03/16] (www-display-object-desc): Fixed. --- cwiki-view.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cwiki-view.el b/cwiki-view.el index 3089868..bf0dd07 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -303,6 +303,7 @@ li { margin: 0 0 0 2em; } ret ret))) ) ((and (eq genre 'character) + (not GlyphWiki-id) (setq ret (or (encode-char object '=chise-hdic-tsj) (encode-char object '===chise-hdic-tsj))) (setq ret (decode-char '===chise-hdic-tsj ret)) @@ -315,6 +316,7 @@ li { margin: 0 0 0 2em; } (est-format-object object 'readable)))) ) ((and (eq genre 'character) + (not GlyphWiki-id) (setq ret (or (encode-char object '=chise-hdic-syp) (encode-char object '===chise-hdic-syp))) (setq ret (decode-char '===chise-hdic-syp ret)) -- 1.7.10.4 From c0c8e42b0024e157c0645248c8f1451f374d806e Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Thu, 28 Apr 2022 22:38:59 +0900 Subject: [PATCH 04/16] update. --- ChangeLog | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index 049196b..708a21e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2022-03-18 MORIOKA Tomohiko + + * cwiki-view.el (www-display-object-desc): Fixed. + +2022-03-17 MORIOKA Tomohiko + + * cwiki-common.el: Mount `sound@fanqie'. + (www-feature-value-format): Use `space-separated-source-list' for + `domain-list'. + (est-format-object): Accept feature `=title' as the same as + `title'. + +2022-03-15 MORIOKA Tomohiko + + * est-eval.el (est-eval-value-as-object): Accept `=title' as the + same as `=name'. + (est-eval-value-as-sources): New function. + (est-eval-apply-value): + - Use `est-eval-value-as-sources' instead of + `est-eval-value-as-domain-list' for format + `space-separated-domain-list'. + - Support new format `space-separated-source-list'. + 2022-01-21 MORIOKA Tomohiko * cwiki-view.el (www-display-object-desc): Use `hdic-tsj-word-id' -- 1.7.10.4 From 6e660383c1b3c1bdcb39216766a66b7f7c70136e Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Thu, 28 Apr 2022 22:39:25 +0900 Subject: [PATCH 05/16] - Mount `<-HDIC-SYP@ktb' instead of `<-HDIC-SYP@KTB'. - Mount `->HDIC-SYP@ktb' instead of `->HDIC-SYP@KTB'. --- cwiki-common.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cwiki-common.el b/cwiki-common.el index 4b99b41..a0914df 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -77,8 +77,8 @@ (mount-char-attribute-table 'hdic-ktb-syp-id) (mount-char-attribute-table 'hdic-ktb-yy-id) (mount-char-attribute-table 'hdic-ktb-ndl-pid) -(mount-char-attribute-table '<-HDIC-SYP@KTB) -(mount-char-attribute-table '->HDIC-SYP@KTB) +(mount-char-attribute-table '<-HDIC-SYP@ktb) +(mount-char-attribute-table '->HDIC-SYP@ktb) (mount-char-attribute-table 'sound@fanqie) -- 1.7.10.4 From 82eb64e1cddf64dc796eb03a8d3e52fde57c9f9d Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Mon, 2 May 2022 18:17:55 +0900 Subject: [PATCH 06/16] update. --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 708a21e..52dd399 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-04-28 MORIOKA Tomohiko + + * cwiki-common.el: + - Mount `<-HDIC-SYP@ktb' instead of `<-HDIC-SYP@KTB'. + - Mount `->HDIC-SYP@ktb' instead of `->HDIC-SYP@KTB'. + 2022-03-18 MORIOKA Tomohiko * cwiki-view.el (www-display-object-desc): Fixed. -- 1.7.10.4 From 56afce8243db34dcb7e956b171f0d81949d40dfa Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Fri, 20 May 2022 17:22:33 +0900 Subject: [PATCH 07/16] (est-eval-value-as-object-with-description): New function. (est-eval-value-as-entry-character-list): New function. (est-eval-apply-value): Use `est-eval-value-as-entry-character-list' to support new formats `entry-character-list' and `unordered-entry-character-list'. --- est-eval.el | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/est-eval.el b/est-eval.el index 10ff991..f4d693d 100644 --- a/est-eval.el +++ b/est-eval.el @@ -388,6 +388,27 @@ (mapconcat #'char-to-string ret "")) (est-eval-value-as-object value)))) +(defun est-eval-value-as-object-with-description (value + object feature-name + &optional lang uri-object list-props) + (let (ret) + (cond + ((characterp value) + (setq ret (or (get-char-attribute value 'description) + (get-char-attribute value 'hdic-syp-description) + (get-char-attribute value 'hdic-ktb-description))) + ) + ((concord-object-p value) + (setq ret (concord-object-get value 'description)) + )) + (if ret + (list 'list nil + (est-eval-value-as-object value) + (est-eval-list ret + object feature-name + lang uri-object list-props)) + (est-eval-value-as-object value)))) + (defun est-eval-value-as-location (value) (let (ret) (if (and (concord-object-p value) @@ -605,6 +626,28 @@ (error (format "%s" value))) (format "%s" value))) +(defun est-eval-value-as-entry-character-list (value + object feature-name + &optional separator subtype + lang uri-object list-props) + (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 (lambda (cell) + (est-eval-value-as-object-with-description + cell + object feature-name + lang uri-object list-props)) + value))) + (error (format "%s" value))) + (format "%s" value))) + ;; (defun est-eval-value-as-ids (value) ;; (if (listp value) ;; (list 'ids nil (ideographic-structure-to-ids value)) @@ -1010,6 +1053,18 @@ (est-eval-value-as-object-list value nil 'unordered-list)) ((eq format 'unordered-composition-list) (est-eval-value-as-composition-list value nil 'unordered-list)) + ((eq format 'entry-character-list) + (est-eval-value-as-entry-character-list + value + object feature-name + nil nil + lang uri-object list-props)) + ((eq format 'unordered-entry-character-list) + (est-eval-value-as-entry-character-list + value + object feature-name + nil 'unordered-list + lang uri-object list-props)) ((eq format 'space-separated-ids) (est-eval-value-as-space-separated-ids value)) ((eq format 'space-separated-domain-list) -- 1.7.10.4 From 96cef8b3d1d170a00d3c9b60759909453e288d48 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Fri, 20 May 2022 17:23:18 +0900 Subject: [PATCH 08/16] update. --- ChangeLog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 52dd399..4b8ce98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2022-05-20 MORIOKA Tomohiko + + * est-eval.el (est-eval-value-as-object-with-description): New + function. + (est-eval-value-as-entry-character-list): New function. + (est-eval-apply-value): Use + `est-eval-value-as-entry-character-list' to support new formats + `entry-character-list' and `unordered-entry-character-list'. + 2022-04-28 MORIOKA Tomohiko * cwiki-common.el: -- 1.7.10.4 From 5fcf4c8e5e2cf4c045afc86293edab2889c2c036 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Fri, 20 May 2022 18:06:28 +0900 Subject: [PATCH 09/16] (est-eval-value-as-object-with-description): New function. (est-eval-value-as-hdic-tsj-character-with-description): New function. (est-eval-value-as-entry-character-list): New function. (est-eval-value-as-hdic-tsj-entry-character-list): New function. (est-eval-apply-value): - Use `est-eval-value-as-entry-character-list' for `entry-character-list' and `unordered-entry-character-list'. - Use `est-eval-value-as-hdic-tsj-entry-character-list' for `hdic-tsj-entry-character-list'. --- est-eval.el | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/est-eval.el b/est-eval.el index 10ff991..0d4be34 100644 --- a/est-eval.el +++ b/est-eval.el @@ -388,6 +388,53 @@ (mapconcat #'char-to-string ret "")) (est-eval-value-as-object value)))) +(defun est-eval-value-as-object-with-description (value + object feature-name + &optional lang uri-object list-props) + (let (ret) + (cond + ((characterp value) + (setq ret (or (get-char-attribute value 'description) + (get-char-attribute value 'hdic-syp-description) + (get-char-attribute value 'hdic-ktb-description))) + ) + ((concord-object-p value) + (setq ret (concord-object-get value 'description)) + )) + (if ret + (list 'list nil + (est-eval-value-as-object value) + (est-eval-list ret + object feature-name + lang uri-object list-props)) + (est-eval-value-as-object value)))) + +(defun est-eval-value-as-hdic-tsj-character-with-description (value + object feature-name + &optional + lang uri-object list-props) + (let (word desc ret) + (cond + ((characterp value) + (when (setq word (get-char-attribute value 'hdic-tsj-word)) + (if (and (= (length word) 1) + (setq ret (get-char-attribute value '<-HDIC-TSJ)) + (memq (aref word 0) ret)) + (setq desc (or (get-char-attribute value 'hdic-tsj-word-description) + (get-char-attribute value 'description))) + (setq desc (list "(" word ")")))) + ) + ((concord-object-p value) + (setq desc (concord-object-get value 'description)) + )) + (if desc + (list 'list nil + (est-eval-value-as-object value) + (est-eval-list (append desc '("　 ")) + object feature-name + lang uri-object list-props)) + (est-eval-value-as-object value)))) + (defun est-eval-value-as-location (value) (let (ret) (if (and (concord-object-p value) @@ -605,6 +652,51 @@ (error (format "%s" value))) (format "%s" value))) +(defun est-eval-value-as-entry-character-list (value + object feature-name + &optional separator subtype + lang uri-object list-props) + (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 (lambda (cell) + (est-eval-value-as-object-with-description + cell + object feature-name + lang uri-object list-props)) + value))) + (error (format "%s" value))) + (format "%s" value))) + +(defun est-eval-value-as-hdic-tsj-entry-character-list (value + object feature-name + &optional separator subtype + lang uri-object list-props) + (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 (lambda (cell) + (est-eval-value-as-hdic-tsj-character-with-description + cell + object feature-name + lang uri-object list-props)) + value))) + (error (format "%s" value))) + (format "%s" value))) + + ;; (defun est-eval-value-as-ids (value) ;; (if (listp value) ;; (list 'ids nil (ideographic-structure-to-ids value)) @@ -1010,6 +1102,24 @@ (est-eval-value-as-object-list value nil 'unordered-list)) ((eq format 'unordered-composition-list) (est-eval-value-as-composition-list value nil 'unordered-list)) + ((eq format 'entry-character-list) + (est-eval-value-as-entry-character-list + value + object feature-name + nil nil + lang uri-object list-props)) + ((eq format 'unordered-entry-character-list) + (est-eval-value-as-entry-character-list + value + object feature-name + nil 'unordered-list + lang uri-object list-props)) + ((eq format 'hdic-tsj-entry-character-list) + (est-eval-value-as-hdic-tsj-entry-character-list + value + object feature-name + nil nil + lang uri-object list-props)) ((eq format 'space-separated-ids) (est-eval-value-as-space-separated-ids value)) ((eq format 'space-separated-domain-list) -- 1.7.10.4 From 5fd61a5a2cd147a051ef3621225d9f748175d190 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Fri, 10 Jun 2022 13:12:46 +0900 Subject: [PATCH 10/16] update. --- ChangeLog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 52dd399..2514775 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2022-05-20 MORIOKA Tomohiko + + * est-eval.el (est-eval-value-as-object-with-description): New + function. + (est-eval-value-as-hdic-tsj-character-with-description): New + function. + (est-eval-value-as-entry-character-list): New function. + (est-eval-value-as-hdic-tsj-entry-character-list): New function. + (est-eval-apply-value): + - Use `est-eval-value-as-entry-character-list' for + `entry-character-list' and `unordered-entry-character-list'. + - Use `est-eval-value-as-hdic-tsj-entry-character-list' for + `hdic-tsj-entry-character-list'. + 2022-04-28 MORIOKA Tomohiko * cwiki-common.el: -- 1.7.10.4 From d92f4f586767446366e22d254861f0f549d28aa6 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Fri, 10 Jun 2022 22:48:26 +0900 Subject: [PATCH 11/16] - Mount `=hdic-ktb-seal-glyph-id'. - Use `<-HDIC-SYP@tenrei-bansho-meigi' instead of `<-HDIC-SYP@ktb'. - Use `->HDIC-SYP@tenrei-bansho-meigi' instead of `->HDIC-SYP@ktb'. - Mount `<-Small-Seal@tenrei-bansho-meigi' and `->Small-Seal@tenrei-bansho-meigi'. (www-format-encode-string): Add setting for `===chise-hdic-ktb-seal'. --- cwiki-common.el | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/cwiki-common.el b/cwiki-common.el index a0914df..a7f0a49 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -66,6 +66,7 @@ (mount-char-attribute-table '=hdic-tsj-glyph-id) (mount-char-attribute-table '=hdic-syp-entry-id) (mount-char-attribute-table '=hdic-ktb-entry-id) +(mount-char-attribute-table '=hdic-ktb-seal-glyph-id) (mount-char-attribute-table 'hdic-tsj-word-id) (mount-char-attribute-table 'hdic-tsj-word) (mount-char-attribute-table 'hdic-tsj-word-description) @@ -77,8 +78,10 @@ (mount-char-attribute-table 'hdic-ktb-syp-id) (mount-char-attribute-table 'hdic-ktb-yy-id) (mount-char-attribute-table 'hdic-ktb-ndl-pid) -(mount-char-attribute-table '<-HDIC-SYP@ktb) -(mount-char-attribute-table '->HDIC-SYP@ktb) +(mount-char-attribute-table '<-HDIC-SYP@tenrei-bansho-meigi) +(mount-char-attribute-table '->HDIC-SYP@tenrei-bansho-meigi) +(mount-char-attribute-table '<-Small-Seal@tenrei-bansho-meigi) +(mount-char-attribute-table '->Small-Seal@tenrei-bansho-meigi) (mount-char-attribute-table 'sound@fanqie) @@ -1199,6 +1202,20 @@ class=\"tooltiptext\">%s" t 'literal))) (goto-char (point-min)) + (while (re-search-forward "&\\(R-\\)?CHISE-HDIC-KTBS\\([0-9A-F]+\\);" nil t) + (setq code (string-to-int (match-string 2) 16)) + (setq char (decode-char '===chise-hdic-ktb-seal code)) + (when (setq ret (get-char-attribute char '=hdic-ktb-seal-glyph-id)) + (replace-match + (format + "
\"HDIC-KTBS-%s\"%s
" + ret ret + (charset-description '===chise-hdic-ktb-seal)) + t 'literal))) + + (goto-char (point-min)) (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?AJ1-\\([0-9]+\\);" nil t) (setq code (string-to-int (match-string 2))) (replace-match -- 1.7.10.4 From 900403a340320a317326761b70c625a356ed71fc Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Tue, 14 Jun 2022 09:29:14 +0900 Subject: [PATCH 12/16] update. --- ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index dcfe66c..d046f23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2022-06-10 MORIOKA Tomohiko + + * cwiki-common.el: + - Mount `=hdic-ktb-seal-glyph-id'. + - Use `<-HDIC-SYP@tenrei-bansho-meigi' instead of `<-HDIC-SYP@ktb'. + - Use `->HDIC-SYP@tenrei-bansho-meigi' instead of `->HDIC-SYP@ktb'. + - Mount `<-Small-Seal@tenrei-bansho-meigi' and + `->Small-Seal@tenrei-bansho-meigi'. + (www-format-encode-string): Add setting for `===chise-hdic-ktb-seal'. + 2022-05-20 MORIOKA Tomohiko * est-eval.el -- 1.7.10.4 From eed3e9ac352f728db9bee203bce6513162ebeb88 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Tue, 14 Jun 2022 09:30:30 +0900 Subject: [PATCH 13/16] (www-format-encode-string): Use "width: auto; max-height: 80px" for Zinbun-Oracle-Bones characters. --- cwiki-common.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cwiki-common.el b/cwiki-common.el index a7f0a49..5415ca6 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -1094,7 +1094,7 @@ style=\"%s\">" (setq code (string-to-int (match-string 2))) (replace-match (format "\"ZOB-%04d\"" +style=\"vertical-align:middle; width: auto; max-height: 80px\">" code chise-wiki-legacy-bitmap-glyphs-url code -- 1.7.10.4 From 01f0ae467386f8eba163ae428c171961aaeea209 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Sun, 19 Jun 2022 12:56:47 +0900 Subject: [PATCH 14/16] update. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index d046f23..d112e33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2022-06-14 MORIOKA Tomohiko + + * cwiki-common.el (www-format-encode-string): Use "width: auto; + max-height: 80px" for Zinbun-Oracle-Bones characters. + 2022-06-10 MORIOKA Tomohiko * cwiki-common.el: -- 1.7.10.4 From 9b6c8c83eb5171c96aea07f67533cdac2b0bbe66 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Sun, 19 Jun 2022 13:15:15 +0900 Subject: [PATCH 15/16] (www-format-encode-string): Format &A-SW-JIGUGE[45]-ddddd; --- cwiki-common.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cwiki-common.el b/cwiki-common.el index 5415ca6..f4e7e6f 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -1114,9 +1114,9 @@ style=\"vertical-align:middle; width: auto; max-height: 60px\">" t 'literal)) (goto-char (point-min)) - (while (re-search-forward "&SW-JIGUGE\\([45]?\\)-\\([0-9]+\\);" nil t) - (setq subcode (match-string 1) - code (string-to-int (match-string 2))) + (while (re-search-forward "&\\(A-\\)?SW-JIGUGE\\([45]?\\)-\\([0-9]+\\);" nil t) + (setq subcode (match-string 2) + code (string-to-int (match-string 3))) (setq plane (if (string= subcode "") "5" -- 1.7.10.4 From 7c71edfde44cf017667cdb14cfd7ddb0d2e4121a Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Mon, 17 Oct 2022 17:34:28 +0900 Subject: [PATCH 16/16] update. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index d112e33..1cbff83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2022-06-19 MORIOKA Tomohiko + + * cwiki-common.el (www-format-encode-string): Format + &A-SW-JIGUGE[45]-ddddd; + 2022-06-14 MORIOKA Tomohiko * cwiki-common.el (www-format-encode-string): Use "width: auto; -- 1.7.10.4