devanagari (14jun14)

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

5 files changed, 342 insertions, 365 deletions

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 33aa073e120..430c4aa926c 100644
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/README
+++ b/Master/texmf-dist/fonts/misc/xetex/fontmapping/xetex-devanagari/README
@@ -1,110 +1,177 @@
-xetex-devanagari 0.4
+xetex-devanagari 0.5
 ====================
 
-XeTeX input mappings for convenient typesetting of Unicode Devanagari
-(0900-097F)
+Xetex-devanagari (1,2) are input mappings (*.map) for convenient LaTeX
+typesetting of simple Unicode Devanagari (0900-097F, 3) with the
+PDF-engine XeTeX (4).
 
-To be processed with teckit_compile (http://scripts.sil.org/TECkit)
+(1) http://www.ctan.org/tex-archive/macros/xetex/generic/devanagari
+(2) https://github.com/danstender/xetex-devanagari
+(3) http://www.unicode.org/charts/PDF/U0900.pdf
+(4) http://en.wikipedia.org/wiki/Xetex
 
-Maintained by Daniel Stender <daniel@danielstender.com>
+Their sources (*.tec) are to be compiled with the TECkit (5).
 
-Location on CTAN:
-http://www.ctan.org/tex-archive/macros/xetex/generic/devanagari
+(5) http://scripts.sil.org/TECkit
 
-Pease report bugs to:
-https://github.com/danstender/xetex-devanagari/issues
+The maps are maintained by Daniel Stender (6), please send hints and
+report problems to: daniel@danielstender.com.
 
-Enjoy!
+(6) http://www.danielstender.com/blog/
 
 Velthuis maps
--------------
+=============
+
+velthuis.map, velthuis-sanskrit.map and devanagarinumerals.map are taken
+over from the Velthuis packet (7), much thanks to Zdeněk Wagner.
+
+(7) http://www.ctan.org/tex-archive/language/devanagari/velthuis
 
-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).
 
-velthuis-sanskrit.map (for Sanskrit)
+Since "~" expands to nonbreakable space it's important to set `~=12 in
+the preamble (8).
 
-Input encoding includes:
+(8) http://cikitsa.blogspot.com/2010/09/xelatex-velthuis-encoding-and-palatal.html
 
--   aa = ā, ii = ī, uu = ū, .r = ṛ, .R = ṝ, .l = ḷ, .L
+velthuis-sanskrit.map (for Sanskrit)
+------------------------------------
 
--   "n = ṅ, ~n = ñ, .t = ṭ, .d = ḍ, .n = ṇ, "s = ś, .s = ṣ
+Input encoding includes:
 
--   .m = Anusvara, .h = Visarga, .a = Avagraha, .o = ॐ, @ = °
+  input   means
+  ------- -------------------
+  aa      ā
+  ii      ī
+  uu      ū
+  .r      ṛ
+  .R      ṝ
+  .l      ḷ
+  .L      ḹ
+  "n      ṅ
+  ~n      ñ
+  .t      ṭ
+  .d      ḍ
+  .n      ṇ
+  "s      ś
+  .s      ṣ
+  .m      Anusvāra
+  .h      Visarga
+  .a      Avagrāha
+  .o      ॐ
+  @       °
+  +       ligature breaking
 
 For a complete list of Velthuis input scheme cf. the manual of the
-Velthuis packet, p. 6.
+Velthuis packet (9), p. 6.
+
+(9) http://mirrors.ctan.org/language/devanagari/velthuis/doc/generic/velthuis/manual.pdf
 
 Usage like:
 
     \documentclass{article}
 
     \usepackage{fontspec}
-    \setmainfont[Script=Devanagari,Mapping=velthuis-sanskrit]{Sanskrit 2003}
+    \setmainfont[Script=Devanagari,Mapping=../tec/velthuis-sanskrit]{Sanskrit 2003}
+
+    \catcode`\~=12
+
+    \setlength\parindent{0pt}
 
     \begin{document}
-    dharmak.setre kuruk.setre samavetaa yuyutsava.h | \\
-    maamakaa.h paa.n.davaa"scaiva kimakurvata sa.mjaya ||
+    namastu"n+ga"sira"scumbicandracaamaracaarave |\\
+    trailokyanagaraarambhamuulas+tambhaaya "sambhave || 1 ||\\
+    haraka.n.thagrahaanandamiilitaak.sii.m namaamyumaam |\\
+    kaalakuu.tavi.saspar"sajaatamuurcchaagamaamiva || 2 ||
     \end{document}
 
 velthuis.map (for Hindi)
+------------------------
 
 Input encoding includes:
 
--   qa = क़, .kha = ख़, .ga = ग़, za = ज़, Ra = ड़, Rha = ढ़, fa = फ़, La = ळ
+  input   means
+  ------- -------
+  qa      क़
+  .kha    ख़
+  .ga     ग़
+  za      ज़
+  Ra      ड़
+  Rha     ढ़
+  fa      फ़
+  La      ळ
 
 Usage like:
 
     \documentclass{article}
 
     \usepackage{fontspec}
-    \setmainfont[Script=Devanagari,Mapping=velthuis]{Nakula}
+    \setmainfont[Script=Devanagari,Mapping=../tec/velthuis]{Nakula}
 
+    \catcode`\~=12
+        
     \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|
+    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 = ḷ
-
--   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 = ढ़
+================
+
+Input coding includes (asterisk marks non-standard):
+
+  input   means
+  ------- -------------------
+  A       ā
+  I       ī
+  U       ū
+  R       ṛ
+  RR      ṝ
+  *L      ḷ
+  G       ṅ
+  J       ñ
+  T       ṭ
+  D       ḍ
+  N       ṇ
+  z       ś
+  S       ṣ
+  M       Anusvāra
+  H       Visarga
+  '       Avagrāha
+  OM      ॐ
+  .l      ळ
+  -       Anudātta
+  !       Svarita
+  .m      Anunāsika
+  °       abbrev (U+0970)
+  +       ligature breaking
 
 Usage like:
 
-    \documentclass{article}
+    \documentclass[12pt]{article}
 
     \usepackage{fontspec}
-    \setmainfont[Script=Devanagari,Mapping=harvardkyoto]{Sanskrit 2003}
+    \setmainfont[Script=Devanagari,Mapping=../tec/harvardkyoto]{Sanskrit 2003}
 
-    \begin{document}
-    dharmakSetre kurukSetre samavetA yuyutsavaH | \\
-    mAmakAH pANDavAzcaiva kimakurvata saMjaya ||
+    \setlength\parindent{0pt}
 
-    a-gnimI!.le pu-rohi!taM ya-jJasya! de-vamR-tvijaM! | \\
-    hotA!raM ratna-dhA!tamaM ||
+    \begin{document}
+    namastuG+gazirazcumbicandracAmaracArave |\\
+    trailokyanagarArambhamUlastambhAya zambhave || 1 ||\\
+    harakaNThagrahAnandamIlitAkSIM namAmyumAm |\\
+    kAlakUTaviSasparzajAtamUrcchAgamAmiva || 2 ||\\[1ex]
 
-    tumase itanI cau.rI nadI pAr karate nahIM banegA |
+    a-gnimI!.le pu-rohi!taM ya-jJasya! de-vamR-tvijaM! |
+    hotA!raM ratna-dhA!tamaM || 1.1.1 ||
     \end{document}
 
 iast.map
---------
+========
 
-Input coding includes IAST Unicode entities:
+Input coding includes Unicode entities representing the IAST:
 
 -   ā ī ū ṛ ṝ (1E5D) ḷ ṅ ñ ṭ ḍ ṇ ś ṣ ṃ ḥ
 
@@ -113,9 +180,13 @@ Usage like:
     \documentclass{article}
 
     \usepackage{fontspec}
-    \setmainfont[Script=Devanagari,Mapping=iast]{Sanskrit 2003}
+    \setmainfont[Script=Devanagari,Mapping=../tec/iast]{Sanskrit 2003}
+
+    \setlength\parindent{0pt}
 
     \begin{document}
-    dharmakṣetre kurukṣetre samavetā yuyutsavaḥ | \\
-    māmakāḥ pāṇḍavāścaiva kimakurvata saṃjaya ||
+    namastuṅ+gaśiraścumbicandracāmaracārave |\\
+    trailokyanagarārambhamūlastambhāya śambhave || 1 ||\\
+    harakaṇṭhagrahānandamīlitākṣīṃ namāmyumām |\\
+    kālakūṭaviṣasparśajātamūrcchāgamāmiva || 2 ||
     \end{document}
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 bad444eea4d..e8c0d8ce300 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
@@ -2,148 +2,106 @@ LHSName "harvardkyoto"
 RHSName "Unicode"
 LHSDescription "Harvard/Kyoto input method for Unicode Devanagari"
 Contact "daniel@danielstender.com"
-
-Define dot U+002E
-
-Define a U+0061
-Define A U+0041
-Define i U+0069
-Define I U+0049
-Define u U+0075
-Define U U+0055
-Define R U+0052
-Define L U+004C
-
-Define e U+0065
-Define o U+006F
-
-Define k U+006B
-Define h U+0068
-Define g U+0067
-Define G U+0047
-
-Define c U+0063
-Define j U+006A
-Define J U+004A
-
-Define T U+0054
-Define D U+0044
-Define N U+004E
-
-Define t U+0074
-Define d U+0064
-Define n U+006E
-
-Define p U+0070
-Define b U+0062
-Define m U+006D
-
-Define y U+0079
-Define r U+0072
-Define l U+006C
-Define v U+0076
-
-Define z U+007A
-Define S U+0053
-Define s U+0073
-
-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
-
-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 Rvoc	U+0960
-Define lvoc	U+090C
-Define esvara	U+090F
-Define aisvara	U+0910
-Define osvara	U+0913
-Define ausvara	U+0914
-
-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 lmatra	U+0962
-Define ematra	U+0947
-Define aimatra	U+0948
-Define omatra	U+094B
-Define aumatra	U+094C
-
-Define ka	U+0915
-Define kha	U+0916
-Define ga	U+0917
-Define gha	U+0918
-Define Ga	U+0919
-Define ca	U+091A
-Define cha	U+091B
-Define ja	U+091C
-Define jha	U+091D
-Define Ja	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 va	U+0935
-Define za	U+0936
-Define Sa	U+0937
-Define sa	U+0938
-Define ha	U+0939
-
-Define anusvara	U+0902
-Define visarga	U+0903
-
-Define danda	U+0964
-Define ddanda	U+0965
-Define virama	U+094D
-Define avagraha	U+093D
-
-Define om	U+0950
- 
-Define rla	U+0933
-Define anunasika U+0901
-
-Define anudatta U+002D
-Define svarita	U+0021
-
-Define hka	U+0958
-Define hkha	U+0959
-Define hga	U+095A
-Define hja	U+095B
-Define hra	U+095C
-Define hrha	U+095D
-Define hpha	U+095E
+Copyright "LaTeX Project Public License"
+
+Define a       U+0061
+Define A       U+0041
+Define i       U+0069
+Define I       U+0049
+Define u       U+0075
+Define U       U+0055
+Define R       U+0052
+Define L       U+004C
+Define e       U+0065
+Define o       U+006F
+Define k       U+006B
+Define h       U+0068
+Define g       U+0067
+Define G       U+0047
+Define c       U+0063
+Define j       U+006A
+Define J       U+004A
+Define T       U+0054
+Define D       U+0044
+Define N       U+004E
+Define t       U+0074
+Define d       U+0064
+Define n       U+006E
+Define p       U+0070
+Define b       U+0062
+Define m       U+006D
+Define y       U+0079
+Define r       U+0072
+Define l       U+006C
+Define v       U+0076
+Define z       U+007A
+Define S       U+0053
+Define s       U+0073
+Define dot     U+002E
+
+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 Rvoc    U+0960
+Define lvoc    U+090C
+Define esvara  U+090F
+Define aisvara U+0910
+Define osvara  U+0913
+Define ausvara U+0914
+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 lmatra  U+0962
+Define ematra  U+0947
+Define aimatra U+0948
+Define omatra  U+094B
+Define aumatra U+094C
+Define ka      U+0915
+Define kha     U+0916
+Define ga      U+0917
+Define gha     U+0918
+Define Ga      U+0919
+Define ca      U+091A
+Define cha     U+091B
+Define ja      U+091C
+Define jha     U+091D
+Define Ja      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 va      U+0935
+Define za      U+0936
+Define Sa      U+0937
+Define sa      U+0938
+Define ha      U+0939
+Define lla     U+0934
+Define virama  U+094D
+Define zwnj    U+200C
 
 pass(Unicode)
-
 a > asvara
 A > Asvara
 i > isvara
@@ -153,12 +111,10 @@ U > Usvara
 R > rvoc
 R R > Rvoc
 L > lvoc
-
 e > esvara
 a i > aisvara
 o > osvara
 a u > ausvara
-
 k > ka
 k h > kha
 g > ga
@@ -192,60 +148,46 @@ z > za
 S > Sa
 s > sa
 h > ha
-
-q > hka
-x > hkha
-dot g > hga
-dot z > hja
-f > hpha
-dot r > hra
-dot R > hrha
-
-svarita > vstroke
-anudatta > hstroke
-
-dot l > rla
-dot m > anunasika
-
-O M > om
-
-U+004D > anusvara
-U+0048 > visarga
-U+0027 > avagraha
-U+002C > virama
-
-U+007C > danda
-U+007C U+007C > ddanda
-
-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
+U+004F U+004D > U+0950 ; om
+dot l > lla
+dot m > U+0901 ; anunāsika
+U+004D > U+0902	; anusvara
+U+0048 > U+0903 ; visarga
+U+0027 > U+093D	; avagraha
+U+002D > U+0952	; anudatta
+U+0021 > U+0951	; svarita
+U+00B0 > U+0970	; abbrev
+U+0030 > U+0966	; digit 0
+U+0031 > U+0967	; digit 1
+U+0032 > U+0968	; digit 2
+U+0033 > U+0969	; digit 3
+U+0034 > U+096A	; digit 4
+U+0035 > U+096B	; digit 5
+U+0036 > U+096C	; digit 6	
+U+0037 > U+096D	; digit 7
+U+0038 > U+096E	; digit 8
+U+0039 > U+096F	; digit 9
+U+007C > U+0964	; danda
+U+007C U+007C > U+0965 ; double danda
+U+002B > zwnj ; ligature breaker
 
 pass(Unicode)
-
-UniClass [vyanjana] = (ka .. ha rla hka .. hpha)
-UniClass [svara] = (Asvara isvara Isvara usvara Usvara rvoc Rvoc lvoc esvara aisvara osvara ausvara)
-UniClass [matra] = (Amatra imatra Imatra umatra Umatra rmatra Rmatra lmatra ematra aimatra omatra aumatra)
+UniClass [vyanjana] = (ka .. ha)
+UniClass [svara] = (Asvara .. ausvara)
+UniClass [matra] = (Amatra .. aumatra)
 [vyanjana] [svara] > [vyanjana] [matra]
+[vyanjana] zwnj > [vyanjana] virama zwnj
 
 pass(Unicode)
-
 UniClass [vyanjana] = (ka .. ha)
 [vyanjana]=v1 [vyanjana]=v2 > @v1 virama @v2
 
 pass(Unicode)
-
 UniClass [vyanjana] = (ka .. ha)
 [vyanjana]=v1 [vyanjana]=v2 > @v1 virama @v2
+[vyanjana] / _ # > [vyanjana] virama / _ #
 
 pass(Unicode)
-
-Uniclass [vyanjana] = (ka .. ha rla hka .. hpha)
+UniClass [vyanjana] = (ka .. ha)
 [vyanjana] asvara > [vyanjana]
+
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 0f5df79f51c..6b1de45eb79 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 82280b59536..787baf745f8 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
@@ -1,56 +1,43 @@
-EncodingName "iast2dn"
-
-; Anstatt direkt umzusetzen (U+xxx [Umschrift] > U+yyy [Devanagari]), ist eine System
-; mit Ein- und Ausgabecodierung notwendig weil Aspirata und ai/au zusammengesetzt
-; eingegeben werden müssen und weil bei der Eingabe nicht zwischen abhängigen und
-; unabhängigen Vokale unterschieden wird
-
-; Eingabecodierung, fürs Mapping dürfen keine Unicode-Entities verwendet werden!
-
-Define a U+0061
-Define A U+0101
-Define i U+0069
-Define I U+012B
-Define u U+0075
-Define U U+016B
-Define R U+1E5B
-Define RR U+1E5D
-Define L U+1E37
-
-Define e U+0065		; siehe unten, ai und au sind zusammengesetzt, "a i" usw.
-Define o U+006F
-
-Define k U+006B
-Define h U+0068		; Aspirata sind zusammengesetzt, "k h" usw.
-Define g U+0067
-Define G U+1E45
-
-Define c U+0063
-Define j U+006A
-Define J U+00F1
-
-Define T U+1E6D
-Define D U+1E0D
-Define N U+1E47
-
-Define t U+0074
-Define d U+0064
-Define n U+006E
-
-Define p U+0070
-Define b U+0062
-Define m U+006D
-
-Define y U+0079
-Define r U+0072
-Define l U+006C
-Define v U+0076
-
-Define z U+015B
-Define S U+1E63
-Define s U+0073
-
-; Ausgabedcodierung (unverändert aus harvardkyoto.map)
+LHSName "iast"
+RHSName "Unicode"
+LHSDescription "IAST input method for Unicode Devanagari"
+Contact "daniel@danielstender.com"
+Copyright "LaTeX Project Public License"
+
+Define a  	U+0061
+Define A	U+0101 ; ā
+Define i	U+0069
+Define I	U+012B ; ī
+Define u	U+0075
+Define U	U+016B ; ū
+Define R	U+1E5B ; ṛ
+Define RR	U+1E5D ; ṝ
+Define L	U+1E37 ; ḷ
+Define e	U+0065
+Define o	U+006F
+Define k	U+006B
+Define h	U+0068
+Define g	U+0067
+Define G	U+1E45 ; ṅ
+Define c	U+0063
+Define j	U+006A
+Define J	U+00F1 ; ñ
+Define T	U+1E6D ; ṭ
+Define D	U+1E0D ; ḍ
+Define N	U+1E47 ; ṇ
+Define t	U+0074
+Define d	U+0064
+Define n	U+006E
+Define p	U+0070
+Define b	U+0062
+Define m	U+006D
+Define y	U+0079
+Define r	U+0072
+Define l	U+006C
+Define v	U+0076
+Define z	U+015B ; ś
+Define S	U+1E63 ; ṣ
+Define s	U+0073
 
 Define asvara	U+0905
 Define Asvara	U+0906
@@ -65,41 +52,6 @@ Define esvara	U+090F
 Define aisvara	U+0910
 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 Ga	U+0919
-Define ca	U+091A
-Define cha	U+091B
-Define ja	U+091C
-Define jha	U+091D
-Define Ja	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 va	U+0935
-Define za	U+0936
-Define Sa	U+0937
-Define sa	U+0938
-Define ha	U+0939
-
 Define Amatra	U+093E
 Define imatra	U+093F
 Define Imatra	U+0940
@@ -109,17 +61,46 @@ Define rmatra	U+0943
 Define Rmatra	U+0944
 Define lmatra	U+0962
 Define ematra	U+0947
-Define aimatra	U+0948
-Define omatra	U+094B
-Define aumatra	U+094C
-
-Define virama	U+094D	; der Virama wird i.d. Unicode Devanagari auch eingesetzt ohne
-			; dargestellt zu werden für Ligaturen, siehe 2. und 3. Durchlauf
-
-; 1. Durchlauf
+Define aimatra 	U+0948
+Define omatra  	U+094B
+Define aumatra 	U+094C
+Define ka      	U+0915
+Define kha     	U+0916
+Define ga      	U+0917
+Define gha     	U+0918
+Define Ga      	U+0919
+Define ca      	U+091A
+Define cha     	U+091B
+Define ja      	U+091C
+Define jha     	U+091D
+Define Ja      	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 va      	U+0935
+Define za      	U+0936
+Define Sa      	U+0937
+Define sa      	U+0938
+Define ha      	U+0939
+Define virama  	U+094D
+Define zwnj	U+200C
 
 pass(Unicode)
-
 a > asvara
 A > Asvara
 i > isvara
@@ -129,14 +110,11 @@ U > Usvara
 R > rvoc
 RR > Rvoc
 L > lvoc
-
 e > esvara
 a i > aisvara
 o > osvara
 a u > ausvara
-
-k > ka			; der springende Punkt für das Vokalhaindling:
-			;"k" = 0915 [ka], "k a" = 0915 0905 [ka asvara]
+k > ka
 k h > kha
 g > ga
 g h > gha
@@ -169,14 +147,11 @@ z > za
 S > Sa
 s > sa
 h > ha
-
-; Direkte Umsetzungen:
-
-U+1E25 > U+0903		; Visarga
-U+1E43 > U+0902		; Anusvara
-U+0027 > U+093D		; Avagraha
-
-U+0030	> U+0966	; Numeralien
+U+1E25 > U+0903	; ḥ
+U+1E43 > U+0902	; ṃ
+U+0027 > U+093D	; avagraha
+U+00B0 > U+0970	; abbrev
+U+0030	> U+0966 ; digit 0
 U+0031	> U+0967
 U+0032	> U+0968
 U+0033	> U+0969
@@ -186,38 +161,27 @@ U+0036	> U+096C
 U+0037	> U+096D
 U+0038	> U+096E
 U+0039	> U+096F
-
-U+007C > U+0964		
-U+007C U+007C > U+0965	; Danda und Doppeldanda
-
-U+002C > virama		; manueller Virama
-
-; 2. Durchlauf, Konvertierung der Vokale: alle xsvara ausser asvara hinter Konsonant werden xmatra
+U+007C > U+0964 ; danda	
+U+007C U+007C > U+0965 ; double danda
+U+002B > zwnj ; ligature breaker
 
 pass(Unicode)
-
 UniClass [vyanjana] = (ka .. ha)
-UniClass [svara] = (Asvara isvara Isvara usvara Usvara rvoc Rvoc lvoc esvara aisvara osvara ausvara)
-UniClass [matra] = (Amatra imatra Imatra umatra Umatra rmatra Rmatra lmatra ematra aimatra omatra aumatra)
+UniClass [svara] = (Asvara .. ausvara)
+UniClass [matra] = (Amatra .. aumatra)
 [vyanjana] [svara] > [vyanjana] [matra]
-
-; 3. Durchlauf, Doppelkonsonanz
+[vyanjana] zwnj > [vyanjana] virama zwnj
 
 pass(Unicode)
-
 UniClass [vyanjana] = (ka .. ha)
 [vyanjana]=v1 [vyanjana]=v2 > @v1 virama @v2
 
-; 4. Durchlauf, Trippelkonsonanz
-
 pass(Unicode)
-
 UniClass [vyanjana] = (ka .. ha)
 [vyanjana]=v1 [vyanjana]=v2 > @v1 virama @v2
-
-; 5. Durchlauf, asvara eliminieren
+[vyanjana] / _ # > [vyanjana] virama / _ #
 
 pass(Unicode)
-
 Uniclass [vyanjana] = (ka .. ha)
 [vyanjana] asvara > [vyanjana]
+
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 17c78f91b04..2e2037def11 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