aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2001-12-16 03:45:30 +0000
committerRichard M. Stallman2001-12-16 03:45:30 +0000
commit4f102de230053d69d8d41765ce8c09acebbb679a (patch)
tree4cd4b2fe29b3ec6ef2906f0867712151ad4ce56b
parent48cb5913dc229cc914f4f7ce4769088aaf0354e1 (diff)
downloademacs-4f102de230053d69d8d41765ce8c09acebbb679a.tar.gz
emacs-4f102de230053d69d8d41765ce8c09acebbb679a.zip
(devanagari-range): Renamed from `range'. All calls changed.
(devanagari-regexp-of-hashtbl-keys): Renamed from `regexp-of-hashtbl-keys'. All calls changed.
-rw-r--r--lisp/language/devan-util.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index 19e965448ad..18fdd27a3e1 100644
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -84,13 +84,13 @@
84 (set-buffer-modified-p buffer-modified-p) 84 (set-buffer-modified-p buffer-modified-p)
85 (- (point-max) (point-min)))))) 85 (- (point-max) (point-min))))))
86 86
87(defun range (from to) 87(defun devanagari-range (from to)
88 "Make the list of the integers of range FROM to TO." 88 "Make the list of the integers of range FROM to TO."
89 (let (result) 89 (let (result)
90 (while (<= from to) (setq result (cons to result) to (1- to))) result)) 90 (while (<= from to) (setq result (cons to result) to (1- to))) result))
91 91
92(defun regexp-of-hashtbl-keys (hashtbl) 92(defun devanagari-regexp-of-hashtbl-keys (hashtbl)
93 "Returns the regular expression of hashtable keys." 93 "Return a regular expression that matches all keys in hashtable HASHTBL."
94 (let ((max-specpdl-size 1000)) 94 (let ((max-specpdl-size 1000))
95 (regexp-opt 95 (regexp-opt
96 (sort 96 (sort
@@ -113,7 +113,7 @@ PATTERN regexp."
113 (aset composition-function-table (decode-char 'ucs ucs) 113 (aset composition-function-table (decode-char 'ucs ucs)
114 (list (cons devanagari-composable-pattern 114 (list (cons devanagari-composable-pattern
115 'devanagari-composition-function))))) 115 'devanagari-composition-function)))))
116 (nconc '(#x0903) (range #x0905 #x0939) (range #x0958 #x0961))) 116 (nconc '(#x0903) (devanagari-range #x0905 #x0939) (devanagari-range #x0958 #x0961)))
117 117
118;; Notes on conversion steps. 118;; Notes on conversion steps.
119 119
@@ -433,7 +433,7 @@ preferred rule from the sanskrit fonts." )
433 hash)) 433 hash))
434 434
435(defvar dev-char-glyph-regexp 435(defvar dev-char-glyph-regexp
436 (regexp-of-hashtbl-keys dev-char-glyph-hash)) 436 (devanagari-regexp-of-hashtbl-keys dev-char-glyph-hash))
437 437
438;; glyph-to-glyph conversion table. 438;; glyph-to-glyph conversion table.
439;; it is supposed that glyphs are ordered in 439;; it is supposed that glyphs are ordered in
@@ -473,7 +473,7 @@ preferred rule from the sanskrit fonts." )
473 dev-glyph-glyph) 473 dev-glyph-glyph)
474 hash)) 474 hash))
475(defvar dev-glyph-glyph-regexp 475(defvar dev-glyph-glyph-regexp
476 (regexp-of-hashtbl-keys dev-glyph-glyph-hash)) 476 (devanagari-regexp-of-hashtbl-keys dev-glyph-glyph-hash))
477 477
478 478
479;; yet another glyph-to-glyph conversions. 479;; yet another glyph-to-glyph conversions.
@@ -488,13 +488,13 @@ preferred rule from the sanskrit fonts." )
488 dev-glyph-glyph-2) 488 dev-glyph-glyph-2)
489 hash)) 489 hash))
490(defvar dev-glyph-glyph-2-regexp 490(defvar dev-glyph-glyph-2-regexp
491 (regexp-of-hashtbl-keys dev-glyph-glyph-2-hash)) 491 (devanagari-regexp-of-hashtbl-keys dev-glyph-glyph-2-hash))
492 492
493 493
494(defun dev-charseq (from &optional to) 494(defun dev-charseq (from &optional to)
495 (if (null to) (setq to from)) 495 (if (null to) (setq to from))
496 (mapcar (function (lambda (x) (indian-glyph-char x 'devanagari))) 496 (mapcar (function (lambda (x) (indian-glyph-char x 'devanagari)))
497 (range from to))) 497 (devanagari-range from to)))
498 498
499(defvar dev-glyph-cvn 499(defvar dev-glyph-cvn
500 (append 500 (append