while code-point
do (setf (gethash code-point names) char-name))
(let ((tree
- #!+sb-unicode
- (make-huffman-tree
- (let (list)
+ #!+sb-unicode
+ (make-huffman-tree
+ (let (list)
(maphash (lambda (code name)
(declare (ignore code))
(push name list))
(let ((h-code (cdr (binary-search char-code
(car *unicode-character-name-database*)
:key #'car))))
- (when h-code
- (huffman-decode h-code *unicode-character-name-huffman-tree*))))))
+ (cond
+ (h-code
+ (huffman-decode h-code *unicode-character-name-huffman-tree*))
+ ((< char-code #x10000)
+ (format nil "U~4,'0X" char-code))
+ (t
+ (format nil "U~8,'0X" char-code)))))))
(defun name-char (name)
#!+sb-doc
(let ((encoding (huffman-encode (string-upcase name)
*unicode-character-name-huffman-tree*)))
(when encoding
- (let ((char-code
- (car (binary-search encoding
- (cdr *unicode-character-name-database*)
- :key #'cdr))))
- (when char-code
- (code-char char-code)))))))
+ (let* ((char-code
+ (car (binary-search encoding
+ (cdr *unicode-character-name-database*)
+ :key #'cdr)))
+ (name-string (string name))
+ (name-length (length name-string)))
+ (cond
+ (char-code
+ (code-char char-code))
+ ((and (or (= name-length 9)
+ (= name-length 5))
+ (char-equal (char name-string 0) #\U)
+ (loop for i from 1 below name-length
+ always (digit-char-p (char name-string i) 16)))
+ (code-char (parse-integer name-string :start 1 :radix 16)))
+ (t
+ nil)))))))
\f
;;;; predicates