--- a/lisp/mule/arabic.el	Sun Aug 03 23:21:31 2008 +0200
+++ b/lisp/mule/arabic.el	Sun Aug 10 23:24:15 2008 +0200
@@ -28,79 +28,204 @@
 
 ;;; Code:
 
-; (make-charset 'arabic-iso8859-6 
-; 	      "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
-; 	      '(dimension
-; 		1
-; 		registry "ISO8859-6"
-; 		chars 96
-; 		columns 1
-; 		direction r2l
-; 		final ?G
-; 		graphic 1
-; 		short-name "RHP of ISO8859/6"
-; 		long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"
-; 		))
+;; See iso-with-esc.el for commentary on the ISO standard Arabic character
+;; set.
 
-;; For Arabic, we need three different types of character sets.
-;; Digits are of direction left-to-right and of width 1-column.
-;; Others are of direction right-to-left and of width 1-column or
-;; 2-column.
-(make-charset 'arabic-digit "Arabic digit"
-	      '(dimension 1
-		registries ["MuleArabic-0"]
-		chars 94
-		columns 1
-		direction l2r
-		final ?2
-		graphic 0
-		short-name "Arabic digit"
-		long-name "Arabic digit"
-		))
+(make-8-bit-coding-system
+ 'iso-8859-6
+ '((#xA0 ?\u00A0) ;; NO-BREAK SPACE
+   (#xA4 ?\u00A4) ;; CURRENCY SIGN
+   (#xAC ?\u060C) ;; ARABIC COMMA
+   (#xAD ?\u00AD) ;; SOFT HYPHEN
+   (#xBB ?\u061B) ;; ARABIC SEMICOLON
+   (#xBF ?\u061F) ;; ARABIC QUESTION MARK
+   (#xC1 ?\u0621) ;; ARABIC LETTER HAMZA
+   (#xC2 ?\u0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE
+   (#xC3 ?\u0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE
+   (#xC4 ?\u0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE
+   (#xC5 ?\u0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW
+   (#xC6 ?\u0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE
+   (#xC7 ?\u0627) ;; ARABIC LETTER ALEF
+   (#xC8 ?\u0628) ;; ARABIC LETTER BEH
+   (#xC9 ?\u0629) ;; ARABIC LETTER TEH MARBUTA
+   (#xCA ?\u062A) ;; ARABIC LETTER TEH
+   (#xCB ?\u062B) ;; ARABIC LETTER THEH
+   (#xCC ?\u062C) ;; ARABIC LETTER JEEM
+   (#xCD ?\u062D) ;; ARABIC LETTER HAH
+   (#xCE ?\u062E) ;; ARABIC LETTER KHAH
+   (#xCF ?\u062F) ;; ARABIC LETTER DAL
+   (#xD0 ?\u0630) ;; ARABIC LETTER THAL
+   (#xD1 ?\u0631) ;; ARABIC LETTER REH
+   (#xD2 ?\u0632) ;; ARABIC LETTER ZAIN
+   (#xD3 ?\u0633) ;; ARABIC LETTER SEEN
+   (#xD4 ?\u0634) ;; ARABIC LETTER SHEEN
+   (#xD5 ?\u0635) ;; ARABIC LETTER SAD
+   (#xD6 ?\u0636) ;; ARABIC LETTER DAD
+   (#xD7 ?\u0637) ;; ARABIC LETTER TAH
+   (#xD8 ?\u0638) ;; ARABIC LETTER ZAH
+   (#xD9 ?\u0639) ;; ARABIC LETTER AIN
+   (#xDA ?\u063A) ;; ARABIC LETTER GHAIN
+   (#xE0 ?\u0640) ;; ARABIC TATWEEL
+   (#xE1 ?\u0641) ;; ARABIC LETTER FEH
+   (#xE2 ?\u0642) ;; ARABIC LETTER QAF
+   (#xE3 ?\u0643) ;; ARABIC LETTER KAF
+   (#xE4 ?\u0644) ;; ARABIC LETTER LAM
+   (#xE5 ?\u0645) ;; ARABIC LETTER MEEM
+   (#xE6 ?\u0646) ;; ARABIC LETTER NOON
+   (#xE7 ?\u0647) ;; ARABIC LETTER HEH
+   (#xE8 ?\u0648) ;; ARABIC LETTER WAW
+   (#xE9 ?\u0649) ;; ARABIC LETTER ALEF MAKSURA
+   (#xEA ?\u064A) ;; ARABIC LETTER YEH
+   (#xEB ?\u064B) ;; ARABIC FATHATAN
+   (#xEC ?\u064C) ;; ARABIC DAMMATAN
+   (#xED ?\u064D) ;; ARABIC KASRATAN
+   (#xEE ?\u064E) ;; ARABIC FATHA
+   (#xEF ?\u064F) ;; ARABIC DAMMA
+   (#xF0 ?\u0650) ;; ARABIC KASRA
+   (#xF1 ?\u0651) ;; ARABIC SHADDA
+   (#xF2 ?\u0652)) ;; ARABIC SUKUN
+ "ISO 8859-6 (Arabic)"
+'(mnemonic "ArISO"))
 
-(make-charset 'arabic-1-column "Arabic 1-column"
-	      '(dimension
-		1
-		registries ["MuleArabic-1"]
-		chars 94
-		columns 1
-		direction r2l
-		final ?3
-		graphic 0
-		short-name "Arabic 1-col"
-		long-name "Arabic 1-column"
-		))
+(make-8-bit-coding-system
+ 'windows-1256
+ '((#x80 ?\u20AC) ;; EURO SIGN
+   (#x81 ?\u067E) ;; ARABIC LETTER PEH
+   (#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
+   (#x88 ?\u02C6) ;; MODIFIER LETTER CIRCUMFLEX ACCENT
+   (#x89 ?\u2030) ;; PER MILLE SIGN
+   (#x8A ?\u0679) ;; ARABIC LETTER TTEH
+   (#x8B ?\u2039) ;; SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+   (#x8C ?\u0152) ;; LATIN CAPITAL LIGATURE OE
+   (#x8D ?\u0686) ;; ARABIC LETTER TCHEH
+   (#x8E ?\u0698) ;; ARABIC LETTER JEH
+   (#x8F ?\u0688) ;; ARABIC LETTER DDAL
+   (#x90 ?\u06AF) ;; ARABIC LETTER GAF
+   (#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
+   (#x98 ?\u06A9) ;; ARABIC LETTER KEHEH
+   (#x99 ?\u2122) ;; TRADE MARK SIGN
+   (#x9A ?\u0691) ;; ARABIC LETTER RREH
+   (#x9B ?\u203A) ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+   (#x9C ?\u0153) ;; LATIN SMALL LIGATURE OE
+   (#x9D ?\u200C) ;; ZERO WIDTH NON-JOINER
+   (#x9E ?\u200D) ;; ZERO WIDTH JOINER
+   (#x9F ?\u06BA) ;; ARABIC LETTER NOON GHUNNA
+   (#xA0 ?\u00A0) ;; NO-BREAK SPACE
+   (#xA1 ?\u060C) ;; ARABIC COMMA
+   (#xA2 ?\u00A2) ;; CENT SIGN
+   (#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
+   (#xAA ?\u06BE) ;; ARABIC LETTER HEH DOACHASHMEE
+   (#xAB ?\u00AB) ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+   (#xAC ?\u00AC) ;; NOT SIGN
+   (#xAD ?\u00AD) ;; SOFT HYPHEN
+   (#xAE ?\u00AE) ;; REGISTERED SIGN
+   (#xAF ?\u00AF) ;; MACRON
+   (#xB0 ?\u00B0) ;; DEGREE SIGN
+   (#xB1 ?\u00B1) ;; PLUS-MINUS SIGN
+   (#xB2 ?\u00B2) ;; SUPERSCRIPT TWO
+   (#xB3 ?\u00B3) ;; SUPERSCRIPT THREE
+   (#xB4 ?\u00B4) ;; ACUTE ACCENT
+   (#xB5 ?\u00B5) ;; MICRO SIGN
+   (#xB6 ?\u00B6) ;; PILCROW SIGN
+   (#xB7 ?\u00B7) ;; MIDDLE DOT
+   (#xB8 ?\u00B8) ;; CEDILLA
+   (#xB9 ?\u00B9) ;; SUPERSCRIPT ONE
+   (#xBA ?\u061B) ;; ARABIC SEMICOLON
+   (#xBB ?\u00BB) ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+   (#xBC ?\u00BC) ;; VULGAR FRACTION ONE QUARTER
+   (#xBD ?\u00BD) ;; VULGAR FRACTION ONE HALF
+   (#xBE ?\u00BE) ;; VULGAR FRACTION THREE QUARTERS
+   (#xBF ?\u061F) ;; ARABIC QUESTION MARK
+   (#xC0 ?\u06C1) ;; ARABIC LETTER HEH GOAL
+   (#xC1 ?\u0621) ;; ARABIC LETTER HAMZA
+   (#xC2 ?\u0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE
+   (#xC3 ?\u0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE
+   (#xC4 ?\u0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE
+   (#xC5 ?\u0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW
+   (#xC6 ?\u0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE
+   (#xC7 ?\u0627) ;; ARABIC LETTER ALEF
+   (#xC8 ?\u0628) ;; ARABIC LETTER BEH
+   (#xC9 ?\u0629) ;; ARABIC LETTER TEH MARBUTA
+   (#xCA ?\u062A) ;; ARABIC LETTER TEH
+   (#xCB ?\u062B) ;; ARABIC LETTER THEH
+   (#xCC ?\u062C) ;; ARABIC LETTER JEEM
+   (#xCD ?\u062D) ;; ARABIC LETTER HAH
+   (#xCE ?\u062E) ;; ARABIC LETTER KHAH
+   (#xCF ?\u062F) ;; ARABIC LETTER DAL
+   (#xD0 ?\u0630) ;; ARABIC LETTER THAL
+   (#xD1 ?\u0631) ;; ARABIC LETTER REH
+   (#xD2 ?\u0632) ;; ARABIC LETTER ZAIN
+   (#xD3 ?\u0633) ;; ARABIC LETTER SEEN
+   (#xD4 ?\u0634) ;; ARABIC LETTER SHEEN
+   (#xD5 ?\u0635) ;; ARABIC LETTER SAD
+   (#xD6 ?\u0636) ;; ARABIC LETTER DAD
+   (#xD7 ?\u00D7) ;; MULTIPLICATION SIGN
+   (#xD8 ?\u0637) ;; ARABIC LETTER TAH
+   (#xD9 ?\u0638) ;; ARABIC LETTER ZAH
+   (#xDA ?\u0639) ;; ARABIC LETTER AIN
+   (#xDB ?\u063A) ;; ARABIC LETTER GHAIN
+   (#xDC ?\u0640) ;; ARABIC TATWEEL
+   (#xDD ?\u0641) ;; ARABIC LETTER FEH
+   (#xDE ?\u0642) ;; ARABIC LETTER QAF
+   (#xDF ?\u0643) ;; ARABIC LETTER KAF
+   (#xE0 ?\u00E0) ;; LATIN SMALL LETTER A WITH GRAVE
+   (#xE1 ?\u0644) ;; ARABIC LETTER LAM
+   (#xE2 ?\u00E2) ;; LATIN SMALL LETTER A WITH CIRCUMFLEX
+   (#xE3 ?\u0645) ;; ARABIC LETTER MEEM
+   (#xE4 ?\u0646) ;; ARABIC LETTER NOON
+   (#xE5 ?\u0647) ;; ARABIC LETTER HEH
+   (#xE6 ?\u0648) ;; ARABIC LETTER WAW
+   (#xE7 ?\u00E7) ;; LATIN SMALL LETTER C WITH CEDILLA
+   (#xE8 ?\u00E8) ;; LATIN SMALL LETTER E WITH GRAVE
+   (#xE9 ?\u00E9) ;; LATIN SMALL LETTER E WITH ACUTE
+   (#xEA ?\u00EA) ;; LATIN SMALL LETTER E WITH CIRCUMFLEX
+   (#xEB ?\u00EB) ;; LATIN SMALL LETTER E WITH DIAERESIS
+   (#xEC ?\u0649) ;; ARABIC LETTER ALEF MAKSURA
+   (#xED ?\u064A) ;; ARABIC LETTER YEH
+   (#xEE ?\u00EE) ;; LATIN SMALL LETTER I WITH CIRCUMFLEX
+   (#xEF ?\u00EF) ;; LATIN SMALL LETTER I WITH DIAERESIS
+   (#xF0 ?\u064B) ;; ARABIC FATHATAN
+   (#xF1 ?\u064C) ;; ARABIC DAMMATAN
+   (#xF2 ?\u064D) ;; ARABIC KASRATAN
+   (#xF3 ?\u064E) ;; ARABIC FATHA
+   (#xF4 ?\u00F4) ;; LATIN SMALL LETTER O WITH CIRCUMFLEX
+   (#xF5 ?\u064F) ;; ARABIC DAMMA
+   (#xF6 ?\u0650) ;; ARABIC KASRA
+   (#xF7 ?\u00F7) ;; DIVISION SIGN
+   (#xF8 ?\u0651) ;; ARABIC SHADDA
+   (#xF9 ?\u00F9) ;; LATIN SMALL LETTER U WITH GRAVE
+   (#xFA ?\u0652) ;; ARABIC SUKUN
+   (#xFB ?\u00FB) ;; LATIN SMALL LETTER U WITH CIRCUMFLEX
+   (#xFC ?\u00FC) ;; LATIN SMALL LETTER U WITH DIAERESIS
+   (#xFD ?\u200E) ;; LEFT-TO-RIGHT MARK
+   (#xFE ?\u200F) ;; RIGHT-TO-LEFT MARK
+   (#xFF ?\u06D2));; ARABIC LETTER YEH BARREE
+ "Windows-1256 (Arabic)"
+ '(mnemonic "cp1256"
+   documentation
+   "This is the much Windows encoding for Arabic, much superior to the ISO
+standard one."
+   aliases (cp1256)))
 
-(make-charset 'arabic-2-column "Arabic 2-column"
-	      '(dimension
-		1
-		registries ["MuleArabic-2"]
-		chars 94
-		columns 2
-		direction r2l
-		final ?4
-		graphic 0
-		short-name "Arabic 2-col"
-		long-name "Arabic 2-column"
-		))
+;; The Mac Arabic coding systems don't have defined MIME names. 
 
-(make-coding-system 'iso-8859-6 'iso2022
-		    "ISO-8859-6 (Arabic)"
-		    '(charset-g0 ascii
-				 charset-g1 arabic-iso8859-6
-				 charset-g2 t
-				 charset-g3 t
-				 no-iso6429 t
-				 mnemonic "MIME/Arbc"
-				 ))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; ARABIC
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; (define-language-environment 'arabic
-;;   "Arabic"
-;;   (lambda ()
-;;     (require 'arabic)))
+;; #### Decide what to do about the syntax of the Arabic punctuation. 
 
 ;;; arabic.el ends here