9 files changed, 176 insertions, 82 deletions

diff --git a/Master/texmf-dist/doc/latex/tengwarscript/README b/Master/texmf-dist/doc/latex/tengwarscript/README
index d70892261c6..71eebc220c4 100644
--- a/Master/texmf-dist/doc/latex/tengwarscript/README
+++ b/Master/texmf-dist/doc/latex/tengwarscript/README
@@ -1,6 +1,6 @@
 TengwarScript package for LaTeX
-version 1.3, 2006
-Author: Ignacio Fernández Galván (Jellby): jellby@yahoo.com
+version 1.3.1, July 2014
+Author: Ignacio Fernández Galván (Jellby): jellby@yahoo.com
 Homepage: http://djelibeibi.unex.es/tengwar
 
 
@@ -39,7 +39,9 @@ user texmf tree)
    e) Move tengwarscript.map into [TEXMF]/fonts/map/dvips/.
 
 4. Download the tengwar fonts (see documentation). You may need to
-rename some files to match the names in the .map file.
+rename some files to match the names in the .map file. You can use
+the included script install-tengwar-scripts.sh to automate the
+download and rename.
 
 5. Move *.ttf into [TEXMF]/fonts/truetype/tengwarscript/ or *.pfb
    into [TEXMF]/fonts/type1/tengwarscript/.
diff --git a/Master/texmf-dist/doc/latex/tengwarscript/install-tengwar-scripts.sh b/Master/texmf-dist/doc/latex/tengwarscript/install-tengwar-scripts.sh
new file mode 100755
index 00000000000..2b826daba42
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tengwarscript/install-tengwar-scripts.sh
@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+
+# Check the tengwarscript package is installed.
+kpsewhich tengwarscript.sty
+ERROR_CODE=$?
+if [ $ERROR_CODE -ne 0 ]; then
+    echo "Error: tengwarscript is not installed."
+    exit $ERROR_CODE
+fi
+
+# Terminate as soon as any command fails
+set -e
+
+# Enable the font maps in the tengwarscript package.
+updmap --enable Map=tengwarscript.map
+
+# Choose the directory to put the fonts in.
+# This could also be just ~/texmf/fonts/truetype.
+# The additional directory is a little neater, though,
+# and matches the documentation.
+FONT_DIR=~/texmf/fonts/truetype/tengwarscript
+mkdir --parents $FONT_DIR
+cd $FONT_DIR
+
+# Note: the following way of entering and exiting directories avoids having to prefix every file with $FONT_DIR,
+# but also makes it susceptible to forgetting the current directory and end up putting things in the wrong place.
+# I've decided that it's easier to explicitly enter and exit directories than to put $FONT_DIR in front of everything,
+# and then potentially forget that when editing later.
+mkdir --parents parmaite
+wget --no-verbose --continue 'http://at.mansbjorkman.net/Downloads/Parmaite2.zip'
+unzip -u Parmaite2.zip -d $FONT_DIR/parmaite
+cd parmaite
+mv --verbose Parmaite.TTF Parmaite.ttf
+mv --verbose Parmaite_alt.TTF Parmaite_alt.ttf
+cd $FONT_DIR
+
+mkdir --parents elfica
+wget --no-verbose --continue 'http://www.oocities.org/enrombell/files/Pack_en.zip'
+unzip -u Pack_en.zip -d $FONT_DIR/elfica
+cd elfica
+mv --verbose Elfica200841se07.ttf Elfica32.ttf
+cd $FONT_DIR
+
+mkdir --parents gothika
+wget --no-verbose --continue 'http://www.oocities.org/enrombell/files/Gothika_en.zip'
+unzip -u Gothika_en.zip -d $FONT_DIR/gothika
+cd gothika
+mv --verbose Gothika2008-se001.ttf TengwarGothika050.ttf
+cd $FONT_DIR
+
+mkdir --parents formal
+wget --no-verbose --continue 'http://tengwarformal.limes.com.pl/fonts/TengwarFormal-12c-ttf-pc.zip'
+unzip -u TengwarFormal-12c-ttf-pc.zip -d $FONT_DIR/formal
+cd formal/TengwarFormal-12c-ttf-pc/fonts
+mv --verbose TengwarFormal12b.ttf TengwarFormal12.ttf
+mv --verbose TengwarFormalA12b.ttf TengwarFormalA12.ttf
+cd $FONT_DIR
+
+mkdir --parents annatar
+wget --no-verbose --continue -O annatar.zip 'http://web.comhem.se/alatius/fonts/tngan120.zip'
+unzip -u annatar.zip -d $FONT_DIR/annatar
+
+mkdir --parents quenya
+wget --no-verbose --continue -O quenya.zip 'http://img.dafont.com/dl/?f=tengwar_quenya'
+unzip -u quenya.zip -d $FONT_DIR/quenya
+cd quenya
+mv --verbose QUENYA.TTF TengwarQuenya.ttf
+mv --verbose QUENYAA.TTF TengwarQuenyaAlt.ttf
+mv --verbose QUENCAP1.TTF TengwarQuenyaCapitals1.ttf
+mv --verbose QUENCAP2.TTF TengwarQuenyaCapitals2.ttf
+cd $FONT_DIR
+
+mkdir --parents sindarin
+wget --no-verbose --continue -O sindarin.zip 'http://img.dafont.com/dl/?f=tengwar_sindarin'
+unzip -u sindarin.zip -d $FONT_DIR/sindarin
+cd sindarin
+mv --verbose SINDAR.TTF TengwarSindarin.ttf
+mv --verbose SINDARA.TTF TengwarSindarinAlt.ttf
+mv --verbose SINDCAP1.TTF TengwarSindarinCapitals1.ttf
+mv --verbose SINDCAP2.TTF TengwarSindarinCapitals2.ttf
+cd $FONT_DIR
+
+mkdir --parents noldor
+wget --no-verbose --continue -O noldor.zip 'http://img.dafont.com/dl/?f=tengwar_noldor'
+unzip -u noldor.zip -d $FONT_DIR/noldor
+cd noldor
+mv --verbose NOLDOR.TTF TengwarNoldor.ttf
+mv --verbose NOLDORA.TTF TengwarNoldorAlt.ttf
+mv --verbose NOLDCAP1.TTF TengwarNoldorCapitals1.ttf
+mv --verbose NOLDCAP2.TTF TengwarNoldorCapitals2.ttf
+cd $FONT_DIR
+
+mkdir --parents teleri
+wget --no-verbose --continue -O teleri.zip 'http://img.dafont.com/dl/?f=tengwar_teleri'
+unzip -u teleri.zip -d $FONT_DIR/teleri
+cd teleri
+mv --verbose 'Tengwar Telerin.ttf' TengwarTelerin.ttf
+cd $FONT_DIR
+
+mkdir --parents ~/texmf/fonts/type1/tengwarscript/
+cd ~/texmf/fonts/type1/tengwarscript/
+mkdir --parents unicodeparmaite
+wget --no-verbose --continue 'http://www.uv.es/~conrad/UnicodeTengwarParmaite.tar.gz'
+tar --ungzip --extract --overwrite  --keep-newer-files --file UnicodeTengwarParmaite.tar.gz --directory unicodeparmaite
+cd unicodeparmaite
+mv --verbose parmaite.pfb UnicodeParmaite.pfb
+cd ~/texmf/fonts/type1/tengwarscript/
+
+# DONE: update names to match /usr/share/texlive/texmf-dist/fonts/map/dvips/tengwarscript/tengwarscript.map
+# DONE: install unicodeparmaite as well
+# DONE: make install safer by removing `cd -` commands.
diff --git a/Master/texmf-dist/doc/latex/tengwarscript/quetta.eps b/Master/texmf-dist/doc/latex/tengwarscript/quetta.eps
index 76bf65106d2..3d3ba2f80f4 100644
--- a/Master/texmf-dist/doc/latex/tengwarscript/quetta.eps
+++ b/Master/texmf-dist/doc/latex/tengwarscript/quetta.eps
@@ -1,16 +1,16 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 14 16
-%%HiResBoundingBox: 0.900000 0.400000 13.753125 15.799609
+%%HiResBoundingBox: 0.900000 0.400000 13.900000 15.800000
 %.............................................
-%%Creator: ESP Ghostscript 81501 (epswrite)
-%%CreationDate: 2007/03/11 19:03:00
+%%Creator: GPL Ghostscript 910 (epswrite)
+%%CreationDate: 2014/07/12 13:15:21
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments
 %%BeginProlog
 % This copyright applies to everything between here and the %%EndProlog:
-% Copyright (C) 2004 artofcode LLC, Benicia, CA.  All rights reserved.
-%%BeginResource: procset GS_epswrite_2_0_1001
+% Copyright (C) 2013 Artifex Software, Inc.  All rights reserved.
+%%BeginResource: procset GS_epswrite_2_0_1001 1.001 0
 /GS_epswrite_2_0_1001 80 dict dup begin
 /PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch
 4 index eq and{ pop pop pop}{ PageSize dup  1
@@ -65,69 +65,26 @@ GS_epswrite_2_0_1001 begin
 gsave mark
 Q q
 0 0 140 0 0 160 ^ Y
-0.2 i
 K
-65.05 99.04 m
-3.3 6.43 5.57 10.99 6.79 14.04 c
--49.96 0 p
--3.55 0 -7.79 -5.71 -12.87 -16.96 c
-1.7 0.64 4.91 0.96 9.65 0.96 c
--6.43 -8.53 -9.65 -15.71 -9.65 -21.88 c
-0 -9.35 9.41 -18.2 18.81 -18.2 c
-8.39 0 16.46 3.95 24.18 12 c
-0 -51.39 p
-0 -4.6 1.38 -9.19 4.14 -13.61 c
-10.86 12.68 p
--1.94 2.37 -3 5.58 -3 9.3 c
-0 52.26 p
-0 9.98 0.35 16.91 1.05 20.8 c
-h
-52 97.98 0 -20.98 P
--5.19 -4.67 -10.04 -7 -14.39 -7 c
--4.35 0 -8.2 2.12 -11.55 6.2 c
--3.01 3.91 -4.52 7.99 -4.52 12.4 c
-0 4.57 1.51 7.5 4.52 8.48 c
-h
-f
-55.39 152.35 -3.05 4.23 -25.23 -37.94 H
-f
-90 99 m
--1.04 6.82 -2.95 11.54 -6.07 13.99 c
--4.68 -5.59 -8.32 -9.81 -10.93 -12.69 c
-3.39 -2.37 5 -5.58 5 -9.3 c
-0 -52.52 p
-0 -11.72 -1.45 -23.28 -4.15 -34.49 c
-5.38 1.36 9.03 2.88 11.46 4.75 c
-3.13 2.38 4.69 6.11 4.69 10.68 c
-0 71.57 p
-5.38 5.11 10.25 7.83 14.45 7.83 c
-4.37 0 8.23 -2.2 11.42 -6.61 c
-3.02 -3.89 4.54 -8.3 4.54 -12.87 c
-0 -6.1 -2.18 -9.14 -6.71 -9.14 c
--2.52 0 -5.37 1.21 -8.57 3.79 c
--8.06 -10.4 p
-2.52 -4.46 5.04 -6.6 7.39 -6.6 c
-5.88 0 12.09 4.55 18.81 13.5 c
-6.38 8.61 9.75 15.86 9.75 22.1 c
-0 9.28 -9.58 18.4 -18.81 18.4 c
--5.21 0 -9.57 -1.03 -13.44 -3.09 c
--3.19 -1.71 -6.72 -4.8 -10.75 -8.91 c
-h
-f
-137.53 52 m
--4.57 -2.62 -8.8 -4 -12.7 -4 c
--4.06 0 -14.05 4 -18.29 4 c
--7.29 0 -14.06 -5.21 -20.32 -15.79 c
-3.22 3.31 6.43 4.79 9.99 4.79 c
-4.06 0 16.43 -5 21.51 -5 c
-6.44 0 13.04 5.33 19.82 16 c
-h
-f
-106.03 149.09 6.43 -6.39 8.81 8.74 -6.44 6.56 H
-115.85 134.8 6.61 -6.81 8.81 9.25 -6.44 6.64 H
-93.33 134.56 6.61 -6.56 8.8 8.98 -6.61 6.74 H
-f
-cleartomark end end pagesave restore showpage
+9 4 63 109 @C
+,
++\JB)\pN<"^$f<8li7"bs8W-!s8W-!s7t/>#_Mp3#Jq"EqL&Utl20[/*=sn%+F4@d+&AR.o_STj
+rkJHaqu=G.s1`LN]9?4mO[fr#GMW"AhflPVGI@~>
+28 119 28 37 @C
+,
+P>u0-ALh=?AH]Wu7IK!DHbI,I\%?k?]6h#*gUD*=euo~>
+74 4 60 108 @C
+,
+,PXA_%hF$Cp\4Xds8VQfs8W-!s8W-!s8S5mTR@'okWYWRID4UQhgWY4r#jm*2qi^>g],%cs1eHs
+n,M_B?e3a4g8:f*WJ.!RCk`p0hX,Kg4kdMKK3)Jb%;7Gt'`fE~>
+88 36 51 16 @C
+,
+-E*+Dat=^"=EnBW@_nN<M\j!KmG?VR"m50+I9[X"?R%8_~>
+95 128 38 30 @C
+,
+4Ge2[l).6:C"#hGG2'I]gM*]_>&)MeN>#/`Waeep3d0oF[;+6m<hK~>
+cleartomark end end pagesave restore
+ showpage
 %%PageTrailer
 %%Trailer
 %%Pages: 1
diff --git a/Master/texmf-dist/doc/latex/tengwarscript/quetta.pdf b/Master/texmf-dist/doc/latex/tengwarscript/quetta.pdf
index fda2cf08766..fab35020166 100644
--- a/Master/texmf-dist/doc/latex/tengwarscript/quetta.pdf
+++ b/Master/texmf-dist/doc/latex/tengwarscript/quetta.pdf
diff --git a/Master/texmf-dist/doc/latex/tengwarscript/tengfonts.pdf b/Master/texmf-dist/doc/latex/tengwarscript/tengfonts.pdf
index 0492faaa304..574a54c083c 100644
--- a/Master/texmf-dist/doc/latex/tengwarscript/tengfonts.pdf
+++ b/Master/texmf-dist/doc/latex/tengwarscript/tengfonts.pdf
diff --git a/Master/texmf-dist/doc/latex/tengwarscript/tengfonts.tex b/Master/texmf-dist/doc/latex/tengwarscript/tengfonts.tex
index 478393abc4a..a5cfc22e644 100644
--- a/Master/texmf-dist/doc/latex/tengwarscript/tengfonts.tex
+++ b/Master/texmf-dist/doc/latex/tengwarscript/tengfonts.tex
@@ -5,12 +5,24 @@
 %% The original source files were:
 %%
 %% tengwarscript.dtx  (with options: `tengfonts.tex,package')
-%% Copyright (C) 2007 Ignacio Fernández Galván, all rights reserved.
-%% If you modify this file, you must change its name first.
-%% You are NOT ALLOWED to distribute this file alone. You are NOT
-%% ALLOWED to take money for the distribution or use of either this
-%% file or a changed version, except for a nominal charge for copying
-%% etc.
+%% 
+%%  tengwarscript.dtx
+%%  Copyright 2014 Ignacio Fernández Galván
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Ignacio Fernández Galván.
+%% 
+%%  This work consists of the files tengwarscript.dtx and tengwarscript.ins and the derived files tengwarscript.sty, annatar.cfg, annatarbold.cfg, annatarbolditalic.cfg, annataritalic.cfg, elfica.cfg, formal.cfg, gothika.cfg, noldor.cfg, noldorcapI.cfg, noldorcapII.cfg, parmaite.cfg, quenya.cfg, quenyacapI.cfg, quenyacapII.cfg, sindarin.cfg, sindarincapI.cfg, sindarincapII.cfg, teleri.cfg, unicodeparmaite.cfg, tengtest.tex, tengfonts.tex.
+%% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
diff --git a/Master/texmf-dist/doc/latex/tengwarscript/tengtest.pdf b/Master/texmf-dist/doc/latex/tengwarscript/tengtest.pdf
index 191ad39ddb4..74afec017a3 100644
--- a/Master/texmf-dist/doc/latex/tengwarscript/tengtest.pdf
+++ b/Master/texmf-dist/doc/latex/tengwarscript/tengtest.pdf
diff --git a/Master/texmf-dist/doc/latex/tengwarscript/tengtest.tex b/Master/texmf-dist/doc/latex/tengwarscript/tengtest.tex
index f246b3d19eb..6048c71122e 100644
--- a/Master/texmf-dist/doc/latex/tengwarscript/tengtest.tex
+++ b/Master/texmf-dist/doc/latex/tengwarscript/tengtest.tex
@@ -5,12 +5,24 @@
 %% The original source files were:
 %%
 %% tengwarscript.dtx  (with options: `tengtest.tex,package')
-%% Copyright (C) 2007 Ignacio Fernández Galván, all rights reserved.
-%% If you modify this file, you must change its name first.
-%% You are NOT ALLOWED to distribute this file alone. You are NOT
-%% ALLOWED to take money for the distribution or use of either this
-%% file or a changed version, except for a nominal charge for copying
-%% etc.
+%% 
+%%  tengwarscript.dtx
+%%  Copyright 2014 Ignacio Fernández Galván
+%% 
+%%  This work may be distributed and/or modified under the
+%%  conditions of the LaTeX Project Public License, either version 1.3
+%%  of this license of (at your option) any later version.
+%%  The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%%  and version 1.3 or later is part of all distributions of LaTeX
+%%  version 2005/12/01 or later.
+%% 
+%%  This work has the LPPL maintenance status `maintained'.
+%% 
+%%  The Current Maintainer of this work is Ignacio Fernández Galván.
+%% 
+%%  This work consists of the files tengwarscript.dtx and tengwarscript.ins and the derived files tengwarscript.sty, annatar.cfg, annatarbold.cfg, annatarbolditalic.cfg, annataritalic.cfg, elfica.cfg, formal.cfg, gothika.cfg, noldor.cfg, noldorcapI.cfg, noldorcapII.cfg, parmaite.cfg, quenya.cfg, quenyacapI.cfg, quenyacapII.cfg, sindarin.cfg, sindarincapI.cfg, sindarincapII.cfg, teleri.cfg, unicodeparmaite.cfg, tengtest.tex, tengfonts.tex.
+%% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
diff --git a/Master/texmf-dist/doc/latex/tengwarscript/tengwarscript.pdf b/Master/texmf-dist/doc/latex/tengwarscript/tengwarscript.pdf
index 7a1b1859806..af08d746935 100644
--- a/Master/texmf-dist/doc/latex/tengwarscript/tengwarscript.pdf
+++ b/Master/texmf-dist/doc/latex/tengwarscript/tengwarscript.pdf