-# Urdu is written in a varient of Perso-Arabic, but I haven't found
-# any references which define the variations. So, for now we'll use Arabic
-# fonts
-include ar.orth
+# We are assuming that:
+# * Most fonts that claim to support an Arabic letter actually do so;
+# * Most modern text rendering software use OpenType tables, instead of
+# directly using presentation forms.
+# * Some good Arabic fonts do not support codepoints for Arabic presentation
+# forms.
+# Thus, we are switching to general forms of Arabic letters.
+#
+# General forms:
+0621-0624
+0626-063a
+0641-0642
+0644-0648
+0679
+067e
+0686
+0688
+0691
+0698
+06a9
+06af
+06ba
+06be
+06cc
+06d2
+# Presentations forms:
+#fb56-fb59
+#fb66-fb69
+#fb7a-fb7d
+#fb88-fb8d
+#fb8e-fb95
+#fb9e-fb9f
+#fbfc-fbff
+#fbaa-fbaf
+#fe80-fe86
+#fe89-fed8
+#fedd-feee
+##fef5-fef8 # These four happen very rarely
+#fefb-fefc