Commits

Anonymous committed 3887333

2002-07-30 Ville Skyttä <ville.skytta@xemacs.org>

* ps-mule.el: Get rid of coding-system aliases.
(ps-mule-string-ascii): Use real XEmacs coding-system names.
(ps-mule-font-info-database-latin): Ditto.
(ps-mule-font-info-database-bdf): Ditto.
(ps-mule-encode-header-string): Ditto.

Message-Id: <1027599632.32495.4.camel@bobcat.ods.org>

Comments (0)

Files changed (2)

+2002-07-30  Ville Skyttä  <ville.skytta@xemacs.org>
+
+	* ps-mule.el: Get rid of coding-system aliases.
+	(ps-mule-string-ascii): Use real XEmacs coding-system names.
+	(ps-mule-font-info-database-latin): Ditto.
+	(ps-mule-font-info-database-bdf): Ditto.
+	(ps-mule-encode-header-string): Ditto.
+
 2002-07-30  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.05 released.
 
 (defconst ps-mule-font-info-database-latin
   '((latin-iso8859-1
-     (normal nil nil iso-latin-1)))
+     (normal nil nil iso-8859-1)))
   "Sample setting of `ps-mule-font-info-database' to use latin fonts.")
 
 (defcustom ps-mule-font-info-database-default
 
 Currently, data for Japanese and Korean PostScript printers are listed.")
 
-(define-coding-system-alias 'greek-iso-8bit 'iso-8859-7)
-(define-coding-system-alias 'hebrew-iso-8bit 'iso-8859-8)
-(define-coding-system-alias 'cyrillic-iso-8bit 'iso-8859-5)
-(define-coding-system-alias 'vietnamese-viscii 'viscii)
-(define-coding-system-alias 'chinese-big5 'big5)
-(define-coding-system-alias 'thai-tis620 'tis-620)
-(define-coding-system-alias 'iso-latin-1 'iso-8859-1)
-(define-coding-system-alias 'iso-latin-2 'iso-8859-2)
-(define-coding-system-alias 'iso-latin-3 'iso-8859-3)
-(define-coding-system-alias 'iso-latin-4 'iso-8859-4)
-(define-coding-system-alias 'iso-latin-5 'iso-8859-5)
-
-
 (defconst ps-mule-font-info-database-bdf
   '((ascii
      (normal bdf ("lt1-24-etl.bdf" "etl24-latin1.bdf") nil 1)
      (italic bdf ("lt1-16i-etl.bdf" "etl16i-latin1.bdf") nil 1)
      (bold-italic bdf ("lt1-16bi-etl.bdf" "etl16bi-latin1.bdf") nil 1))
     (latin-iso8859-1
-     (normal bdf ("lt1-24-etl.bdf" "etl24-latin1.bdf") iso-latin-1 1)
-     (bold bdf ("lt1-16b-etl.bdf" "etl16b-latin1.bdf") iso-latin-1 1)
-     (italic bdf ("lt1-16i-etl.bdf" "etl16i-latin1.bdf") iso-latin-1 1)
-     (bold-italic bdf ("lt1-16bi-etl.bdf" "etl16bi-latin1.bdf") iso-latin-1 1))
+     (normal bdf ("lt1-24-etl.bdf" "etl24-latin1.bdf") iso-8859-1 1)
+     (bold bdf ("lt1-16b-etl.bdf" "etl16b-latin1.bdf") iso-8859-1 1)
+     (italic bdf ("lt1-16i-etl.bdf" "etl16i-latin1.bdf") iso-8859-1 1)
+     (bold-italic bdf ("lt1-16bi-etl.bdf" "etl16bi-latin1.bdf") iso-8859-1 1))
     (latin-iso8859-2
-     (normal bdf ("lt2-24-etl.bdf" "etl24-latin2.bdf") iso-latin-2 1))
+     (normal bdf ("lt2-24-etl.bdf" "etl24-latin2.bdf") iso-8859-2 1))
     (latin-iso8859-3
-     (normal bdf ("lt3-24-etl.bdf" "etl24-latin3.bdf") iso-latin-3 1))
+     (normal bdf ("lt3-24-etl.bdf" "etl24-latin3.bdf") iso-8859-3 1))
     (latin-iso8859-4
-     (normal bdf ("lt4-24-etl.bdf" "etl24-latin4.bdf") iso-latin-4 1))
+     (normal bdf ("lt4-24-etl.bdf" "etl24-latin4.bdf") iso-8859-4 1))
     (thai-tis620
-     (normal bdf ("thai24.bdf" "thai-24.bdf") thai-tis620 1))
+     (normal bdf ("thai24.bdf" "thai-24.bdf") tis-620 1))
     (greek-iso8859-7
-     (normal bdf ("grk24-etl.bdf" "etl24-greek.bdf") greek-iso-8bit 1))
+     (normal bdf ("grk24-etl.bdf" "etl24-greek.bdf") iso-8859-7 1))
     ;; (arabic-iso8859-6	nil) ; not yet available
     (hebrew-iso8859-8
-     (normal bdf ("heb24-etl.bdf" "etl24-hebrew.bdf") hebrew-iso-8bit 1))
+     (normal bdf ("heb24-etl.bdf" "etl24-hebrew.bdf") iso-8859-8 1))
     (katakana-jisx0201
      (normal bdf "12x24rk.bdf" ps-mule-encode-8bit 1))
     (latin-jisx0201
      (normal bdf "12x24rk.bdf" ps-mule-encode-7bit 1))
     (cyrillic-iso8859-5
-     (normal bdf ("cyr24-etl.bdf" "etl24-cyrillic.bdf") cyrillic-iso-8bit 1))
+     (normal bdf ("cyr24-etl.bdf" "etl24-cyrillic.bdf") iso-8859-5 1))
     (latin-iso8859-9
-     (normal bdf ("lt5-24-etl.bdf" "etl24-latin5.bdf") iso-latin-5 1))
+     (normal bdf ("lt5-24-etl.bdf" "etl24-latin5.bdf") iso-8859-5 1))
     (japanese-jisx0208-1978
      (normal bdf "jiskan24.bdf" ps-mule-encode-7bit 2))
     (chinese-gb2312
     (chinese-cns11643-2
      (normal bdf ("cns2-40.bdf" "cns-2-40.bdf") ps-mule-encode-7bit 2))
     (chinese-big5-1
-     (normal bdf "taipei24.bdf" chinese-big5 2))
+     (normal bdf "taipei24.bdf" big5 2))
     (chinese-big5-2
-     (normal bdf "taipei24.bdf" chinese-big5 2))
+     (normal bdf "taipei24.bdf" big5 2))
     (chinese-sisheng
      (normal bdf ("sish24-etl.bdf" "etl24-sisheng.bdf") ps-mule-encode-8bit 1))
     (ipa
      (normal bdf ("ipa24-etl.bdf" "etl24-ipa.bdf") ps-mule-encode-8bit 1))
     (vietnamese-viscii-lower
-     (normal bdf ("visc24-etl.bdf" "etl24-viscii.bdf") vietnamese-viscii 1))
+     (normal bdf ("visc24-etl.bdf" "etl24-viscii.bdf") viscii 1))
     (vietnamese-viscii-upper
-     (normal bdf ("visc24-etl.bdf" "etl24-viscii.bdf") vietnamese-viscii 1))
+     (normal bdf ("visc24-etl.bdf" "etl24-viscii.bdf") viscii 1))
     (arabic-digit
      (normal bdf ("arab24-0-etl.bdf" "etl24-arabic0.bdf") ps-mule-encode-7bit 1))
     (arabic-1-column
 
 (defun ps-mule-string-ascii (str)
   (ps-set-font ps-current-font)
-  (string-as-unibyte (encode-coding-string str 'iso-latin-1)))
+  (string-as-unibyte (encode-coding-string str 'iso-8859-1)))
 
 ;; Encode STR for a font specified by FONT-SPEC and return the result.
 ;; If necessary, it generates the PostScript code for the font and glyphs to
 	    (or (memq (char-charset (aref string i)) '(ascii latin-iso8859-1))
 		(aset string i ??))
 	    (setq i (1+ i)))
-	  (setq string (encode-coding-string string 'iso-latin-1)))
+	  (setq string (encode-coding-string string 'iso-8859-1)))
       ;; We must prepare a font for the first non-ASCII and non-Latin1
       ;; character in STRING.
       (let* ((ps-current-font (if (string= fonttag "/h0") 0 1))
 			  '(ascii latin-iso8859-1))
 		    (aset string i ??))
 		(setq i (1+ i)))
-	      (setq string (encode-coding-string string 'iso-latin-1)))
+	      (setq string (encode-coding-string string 'iso-8859-1)))
 	  (let ((charsets (list 'ascii (car ps-mule-header-charsets)))
 		(len (length string))
 		(i 0))