Mercurial > emacs
diff lisp/language/devan-util.el @ 49598:0d8b17d428b5
Trailing whitepace deleted.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 04 Feb 2003 13:24:35 +0000 |
| parents | abba3d3c7e98 |
| children | 003055ca7e13 |
line wrap: on
line diff
--- a/lisp/language/devan-util.el Tue Feb 04 12:29:42 2003 +0000 +++ b/lisp/language/devan-util.el Tue Feb 04 13:24:35 2003 +0000 @@ -52,7 +52,7 @@ "[$,15U(B-$,15y68(B-$,16?(B]") (defconst devanagari-composable-pattern - (concat + (concat "\\([$,15E(B-$,15T6@6A(B][$,15A5B(B]?\\)\\|$,15C(B" "\\|\\(" "\\(?:\\(?:[$,15U(B-$,15y68(B-$,16?(B]$,16-(B\\)?\\(?:[$,15U(B-$,15y68(B-$,16?(B]$,16-(B\\)?\\(?:[$,15U(B-$,15y68(B-$,16?(B]$,16-(B\\)?[$,15U(B-$,15y68(B-$,16?(B]$,16-(B\\)?" @@ -67,7 +67,7 @@ (narrow-to-region from to) (goto-char (point-min)) (while (re-search-forward devanagari-composable-pattern nil t) - (devanagari-compose-syllable-region (match-beginning 0) + (devanagari-compose-syllable-region (match-beginning 0) (match-end 0)))))) (defun devanagari-compose-string (string) (with-temp-buffer @@ -86,14 +86,14 @@ (defun devanagari-range (from to) "Make the list of the integers of range FROM to TO." - (let (result) + (let (result) (while (<= from to) (setq result (cons to result) to (1- to))) result)) (defun devanagari-regexp-of-hashtbl-keys (hashtbl) "Return a regular expression that matches all keys in hashtable HASHTBL." (let ((max-specpdl-size 1000)) (regexp-opt - (sort + (sort (let (dummy) (maphash (function (lambda (key val) (setq dummy (cons key dummy)))) hashtbl) dummy) @@ -111,13 +111,13 @@ (mapc (function (lambda (ucs) (aset composition-function-table (decode-char 'ucs ucs) - (list (cons devanagari-composable-pattern + (list (cons devanagari-composable-pattern 'devanagari-composition-function))))) (nconc '(#x0903) (devanagari-range #x0905 #x0939) (devanagari-range #x0958 #x0961))) ;; Notes on conversion steps. -;; 1. chars to glyphs +;; 1. chars to glyphs ;; ;; Rules will not be applied to the halant appeared at the end of the ;; text. Also, the preceding/following "r" will be treated as special case. @@ -130,8 +130,8 @@ ;; Note that `consonant-glyph' mentioned here does not contain the ;; vertical bar (right modifier) attached at the right of the ;; consonant. -;; -;; If the glyph-group contains right modifier, +;; +;; If the glyph-group contains right modifier, ;; (1) consonant-glyphs/vowels, with nukta sign ;; (2) spacing ;; (3) right modifier (may be matra) @@ -140,11 +140,11 @@ ;; (6) anuswar ;; (7) following "r" ;; (8) bottom matra or halant. -;; -;; Otherwise, +;; +;; Otherwise, ;; (1) consonant-glyph/vowels, with nukta sign ;; (3) left matra -;; (4) top matra +;; (4) top matra ;; (5) preceding "r" ;; (6) anuswar ;; (7) following "r" @@ -186,15 +186,15 @@ ("$,15M5A(B" . "$,4 b"$(B") ("$,15M5B(B" . "$,4 b"$(B") ("$,16%(B" . "\$,4"L(B") - ("$,15N(B" . "$,4 b"@(B") - ("$,15N5A(B" . "$,4 b"@"&(B") + ("$,15N(B" . "$,4 b"@(B") + ("$,15N5A(B" . "$,4 b"@"&(B") ("$,16&(B" . "\$,4"@(B") ("$,16&5A(B" . "\$,4"@(B\$,4"&(B") - ("$,15O(B" . "$,4 b(B") + ("$,15O(B" . "$,4 b(B") ("$,16'(B" . "\$,4"D(B") ("$,16'5A(B" . "\$,4"D(B\$,4"&(B") - ("$,15P(B" . "$,4 b"D(B") - ("$,15P5A(B" . "$,4 b"D"&(B") + ("$,15P(B" . "$,4 b"D(B") + ("$,15P5A(B" . "$,4 b"D"&(B") ("$,16((B" . "\$,4"H(B") ("$,16(5A(B" . "\$,4"H(B\$,4"&(B") ("$,15Q(B" . "$,4 K")"L(B") ;; special rule for reodering. @@ -203,21 +203,21 @@ ("$,16)(B" . "\$,4")"L(B") ("$,16)5A(B" . "\$,4")"$(B") ("$,16)5B(B" . "\$,4")"$(B") - ("$,15R(B" . "$,4 K")"@(B") - ("$,15R5A(B" . "$,4 K")"@"&(B") + ("$,15R(B" . "$,4 K")"@(B") + ("$,15R5A(B" . "$,4 K")"@"&(B") ("$,16*(B" . "\$,4")"@(B") ("$,16*5A(B" . "\$,4")"@"&(B") ("$,15S(B" . "$,4 K")"D(B") ("$,15S5A(B" . "$,4 K")"D"&(B") ("$,16+(B" . "\$,4")"D(B") ("$,16+5A(B" . "\$,4")"D"&(B") - ("$,15T(B" . "$,4 K")"H(B") - ("$,15T5A(B" . "$,4 K")"H"&(B") + ("$,15T(B" . "$,4 K")"H(B") + ("$,15T5A(B" . "$,4 K")"H"&(B") ("$,16,(B" . "\$,4")"H(B") ("$,16,5A(B" . "\$,4")"H"&(B") - ("$,16@(B" . "$,4 a"Q(B") + ("$,16@(B" . "$,4 a"Q(B") ;;("$,16B(B" . nil) - ;;("$,16A(B" . nil) + ;;("$,16A(B" . nil) ;;("$,16C(B" . nil) ;; GRUTTALS @@ -233,69 +233,69 @@ ("$,15V6-5p(B" . "$,4 l")(B") ("$,15V6-5p6-(B" . "$,4 l(B") - ("$,15W(B" . "$,4 m")(B") - ("$,15W6-(B" . "$,4 m(B") + ("$,15W(B" . "$,4 m")(B") + ("$,15W6-(B" . "$,4 m(B") ("$,15W6-5p(B" . "$,4 o")(B") ("$,15W6-5p6-(B" . "$,4 o(B") - ("$,15X(B" . "$,4 p")(B") - ("$,15X6-(B" . "$,4 p(B") - ("$,15X6-5p(B" . "$,4 q")(B") - ("$,15X6-5p6-(B" . "$,4 q(B") + ("$,15X(B" . "$,4 p")(B") + ("$,15X6-(B" . "$,4 p(B") + ("$,15X6-5p(B" . "$,4 q")(B") + ("$,15X6-5p6-(B" . "$,4 q(B") ("$,15Y(B" . "$,4 r"S(B") - ;; PALATALS - ("$,15Z(B" . "$,4 s")(B") - ("$,15Z6-(B" . "$,4 s(B") - ("$,15Z6-5p(B" . "$,4 t")(B") + ;; PALATALS + ("$,15Z(B" . "$,4 s")(B") + ("$,15Z6-(B" . "$,4 s(B") + ("$,15Z6-5p(B" . "$,4 t")(B") ("$,15Z6-5p6-(B" . "$,4 t(B") - ("$,15[(B" . "$,4 u"T(B") + ("$,15[(B" . "$,4 u"T(B") - ("$,15\(B" . "$,4 v")(B") - ("$,15\6-(B" . "$,4 v(B") - ("$,15\6-5p(B" . "$,4 x")(B") - ("$,15\6-5p6-(B" . "$,4 x(B") - ("$,15\6-5^(B" . "$,4 y")(B") - ("$,15\6-5^6-(B" . "$,4 y(B") + ("$,15\(B" . "$,4 v")(B") + ("$,15\6-(B" . "$,4 v(B") + ("$,15\6-5p(B" . "$,4 x")(B") + ("$,15\6-5p6-(B" . "$,4 x(B") + ("$,15\6-5^(B" . "$,4 y")(B") + ("$,15\6-5^6-(B" . "$,4 y(B") - ("$,15](B" . "$,4 z")(B") - ("$,15]6-(B" . "$,4 z(B") - ("$,15]6-5p(B" . "$,4 {")(B") - ("$,15]6-5p6-(B" . "$,4 {(B") + ("$,15](B" . "$,4 z")(B") + ("$,15]6-(B" . "$,4 z(B") + ("$,15]6-5p(B" . "$,4 {")(B") + ("$,15]6-5p6-(B" . "$,4 {(B") ("$,15^(B" . "$,4 |")(B") ("$,15^6-(B" . "$,4 |(B") - ;; CEREBRALS + ;; CEREBRALS ("$,15_(B" . "$,4 }"U(B") ("$,15_6-5_(B" . "$,4 ~"U(B") ("$,15_6-5`(B" . "$,4 "U(B") - ("$,15`(B" . "$,4! "V(B") - ("$,15`6-5`(B" . "$,4!!"V(B") + ("$,15`(B" . "$,4! "V(B") + ("$,15`6-5`(B" . "$,4!!"V(B") - ("$,15a(B" . "$,4!""W(B") - ("$,15a6-5a(B" . "$,4!$"W(B") - ("$,15a6-5b(B" . "$,4!%"W(B") + ("$,15a(B" . "$,4!""W(B") + ("$,15a6-5a(B" . "$,4!$"W(B") + ("$,15a6-5b(B" . "$,4!%"W(B") - ("$,15b(B" . "$,4!&"X(B") + ("$,15b(B" . "$,4!&"X(B") ("$,15c(B" . "$,4!(")(B") ("$,15c6-(B" . "$,4!((B") - ;; DENTALS - ("$,15d(B" . "$,4!)")(B") - ("$,15d6-(B" . "$,4!)(B") - ("$,15d6-5p(B" . "$,4!*")(B") - ("$,15d6-5p6-(B" . "$,4!*(B") - ("$,15d6-5d(B" . "$,4!+")(B") - ("$,15d6-5d6-(B" . "$,4!+(B") + ;; DENTALS + ("$,15d(B" . "$,4!)")(B") + ("$,15d6-(B" . "$,4!)(B") + ("$,15d6-5p(B" . "$,4!*")(B") + ("$,15d6-5p6-(B" . "$,4!*(B") + ("$,15d6-5d(B" . "$,4!+")(B") + ("$,15d6-5d6-(B" . "$,4!+(B") - ("$,15e(B" . "$,4!,")(B") - ("$,15e6-(B" . "$,4!,(B") - ("$,15e6-5p(B" . "$,4!-")(B") - ("$,15e6-5p6-(B" . "$,4!-(B") + ("$,15e(B" . "$,4!,")(B") + ("$,15e6-(B" . "$,4!,(B") + ("$,15e6-5p(B" . "$,4!-")(B") + ("$,15e6-5p6-(B" . "$,4!-(B") - ("$,15f(B" . "$,4!."Y(B") + ("$,15f(B" . "$,4!."Y(B") ("$,15f6#(B" . "$,4!/"Y(B") ("$,15f6-5p(B" . "$,4!0"Y(B") ("$,15f6-5f(B" . "$,4!1"Y(B") @@ -304,61 +304,61 @@ ("$,15f6-5o(B" . "$,4!4(B") ("$,15f6-5u(B" . "$,4!5"Y(B") - ("$,15g(B" . "$,4!6")(B") - ("$,15g6-(B" . "$,4!6(B") - ("$,15g6-5p(B" . "$,4!7")(B") - ("$,15g6-5p6-(B" . "$,4!7(B") + ("$,15g(B" . "$,4!6")(B") + ("$,15g6-(B" . "$,4!6(B") + ("$,15g6-5p(B" . "$,4!7")(B") + ("$,15g6-5p6-(B" . "$,4!7(B") - ("$,15h(B" . "$,4!8")(B") - ("$,15h6-(B" . "$,4!8(B") - ("$,15h6-5p(B" . "$,4!9")(B") - ("$,15h6-5p6-(B" . "$,4!9")(B") - ("$,15h6-5h(B" . "$,4!:")(B") - ("$,15h6-5h6-(B" . "$,4!:(B") + ("$,15h(B" . "$,4!8")(B") + ("$,15h6-(B" . "$,4!8(B") + ("$,15h6-5p(B" . "$,4!9")(B") + ("$,15h6-5p6-(B" . "$,4!9")(B") + ("$,15h6-5h(B" . "$,4!:")(B") + ("$,15h6-5h6-(B" . "$,4!:(B") ("$,15i(B" . "$,4!8"#")(B") - ;; LABIALS - ("$,15j(B" . "$,4!;")(B") - ("$,15j6-(B" . "$,4!;(B") - ("$,15j6-5p(B" . "$,4!<")(B") - ("$,15j6-5p6-(B" . "$,4!<(B") + ;; LABIALS + ("$,15j(B" . "$,4!;")(B") + ("$,15j6-(B" . "$,4!;(B") + ("$,15j6-5p(B" . "$,4!<")(B") + ("$,15j6-5p6-(B" . "$,4!<(B") - ("$,15k(B" . "$,4!a"[(B") - ("$,15k6-(B" . "$,4!=(B") - ("$,15k6-5p(B" . "$,4!c"[(B") + ("$,15k(B" . "$,4!a"[(B") + ("$,15k6-(B" . "$,4!=(B") + ("$,15k6-5p(B" . "$,4!c"[(B") - ("$,15l(B" . "$,4!d")(B") - ("$,15l6-(B" . "$,4!d(B") - ("$,15l6-5p(B" . "$,4!e")(B") - ("$,15l6-5p6-(B" . "$,4!e(B") + ("$,15l(B" . "$,4!d")(B") + ("$,15l6-(B" . "$,4!d(B") + ("$,15l6-5p(B" . "$,4!e")(B") + ("$,15l6-5p6-(B" . "$,4!e(B") - ("$,15m(B" . "$,4!f")(B") - ("$,15m6-(B" . "$,4!f(B") - ("$,15m6-5p(B" . "$,4!g")(B") - ("$,15m6-5p6-(B" . "$,4!g(B") + ("$,15m(B" . "$,4!f")(B") + ("$,15m6-(B" . "$,4!f(B") + ("$,15m6-5p(B" . "$,4!g")(B") + ("$,15m6-5p6-(B" . "$,4!g(B") ("$,15n(B" . "$,4!h")(B") ("$,15n6-(B" . "$,4!h(B") ("$,15n6-5p(B" . "$,4!i")(B") ("$,15n6-5p6-(B" . "$,4!i(B") ;; SEMIVOWELS - ("$,15o(B" . "$,4!j")(B") - ("$,15o6-(B" . "$,4!j(B") - ("$,15o6-5p(B" . "$,4!k")(B") - ("$,15o6-5p6-(B" . "$,4!k(B") + ("$,15o(B" . "$,4!j")(B") + ("$,15o6-(B" . "$,4!j(B") + ("$,15o6-5p(B" . "$,4!k")(B") + ("$,15o6-5p6-(B" . "$,4!k(B") ("$,16-5o(B" . "$,4!l(B") ;; when every ohter lig. fails. - ("$,15p(B" . "$,4!n"W(B") + ("$,15p(B" . "$,4!n"W(B") ;; ("$,15p6-(B" . "\$,4"'(B") ;; special case. only the topmost pos. - ("$,15q(B" . "$,4!n"#"W(B") + ("$,15q(B" . "$,4!n"#"W(B") ("$,15q6-(B" . "$,4!m(B") ;; IS 13194 speical rule. - ("$,15p6!(B" . "$,4!o"[(B") - ("$,15p6"(B" . "$,4!p"\(B") + ("$,15p6!(B" . "$,4!o"[(B") + ("$,15p6"(B" . "$,4!p"\(B") - ("$,15r(B" . "$,4!q")(B") - ("$,15r6-(B" . "$,4!q(B") - ("$,15s(B" . "$,4!s(B") - ("$,15s6-(B" . "$,4!r(B") + ("$,15r(B" . "$,4!q")(B") + ("$,15r6-(B" . "$,4!q(B") + ("$,15s(B" . "$,4!s(B") + ("$,15s6-(B" . "$,4!r(B") ("$,15t(B" . "$,4!s"#(B") ("$,15t6-(B" . "$,4!r"#(B") @@ -366,8 +366,8 @@ ("$,15u6-(B" . "$,4!t(B") ("$,15u6-5p(B" . "$,4!u")(B") ("$,15u6-5p6-(B" . "$,4!u(B") - ;; SIBILANTS - ("$,15v(B" . "$,4!v")(B") + ;; SIBILANTS + ("$,15v(B" . "$,4!v")(B") ("$,15v6-(B" . "$,4!v(B") ("$,15v6-5u(B" . "$,4!w")(B") ("$,15v6-5u6-(B" . "$,4!w(B") @@ -387,42 +387,42 @@ ("$,15y6-5p(B" . "$,4!(B") ("$,15y6-5n(B" . "$,4" (B") ("$,15y6-5o(B" . "$,4"!(B") - ;; NUKTAS + ;; NUKTAS ("$,168(B" . "$,4 f"R"S(B") - ("$,1686-(B" . "$,4 d(B") - ("$,169(B" . "$,4 k")(B") - ("$,1696-(B" . "$,4 k(B") - ("$,16:(B" . "$,4 n")(B") - ("$,16:6-(B" . "$,4 n(B") - ("$,16;(B" . "$,4 w")(B") - ("$,16;6-(B" . "$,4 w(B") - ("$,16<(B" . "$,4!#"W(B") - ("$,16=(B" . "$,4!'"X(B") - ("$,16>(B" . "$,4!b"[(B") - ("$,16>6-(B" . "$,4!>(B") + ("$,1686-(B" . "$,4 d(B") + ("$,169(B" . "$,4 k")(B") + ("$,1696-(B" . "$,4 k(B") + ("$,16:(B" . "$,4 n")(B") + ("$,16:6-(B" . "$,4 n(B") + ("$,16;(B" . "$,4 w")(B") + ("$,16;6-(B" . "$,4 w(B") + ("$,16<(B" . "$,4!#"W(B") + ("$,16=(B" . "$,4!'"X(B") + ("$,16>(B" . "$,4!b"[(B") + ("$,16>6-(B" . "$,4!>(B") ("$,16?(B" . "$,4!j"#")(B") ;; misc modifiers. ("$,15A(B" . "\$,4"$(B") - ("$,15B(B" . "\$,4"&(B") + ("$,15B(B" . "\$,4"&(B") ("$,15C(B" . "$,4 F(B") ("$,15|(B" . "$,4"#(B") ("$,15}(B" . "$,4 E(B") ("$,16-(B" . "$,4""(B") ("$,16-5p(B" . "$,4"%(B") ;; following "r" - ;; ("$,160(B" . "$,4 D(B") + ;; ("$,160(B" . "$,4 D(B") ;; ("$,16D(B" . "$,4 J(B") - ;; ("$,16F(B" . "") - ;; ("$,16G(B" . "") - ;; ("$,16H(B" . "") - ;; ("$,16I(B" . "") - ;; ("$,16J(B" . "") - ;; ("$,16K(B" . "") - ;; ("$,16L(B" . "") - ;; ("$,16M(B" . "") - ;; ("$,16N(B" . "") + ;; ("$,16F(B" . "") + ;; ("$,16G(B" . "") + ;; ("$,16H(B" . "") + ;; ("$,16I(B" . "") + ;; ("$,16J(B" . "") + ;; ("$,16K(B" . "") + ;; ("$,16L(B" . "") + ;; ("$,16M(B" . "") + ;; ("$,16N(B" . "") ;; ("$,16O(B" . "") ) - "Devanagari characters to glyphs conversion table. + "Devanagari characters to glyphs conversion table. Default value contains only the basic rules. You may add your own preferred rule from the sanskrit fonts." ) @@ -436,7 +436,7 @@ (devanagari-regexp-of-hashtbl-keys dev-char-glyph-hash)) ;; glyph-to-glyph conversion table. -;; it is supposed that glyphs are ordered in +;; it is supposed that glyphs are ordered in ;; [consonant/nukta] - [matra/halant] - [preceding-r] - [anuswar]. (defvar dev-glyph-glyph @@ -497,7 +497,7 @@ (devanagari-range from to))) (defvar dev-glyph-cvn - (append + (append (dev-charseq #x2b) (dev-charseq #x3c #xc1) (dev-charseq #xc3)) @@ -508,7 +508,7 @@ "Devanagari Spacing Glyphs") (defvar dev-glyph-right-modifier - (append + (append (dev-charseq #xc9) (dev-charseq #xd2 #xd5)) "Devanagari Modifiers attached at the right side.") @@ -525,7 +525,7 @@ "Devanagari Matras attached at the top side.") (defvar dev-glyph-bottom-modifier - (append + (append (dev-charseq #xd6 #xdf) (dev-charseq #xc2)) "Devanagari Modifiers attached at the bottom.") @@ -541,9 +541,9 @@ (,(dev-charseq #xc5) . 7) (,dev-glyph-bottom-modifier . 8))) -(mapc +(mapc (function (lambda (x) - (mapc + (mapc (function (lambda (y) (put-char-code-property y 'composition-order (cdr x)))) (car x)))) @@ -563,7 +563,7 @@ (defun devanagari-compose-syllable-region (from to) "Compose devanagari syllable in region FROM to TO." (let ((glyph-str nil) (cons-num 0) glyph-str-list - (last-halant nil) (preceding-r nil) (last-modifier nil) + (last-halant nil) (preceding-r nil) (last-modifier nil) (last-char (char-before to)) match-str glyph-block split-pos) (save-excursion @@ -586,23 +586,23 @@ ;; translate the rest characters into glyphs (while (re-search-forward dev-char-glyph-regexp nil t) (setq match-str (match-string 0)) - (setq glyph-str + (setq glyph-str (concat glyph-str (gethash match-str dev-char-glyph-hash))) ;; count the number of consonant-glyhs. (if (string-match devanagari-consonant match-str) (setq cons-num (1+ cons-num)))) ;; preceding-r must be attached before the anuswar if exists. - (if preceding-r + (if preceding-r (if last-modifier - (setq glyph-str (concat (substring glyph-str 0 -1) + (setq glyph-str (concat (substring glyph-str 0 -1) "$,4"'(B" (substring glyph-str -1))) (setq glyph-str (concat glyph-str "$,4"'(B")))) (if last-halant (setq glyph-str (concat glyph-str "$,4""(B"))) ;;; *** glyph-to-glyph conversion *** (when (string-match dev-glyph-glyph-regexp glyph-str) (setq glyph-str - (replace-match (gethash (match-string 0 glyph-str) + (replace-match (gethash (match-string 0 glyph-str) dev-glyph-glyph-hash) nil t glyph-str)) (if (and (> cons-num 1) @@ -615,8 +615,8 @@ (while (setq split-pos (string-match "$,4""(B\\|.$" glyph-str)) (setq glyph-block (substring glyph-str 0 (1+ split-pos))) (setq glyph-str (substring glyph-str (1+ split-pos))) - (setq - glyph-block + (setq + glyph-block (if (string-match dev-glyph-right-modifier-regexp glyph-block) (sort (string-to-list glyph-block) (function (lambda (x y) @@ -630,11 +630,11 @@ (setq glyph-str-list (nconc glyph-str-list glyph-block))) ;; concatenate and attach reference-points. (setq glyph-str - (cdr - (apply - 'nconc - (mapcar - (function (lambda (x) + (cdr + (apply + 'nconc + (mapcar + (function (lambda (x) (list (or (get-char-code-property x 'reference-point) '(5 . 3) ;; default reference point.