changeset 5530:17bcc2aab111

Update the GPLv3 HELLO to use the ISO-IR-196 escape sequences. etc/ChangeLog addition: 2011-06-28 Aidan Kehoe <kehoea@parhasard.net> * HELLO: No longer encode various Unicode characters in GNU's specific ad-hoc character sets, use ISO-IR-196 sequences instead. tests/ChangeLog addition: 2011-06-28 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el: Update the charsets-in-region test to reflect the GPLv3 HELLO file.
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 28 Jun 2011 18:34:26 +0100
parents 3d1f8f0e690f
children 1b054bc2ac40
files etc/ChangeLog etc/HELLO tests/ChangeLog tests/automated/mule-tests.el
diffstat 4 files changed, 55 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/etc/ChangeLog	Sat Jun 25 14:00:48 2011 +0100
+++ b/etc/ChangeLog	Tue Jun 28 18:34:26 2011 +0100
@@ -1,3 +1,9 @@
+2011-06-28  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* HELLO:
+	No longer encode various Unicode characters in GNU's specific
+	ad-hoc character sets, use ISO-IR-196 sequences instead.
+
 2011-05-20  Jerry James  <james@xemacs.org>
 
 	* tests/external-widget/Makefile (DESTDIR): New variable for all
--- a/etc/HELLO	Sat Jun 25 14:00:48 2011 +0100
+++ b/etc/HELLO	Tue Jun 28 18:34:26 2011 +0100
@@ -2,64 +2,64 @@
 
 Non-ASCII examples:
   Europe: ,A!(BHola!, Gr,A|_(B Gott, Hyv,Add(B p,Ad(Biv,Add(B, Tere ,Au(Bhtust, Bon,Cu(Bu
-          Cze,B6f(B!, Dobr,B}(B den, ,L7T`PRabRcYbU(B!, ,FCei\(B ,Fsar(B, $,1J2J0J;J0J@JOJ=J1J0(B
+          Cze,B6f(B!, Dobr,B}(B den, ,L7T`PRabRcYbU(B!, ,FCei\(B ,Fsar(B,  %Gგამარჯობა%@
   Africa: $(3!A!,!>(B
-  Middle/Near East: ,Hylem(B, $,1-g.$-s.1.$-g.%(B $,1-y.$.*.#.%(B
-  South Asia: $,19h9n9x:-9d:'(B, $,15h5n5x6-5d6'(B, $,1?(?.?8?M>u?>?0(B, $,1@H@N@X@m@5@^@P@"(B, $,1;6;A;#;?;,;G(B,
-              $,1AFAzB4AvB=B AqB*(B, $,1<U<C<5<m<5<N<m(B, $,1=h=n=x>-=U=~=p=B(B, $(7"7"!#C!;"E"S"G!;"7"2"[!;"D"["#"G!>(B
-  South East Asia: $,1\'\f\:\V\4\?\]\:(B, (1JP:R-4U(B, $,1H9H$HZHYH"H<HLH5HK(B, ,TJGQJ4U$CQ:(B, Ch,1`(Bo b,1U(Bn
+  Middle/Near East: [2],Hylem[0](B, [2],GGdSqdGe[0](B [2],GYdjce[0](B
+  South Asia: %Gનમસ્તે%@, (5FLWhBa(B, %Gನಮಸ್ಕಾರ%@, %Gനമസ്കാരം%@, %Gଶୁଣିବେ%@,
+              %Gආයුබෝවන්%@, %Gவணக்கம்%@, %Gనమస్కారం%@, %Gབཀ%@$(7#C!;%Gཤ%@"S%Gས%@!;%Gབད%@"[!;%Gལ%@"[%Gགས%@!>(B
+  South East Asia: %Gជំរាបសួរ%@, (1JP:R-4U(B, %Gမင်္ဂလာပါ%@, %Gสวัสดีครับ%@, Ch,A`(Bo b,1U(Bn
   East Asia: $ADc:C(B, $(0*/=((B, $B$3$s$K$A$O(B, $(C>H3gGO<<?d(B
-  Misc: E,C6(Bo,C~(Ban,Cx(Bo ,Cf(Biu,C<(Ba,C}(Bde, $,2(3(1('('(5(B, $,1x (B p $,1x((B world $,1s"(B hello p  $,2!a(B
+  Misc: E$(D+>(Bo$(D+](Ban$(D+:(Bo $(D+,(Biu$(D+H(Ba$(D+f(Bde, %G⠓⠑⠇⠇⠕%@, $B"O(B p $B":(B world %G•%@ hello p  %G□%@
   CJK variety: GB($AT*Fx(B,$A?*7"(B), BIG5($(0&x86(B,$(0DeBv(B), JIS($B855$(B,$B3+H/(B), KSC($(Cj*Q((B,$(CKR[!(B)
-  Unicode charset: E$,1 E(Bo$,1 }(Ban$,1 =(Bo $,1 )(Biu$,1 U(Ba$,1!-(Bde, $,1&s'5'9',(B $,1'C'1'B(B, $,1-),|,u,}(B, $,1(7(T(`(P(R(a(b(R(c(Y(b(U(B!
+  Unicode charset: E$(D+>(Bo$(D+](Ban$(D+:(Bo $(D+,(Biu$(D+H(Ba$(D+f(Bde, ,FCei\(B ,Fsar(B, [2],Hylem[0](B, ,L7T`PRabRcYbU(B!
 
 LANGUAGE (NATIVE NAME)	HELLO
 ----------------------	-----
-Amharic ($,1O M[MmN{(B)	$,1M`MKM](B
-Arabic $,1ro(B($,1-g.$-y-q-h.*.1-i(B)	$,1-g.$-s.1.$-g.%(B $,1-y.$.*.#.%(B
-Bengali ($,17,7>6b727>(B)	$,17(7.787M6u7>70(B
-Braille	$,2(3(1('('(5(B
-Burmese ($,1H9H\H4HZH9HL(B)	$,1H9H$HZHYH"H<HLH5HK(B
+Amharic ($(3"c!<!N"^(B)	$(3!A!,!>(B
+Arabic [2],H~[0](B([2],GGdYQHjqI[0](B)	[2],GGdSqdGe[0](B [2],GYdjce[0](B
+Bengali (%Gবাংলা%@)	%Gনমস্কার%@
+Braille	%G⠓⠑⠇⠇⠕%@
+Burmese (%Gမြန်မာ%@)	%Gမင်္ဂလာပါ%@
 C	printf ("Hello, world!\n");
 Czech (,Bh(Be,B9(Btina)	Dobr,A}(B den
 Danish (dansk)	Hej / Goddag / Hall,Ax(Bj
 Dutch (Nederlands)	Hallo / Dag
 Emacs	emacs --no-splash -f view-hello-file
-English /$(O+S,0!,D?$(O*y(Bl,0!$(O*h(B/	Hello
+English /,0p!,D?%Gɡ%@(Bl,0!L(B/	Hello
 Esperanto	Saluton (E,C6(Bo,C~(Ban,Cx(Bo ,Cf(Biu,C<(Ba,C}(Bde)
 Estonian (eesti keel)	Tere p,Ad(Bevast / Tere ,Au(Bhtust
 Finnish (suomi)	Hei / Hyv,Add(B p,Ad(Biv,Add(B
 French (fran,Ag(Bais)	Bonjour / Salut
-Georgian ($,1JEJ0J@J7J5J4J:J8(B)	$,1J2J0J;J0J@JOJ=J1J0(B
+Georgian (%Gქართველი%@)	%Gგამარჯობა%@
 German (Deutsch)	Guten Tag / Gr,A|_(B Gott
 Greek (,Fekkgmij\(B)	,FCei\(B ,Fsar(B
-Gujarati ($,19W:!9\9p9~9d: (B)	$,19h9n9x:-9d:'(B
-Hebrew $,1ro(B($,1-",q-(,y-*(B)	,Hylem(B
+Gujarati (%Gગુજરાતી%@)	%Gનમસ્તે%@
+Hebrew [2],H~[0](B([2],Hraxiz[0](B)	[2],Hylem[0](B
 Hungarian (magyar)	Sz,Bi(Bp j,Bs(B napot!
-Hindi ($,15y55B5f6 (B)	$,15h5n5x6-5d6'(B / $,15h5n5x6-5U5~5p(B $,16D(B
+Hindi ((5X["D\(B)	(5FLWhBa(B / (5FLWh3ZO(B (5j(B
 Italian (italiano)	Ciao / Buon giorno
 Javanese (Jawa)	System.out.println("Sugeng siang!");
-Kannada ($,1>u?(?M?(?!(B)	$,1?(?.?8?M>u?>?0(B
-Khmer ($,1\7\V\?\V\!\r\8\b\:(B)	$,1\'\f\:\V\4\?\]\:(B
+Kannada (%Gಕನ್ನಡ%@)	%Gನಮಸ್ಕಾರ%@
+Khmer (%Gភាសាខ្មែរ%@)	%Gជំរាបសួរ%@
 Lao ((1>RJRERG(B)	(1JP:R-4U(B / (1"mcKib*!4U(B
-Malayalam ($,1@N@R@O@^@S@"(B)	$,1@H@N@X@m@5@^@P@"(B
+Malayalam (%Gമലയാളം%@)	%Gനമസ്കാരം%@
 Maltese (il-Malti)	Bon,Cu(Bu / Sa,C11(Ba
-Mathematics	$,1x (B p $,1x((B world $,1s"(B hello p  $,2!a(B
+Mathematics	$B"O(B p $B":(B world %G•%@ hello p  %G□%@
 Nederlands, Vlaams	Hallo / Dag
 Norwegian (norsk)	Hei / God dag
-Oriya ($,1:s;\;?:f(B)	$,1;6;A;#;?;,;G(B
+Oriya (%Gଓଡ଼ିଆ%@)	%Gଶୁଣିବେ%@
 Polish  (j,Bj(Bzyk polski)	Dzie,Bq(B dobry! / Cze,B6f(B!
-Russian (,L`caaZXY(B)	,L7T`P$(O+Z,LRabRcYbU(B!
-Sinhala ($,1B#B2ABB$A}(B)	$,1AFAzB4AvB=B AqB*(B
+Russian (,L`caaZXY(B)	,L7T`P%Ǵ%@RabRcYbU(B!
+Sinhala (%Gසිංහල%@)	%Gආයුබෝවන්%@
 Slovak (sloven,Bh(Bina)	Dobr,A}(B de,Br(B
 Slovenian (sloven,B9h(Bina)	Pozdravljeni!
 Spanish (espa,Aq(Bol)	,A!(BHola!
 Swedish (p,Ae(B svenska)	Hej / Goddag / Hall,Ae(B
-Tamil ($,1<D<N<_<T<m(B)	$,1<U<C<5<m<5<N<m(B
-Telugu ($,1=d>&=r>!=W>!(B)	$,1=h=n=x>-=U=~=p=B(B
+Tamil (%Gதமிழ்%@)	%Gவணக்கம்%@
+Telugu (%Gతెలుగు%@)	%Gనమస్కారం%@
 Thai (,T@RIRd7B(B)	,TJGQJ4U$CQ:(B / ,TJGQJ4U$hP(B
-Tibetan ($(7"7"]"2!;"G#!"2!;(B)	$(7"7"!#C!;"E"S"G!;"7"2"[!;"D"["#"G!>(B
-Tigrigna ($,1NUP-MmN{(B)	$,1MpMKM[NU(B
+Tibetan (%Gབ%@$(7"]%Gད%@!;%Gས%@#!%Gད%@!;(B)	%Gབཀ%@$(7#C!;%Gཤ%@"S%Gས%@!;%Gབད%@"[!;%Gལ%@"[%Gགས%@!>(B
+Tigrigna ($(3"8#r!N"^(B)	$(3!Q!,!<"8(B
 Turkish (T,A|(Brk,Ag(Be)	Merhaba
 Ukrainian (,LcZ`Pw]alZP(B)	,L2vbPn(B
 Vietnamese (ti,1*(Bng Vi,1.(Bt)	Ch,A`(Bo b,1U(Bn
--- a/tests/ChangeLog	Sat Jun 25 14:00:48 2011 +0100
+++ b/tests/ChangeLog	Tue Jun 28 18:34:26 2011 +0100
@@ -1,3 +1,9 @@
+2011-06-28  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* automated/mule-tests.el:
+	Update the charsets-in-region test to reflect the GPLv3 HELLO
+	file.
+
 2011-05-20  Jerry James  <james@xemacs.org>
 
 	* tooltalk/Makefile (DESTDIR): New variable for all Makefiles, unused
--- a/tests/automated/mule-tests.el	Sat Jun 25 14:00:48 2011 +0100
+++ b/tests/automated/mule-tests.el	Tue Jun 28 18:34:26 2011 +0100
@@ -572,22 +572,28 @@
   ;; Test charset-in-* functions
   ;;---------------------------------------------------------------
   (with-temp-buffer
-    (insert-file-contents (locate-data-file "HELLO"))
     (let ((sorted-charsets-in-HELLO
-	   '(arabic-iso8859-6 ascii chinese-big5-1 chinese-gb2312
-	     cyrillic-iso8859-5 ethiopic greek-iso8859-7
-	     hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
-	     katakana-jisx0201 korean-ksc5601 latin-iso8859-1
-	     latin-iso8859-2 vietnamese-viscii-lower)))
+           '(arabic-iso8859-6 ascii chinese-big5-1 chinese-gb2312
+             cyrillic-iso8859-5 ethiopic greek-iso8859-7 hebrew-iso8859-8
+             indian-is13194 ipa japanese-jisx0208 japanese-jisx0212
+             katakana-jisx0201 korean-ksc5601 lao latin-iso8859-1
+             latin-iso8859-2 latin-iso8859-3 latin-iso8859-4 thai-tis620
+             tibetan vietnamese-viscii-lower))
+	  (coding-system-for-read 'iso-2022-7))
+      (insert-file-contents (locate-data-file "HELLO"))
       (Assert (equal 
        ;; The sort is to make the algorithm of charsets-in-region
        ;; irrelevant.
-       (sort (charsets-in-region (point-min) (point-max))
+       (sort (remove* "^jit-ucs-charset-" (charsets-in-region (point-min)
+                                                              (point-max))
+                      :test 'string-match :key 'symbol-name)
 	     #'string<)
        sorted-charsets-in-HELLO))
       (Assert (equal 
-       (sort (charsets-in-string (buffer-substring (point-min)
-						   (point-max)))
+       (sort (remove* "^jit-ucs-charset-" (charsets-in-string
+                                           (buffer-substring (point-min)
+                                                             (point-max)))
+                      :test 'string-match :key 'symbol-name)
 	     #'string<)
        sorted-charsets-in-HELLO))))