bug#55493: [PATCH] Rename Oriya to Odia

bug#55493: [PATCH] Rename Oriya to Odia

[समीर सिंह Sameer Singh]

[-- Attachment #1.1: Type: text/plain, Size: 548 bytes --]

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.

[-- Attachment #1.2: Type: text/html, Size: 784 bytes --]

[-- Attachment #2: 0001-Rename-Oriya-to-Odia.patch --]
[-- Type: text/x-patch, Size: 10007 bytes --]

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?= <lumarzeli30@gmail.com>
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"))
 
 ;;;***
 \f
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

bug#55493: [PATCH] Rename Oriya to Odia

[Visuwesh]

[புதன் மே 18, 2022] समीर सिंह Sameer Singh wrote:

> 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.

In the interest of preserving backward compatibility, I think we should
define indian-ori-base-table and indian-ori-itrans-v5-hash an obsolete
alias of indian-odi-base-table and indian-odi-itrans-v5-hash.  I don't
think we can do such a thing for the language environments or the input
methods tho.  We also need to announce these changes in NEWS.

I think we should include the bill link in the commit message for future
readers.

bug#55493: [PATCH] Rename Oriya to Odia

[Eli Zaretskii]

> Cc: 55493@debbugs.gnu.org
> From: Visuwesh <visuweshm@gmail.com>
> Date: Wed, 18 May 2022 09:57:56 +0530
> 
> I think we should include the bill link in the commit message for future
> readers.

We could point to that in the commit log message.

bug#55493: [PATCH] Rename Oriya to Odia

[समीर सिंह Sameer Singh]

[-- Attachment #1: Type: text/plain, Size: 2210 bytes --]

>
> The changes to HELLO do more that the above says.  I don't think I
> understand the reason for the change in the "South Asia" line.


The South Asia line was correcting the Odia greeting, which I had changed
previously (from "Listen" to "Namaskaar")

This is unrelated, and I see no reason to rename the variable in a
> backward-incompatible way.  It's just a variable, so it doesn't have
> to be named rigorously correct.  If we were discussing new code, the
> correction would have had its place, but not now, 16 years after it
> was introduced.
>

This variable name is somewhat misleading. When I searched "iso 638",
online to see whether the language codes were updated or not,
 it showed me results for oven boards, later when searching "iso 638
languages" I realized that the correct standard number is 639.
There was also a FIXME above it, so I fixed that.
If there is a backward-compatible way to change it please tell me, or if
you still feel the change is not warranted, I will revert this it.

I don't think we should rename variables and functions.  It's just a
> lot of hassle for us (defalias etc.) and potentially for others, and
> the gain is very small.  This variable doesn't even say "oriya", just
> "ori".  Let's not be too radical here.
>

Then I should only rename in etc/HELLO, and in (set-language-info-alist) of
lisp/language/indian.el.

We cannot rename an input method we had for almost 20 years.  If there
> is some way of having an alias for an input method (I don't think so,
> but maybe I'm missing something), let's use that; otherwise we will
> have either to leave the old name alone or define a new input method
> that is an exact copy of the old one, except for the name and the
> mode-line indicator.
>

How about I make a new Odia input system, just like the ones which I had
made for the other scripts, and leave the old ones alone?

On Wed, May 18, 2022 at 6:18 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > Cc: 55493@debbugs.gnu.org
> > From: Visuwesh <visuweshm@gmail.com>
> > Date: Wed, 18 May 2022 09:57:56 +0530
> >
> > I think we should include the bill link in the commit message for future
> > readers.
>
> We could point to that in the commit log message.
>

[-- Attachment #2: Type: text/html, Size: 3541 bytes --]

bug#55493: [PATCH] Rename Oriya to Odia

[Eli Zaretskii]

> From: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
> Date: Wed, 18 May 2022 21:08:09 +0530
> Cc: Visuwesh <visuweshm@gmail.com>, 55493@debbugs.gnu.org
> 
>  The changes to HELLO do more that the above says.  I don't think I
>  understand the reason for the change in the "South Asia" line.
> 
> The South Asia line was correcting the Odia greeting, which I had changed previously (from "Listen" to
> "Namaskaar") 

Please reflect that in the log message.

>  This is unrelated, and I see no reason to rename the variable in a
>  backward-incompatible way.  It's just a variable, so it doesn't have
>  to be named rigorously correct.  If we were discussing new code, the
>  correction would have had its place, but not now, 16 years after it
>  was introduced.
> 
> This variable name is somewhat misleading. When I searched "iso 638", online to see whether the language
> codes were updated or not,
>  it showed me results for oven boards, later when searching "iso 638 languages" I realized that the correct
> standard number is 639.
> There was also a FIXME above it, so I fixed that.
> If there is a backward-compatible way to change it please tell me, or if you still feel the change is not
> warranted, I will revert this it.

A backward-compatible change would need to introduce an obsolete alias
with the old name.

>  I don't think we should rename variables and functions.  It's just a
>  lot of hassle for us (defalias etc.) and potentially for others, and
>  the gain is very small.  This variable doesn't even say "oriya", just
>  "ori".  Let's not be too radical here.
> 
> Then I should only rename in etc/HELLO, and in (set-language-info-alist) of lisp/language/indian.el.

Yes, I think so.

>  We cannot rename an input method we had for almost 20 years.  If there
>  is some way of having an alias for an input method (I don't think so,
>  but maybe I'm missing something), let's use that; otherwise we will
>  have either to leave the old name alone or define a new input method
>  that is an exact copy of the old one, except for the name and the
>  mode-line indicator.
> 
> How about I make a new Odia input system, just like the ones which I had made for the other scripts, and
> leave the old ones alone?

By "input system", do you mean a separate language-environment with a
separate input method?  That would be OK, I think.

Thanks.

bug#55493: [PATCH] Rename Oriya to Odia

[समीर सिंह Sameer Singh]

[-- Attachment #1: Type: text/plain, Size: 2904 bytes --]

>
> By "input system", do you mean a separate language-environment with a
> separate input method?  That would be OK, I think


I meant to say, "input method".
Is there a need for a separate language-environment?
I think only writing a new input-method  will be sufficient, right?

On Wed, May 18, 2022 at 9:27 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
> > Date: Wed, 18 May 2022 21:08:09 +0530
> > Cc: Visuwesh <visuweshm@gmail.com>, 55493@debbugs.gnu.org
> >
> >  The changes to HELLO do more that the above says.  I don't think I
> >  understand the reason for the change in the "South Asia" line.
> >
> > The South Asia line was correcting the Odia greeting, which I had
> changed previously (from "Listen" to
> > "Namaskaar")
>
> Please reflect that in the log message.
>
> >  This is unrelated, and I see no reason to rename the variable in a
> >  backward-incompatible way.  It's just a variable, so it doesn't have
> >  to be named rigorously correct.  If we were discussing new code, the
> >  correction would have had its place, but not now, 16 years after it
> >  was introduced.
> >
> > This variable name is somewhat misleading. When I searched "iso 638",
> online to see whether the language
> > codes were updated or not,
> >  it showed me results for oven boards, later when searching "iso 638
> languages" I realized that the correct
> > standard number is 639.
> > There was also a FIXME above it, so I fixed that.
> > If there is a backward-compatible way to change it please tell me, or if
> you still feel the change is not
> > warranted, I will revert this it.
>
> A backward-compatible change would need to introduce an obsolete alias
> with the old name.
>
> >  I don't think we should rename variables and functions.  It's just a
> >  lot of hassle for us (defalias etc.) and potentially for others, and
> >  the gain is very small.  This variable doesn't even say "oriya", just
> >  "ori".  Let's not be too radical here.
> >
> > Then I should only rename in etc/HELLO, and in (set-language-info-alist)
> of lisp/language/indian.el.
>
> Yes, I think so.
>
> >  We cannot rename an input method we had for almost 20 years.  If there
> >  is some way of having an alias for an input method (I don't think so,
> >  but maybe I'm missing something), let's use that; otherwise we will
> >  have either to leave the old name alone or define a new input method
> >  that is an exact copy of the old one, except for the name and the
> >  mode-line indicator.
> >
> > How about I make a new Odia input system, just like the ones which I had
> made for the other scripts, and
> > leave the old ones alone?
>
> By "input system", do you mean a separate language-environment with a
> separate input method?  That would be OK, I think.
>
> Thanks.
>

[-- Attachment #2: Type: text/html, Size: 3915 bytes --]

bug#55493: [PATCH] Rename Oriya to Odia

[Eli Zaretskii]

> From: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
> Date: Wed, 18 May 2022 21:50:13 +0530
> Cc: Visuwesh <visuweshm@gmail.com>, 55493@debbugs.gnu.org
> 
>  By "input system", do you mean a separate language-environment with a
>  separate input method?  That would be OK, I think
> 
> I meant to say, "input method".

It's okay to have a separate input method, yes.

> Is there a need for a separate language-environment?
> I think only writing a new input-method  will be sufficient, right?

Yes, I hope so.

bug#55493: [PATCH] Rename Oriya to Odia

[समीर सिंह Sameer Singh]

[-- Attachment #1.1: Type: text/plain, Size: 708 bytes --]

Here is the latest patch.

Please review this.
Thank You.

On Wed, May 18, 2022 at 10:20 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
> > Date: Wed, 18 May 2022 21:50:13 +0530
> > Cc: Visuwesh <visuweshm@gmail.com>, 55493@debbugs.gnu.org
> >
> >  By "input system", do you mean a separate language-environment with a
> >  separate input method?  That would be OK, I think
> >
> > I meant to say, "input method".
>
> It's okay to have a separate input method, yes.
>
> > Is there a need for a separate language-environment?
> > I think only writing a new input-method  will be sufficient, right?
>
> Yes, I hope so.
>

[-- Attachment #1.2: Type: text/html, Size: 1299 bytes --]

[-- Attachment #2: 0001-Rename-Oriya-to-Odia.patch --]
[-- Type: text/x-patch, Size: 8381 bytes --]

From abe6d6a5ec5f3201141233b8de81f039a8525ff4 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?= <lumarzeli30@gmail.com>
Date: Thu, 19 May 2022 01:08:14 +0530
Subject: [PATCH] Rename Oriya to Odia

Due to "The Orissa (Alteration of Name) Act, 2011"
(https://legislative.gov.in/sites/default/files/A2011-15.pdf)
Oriya has been renamed to Odia.

* lisp/language/indian.el:
(set-language-info-alist): Rename Oriya to Odia.
Improve Oriya composition rules.
* lisp/leim/quail/indian.el ("odia"): New input method.
* lisp/erc/erc-lang.el: Obsolete the iso-638-languages variable
and replace it with iso-639-1-languages.

* etc/HELLO: Rename Oriya to Odia.
Replace the old Odia greeting with the new one.
Add a Hindi greeting separate from the Devanagari one.
(Bug#55493)
---
 etc/HELLO                 |   6 +-
 lisp/erc/erc-lang.el      |  12 ++--
 lisp/language/indian.el   |  19 ++++---
 lisp/leim/quail/indian.el | 116 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 135 insertions(+), 18 deletions(-)

diff --git a/etc/HELLO b/etc/HELLO
index ba7bd8e132..c051a9213c 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>
@@ -56,6 +56,7 @@ Greek, ancient (ἑλληνική)	Οὖλέ τε καὶ μέγα χαῖρε
 Gujarati (ગુજરાતી)	નમસ્તે
 Gurmukhi (ਗੁਰਮੁਖੀ)	ਸਤ ਸ੍ਰੀ ਅਕਾਲ
 Hebrew (עִבְרִית)	שָׁלוֹם
+Hindi (हिन्दी)	प्रणाम / पाय लागू
 Hungarian (magyar)	Szép jó napot!
 Inuktitut (ᐃᓄᒃᑎᑐᑦ)	ᐊᐃ
 Italian (italiano)	Ciao / Buon giorno
@@ -74,7 +76,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..d059caf5a3 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -32,10 +32,8 @@
 
 (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
+(define-obsolete-variable-alias 'iso-638-languages 'iso-639-1-languages "29.1")
+(defvar iso-639-1-languages
   '(("aa" . "Afar")
     ("ab" . "Abkhazian")
     ("af" . "Afrikaans")
@@ -197,12 +195,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/indian.el b/lisp/language/indian.el
index 257ecc1617..fccf3c0c0a 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -83,14 +83,15 @@ '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
-are supported in this language environment."))
+ "Odia" '((charset unicode)
+	  (coding-system utf-8)
+	  (coding-priority utf-8)
+	  (input-method . "odia")
+          (sample-text . "Odia (ଓଡ଼ିଆ)	ନମସ୍କାର")
+	  (documentation . "\
+Such languages using the Odia script as Odia, Khonti, and Santali
+are supported in this language environment (formerly the Oriya
+language environment)."))
  '("Indian"))
 
 (set-language-info-alist
@@ -339,7 +340,7 @@ oriya-composable-pattern
 	 '(("a" . "\u0B01")		; SIGN CANDRABINDU
 	   ("A" . "[\u0B02\u0B03]")	; SIGN ANUSVARA .. VISARGA
 	   ("V" . "[\u0B05-\u0B14\u0B60\u0B61]") ; independent vowel
-	   ("C" . "[\u0B15-\u0B39\u0B5C\u0B5D\u0B71]")	; consonant
+	   ("C" . "[\u0B15-\u0B39\u0B5C\u0B5D\u0B5F\u0B71]")	; consonant
 	   ("B" . "[\u0B15-\u0B17\u0B1B-\u0B1D\u0B1F-\u0B21\u0B23\u0B24\u0B27-\u0B30\u0B32-\u0B35\u0B38\u0B39]") ; consonant with below form
 	   ("R" . "\u0B30")		; RA
 	   ("n" . "\u0B3C")		; NUKTA
diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el
index 95798a4477..b76cf9a80d 100644
--- a/lisp/leim/quail/indian.el
+++ b/lisp/leim/quail/indian.el
@@ -1449,4 +1449,120 @@ "||"
 ("M"  ?𑘽)
 )
 
+(quail-define-package
+ "odia" "Odia" "ଓ" t "Odia phonetic input method.
+
+ `\\=`' is used to switch levels instead of Alt-Gr.
+" nil t t t t nil nil nil nil nil t)
+
+(quail-define-rules
+("``" ?₹)
+("1"  ?୧)
+("`1" ?1)
+("`!" ?୲)
+("2"  ?୨)
+("`2" ?2)
+("`@" ?୳)
+("3"  ?୩)
+("`3" ?3)
+("`#" ?୴)
+("4"  ?୪)
+("`4" ?4)
+("`$" ?୵)
+("5"  ?୫)
+("`5" ?5)
+("`%" ?୶)
+("6"  ?୬)
+("`6" ?6)
+("`^" ?୷)
+("7"  ?୭)
+("`7" ?7)
+("8"  ?୮)
+("`8" ?8)
+("9"  ?୯)
+("`9" ?9)
+("0"  ?୦)
+("`0" ?0)
+("`\\" ?।)
+("`|" ?॥)
+("`"  ?ଟ)
+("q"  ?ଟ)
+("Q"  ?ଠ)
+("`q" ?୰)
+("`Q" ?୕)
+("w"  ?ଡ)
+("W"  ?ଢ)
+("`w" ?ଡ଼)
+("`W" ?ଢ଼)
+("e"  ?େ)
+("E"  ?ୈ)
+("`e" ?ଏ)
+("`E" ?ଐ)
+("r"  ?ର)
+("R"  ?ୃ)
+("`r" ?ଋ)
+("t"  ?ତ)
+("T"  ?ଥ)
+("`t" ?ୖ)
+("`T" ?ୗ)
+("y"  ?ଯ)
+("Y"  ?ୟ)
+("u"  ?ୁ)
+("U"  ?ୂ)
+("`u" ?ଉ)
+("`U" ?ଊ)
+("i"  ?ି)
+("I"  ?ୀ)
+("`i" ?ଇ)
+("`I" ?ଈ)
+("o"  ?ୋ)
+("O"  ?ୌ)
+("`o" ?ଓ)
+("`O" ?ଔ)
+("p"  ?ପ)
+("P"  ?ଫ)
+("a"  ?ା)
+("A"  ?ଆ)
+("`a" ?ଅ)
+("s"  ?ସ)
+("S"  ?ଶ)
+("d"  ?ଦ)
+("D"  ?ଧ)
+("f"  ?୍)
+("F"  ?ୄ)
+("`f" ?ୠ)
+("g"  ?ଗ)
+("G"  ?ଘ)
+("h"  ?ହ)
+("H"  ?ଃ)
+("j"  ?ଜ)
+("J"  ?ଝ)
+("k"  ?କ)
+("K"  ?ଖ)
+("l"  ?ଲ)
+("L"  ?ଳ)
+("`l" ?ୢ)
+("`L" ?ଌ)
+("z"  ?ଞ)
+("Z"  ?ଙ)
+("`z" ?ୣ)
+("`Z" ?ୡ)
+("x"  ?ଷ)
+("X"  ?଼)
+("c"  ?ଚ)
+("C"  ?ଛ)
+("`c" #x200C)  ; ZWNJ
+("`C" #x200D)  ; ZWJ
+("v"  ?ଵ)
+("V"  ?ୱ)
+("b"  ?ବ)
+("B"  ?ଭ)
+("n"  ?ନ)
+("N"  ?ଣ)
+("m"  ?ମ)
+("M"  ?ଂ)
+("`m" ?ଁ)
+("`M" ?ଽ)
+)
+
 ;;; indian.el ends here
-- 
2.36.1

bug#55493: [PATCH] Rename Oriya to Odia

[Eli Zaretskii]

> From: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
> Date: Thu, 19 May 2022 02:02:40 +0530
> Cc: Visuwesh <visuweshm@gmail.com>, 55493@debbugs.gnu.org
> 
> Here is the latest patch.

Thanks, I installed it.  I also added an "Oriya" language-environment,
which is an exact copy of "Odia", so that people could still activate
it under the old name.

bug#55493: [PATCH] Rename Oriya to Odia

[समीर सिंह Sameer Singh]

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

Great Thanks !

On Thu, May 19, 2022 at 6:06 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
> > Date: Thu, 19 May 2022 02:02:40 +0530
> > Cc: Visuwesh <visuweshm@gmail.com>, 55493@debbugs.gnu.org
> >
> > Here is the latest patch.
>
> Thanks, I installed it.  I also added an "Oriya" language-environment,
> which is an exact copy of "Odia", so that people could still activate
> it under the old name.
>

[-- Attachment #2: Type: text/html, Size: 1028 bytes --]

bug#55493: [PATCH] Rename Oriya to Odia

[Eli Zaretskii]

> From: समीर सिंह Sameer Singh
>  <lumarzeli30@gmail.com>
> 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.

Thanks.

In general, this patch is too radical, and unnecessarily so.

> * etc/HELLO: Rename Oriya to Odia.

The changes to HELLO do more that the above says.  I don't think I
understand the reason for the change in the "South Asia" line.

Also, please include the bug number in the commit log message.

> -;; 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

This is unrelated, and I see no reason to rename the variable in a
backward-incompatible way.  It's just a variable, so it doesn't have
to be named rigorously correct.  If we were discussing new code, the
correction would have had its place, but not now, 16 years after it
was introduced.

> 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

I don't think we should rename variables and functions.  It's just a
lot of hassle for us (defalias etc.) and potentially for others, and
the gain is very small.  This variable doesn't even say "oriya", just
"ori".  Let's not be too radical here.

> @@ -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))

Likewise here (and elsewhere in similar changes).

>  (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"))

The doc string should say that this language environment was
previously named "Oriya".

> 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

This file is regenerated automatically, so this part should be
omitted.

> 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"))

We cannot rename an input method we had for almost 20 years.  If there
is some way of having an alias for an input method (I don't think so,
but maybe I'm missing something), let's use that; otherwise we will
have either to leave the old name alone or define a new input method
that is an exact copy of the old one, except for the name and the
mode-line indicator.

> -	  /* Workaround for crash when displaying Oriya characters
> +	  /* Workaround for crash when displaying Odia characters

This is incorrect: characters are named by Unicode, and Unicode still
calls that block Oriya (and will not change the name, AFAIU).

bug#55493: [PATCH] Rename Oriya to Odia

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > >  (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"))

What you said about input methods applies here too.  We should add the
"Odia" item and keep the "Oriya" item (though updating its doc
string).

-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

bug#55493: [PATCH] Rename Oriya to Odia

[समीर सिंह Sameer Singh]

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

>
> What you said about input methods applies here too.  We should add the
> "Odia" item and keep the "Oriya" item (though updating its doc
> string).
>

Hasn't  Eli already done that? Check commit:
99be0cfcd92d7400d65fdbfd0142e1fc619e4f1f

On Fri, May 20, 2022 at 4:43 AM Richard Stallman <rms@gnu.org> wrote:

> [[[ To any NSA and FBI agents reading my email: please consider    ]]]
> [[[ whether defending the US Constitution against all enemies,     ]]]
> [[[ foreign or domestic, requires you to follow Snowden's example. ]]]
>
>   > >  (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"))
>
> What you said about input methods applies here too.  We should add the
> "Odia" item and keep the "Oriya" item (though updating its doc
> string).
>
> --
> Dr Richard Stallman (https://stallman.org)
> Chief GNUisance of the GNU Project (https://gnu.org)
> Founder, Free Software Foundation (https://fsf.org)
> Internet Hall-of-Famer (https://internethalloffame.org)
>
>
>

[-- Attachment #2: Type: text/html, Size: 2864 bytes --]

bug#55493: [PATCH] Rename Oriya to Odia

[Eli Zaretskii]

> From: Richard Stallman <rms@gnu.org>
> Cc: lumarzeli30@gmail.com, 55493@debbugs.gnu.org
> Date: Thu, 19 May 2022 19:13:12 -0400
> 
>   > >  (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"))
> 
> What you said about input methods applies here too.  We should add the
> "Odia" item and keep the "Oriya" item (though updating its doc
> string).

In a later message I said I did exactly that.

bug#55493: [PATCH] Rename Oriya to Odia

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > In a later message I said I did exactly that.

Thank you.

Sorry, I am always backlogged and behind on mail.

-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)