diff lisp/mule/greek.el @ 4690:257b468bf2ca

Move the #'query-coding-region implementation to C. This is necessary because there is no reasonable way to access the corresponding mswindows-multibyte functionality from Lisp, and we need such functionality if we're going to have a reliable and portable #'query-coding-region implementation. However, this change doesn't yet provide #'query-coding-region for the mswindow-multibyte coding systems, there should be no functional differences between an XEmacs with this change and one without it. src/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> Move the #'query-coding-region implementation to C. This is necessary because there is no reasonable way to access the corresponding mswindows-multibyte functionality from Lisp, and we need such functionality if we're going to have a reliable and portable #'query-coding-region implementation. However, this change doesn't yet provide #'query-coding-region for the mswindow-multibyte coding systems, there should be no functional differences between an XEmacs with this change and one without it. * mule-coding.c (struct fixed_width_coding_system): Add a new coding system type, fixed_width, and implement it. It uses the CCL infrastructure but has a much simpler creation API, and its own query_method, formerly in lisp/mule/mule-coding.el. * unicode.c: Move the Unicode query method implementation here from unicode.el. * lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table here. * intl-win32.c (complex_vars_of_intl_win32): Use Fmake_coding_system_internal, not Fmake_coding_system. * general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence here. * file-coding.h (enum coding_system_variant): Add fixed_width_coding_system here. (struct coding_system_methods): Add query_method and query_lstream_method to the coding system methods. Provide flags for the query methods. Declare the default query method; initialise it correctly in INITIALIZE_CODING_SYSTEM_TYPE. * file-coding.c (default_query_method): New function, the default query method for coding systems that do not set it. Moved from coding.el. (make_coding_system_1): Accept new elements in PROPS in #'make-coding-system; aliases, a list of aliases; safe-chars and safe-charsets (these were previously accepted but not saved); and category. (Fmake_coding_system_internal): New function, what used to be #'make-coding-system--on Mule builds, we've now moved some of the functionality of this to Lisp. (Fcoding_system_canonical_name_p): Move this earlier in the file, since it's now called from within make_coding_system_1. (Fquery_coding_region): Move the implementation of this here, from coding.el. (complex_vars_of_file_coding): Call Fmake_coding_system_internal, not Fmake_coding_system; specify safe-charsets properties when we're a mule build. * extents.h (mouse_highlight_priority, Fset_extent_priority, Fset_extent_face, Fmap_extents): Make these available to other C files. lisp/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> Move the #'query-coding-region implementation to C. * coding.el: Consolidate code that depends on the presence or absence of Mule at the end of this file. (default-query-coding-region, query-coding-region): Move these functions to C. (default-query-coding-region-safe-charset-skip-chars-map): Remove this variable, the corresponding C variable is Vdefault_query_coding_region_chartab_cache in file-coding.c. (query-coding-string): Update docstring to reflect actual multiple values, be more careful about not modifying a range table that we're currently mapping over. (encode-coding-char): Make the implementation of this simpler. (featurep 'mule): Autoload #'make-coding-system from mule/make-coding-system.el if we're a mule build; provide an appropriate compiler macro. Do various non-mule compatibility things if we're not a mule build. * update-elc.el (additional-dump-dependencies): Add mule/make-coding-system as a dump time dependency if we're a mule build. * unicode.el (ccl-encode-to-ucs-2): (decode-char): (encode-char): Move these earlier in the file, for the sake of some byte compile warnings. (unicode-query-coding-region): Move this to unicode.c * mule/make-coding-system.el: New file, not dumped. Contains the functionality to rework the arguments necessary for fixed-width coding systems, and contains the implementation of #'make-coding-system, which now calls #'make-coding-system-internal. * mule/vietnamese.el (viscii): * mule/latin.el (iso-8859-2): (windows-1250): (iso-8859-3): (iso-8859-4): (iso-8859-14): (iso-8859-15): (iso-8859-16): (iso-8859-9): (macintosh): (windows-1252): * mule/hebrew.el (iso-8859-8): * mule/greek.el (iso-8859-7): (windows-1253): * mule/cyrillic.el (iso-8859-5): (koi8-r): (koi8-u): (windows-1251): (alternativnyj): (koi8-ru): (koi8-t): (koi8-c): (koi8-o): * mule/arabic.el (iso-8859-6): (windows-1256): Move all these coding systems to being of type fixed-width, not of type CCL. This allows the distinct query-coding-region for them to be in C, something which will eventually allow us to implement query-coding-region for the mswindows-multibyte coding systems. * mule/general-late.el (posix-charset-to-coding-system-hash): Document why we're pre-emptively persuading the byte compiler that the ELC for this file needs to be written using escape-quoted. Call #'set-unicode-query-skip-chars-args, now the Unicode query-coding-region implementation is in C. * mule/thai-xtis.el (tis-620): Don't bother checking whether we're XEmacs or not here. * mule/mule-coding.el: Move the eight bit fixed-width functionality from this file to make-coding-system.el. tests/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el: Check a coding system's type, not an 8-bit-fixed property, for whether that coding system should be treated as a fixed-width coding system. * automated/query-coding-tests.el: Don't test the query coding functionality for mswindows-multibyte coding systems, it's not yet implemented.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 19 Sep 2009 22:53:13 +0100
parents e0a8715fdb1f
children 308d34e9f07d
line wrap: on
line diff
--- a/lisp/mule/greek.el	Sat Sep 19 17:56:23 2009 +0200
+++ b/lisp/mule/greek.el	Sat Sep 19 22:53:13 2009 +0100
@@ -118,254 +118,256 @@
       (string (char-syntax (make-char 'latin-iso8859-1 latin-1)))
       syntax-table))
 
-(make-8-bit-coding-system
- 'iso-8859-7
- '((#x80 ?\u0080) ;; <control>
-   (#x81 ?\u0081) ;; <control>
-   (#x82 ?\u0082) ;; <control>
-   (#x83 ?\u0083) ;; <control>
-   (#x84 ?\u0084) ;; <control>
-   (#x85 ?\u0085) ;; <control>
-   (#x86 ?\u0086) ;; <control>
-   (#x87 ?\u0087) ;; <control>
-   (#x88 ?\u0088) ;; <control>
-   (#x89 ?\u0089) ;; <control>
-   (#x8A ?\u008A) ;; <control>
-   (#x8B ?\u008B) ;; <control>
-   (#x8C ?\u008C) ;; <control>
-   (#x8D ?\u008D) ;; <control>
-   (#x8E ?\u008E) ;; <control>
-   (#x8F ?\u008F) ;; <control>
-   (#x90 ?\u0090) ;; <control>
-   (#x91 ?\u0091) ;; <control>
-   (#x92 ?\u0092) ;; <control>
-   (#x93 ?\u0093) ;; <control>
-   (#x94 ?\u0094) ;; <control>
-   (#x95 ?\u0095) ;; <control>
-   (#x96 ?\u0096) ;; <control>
-   (#x97 ?\u0097) ;; <control>
-   (#x98 ?\u0098) ;; <control>
-   (#x99 ?\u0099) ;; <control>
-   (#x9A ?\u009A) ;; <control>
-   (#x9B ?\u009B) ;; <control>
-   (#x9C ?\u009C) ;; <control>
-   (#x9D ?\u009D) ;; <control>
-   (#x9E ?\u009E) ;; <control>
-   (#x9F ?\u009F) ;; <control>
-   (#xA0 ?\u00A0) ;; NO-BREAK SPACE
-   (#xA1 ?\u2018) ;; LEFT SINGLE QUOTATION MARK
-   (#xA2 ?\u2019) ;; RIGHT SINGLE QUOTATION MARK
-   (#xA3 ?\u00A3) ;; POUND SIGN
-   (#xA4 ?\u20AC) ;; EURO SIGN
-   (#xA5 ?\u20AF) ;; DRACHMA SIGN
-   (#xA6 ?\u00A6) ;; BROKEN BAR
-   (#xA7 ?\u00A7) ;; SECTION SIGN
-   (#xA8 ?\u00A8) ;; DIAERESIS
-   (#xA9 ?\u00A9) ;; COPYRIGHT SIGN
-   (#xAA ?\u037A) ;; GREEK YPOGEGRAMMENI
-   (#xAB ?\u00AB) ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-   (#xAC ?\u00AC) ;; NOT SIGN
-   (#xAD ?\u00AD) ;; SOFT HYPHEN
-   (#xAF ?\u2015) ;; HORIZONTAL BAR
-   (#xB0 ?\u00B0) ;; DEGREE SIGN
-   (#xB1 ?\u00B1) ;; PLUS-MINUS SIGN
-   (#xB2 ?\u00B2) ;; SUPERSCRIPT TWO
-   (#xB3 ?\u00B3) ;; SUPERSCRIPT THREE
-   (#xB4 ?\u0384) ;; GREEK TONOS
-   (#xB5 ?\u0385) ;; GREEK DIALYTIKA TONOS
-   (#xB6 ?\u0386) ;; GREEK CAPITAL LETTER ALPHA WITH TONOS
-   (#xB7 ?\u00B7) ;; MIDDLE DOT
-   (#xB8 ?\u0388) ;; GREEK CAPITAL LETTER EPSILON WITH TONOS
-   (#xB9 ?\u0389) ;; GREEK CAPITAL LETTER ETA WITH TONOS
-   (#xBA ?\u038A) ;; GREEK CAPITAL LETTER IOTA WITH TONOS
-   (#xBB ?\u00BB) ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-   (#xBC ?\u038C) ;; GREEK CAPITAL LETTER OMICRON WITH TONOS
-   (#xBD ?\u00BD) ;; VULGAR FRACTION ONE HALF
-   (#xBE ?\u038E) ;; GREEK CAPITAL LETTER UPSILON WITH TONOS
-   (#xBF ?\u038F) ;; GREEK CAPITAL LETTER OMEGA WITH TONOS
-   (#xC0 ?\u0390) ;; GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-   (#xC1 ?\u0391) ;; GREEK CAPITAL LETTER ALPHA
-   (#xC2 ?\u0392) ;; GREEK CAPITAL LETTER BETA
-   (#xC3 ?\u0393) ;; GREEK CAPITAL LETTER GAMMA
-   (#xC4 ?\u0394) ;; GREEK CAPITAL LETTER DELTA
-   (#xC5 ?\u0395) ;; GREEK CAPITAL LETTER EPSILON
-   (#xC6 ?\u0396) ;; GREEK CAPITAL LETTER ZETA
-   (#xC7 ?\u0397) ;; GREEK CAPITAL LETTER ETA
-   (#xC8 ?\u0398) ;; GREEK CAPITAL LETTER THETA
-   (#xC9 ?\u0399) ;; GREEK CAPITAL LETTER IOTA
-   (#xCA ?\u039A) ;; GREEK CAPITAL LETTER KAPPA
-   (#xCB ?\u039B) ;; GREEK CAPITAL LETTER LAMDA
-   (#xCC ?\u039C) ;; GREEK CAPITAL LETTER MU
-   (#xCD ?\u039D) ;; GREEK CAPITAL LETTER NU
-   (#xCE ?\u039E) ;; GREEK CAPITAL LETTER XI
-   (#xCF ?\u039F) ;; GREEK CAPITAL LETTER OMICRON
-   (#xD0 ?\u03A0) ;; GREEK CAPITAL LETTER PI
-   (#xD1 ?\u03A1) ;; GREEK CAPITAL LETTER RHO
-   (#xD3 ?\u03A3) ;; GREEK CAPITAL LETTER SIGMA
-   (#xD4 ?\u03A4) ;; GREEK CAPITAL LETTER TAU
-   (#xD5 ?\u03A5) ;; GREEK CAPITAL LETTER UPSILON
-   (#xD6 ?\u03A6) ;; GREEK CAPITAL LETTER PHI
-   (#xD7 ?\u03A7) ;; GREEK CAPITAL LETTER CHI
-   (#xD8 ?\u03A8) ;; GREEK CAPITAL LETTER PSI
-   (#xD9 ?\u03A9) ;; GREEK CAPITAL LETTER OMEGA
-   (#xDA ?\u03AA) ;; GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-   (#xDB ?\u03AB) ;; GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-   (#xDC ?\u03AC) ;; GREEK SMALL LETTER ALPHA WITH TONOS
-   (#xDD ?\u03AD) ;; GREEK SMALL LETTER EPSILON WITH TONOS
-   (#xDE ?\u03AE) ;; GREEK SMALL LETTER ETA WITH TONOS
-   (#xDF ?\u03AF) ;; GREEK SMALL LETTER IOTA WITH TONOS
-   (#xE0 ?\u03B0) ;; GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-   (#xE1 ?\u03B1) ;; GREEK SMALL LETTER ALPHA
-   (#xE2 ?\u03B2) ;; GREEK SMALL LETTER BETA
-   (#xE3 ?\u03B3) ;; GREEK SMALL LETTER GAMMA
-   (#xE4 ?\u03B4) ;; GREEK SMALL LETTER DELTA
-   (#xE5 ?\u03B5) ;; GREEK SMALL LETTER EPSILON
-   (#xE6 ?\u03B6) ;; GREEK SMALL LETTER ZETA
-   (#xE7 ?\u03B7) ;; GREEK SMALL LETTER ETA
-   (#xE8 ?\u03B8) ;; GREEK SMALL LETTER THETA
-   (#xE9 ?\u03B9) ;; GREEK SMALL LETTER IOTA
-   (#xEA ?\u03BA) ;; GREEK SMALL LETTER KAPPA
-   (#xEB ?\u03BB) ;; GREEK SMALL LETTER LAMDA
-   (#xEC ?\u03BC) ;; GREEK SMALL LETTER MU
-   (#xED ?\u03BD) ;; GREEK SMALL LETTER NU
-   (#xEE ?\u03BE) ;; GREEK SMALL LETTER XI
-   (#xEF ?\u03BF) ;; GREEK SMALL LETTER OMICRON
-   (#xF0 ?\u03C0) ;; GREEK SMALL LETTER PI
-   (#xF1 ?\u03C1) ;; GREEK SMALL LETTER RHO
-   (#xF2 ?\u03C2) ;; GREEK SMALL LETTER FINAL SIGMA
-   (#xF3 ?\u03C3) ;; GREEK SMALL LETTER SIGMA
-   (#xF4 ?\u03C4) ;; GREEK SMALL LETTER TAU
-   (#xF5 ?\u03C5) ;; GREEK SMALL LETTER UPSILON
-   (#xF6 ?\u03C6) ;; GREEK SMALL LETTER PHI
-   (#xF7 ?\u03C7) ;; GREEK SMALL LETTER CHI
-   (#xF8 ?\u03C8) ;; GREEK SMALL LETTER PSI
-   (#xF9 ?\u03C9) ;; GREEK SMALL LETTER OMEGA
-   (#xFA ?\u03CA) ;; GREEK SMALL LETTER IOTA WITH DIALYTIKA
-   (#xFB ?\u03CB) ;; GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-   (#xFC ?\u03CC) ;; GREEK SMALL LETTER OMICRON WITH TONOS
-   (#xFD ?\u03CD) ;; GREEK SMALL LETTER UPSILON WITH TONOS
-   (#xFE ?\u03CE));; GREEK SMALL LETTER OMEGA WITH TONOS
- "ISO-8859-7 (Greek)"
- '(mnemonic "Grk"
+(make-coding-system
+ 'iso-8859-7 'fixed-width "ISO-8859-7 (Greek)"
+ '(unicode-map
+   ((#x80 ?\u0080) ;; <control>
+    (#x81 ?\u0081) ;; <control>
+    (#x82 ?\u0082) ;; <control>
+    (#x83 ?\u0083) ;; <control>
+    (#x84 ?\u0084) ;; <control>
+    (#x85 ?\u0085) ;; <control>
+    (#x86 ?\u0086) ;; <control>
+    (#x87 ?\u0087) ;; <control>
+    (#x88 ?\u0088) ;; <control>
+    (#x89 ?\u0089) ;; <control>
+    (#x8A ?\u008A) ;; <control>
+    (#x8B ?\u008B) ;; <control>
+    (#x8C ?\u008C) ;; <control>
+    (#x8D ?\u008D) ;; <control>
+    (#x8E ?\u008E) ;; <control>
+    (#x8F ?\u008F) ;; <control>
+    (#x90 ?\u0090) ;; <control>
+    (#x91 ?\u0091) ;; <control>
+    (#x92 ?\u0092) ;; <control>
+    (#x93 ?\u0093) ;; <control>
+    (#x94 ?\u0094) ;; <control>
+    (#x95 ?\u0095) ;; <control>
+    (#x96 ?\u0096) ;; <control>
+    (#x97 ?\u0097) ;; <control>
+    (#x98 ?\u0098) ;; <control>
+    (#x99 ?\u0099) ;; <control>
+    (#x9A ?\u009A) ;; <control>
+    (#x9B ?\u009B) ;; <control>
+    (#x9C ?\u009C) ;; <control>
+    (#x9D ?\u009D) ;; <control>
+    (#x9E ?\u009E) ;; <control>
+    (#x9F ?\u009F) ;; <control>
+    (#xA0 ?\u00A0) ;; NO-BREAK SPACE
+    (#xA1 ?\u2018) ;; LEFT SINGLE QUOTATION MARK
+    (#xA2 ?\u2019) ;; RIGHT SINGLE QUOTATION MARK
+    (#xA3 ?\u00A3) ;; POUND SIGN
+    (#xA4 ?\u20AC) ;; EURO SIGN
+    (#xA5 ?\u20AF) ;; DRACHMA SIGN
+    (#xA6 ?\u00A6) ;; BROKEN BAR
+    (#xA7 ?\u00A7) ;; SECTION SIGN
+    (#xA8 ?\u00A8) ;; DIAERESIS
+    (#xA9 ?\u00A9) ;; COPYRIGHT SIGN
+    (#xAA ?\u037A) ;; GREEK YPOGEGRAMMENI
+    (#xAB ?\u00AB) ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+    (#xAC ?\u00AC) ;; NOT SIGN
+    (#xAD ?\u00AD) ;; SOFT HYPHEN
+    (#xAF ?\u2015) ;; HORIZONTAL BAR
+    (#xB0 ?\u00B0) ;; DEGREE SIGN
+    (#xB1 ?\u00B1) ;; PLUS-MINUS SIGN
+    (#xB2 ?\u00B2) ;; SUPERSCRIPT TWO
+    (#xB3 ?\u00B3) ;; SUPERSCRIPT THREE
+    (#xB4 ?\u0384) ;; GREEK TONOS
+    (#xB5 ?\u0385) ;; GREEK DIALYTIKA TONOS
+    (#xB6 ?\u0386) ;; GREEK CAPITAL LETTER ALPHA WITH TONOS
+    (#xB7 ?\u00B7) ;; MIDDLE DOT
+    (#xB8 ?\u0388) ;; GREEK CAPITAL LETTER EPSILON WITH TONOS
+    (#xB9 ?\u0389) ;; GREEK CAPITAL LETTER ETA WITH TONOS
+    (#xBA ?\u038A) ;; GREEK CAPITAL LETTER IOTA WITH TONOS
+    (#xBB ?\u00BB) ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+    (#xBC ?\u038C) ;; GREEK CAPITAL LETTER OMICRON WITH TONOS
+    (#xBD ?\u00BD) ;; VULGAR FRACTION ONE HALF
+    (#xBE ?\u038E) ;; GREEK CAPITAL LETTER UPSILON WITH TONOS
+    (#xBF ?\u038F) ;; GREEK CAPITAL LETTER OMEGA WITH TONOS
+    (#xC0 ?\u0390) ;; GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+    (#xC1 ?\u0391) ;; GREEK CAPITAL LETTER ALPHA
+    (#xC2 ?\u0392) ;; GREEK CAPITAL LETTER BETA
+    (#xC3 ?\u0393) ;; GREEK CAPITAL LETTER GAMMA
+    (#xC4 ?\u0394) ;; GREEK CAPITAL LETTER DELTA
+    (#xC5 ?\u0395) ;; GREEK CAPITAL LETTER EPSILON
+    (#xC6 ?\u0396) ;; GREEK CAPITAL LETTER ZETA
+    (#xC7 ?\u0397) ;; GREEK CAPITAL LETTER ETA
+    (#xC8 ?\u0398) ;; GREEK CAPITAL LETTER THETA
+    (#xC9 ?\u0399) ;; GREEK CAPITAL LETTER IOTA
+    (#xCA ?\u039A) ;; GREEK CAPITAL LETTER KAPPA
+    (#xCB ?\u039B) ;; GREEK CAPITAL LETTER LAMDA
+    (#xCC ?\u039C) ;; GREEK CAPITAL LETTER MU
+    (#xCD ?\u039D) ;; GREEK CAPITAL LETTER NU
+    (#xCE ?\u039E) ;; GREEK CAPITAL LETTER XI
+    (#xCF ?\u039F) ;; GREEK CAPITAL LETTER OMICRON
+    (#xD0 ?\u03A0) ;; GREEK CAPITAL LETTER PI
+    (#xD1 ?\u03A1) ;; GREEK CAPITAL LETTER RHO
+    (#xD3 ?\u03A3) ;; GREEK CAPITAL LETTER SIGMA
+    (#xD4 ?\u03A4) ;; GREEK CAPITAL LETTER TAU
+    (#xD5 ?\u03A5) ;; GREEK CAPITAL LETTER UPSILON
+    (#xD6 ?\u03A6) ;; GREEK CAPITAL LETTER PHI
+    (#xD7 ?\u03A7) ;; GREEK CAPITAL LETTER CHI
+    (#xD8 ?\u03A8) ;; GREEK CAPITAL LETTER PSI
+    (#xD9 ?\u03A9) ;; GREEK CAPITAL LETTER OMEGA
+    (#xDA ?\u03AA) ;; GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+    (#xDB ?\u03AB) ;; GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+    (#xDC ?\u03AC) ;; GREEK SMALL LETTER ALPHA WITH TONOS
+    (#xDD ?\u03AD) ;; GREEK SMALL LETTER EPSILON WITH TONOS
+    (#xDE ?\u03AE) ;; GREEK SMALL LETTER ETA WITH TONOS
+    (#xDF ?\u03AF) ;; GREEK SMALL LETTER IOTA WITH TONOS
+    (#xE0 ?\u03B0) ;; GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+    (#xE1 ?\u03B1) ;; GREEK SMALL LETTER ALPHA
+    (#xE2 ?\u03B2) ;; GREEK SMALL LETTER BETA
+    (#xE3 ?\u03B3) ;; GREEK SMALL LETTER GAMMA
+    (#xE4 ?\u03B4) ;; GREEK SMALL LETTER DELTA
+    (#xE5 ?\u03B5) ;; GREEK SMALL LETTER EPSILON
+    (#xE6 ?\u03B6) ;; GREEK SMALL LETTER ZETA
+    (#xE7 ?\u03B7) ;; GREEK SMALL LETTER ETA
+    (#xE8 ?\u03B8) ;; GREEK SMALL LETTER THETA
+    (#xE9 ?\u03B9) ;; GREEK SMALL LETTER IOTA
+    (#xEA ?\u03BA) ;; GREEK SMALL LETTER KAPPA
+    (#xEB ?\u03BB) ;; GREEK SMALL LETTER LAMDA
+    (#xEC ?\u03BC) ;; GREEK SMALL LETTER MU
+    (#xED ?\u03BD) ;; GREEK SMALL LETTER NU
+    (#xEE ?\u03BE) ;; GREEK SMALL LETTER XI
+    (#xEF ?\u03BF) ;; GREEK SMALL LETTER OMICRON
+    (#xF0 ?\u03C0) ;; GREEK SMALL LETTER PI
+    (#xF1 ?\u03C1) ;; GREEK SMALL LETTER RHO
+    (#xF2 ?\u03C2) ;; GREEK SMALL LETTER FINAL SIGMA
+    (#xF3 ?\u03C3) ;; GREEK SMALL LETTER SIGMA
+    (#xF4 ?\u03C4) ;; GREEK SMALL LETTER TAU
+    (#xF5 ?\u03C5) ;; GREEK SMALL LETTER UPSILON
+    (#xF6 ?\u03C6) ;; GREEK SMALL LETTER PHI
+    (#xF7 ?\u03C7) ;; GREEK SMALL LETTER CHI
+    (#xF8 ?\u03C8) ;; GREEK SMALL LETTER PSI
+    (#xF9 ?\u03C9) ;; GREEK SMALL LETTER OMEGA
+    (#xFA ?\u03CA) ;; GREEK SMALL LETTER IOTA WITH DIALYTIKA
+    (#xFB ?\u03CB) ;; GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+    (#xFC ?\u03CC) ;; GREEK SMALL LETTER OMICRON WITH TONOS
+    (#xFD ?\u03CD) ;; GREEK SMALL LETTER UPSILON WITH TONOS
+    (#xFE ?\u03CE)) ;; GREEK SMALL LETTER OMEGA WITH TONOS
+   mnemonic "Grk"
    aliases (greek-iso-8bit)))
 
-(make-8-bit-coding-system 
- 'windows-1253
- '((#x80 ?\u20AC) ;; EURO SIGN
-   (#x82 ?\u201A) ;; SINGLE LOW-9 QUOTATION MARK
-   (#x83 ?\u0192) ;; LATIN SMALL LETTER F WITH HOOK
-   (#x84 ?\u201E) ;; DOUBLE LOW-9 QUOTATION MARK
-   (#x85 ?\u2026) ;; HORIZONTAL ELLIPSIS
-   (#x86 ?\u2020) ;; DAGGER
-   (#x87 ?\u2021) ;; DOUBLE DAGGER
-   (#x89 ?\u2030) ;; PER MILLE SIGN
-   (#x8B ?\u2039) ;; SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-   (#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
-   (#x9B ?\u203A) ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-   (#xA0 ?\u00A0) ;; NO-BREAK SPACE
-   (#xA1 ?\u0385) ;; GREEK DIALYTIKA TONOS
-   (#xA2 ?\u0386) ;; GREEK CAPITAL LETTER ALPHA WITH TONOS
-   (#xA3 ?\u00A3) ;; POUND SIGN
-   (#xA4 ?\u00A4) ;; CURRENCY SIGN
-   (#xA5 ?\u00A5) ;; YEN SIGN
-   (#xA6 ?\u00A6) ;; BROKEN BAR
-   (#xA7 ?\u00A7) ;; SECTION SIGN
-   (#xA8 ?\u00A8) ;; DIAERESIS
-   (#xA9 ?\u00A9) ;; COPYRIGHT SIGN
-   (#xAB ?\u00AB) ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-   (#xAC ?\u00AC) ;; NOT SIGN
-   (#xAD ?\u00AD) ;; SOFT HYPHEN
-   (#xAE ?\u00AE) ;; REGISTERED SIGN
-   (#xAF ?\u2015) ;; HORIZONTAL BAR
-   (#xB0 ?\u00B0) ;; DEGREE SIGN
-   (#xB1 ?\u00B1) ;; PLUS-MINUS SIGN
-   (#xB2 ?\u00B2) ;; SUPERSCRIPT TWO
-   (#xB3 ?\u00B3) ;; SUPERSCRIPT THREE
-   (#xB4 ?\u0384) ;; GREEK TONOS
-   (#xB5 ?\u00B5) ;; MICRO SIGN
-   (#xB6 ?\u00B6) ;; PILCROW SIGN
-   (#xB7 ?\u00B7) ;; MIDDLE DOT
-   (#xB8 ?\u0388) ;; GREEK CAPITAL LETTER EPSILON WITH TONOS
-   (#xB9 ?\u0389) ;; GREEK CAPITAL LETTER ETA WITH TONOS
-   (#xBA ?\u038A) ;; GREEK CAPITAL LETTER IOTA WITH TONOS
-   (#xBB ?\u00BB) ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-   (#xBC ?\u038C) ;; GREEK CAPITAL LETTER OMICRON WITH TONOS
-   (#xBD ?\u00BD) ;; VULGAR FRACTION ONE HALF
-   (#xBE ?\u038E) ;; GREEK CAPITAL LETTER UPSILON WITH TONOS
-   (#xBF ?\u038F) ;; GREEK CAPITAL LETTER OMEGA WITH TONOS
-   (#xC0 ?\u0390) ;; GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-   (#xC1 ?\u0391) ;; GREEK CAPITAL LETTER ALPHA
-   (#xC2 ?\u0392) ;; GREEK CAPITAL LETTER BETA
-   (#xC3 ?\u0393) ;; GREEK CAPITAL LETTER GAMMA
-   (#xC4 ?\u0394) ;; GREEK CAPITAL LETTER DELTA
-   (#xC5 ?\u0395) ;; GREEK CAPITAL LETTER EPSILON
-   (#xC6 ?\u0396) ;; GREEK CAPITAL LETTER ZETA
-   (#xC7 ?\u0397) ;; GREEK CAPITAL LETTER ETA
-   (#xC8 ?\u0398) ;; GREEK CAPITAL LETTER THETA
-   (#xC9 ?\u0399) ;; GREEK CAPITAL LETTER IOTA
-   (#xCA ?\u039A) ;; GREEK CAPITAL LETTER KAPPA
-   (#xCB ?\u039B) ;; GREEK CAPITAL LETTER LAMDA
-   (#xCC ?\u039C) ;; GREEK CAPITAL LETTER MU
-   (#xCD ?\u039D) ;; GREEK CAPITAL LETTER NU
-   (#xCE ?\u039E) ;; GREEK CAPITAL LETTER XI
-   (#xCF ?\u039F) ;; GREEK CAPITAL LETTER OMICRON
-   (#xD0 ?\u03A0) ;; GREEK CAPITAL LETTER PI
-   (#xD1 ?\u03A1) ;; GREEK CAPITAL LETTER RHO
-   (#xD3 ?\u03A3) ;; GREEK CAPITAL LETTER SIGMA
-   (#xD4 ?\u03A4) ;; GREEK CAPITAL LETTER TAU
-   (#xD5 ?\u03A5) ;; GREEK CAPITAL LETTER UPSILON
-   (#xD6 ?\u03A6) ;; GREEK CAPITAL LETTER PHI
-   (#xD7 ?\u03A7) ;; GREEK CAPITAL LETTER CHI
-   (#xD8 ?\u03A8) ;; GREEK CAPITAL LETTER PSI
-   (#xD9 ?\u03A9) ;; GREEK CAPITAL LETTER OMEGA
-   (#xDA ?\u03AA) ;; GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-   (#xDB ?\u03AB) ;; GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-   (#xDC ?\u03AC) ;; GREEK SMALL LETTER ALPHA WITH TONOS
-   (#xDD ?\u03AD) ;; GREEK SMALL LETTER EPSILON WITH TONOS
-   (#xDE ?\u03AE) ;; GREEK SMALL LETTER ETA WITH TONOS
-   (#xDF ?\u03AF) ;; GREEK SMALL LETTER IOTA WITH TONOS
-   (#xE0 ?\u03B0) ;; GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-   (#xE1 ?\u03B1) ;; GREEK SMALL LETTER ALPHA
-   (#xE2 ?\u03B2) ;; GREEK SMALL LETTER BETA
-   (#xE3 ?\u03B3) ;; GREEK SMALL LETTER GAMMA
-   (#xE4 ?\u03B4) ;; GREEK SMALL LETTER DELTA
-   (#xE5 ?\u03B5) ;; GREEK SMALL LETTER EPSILON
-   (#xE6 ?\u03B6) ;; GREEK SMALL LETTER ZETA
-   (#xE7 ?\u03B7) ;; GREEK SMALL LETTER ETA
-   (#xE8 ?\u03B8) ;; GREEK SMALL LETTER THETA
-   (#xE9 ?\u03B9) ;; GREEK SMALL LETTER IOTA
-   (#xEA ?\u03BA) ;; GREEK SMALL LETTER KAPPA
-   (#xEB ?\u03BB) ;; GREEK SMALL LETTER LAMDA
-   (#xEC ?\u03BC) ;; GREEK SMALL LETTER MU
-   (#xED ?\u03BD) ;; GREEK SMALL LETTER NU
-   (#xEE ?\u03BE) ;; GREEK SMALL LETTER XI
-   (#xEF ?\u03BF) ;; GREEK SMALL LETTER OMICRON
-   (#xF0 ?\u03C0) ;; GREEK SMALL LETTER PI
-   (#xF1 ?\u03C1) ;; GREEK SMALL LETTER RHO
-   (#xF2 ?\u03C2) ;; GREEK SMALL LETTER FINAL SIGMA
-   (#xF3 ?\u03C3) ;; GREEK SMALL LETTER SIGMA
-   (#xF4 ?\u03C4) ;; GREEK SMALL LETTER TAU
-   (#xF5 ?\u03C5) ;; GREEK SMALL LETTER UPSILON
-   (#xF6 ?\u03C6) ;; GREEK SMALL LETTER PHI
-   (#xF7 ?\u03C7) ;; GREEK SMALL LETTER CHI
-   (#xF8 ?\u03C8) ;; GREEK SMALL LETTER PSI
-   (#xF9 ?\u03C9) ;; GREEK SMALL LETTER OMEGA
-   (#xFA ?\u03CA) ;; GREEK SMALL LETTER IOTA WITH DIALYTIKA
-   (#xFB ?\u03CB) ;; GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-   (#xFC ?\u03CC) ;; GREEK SMALL LETTER OMICRON WITH TONOS
-   (#xFD ?\u03CD) ;; GREEK SMALL LETTER UPSILON WITH TONOS
-   (#xFE ?\u03CE)) ;; GREEK SMALL LETTER OMEGA WITH TONOS
- "Microsoft's Code Page 1253, for monotonic Greek.  "
- '(mnemonic "GrkW"
+(make-coding-system 
+ 'windows-1253 'fixed-width "Microsoft's CP1253"
+ '(unicode-map
+   ((#x80 ?\u20AC) ;; EURO SIGN
+    (#x82 ?\u201A) ;; SINGLE LOW-9 QUOTATION MARK
+    (#x83 ?\u0192) ;; LATIN SMALL LETTER F WITH HOOK
+    (#x84 ?\u201E) ;; DOUBLE LOW-9 QUOTATION MARK
+    (#x85 ?\u2026) ;; HORIZONTAL ELLIPSIS
+    (#x86 ?\u2020) ;; DAGGER
+    (#x87 ?\u2021) ;; DOUBLE DAGGER
+    (#x89 ?\u2030) ;; PER MILLE SIGN
+    (#x8B ?\u2039) ;; SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+    (#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
+    (#x9B ?\u203A) ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+    (#xA0 ?\u00A0) ;; NO-BREAK SPACE
+    (#xA1 ?\u0385) ;; GREEK DIALYTIKA TONOS
+    (#xA2 ?\u0386) ;; GREEK CAPITAL LETTER ALPHA WITH TONOS
+    (#xA3 ?\u00A3) ;; POUND SIGN
+    (#xA4 ?\u00A4) ;; CURRENCY SIGN
+    (#xA5 ?\u00A5) ;; YEN SIGN
+    (#xA6 ?\u00A6) ;; BROKEN BAR
+    (#xA7 ?\u00A7) ;; SECTION SIGN
+    (#xA8 ?\u00A8) ;; DIAERESIS
+    (#xA9 ?\u00A9) ;; COPYRIGHT SIGN
+    (#xAB ?\u00AB) ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+    (#xAC ?\u00AC) ;; NOT SIGN
+    (#xAD ?\u00AD) ;; SOFT HYPHEN
+    (#xAE ?\u00AE) ;; REGISTERED SIGN
+    (#xAF ?\u2015) ;; HORIZONTAL BAR
+    (#xB0 ?\u00B0) ;; DEGREE SIGN
+    (#xB1 ?\u00B1) ;; PLUS-MINUS SIGN
+    (#xB2 ?\u00B2) ;; SUPERSCRIPT TWO
+    (#xB3 ?\u00B3) ;; SUPERSCRIPT THREE
+    (#xB4 ?\u0384) ;; GREEK TONOS
+    (#xB5 ?\u00B5) ;; MICRO SIGN
+    (#xB6 ?\u00B6) ;; PILCROW SIGN
+    (#xB7 ?\u00B7) ;; MIDDLE DOT
+    (#xB8 ?\u0388) ;; GREEK CAPITAL LETTER EPSILON WITH TONOS
+    (#xB9 ?\u0389) ;; GREEK CAPITAL LETTER ETA WITH TONOS
+    (#xBA ?\u038A) ;; GREEK CAPITAL LETTER IOTA WITH TONOS
+    (#xBB ?\u00BB) ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+    (#xBC ?\u038C) ;; GREEK CAPITAL LETTER OMICRON WITH TONOS
+    (#xBD ?\u00BD) ;; VULGAR FRACTION ONE HALF
+    (#xBE ?\u038E) ;; GREEK CAPITAL LETTER UPSILON WITH TONOS
+    (#xBF ?\u038F) ;; GREEK CAPITAL LETTER OMEGA WITH TONOS
+    (#xC0 ?\u0390) ;; GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+    (#xC1 ?\u0391) ;; GREEK CAPITAL LETTER ALPHA
+    (#xC2 ?\u0392) ;; GREEK CAPITAL LETTER BETA
+    (#xC3 ?\u0393) ;; GREEK CAPITAL LETTER GAMMA
+    (#xC4 ?\u0394) ;; GREEK CAPITAL LETTER DELTA
+    (#xC5 ?\u0395) ;; GREEK CAPITAL LETTER EPSILON
+    (#xC6 ?\u0396) ;; GREEK CAPITAL LETTER ZETA
+    (#xC7 ?\u0397) ;; GREEK CAPITAL LETTER ETA
+    (#xC8 ?\u0398) ;; GREEK CAPITAL LETTER THETA
+    (#xC9 ?\u0399) ;; GREEK CAPITAL LETTER IOTA
+    (#xCA ?\u039A) ;; GREEK CAPITAL LETTER KAPPA
+    (#xCB ?\u039B) ;; GREEK CAPITAL LETTER LAMDA
+    (#xCC ?\u039C) ;; GREEK CAPITAL LETTER MU
+    (#xCD ?\u039D) ;; GREEK CAPITAL LETTER NU
+    (#xCE ?\u039E) ;; GREEK CAPITAL LETTER XI
+    (#xCF ?\u039F) ;; GREEK CAPITAL LETTER OMICRON
+    (#xD0 ?\u03A0) ;; GREEK CAPITAL LETTER PI
+    (#xD1 ?\u03A1) ;; GREEK CAPITAL LETTER RHO
+    (#xD3 ?\u03A3) ;; GREEK CAPITAL LETTER SIGMA
+    (#xD4 ?\u03A4) ;; GREEK CAPITAL LETTER TAU
+    (#xD5 ?\u03A5) ;; GREEK CAPITAL LETTER UPSILON
+    (#xD6 ?\u03A6) ;; GREEK CAPITAL LETTER PHI
+    (#xD7 ?\u03A7) ;; GREEK CAPITAL LETTER CHI
+    (#xD8 ?\u03A8) ;; GREEK CAPITAL LETTER PSI
+    (#xD9 ?\u03A9) ;; GREEK CAPITAL LETTER OMEGA
+    (#xDA ?\u03AA) ;; GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+    (#xDB ?\u03AB) ;; GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+    (#xDC ?\u03AC) ;; GREEK SMALL LETTER ALPHA WITH TONOS
+    (#xDD ?\u03AD) ;; GREEK SMALL LETTER EPSILON WITH TONOS
+    (#xDE ?\u03AE) ;; GREEK SMALL LETTER ETA WITH TONOS
+    (#xDF ?\u03AF) ;; GREEK SMALL LETTER IOTA WITH TONOS
+    (#xE0 ?\u03B0) ;; GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+    (#xE1 ?\u03B1) ;; GREEK SMALL LETTER ALPHA
+    (#xE2 ?\u03B2) ;; GREEK SMALL LETTER BETA
+    (#xE3 ?\u03B3) ;; GREEK SMALL LETTER GAMMA
+    (#xE4 ?\u03B4) ;; GREEK SMALL LETTER DELTA
+    (#xE5 ?\u03B5) ;; GREEK SMALL LETTER EPSILON
+    (#xE6 ?\u03B6) ;; GREEK SMALL LETTER ZETA
+    (#xE7 ?\u03B7) ;; GREEK SMALL LETTER ETA
+    (#xE8 ?\u03B8) ;; GREEK SMALL LETTER THETA
+    (#xE9 ?\u03B9) ;; GREEK SMALL LETTER IOTA
+    (#xEA ?\u03BA) ;; GREEK SMALL LETTER KAPPA
+    (#xEB ?\u03BB) ;; GREEK SMALL LETTER LAMDA
+    (#xEC ?\u03BC) ;; GREEK SMALL LETTER MU
+    (#xED ?\u03BD) ;; GREEK SMALL LETTER NU
+    (#xEE ?\u03BE) ;; GREEK SMALL LETTER XI
+    (#xEF ?\u03BF) ;; GREEK SMALL LETTER OMICRON
+    (#xF0 ?\u03C0) ;; GREEK SMALL LETTER PI
+    (#xF1 ?\u03C1) ;; GREEK SMALL LETTER RHO
+    (#xF2 ?\u03C2) ;; GREEK SMALL LETTER FINAL SIGMA
+    (#xF3 ?\u03C3) ;; GREEK SMALL LETTER SIGMA
+    (#xF4 ?\u03C4) ;; GREEK SMALL LETTER TAU
+    (#xF5 ?\u03C5) ;; GREEK SMALL LETTER UPSILON
+    (#xF6 ?\u03C6) ;; GREEK SMALL LETTER PHI
+    (#xF7 ?\u03C7) ;; GREEK SMALL LETTER CHI
+    (#xF8 ?\u03C8) ;; GREEK SMALL LETTER PSI
+    (#xF9 ?\u03C9) ;; GREEK SMALL LETTER OMEGA
+    (#xFA ?\u03CA) ;; GREEK SMALL LETTER IOTA WITH DIALYTIKA
+    (#xFB ?\u03CB) ;; GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+    (#xFC ?\u03CC) ;; GREEK SMALL LETTER OMICRON WITH TONOS
+    (#xFD ?\u03CD) ;; GREEK SMALL LETTER UPSILON WITH TONOS
+    (#xFE ?\u03CE)) ;; GREEK SMALL LETTER OMEGA WITH TONOS
+   mnemonic "GrkW"
    documentation
-   "This ASCII-compatible encoding is slightly incompatibile with
+   "Microsoft's Code Page 1253, for monotonic Greek.
+
+This ASCII-compatible encoding is slightly incompatibile with
 ISO-8859-7; it provides several widely-used punctuation marks in the C1
 ISO-2022 area, which makes it incompatbile with the latter standard, but
 that latter standard is not used in Greece,  "