archaic (cypriot) update (24may09)

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

13 files changed, 449 insertions, 451 deletions

diff --git a/Master/texmf-dist/doc/fonts/archaic/cypriot-README b/Master/texmf-dist/doc/fonts/archaic/cypriot-README
index 15ade5ac372..0cc52b0d084 100644
--- a/Master/texmf-dist/doc/fonts/archaic/cypriot-README
+++ b/Master/texmf-dist/doc/fonts/archaic/cypriot-README
@@ -3,6 +3,9 @@ script which was used on Cyprus for writing Greek. The script was
 in use between approximately the tenth and third centuries BC.
 The bundle is one of a series for archaic fonts.
 
+Changes in version 1.2 (2009/05/22)
+o Bug fixes in package code and documentation
+
 Changes in version 1.1 (2005/06/13)
 o Font supplied as Postscript Type1 as well as MetaFont
 
@@ -11,7 +14,7 @@ o First public release
 
 ------------------------------------------------------------------
   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-  Copyright 1999--2005 Peter R. Wilson
+  Copyright 1999--2009 Peter R. Wilson
 
   This work may be distributed and/or modified under the
   conditions of the Latex Project Public License, either
@@ -48,7 +51,7 @@ cypr10.afm
 cypr10.pfb
 cypr10.tfm
 
-    To install the bundlee:
+    To install the bundle:
 o If you want MetaFont sources uncomment the appropriate lines in cypriot.ins.
 o run: latex cypriot.ins, which will generate:
        cypriot.sty
@@ -78,7 +81,7 @@ o (for an index run: makeindex -s gind.ist *.idx)
 o run: (pdf)latex *.dtx
 o Print *.(pdf|dvi) for a hardcopy of the package manual
 
-2005/06/13
+2009/05/22
 Peter Wilson
 herries dot press at earthlink dot net
 
diff --git a/Master/texmf-dist/doc/fonts/archaic/cypriot.pdf b/Master/texmf-dist/doc/fonts/archaic/cypriot.pdf
index b38659b3597..42578aacd38 100644
--- a/Master/texmf-dist/doc/fonts/archaic/cypriot.pdf
+++ b/Master/texmf-dist/doc/fonts/archaic/cypriot.pdf
diff --git a/Master/texmf-dist/doc/fonts/archaic/trycypriot.pdf b/Master/texmf-dist/doc/fonts/archaic/trycypriot.pdf
index 389d96e7909..24d6ebb6e83 100644
--- a/Master/texmf-dist/doc/fonts/archaic/trycypriot.pdf
+++ b/Master/texmf-dist/doc/fonts/archaic/trycypriot.pdf
diff --git a/Master/texmf-dist/doc/fonts/archaic/trycypriot.tex b/Master/texmf-dist/doc/fonts/archaic/trycypriot.tex
index d4eb84dce72..2407e1888bf 100644
--- a/Master/texmf-dist/doc/fonts/archaic/trycypriot.tex
+++ b/Master/texmf-dist/doc/fonts/archaic/trycypriot.tex
@@ -61,7 +61,7 @@
 
 %    The w syllables (wa, we, wi, wo) are: \textcypr{\Cwa{} \Cwe{} \Cwi{} \Cwo}
 
-    The x syllables (xa, xe, xo) are: \textcypr{x X z}.
+    The x syllables (xa, xe) are: \textcypr{x X}.
 
 %    The x syllables (xa, xe, xo) are: \textcypr{\Cxa{} \Cxe{} \Cxo}
 
@@ -109,7 +109,7 @@ r & \CP{\Cra} & \CP{\Cre} & \CP{\Cri} & \CP{\Cro} & \CP{\Cru} \\
 s & \CP{\Csa} & \CP{\Cse} & \CP{\Csi} & \CP{\Cso} & \CP{\Csu} \\
 t & \CP{\Cta} & \CP{\Cte} & \CP{\Cti} & \CP{\Cto} & \CP{\Ctu} \\
 w & \CP{\Cwa} & \CP{\Cwe} & \CP{\Cwi} & \CP{\Cwo} \\
-x & \CP{\Cxa} & \CP{\Cxe} &           & \CP{\Cxo} \\
+x & \CP{\Cxa} & \CP{\Cxe} &           &           \\ %% \CP{\Cxo} \\
 z &           &           &           & \CP{\Czo} 
 \end{tabular}
 \end{table}
diff --git a/Master/texmf-dist/source/fonts/archaic/cypriot.dtx b/Master/texmf-dist/source/fonts/archaic/cypriot.dtx
index 3ff0f5facbd..947dd58f978 100644
--- a/Master/texmf-dist/source/fonts/archaic/cypriot.dtx
+++ b/Master/texmf-dist/source/fonts/archaic/cypriot.dtx
@@ -3,7 +3,7 @@
 % cypriot.dtx
 %
 %  Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%  Copyright 1999--2005 Peter R. Wilson
+%  Copyright 1999--2009 Peter R. Wilson
 %
 %  This work may be distributed and/or modified under the
 %  conditions of the Latex Project Public License, either
@@ -108,9 +108,11 @@
 % \changes{v1.0}{1999/06/20}{First public release}
 % \changes{v1.1}{2005/04/17}{Contact changed, Type1 map file}
 % \changes{v1.1}{2005/04/17}{Merged the three metafont files into one}
+% \changes{v1.2}{2009/05/22}{Corrected some glyph codings}
 %
 % \def\fileversion{v1.0} \def\filedate{1999/06/20}
 % \def\fileversion{v1.1} \def\filedate{2005/06/13}
+% \def\fileversion{v1.2} \def\filedate{2009/05/22}
 % \newcommand*{\Lpack}[1]{\textsf {#1}}           ^^A typeset a package
 % \newcommand*{\Lopt}[1]{\textsf {#1}}            ^^A typeset an option
 % \newcommand*{\file}[1]{\texttt {#1}}            ^^A typeset a file
@@ -258,7 +260,7 @@
 % The apparently odd mapping to the ASCII characters is so that a
 % companion Linear~B font~\cite{LINEARB} can use the same ASCII characters
 % for the syllables that are common to both scripts.
-%
+% \changes{v1.2}{2009/05/22}{Added \cs{Cxa} and \cs{Cxe} to encoding table}
 % \begin{table}
 % \centering
 % \caption{Commands and encoding for the signs}\label{tab:basic}
@@ -276,6 +278,7 @@
 % s  & |\Csa| s & |\Cse| S & |\Csi| Y & |\Cso| 1 & |\Csu| 2 \\
 % t  & |\Cta| t & |\Cte| T & |\Cti| 3 & |\Cto| 4 & |\Ctu| 5 \\
 % w  & |\Cwa| w & |\Cwe| W & |\Cwi| 6 & |\Cwo| 7 &          \\
+% x  & |\Cxa| x & |\Cxe| X &          &          &          \\
 % z  &          &          &          & |\Czo| 9 &          \\
 % \hline
 % \end{tabular}
@@ -317,6 +320,430 @@
 % would do: \\
 % |\renewcommand{\translitcyprfont}{\sffamily\bfseries}|
 %
+%
+% \section{The font definition files} \label{sec:fd}
+%
+%    \begin{macrocode}
+%<*fdot1>
+\ProvidesFile{ot1cypr.fd}[1999/06/20 v1.0 Cypriot font definitions]
+\DeclareFontFamily{OT1}{cypr}{}
+  \DeclareFontShape{OT1}{cypr}{m}{n}{ <-> cypr10 }{}
+  \DeclareFontShape{OT1}{cypr}{bx}{n}{ <-> sub cypr/m/n }{}
+  \DeclareFontShape{OT1}{cypr}{b}{n}{ <-> sub cypr/m/n }{}
+  \DeclareFontShape{OT1}{cypr}{m}{sl}{ <-> sub cypr/m/n }{}
+  \DeclareFontShape{OT1}{cypr}{m}{it}{ <-> sub cypr/m/n }{}
+%</fdot1>
+%    \end{macrocode}
+%
+%
+%    \begin{macrocode}
+%<*fdt1>
+\ProvidesFile{t1cypr.fd}[1999/06/20 v1.0 Cypriot font definitions]
+\DeclareFontFamily{T1}{cypr}{}
+  \DeclareFontShape{T1}{cypr}{m}{n}{ <-> cypr10 }{}
+  \DeclareFontShape{T1}{cypr}{bx}{n}{ <-> sub cypr/m/n }{}
+  \DeclareFontShape{T1}{cypr}{b}{n}{ <-> sub cypr/m/n }{}
+  \DeclareFontShape{T1}{cypr}{m}{sl}{ <-> sub cypr/m/n }{}
+  \DeclareFontShape{T1}{cypr}{m}{it}{ <-> sub cypr/m/n }{}
+%</fdt1>
+%    \end{macrocode}
+%
+% \section{The \Lpack{cypriot} package code} \label{sec:code}
+%
+%    Announce the name and version of the package, which requires
+% \LaTeXe{}.
+%    \begin{macrocode}
+%<*usc>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{cypriot}[2009/05/22 v1.2 package for Cypriot font]
+%    \end{macrocode}
+%
+%   We need to check the encoding default for the document.
+% \begin{macro}{\Tienc}
+%    \begin{macrocode}
+\providecommand{\Tienc}{T1}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\cyprfamily}
+%    Selects the Cypriot font family in the T1 encoding if this
+% is the document's default encoding, otherwise make it the OT1 encoding.
+%    \begin{macrocode}
+\ifx\Tienc\encodingdefault
+  \newcommand{\cyprfamily}{\usefont{T1}{cypr}{m}{n}}
+\else
+  \newcommand{\cyprfamily}{\usefont{OT1}{cypr}{m}{n}}
+\fi
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\textcypr}
+%    Text command for the Cypriot font family.
+%    \begin{macrocode}
+\DeclareTextFontCommand{\textcypr}{\cyprfamily}
+%    \end{macrocode}
+% \end{macro}
+%
+%    The commands for the basic signs.
+% \begin{macro}{\Ca}
+% \begin{macro}{\Ce}
+% \begin{macro}{\Ci}
+% \begin{macro}{\Co}
+% \begin{macro}{\Cu}
+% The 5 vowels.
+%    \begin{macrocode}
+\chardef\Ca=`a
+\chardef\Ce=`e
+\chardef\Ci=`i
+\chardef\Co=`o
+\chardef\Cu=`u
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\Cga}
+% The 1 G syllables.
+%    \begin{macrocode}
+\chardef\Cga=`g
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\Cja}
+% \begin{macro}{\Cjo}
+% The 2 J syllables.
+%    \begin{macrocode}
+\chardef\Cja=`j
+\chardef\Cjo=`b
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+%
+% \begin{macro}{\Cka}
+% \begin{macro}{\Cke}
+% \begin{macro}{\Cki}
+% \begin{macro}{\Cko}
+% \begin{macro}{\Cku}
+% The 5 K syllables.
+%    \begin{macrocode}
+\chardef\Cka=`k
+\chardef\Cke=`K
+\chardef\Cki=`c
+\chardef\Cko=`h
+\chardef\Cku=`v
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\Cla}
+% \begin{macro}{\Cle}
+% \begin{macro}{\Cli}
+% \begin{macro}{\Clo}
+% \begin{macro}{\Clu}
+% The 5 L syllables.
+%    \begin{macrocode}
+\chardef\Cla=`l
+\chardef\Cle=`L
+\chardef\Cli=`d
+\chardef\Clo=`f
+\chardef\Clu=`q
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+%
+% \begin{macro}{\Cma}
+% \begin{macro}{\Cme}
+% \begin{macro}{\Cmi}
+% \begin{macro}{\Cmo}
+% \begin{macro}{\Cmu}
+% The 5 M syllables.
+%    \begin{macrocode}
+\chardef\Cma=`m
+\chardef\Cme=`M
+\chardef\Cmi=`y
+\chardef\Cmo=`A
+\chardef\Cmu=`B
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+%
+% \begin{macro}{\Cna}
+% \begin{macro}{\Cne}
+% \begin{macro}{\Cni}
+% \begin{macro}{\Cno}
+% \begin{macro}{\Cnu}
+% The 5 N syllables.
+%    \begin{macrocode}
+\chardef\Cna=`n
+\chardef\Cne=`N
+\chardef\Cni=`C
+\chardef\Cno=`E
+\chardef\Cnu=`F
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\Cpa}
+% \begin{macro}{\Cpe}
+% \begin{macro}{\Cpi}
+% \begin{macro}{\Cpo}
+% \begin{macro}{\Cpu}
+% The 5 P syllables.
+%    \begin{macrocode}
+\chardef\Cpa=`p
+\chardef\Cpe=`P
+\chardef\Cpi=`G
+\chardef\Cpo=`H
+\chardef\Cpu=`I
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+%
+% \begin{macro}{\Cra}
+% \begin{macro}{\Cre}
+% \begin{macro}{\Cri}
+% \begin{macro}{\Cro}
+% \begin{macro}{\Cru}
+% The 5 R syllables.
+%    \begin{macrocode}
+\chardef\Cra=`r
+\chardef\Cre=`R
+\chardef\Cri=`O
+\chardef\Cro=`U
+\chardef\Cru=`V
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\Csa}
+% \begin{macro}{\Cse}
+% \begin{macro}{\Csi}
+% \begin{macro}{\Cso}
+% \begin{macro}{\Csu}
+% The 5 S syllables.
+%    \begin{macrocode}%
+\chardef\Csa=`s
+\chardef\Cse=`S
+\chardef\Csi=`Y
+\chardef\Cso=`1
+\chardef\Csu=`2
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\Cta}
+% \begin{macro}{\Cte}
+% \begin{macro}{\Cti}
+% \begin{macro}{\Cto}
+% \begin{macro}{\Ctu}
+% The 5 T syllables.
+%    \begin{macrocode}
+\chardef\Cta=`t
+\chardef\Cte=`T
+\chardef\Cti=`3
+\chardef\Cto=`4
+\chardef\Ctu=`5
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\Cwa}
+% \begin{macro}{\Cwe}
+% \begin{macro}{\Cwi}
+% \begin{macro}{\Cwo}
+% The 4 W syllables.
+%    \begin{macrocode}
+\chardef\Cwa=`w
+\chardef\Cwe=`W
+\chardef\Cwi=`6
+\chardef\Cwo=`7
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\Cxa}
+% \begin{macro}{\Cxe}
+% The 2 X syllables.
+% \changes{v1.2}{2009/05/22}{There are only 2, not 3, X syllables}
+%    \begin{macrocode}
+\chardef\Cxa=`x
+\chardef\Cxe=`X
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\Czo}
+% The 1 Z syllables.
+%    \begin{macrocode}
+\chardef\Czo=`9
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\Cza}
+% \begin{macro}{\Cya}
+% \begin{macro}{\Cya}
+% The 3 arguable syllables.
+%    \begin{macrocode}
+\chardef\Cza=`g
+\chardef\Cya=`j
+\chardef\Cyo=`b
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+%
+% \begin{macro}{\translitcyprfont}
+% \begin{macro}{\translitcypr}
+%    |\translitcypr{|\meta{char-commands}|}| transliterates Cypriot character
+% commands into distinguished syllables; these are typeset using the 
+% |\translitcyprfont| font specification.
+%    \begin{macrocode}
+\newcommand{\translitcyprfont}{\itshape}
+\newcommand{\translitcypr}[1]{{%
+  \@translitC\translitcyprfont #1}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@translitC}
+%    This macro redefines all the character producing commands for use
+% in |\translitcypr|.
+%
+% Start with the 5 vowels. We have to make sure that there are no extraneous
+% spaces within the command.
+%    \begin{macrocode}
+\newcommand{\@translitC}{%
+\def\Ca{a-}\def\Ce{e-}\def\Ci{i-}\def\Co{o-}\def\Cu{u-}%
+%    \end{macrocode}    
+%
+% The 1 G syllables.
+%    \begin{macrocode}
+\def\Cga{ga-}%
+%    \end{macrocode}
+%
+% The 2 J syllables.
+%    \begin{macrocode}
+\def\Cja{ja-}\def\Cjo{jo-}%
+%    \end{macrocode}
+%
+% The 5 K syllables.
+%    \begin{macrocode}
+\def\Cka{ka-}\def\Cke{ke-}\def\Cki{ki-}\def\Cko{ko-}\def\Cku{ku-}%
+%    \end{macrocode}
+%
+% The 5 L syllables.
+%    \begin{macrocode}
+\def\Cda{da-}\def\Cde{de-}\def\Cdi{di-}\def\Cdo{do-}\def\Cdu{du-}%
+%    \end{macrocode}
+%
+% The 5 M syllables.
+%    \begin{macrocode}
+\def\Cma{ma-}\def\Cme{me-}\def\Cmi{mi-}\def\Cmo{mo-}\def\Cmu{mu-}%
+%    \end{macrocode}
+%
+% The 5 N syllables.
+%    \begin{macrocode}
+\def\Cna{na-}\def\Cne{ne-}\def\Cni{ni-}\def\Cno{no-}\def\Cnu{nu-}%
+%    \end{macrocode}
+%
+% The 5 P syllables.
+%    \begin{macrocode}
+\def\Cpa{pa-}\def\Cpe{pe-}\def\Cpi{pi-}\def\Cpo{po-}\def\Cpu{pu-}%
+%    \end{macrocode}
+%
+%
+% The 5 R syllables.
+%    \begin{macrocode}
+\def\Cra{ra-}\def\Cre{re-}\def\Cri{ri-}\def\Cro{ro-}\def\Cru{ru-}%
+%    \end{macrocode}
+%
+% The 5 S syllables.
+%    \begin{macrocode}
+\def\Csa{sa-}\def\Cse{se-}\def\Csi{si-}\def\Cso{so-}\def\Csu{su-}%
+%    \end{macrocode}
+%
+% The 5 T syllables.
+%    \begin{macrocode}
+\def\Cta{ta-}\def\Cte{te-}\def\Cti{ti-}\def\Cto{to-}\def\Ctu{tu-}%
+%    \end{macrocode}
+%
+% The 4 W syllables.
+%    \begin{macrocode}
+\def\Cwa{wa-}\def\Cwe{we-}\def\Cwi{wi-}\def\Cwo{wo-}%
+%    \end{macrocode}
+%
+% The 2 X syllables.
+% \changes{v1.2}{2009/05/22}{There is no \cs{Cxo} syllable}
+%    \begin{macrocode}
+\def\Cxa{xa-}\def\Cxe{xe-}%
+%    \end{macrocode}
+%
+% The 1 Z syllables.
+%    \begin{macrocode}
+\def\Czo{zo-}%
+%    \end{macrocode}
+%
+% The 3 arguable syllables
+%    \begin{macrocode}
+\def\Cza{za-}\def\Cya{ya-}\def\Cyo{yo-}%
+%    \end{macrocode}
+%
+% Close the macro definition.
+%    \begin{macrocode}
+} % end of \@translitC
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%    The end of this package.
+%    \begin{macrocode}
+%</usc>
+%    \end{macrocode}
+%
+% \section{The map file}
+%
+% This is pretty short.
+% \changes{v1.1}{2005/04/17}{Added the map file}
+%    \begin{macrocode}
+%<*map>
+cypr10   Archaic-Cypriot  <cypr10.pfb
+%</map>
+%    \end{macrocode}
+%
 % 
 % \StopEventually{
 % \bibliographystyle{alpha}
@@ -357,6 +784,7 @@
 % \PrintIndex
 % }
 %
+%
 %     
 %
 % \section{The Metafont code} \label{sec:mf}
@@ -1663,434 +2091,6 @@ end
 %
 %
 %
-% \section{The font definition files} \label{sec:fd}
-%
-%    \begin{macrocode}
-%<*fdot1>
-\ProvidesFile{ot1cypr.fd}[1999/06/20 v1.0 Cypriot font definitions]
-\DeclareFontFamily{OT1}{cypr}{}
-  \DeclareFontShape{OT1}{cypr}{m}{n}{ <-> cypr10 }{}
-  \DeclareFontShape{OT1}{cypr}{bx}{n}{ <-> sub cypr/m/n }{}
-  \DeclareFontShape{OT1}{cypr}{b}{n}{ <-> sub cypr/m/n }{}
-  \DeclareFontShape{OT1}{cypr}{m}{sl}{ <-> sub cypr/m/n }{}
-  \DeclareFontShape{OT1}{cypr}{m}{it}{ <-> sub cypr/m/n }{}
-%</fdot1>
-%    \end{macrocode}
-%
-%
-%    \begin{macrocode}
-%<*fdt1>
-\ProvidesFile{t1cypr.fd}[1999/06/20 v1.0 Cypriot font definitions]
-\DeclareFontFamily{T1}{cypr}{}
-  \DeclareFontShape{T1}{cypr}{m}{n}{ <-> cypr10 }{}
-  \DeclareFontShape{T1}{cypr}{bx}{n}{ <-> sub cypr/m/n }{}
-  \DeclareFontShape{T1}{cypr}{b}{n}{ <-> sub cypr/m/n }{}
-  \DeclareFontShape{T1}{cypr}{m}{sl}{ <-> sub cypr/m/n }{}
-  \DeclareFontShape{T1}{cypr}{m}{it}{ <-> sub cypr/m/n }{}
-%</fdt1>
-%    \end{macrocode}
-%
-% \section{The \Lpack{cypriot} package code} \label{sec:code}
-%
-%    Announce the name and version of the package, which requires
-% \LaTeXe{}.
-%    \begin{macrocode}
-%<*usc>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cypriot}[1999/06/20 v1.0 package for Cypriot font]
-%    \end{macrocode}
-%
-%   We need to check the encoding default for the document.
-% \begin{macro}{\Tienc}
-%    \begin{macrocode}
-\providecommand{\Tienc}{T1}
-%    \end{macrocode}
-% \end{macro}
-%
-%
-% \begin{macro}{\cyprfamily}
-%    Selects the Cypriot font family in the T1 encoding if this
-% is the document's default encoding, otherwise make it the OT1 encoding.
-%    \begin{macrocode}
-\ifx\Tienc\encodingdefault
-  \newcommand{\cyprfamily}{\usefont{T1}{cypr}{m}{n}}
-\else
-  \newcommand{\cyprfamily}{\usefont{OT1}{cypr}{m}{n}}
-\fi
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\textcypr}
-%    Text command for the Cypriot font family.
-%    \begin{macrocode}
-\DeclareTextFontCommand{\textcypr}{\cyprfamily}
-%    \end{macrocode}
-% \end{macro}
-%
-%    The commands for the basic signs.
-% \begin{macro}{\Ca}
-% \begin{macro}{\Ce}
-% \begin{macro}{\Ci}
-% \begin{macro}{\Co}
-% \begin{macro}{\Cu}
-% The 5 vowels.
-%    \begin{macrocode}
-\chardef\Ca=`a
-\chardef\Ce=`e
-\chardef\Ci=`i
-\chardef\Co=`o
-\chardef\Cu=`u
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Cga}
-% The 1 G syllables.
-%    \begin{macrocode}
-\chardef\Cga=`g
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Cja}
-% \begin{macro}{\Cjo}
-% The 2 J syllables.
-%    \begin{macrocode}
-\chardef\Cja=`j
-\chardef\Cjo=`b
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-%
-% \begin{macro}{\Cka}
-% \begin{macro}{\Cke}
-% \begin{macro}{\Cki}
-% \begin{macro}{\Cko}
-% \begin{macro}{\Cku}
-% The 5 K syllables.
-%    \begin{macrocode}
-\chardef\Cka=`k
-\chardef\Cke=`K
-\chardef\Cki=`c
-\chardef\Cko=`h
-\chardef\Cku=`v
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Cla}
-% \begin{macro}{\Cle}
-% \begin{macro}{\Cli}
-% \begin{macro}{\Clo}
-% \begin{macro}{\Clu}
-% The 5 L syllables.
-%    \begin{macrocode}
-\chardef\Cla=`l
-\chardef\Cle=`L
-\chardef\Cli=`d
-\chardef\Clo=`f
-\chardef\Clu=`q
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \begin{macro}{\Cma}
-% \begin{macro}{\Cme}
-% \begin{macro}{\Cmi}
-% \begin{macro}{\Cmo}
-% \begin{macro}{\Cmu}
-% The 5 M syllables.
-%    \begin{macrocode}
-\chardef\Cma=`m
-\chardef\Cme=`M
-\chardef\Cmi=`y
-\chardef\Cmo=`A
-\chardef\Cmu=`B
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \begin{macro}{\Cna}
-% \begin{macro}{\Cne}
-% \begin{macro}{\Cni}
-% \begin{macro}{\Cno}
-% \begin{macro}{\Cnu}
-% The 5 N syllables.
-%    \begin{macrocode}
-\chardef\Cna=`n
-\chardef\Cne=`N
-\chardef\Cni=`C
-\chardef\Cno=`E
-\chardef\Cnu=`F
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Cpa}
-% \begin{macro}{\Cpe}
-% \begin{macro}{\Cpi}
-% \begin{macro}{\Cpo}
-% \begin{macro}{\Cpu}
-% The 5 P syllables.
-%    \begin{macrocode}
-\chardef\Cpa=`p
-\chardef\Cpe=`P
-\chardef\Cpi=`G
-\chardef\Cpo=`H
-\chardef\Cpu=`I
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \begin{macro}{\Cra}
-% \begin{macro}{\Cre}
-% \begin{macro}{\Cri}
-% \begin{macro}{\Cro}
-% \begin{macro}{\Cru}
-% The 5 R syllables.
-%    \begin{macrocode}
-\chardef\Cra=`r
-\chardef\Cre=`R
-\chardef\Cri=`O
-\chardef\Cro=`U
-\chardef\Cru=`V
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Csa}
-% \begin{macro}{\Cse}
-% \begin{macro}{\Csi}
-% \begin{macro}{\Cso}
-% \begin{macro}{\Csu}
-% The 5 S syllables.
-%    \begin{macrocode}%
-\chardef\Csa=`s
-\chardef\Cse=`S
-\chardef\Csi=`Y
-\chardef\Cso=`1
-\chardef\Csu=`2
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Cta}
-% \begin{macro}{\Cte}
-% \begin{macro}{\Cti}
-% \begin{macro}{\Cto}
-% \begin{macro}{\Ctu}
-% The 5 T syllables.
-%    \begin{macrocode}
-\chardef\Cta=`t
-\chardef\Cte=`T
-\chardef\Cti=`3
-\chardef\Cto=`4
-\chardef\Ctu=`5
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Cwa}
-% \begin{macro}{\Cwe}
-% \begin{macro}{\Cwi}
-% \begin{macro}{\Cwo}
-% The 4 W syllables.
-%    \begin{macrocode}
-\chardef\Cwa=`w
-\chardef\Cwe=`W
-\chardef\Cwi=`6
-\chardef\Cwo=`7
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Cxa}
-% \begin{macro}{\Cxe}
-% \begin{macro}{\Cxo}
-% The 3 X syllables.
-%    \begin{macrocode}
-\chardef\Cxa=`x
-\chardef\Cxe=`X
-\chardef\Cxo=`z
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Czo}
-% The 1 Z syllables.
-%    \begin{macrocode}
-\chardef\Czo=`9
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Cza}
-% \begin{macro}{\Cya}
-% \begin{macro}{\Cya}
-% The 3 arguable syllables.
-%    \begin{macrocode}
-\chardef\Cza=`g
-\chardef\Cya=`j
-\chardef\Cyo=`b
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-%
-%
-% \begin{macro}{\translitcyprfont}
-% \begin{macro}{\translitcypr}
-%    |\translitcypr{|\meta{char-commands}|}| transliterates Cypriot character
-% commands into distinguished syllables; these are typeset using the 
-% |\translitcyprfont| font specification.
-%    \begin{macrocode}
-\newcommand{\translitcyprfont}{\itshape}
-\newcommand{\translitcypr}[1]{{%
-  \@translitC\translitcyprfont #1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@translitC}
-%    This macro redefines all the character producing commands for use
-% in |\translitcypr|.
-%
-% Start with the 5 vowels. We have to make sure that there are no extraneous
-% spaces within the command.
-%    \begin{macrocode}
-\newcommand{\@translitC}{%
-\def\Ca{a-}\def\Ce{e-}\def\Ci{i-}\def\Co{o-}\def\Cu{u-}%
-%    \end{macrocode}    
-%
-% The 1 G syllables.
-%    \begin{macrocode}
-\def\Cga{ga-}%
-%    \end{macrocode}
-%
-% The 2 J syllables.
-%    \begin{macrocode}
-\def\Cja{ja-}\def\Cjo{jo-}%
-%    \end{macrocode}
-%
-% The 5 K syllables.
-%    \begin{macrocode}
-\def\Cka{ka-}\def\Cke{ke-}\def\Cki{ki-}\def\Cko{ko-}\def\Cku{ku-}%
-%    \end{macrocode}
-%
-% The 5 L syllables.
-%    \begin{macrocode}
-\def\Cda{da-}\def\Cde{de-}\def\Cdi{di-}\def\Cdo{do-}\def\Cdu{du-}%
-%    \end{macrocode}
-%
-% The 5 M syllables.
-%    \begin{macrocode}
-\def\Cma{ma-}\def\Cme{me-}\def\Cmi{mi-}\def\Cmo{mo-}\def\Cmu{mu-}%
-%    \end{macrocode}
-%
-% The 5 N syllables.
-%    \begin{macrocode}
-\def\Cna{na-}\def\Cne{ne-}\def\Cni{ni-}\def\Cno{no-}\def\Cnu{nu-}%
-%    \end{macrocode}
-%
-% The 5 P syllables.
-%    \begin{macrocode}
-\def\Cpa{pa-}\def\Cpe{pe-}\def\Cpi{pi-}\def\Cpo{po-}\def\Cpu{pu-}%
-%    \end{macrocode}
-%
-%
-% The 5 R syllables.
-%    \begin{macrocode}
-\def\Cra{ra-}\def\Cre{re-}\def\Cri{ri-}\def\Cro{ro-}\def\Cru{ru-}%
-%    \end{macrocode}
-%
-% The 5 S syllables.
-%    \begin{macrocode}
-\def\Csa{sa-}\def\Cse{se-}\def\Csi{si-}\def\Cso{so-}\def\Csu{su-}%
-%    \end{macrocode}
-%
-% The 5 T syllables.
-%    \begin{macrocode}
-\def\Cta{ta-}\def\Cte{te-}\def\Cti{ti-}\def\Cto{to-}\def\Ctu{tu-}%
-%    \end{macrocode}
-%
-% The 4 W syllables.
-%    \begin{macrocode}
-\def\Cwa{wa-}\def\Cwe{we-}\def\Cwi{wi-}\def\Cwo{wo-}%
-%    \end{macrocode}
-%
-% The 3 X syllables.
-%    \begin{macrocode}
-\def\Cxa{xa-}\def\Cxe{xe-}\def\Cxo{xo-}%
-%    \end{macrocode}
-%
-% The 1 Z syllables.
-%    \begin{macrocode}
-\def\Czo{zo-}%
-%    \end{macrocode}
-%
-% The 3 arguable syllables
-%    \begin{macrocode}
-\def\Cza{za-}\def\Cya{ya-}\def\Cyo{yo-}%
-%    \end{macrocode}
-%
-% Close the macro definition.
-%    \begin{macrocode}
-} % end of \@translitC
-%    \end{macrocode}
-% \end{macro}
-%
-%
-%    The end of this package.
-%    \begin{macrocode}
-%</usc>
-%    \end{macrocode}
-%
-% \section{The map file}
-%
-% This is pretty short.
-% \changes{v1.1}{2005/04/17}{Added the map file}
-%    \begin{macrocode}
-%<*map>
-cypr10   Archaic-Cypriot  <cypr10.pfb
-%</map>
-%    \end{macrocode}
-%
-%
-%
 % \Finale
 %
 \endinput
diff --git a/Master/texmf-dist/source/fonts/archaic/cypriot.ins b/Master/texmf-dist/source/fonts/archaic/cypriot.ins
index 1cad77c4fb6..baa51acc47d 100644
--- a/Master/texmf-dist/source/fonts/archaic/cypriot.ins
+++ b/Master/texmf-dist/source/fonts/archaic/cypriot.ins
@@ -1,6 +1,6 @@
 %% cypriot.ins
 %%  Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%%  Copyright 1999--2005 Peter R. Wilson
+%%  Copyright 1999--2009 Peter R. Wilson
 %%
 %%  This work may be distributed and/or modified under the
 %%  conditions of the Latex Project Public License, either
@@ -25,7 +25,7 @@
 \preamble
 ------------------------------------------------------------------
   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-  Copyright 1999--2005 Peter R. Wilson
+  Copyright 1999--2009 Peter R. Wilson
 
   This work may be distributed and/or modified under the
   conditions of the Latex Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/archaic/cypriot.sty b/Master/texmf-dist/tex/latex/archaic/cypriot.sty
index bb347ab39f5..bc44f4433a8 100644
--- a/Master/texmf-dist/tex/latex/archaic/cypriot.sty
+++ b/Master/texmf-dist/tex/latex/archaic/cypriot.sty
@@ -7,7 +7,7 @@
 %% cypriot.dtx  (with options: `usc')
 %% ------------------------------------------------------------------
 %%   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%%   Copyright 1999--2005 Peter R. Wilson
+%%   Copyright 1999--2009 Peter R. Wilson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the Latex Project Public License, either
@@ -23,7 +23,7 @@
 %%   This work consists of the files listed in the README file.
 %% ------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cypriot}[1999/06/20 v1.0 package for Cypriot font]
+\ProvidesPackage{cypriot}[2009/05/22 v1.2 package for Cypriot font]
 \providecommand{\Tienc}{T1}
 \ifx\Tienc\encodingdefault
   \newcommand{\cyprfamily}{\usefont{T1}{cypr}{m}{n}}
@@ -85,7 +85,6 @@
 \chardef\Cwo=`7
 \chardef\Cxa=`x
 \chardef\Cxe=`X
-\chardef\Cxo=`z
 \chardef\Czo=`9
 \chardef\Cza=`g
 \chardef\Cya=`j
@@ -106,7 +105,7 @@
 \def\Csa{sa-}\def\Cse{se-}\def\Csi{si-}\def\Cso{so-}\def\Csu{su-}%
 \def\Cta{ta-}\def\Cte{te-}\def\Cti{ti-}\def\Cto{to-}\def\Ctu{tu-}%
 \def\Cwa{wa-}\def\Cwe{we-}\def\Cwi{wi-}\def\Cwo{wo-}%
-\def\Cxa{xa-}\def\Cxe{xe-}\def\Cxo{xo-}%
+\def\Cxa{xa-}\def\Cxe{xe-}%
 \def\Czo{zo-}%
 \def\Cza{za-}\def\Cya{ya-}\def\Cyo{yo-}%
 } % end of \@translitC
diff --git a/Master/texmf-dist/tex/latex/archaic/ot1cypr.fd b/Master/texmf-dist/tex/latex/archaic/ot1cypr.fd
index db68dfb81d6..d8ed0d42e6b 100644
--- a/Master/texmf-dist/tex/latex/archaic/ot1cypr.fd
+++ b/Master/texmf-dist/tex/latex/archaic/ot1cypr.fd
@@ -7,7 +7,7 @@
 %% cypriot.dtx  (with options: `fdot1')
 %% ------------------------------------------------------------------
 %%   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%%   Copyright 1999--2005 Peter R. Wilson
+%%   Copyright 1999--2009 Peter R. Wilson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the Latex Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/archaic/t1cypr.fd b/Master/texmf-dist/tex/latex/archaic/t1cypr.fd
index c2a86c24e26..6249c373542 100644
--- a/Master/texmf-dist/tex/latex/archaic/t1cypr.fd
+++ b/Master/texmf-dist/tex/latex/archaic/t1cypr.fd
@@ -7,7 +7,7 @@
 %% cypriot.dtx  (with options: `fdt1')
 %% ------------------------------------------------------------------
 %%   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%%   Copyright 1999--2005 Peter R. Wilson
+%%   Copyright 1999--2009 Peter R. Wilson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the Latex Project Public License, either
diff --git a/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
index 33655d5696d..624aa00cb14 100644
--- a/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
@@ -11,7 +11,6 @@ runpattern d tlpkg/archive
 runpattern d tlpkg/doc
 runpattern d tlpkg/libexec
 runpattern f texmf-dist/README
-runpattern f texmf-doc/README
 runpattern f texmf/README
 runpattern f texmf/doc/man/Makefile
 runpattern f texmf/doc/man/man1/Makefile
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
index 1390f7c5494..84202cd09ea 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
@@ -1,7 +1,6 @@
 name collection-documentation-polish
 category Collection
 shortdesc Polish documentation
-depend guides-pl
 depend lshort-polish
 depend tex-virtual-academy-pl
 depend texlive-pl
diff --git a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
index a5e0691f791..b4e531c9490 100644
--- a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
@@ -18,7 +18,6 @@ depend firststeps
 depend impatient
 depend iwona
 depend metafont-for-beginners
-depend metafp
 depend metapost-examples
 depend pstricks-tutorial
 depend seminar
diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
index 6ddb1ff17c0..c8a3521d5fc 100644
--- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
@@ -1,12 +1,11 @@
-name xmltex
-category Package
 depend pdftex
 depend tex
-execute AddFormat name=xmltex engine=pdftex patterns=language.dat options="&latex xmltex.ini"
-execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat options="&pdflatex pdfxmltex.ini"
+execute AddFormat name=xmltex engine=pdftex patterns=language.dat \
+        options="&latex xmltex.ini" 
+execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat \
+        options="&pdflatex pdfxmltex.ini" 
 srcpattern +!d texmf-dist/source/xmltex/xmlplay
 runpattern d texmf-dist/tex/xmltex/base
 runpattern d texmf-dist/tex/xmltex/config
-docpattern d texmf-dist/doc/xmltex/base
 binpattern f bin/${ARCH}/pdfxmltex
 binpattern f bin/${ARCH}/xmltex