diff options
| author | Juanma Barranquero | 2008-04-14 10:47:12 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-04-14 10:47:12 +0000 |
| commit | dd7d19d7ce68900957eae8d93de0e144ca52dc88 (patch) | |
| tree | 5109e00cf444c3cdf59f04e76b03ab6414278356 /admin | |
| parent | 9eef6650a59cd8b62a4546aecdb121b3c22ba159 (diff) | |
| download | emacs-dd7d19d7ce68900957eae8d93de0e144ca52dc88.tar.gz emacs-dd7d19d7ce68900957eae8d93de0e144ca52dc88.zip | |
(unidata-prop-alist): Fix typo in description of `numeric-value'.
(unidata-put-character): Fix typo in error message.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 6 | ||||
| -rw-r--r-- | admin/unidata/unidata-gen.el | 33 |
2 files changed, 24 insertions, 15 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 094adb603ed..df4a5f0f727 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-04-14 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * unidata/unidata-gen.el (unidata-prop-alist): | ||
| 4 | Fix typo in description of `numeric-value'. | ||
| 5 | (unidata-put-character): Fix typo in error message. | ||
| 6 | |||
| 1 | 2008-02-21 Glenn Morris <rgm@gnu.org> | 7 | 2008-02-21 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * notes/unicode, notes/font-backend: New files, split off from | 9 | * notes/unicode, notes/font-backend: New files, split off from |
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index a3015a4968d..8f8a9cb02af 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el | |||
| @@ -40,8 +40,11 @@ | |||
| 40 | ;; (name, generic-category, etc), and FILE is a name of one of | 40 | ;; (name, generic-category, etc), and FILE is a name of one of |
| 41 | ;; the following files. | 41 | ;; the following files. |
| 42 | ;; | 42 | ;; |
| 43 | ;; uni-name.el, uni-cat.el, uni-comb.el, uni-bidi.el | 43 | ;; uni-name.el, uni-category.el, uni-combining.el, uni-bidi.el, |
| 44 | ;; It contains a single form of this format: | 44 | ;; uni-decomposition.el, uni-decimal.el, uni-digit.el, uni-numeric.el, |
| 45 | ;; uni-mirrored.el, uni-old-name.el, uni-comment.el, uni-uppercase.el, | ||
| 46 | ;; uni-lowercase.el, uni-titlecase.el | ||
| 47 | ;; They each contain a single form of this format: | ||
| 45 | ;; (char-code-property-register PROP CHAR-TABLE) | 48 | ;; (char-code-property-register PROP CHAR-TABLE) |
| 46 | ;; where PROP is the same as above, and CHAR-TABLE is a | 49 | ;; where PROP is the same as above, and CHAR-TABLE is a |
| 47 | ;; char-table containing property values in a compressed format. | 50 | ;; char-table containing property values in a compressed format. |
| @@ -180,7 +183,7 @@ Property value is an integer.") | |||
| 180 | (numeric-value | 183 | (numeric-value |
| 181 | 8 unidata-gen-table-symbol "uni-numeric.el" | 184 | 8 unidata-gen-table-symbol "uni-numeric.el" |
| 182 | "Unicode numeric value (numeric). | 185 | "Unicode numeric value (numeric). |
| 183 | Property value is an symbol.") | 186 | Property value is a symbol.") |
| 184 | (mirrored | 187 | (mirrored |
| 185 | 9 unidata-gen-table-symbol "uni-mirrored.el" | 188 | 9 unidata-gen-table-symbol "uni-mirrored.el" |
| 186 | "Unicode bidi mirrored flag. | 189 | "Unicode bidi mirrored flag. |
| @@ -255,7 +258,7 @@ Property value is a character." | |||
| 255 | (defun unidata-put-character (char val table) | 258 | (defun unidata-put-character (char val table) |
| 256 | (or (characterp val) | 259 | (or (characterp val) |
| 257 | (not val) | 260 | (not val) |
| 258 | (error "Not an character nor nil: %S" val)) | 261 | (error "Not a character nor nil: %S" val)) |
| 259 | (let ((current-val (aref table char))) | 262 | (let ((current-val (aref table char))) |
| 260 | (unless (eq current-val val) | 263 | (unless (eq current-val val) |
| 261 | (if (stringp current-val) | 264 | (if (stringp current-val) |
| @@ -364,7 +367,7 @@ Property value is a character." | |||
| 364 | this-val)) | 367 | this-val)) |
| 365 | ((> val 0) | 368 | ((> val 0) |
| 366 | (aref val-table (1- val)))))) | 369 | (aref val-table (1- val)))))) |
| 367 | 370 | ||
| 368 | ;; Return a integer-type character property value of CHAR. VAL is the | 371 | ;; Return a integer-type character property value of CHAR. VAL is the |
| 369 | ;; current value of (aref TABLE CHAR). | 372 | ;; current value of (aref TABLE CHAR). |
| 370 | 373 | ||
| @@ -492,7 +495,7 @@ Property value is a character." | |||
| 492 | (set-char-table-range table (cons start limit) str)))))) | 495 | (set-char-table-range table (cons start limit) str)))))) |
| 493 | 496 | ||
| 494 | (setq val-list (nreverse (cdr val-list))) | 497 | (setq val-list (nreverse (cdr val-list))) |
| 495 | (set-char-table-extra-slot table 0 prop) | 498 | (set-char-table-extra-slot table 0 prop) |
| 496 | (set-char-table-extra-slot table 4 (vconcat (mapcar 'car val-list))) | 499 | (set-char-table-extra-slot table 4 (vconcat (mapcar 'car val-list))) |
| 497 | table)) | 500 | table)) |
| 498 | 501 | ||
| @@ -556,7 +559,7 @@ Property value is a character." | |||
| 556 | (while (and l1 (eq (car l1) (car l2))) | 559 | (while (and l1 (eq (car l1) (car l2))) |
| 557 | (setq beg (1+ beg) | 560 | (setq beg (1+ beg) |
| 558 | l1 (cdr l1) len1 (1- len1) l2 (cdr l2) len2 (1- len2))) | 561 | l1 (cdr l1) len1 (1- len1) l2 (cdr l2) len2 (1- len2))) |
| 559 | (while (and (< end len1) (< end len2) | 562 | (while (and (< end len1) (< end len2) |
| 560 | (eq (nth (- len1 end 1) l1) (nth (- len2 end 1) l2))) | 563 | (eq (nth (- len1 end 1) l1) (nth (- len2 end 1) l2))) |
| 561 | (setq end (1+ end)))) | 564 | (setq end (1+ end)))) |
| 562 | (if (= (+ beg end) 0) | 565 | (if (= (+ beg end) 0) |
| @@ -628,7 +631,7 @@ Property value is a character." | |||
| 628 | ;; CHAR). | 631 | ;; CHAR). |
| 629 | 632 | ||
| 630 | (defun unidata-get-name (char val table) | 633 | (defun unidata-get-name (char val table) |
| 631 | (cond | 634 | (cond |
| 632 | ((stringp val) | 635 | ((stringp val) |
| 633 | (if (> (aref val 0) 0) | 636 | (if (> (aref val 0) 0) |
| 634 | val | 637 | val |
| @@ -659,7 +662,7 @@ Property value is a character." | |||
| 659 | (setq word-list (nconc word-list (list (car l))) | 662 | (setq word-list (nconc word-list (list (car l))) |
| 660 | l (cdr l)))))) | 663 | l (cdr l)))))) |
| 661 | (setq word-list | 664 | (setq word-list |
| 662 | (nconc word-list | 665 | (nconc word-list |
| 663 | (list (symbol-name | 666 | (list (symbol-name |
| 664 | (unidata-decode-word c word-table)))) | 667 | (unidata-decode-word c word-table)))) |
| 665 | i (1+ i)))) | 668 | i (1+ i)))) |
| @@ -698,7 +701,7 @@ Property value is a character." | |||
| 698 | (V (/ (% char 588) 28)) | 701 | (V (/ (% char 588) 28)) |
| 699 | ;; TIndex = SIndex % TCount | 702 | ;; TIndex = SIndex % TCount |
| 700 | (T (% char 28))) | 703 | (T (% char 28))) |
| 701 | (format "HANGUL SYLLABLE %s%s%s" | 704 | (format "HANGUL SYLLABLE %s%s%s" |
| 702 | ;; U+110B is nil in this table. | 705 | ;; U+110B is nil in this table. |
| 703 | (or (aref (aref jamo-name-table 0) L) "") | 706 | (or (aref (aref jamo-name-table 0) L) "") |
| 704 | (aref (aref jamo-name-table 1) V) | 707 | (aref (aref jamo-name-table 1) V) |
| @@ -754,7 +757,7 @@ Property value is a character." | |||
| 754 | (setq word-list (nconc word-list (list (car l))) | 757 | (setq word-list (nconc word-list (list (car l))) |
| 755 | l (cdr l)))))) | 758 | l (cdr l)))))) |
| 756 | (setq word-list | 759 | (setq word-list |
| 757 | (nconc word-list | 760 | (nconc word-list |
| 758 | (list (or (unidata-decode-word c word-table) c))) | 761 | (list (or (unidata-decode-word c word-table) c))) |
| 759 | i (1+ i)))) | 762 | i (1+ i)))) |
| 760 | (if (or word-list tail-list) | 763 | (if (or word-list tail-list) |
| @@ -933,7 +936,7 @@ Property value is a character." | |||
| 933 | (if (= c 32) | 936 | (if (= c 32) |
| 934 | (setq l (cons (intern (substring str idx i)) l) | 937 | (setq l (cons (intern (substring str idx i)) l) |
| 935 | idx (1+ i)) | 938 | idx (1+ i)) |
| 936 | (if (and (= c ?-) (< idx i) | 939 | (if (and (= c ?-) (< idx i) |
| 937 | (< (1+ i) len) (/= (aref str (1+ i)) 32)) | 940 | (< (1+ i) len) (/= (aref str (1+ i)) 32)) |
| 938 | (setq l (cons '- (cons (intern (substring str idx i)) l)) | 941 | (setq l (cons '- (cons (intern (substring str idx i)) l)) |
| 939 | idx (1+ i))))) | 942 | idx (1+ i))))) |
| @@ -985,7 +988,7 @@ Property value is a character." | |||
| 985 | (byte-compile 'unidata-put-decomposition) | 988 | (byte-compile 'unidata-put-decomposition) |
| 986 | (set-char-table-extra-slot table 1 | 989 | (set-char-table-extra-slot table 1 |
| 987 | (symbol-function 'unidata-get-decomposition)) | 990 | (symbol-function 'unidata-get-decomposition)) |
| 988 | (set-char-table-extra-slot table 2 | 991 | (set-char-table-extra-slot table 2 |
| 989 | (symbol-function 'unidata-put-decomposition)) | 992 | (symbol-function 'unidata-put-decomposition)) |
| 990 | (set-char-table-extra-slot table 4 (car word-tables)) | 993 | (set-char-table-extra-slot table 4 (car word-tables)) |
| 991 | table)) | 994 | table)) |
| @@ -1088,7 +1091,7 @@ Property value is a character." | |||
| 1088 | (let* ((prop (car elt)) | 1091 | (let* ((prop (car elt)) |
| 1089 | (index (unidata-prop-index prop)) | 1092 | (index (unidata-prop-index prop)) |
| 1090 | (generator (unidata-prop-generator prop)) | 1093 | (generator (unidata-prop-generator prop)) |
| 1091 | (table (progn | 1094 | (table (progn |
| 1092 | (message "Generating %S table..." prop) | 1095 | (message "Generating %S table..." prop) |
| 1093 | (funcall generator prop))) | 1096 | (funcall generator prop))) |
| 1094 | (decoder (char-table-extra-slot table 1)) | 1097 | (decoder (char-table-extra-slot table 1)) |
| @@ -1114,7 +1117,7 @@ Property value is a character." | |||
| 1114 | (message "%S %04X" prop check) | 1117 | (message "%S %04X" prop check) |
| 1115 | (setq check (+ check #x400))) | 1118 | (setq check (+ check #x400))) |
| 1116 | (or (equal val1 val2) | 1119 | (or (equal val1 val2) |
| 1117 | (insert (format "> %04X %S\n< %04X %S\n" | 1120 | (insert (format "> %04X %S\n< %04X %S\n" |
| 1118 | char val1 char val2))) | 1121 | char val1 char val2))) |
| 1119 | (sit-for 0))))))) | 1122 | (sit-for 0))))))) |
| 1120 | 1123 | ||