Merge remote-tracking branch 'origin/released'

5 files changed, 48 insertions, 7 deletions

diff --git a/fontconfig/fc-lang/Makefile.am b/fontconfig/fc-lang/Makefile.am
index 29cee5934..628796054 100644
--- a/fontconfig/fc-lang/Makefile.am
+++ b/fontconfig/fc-lang/Makefile.am
@@ -299,5 +299,6 @@ ORTH = \
 	ty.orth \
 	wal.orth \
 	za.orth \
-	lah.orth
+	lah.orth \
+	nqo.orth
 #	^-------------- Add new orth files here
diff --git a/fontconfig/fc-lang/ast.orth b/fontconfig/fc-lang/ast.orth
index 634f07910..55aaed512 100644
--- a/fontconfig/fc-lang/ast.orth
+++ b/fontconfig/fc-lang/ast.orth
@@ -41,3 +41,7 @@
 00f3
 00fa
 00fc
+1e24
+1e25
+1e36
+1e37
diff --git a/fontconfig/fc-lang/ks.orth b/fontconfig/fc-lang/ks.orth
index e86ba0df0..6697e1521 100644
--- a/fontconfig/fc-lang/ks.orth
+++ b/fontconfig/fc-lang/ks.orth
@@ -23,8 +23,10 @@
 #
 # Kashmiri (ks)
 #
-# Kashmiri is written in Arabic in both India and Pakistan. The problem is,
-# Unicode 5.1 does not contain all the letters required in the orthography,
-# including Wavy Hamza Below and the Alef Maksura With Ring Below. We'll
-# just include Urdu for now.
 include ur.orth
+0620
+0657
+065f
+0672
+0673
+06c4
diff --git a/fontconfig/fc-lang/nqo.orth b/fontconfig/fc-lang/nqo.orth
new file mode 100644
index 000000000..285e1d79c
--- /dev/null
+++ b/fontconfig/fc-lang/nqo.orth
@@ -0,0 +1,31 @@
+#
+# fontconfig/fc-lang/nqo.orth
+#
+# Copyright © 2011 Akira TAGOH
+#
+# 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 authors make no
+# representations about the suitability of this software for any purpose.  It
+# is provided "as is" without express or implied warranty.
+#
+# THE AUTHOR(S) DISCLAIMS 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.
+#
+# N'Ko (nqo)
+#
+# See:
+#  http://www.unicode.org/charts/PDF/U07C0.pdf
+#  http://en.wikipedia.org/wiki/N'Ko_alphabet
+#
+07c0-07ff
+
diff --git a/fontconfig/fc-lang/ur.orth b/fontconfig/fc-lang/ur.orth
index 57f724d10..5b39a50cb 100644
--- a/fontconfig/fc-lang/ur.orth
+++ b/fontconfig/fc-lang/ur.orth
@@ -34,9 +34,11 @@
 #
 # General forms:
 0621-0624
-0626-063a
+0626-0628
+063a
 0641-0642
-0644-0648
+0644-0646
+0648
 0679
 067e
 0686
@@ -47,6 +49,7 @@
 06af
 06ba
 06be
+06c3
 06cc
 06d2
 # Presentations forms: