Subject: bug#55493: [PATCH] Rename Oriya to Odia

From: समीर सिंह Sameer Singh <[email-masked]>
Date: Wed, 18 May 2022 05:26:39 +0530

Since Oriya was renamed to Odia in 2011. (
https://legislative.gov.in/sites/default/files/A2011-15.pdf) Here is a
patch to do the same in Emacs.

I have not changed it wherever unicode, is13194, iso639, cdac and akruti
were involved, since they all use the old name. (I am not sure about cdac
though, because I was not able to run their software)

There was also a typo in erc/erc-lang.el and lisp/ldefs-boot.el, iso639-1
was written as iso638, I fixed that.

Please review the patch.
Also please check if the commit message is correct.
Thank You.
From 7170e853914d3e433f25d46419765c2287744dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=B8=E0=A4=AE=E0=A5=80=E0=A4=B0=20=E0=A4=B8=E0=A4=BF?=
 =?UTF-8?q?=E0=A4=82=E0=A4=B9=20Sameer=20Singh?= <[email-masked]>
Date: Wed, 18 May 2022 04:19:10 +0530
Subject: [PATCH] Rename Oriya to Odia

* lisp/erc/erc-lang.el:
* lisp/ldefs-boot.el:
Rename iso-638-languages to iso-639-1-languages.
* lisp/language/ind-util.el:
Rename indian-ori-base-table to indian-odi-base-table.
Rename indian-ori-itrans-v5-hash to indian-odi-itrans-v5-hash.
* lisp/language/indian.el:
(set-language-info-alist): Rename Oriya to Odia.
Rename oriya-composable-pattern to odia-composable-pattern.
* lisp/leim/quail/indian.el: Rename oriya-itrans to odia-itrans.
Rename oriya-inscript to odia-inscript.

* etc/HELLO: Rename Oriya to Odia.

* src/macfont.m: Rename Oriya to Odia.
---
 etc/HELLO                 |  4 ++--
 lisp/erc/erc-lang.el      | 11 ++++-------
 lisp/language/ind-util.el |  8 ++++----
 lisp/language/indian.el   | 20 ++++++++++----------
 lisp/ldefs-boot.el        |  2 +-
 lisp/leim/quail/indian.el | 14 +++++++-------
 src/macfont.m             |  2 +-
 7 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/etc/HELLO b/etc/HELLO
index ba7bd8e132..442439ba73 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -11,7 +11,7 @@ Non-ASCII examples:
           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> გამარჯობა
   Africa: <x-charset><param>ethiopic</param>ሠላም</x-charset>
   Middle/Near East:<x-charset><param>hebrew-iso8859-8</param> שָׁלוֹם,</x-charset> السّلام عليكم
-  South Asia: નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ଶୁଣିବେ,
+  South Asia: નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ନମସ୍କାର,
               ආයුබෝවන්, வணக்கம், నమస్కారం,<x-charset><param>tibetan</param> བཀྲ་ཤིས་བདེ་ལེགས༎</x-charset>
   South East Asia: ជំរាបសួរ,<x-charset><param>lao</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>
@@ -74,7 +74,7 @@ Modi (𑘦𑘻𑘚𑘲)	𑘡𑘦𑘭𑘿𑘎𑘰𑘨
 Mongolian (монгол хэл)	Сайн байна уу?
 Northern Thai (ᨣᩣᩴᨾᩮᩬᩥᨦ / ᨽᩣᩈᩣᩃ᩶ᩣ᩠ᨶᨶᩣ)	ᩈ᩠ᩅᩢᩔ᩠ᨯᩦᨣᩕᩢ᩠ᨸ
 Norwegian (norsk)	Hei / God dag
-Oriya (ଓଡ଼ିଆ)	ନମସ୍କାର
+Odia (ଓଡ଼ିଆ)	ନମସ୍କାର
 Polish  (język polski)	Dzień dobry! / Cześć!
 Russian (русский)	Здра́вствуйте!
 Sharada (𑆯𑆳𑆫𑆢𑆳)	𑆤𑆩𑆱𑇀𑆑𑆳𑆫
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index b65f4dbf6a..e01529c7f9 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -32,10 +32,7 @@
 
 (require 'erc)
 
-;; FIXME: It's ISO 639-1, not ISO 638.  ISO 638 is for paper, board and pulps.
-;; The Lisp variable should be renamed.
-
-(defvar iso-638-languages
+(defvar iso-639-1-languages
   '(("aa" . "Afar")
     ("ab" . "Abkhazian")
     ("af" . "Afrikaans")
@@ -197,12 +194,12 @@ iso-638-languages
 (defun language (code)
   "Return the language name for the ISO CODE."
   (interactive (list (completing-read "ISO language code: "
-				      iso-638-languages)))
-  (message "%s" (cdr (assoc code iso-638-languages))))
+				      iso-639-1-languages)))
+  (message "%s" (cdr (assoc code iso-639-1-languages))))
 
 (defun erc-cmd-LANG (language)
   "Display the language name for the language code given by LANGUAGE."
-  (let ((lang (cdr (assoc language iso-638-languages))))
+  (let ((lang (cdr (assoc language iso-639-1-languages))))
     (erc-display-message
      nil 'notice 'active
      (or lang (concat language ": No such domain"))))
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 60ada03fa2..dede705a30 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -113,7 +113,7 @@ indian-gjr-base-table
     (;; Inscript-extra (4)  (#, $, ^, *, ])
      "્ર" "ર્" "ત્ર" "શ્ર" "઼")))
 
-(defvar indian-ori-base-table
+(defvar indian-odi-base-table
   '(
     (;; VOWELS
      (?ଅ nil) (?ଆ ?ା) (?ଇ ?ି) (?ଈ ?ୀ) (?ଉ ?ୁ) (?ଊ ?ୂ)
@@ -303,7 +303,7 @@ indian-tml-base-digits-table
 (defvar indian-base-table-to-language-alist
   '((indian-dev-base-table . "Devanagari")
     (indian-pnj-base-table . "Punjabi")
-    (indian-ori-base-table . "Oriya")
+    (indian-odi-base-table . "Odia")
     (indian-bng-base-table . "Bengali")
     (indian-asm-base-table . "Assamese")
     (indian-tlg-base-table . "Telugu")
@@ -549,8 +549,8 @@ indian-gjr-itrans-v5-hash
   (indian-make-hash indian-gjr-base-table
 			  indian-itrans-v5-table))
 
-(defvar indian-ori-itrans-v5-hash
-  (indian-make-hash indian-ori-base-table
+(defvar indian-odi-itrans-v5-hash
+  (indian-make-hash indian-odi-base-table
 			  indian-itrans-v5-table))
 
 (defvar indian-bng-itrans-v5-hash
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index 257ecc1617..ee6bd16f69 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -83,13 +83,13 @@ 'devanagari
  '("Indian"))
 
 (set-language-info-alist
- "Oriya" '((charset unicode)
-	      (coding-system utf-8)
-	      (coding-priority utf-8)
-	      (input-method . "oriya-itrans")
-              (sample-text . "Oriya (ଓଡ଼ିଆ)	ନମସ୍କାର")
-	      (documentation . "\
-Such languages using Oriya script as Oriya, Khonti, and Santali
+ "Odia" '((charset unicode) ;; formerly Oriya
+	  (coding-system utf-8)
+	  (coding-priority utf-8)
+	  (input-method . "odia-itrans")
+          (sample-text . "Odia (ଓଡ଼ିଆ)	ନମସ୍କାର")
+	  (documentation . "\
+Such languages using Odia script as Odia, Khonti, and Santali
 are supported in this language environment."))
  '("Indian"))
 
@@ -334,7 +334,7 @@ gujarati-composable-pattern
      table))
   "Regexp matching a composable sequence of Gujarati characters.")
 
-(defconst oriya-composable-pattern
+(defconst odia-composable-pattern
   (let ((table
 	 '(("a" . "\u0B01")		; SIGN CANDRABINDU
 	   ("A" . "[\u0B02\u0B03]")	; SIGN ANUSVARA .. VISARGA
@@ -359,7 +359,7 @@ oriya-composable-pattern
       ;; any other singleton characters
       "X")
      table))
-  "Regexp matching a composable sequence of Oriya characters.")
+  "Regexp matching a composable sequence of Odia characters.")
 
 (defconst tamil-composable-pattern
   (let ((table
@@ -459,7 +459,7 @@ malayalam-composable-pattern
 	 (bengali . ,bengali-composable-pattern)
 	 (gurmukhi . ,gurmukhi-composable-pattern)
 	 (gujarati . ,gujarati-composable-pattern)
-	 (oriya . ,oriya-composable-pattern)
+	 (oriya . ,odia-composable-pattern)
 	 (tamil . ,tamil-composable-pattern)
 	 (telugu . ,telugu-composable-pattern)
 	 (kannada . ,kannada-composable-pattern)
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 95ad2f78cf..ade3e9c69c 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -11169,7 +11169,7 @@ "erc-ibuffer"
 ;;;### (autoloads nil "erc-lang" "erc/erc-lang.el" (0 0 0 0))
 ;;; Generated autoloads from erc/erc-lang.el
 
-(register-definition-prefixes "erc-lang" '("erc-cmd-LANG" "iso-638-languages" "language"))
+(register-definition-prefixes "erc-lang" '("erc-cmd-LANG" "iso-639-1-languages" "language"))
 
 ;;;***
 
diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el
index 95798a4477..e06464dc24 100644
--- a/lisp/leim/quail/indian.el
+++ b/lisp/leim/quail/indian.el
@@ -91,10 +91,10 @@ "\\''"
  "Gujarati transliteration by ITRANS method.")
 
 (if nil
-    (quail-define-package "oriya-itrans" "Oriya" "OriIT" t "Oriya ITRANS"))
+    (quail-define-package "odia-itrans" "Odia" "OdiIT" t "Odia ITRANS"))
 (quail-define-indian-trans-package
- indian-ori-itrans-v5-hash "oriya-itrans" "Oriya" "OriIT"
- "Oriya transliteration by ITRANS method.")
+ indian-odi-itrans-v5-hash "odia-itrans" "Odia" "OdiIT"
+ "Odia transliteration by ITRANS method.")
 
 (if nil
     (quail-define-package "bengali-itrans" "Bengali" "BngIT" t "Bengali ITRANS"))
@@ -469,11 +469,11 @@ inscript-tml-keytable
  "Gujarati keyboard Inscript.")
 
 (if nil
-    (quail-define-package "oriya-inscript" "Oriya" "OriIS" t "Oriya keyboard Inscript"))
+    (quail-define-package "odia-inscript" "Odia" "OdiIS" t "Odia keyboard Inscript"))
 (quail-define-inscript-package
- indian-ori-base-table inscript-dev-keytable
- "oriya-inscript" "Oriya" "OriIS"
- "Oriya keyboard Inscript.")
+ indian-odi-base-table inscript-dev-keytable
+ "odia-inscript" "Odia" "OdiIS"
+ "Odia keyboard Inscript.")
 
 (if nil
     (quail-define-package "bengali-inscript" "Bengali" "BngIS" t "Bengali keyboard Inscript"))
diff --git a/src/macfont.m b/src/macfont.m
index 4dd55e7746..9453a53123 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -808,7 +808,7 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char,
 	{
 	  CFIndex weight = mac_font_get_weight (font);
 
-	  /* Workaround for crash when displaying Oriya characters
+	  /* Workaround for crash when displaying Odia characters
 	     with Arial Unicode MS on OS X 10.11.  */
 	  if (weight == 5)
 	    val = 0;
-- 
2.36.1