From: Taylor R Campbell Date: Sat, 22 Feb 2014 19:20:29 +0000 (+0000) Subject: Fix default (ISO-8859-1) char image strings. X-Git-Tag: release-9.2.0~47 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=a885af794a302f0532cea456d5597796816c5de4;p=mit-scheme.git Fix default (ISO-8859-1) char image strings. We previously used `ANSI' char image strings, which really meant Windows-1252 for some reason. Now we use ISO-8859-1 so things get displayed correctly in X at least. Some characters may not display *nicely* on Windows, but they will display *correctly* (with an octal escape). --- diff --git a/src/edwin/image.scm b/src/edwin/image.scm index 392862acf..0c90162c1 100644 --- a/src/edwin/image.scm +++ b/src/edwin/image.scm @@ -94,16 +94,24 @@ USA. (vector-set! strings i (string-append "\\" (number->string i 8)))) strings)) -(define default-char-image-strings/ansi +(define default-char-image-strings/iso-8859-1 (let ((strings (vector-copy default-char-image-strings/original-emacs))) - (do ((i #x91 (+ i 1))) - ((= #x93 i)) - (vector-set! strings i (string (integer->char i)))) (do ((i #xA0 (+ i 1))) ((= #x100 i)) (vector-set! strings i (string (integer->char i)))) strings)) +(define default-char-image-strings/windows-1252 + (let ((strings (vector-copy default-char-image-strings/iso-8859-1))) + (define (fixup i) (vector-set! strings i (string (integer->char i)))) + (fixup #x80) ;Euro + (do ((i #x82 (+ i 1))) ((= i #x8d)) (fixup i)) + (fixup #x8e) ;Z with hacek + (do ((i #x91 (+ i 1))) ((= i #x9d)) (fixup i)) + (fixup #x9e) ;z with hacek + (fixup #x9f) ;Y with diaeresis + strings)) + (define default-char-image-strings/ascii (let ((strings (vector-copy default-char-image-strings/original-emacs))) (subvector-move-left! @@ -114,7 +122,7 @@ USA. 0 #x20 strings 0) strings)) -(define default-char-image-strings default-char-image-strings/ansi) +(define default-char-image-strings default-char-image-strings/iso-8859-1) (define (group-line-columns group start end column tab-width char-image-strings)