From: MORIOKA Tomohiko Date: Mon, 8 Feb 2021 03:18:43 +0000 (+0900) Subject: (est-coded-charset-priority-list): Use `==[name]' instead of X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc8d70678098d96d0b2a8688a384de6b4856034e;p=chise%2Fest.git (est-coded-charset-priority-list): Use `==[name]' instead of `=>>>[name]'. (www-uri-decode-feature-name): Abolished; use implementation in tomoyo-tools/chiset-common.el. (www-uri-encode-feature-name): Likewise. --- diff --git a/cwiki-common.el b/cwiki-common.el index 291a138..b72cfb3 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -98,8 +98,8 @@ =zinbun-oracle =>zinbun-oracle =daikanwa =gt =gt-k - =>>>adobe-japan1 - =>>>jis-x0208 =>>>jis-x0213-1 =>>>jis-x0213-2 + ==adobe-japan1 + ==jis-x0208 ==jis-x0213-1 ==jis-x0213-2 =>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-2 =>>adobe-japan1 =+>jis-x0208 =+>jis-x0213-1 =+>jis-x0213-2 @@ -112,8 +112,8 @@ =+>ucs@iso =+>ucs@unicode =>>ucs@iso =>>ucs@unicode =>>ucs@jis =>>ucs@cns =>>ucs@ks - =>>>ucs@iso =>>>ucs@unicode - =>>>ucs@jis =>>>ucs@cns =>>>ucs@ks + ==ucs@iso ==ucs@unicode + ==ucs@jis ==ucs@cns ==ucs@ks ===ucs@iso =ruimoku-v6 =big5 @@ -460,142 +460,142 @@ ;; (t (char-to-string c)))) ;; feature "")) -(defun www-uri-decode-feature-name (uri-feature) - (let (feature) - (setq uri-feature (decode-uri-string uri-feature 'utf-8-mcs-er)) - (cond - ((string-match "^from\\." uri-feature) - (intern (format "<-%s" - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^to\\." uri-feature) - (intern (format "->%s" - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^rep\\." uri-feature) - (intern (format "=%s" - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^rep[2i]\\." uri-feature) - (intern (format "===%s" - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^g\\." uri-feature) - (intern (format "=>>%s" - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^g[i2]\\." uri-feature) - (intern (format "==%s" - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^gi\\([0-9]+\\)\\." uri-feature) - (intern (format "=>>%s%s" - (make-string (string-to-int - (match-string 1 uri-feature)) - ?>) - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^o\\." uri-feature) - (intern (format "=+>%s" - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^a\\." uri-feature) - (intern (format "=>%s" - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((string-match "^a\\([0-9]+\\)\\." uri-feature) - (intern (format "%s>%s" - (make-string (string-to-int - (match-string 1 uri-feature)) - ?=) - (est-uri-decode-feature-name-body - (substring uri-feature (match-end 0))))) - ) - ((and (setq uri-feature (est-uri-decode-feature-name-body uri-feature)) - (setq feature (intern (format "=>%s" uri-feature))) - (find-charset feature)) - feature) - ((and (setq feature (intern (format "=>>%s" uri-feature))) - (find-charset feature)) - feature) - ((and (setq feature (intern (format "=>>>%s" uri-feature))) - (find-charset feature)) - feature) - ((and (setq feature (intern (format "=%s" uri-feature))) - (find-charset feature)) - feature) - (t (intern uri-feature))))) - -(defun www-uri-encode-feature-name (feature-name) - (setq feature-name (symbol-name feature-name)) - (cond - ((string-match "^=\\+>\\([^=>]+\\)" feature-name) - (concat "o." - (est-uri-encode-feature-name-body - (substring feature-name (match-beginning 1)))) - ) - ((string-match "^=\\([^=>]+\\)" feature-name) - (concat "rep." - (est-uri-encode-feature-name-body - (substring feature-name (match-beginning 1)))) - ) - ((string-match "^==\\([^=>]+\\)" feature-name) - (concat "g2." - (est-uri-encode-feature-name-body - (substring feature-name (match-beginning 1)))) - ) - ((string-match "^===\\([^=>]+\\)" feature-name) - (concat "repi." - (est-uri-encode-feature-name-body - (substring feature-name (match-beginning 1)))) - ) - ((string-match "^=>>\\([^=>]+\\)" feature-name) - (concat "g." - (est-uri-encode-feature-name-body - (substring feature-name (match-beginning 1)))) - ) - ((string-match "^=>>>\\([^=>]+\\)" feature-name) - (concat "gi." - (est-uri-encode-feature-name-body - (substring feature-name (match-beginning 1)))) - ) - ((string-match "^=>>\\(>+\\)" feature-name) - (format "gi%d.%s" - (length (match-string 1 feature-name)) - (est-uri-encode-feature-name-body - (substring feature-name (match-end 1)))) - ) - ((string-match "^=>\\([^=>]+\\)" feature-name) - (concat "a." - (est-uri-encode-feature-name-body - (substring feature-name (match-beginning 1)))) - ) - ((string-match "^\\(=+\\)>" feature-name) - (format "a%d.%s" - (length (match-string 1 feature-name)) - (est-uri-encode-feature-name-body - (substring feature-name (match-end 0)))) - ) - ((string-match "^->" feature-name) - (concat "to." - (est-uri-encode-feature-name-body - (substring feature-name (match-end 0)))) - ) - ((string-match "^<-" feature-name) - (concat "from." - (est-uri-encode-feature-name-body - (substring feature-name (match-end 0)))) - ) - (t (est-uri-encode-feature-name-body feature-name)))) +;; (defun www-uri-decode-feature-name (uri-feature) +;; (let (feature) +;; (setq uri-feature (decode-uri-string uri-feature 'utf-8-mcs-er)) +;; (cond +;; ((string-match "^from\\." uri-feature) +;; (intern (format "<-%s" +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^to\\." uri-feature) +;; (intern (format "->%s" +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^rep\\." uri-feature) +;; (intern (format "=%s" +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^rep[2i]\\." uri-feature) +;; (intern (format "===%s" +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^g\\." uri-feature) +;; (intern (format "=>>%s" +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^g[i2]\\." uri-feature) +;; (intern (format "==%s" +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^gi\\([0-9]+\\)\\." uri-feature) +;; (intern (format "=>>%s%s" +;; (make-string (string-to-int +;; (match-string 1 uri-feature)) +;; ?>) +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^o\\." uri-feature) +;; (intern (format "=+>%s" +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^a\\." uri-feature) +;; (intern (format "=>%s" +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((string-match "^a\\([0-9]+\\)\\." uri-feature) +;; (intern (format "%s>%s" +;; (make-string (string-to-int +;; (match-string 1 uri-feature)) +;; ?=) +;; (est-uri-decode-feature-name-body +;; (substring uri-feature (match-end 0))))) +;; ) +;; ((and (setq uri-feature (est-uri-decode-feature-name-body uri-feature)) +;; (setq feature (intern (format "=>%s" uri-feature))) +;; (find-charset feature)) +;; feature) +;; ((and (setq feature (intern (format "=>>%s" uri-feature))) +;; (find-charset feature)) +;; feature) +;; ((and (setq feature (intern (format "=>>>%s" uri-feature))) +;; (find-charset feature)) +;; feature) +;; ((and (setq feature (intern (format "=%s" uri-feature))) +;; (find-charset feature)) +;; feature) +;; (t (intern uri-feature))))) + +;; (defun www-uri-encode-feature-name (feature-name) +;; (setq feature-name (symbol-name feature-name)) +;; (cond +;; ((string-match "^=\\+>\\([^=>]+\\)" feature-name) +;; (concat "o." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-beginning 1)))) +;; ) +;; ((string-match "^=\\([^=>]+\\)" feature-name) +;; (concat "rep." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-beginning 1)))) +;; ) +;; ((string-match "^==\\([^=>]+\\)" feature-name) +;; (concat "g2." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-beginning 1)))) +;; ) +;; ((string-match "^===\\([^=>]+\\)" feature-name) +;; (concat "repi." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-beginning 1)))) +;; ) +;; ((string-match "^=>>\\([^=>]+\\)" feature-name) +;; (concat "g." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-beginning 1)))) +;; ) +;; ((string-match "^=>>>\\([^=>]+\\)" feature-name) +;; (concat "gi." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-beginning 1)))) +;; ) +;; ((string-match "^=>>\\(>+\\)" feature-name) +;; (format "gi%d.%s" +;; (length (match-string 1 feature-name)) +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-end 1)))) +;; ) +;; ((string-match "^=>\\([^=>]+\\)" feature-name) +;; (concat "a." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-beginning 1)))) +;; ) +;; ((string-match "^\\(=+\\)>" feature-name) +;; (format "a%d.%s" +;; (length (match-string 1 feature-name)) +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-end 0)))) +;; ) +;; ((string-match "^->" feature-name) +;; (concat "to." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-end 0)))) +;; ) +;; ((string-match "^<-" feature-name) +;; (concat "from." +;; (est-uri-encode-feature-name-body +;; (substring feature-name (match-end 0)))) +;; ) +;; (t (est-uri-encode-feature-name-body feature-name)))) (defun www-uri-make-feature-name-url (uri-genre uri-feature-name uri-object) (if est-hide-cgi-mode