elvish update to get free license

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

6 files changed, 16 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/fonts/elvish/README b/Master/texmf-dist/doc/fonts/elvish/README
index 4bb3346b45f..74c467f009f 100644
--- a/Master/texmf-dist/doc/fonts/elvish/README
+++ b/Master/texmf-dist/doc/fonts/elvish/README
@@ -1,3 +1,5 @@
+(README changed 09/06/99; conditions relaxed)
+
 28/06/91  As a concession to those who for some reason don't have Metafont,
 the following files are now included: teng10.tfm and cirth.tfm (the font
 metric files), and {teng10,cirth}.pk{300,360} (the pk files generated
@@ -10,31 +12,20 @@ with mode imagen (i.e. Laserwriter) at normal size and at magstep 1).
 
 These files are copyright (c) 1987 J.C. Bradfield.
 They are distributed on the following conditions:
- (a) You may make the source and generated fonts available at your site.
- (b) You may use the generated fonts in any academic or non-commercial
-     publication. You may not charge, or allow any other user at your 
-     site to charge, for use of these fonts.
- (c) You, or any user at your site, may make modifications for his or
-     her own use. If you distribute any modified form of these files, you
-     must include the original files clearly labelled as such.
+ (a) You may use the source and generated fonts for any purpose,
+     and may distribute the files, provided that all files including
+     this copyright notice remain intact.
+ (b) You may make modifications for your own use. You may distribute
+     modified versions of these files PROVIDED that this copyright
+     notice remains intact AND that you include the original files
+     clearly labelled as such.
      If you produce modifications that seem useful, you are asked to
      send them to me, so that they can be incorporated into the master
      files.
- (d) You may redistribute these files to single individuals (who are
-     asked to act on the note below), but you may *not* place these
-     files in a public archive site without my permission.
-
-The tengwar font is still under development; when I consider that a
-reasonably final version has been produced, conditions (c) and (d) 
-will no longer apply; but until then I ask you to comply.
-
-
-*** PLEASE *** If you use these fonts, let me know (at the contact
-address below). One day, I may actually get round to the necessary tidying 
-and improvement, at which time I shall want to replace all earlier versions.
-In particular, I hope that the facilities of TeX 3.0 will allow a great
-improvement in the "user interface" to the fonts.
 
+There are still things I would like to do with these fonts, in
+particular, to provide virtual fonts for Quenya etc. If you have
+suggestions or comments, please contact me.
 
 ******************************************
 
@@ -83,7 +74,7 @@ I can be contacted by post at:
  U.K.          EH9  3JZ
 
 I can be contacted by electronic mail as:
-  jcb@lfcs.ed.ac.uk   (in Internet domain ordering)
+  jcb@dcs.ed.ac.uk   (in Internet domain ordering)
 
 If that doesn't work, you should kick your postmaster, and then
 get him/her to tell you how to reach that address. (Well, maybe
diff --git a/Master/texmf-dist/tex/generic/elvish/teng.tex b/Master/texmf-dist/doc/fonts/elvish/teng.tex
index f87a2fbd7f1..f87a2fbd7f1 100644
--- a/Master/texmf-dist/tex/generic/elvish/teng.tex
+++ b/Master/texmf-dist/doc/fonts/elvish/teng.tex
diff --git a/Master/texmf-dist/fonts/source/public/elvish/elvish-cirth.mf b/Master/texmf-dist/fonts/source/public/elvish/cirth.mf
index 790da12fe0a..790da12fe0a 100644
--- a/Master/texmf-dist/fonts/source/public/elvish/elvish-cirth.mf
+++ b/Master/texmf-dist/fonts/source/public/elvish/cirth.mf
diff --git a/Master/texmf-dist/fonts/tfm/public/elvish/elvish-cirth.tfm b/Master/texmf-dist/fonts/tfm/public/elvish/cirth.tfm
index 8212036e971..8212036e971 100644
--- a/Master/texmf-dist/fonts/tfm/public/elvish/elvish-cirth.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/elvish/cirth.tfm
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 49f483ae780..625a9226770 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -767,6 +767,7 @@ $standardfmt='latex';
  'edmac',	'generic',
  'elhyphen',	'generic',
  'elsevier-bib','bibtex',
+ 'elvish',	'fonts',
  'encxvlna',    'generic',
  'eplain',	'eplain',
  'epsf',	'generic',
@@ -1325,6 +1326,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'acmconf'	=> "$standardclean|flushend.sty",	# dup with sttools
  'chemscheme'	=> "$standardclean|jawltxdoc.sty",	# temp file for doc
  'chemstyle'	=> "$standardclean|jawltxdoc.sty",	# temp file for doc
+ 'elvish'	=> '\.pk3',		# no pk files
  'gentle'	=> 'gentle.ps.gz',	# pdf is enough
  'hyph-utf8'	=> 'README',
  'latex2e-help-texinfo' => '\.info',	# must move .info by hand, sigh
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 38118c33da9..a218f2dbedc 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -78,7 +78,7 @@ my @WorkingTLP = qw(
           ebong ebsthesis eCards ecc ecclesiastic economic
           ecv ed edmac edmargin ednotes eemeir egameps
           egplot eijkhout
-          ellipsis elpres elsarticle elsevier elsevier-bib
+          ellipsis elpres elsarticle elsevier elsevier-bib elvish
           emulateapj emp encxvlna endfloat endheads
           engpron engrec enumitem envbig environ envlab
           epigrafica epigraph epiolmec eplain