Reorganize Panjabi/Punjabi and Lahnda orthographies (bug #19890)

The correct ISO 639 code for Pakistani/Western Panjabi seems to be 'lah',
not 'pa'. We are keeping 'pa_pk.orth' for compatiblity with glibc.

Signed-off-by: Behdad Esfahbod <behdad@behdad.org>

4 files changed, 54 insertions, 10 deletions

diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index f248e0e..a7290f4 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -181,7 +181,7 @@ ORTH = \
 	om.orth \
 	or.orth \
 	os.orth \
-	pa_in.orth \
+	pa.orth \
 	pl.orth \
 	ps_af.orth \
 	ps_pk.orth \
@@ -295,5 +295,6 @@ ORTH = \
 	su.orth \
 	ty.orth \
 	wal.orth \
-	za.orth
+	za.orth \
+	lah.orth
 #	^-------------- Add new orth files here
diff --git a/fc-lang/lah.orth b/fc-lang/lah.orth
new file mode 100644
index 0000000..c0321b6
--- /dev/null
+++ b/fc-lang/lah.orth
@@ -0,0 +1,35 @@
+#
+# fontconfig/fc-lang/lah.orth
+#
+# Copyright © 2009 Roozbeh Pournader
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of the author(s) not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission.  The author(s) make(s) no
+# representations about the suitability of this software for any purpose.  It
+# is provided "as is" without express or implied warranty.
+#
+# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# Lahnda (lah)
+#
+# This is basically Western Panjabi/Punjabi, or Panjabi for Pakistan. It is
+# written in the Arabic script, also known as Shahmukhi. According to
+# ISO 639-3, the 'pa/pan' language code does not include Pakistani Panjabi,
+# but 'lah' does:
+#   http://www.sil.org/iso639-3/documentation.asp?id=lah
+#   http://www.sil.org/iso639-3/documentation.asp?id=pan
+#
+# The letter list appears to be identical to Urdu. More research may be
+# needed for rare letters.
+include ur.orth
diff --git a/fc-lang/pa_in.orth b/fc-lang/pa.orth
index 1925291..1258850 100644
--- a/fc-lang/pa_in.orth
+++ b/fc-lang/pa.orth
@@ -1,19 +1,20 @@
 #
-# fontconfig/fc-lang/pa_in.orth
+# fontconfig/fc-lang/pa.orth
 #
 # Copyright © 2004 Red Hat, Inc.
+# Copyright © 2009 Roozbeh Pournader
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
 # the above copyright notice appear in all copies and that both that
 # copyright notice and this permission notice appear in supporting
-# documentation, and that the name of Red Hat not be used in
+# documentation, and that the name of the author(s) not be used in
 # advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission.  Red Hat makes no
+# specific, written prior permission.  The author(s) make(s) no
 # representations about the suitability of this software for any purpose.  It
 # is provided "as is" without express or implied warranty.
 #
-# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 # EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
@@ -21,7 +22,13 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# Panjabi/Punjabi in India (Gurmukhi script) (pa-IN)
+# Panjabi/Punjabi (pa)
+#
+# According to ISO 639-3, 'pa/pan' only applies to Panjabi as used in India:
+#   http://www.sil.org/iso639-3/documentation.asp?id=pan
+#
+# For Panjabi as used in Pakistan, use 'lah' or 'pa-PK':
+#   http://www.sil.org/iso639-3/documentation.asp?id=lah
 #
 # From Unicode coverage for Gurmukhi, with modifications based on
 # the 'Lohit Punjabi' font
diff --git a/fc-lang/pa_pk.orth b/fc-lang/pa_pk.orth
index deec216..fba09e3 100644
--- a/fc-lang/pa_pk.orth
+++ b/fc-lang/pa_pk.orth
@@ -23,6 +23,7 @@
 #
 # Panjabi/Punjabi in Pakistan (pa-PK)
 #
-# The letter list appears identical to Urdu. More research may be needed
-# for rare letters.
-include ur.orth
+# This file is kept for compatiblity for glibc: According to ISO 639-3, the
+# proper code for Pakistani Panjabi is 'lah'. See the file 'lah.orth' for
+# more information.
+include lah.orth