xetex-devanagari, new maps (23jul11)

git-svn-id: svn://tug.org/texlive/trunk@23223 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 735 insertions, 40 deletions

diff --git a/Master/texmf-dist/doc/xetex/xetex-devanagari/changelog b/Master/texmf-dist/doc/xetex/xetex-devanagari/changelog
new file mode 100644
index 00000000000..4fa40feaf93
--- /dev/null
+++ b/Master/texmf-dist/doc/xetex/xetex-devanagari/changelog
@@ -0,0 +1,17 @@
+xetex-devanagari (0.4) UNRLEASED; urgency=low
+
+  * added velthuis.map, velthuis-sanskrit.map and
+    devanagari-numerals.map from the velthuis packet (thanks to Zdeněk Wagner).
+  * removed versioning from harvardkyoto.map.
+
+ -- Daniel Stender <daniel@danielstender.com>  Thu, 21 Jul 2011 11:51:28 +0200
+
+xetex-devanagari (0.3) released; urgency=low
+
+  * changed revision numbering (0.2 was 0.99a).
+  * created changelog.
+  * harvardkyoto.map: ॐ (U+0950) is now reached through "OM".
+  * iast.map: changed input entity for "vocalic long r" from <U+1E5B U+0304>
+    (with combined mark) to U+1E5D (LATIN SMALL LETTER R WITH DOT BELOW AND MACRON).
+    
+ -- Daniel Stender <daniel@danielstender.com>  Fri, 08 Jul 2011 15:51:49 +0200
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/README b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/README
index 10d4d474dde..33aa073e120 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/README
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/README
@@ -1,67 +1,121 @@
-## xetex-devanagari 0.99a
+xetex-devanagari 0.4
+====================
 
-(based on velthuis-sanskrit.map by Zdeněk Wagner)
+XeTeX input mappings for convenient typesetting of Unicode Devanagari
+(0900-097F)
 
-XeTeX input mappings for convenient Unicode Devanagari (0900-097F) typesetting. 
-To be processed with teckit_compile ([http://scripts.sil.org/TECkit](http://scripts.sil.org/TECkit)).
+To be processed with teckit_compile (http://scripts.sil.org/TECkit)
 
-#### harvardkyoto.map
+Maintained by Daniel Stender <daniel@danielstender.com>
 
-Input coding:
+Location on CTAN:
+http://www.ctan.org/tex-archive/macros/xetex/generic/devanagari
 
-A = ā, I = ī, U= ū, R = ṛ, RR = ṝ, L = ḷ
+Pease report bugs to:
+https://github.com/danstender/xetex-devanagari/issues
 
-G = ṅ, J = ñ
+Enjoy!
+
+Velthuis maps
+-------------
+
+velthuis.map, velthuis-sanskrit.map and devanagarinumerals.map taken
+over from the Velthuis packet (much thanks to Zdeněk Wagner).
+devanagarinumerals.tec is the simplest way to turn automatically
+generated counters to Devanagari (XeTeX displays the numbers in
+Devanagari while applications like Xindy could work with the original
+Arabic numbering).
 
-T = ṭ, D = ḍ, N = ṇ
+velthuis-sanskrit.map (for Sanskrit)
 
-z = ś, S = ṣ
+Input encoding includes:
 
-M = Anusvara, H = Visarga, , = Virama, ' = Avagraha
+-   aa = ā, ii = ī, uu = ū, .r = ṛ, .R = ṝ, .l = ḷ, .L
 
-.l = ऴ, .m = Anunasika, - = Anudatta (Rv), ! = Svarita (Rv), om = ॐ
+-   "n = ṅ, ~n = ñ, .t = ṭ, .d = ḍ, .n = ṇ, "s = ś, .s = ṣ
 
-q = क़, x = ख़, .g = ग़, .z = ज़, f = फ़, .r = ड़, .R = ढ़
+-   .m = Anusvara, .h = Visarga, .a = Avagraha, .o = ॐ, @ = °
+
+For a complete list of Velthuis input scheme cf. the manual of the
+Velthuis packet, p. 6.
 
 Usage like:
 
-	\documentclass{article}
+    \documentclass{article}
 
-	\usepackage{fontspec}
-	\setmainfont[Script=Devanagari,Mapping=harvardkyoto]{Devanagari2003}
+    \usepackage{fontspec}
+    \setmainfont[Script=Devanagari,Mapping=velthuis-sanskrit]{Sanskrit 2003}
 
-	\begin{document}
-	dharmakSetre kurukSetre samavetA yuyutsavaH | \\
-	mAmakAH pANDavAzcaiva kimakurvata saMjaya ||
+    \begin{document}
+    dharmak.setre kuruk.setre samavetaa yuyutsava.h | \\
+    maamakaa.h paa.n.davaa"scaiva kimakurvata sa.mjaya ||
+    \end{document}
 
-	a-gnimI!.le pu-rohi!taM ya-jJasya! de-vamR-tvijaM! | \\
-	hotA!raM ratna-dhA!tamaM ||
+velthuis.map (for Hindi)
 
-	tumase itanI cau.rI nadI pAr karate nahIM banegA |
-	\end{document}
+Input encoding includes:
 
-#### iast.map
+-   qa = क़, .kha = ख़, .ga = ग़, za = ज़, Ra = ड़, Rha = ढ़, fa = फ़, La = ळ
 
-Input coding includes IAST Unicode entities:
+Usage like:
+
+    \documentclass{article}
+
+    \usepackage{fontspec}
+    \setmainfont[Script=Devanagari,Mapping=velthuis]{Nakula}
+
+    \begin{document}
+    am.rt ek cho.te se ghaRe meM samudr ke tal meM sthit thaa| devataa aur asur
+    use nikaalane ke lie samudr ko mathanaa caahate the|
+    \end{document}
+
+harvardkyoto.map
+----------------
+
+Input coding includes:
+
+-   A = ā, I = ī, U= ū, R = ṛ, RR = ṝ, L = ḷ
 
-ā ī ū ṛ ṝ (1E5B 0304) ḷ ṅ ñ ṭ ḍ ṇ ś ṣ ṃ ḥ
+-   G = ṅ, J = ñ, T = ṭ, D = ḍ, N = ṇ, z = ś, S = ṣ
+
+-   M = Anusvara, H = Visarga, , = Virama, ' = Avagraha
+
+-   .l = ऴ, .m = Anunasika, - = Anudatta (Rv), ! = Svarita (Rv), OM = ॐ
+
+-   q = क़, x = ख़, .g = ग़, .z = ज़, f = फ़, .r = ड़, .R = ढ़
 
 Usage like:
 
-	\documentclass{article}
+    \documentclass{article}
 
-	\usepackage{fontspec}
-	\setmainfont[Script=Devanagari,Mapping=iast]{Devanagari2003}
+    \usepackage{fontspec}
+    \setmainfont[Script=Devanagari,Mapping=harvardkyoto]{Sanskrit 2003}
 
-	\begin{document}
-	dharmakṣetre kurukṣetre samavetā yuyutsavaḥ | \\
-	māmakāḥ pāṇḍavāścaiva kimakurvata saṃjaya ||
-	\end{document}
+    \begin{document}
+    dharmakSetre kurukSetre samavetA yuyutsavaH | \\
+    mAmakAH pANDavAzcaiva kimakurvata saMjaya ||
 
-Please report bugs to: [https://github.com/danstender/xetex-devanagari/issues](https://github.com/danstender/xetex-devanagari/issues)
+    a-gnimI!.le pu-rohi!taM ya-jJasya! de-vamR-tvijaM! | \\
+    hotA!raM ratna-dhA!tamaM ||
 
-Enjoy!
+    tumase itanI cau.rI nadI pAr karate nahIM banegA |
+    \end{document}
+
+iast.map
+--------
+
+Input coding includes IAST Unicode entities:
+
+-   ā ī ū ṛ ṝ (1E5D) ḷ ṅ ñ ṭ ḍ ṇ ś ṣ ṃ ḥ
+
+Usage like:
+
+    \documentclass{article}
 
-(C) 2008-2011 Daniel Stender ([daniel@danielstender.com](mailto:daniel@danielstender.com))
+    \usepackage{fontspec}
+    \setmainfont[Script=Devanagari,Mapping=iast]{Sanskrit 2003}
 
-[http://www.danielstender.com/granthinam](http://www.danielstender.com/granthinam)
+    \begin{document}
+    dharmakṣetre kurukṣetre samavetā yuyutsavaḥ | \\
+    māmakāḥ pāṇḍavāścaiva kimakurvata saṃjaya ||
+    \end{document}
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/devanagarinumerals.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/devanagarinumerals.map
new file mode 100644
index 00000000000..c55b7e65b6b
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/devanagarinumerals.map
@@ -0,0 +1,21 @@
+; $Id: devanagarinumerals.map,v 1.1 2007-07-15 14:47:55 icebearsoft Exp $
+; TECkit mapping for conversion of arabic numerals to devanagari numerals
+LHSName "Devanagari-numerals"
+RHSName "UNICODE"
+LHSDescription "Arabic numerals"
+RHSDescription "Devanagari numerals"
+Version "1"
+Contact "http://devnag.sarovar.org"
+
+pass(Unicode)
+
+U+0030	>	U+0966
+U+0031	>	U+0967
+U+0032	>	U+0968
+U+0033	>	U+0969
+U+0034	>	U+096A
+U+0035	>	U+096B
+U+0036	>	U+096C
+U+0037	>	U+096D
+U+0038	>	U+096E
+U+0039	>	U+096F
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/devanagarinumerals.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/devanagarinumerals.tec
new file mode 100644
index 00000000000..4f6b6d9fc75
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/devanagarinumerals.tec
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.map
index bab86328539..bad444eea4d 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.map
@@ -1,7 +1,6 @@
 LHSName "harvardkyoto"
 RHSName "Unicode"
 LHSDescription "Harvard/Kyoto input method for Unicode Devanagari"
-Version "0.91c"
 Contact "daniel@danielstender.com"
 
 Define dot U+002E
@@ -52,6 +51,9 @@ Define q U+0071
 Define f U+0066
 Define x U+0078
 
+Define O U+004F
+Define M U+004D
+
 Define vstroke	U+0951
 Define hstroke  U+0952
 
@@ -205,7 +207,7 @@ anudatta > hstroke
 dot l > rla
 dot m > anunasika
 
-o m > om
+O M > om
 
 U+004D > anusvara
 U+0048 > visarga
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.tec
index 8decbd98c14..0f5df79f51c 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.tec
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.tec
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.map
index 0a2f99445fd..82280b59536 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.map
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.map
@@ -14,7 +14,7 @@ Define I U+012B
 Define u U+0075
 Define U U+016B
 Define R U+1E5B
-Define RR U+1E5B U+0304
+Define RR U+1E5D
 Define L U+1E37
 
 Define e U+0065		; siehe unten, ai und au sind zusammengesetzt, "a i" usw.
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.tec
index 770d5d6dfaf..17c78f91b04 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.tec
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.tec
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis-sanskrit.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis-sanskrit.map
new file mode 100644
index 00000000000..175ca3386b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis-sanskrit.map
@@ -0,0 +1,303 @@
+; $Id: velthuis-sanskrit.map,v 1.2 2008-03-12 19:41:03 icebearsoft Exp $
+; TECkit mapping for conversion of Velthuis transliteration
+; into UTF-8 directly by XeTeX.
+; Viramas are added after the final consonant.
+; Rules from tex-text.map and devanagarinumerals.map are included.
+LHSName  "Velthuis-sanskrit"
+RHSName  "UNICODE"
+LHSDescription "Velthuis Devanagari for Sanskrit"
+Version  "1"
+Contact  "http://devnag.sarovar.org"
+
+Define a U+0061  ;a
+Define b U+0062  ;b
+Define c U+0063  ;c
+Define d U+0064  ;d
+Define e U+0065  ;e
+Define f U+0066  ;f
+Define g U+0067  ;g
+Define h U+0068  ;h
+Define i U+0069  ;i
+Define j U+006A  ;j
+Define k U+006B  ;k
+Define l U+006C  ;l
+Define m U+006D  ;m
+Define n U+006E  ;n
+Define o U+006F  ;o
+Define p U+0070  ;p
+Define q U+0071  ;q
+Define r U+0072  ;r
+Define s U+0073  ;s
+Define t U+0074  ;t
+Define u U+0075  ;u
+Define v U+0076  ;v
+Define w U+0077  ;w
+Define x U+0078  ;x
+Define y U+0079  ;y
+Define z U+007A  ;z
+Define A U+0041  ;A
+Define B U+0042  ;B
+Define C U+0043  ;C
+Define D U+0044  ;D
+Define G U+0047  ;G
+Define I U+0049  ;I
+Define J U+004A  ;J
+Define K U+004B  ;K
+Define L U+004C  ;L
+Define M U+004d  ;M
+Define P U+0050  ;P
+Define R U+0052  ;R
+Define T U+0054  ;T
+Define U U+0055  ;U
+
+Define quot	U+0022
+Define hash	U+0023
+Define amper	U+0026
+Define plus	U+002B
+Define dot	U+002E
+Define slash	U+002F
+Define at	U+0040
+Define under	U+005F
+Define lbrace	U+007B
+Define bar	U+007C
+Define rbrace	U+007D
+Define tlde	U+007E
+
+Define candrabindu U+0901
+Define bindu	U+0902
+Define visarga	U+0903
+Define asvara	U+0905
+Define Asvara	U+0906
+Define isvara	U+0907
+Define Isvara	U+0908
+Define usvara	U+0909
+Define Usvara	U+090A
+Define rvoc	U+090B
+Define lvoc	U+090C
+Define esvara	U+090F
+Define aisvara	U+0910
+Define ocandra	U+0911
+Define osvara	U+0913
+Define ausvara	U+0914
+Define ka	U+0915
+Define kha	U+0916
+Define ga	U+0917
+Define gha	U+0918
+Define nga	U+0919
+Define ca	U+091A
+Define cha	U+091B
+Define ja	U+091C
+Define jha	U+091D
+Define nya	U+091E
+Define Ta	U+091F
+Define Tha	U+0920
+Define Da	U+0921
+Define Dha	U+0922
+Define Na	U+0923
+Define ta	U+0924
+Define tha	U+0925
+Define da	U+0926
+Define dha	U+0927
+Define na	U+0928
+Define pa	U+092A
+Define pha	U+092B
+Define ba	U+092C
+Define bha	U+092D
+Define ma	U+092E
+Define ya	U+092F
+Define ra	U+0930
+Define la	U+0932
+Define La	U+0933
+Define va	U+0935
+Define sha	U+0936
+Define Sa	U+0937
+Define sa	U+0938
+Define ha	U+0939
+Define avagraha	U+093D
+Define Amatra	U+093E
+Define imatra	U+093F
+Define Imatra	U+0940
+Define umatra	U+0941
+Define Umatra	U+0942
+Define rmatra	U+0943
+Define Rmatra	U+0944
+Define ematra	U+0947
+Define aimatra	U+0948
+Define ocmatra	U+0949
+Define omatra	U+094B
+Define aumatra	U+094C
+Define virama	U+094D
+Define aum	U+0950
+Define qa	U+0958
+Define khha	U+0959
+Define ghha	U+095A
+Define za	U+095B
+Define Ra	U+095C
+Define Rha	U+095D
+Define fa	U+095E
+Define Rvoc	U+0960
+Define Lvoc	U+0961
+Define lmatra	U+0962
+Define Lmatra	U+0963
+Define danda	U+0964
+Define dbldanda	U+0965
+Define abbrev	U+0970
+
+Define zwnj	U+200C
+Define zwj	U+200D
+
+;; First pass
+pass(Unicode)
+; From TeX-text
+U+002D U+002D                   <>      U+2013  ; -- -> en dash
+U+002D U+002D U+002D    <>      U+2014  ; --- -> em dash
+                                                                                
+U+0027                  <>      U+2019  ; ' -> right single quote
+U+0027 U+0027   <>      U+201D  ; '' -> right double quote
+U+0022                   >      U+201D  ; " -> right double quote
+                                                                                
+U+0060                  <>      U+2018  ; ` -> left single quote
+U+0060 U+0060   <>      U+201C  ; `` -> left double quote
+
+; Numerals
+U+0030	>	U+0966
+U+0031	>	U+0967
+U+0032	>	U+0968
+U+0033	>	U+0969
+U+0034	>	U+096A
+U+0035	>	U+096B
+U+0036	>	U+096C
+U+0037	>	U+096D
+U+0038	>	U+096E
+U+0039	>	U+096F
+
+; Vowels, all independent
+a <> asvara
+a a > Asvara
+A <> Asvara
+i <> isvara
+i i > Isvara
+I <> Isvara
+u <> usvara
+u u > Usvara
+U <> Usvara
+dot r <> rvoc
+dot R <> Rvoc
+dot l <> lvoc
+dot L <> Lvoc
+e <> esvara
+a i <> aisvara
+o <> osvara
+a u <> ausvara
+M <> bindu
+dot m > bindu
+tlde m <> candrabindu
+slash > candrabindu
+dot h <> visarga
+under <> virama
+amper > virama
+dot a <> avagraha
+tlde o <> ocandra
+dot o <> aum
+
+; Consonants, no conjuncts
+k <> ka
+k h <> kha
+K > kha
+g <> ga
+g h <> gha
+G > gha
+quot n <> nga
+q <> qa
+dot k h <> khha
+dot g <> ghha
+c <> ca
+c h <> cha
+C > cha
+j <> ja
+j h <> jha
+J > jha
+tlde n <> nya
+z <> za
+dot t <> Ta
+dot t h <> Tha
+dot T > Tha
+dot d <> Da
+dot d h <> Dha
+dot D > Dha
+dot n <> Na
+R <> Ra
+R h <> Rha
+t <> ta
+t h <> tha
+T > tha
+d <> da
+d h <> dha
+D > dha
+n <> na
+p <> pa
+p h <> pha
+P > pha
+b <> ba
+b h <> bha
+B > bha
+m <> ma
+f <> fa
+y <> ya
+r <> ra
+l <> la
+v <> va
+L <> La
+quot s <> sha
+dot s <> Sa
+s <> sa
+h <> ha
+; Symbols
+at <> abbrev
+bar <> danda
+
+; Ligature breaking
+plus <> zwj
+
+;; Second pass: converting vowels + a few simple rules
+pass (Unicode)
+
+;; Classes
+UniClass [vyanjana] = (ka .. ha qa .. fa)
+UniClass [svara] = (Asvara isvara Isvara usvara Usvara rvoc Rvoc lvoc Lvoc esvara aisvara \
+                 osvara ausvara ocandra)
+UniClass [matra] = (Amatra imatra Imatra umatra Umatra rmatra Rmatra lmatra Lmatra ematra \
+                 aimatra omatra aumatra ocmatra)
+
+[vyanjana] [svara] <> [vyanjana] [matra]
+[vyanjana] zwj <> [vyanjana] virama zwj
+danda danda <> dbldanda
+
+;; Third pass: making conjuncts
+pass (Unicode)
+
+;; Classes
+UniClass [vyanjana] = (ka .. ha qa .. fa)
+
+[vyanjana]=v1 [vyanjana]=v2 <> @v1 virama @v2
+
+;; Fourth pass: making remaining conjuncts (for groups of two or more consonants)
+;; and adding viramas to the end of the words in Sanskrit
+pass (Unicode)
+
+;; Classes
+UniClass [vyanjana] = (ka .. ha qa .. fa)
+UniClass [spacepunct] = (U+0009 .. U+0040 U+005B .. U+0060 U+007B .. U+007D danda dbldanda \
+    U+2013 U+2014 U+2018 U+2019 U+201C U+201D)
+
+[vyanjana]=v1 [vyanjana]=v2 <> @v1 virama @v2
+[vyanjana] / _ [spacepunct] <> [vyanjana] virama / _ [spacepunct]
+[vyanjana] / _ # <> [vyanjana] virama / _ #
+
+;; Fifth pass: removing inherent "a"
+pass (Unicode)
+
+;; Classes
+UniClass [vyanjana] = (ka .. ha qa .. fa)
+
+[vyanjana] asvara <> [vyanjana]
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis-sanskrit.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis-sanskrit.tec
new file mode 100644
index 00000000000..f58c528aa93
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis-sanskrit.tec
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis.map
new file mode 100644
index 00000000000..c028dc62a29
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis.map
@@ -0,0 +1,298 @@
+; $Id: velthuis.map,v 1.1 2007-07-15 14:47:55 icebearsoft Exp $
+; TECkit mapping for conversion of Velthuis transliteration
+; to UTF-8 directly in XeTeX
+; Viramas are NOT added after the final consonant.
+; Rules from tex-text.map and devanagarinumerals.map are included.
+LHSName  "Velthuis-standard-hindi"
+RHSName  "UNICODE"
+LHSDescription "Velthuis Devanagari for Standard Hindi"
+Version  "1"
+Contact  "http://devnag.sarovar.org"
+
+Define a U+0061  ;a
+Define b U+0062  ;b
+Define c U+0063  ;c
+Define d U+0064  ;d
+Define e U+0065  ;e
+Define f U+0066  ;f
+Define g U+0067  ;g
+Define h U+0068  ;h
+Define i U+0069  ;i
+Define j U+006A  ;j
+Define k U+006B  ;k
+Define l U+006C  ;l
+Define m U+006D  ;m
+Define n U+006E  ;n
+Define o U+006F  ;o
+Define p U+0070  ;p
+Define q U+0071  ;q
+Define r U+0072  ;r
+Define s U+0073  ;s
+Define t U+0074  ;t
+Define u U+0075  ;u
+Define v U+0076  ;v
+Define w U+0077  ;w
+Define x U+0078  ;x
+Define y U+0079  ;y
+Define z U+007A  ;z
+Define A U+0041  ;A
+Define B U+0042  ;B
+Define C U+0043  ;C
+Define D U+0044  ;D
+Define G U+0047  ;G
+Define I U+0049  ;I
+Define J U+004A  ;J
+Define K U+004B  ;K
+Define L U+004C  ;L
+Define M U+004d  ;M
+Define P U+0050  ;P
+Define R U+0052  ;R
+Define T U+0054  ;T
+Define U U+0055  ;U
+
+Define quot	U+0022
+Define hash	U+0023
+Define amper	U+0026
+Define plus	U+002B
+Define dot	U+002E
+Define slash	U+002F
+Define at	U+0040
+Define under	U+005F
+Define lbrace	U+007B
+Define bar	U+007C
+Define rbrace	U+007D
+Define tlde	U+007E
+
+Define candrabindu U+0901
+Define bindu	U+0902
+Define visarga	U+0903
+Define asvara	U+0905
+Define Asvara	U+0906
+Define isvara	U+0907
+Define Isvara	U+0908
+Define usvara	U+0909
+Define Usvara	U+090A
+Define rvoc	U+090B
+Define lvoc	U+090C
+Define esvara	U+090F
+Define aisvara	U+0910
+Define ocandra	U+0911
+Define osvara	U+0913
+Define ausvara	U+0914
+Define ka	U+0915
+Define kha	U+0916
+Define ga	U+0917
+Define gha	U+0918
+Define nga	U+0919
+Define ca	U+091A
+Define cha	U+091B
+Define ja	U+091C
+Define jha	U+091D
+Define nya	U+091E
+Define Ta	U+091F
+Define Tha	U+0920
+Define Da	U+0921
+Define Dha	U+0922
+Define Na	U+0923
+Define ta	U+0924
+Define tha	U+0925
+Define da	U+0926
+Define dha	U+0927
+Define na	U+0928
+Define pa	U+092A
+Define pha	U+092B
+Define ba	U+092C
+Define bha	U+092D
+Define ma	U+092E
+Define ya	U+092F
+Define ra	U+0930
+Define la	U+0932
+Define La	U+0933
+Define va	U+0935
+Define sha	U+0936
+Define Sa	U+0937
+Define sa	U+0938
+Define ha	U+0939
+Define avagraha	U+093D
+Define Amatra	U+093E
+Define imatra	U+093F
+Define Imatra	U+0940
+Define umatra	U+0941
+Define Umatra	U+0942
+Define rmatra	U+0943
+Define Rmatra	U+0944
+Define ematra	U+0947
+Define aimatra	U+0948
+Define ocmatra	U+0949
+Define omatra	U+094B
+Define aumatra	U+094C
+Define virama	U+094D
+Define aum	U+0950
+Define qa	U+0958
+Define khha	U+0959
+Define ghha	U+095A
+Define za	U+095B
+Define Ra	U+095C
+Define Rha	U+095D
+Define fa	U+095E
+Define Rvoc	U+0960
+Define Lvoc	U+0961
+Define lmatra	U+0962
+Define Lmatra	U+0963
+Define danda	U+0964
+Define dbldanda	U+0965
+Define abbrev	U+0970
+
+Define zwnj	U+200C
+Define zwj	U+200D
+
+;; First pass
+pass(Unicode)
+; From TeX-text
+U+002D U+002D                   <>      U+2013  ; -- -> en dash
+U+002D U+002D U+002D    <>      U+2014  ; --- -> em dash
+                                                                                
+U+0027                  <>      U+2019  ; ' -> right single quote
+U+0027 U+0027   <>      U+201D  ; '' -> right double quote
+U+0022                   >      U+201D  ; " -> right double quote
+                                                                                
+U+0060                  <>      U+2018  ; ` -> left single quote
+U+0060 U+0060   <>      U+201C  ; `` -> left double quote
+
+; Numerals
+U+0030	>	U+0966
+U+0031	>	U+0967
+U+0032	>	U+0968
+U+0033	>	U+0969
+U+0034	>	U+096A
+U+0035	>	U+096B
+U+0036	>	U+096C
+U+0037	>	U+096D
+U+0038	>	U+096E
+U+0039	>	U+096F
+
+; Vowels, all independent
+a <> asvara
+a a > Asvara
+A <> Asvara
+i <> isvara
+i i > Isvara
+I <> Isvara
+u <> usvara
+u u > Usvara
+U <> Usvara
+dot r <> rvoc
+dot R <> Rvoc
+dot l <> lvoc
+dot L <> Lvoc
+e <> esvara
+a i <> aisvara
+o <> osvara
+a u <> ausvara
+M <> bindu
+dot m > bindu
+tlde m <> candrabindu
+slash > candrabindu
+dot h <> visarga
+under <> virama
+amper > virama
+dot a <> avagraha
+tlde o <> ocandra
+dot o <> aum
+
+; Consonants, no conjuncts
+k <> ka
+k h <> kha
+K > kha
+g <> ga
+g h <> gha
+G > gha
+quot n <> nga
+q <> qa
+dot k h <> khha
+dot g <> ghha
+c <> ca
+c h <> cha
+C > cha
+j <> ja
+j h <> jha
+J > jha
+tlde n <> nya
+z <> za
+dot t <> Ta
+dot t h <> Tha
+dot T > Tha
+dot d <> Da
+dot d h <> Dha
+dot D > Dha
+dot n <> Na
+R <> Ra
+R h <> Rha
+t <> ta
+t h <> tha
+T > tha
+d <> da
+d h <> dha
+D > dha
+n <> na
+p <> pa
+p h <> pha
+P > pha
+b <> ba
+b h <> bha
+B > bha
+m <> ma
+f <> fa
+y <> ya
+r <> ra
+l <> la
+v <> va
+L <> La
+quot s <> sha
+dot s <> Sa
+s <> sa
+h <> ha
+; Symbols
+at <> abbrev
+bar <> danda
+
+; Ligature breaking
+plus <> zwj
+
+;; Second pass: converting vowels + a few simple rules
+pass (Unicode)
+
+;; Classes
+UniClass [vyanjana] = (ka .. ha qa .. fa)
+UniClass [svara] = (Asvara isvara Isvara usvara Usvara rvoc Rvoc lvoc Lvoc esvara aisvara \
+                 osvara ausvara ocandra)
+UniClass [matra] = (Amatra imatra Imatra umatra Umatra rmatra Rmatra lmatra Lmatra ematra \
+                 aimatra omatra aumatra ocmatra)
+
+[vyanjana] [svara] <> [vyanjana] [matra]
+[vyanjana] zwj <> [vyanjana] virama zwj
+danda danda <> dbldanda
+
+;; Third pass: making conjuncts
+pass (Unicode)
+
+;; Classes
+UniClass [vyanjana] = (ka .. ha qa .. fa)
+
+[vyanjana]=v1 [vyanjana]=v2 <> @v1 virama @v2
+
+;; Fourth pass: making remaining conjuncts (for groups of two or more consonants)
+pass (Unicode)
+
+;; Classes
+UniClass [vyanjana] = (ka .. ha qa .. fa)
+
+[vyanjana]=v1 [vyanjana]=v2 <> @v1 virama @v2
+
+;; Fifth pass: removing inherent "a"
+pass (Unicode)
+
+;; Classes
+UniClass [vyanjana] = (ka .. ha qa .. fa)
+
+[vyanjana] asvara <> [vyanjana]
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis.tec
new file mode 100644
index 00000000000..03b0d95e985
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis.tec