summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-07-25 22:19:37 +0000
committerKarl Berry <karl@freefriends.org>2011-07-25 22:19:37 +0000
commitefe6cc82fe94c03386364305bef7ce96b63dd344 (patch)
treeb09579e49788242ed9c7d8885279c53b517bfbb7 /Master
parent2731f61463569e8975b66e3cf7f4ae47f20b2471 (diff)
velthuis, moved map files (25jul11)
git-svn-id: svn://tug.org/texlive/trunk@23224 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/velthuis/README2
-rw-r--r--Master/texmf-dist/doc/generic/velthuis/changes11
-rw-r--r--Master/texmf-dist/doc/generic/velthuis/manual.pdfbin555159 -> 532687 bytes
-rw-r--r--Master/texmf-dist/doc/generic/velthuis/manual.tex5
-rw-r--r--Master/texmf-dist/doc/generic/velthuis/vedasample.dn45
-rw-r--r--Master/texmf-dist/doc/generic/velthuis/vedasample.pdfbin27802 -> 29303 bytes
-rw-r--r--Master/texmf-dist/doc/generic/velthuis/xetex-examples.pdfbin30634 -> 30193 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/devanagarinumerals.map21
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/devanagarinumerals.tecbin239 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis-sanskrit.map303
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis-sanskrit.tecbin2264 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis.map298
-rw-r--r--Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis.tecbin2062 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/latex/velthuis/devanagari.sty23
-rw-r--r--Master/texmf-dist/tex/plain/velthuis/dnmacs.tex19
15 files changed, 91 insertions, 636 deletions
diff --git a/Master/texmf-dist/doc/generic/velthuis/README b/Master/texmf-dist/doc/generic/velthuis/README
index 539838d7e12..5cb3c784623 100644
--- a/Master/texmf-dist/doc/generic/velthuis/README
+++ b/Master/texmf-dist/doc/generic/velthuis/README
@@ -1,6 +1,6 @@
==============================================================================
Velthuis Devanagari for TeX Installation Notes
-Version 2.15 22 June 2008
+Version 2.15.1 24 July 2011
==============================================================================
diff --git a/Master/texmf-dist/doc/generic/velthuis/changes b/Master/texmf-dist/doc/generic/velthuis/changes
index dca9f93ab4f..6ab59c84931 100644
--- a/Master/texmf-dist/doc/generic/velthuis/changes
+++ b/Master/texmf-dist/doc/generic/velthuis/changes
@@ -3,6 +3,17 @@ Devanagari for TeX Release Notes
Version 2.15 22 June 2007
=============================================================================
+= 21 July 2011: version 2.15.1
+
+ - TECkit maps kept in CVS but removed from the distribution package,
+ they are now distributed in xetex-devanagari.
+
+= 9 February 2009:
+
+ - \dnveda used for Devanagari only, \dnvedatrans for transliteration.
+
+-----------------------------------------------------------------------------
+
= 9 March 2008: version 2.15
- Bibliography modified; cite.sty is no longer loaded as default
diff --git a/Master/texmf-dist/doc/generic/velthuis/manual.pdf b/Master/texmf-dist/doc/generic/velthuis/manual.pdf
index f4e8f216d0e..2582b480767 100644
--- a/Master/texmf-dist/doc/generic/velthuis/manual.pdf
+++ b/Master/texmf-dist/doc/generic/velthuis/manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/velthuis/manual.tex b/Master/texmf-dist/doc/generic/velthuis/manual.tex
index afba7b6e55e..942312fd4e6 100644
--- a/Master/texmf-dist/doc/generic/velthuis/manual.tex
+++ b/Master/texmf-dist/doc/generic/velthuis/manual.tex
@@ -8,7 +8,7 @@
% Maintainer : Kevin Carmody <i@kevincarmody.com>
% Zdenek Wagner <zdenek.wagner@gmail.com>
%
-% $Id: manual.tex,v 1.10 2008-03-09 15:57:59 icebearsoft Exp $
+% $Id: manual.tex,v 1.11 2011-07-21 10:44:32 icebearsoft Exp $
%
% This program is free software; you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -1335,6 +1335,9 @@ nonbreakable space. If you want to utilise TECkit maps, you have to change its \
12 inside the \devnag\ text, otherwise words like {\dn Ev\3E2wApn} will be printed
incorrectly.
+\textbf{The map files are no longer part of the package. You will find them in the xetex-devanagari
+package. However, the map files can still be found in the CVS repository.}
+
\section{Using Hindi with \babel}\label{babel}
Since the \textsc{devnag} package version~2.14.1 a new module for \babel\ is released. This unifies
the interface for multiligual documents where Hindi is one of the languages. The module is
diff --git a/Master/texmf-dist/doc/generic/velthuis/vedasample.dn b/Master/texmf-dist/doc/generic/velthuis/vedasample.dn
index ef7ce4a88cc..c2a10256e94 100644
--- a/Master/texmf-dist/doc/generic/velthuis/vedasample.dn
+++ b/Master/texmf-dist/doc/generic/velthuis/vedasample.dn
@@ -1,7 +1,8 @@
\input dnmacs
\font\dnhead=dvnc10 at 20pt
-\font\dvngcal=dvnc10
-\font\bigdncal=dvnc10 scaled\magstep1
+\font\rmhead=cmr10 at 14pt
+\def\newpage{\vfill\eject}
+\def\newline{\hfill\break}
\def\skiphead{\vskip 2pc}
\def\skipline{\vskip 1pc}
\def\samaindent{\parindent=1.0in}
@@ -10,7 +11,7 @@
{\dn\dnnum\dncalcutta\dnbig
\centerline{{\dnhead .rgveda sa.mhitaa}}
-\skiphead
+\skipline
{\dnveda
@@ -53,22 +54,39 @@ ya it tad \_{vi}dusta \_{i}me sa\|{maa}sate || \qquad {\dnnormal 1..164..39}
}
+}
+
\skiphead
-\centerline{{\dnhead saamaveda sa.mhitaa}}
+\centerline{{\rmhead \d{R}gveda sa\d{m}hit\=a}}
+\skipline
+
+{\rm\dnvedatrans
+
+1.1.1 \qquad
+\_agnim\|{\={\i}}\d{l}e p\_uroh\|ita\d{m} y\_aj\~nasy\|a
+d\_evam\_{\d{r}}tvij\|am \qquad
+hot\|{\=a}ra\d{m} ratn\_adh\=at\|amam
+
+}
+
+{\dn\dnnum\dncalcutta\dnbig
+
\skiphead
+\centerline{{\dnhead saamaveda sa.mhitaa}}
+\skipline
{\dnsamaveda\samaindent
\item{1} \^{a}{2}\^{gna}{3} \^{aa}{1} \^{yaa}{2}hi
\^{vii}{3}\^{ta}{1}\^{ye}{2} g.r\^{.naa}{3}\^{no}{2}
-\^{ha}{3}\^{vya}{1}\^{daa}{2}taye \hfill\break
+\^{ha}{3}\^{vya}{1}\^{daa}{2}taye \newline
\^{ni}{1} ho\^{taa}{2ra} satsi \^{ba}{3}\^{rhi}{1}\^{.si}{2} \quad 1
\skipline
\item{2} \^{tva}{1}\^{ma}{2}gne \^{ya}{3}\^{j~naa}{2}\^{naa}{3}\@\ %
\^{ho}{2}\^{taa}{3} \^{vi}{1}\^{"sve}{2}.saa\@\ %
-\^{hi}{3}\^{ta}{2}.h \hfill\break
+\^{hi}{3}\^{ta}{2}.h \newline
\^{de}{3}\^{ve}{2}\^{bhi}{3}\^{rmaa}{1}\^{nu}{2}\^{.se}{3}
\^{ja}{1}\^{ne}{2} \quad 2
@@ -76,7 +94,7 @@ ya it tad \_{vi}dusta \_{i}me sa\|{maa}sate || \qquad {\dnnormal 1..164..39}
\item{3} \^{a}{3}\^{gni.m}{2} \^{duu}{3}\^{ta.m}{1}
\^{v.r}{2}.niima\^{he}{3} \^{ho}{1}\^{taa}{2}ra.m
-\^{vi}{3}\^{"sva}{1}\^{ve}{2}dasam \hfill\break
+\^{vi}{3}\^{"sva}{1}\^{ve}{2}dasam \newline
\^{a}{3}\^{sya}{2} \^{ya}{3}\^{j~na}{1}\^{sya}{2}
\^{su}{3}\^{kra}{1}\^{tu}{2}m \quad 3
@@ -84,4 +102,17 @@ ya it tad \_{vi}dusta \_{i}me sa\|{maa}sate || \qquad {\dnnormal 1..164..39}
}
+\skiphead
+\centerline{{\rmhead S\=amaveda sa\d{m}hit\=a}}
+\skipline
+
+{\rm\dnsamavedatrans
+
+\item{1.1} a\^2gna\^3 \=a\^1 y\=a\^2hi
+v\={\i}\^3ta\^1ye\^2 g\d{r}\d{n}\=a\^3no\^2
+ha\^3vya\^1d\=a\^2taye \newline
+ni\^1 hot\=a\^{2ra} satsi ba\^3rhi\^1\d{s}i\^2
+
+}
+
\end \ No newline at end of file
diff --git a/Master/texmf-dist/doc/generic/velthuis/vedasample.pdf b/Master/texmf-dist/doc/generic/velthuis/vedasample.pdf
index 545aee1d001..f1c441ce5dd 100644
--- a/Master/texmf-dist/doc/generic/velthuis/vedasample.pdf
+++ b/Master/texmf-dist/doc/generic/velthuis/vedasample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/velthuis/xetex-examples.pdf b/Master/texmf-dist/doc/generic/velthuis/xetex-examples.pdf
index 4735e644986..f03b743a237 100644
--- a/Master/texmf-dist/doc/generic/velthuis/xetex-examples.pdf
+++ b/Master/texmf-dist/doc/generic/velthuis/xetex-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/devanagarinumerals.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/devanagarinumerals.map
deleted file mode 100644
index c55b7e65b6b..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/devanagarinumerals.map
+++ /dev/null
@@ -1,21 +0,0 @@
-; $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/velthuis/devanagarinumerals.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/devanagarinumerals.tec
deleted file mode 100644
index 4f6b6d9fc75..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/devanagarinumerals.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis-sanskrit.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis-sanskrit.map
deleted file mode 100644
index 175ca3386b0..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis-sanskrit.map
+++ /dev/null
@@ -1,303 +0,0 @@
-; $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/velthuis/velthuis-sanskrit.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis-sanskrit.tec
deleted file mode 100644
index f58c528aa93..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis-sanskrit.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis.map b/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis.map
deleted file mode 100644
index c028dc62a29..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis.map
+++ /dev/null
@@ -1,298 +0,0 @@
-; $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/velthuis/velthuis.tec b/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis.tec
deleted file mode 100644
index 03b0d95e985..00000000000
--- a/Master/texmf-dist/fonts/misc/xetex/fontmapping/velthuis/velthuis.tec
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/velthuis/devanagari.sty b/Master/texmf-dist/tex/latex/velthuis/devanagari.sty
index 3e9207f3d97..6a8be09c07e 100644
--- a/Master/texmf-dist/tex/latex/velthuis/devanagari.sty
+++ b/Master/texmf-dist/tex/latex/velthuis/devanagari.sty
@@ -8,7 +8,7 @@
% Maintainer : Anshuman Pandey <apandey@u.washington.edu>
% Kevin Carmody <i@kevincarmody.com>
% Zdenek Wagner <zdenek.wagner@gmail.com>
-% Revised : 18 January 2007
+% Revised : 8 February 2009
%
% This program is free software; you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@
% The Identification Part
% ~~~~~~~~~~~~~~~~~~~~~~~
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{devanagari}[2008/03/09 v2.15 LaTeX macros for Velthuis Devanagari]
+\ProvidesPackage{devanagari}[2009/02/09 v2.15 LaTeX macros for Velthuis Devanagari]
%
% Error message for someone running LaTeX 2.09: Checks for definition of
% \documentclass; it exists in LaTeX2e, but not in LaTeX 2.09
@@ -293,10 +293,17 @@
\DeclareRobustCommand\|{\svarita}%
\DeclareRobustCommand\~{\padasep}}
%
+\DeclareRobustCommand\dnvedatrans{%
+ \DeclareRobustCommand\_{\underline}%
+ \DeclareRobustCommand\|{\svaritatrans}}%
+%
\DeclareRobustCommand\dnsamaveda{%
\DeclareRobustCommand\^{\samatone}%
\DeclareRobustCommand\@{\vedicanusvara}}
%
+\DeclareRobustCommand\dnsamavedatrans{%
+ \DeclareRobustCommand\^{\samatonetrans}}
+%
\DeclareRobustCommand*\anudattavar[1]{\leavevmode\setbox0=\hbox{#1}\anudep=\dp0\anuwid=\wd0
\advance\anudep by 0.7ex\advance\anuwid by -0.1em{#1}\llap{\lower\anudep
\hbox{\vrule width\anuwid height0.07em}%
@@ -310,6 +317,10 @@
\llap{\raise5.7ex\hbox{\vrule height2.5ex width0.08em}%
\hbox{\phantom{\vrule height2.5ex width0.15em}}}}
%
+\DeclareRobustCommand*\svaritatrans[1]{\leavevmode\hbox{#1}%
+ \llap{\raise1.7ex\hbox{\vrule height0.8ex width0.08em}%
+ \hbox{\phantom{\vrule height0.8ex width0.08em}}}}
+%
\DeclareRobustCommand\padasep{\leavevmode\hbox{%
\kern-0.15em\raise2.42ex\hbox{\char255}%
\kern-0.15em\raise2.42ex\hbox{\char255}%
@@ -322,6 +333,8 @@
\DeclareRobustCommand\vedicanusvara{\leavevmode{\kern1.0ex\lower1.5ex\hbox{\char32}}%
\kern-2.0ex\raise3.7ex\llap{\char94}\kern3.8ex}
%
+\DeclareRobustCommand*\samatonetrans[1]{\(^{#1}\)}
+%
% Macro for selection of Sama Veda tone font \dn@tf
%
\def\dn@tf{%
@@ -539,6 +552,10 @@
Here is the log file, created by RCS. (Log from dev.sty is also kept here.)
% $Log: devanagari.sty,v $
+% Revision 1.13 2009-02-09 10:11:56 icebearsoft
+% Fix by Kevin Carmody: Use \dnveda only for Devanagari, and use a new command, \dnvedatrans, for
+% transliteration.
+%
% Revision 1.12 2008-03-09 15:58:00 icebearsoft
% Citation macros moved to a separate package. Switch \ifdnmode implemented. Email address corrected.
%
@@ -690,7 +707,7 @@ Here is the log file, created by RCS. (Log from dev.sty is also kept here.)
% o Moved RCS log entries to after \endinput.
%
% Revision 1.11 1998/06/22 12:11:17 UCGADKW
-% o added $Revision: 1.12 $ to \ProvidesFile;
+% o added $Revision: 1.13 $ to \ProvidesFile;
% o moved RCS log to after \endinput.
%
% Revision 1.10 1998/06/22 12:10:00 UCGADKW
diff --git a/Master/texmf-dist/tex/plain/velthuis/dnmacs.tex b/Master/texmf-dist/tex/plain/velthuis/dnmacs.tex
index 50c05ba72dc..ce93534e4e5 100644
--- a/Master/texmf-dist/tex/plain/velthuis/dnmacs.tex
+++ b/Master/texmf-dist/tex/plain/velthuis/dnmacs.tex
@@ -8,7 +8,7 @@
% Maintainer : John Smith <jds10@cam.ac.uk>
% Anshuman Pandey <apandey@u.washington.edu>
% Kevin Carmody <i@kevincarmody.com>
-% Date : 14 March 2005
+% Revised : 8 February 2009
%
% This program is free software; you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -191,6 +191,10 @@
\def\|{\svarita}%
\def\~{\padasep}}
%
+\def\dnvedatrans{\dnvedatransmodetrue%
+\def\_{\underbar}%
+\def\|{\svaritatrans}}
+%
\def\dnfixedanudatta{\dnanudattafixedtrue}%
\def\dnvariableanudatta{\dnanudattafixedfalse}%
%
@@ -228,10 +232,17 @@
\hbox{\vrule width\anuwid height0.07em}%
\hbox{\phantom{\vrule width0.1em height0.08em}}}\fi}
%
+\def\dnsamavedatrans{\dnsamavedatransmodetrue%
+\def\^{\samatonetrans}}
+%
\def\svarita#1{\leavevmode\hbox{#1}%
\llap{\raise5.7ex\hbox{\vrule height2.5ex width0.08em}%
\hbox{\phantom{\vrule height2.5ex width0.15em}}}}
%
+\def\svaritatrans#1{\leavevmode\hbox{#1}%
+\llap{\raise1.7ex\hbox{\vrule height0.8ex width0.08em}%
+\hbox{\phantom{\vrule height0.8ex width0.08em}}}}
+%
\def\padasep{\leavevmode\hbox{%
\kern-0.15em\raise2.42ex\hbox{\char255}%
\kern-0.15em\raise2.42ex\hbox{\char255}%
@@ -244,6 +255,8 @@
\def\vedicanusvara{\leavevmode{\kern1.0ex\lower1.5ex\hbox{\char32}}%
\kern-2.0ex\raise3.7ex\llap{\char94}\kern3.8ex}
%
+\def\samatonetrans#1{$^{#1}$}
+%
% Macros for selection of Sama Veda tone font \dntf
%
\def\dnsmalltf{\ifdnpenfont\ifdnbombayfont\let\dntf=\sixdnpbom\else%
@@ -466,7 +479,9 @@
\newif\ifdnitalfont
\newif\ifdnpenfont
\newif\ifdnvedamode
+\newif\ifdnvedatransmode
\newif\ifdnsamavedamode
+\newif\ifdnsamavedatransmode
\newif\ifdnsamavedafont
\newif\ifdnanudattafixed
%
@@ -527,4 +542,4 @@
\let\pdnpcal=\dvngpcal
\dnblskip=15pt
\let\rsize=\rm
-\cmnum \ No newline at end of file
+\cmnum