diff lisp/mule/cyrillic.el @ 4145:edb00a8b4eff

[xemacs-hg @ 2007-08-26 20:00:29 by aidan] Generally make the language environments and coding systems a little more sane.
author aidan
date Sun, 26 Aug 2007 20:00:42 +0000
parents 751ae075e76e
children f4c3ffe60a4f
line wrap: on
line diff
--- a/lisp/mule/cyrillic.el	Sat Aug 25 21:51:21 2007 +0000
+++ b/lisp/mule/cyrillic.el	Sun Aug 26 20:00:42 2007 +0000
@@ -455,147 +455,143 @@
                 . "Support for Ukrainian."))
  '("Cyrillic"))
 
-;; Windows 1251 may be provided automatically on Windows, in which case we
-;; don't need to provide it.
-;; #### (Though we should provide the CP1251 alias.)
-(unless (find-coding-system 'windows-1251) 
-  (make-8-bit-coding-system 
-   'windows-1251
-   '((#x80 ?\u0402) ;; CYRILLIC CAPITAL LETTER DJE
-     (#x81 ?\u0403) ;; CYRILLIC CAPITAL LETTER GJE
-     (#x82 ?\u201A) ;; SINGLE LOW-9 QUOTATION MARK
-     (#x83 ?\u0453) ;; CYRILLIC SMALL LETTER GJE
-     (#x84 ?\u201E) ;; DOUBLE LOW-9 QUOTATION MARK
-     (#x85 ?\u2026) ;; HORIZONTAL ELLIPSIS
-     (#x86 ?\u2020) ;; DAGGER
-     (#x87 ?\u2021) ;; DOUBLE DAGGER
-     (#x88 ?\u20AC) ;; EURO SIGN
-     (#x89 ?\u2030) ;; PER MILLE SIGN
-     (#x8A ?\u0409) ;; CYRILLIC CAPITAL LETTER LJE
-     (#x8B ?\u2039) ;; SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-     (#x8C ?\u040A) ;; CYRILLIC CAPITAL LETTER NJE
-     (#x8D ?\u040C) ;; CYRILLIC CAPITAL LETTER KJE
-     (#x8E ?\u040B) ;; CYRILLIC CAPITAL LETTER TSHE
-     (#x8F ?\u040F) ;; CYRILLIC CAPITAL LETTER DZHE
-     (#x90 ?\u0452) ;; CYRILLIC SMALL LETTER DJE
-     (#x91 ?\u2018) ;; LEFT SINGLE QUOTATION MARK
-     (#x92 ?\u2019) ;; RIGHT SINGLE QUOTATION MARK
-     (#x93 ?\u201C) ;; LEFT DOUBLE QUOTATION MARK
-     (#x94 ?\u201D) ;; RIGHT DOUBLE QUOTATION MARK
-     (#x95 ?\u2022) ;; BULLET
-     (#x96 ?\u2013) ;; EN DASH
-     (#x97 ?\u2014) ;; EM DASH
-     (#x99 ?\u2122) ;; TRADE MARK SIGN
-     (#x9A ?\u0459) ;; CYRILLIC SMALL LETTER LJE
-     (#x9B ?\u203A) ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-     (#x9C ?\u045A) ;; CYRILLIC SMALL LETTER NJE
-     (#x9D ?\u045C) ;; CYRILLIC SMALL LETTER KJE
-     (#x9E ?\u045B) ;; CYRILLIC SMALL LETTER TSHE
-     (#x9F ?\u045F) ;; CYRILLIC SMALL LETTER DZHE
-     (#xA0 ?\u00A0) ;; NO-BREAK SPACE
-     (#xA1 ?\u040E) ;; CYRILLIC CAPITAL LETTER SHORT U
-     (#xA2 ?\u045E) ;; CYRILLIC SMALL LETTER SHORT U
-     (#xA3 ?\u0408) ;; CYRILLIC CAPITAL LETTER JE
-     (#xA4 ?\u00A4) ;; CURRENCY SIGN
-     (#xA5 ?\u0490) ;; CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-     (#xA6 ?\u00A6) ;; BROKEN BAR
-     (#xA7 ?\u00A7) ;; SECTION SIGN
-     (#xA8 ?\u0401) ;; CYRILLIC CAPITAL LETTER IO
-     (#xA9 ?\u00A9) ;; COPYRIGHT SIGN
-     (#xAA ?\u0404) ;; CYRILLIC CAPITAL LETTER UKRAINIAN IE
-     (#xAB ?\u00AB) ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-     (#xAC ?\u00AC) ;; NOT SIGN
-     (#xAD ?\u00AD) ;; SOFT HYPHEN
-     (#xAE ?\u00AE) ;; REGISTERED SIGN
-     (#xAF ?\u0407) ;; CYRILLIC CAPITAL LETTER YI
-     (#xB0 ?\u00B0) ;; DEGREE SIGN
-     (#xB1 ?\u00B1) ;; PLUS-MINUS SIGN
-     (#xB2 ?\u0406) ;; CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-     (#xB3 ?\u0456) ;; CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-     (#xB4 ?\u0491) ;; CYRILLIC SMALL LETTER GHE WITH UPTURN
-     (#xB5 ?\u00B5) ;; MICRO SIGN
-     (#xB6 ?\u00B6) ;; PILCROW SIGN
-     (#xB7 ?\u00B7) ;; MIDDLE DOT
-     (#xB8 ?\u0451) ;; CYRILLIC SMALL LETTER IO
-     (#xB9 ?\u2116) ;; NUMERO SIGN
-     (#xBA ?\u0454) ;; CYRILLIC SMALL LETTER UKRAINIAN IE
-     (#xBB ?\u00BB) ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-     (#xBC ?\u0458) ;; CYRILLIC SMALL LETTER JE
-     (#xBD ?\u0405) ;; CYRILLIC CAPITAL LETTER DZE
-     (#xBE ?\u0455) ;; CYRILLIC SMALL LETTER DZE
-     (#xBF ?\u0457) ;; CYRILLIC SMALL LETTER YI
-     (#xC0 ?\u0410) ;; CYRILLIC CAPITAL LETTER A
-     (#xC1 ?\u0411) ;; CYRILLIC CAPITAL LETTER BE
-     (#xC2 ?\u0412) ;; CYRILLIC CAPITAL LETTER VE
-     (#xC3 ?\u0413) ;; CYRILLIC CAPITAL LETTER GHE
-     (#xC4 ?\u0414) ;; CYRILLIC CAPITAL LETTER DE
-     (#xC5 ?\u0415) ;; CYRILLIC CAPITAL LETTER IE
-     (#xC6 ?\u0416) ;; CYRILLIC CAPITAL LETTER ZHE
-     (#xC7 ?\u0417) ;; CYRILLIC CAPITAL LETTER ZE
-     (#xC8 ?\u0418) ;; CYRILLIC CAPITAL LETTER I
-     (#xC9 ?\u0419) ;; CYRILLIC CAPITAL LETTER SHORT I
-     (#xCA ?\u041A) ;; CYRILLIC CAPITAL LETTER KA
-     (#xCB ?\u041B) ;; CYRILLIC CAPITAL LETTER EL
-     (#xCC ?\u041C) ;; CYRILLIC CAPITAL LETTER EM
-     (#xCD ?\u041D) ;; CYRILLIC CAPITAL LETTER EN
-     (#xCE ?\u041E) ;; CYRILLIC CAPITAL LETTER O
-     (#xCF ?\u041F) ;; CYRILLIC CAPITAL LETTER PE
-     (#xD0 ?\u0420) ;; CYRILLIC CAPITAL LETTER ER
-     (#xD1 ?\u0421) ;; CYRILLIC CAPITAL LETTER ES
-     (#xD2 ?\u0422) ;; CYRILLIC CAPITAL LETTER TE
-     (#xD3 ?\u0423) ;; CYRILLIC CAPITAL LETTER U
-     (#xD4 ?\u0424) ;; CYRILLIC CAPITAL LETTER EF
-     (#xD5 ?\u0425) ;; CYRILLIC CAPITAL LETTER HA
-     (#xD6 ?\u0426) ;; CYRILLIC CAPITAL LETTER TSE
-     (#xD7 ?\u0427) ;; CYRILLIC CAPITAL LETTER CHE
-     (#xD8 ?\u0428) ;; CYRILLIC CAPITAL LETTER SHA
-     (#xD9 ?\u0429) ;; CYRILLIC CAPITAL LETTER SHCHA
-     (#xDA ?\u042A) ;; CYRILLIC CAPITAL LETTER HARD SIGN
-     (#xDB ?\u042B) ;; CYRILLIC CAPITAL LETTER YERU
-     (#xDC ?\u042C) ;; CYRILLIC CAPITAL LETTER SOFT SIGN
-     (#xDD ?\u042D) ;; CYRILLIC CAPITAL LETTER E
-     (#xDE ?\u042E) ;; CYRILLIC CAPITAL LETTER YU
-     (#xDF ?\u042F) ;; CYRILLIC CAPITAL LETTER YA
-     (#xE0 ?\u0430) ;; CYRILLIC SMALL LETTER A
-     (#xE1 ?\u0431) ;; CYRILLIC SMALL LETTER BE
-     (#xE2 ?\u0432) ;; CYRILLIC SMALL LETTER VE
-     (#xE3 ?\u0433) ;; CYRILLIC SMALL LETTER GHE
-     (#xE4 ?\u0434) ;; CYRILLIC SMALL LETTER DE
-     (#xE5 ?\u0435) ;; CYRILLIC SMALL LETTER IE
-     (#xE6 ?\u0436) ;; CYRILLIC SMALL LETTER ZHE
-     (#xE7 ?\u0437) ;; CYRILLIC SMALL LETTER ZE
-     (#xE8 ?\u0438) ;; CYRILLIC SMALL LETTER I
-     (#xE9 ?\u0439) ;; CYRILLIC SMALL LETTER SHORT I
-     (#xEA ?\u043A) ;; CYRILLIC SMALL LETTER KA
-     (#xEB ?\u043B) ;; CYRILLIC SMALL LETTER EL
-     (#xEC ?\u043C) ;; CYRILLIC SMALL LETTER EM
-     (#xED ?\u043D) ;; CYRILLIC SMALL LETTER EN
-     (#xEE ?\u043E) ;; CYRILLIC SMALL LETTER O
-     (#xEF ?\u043F) ;; CYRILLIC SMALL LETTER PE
-     (#xF0 ?\u0440) ;; CYRILLIC SMALL LETTER ER
-     (#xF1 ?\u0441) ;; CYRILLIC SMALL LETTER ES
-     (#xF2 ?\u0442) ;; CYRILLIC SMALL LETTER TE
-     (#xF3 ?\u0443) ;; CYRILLIC SMALL LETTER U
-     (#xF4 ?\u0444) ;; CYRILLIC SMALL LETTER EF
-     (#xF5 ?\u0445) ;; CYRILLIC SMALL LETTER HA
-     (#xF6 ?\u0446) ;; CYRILLIC SMALL LETTER TSE
-     (#xF7 ?\u0447) ;; CYRILLIC SMALL LETTER CHE
-     (#xF8 ?\u0448) ;; CYRILLIC SMALL LETTER SHA
-     (#xF9 ?\u0449) ;; CYRILLIC SMALL LETTER SHCHA
-     (#xFA ?\u044A) ;; CYRILLIC SMALL LETTER HARD SIGN
-     (#xFB ?\u044B) ;; CYRILLIC SMALL LETTER YERU
-     (#xFC ?\u044C) ;; CYRILLIC SMALL LETTER SOFT SIGN
-     (#xFD ?\u044D) ;; CYRILLIC SMALL LETTER E
-     (#xFE ?\u044E) ;; CYRILLIC SMALL LETTER YU
-     (#xFF ?\u044F)) ;; CYRILLIC SMALL LETTER YA
-   "Microsoft's Code Page 1251, for Russian, Bulgarian, Serbian and others.  "
-   '(mnemonic "CyrW"
-     documentation
-     "This ASCII-compatible encoding is unfortunately not compatible at
+(make-8-bit-coding-system 
+ 'windows-1251
+ '((#x80 ?\u0402) ;; CYRILLIC CAPITAL LETTER DJE
+   (#x81 ?\u0403) ;; CYRILLIC CAPITAL LETTER GJE
+   (#x82 ?\u201A) ;; SINGLE LOW-9 QUOTATION MARK
+   (#x83 ?\u0453) ;; CYRILLIC SMALL LETTER GJE
+   (#x84 ?\u201E) ;; DOUBLE LOW-9 QUOTATION MARK
+   (#x85 ?\u2026) ;; HORIZONTAL ELLIPSIS
+   (#x86 ?\u2020) ;; DAGGER
+   (#x87 ?\u2021) ;; DOUBLE DAGGER
+   (#x88 ?\u20AC) ;; EURO SIGN
+   (#x89 ?\u2030) ;; PER MILLE SIGN
+   (#x8A ?\u0409) ;; CYRILLIC CAPITAL LETTER LJE
+   (#x8B ?\u2039) ;; SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+   (#x8C ?\u040A) ;; CYRILLIC CAPITAL LETTER NJE
+   (#x8D ?\u040C) ;; CYRILLIC CAPITAL LETTER KJE
+   (#x8E ?\u040B) ;; CYRILLIC CAPITAL LETTER TSHE
+   (#x8F ?\u040F) ;; CYRILLIC CAPITAL LETTER DZHE
+   (#x90 ?\u0452) ;; CYRILLIC SMALL LETTER DJE
+   (#x91 ?\u2018) ;; LEFT SINGLE QUOTATION MARK
+   (#x92 ?\u2019) ;; RIGHT SINGLE QUOTATION MARK
+   (#x93 ?\u201C) ;; LEFT DOUBLE QUOTATION MARK
+   (#x94 ?\u201D) ;; RIGHT DOUBLE QUOTATION MARK
+   (#x95 ?\u2022) ;; BULLET
+   (#x96 ?\u2013) ;; EN DASH
+   (#x97 ?\u2014) ;; EM DASH
+   (#x99 ?\u2122) ;; TRADE MARK SIGN
+   (#x9A ?\u0459) ;; CYRILLIC SMALL LETTER LJE
+   (#x9B ?\u203A) ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+   (#x9C ?\u045A) ;; CYRILLIC SMALL LETTER NJE
+   (#x9D ?\u045C) ;; CYRILLIC SMALL LETTER KJE
+   (#x9E ?\u045B) ;; CYRILLIC SMALL LETTER TSHE
+   (#x9F ?\u045F) ;; CYRILLIC SMALL LETTER DZHE
+   (#xA0 ?\u00A0) ;; NO-BREAK SPACE
+   (#xA1 ?\u040E) ;; CYRILLIC CAPITAL LETTER SHORT U
+   (#xA2 ?\u045E) ;; CYRILLIC SMALL LETTER SHORT U
+   (#xA3 ?\u0408) ;; CYRILLIC CAPITAL LETTER JE
+   (#xA4 ?\u00A4) ;; CURRENCY SIGN
+   (#xA5 ?\u0490) ;; CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+   (#xA6 ?\u00A6) ;; BROKEN BAR
+   (#xA7 ?\u00A7) ;; SECTION SIGN
+   (#xA8 ?\u0401) ;; CYRILLIC CAPITAL LETTER IO
+   (#xA9 ?\u00A9) ;; COPYRIGHT SIGN
+   (#xAA ?\u0404) ;; CYRILLIC CAPITAL LETTER UKRAINIAN IE
+   (#xAB ?\u00AB) ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+   (#xAC ?\u00AC) ;; NOT SIGN
+   (#xAD ?\u00AD) ;; SOFT HYPHEN
+   (#xAE ?\u00AE) ;; REGISTERED SIGN
+   (#xAF ?\u0407) ;; CYRILLIC CAPITAL LETTER YI
+   (#xB0 ?\u00B0) ;; DEGREE SIGN
+   (#xB1 ?\u00B1) ;; PLUS-MINUS SIGN
+   (#xB2 ?\u0406) ;; CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+   (#xB3 ?\u0456) ;; CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+   (#xB4 ?\u0491) ;; CYRILLIC SMALL LETTER GHE WITH UPTURN
+   (#xB5 ?\u00B5) ;; MICRO SIGN
+   (#xB6 ?\u00B6) ;; PILCROW SIGN
+   (#xB7 ?\u00B7) ;; MIDDLE DOT
+   (#xB8 ?\u0451) ;; CYRILLIC SMALL LETTER IO
+   (#xB9 ?\u2116) ;; NUMERO SIGN
+   (#xBA ?\u0454) ;; CYRILLIC SMALL LETTER UKRAINIAN IE
+   (#xBB ?\u00BB) ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+   (#xBC ?\u0458) ;; CYRILLIC SMALL LETTER JE
+   (#xBD ?\u0405) ;; CYRILLIC CAPITAL LETTER DZE
+   (#xBE ?\u0455) ;; CYRILLIC SMALL LETTER DZE
+   (#xBF ?\u0457) ;; CYRILLIC SMALL LETTER YI
+   (#xC0 ?\u0410) ;; CYRILLIC CAPITAL LETTER A
+   (#xC1 ?\u0411) ;; CYRILLIC CAPITAL LETTER BE
+   (#xC2 ?\u0412) ;; CYRILLIC CAPITAL LETTER VE
+   (#xC3 ?\u0413) ;; CYRILLIC CAPITAL LETTER GHE
+   (#xC4 ?\u0414) ;; CYRILLIC CAPITAL LETTER DE
+   (#xC5 ?\u0415) ;; CYRILLIC CAPITAL LETTER IE
+   (#xC6 ?\u0416) ;; CYRILLIC CAPITAL LETTER ZHE
+   (#xC7 ?\u0417) ;; CYRILLIC CAPITAL LETTER ZE
+   (#xC8 ?\u0418) ;; CYRILLIC CAPITAL LETTER I
+   (#xC9 ?\u0419) ;; CYRILLIC CAPITAL LETTER SHORT I
+   (#xCA ?\u041A) ;; CYRILLIC CAPITAL LETTER KA
+   (#xCB ?\u041B) ;; CYRILLIC CAPITAL LETTER EL
+   (#xCC ?\u041C) ;; CYRILLIC CAPITAL LETTER EM
+   (#xCD ?\u041D) ;; CYRILLIC CAPITAL LETTER EN
+   (#xCE ?\u041E) ;; CYRILLIC CAPITAL LETTER O
+   (#xCF ?\u041F) ;; CYRILLIC CAPITAL LETTER PE
+   (#xD0 ?\u0420) ;; CYRILLIC CAPITAL LETTER ER
+   (#xD1 ?\u0421) ;; CYRILLIC CAPITAL LETTER ES
+   (#xD2 ?\u0422) ;; CYRILLIC CAPITAL LETTER TE
+   (#xD3 ?\u0423) ;; CYRILLIC CAPITAL LETTER U
+   (#xD4 ?\u0424) ;; CYRILLIC CAPITAL LETTER EF
+   (#xD5 ?\u0425) ;; CYRILLIC CAPITAL LETTER HA
+   (#xD6 ?\u0426) ;; CYRILLIC CAPITAL LETTER TSE
+   (#xD7 ?\u0427) ;; CYRILLIC CAPITAL LETTER CHE
+   (#xD8 ?\u0428) ;; CYRILLIC CAPITAL LETTER SHA
+   (#xD9 ?\u0429) ;; CYRILLIC CAPITAL LETTER SHCHA
+   (#xDA ?\u042A) ;; CYRILLIC CAPITAL LETTER HARD SIGN
+   (#xDB ?\u042B) ;; CYRILLIC CAPITAL LETTER YERU
+   (#xDC ?\u042C) ;; CYRILLIC CAPITAL LETTER SOFT SIGN
+   (#xDD ?\u042D) ;; CYRILLIC CAPITAL LETTER E
+   (#xDE ?\u042E) ;; CYRILLIC CAPITAL LETTER YU
+   (#xDF ?\u042F) ;; CYRILLIC CAPITAL LETTER YA
+   (#xE0 ?\u0430) ;; CYRILLIC SMALL LETTER A
+   (#xE1 ?\u0431) ;; CYRILLIC SMALL LETTER BE
+   (#xE2 ?\u0432) ;; CYRILLIC SMALL LETTER VE
+   (#xE3 ?\u0433) ;; CYRILLIC SMALL LETTER GHE
+   (#xE4 ?\u0434) ;; CYRILLIC SMALL LETTER DE
+   (#xE5 ?\u0435) ;; CYRILLIC SMALL LETTER IE
+   (#xE6 ?\u0436) ;; CYRILLIC SMALL LETTER ZHE
+   (#xE7 ?\u0437) ;; CYRILLIC SMALL LETTER ZE
+   (#xE8 ?\u0438) ;; CYRILLIC SMALL LETTER I
+   (#xE9 ?\u0439) ;; CYRILLIC SMALL LETTER SHORT I
+   (#xEA ?\u043A) ;; CYRILLIC SMALL LETTER KA
+   (#xEB ?\u043B) ;; CYRILLIC SMALL LETTER EL
+   (#xEC ?\u043C) ;; CYRILLIC SMALL LETTER EM
+   (#xED ?\u043D) ;; CYRILLIC SMALL LETTER EN
+   (#xEE ?\u043E) ;; CYRILLIC SMALL LETTER O
+   (#xEF ?\u043F) ;; CYRILLIC SMALL LETTER PE
+   (#xF0 ?\u0440) ;; CYRILLIC SMALL LETTER ER
+   (#xF1 ?\u0441) ;; CYRILLIC SMALL LETTER ES
+   (#xF2 ?\u0442) ;; CYRILLIC SMALL LETTER TE
+   (#xF3 ?\u0443) ;; CYRILLIC SMALL LETTER U
+   (#xF4 ?\u0444) ;; CYRILLIC SMALL LETTER EF
+   (#xF5 ?\u0445) ;; CYRILLIC SMALL LETTER HA
+   (#xF6 ?\u0446) ;; CYRILLIC SMALL LETTER TSE
+   (#xF7 ?\u0447) ;; CYRILLIC SMALL LETTER CHE
+   (#xF8 ?\u0448) ;; CYRILLIC SMALL LETTER SHA
+   (#xF9 ?\u0449) ;; CYRILLIC SMALL LETTER SHCHA
+   (#xFA ?\u044A) ;; CYRILLIC SMALL LETTER HARD SIGN
+   (#xFB ?\u044B) ;; CYRILLIC SMALL LETTER YERU
+   (#xFC ?\u044C) ;; CYRILLIC SMALL LETTER SOFT SIGN
+   (#xFD ?\u044D) ;; CYRILLIC SMALL LETTER E
+   (#xFE ?\u044E) ;; CYRILLIC SMALL LETTER YU
+   (#xFF ?\u044F)) ;; CYRILLIC SMALL LETTER YA
+ "Microsoft's Code Page 1251, for Russian, Bulgarian, Serbian and others.  "
+ '(mnemonic "CyrW"
+   documentation
+   "This ASCII-compatible encoding is unfortunately not compatible at
 the code point level with the KOI8 family of encodings, but it
 provides several widely-used punctuation and quotation marks that
 KOI-8R and its relatives don't, and has become widely used.  "
-     aliases (cp1251))))
+   aliases (cp1251)))
 
 (set-language-info-alist
  "Bulgarian" '((coding-system windows-1251)