[Emacs-diffs] master e2f68c1: * etc/HELLO: More reasonable placement of 'charset' properties.

[Eli Zaretskii]

branch: master
commit e2f68c144f83b4634096b8180ee9d5d56329a01d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    * etc/HELLO: More reasonable placement of 'charset' properties.
---
 etc/HELLO | 114 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 58 insertions(+), 56 deletions(-)

diff --git a/etc/HELLO b/etc/HELLO
index f415ec0..3aacbf9 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -7,80 +7,82 @@ some of the character sets that Emacs supports.
 
 
 Non-ASCII examples:
-  Europe: <x-charset><param>latin-iso8859-1</param>¡Hola!, Grüß Gott, Hyvää 
päivää, Tere õhtust, Bon</x-charset><x-charset><param>latin-iso8859-3</param>ġu
-          Cze</x-charset><x-charset><param>latin-iso8859-2</param>ść!, Dobrý 
den, </x-charset><x-charset><param>cyrillic-iso8859-5</param>Здравствуйте!, 
</x-charset><x-charset><param>greek-iso8859-7</param>Γειά σας, 
</x-charset><x-charset><param>mule-unicode-0100-24ff</param>გამარჯობა
-  Africa: </x-charset><x-charset><param>ethiopic</param>ሠላም
-  Middle/Near East: 
</x-charset><x-charset><param>hebrew-iso8859-8</param>שלום, 
</x-charset><x-charset><param>mule-unicode-0100-24ff</param>السّلام عليكم
-  South Asia: નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ଶୁଣିବେ,
-              ආයුබෝවන්, வணக்கம், నమస్కారం, 
</x-charset><x-charset><param>tibetan</param>བཀྲ་ཤིས་བདེ་ལེགས༎
-  South East Asia: 
</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ជំរាបសួរ, 
</x-charset><x-charset><param>lao</param>ສະບາຍດີ, 
</x-charset><x-charset><param>mule-unicode-0100-24ff</param>မင်္ဂလာပါ, 
</x-charset><x-charset><param>thai-tis620</param>สวัสดีครับ, 
Ch</x-charset><x-charset><param>vietnamese-viscii-lower</param>ào bạn
-  East Asia: </x-charset><x-charset><param>chinese-gb2312</param>你好, 
</x-charset><x-charset><param>chinese-big5-1</param>早晨, 
</x-charset><x-charset><param>japanese-jisx0208</param>こんにちは, 
</x-charset><x-charset><param>korean-ksc5601</param>안녕하세요
-  Misc: E</x-charset><x-charset><param>latin-iso8859-3</param>ĥoŝanĝo 
ĉiuĵaŭde, </x-charset><x-charset><param>mule-unicode-2500-33ff</param>⠓⠑⠇⠇⠕, 
</x-charset><x-charset><param>mule-unicode-0100-24ff</param>∀ p ∈ world • hello 
p  </x-charset><x-charset><param>mule-unicode-2500-33ff</param>□
-  CJK variety: GB(</x-charset><x-charset><param>chinese-gb2312</param>元气,开发), 
BIG5(</x-charset><x-charset><param>chinese-big5-1</param>元氣,開發), 
JIS(</x-charset><x-charset><param>japanese-jisx0208</param>元気,開発), 
KSC(</x-charset><x-charset><param>korean-ksc5601</param>元氣,開發)
-  Unicode charset: 
E</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ĥoŝanĝo ĉiuĵaŭde, 
Γειά σας, שלום, Здравствуйте!
+  Europe: <x-charset><param>latin-iso8859-1</param>¡Hola!, Grüß Gott, Hyvää 
päivää,</x-charset><x-charset><param>latin-iso8859-15</param> Tere 
õhtust,</x-charset><x-charset><param>latin-iso8859-3</param> Bonġu
+          Cześć!,</x-charset><x-charset><param>latin-iso8859-2</param> Dobrý 
den,</x-charset><x-charset><param>cyrillic-iso8859-5</param> 
Здравствуйте!,</x-charset><x-charset><param>greek-iso8859-7</param> Γειά 
σας,</x-charset><x-charset><param>mule-unicode-0100-24ff</param> 
გამარჯობა</x-charset>
+  Africa:<x-charset><param>mule-unicode-0100-24ff</param> 
</x-charset><x-charset><param>ethiopic</param>ሠላም</x-charset>
+  Middle/Near East:<x-charset><param>hebrew-iso8859-8</param> 
שלום,</x-charset><x-charset><param>mule-unicode-0100-24ff</param> السّلام 
عليكم</x-charset>
+  South Asia:<x-charset><param>mule-unicode-0100-24ff</param> નમસ્તે, नमस्ते, 
ನಮಸ್ಕಾರ, നമസ്കാരം, ଶୁଣିବେ,
+              ආයුබෝවන්, வணக்கம், 
నమస్కారం,</x-charset><x-charset><param>tibetan</param> 
བཀྲ་ཤིས་བདེ་ལེགས༎</x-charset>
+  South East Asia:<x-charset><param>mule-unicode-0100-24ff</param> 
ជំរាបសួរ,</x-charset><x-charset><param>lao</param> 
ສະບາຍດີ,</x-charset><x-charset><param>mule-unicode-0100-24ff</param> 
မင်္ဂလာပါ,</x-charset><x-charset><param>thai-tis620</param> 
สวัสดีครับ,</x-charset><x-charset><param>vietnamese-viscii-lower</param> 
</x-charset><x-charset><param>vietnamese-viscii-upper</param>C</x-charset><x-charset><param>vietnamese-viscii-lower</param>hào
 bạn</x-charset>
+  East Asia:<x-charset><param>chinese-gb2312</param> 
你好,</x-charset><x-charset><param>chinese-big5-1</param> 
早晨,</x-charset><x-charset><param>japanese-jisx0208</param> 
こんにちは,</x-charset><x-charset><param>korean-ksc5601</param> 안녕하세요</x-charset>
+  Misc:<x-charset><param>latin-iso8859-3</param> Eĥoŝanĝo 
ĉiuĵaŭde,</x-charset><x-charset><param>mule-unicode-2500-33ff</param> 
⠓⠑⠇⠇⠕,</x-charset><x-charset><param>mule-unicode-0100-24ff</param> ∀ p ∈ world 
• hello p  
</x-charset><x-charset><param>mule-unicode-2500-33ff</param>□</x-charset>
+  CJK variety:<x-charset><param>chinese-gb2312</param> 
GB(元气,开发),</x-charset><x-charset><param>chinese-big5-1</param> 
BIG5(元氣,開發),</x-charset><x-charset><param>japanese-jisx0208</param> 
JIS(元気,開発),</x-charset><x-charset><param>korean-ksc5601</param> 
KSC(元氣,開發)</x-charset>
+  Unicode charset:<x-charset><param>unicode</param> Eĥoŝanĝo ĉiuĵaŭde, Γειά 
σας, שלום, Здравствуйте!</x-charset>
 
 
 LANGUAGE (NATIVE NAME) HELLO
 ---------------------- -----
-Amharic (አማርኛ) ሠላም
+<x-charset><param>mule-unicode-0100-24ff</param>Amharic (አማርኛ) ሠላም
 Arabic (العربيّة)      السّلام عليكم
 Armenian (հայերեն)     Բարև ձեզ
 Bengali (বাংলা)        নমস্কার
-Braille        
</x-charset><x-charset><param>mule-unicode-2500-33ff</param>⠓⠑⠇⠇⠕
-Burmese (</x-charset><x-charset><param>mule-unicode-0100-24ff</param>မြန်မာ)   
မင်္ဂလာပါ
-C      printf ("Hello, world!\n");
-Czech (</x-charset><x-charset><param>latin-iso8859-2</param>čeština)   
Dobr</x-charset><x-charset><param>latin-iso8859-1</param>ý den
-Danish (dansk) Hej / Goddag / Halløj
+</x-charset><x-charset><param>mule-unicode-2500-33ff</param>Braille    ⠓⠑⠇⠇⠕
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Burmese (မြန်မာ)   
မင်္ဂလာပါ
+</x-charset>C  printf ("Hello, world!\n");
+<x-charset><param>latin-iso8859-2</param>Czech (čeština)       Dobrý den
+</x-charset><x-charset><param>latin-iso8859-1</param>Danish (dansk)    Hej / 
Goddag / Halløj
 Dutch (Nederlands)     Hallo / Dag
-Emacs  emacs --no-splash -f view-hello-file
+</x-charset><x-charset><param>unicode</param>Emacs     emacs --no-splash -f 
view-hello-file
 
-Emoji  </x-charset><x-charset><param>unicode</param>👋
-</x-charset><x-charset><param>latin-iso8859-1</param>English 
/</x-charset><x-charset><param>japanese-jisx0213-1</param>ˈ</x-charset><x-charset><param>ipa</param>ɪ</x-charset><x-charset><param>latin-iso8859-4</param>ŋ</x-charset><x-charset><param>japanese-jisx0213-1</param>ɡl</x-charset><x-charset><param>ipa</param>ɪ</x-charset><x-charset><param>japanese-jisx0213-1</param>ʃ/
       Hello
-Esperanto      Saluton 
(E</x-charset><x-charset><param>latin-iso8859-3</param>ĥoŝanĝo ĉiuĵaŭde)
-Estonian (eesti keel)  Tere 
p</x-charset><x-charset><param>latin-iso8859-1</param>äevast / Tere õhtust
-Finnish (suomi)        Hei / Hyvää päivää
+Emoji  👋
+</x-charset>English <x-charset><param>ipa</param>/ˈɪŋɡlɪʃ/</x-charset> Hello
+<x-charset><param>latin-iso8859-3</param>Esperanto     Saluton (Eĥoŝanĝo 
ĉiuĵaŭde)
+</x-charset><x-charset><param>latin-iso8859-15</param>Estonian (eesti keel)    
Tere päevast / Tere õhtust
+</x-charset><x-charset><param>latin-iso8859-1</param>Finnish (suomi)   Hei / 
Hyvää päivää
 French (français)      Bonjour / Salut
-Georgian 
(</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ქართველი)        
გამარჯობა
-German (Deutsch)       Guten Tag / 
Gr</x-charset><x-charset><param>latin-iso8859-1</param>üß Gott
-Greek (</x-charset><x-charset><param>greek-iso8859-7</param>ελληνικά)  Γειά σας
-Greek, ancient 
(</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ἑ</x-charset><x-charset><param>greek-iso8859-7</param>λληνική)
     
Ο</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ὖ</x-charset><x-charset><param>greek-iso8859-7</param>λέ
 τε κα</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ὶ 
</x-charset><x-charset><param>greek-iso8859-7</param>μέγα 
χα</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ῖ</x-charset><x-charset><param>greek-iso8859-7</
 [...]
-Gujarati (</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ગુજરાતી) 
નમસ્તે
-Hebrew 
</x-charset><x-charset><param>hebrew-iso8859-8</param>(עברית)</x-charset><x-charset><param>mule-unicode-0100-24ff</param>
       </x-charset><x-charset><param>hebrew-iso8859-8</param>שלום
-Hungarian (magyar)     
Sz</x-charset><x-charset><param>latin-iso8859-2</param>ép jó napot!
-Hindi (</x-charset><x-charset><param>mule-unicode-0100-24ff</param>हिंदी)      
नमस्ते / नमस्कार ।
-Italian (italiano)     Ciao / Buon giorno
-Javanese (Jawa)        System.out.println("Sugeng siang!");
-Kannada (ಕನ್ನಡ)        ನಮಸ್ಕಾರ
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Georgian 
(ქართველი)        გამარჯობა
+</x-charset><x-charset><param>latin-iso8859-1</param>German (Deutsch)  Guten 
Tag / Grüß Gott
+</x-charset><x-charset><param>greek-iso8859-7</param>Greek (ελληνικά)  Γειά σας
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Greek, ancient 
(ἑλληνική)  Οὖλέ τε καὶ μέγα χαῖρε
+Gujarati (ગુજરાતી)     નમસ્તે
+</x-charset><x-charset><param>hebrew-iso8859-8</param>Hebrew (עברית)   שלום
+</x-charset><x-charset><param>latin-iso8859-2</param>Hungarian (magyar)        
Szép jó napot!
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Hindi (हिंदी)      
नमस्ते / नमस्कार ।
+</x-charset><x-charset><param>latin-iso8859-1</param>Italian (italiano)        
Ciao / Buon giorno
+</x-charset>Javanese (Jawa)    System.out.println("Sugeng siang!");
+<x-charset><param>mule-unicode-0100-24ff</param>Kannada (ಕನ್ನಡ)        ನಮಸ್ಕಾರ
 Khmer (ភាសាខ្មែរ)      ជំរាបសួរ
-Lao (</x-charset><x-charset><param>lao</param>ພາສາລາວ) ສະບາຍດີ / ຂໍໃຫ້ໂຊກດີ
-Malayalam (</x-charset><x-charset><param>mule-unicode-0100-24ff</param>മലയാളം) 
നമസ്കാരം
-Maltese (il-Malti)     
Bon</x-charset><x-charset><param>latin-iso8859-3</param>ġu / Saħħa
-Mathematics    </x-charset><x-charset><param>mule-unicode-0100-24ff</param>∀ p 
∈ world • hello p  </x-charset><x-charset><param>mule-unicode-2500-33ff</param>□
-Mongolian (</x-charset><x-charset><param>cyrillic-iso8859-5</param>монгол хэл) 
Сайн байна уу?
-Norwegian (norsk)      Hei / God dag
-Oriya (</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ଓଡ଼ିଆ)       
ଶୁଣିବେ
-Polish  (j</x-charset><x-charset><param>latin-iso8859-2</param>ęzyk polski)    
Dzień dobry! / Cześć!
-Russian (</x-charset><x-charset><param>cyrillic-iso8859-5</param>русский)      
Здра</x-charset><x-charset><param>japanese-jisx0213-1</param>́</x-charset><x-charset><param>cyrillic-iso8859-5</param>вствуйте!
-Sinhala (</x-charset><x-charset><param>mule-unicode-0100-24ff</param>සිංහල)    
ආයුබෝවන්
-Slovak (sloven</x-charset><x-charset><param>latin-iso8859-2</param>čina)       
Dobr</x-charset><x-charset><param>latin-iso8859-1</param>ý 
de</x-charset><x-charset><param>latin-iso8859-2</param>ň
+</x-charset><x-charset><param>lao</param>Lao (ພາສາລາວ) ສະບາຍດີ / ຂໍໃຫ້ໂຊກດີ
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Malayalam (മലയാളം) 
നമസ്കാരം
+</x-charset><x-charset><param>latin-iso8859-3</param>Maltese (il-Malti)        
Bonġu / Saħħa
+</x-charset><x-charset><param>unicode</param>Mathematics       ∀ p ∈ world • 
hello p  □
+</x-charset><x-charset><param>cyrillic-iso8859-5</param>Mongolian (монгол хэл) 
Сайн байна уу?
+</x-charset><x-charset><param>latin-iso8859-1</param>Norwegian (norsk) Hei / 
God dag
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Oriya (ଓଡ଼ିଆ)       
ଶୁଣିବେ
+</x-charset><x-charset><param>latin-iso8859-2</param>Polish  (język polski)    
Dzień dobry! / Cześć!
+</x-charset><x-charset><param>cyrillic-iso8859-5</param>Russian (русский)      
Здра́вствуйте!
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Sinhala (සිංහල)    
ආයුබෝවන්
+</x-charset><x-charset><param>latin-iso8859-2</param>Slovak (slovenčina)       
Dobrý deň
 Slovenian (slovenščina)        Pozdravljeni!
 Spanish (espa</x-charset><x-charset><param>latin-iso8859-1</param>ñol) ¡Hola!
 Swedish (svenska)      Hej / Goddag / Hallå
-Tamil (</x-charset><x-charset><param>mule-unicode-0100-24ff</param>தமிழ்)      
வணக்கம்
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Tamil (தமிழ்)      
வணக்கம்
 Telugu (తెలుగు)        నమస్కారం
-Thai (</x-charset><x-charset><param>thai-tis620</param>ภาษาไทย)        
สวัสดีครับ / สวัสดีค่ะ
-Tibetan (</x-charset><x-charset><param>tibetan</param>བོད་སྐད་)        
བཀྲ་ཤིས་བདེ་ལེགས༎
-Tigrigna (</x-charset><x-charset><param>mule-unicode-0100-24ff</param>ትግርኛ)    
ሰላማት
-Turkish (T</x-charset><x-charset><param>latin-iso8859-1</param>ürkçe)  Merhaba
-Ukrainian (</x-charset><x-charset><param>cyrillic-iso8859-5</param>українська) 
Вітаю
-Vietnamese (ti</x-charset><x-charset><param>vietnamese-viscii-lower</param>ếng 
Việt)   Ch</x-charset><x-charset><param>latin-iso8859-1</param>ào 
b</x-charset><x-charset><param>vietnamese-viscii-lower</param>ạn
+</x-charset><x-charset><param>thai-tis620</param>Thai (ภาษาไทย)        
สวัสดีครับ / สวัสดีค่ะ
+</x-charset><x-charset><param>tibetan</param>Tibetan (བོད་སྐད་)        
བཀྲ་ཤིས་བདེ་ལེགས༎
+</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Tigrigna (ትግርኛ)    
ሰላማት
+</x-charset><x-charset><param>latin-iso8859-9</param>Turkish (Türkçe)  Merhaba
+</x-charset><x-charset><param>cyrillic-iso8859-5</param>Ukrainian (українська) 
Вітаю
+</x-charset><x-charset><param>vietnamese-viscii-lower</param>Vietnamese (tiếng 
</x-charset><x-charset><param>vietnamese-viscii-upper</param>V</x-charset><x-charset><param>vietnamese-viscii-lower</param>iệt)
 </x-charset><x-charset><param>vietnamese-viscii-upper</param>Chào bạn
 
+</x-charset>
 
-Japanese (</x-charset><x-charset><param>japanese-jisx0208</param>日本語)  こんにちは / 
</x-charset><x-charset><param>katakana-jisx0201</param>ｺﾝﾆﾁﾊ
-Chinese (</x-charset><x-charset><param>chinese-gb2312</param>中文,普通话,汉语)        
你好
-Cantonese (</x-charset><x-charset><param>chinese-big5-1</param>粵語,廣東話) 早晨, 你好
-Korean (</x-charset><x-charset><param>korean-ksc5601</param>한글)        안녕하세요 / 
안녕하십니까
+Japanese (日本語) こんにちは <x-charset><param>katakana-jisx0201</param>/ ｺﾝﾆﾁﾊ
+</x-charset><x-charset><param>chinese-gb2312</param>Chinese (中文,普通话,汉语)        
你好
+</x-charset><x-charset><param>chinese-big5-1</param>Cantonese (粵語,廣東話) 早晨, 你好
+</x-charset>Korean (한글)        안녕하세요 / 안녕하십니까
 
+<x-charset><param>korean-ksc5601</param>
 
 </x-charset><x-charset><param>unicode</param>