summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/tools/tpm-ctan-check2
-rw-r--r--Master/texmf-dist/doc/latex/galois/README (renamed from Master/texmf-dist/source/latex/galois/README)4
-rw-r--r--Master/texmf-dist/doc/latex/galois/galois.pdfbin0 -> 110044 bytes
-rw-r--r--Master/texmf-dist/source/latex/galois/Makefile44
-rw-r--r--Master/texmf-dist/source/latex/galois/galois.dtx167
-rw-r--r--Master/texmf-dist/source/latex/galois/galois.ins6
-rw-r--r--Master/texmf-dist/tex/latex/galois/galois.sty63
-rw-r--r--Master/texmf-dist/tpm/galois.tpm12
-rw-r--r--Master/texmf-dist/tpm/pstricks-add.tpm2
-rw-r--r--Master/texmf/lists/galois5
10 files changed, 222 insertions, 83 deletions
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index c5c6b392d56..7071ae13964 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -46,7 +46,7 @@ sub main
"floatrow", "flowfram",
"fltpoint", "fmtcount", "fncychap", "fontspec", "formular",
"fourier", "free-math-font-survey", "frenchle",
- "genmisc", "glossary", "gnuplottex", "gost", "graphics",
+ "galois", "genmisc", "glossary", "gnuplottex", "gost", "graphics",
"graphicx-psmin",
"hrlatex", "hyphen-base", "hyphen-basque", "hyphen-german",
"hyphen-greek", "hyphen-norwegian", "hyphen-ukenglish",
diff --git a/Master/texmf-dist/source/latex/galois/README b/Master/texmf-dist/doc/latex/galois/README
index ad58f1ca701..b063b23d717 100644
--- a/Master/texmf-dist/source/latex/galois/README
+++ b/Master/texmf-dist/doc/latex/galois/README
@@ -1,6 +1,6 @@
-galois.sty V1.04 1999/05/01
+galois.sty V1.05 2006/03/19
-------------------------------------------------------------------------
-A LaTeX package for writing Galois connections (two dimensional notation).
+Write Galois connections in two dimensional style, optionally in color.
This file may be distributed under the terms of the LPPL.
-------------------------------------------------------------------------
Patrick.Cousot@ens.fr \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/galois/galois.pdf b/Master/texmf-dist/doc/latex/galois/galois.pdf
new file mode 100644
index 00000000000..d083626d688
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/galois/galois.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/galois/Makefile b/Master/texmf-dist/source/latex/galois/Makefile
new file mode 100644
index 00000000000..58ac721599b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/galois/Makefile
@@ -0,0 +1,44 @@
+PACKAGE = galois
+
+.PHONY:help
+help:
+ @echo '******************************************'
+ @echo 'make [help] : this help'
+ @echo 'make documentation: create ${PACKAGE}.pdf'
+ @echo 'make distribution : create ${PACKAGE}.tar.gz'
+ @echo 'make cleanup : delete auxiliary files'
+ @echo '******************************************'
+
+.PHONY:documentation
+documentation:
+ @echo '******************************************'
+ @echo 'Make documentation of ${PACKAGE} package...'
+ latex ${PACKAGE}.ins
+ latex ${PACKAGE}.dtx
+ makeindex -s gind.ist ${PACKAGE}
+ makeindex -s gglo.ist -o ${PACKAGE}.gls ${PACKAGE}.glo
+ latex ${PACKAGE}.dtx
+ latex ${PACKAGE}.dtx
+ dvips -Ppdf ${PACKAGE}.dvi
+ ps2pdf ${PACKAGE}.ps
+ @echo '******************************************'
+
+distribution:
+ @echo '******************************************'
+ @echo 'Make distribution of ${PACKAGE} package...'
+ mkdir $(PACKAGE)
+ cp -p README Makefile $(PACKAGE)
+ cp -p $(PACKAGE).dtx $(PACKAGE).ins $(PACKAGE).pdf $(PACKAGE)
+ tar -cvf $(PACKAGE).tar ./$(PACKAGE)
+ rm -rf $(PACKAGE)
+ gzip -9 $(PACKAGE).tar
+ @echo '******************************************'
+
+.PHONY:cleanup
+cleanup:
+ @echo '******************************************'
+ @echo 'Clean up...'
+ rm -f ${PACKAGE}.{aux,dvi,glo,gls,idx,ilg,ind,log,ps,sty,gz}
+ rm -f ${PACKAGE}.dtx~ ${PACKAGE}.ins~ Makefile~ README~
+ @echo '******************************************'
+
diff --git a/Master/texmf-dist/source/latex/galois/galois.dtx b/Master/texmf-dist/source/latex/galois/galois.dtx
index f80c8037acd..7d42cf52fc7 100644
--- a/Master/texmf-dist/source/latex/galois/galois.dtx
+++ b/Master/texmf-dist/source/latex/galois/galois.dtx
@@ -1,15 +1,15 @@
-\def\fileversion{1.04}
-\def\filedate{1999/05/01}
+\def\fileversion{1.05}
+\def\filedate{2005/03/19}
% \iffalse meta-comment
%
% This file can be redistributed and/or modified under the terms of
-% the LaTeX Project Public License from CTAN archives, as described in
-% macros/latex/base/ lppl.txt in the base LaTeX distribution. Either
-% version 1.0 or, at your option, any later version.
+% the LaTeX Project Public License from CTAN archives, as described at
+% http://www.latex-project.org/lppl.txt. Either LPPL Version 1.3 or,
+% at your option, any later version.
%
% \fi
%
-% \CheckSum{388}
+% \CheckSum{423}
%% \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
@@ -30,7 +30,7 @@
% \iffalse
%%
%% Source File: galois.dtx
-%% Copyright 1994 1998 1999 Patrick.Cousot@ens.fr
+%% Copyright 1994 1998 1999 2006 Patrick.Cousot@ens.fr
%%
%
%<*dtx>
@@ -50,13 +50,13 @@
\DoNotIndex{\DoNotIndex,\NeedsTeXFormat,\ifx,\else,\fi,\ifdim,\fi,\endtrivlist}
\DoNotIndex{\addtolength,\divide,\circ,\cleaders,\ensuremath}
\DoNotIndex{\begin,\end,\bgroup,\egroup,\begingroup,\endgroup}
-\DoNotIndex{\catcode,\noexpand,\protect,\string,\space}
-\DoNotIndex{\filedate,\filename,\fileversion}
-\DoNotIndex{\hbox,\raisebox,\rlap,\llap,\rule,\smash}
-\DoNotIndex{\let,\def,\newcommand,\newenvironment}
+\DoNotIndex{\catcode,\noexpand,\protect,\string,\space,\put,\equiv}
+\DoNotIndex{\filedate,\filename,\fileversion,\ProcessOptions}
+\DoNotIndex{\hbox,\raisebox,\rlap,\llap,\relax,\rule,\smash}
+\DoNotIndex{\let,\def,\newcommand,\newenvironment,\DeclareOption}
\DoNotIndex{\m@th,\mathchoice,\mathord,\mathrel,\max,\mkern,\newlength}
\DoNotIndex{\setlength,\settodepth,\settoheight,\settowidth}
-\DoNotIndex{\tiny,\scriptstyle,\scriptscriptstyle}
+\DoNotIndex{\tiny,\scriptstyle,\scriptscriptstyle,\undefined}
\DoNotIndex{\leftarrow,\rightarrow,\longleftarrow,\longrightarrow}
\makeatother
%
@@ -65,7 +65,7 @@
\EnableCrossrefs
\RecordChanges
%
-\usepackage{galois}
+\usepackage[color]{galois}
\begin{document}
\DocInput{galois.dtx}
\PrintIndex
@@ -78,22 +78,24 @@
[\filedate\space v\fileversion, Galois connections, Patrick.Cousot@ens.fr]
%
%
-% \changes{v0.00}{1996/11/25}
+% \changes{v0.00}{1996/11/25}%
% {Initial version for LaTeX 2.09}
-% \changes{v1.00}{1997/05/19}
+% \changes{v1.00}{1997/05/19}%
% {Adapted to LaTeX2e}
-% \changes{v1.01}{1998/10/19}
+% \changes{v1.01}{1998/10/19}%
% {Check "\textbackslash comp" is not already defined (as in "mathtime.sty")}
-% \changes{v1.02}{1998/11/13}
+% \changes{v1.02}{1998/11/13}%
% {Rewritting of extendable arrows using the TeX book left/right arrowfill
% p. 357. Added and renamed style parameters ("\textbackslash GaloisSep" now
% "\textbackslash GaloisArrowTagSep")}
-% \changes{v1.03}{1999/04/02}
+% \changes{v1.03}{1999/04/02}%
% {Renamed internal macros to avoid interferences with other packages
% "\textbackslash rightarrowfill" $\rightarrow$ "\textbackslash @GALOISrightarrowfill"
% "\textbackslash leftarrowfill" $\rightarrow$ "\textbackslash @GALOISleftarrowfill"}
-% \changes{v1.04}{1999/05/01}
+% \changes{v1.04}{1999/05/01}%
% {\LaTeX{} package file documentation}
+% \changes{v1.05}{2005/03/19}%
+% {Added color option}
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -164,7 +166,7 @@
% \quad{\rm and}\quad
% (M,\,{\sqsubseteq})\galois{\alpha_2}{\gamma_2}(N,\,{\preceq})
% \end{displaymath}
-% is a Galois connection (the composition $\comp$ o functions is
+% is a Galois connection (the composition $\comp$ of functions is
% |\comp|):
% \DescribeMacro{\comp}
% \begin{displaymath}
@@ -181,6 +183,39 @@
% x:\varphi(x)\preceq\phi(x)$. Observe that the length of the arrows
% stretches automatically to the appropriate width.
%
+% \section{Package options}
+%
+% \begin{macro}{color}
+% The \texttt{color} option is required for colored Galois
+% connections is in
+% \begin{center}
+% \begin{tabular}{cc}
+% |\galois[red]{\alpha}{\gamma}| &
+% $\galois[red]{\alpha}{\gamma}$,\\[1ex]
+% |\Galois{\alpha}[blue]{\gamma}| &
+% $\Galois{\alpha}[blue]{\gamma}$,\\[1ex]
+% |\GaloiS[red]{\alpha}[blue]{\gamma}| &
+% $\GaloiS[red]{\alpha}[blue]{\gamma}$,\\[1ex]
+% |\galoiSr[red]{\alpha}[blue]{\gamma}| &
+% $\galoiSr[red]{\alpha}[blue]{\gamma}$, or\\[1ex]
+% |\comp[red]| & $\comp[red]$\ .
+% \end{tabular}
+% \end{center}
+% Without '|color|' option, these colors are ignored.
+% \begin{macro}{\@GALOIScolor}
+% |\@GALOIScolor| is |\color| with the |color| option and later
+% defined as |\relax| in absence of |color| option.
+% \begin{macrocode}
+\DeclareOption{color}{%
+ \def\@GALOIScolor{\color}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ProcessOptions
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \section{Style parameters}
%
% You can use Galois connections in any size (footnotes, transparencies,
@@ -249,23 +284,39 @@
%<*package>
% \end{macrocode}
%
+% Require |color| package for '|color|' option else coloring is ignored.
+% \begin{macrocode}
+\ifx\@GALOIScolor\undefined
+\def\@GALOIScolor#1{\relax}%
+\else
+\RequirePackage{color}%
+\fi
+% \end{macrocode}
+%
% ^^A Reset style parameters to default
% \renewcommand{\GaloisStyle}{\scriptstyle}%
% \renewcommand{\GaloisArrowThickness}{0.1ex}%
% \renewcommand{\GaloisArrowsSep}{0.2ex}%
% \renewcommand{\GaloisArrowTagSep}{0.5ex}%
% \begin{macro}{\comp}
+% \begin{macro}{\@GALOIScomp}
% Define functional composition $f\comp g(x)$ is $f(g(x))$ (if not
-% already defined e.g.\ as in |mathtime.sty|):
+% already defined e.g.\ as in |mathtime.sty|). |\comp[color]| will
+% draw in color (black by default).
% \begin{macrocode}
\@ifundefined{comp}{%
-\newcommand{\comp}{\mathchoice{\mathrel{\raisebox{0.2ex}{$\scriptstyle\circ$}}}%
-{\mathrel{\raisebox{0.2ex}{$\scriptstyle\circ$}}}%
-{\mathrel{\raisebox{0.1ex}{$\scriptscriptstyle\circ$}}}%
-{\mathrel{\raisebox{0.1ex}{$\scriptscriptstyle\circ$}}}}%
+% Scan the optional color argument
+\newcommand{\comp}{\@ifnextchar[{\@GALOIScomp}{\@GALOIScomp[black]}}%
+% Defined the colored functional composition \@GALOIScomp[color]
+\def\@GALOIScomp[#1]{\mathchoice
+{\mathrel{\raisebox{0.2ex}{$\@GALOIScolor{#1}\scriptstyle\circ$}}}%
+{\mathrel{\raisebox{0.2ex}{$\@GALOIScolor{#1}\scriptstyle\circ$}}}%
+{\mathrel{\raisebox{0.1ex}{$\@GALOIScolor{#1}\scriptscriptstyle\circ$}}}%
+{\mathrel{\raisebox{0.1ex}{$\@GALOIScolor{#1}\scriptscriptstyle\circ$}}}}%
}{}%
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% Style commands:
% \begin{macro}{\GaloisStyle}
@@ -367,15 +418,32 @@
%
% Stacking $a$, the arrows and $g$ in $\galois{a}{g}$:
% \begin{macro}{\@GALOIS}
-% |\@GALOIS{a}{g}{-->}{<--}| constructs $\galois{a}{g}$:
+% \begin{macro}{\@GALOISca}
+% \begin{macro}{\@GALOISca}
+% |\@GALOIS{-->}{<--}{a}{g}| constructs $\galois{a}{g}$.
+% |\@GALOIS{-->}{<--}[colora]{a}{g}|,
+% |\@GALOIS{-->}{<--}{a}[colorg]{g}| and
+% |\@GALOIS{-->}{<--}[colora]{a}[colorg]{g}|
+% add colors |colora| for the $a$-arrow and |colorg| for
+% the$ g$ arrow.
% \begin{macrocode}
-\def\@GALOIS#1#2#3#4{%
+% First, scan the alpha color optional argument (black
+% otherwise)
+\def\@GALOIS#1#2{\@ifnextchar[{\@GALOISca{#1}{#2}}{\@GALOISca{#1}{#2}[black]}}%
+% Second scan the gamma color optional argument (black
+% otherwise)
+\def\@GALOISca#1#2[#3]#4{\@ifnextchar[{\@GALOIScacg{#1}{#2}[#3]{#4}}%
+ {\@GALOIScacg{#1}{#2}[#3]{#4}[black]}}%
+% Finally \@GALOIScacg{-->}{<--}[colora]{a}[colorg]{g} stacks $a$,
+% the arrows and $g$ in $\galois{a}{g}$, using colors with the
+% 'color' option.
+\def\@GALOIScacg#1#2[#3]#4[#5]#6{%
\ensuremath{\mathrel{%
-\def\@GALOISalphatag{\ $\GaloisStyle#1$\ }%
-\def\@GALOISgammatag{\ $\GaloisStyle#2$\ }%
+\def\@GALOISalphatag{\ $\@GALOIScolor{#3}\GaloisStyle#4$\ }%
+\def\@GALOISgammatag{\ $\@GALOIScolor{#5}\GaloisStyle#6$\ }%
% compute width of alpha/lower and gamma/upper arrows
-\settowidth{\@GALOISalphaarrowwidth}{$\mathord{#3}$}%
-\settowidth{\@GALOISgammaarrowwidth}{$\mathord{#4}$}%
+\settowidth{\@GALOISalphaarrowwidth}{$\mathord{#1}$}%
+\settowidth{\@GALOISgammaarrowwidth}{$\mathord{#2}$}%
% compute width of the picture \@GALOISwidth
\ifdim\@GALOISalphaarrowwidth>\@GALOISgammaarrowwidth%
\settowidth{\@tempdima}{\hbox{\hspace*{\@GALOISalphaarrowwidth}\@GALOISalphatag}}%
@@ -389,20 +457,23 @@
\else%
\setlength{\@GALOISwidth}{\@tempdimb}%
\fi%
-\def\@GALOISrightarrow{\hbox to\@GALOISwidth{\@GALOISrightarrowfill{#3}}}%
-\def\@GALOISleftarrow{\hbox to\@GALOISwidth{\@GALOISleftarrowfill{#4}}}%
+\def\@GALOISrightarrow{\hbox to\@GALOISwidth
+{\@GALOIScolor{#3}\@GALOISrightarrowfill{#1}}}%
+\def\@GALOISleftarrow{\hbox to\@GALOISwidth
+{\@GALOIScolor{#5}\@GALOISleftarrowfill{#2}}}%
% compute half height of alpha/lower arrow
-\settodepth{\@GALOISalphaarrowhalfheight}{$\mathord{#3}$}%
-\settoheight{\@tempdima}{$\mathord{#3}$}%
+\settodepth{\@GALOISalphaarrowhalfheight}{$\mathord{#1}$}%
+\settoheight{\@tempdima}{$\mathord{#1}$}%
\addtolength{\@GALOISalphaarrowhalfheight}{\@tempdima}%
\divide \@GALOISalphaarrowhalfheight by 2%
% compute half height of gamma/upper arrow
-\settodepth{\@GALOISgammaarrowhalfheight}{$\mathord{#4}$}%
-\settoheight{\@tempdima}{$\mathord{#4}$}%
+\settodepth{\@GALOISgammaarrowhalfheight}{$\mathord{#2}$}%
+\settoheight{\@tempdima}{$\mathord{#2}$}%
\addtolength{\@GALOISgammaarrowhalfheight}{\@tempdima}%
\divide \@GALOISgammaarrowhalfheight by 2%
% compute the distance between the two arrows \@GALOISGap =
-% \max(\@GALOISalphaarrowhalfheight,\@GALOISgammaarrowhalfheight)+\GaloisArrowsSep
+% \max(\@GALOISalphaarrowhalfheight,
+% \@GALOISgammaarrowhalfheight)+\GaloisArrowsSep
\ifdim\@GALOISalphaarrowhalfheight>\@GALOISgammaarrowhalfheight%
\setlength{\@GALOISGap}{\@GALOISalphaarrowhalfheight}%
\else%
@@ -418,12 +489,14 @@
\settoheight{\@GALOISalphaheight}{\@GALOISalphatag}%
\settodepth{\@GALOISgammadepth}{\@GALOISgammatag}%
% compute depth \@GALOISdepth of the picture
-% \@GALOISdepth = \@GALOISalphadepth+\@GALOISalphaheight % vertical size of alpha tag
-% + \GaloisArrowTagSep % between top of tag and arrow
+% \@GALOISdepth = \@GALOISalphadepth
+% + \@GALOISalphaheight % vertical size of alpha tag
+% + \GaloisArrowTagSep % between top of tag and arrow
\setlength{\@GALOISdepth}{\@GALOISalphadepth}%
\addtolength{\@GALOISdepth}{\@GALOISalphaheight}%
\addtolength{\@GALOISdepth}{\GaloisArrowTagSep}%
-\addtolength{\@GALOISdepth}{-\GaloisArrowThickness }% lift from the stem thickness
+% lift from the stem thickness
+\addtolength{\@GALOISdepth}{-\GaloisArrowThickness }%
% compute height \@GALOISheight of the picture
\setlength{\@GALOISheight}{\@GALOISGap}%
\addtolength{\@GALOISheight}{\GaloisArrowTagSep}%
@@ -461,11 +534,13 @@
}}}%
% \end{macrocode}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\galois}
% |\galois{a}{g}| is $\galois{a}{g}$.
% \begin{macrocode}
-\newcommand{\galois}[2]{\@GALOIS{#1}{#2}{\rightarrow}{\leftarrow}}%
+\newcommand{\galois}{\@GALOIS{\rightarrow}{\leftarrow}}%
% \end{macrocode}
% \end{macro}
%
@@ -475,7 +550,7 @@
% \begin{macrocode}
\def\@GALOISmytwoheadrightarrow{\rlap{$\:\,{\rightarrow}$}{\longrightarrow}}%
\def\@GALOIStwoheadrightarrow{\protect\@GALOISmytwoheadrightarrow}%
-\newcommand{\galoiS}[2]{\@GALOIS{#1}{#2}{\@GALOIStwoheadrightarrow}{\leftarrow}}%
+\newcommand{\galoiS}{\@GALOIS{\@GALOIStwoheadrightarrow}{\leftarrow}}%
% \end{macrocode}
% \end{macro}
%
@@ -485,7 +560,7 @@
\def\@GALOISmytwoheadrightarrowreduc{\rlap{\smash{\hskip1ex\raisebox{0.815ex}%
{\tiny$\equiv$}}}\rlap{$\:\,{\rightarrow}$}{\longrightarrow}}%
\def\@GALOIStwoheadrightarrowreduc{\protect\@GALOISmytwoheadrightarrowreduc}%
-\newcommand{\galoiSr}[2]{\@GALOIS{#1}{#2}{\@GALOIStwoheadrightarrowreduc}{\leftarrow}}%
+\newcommand{\galoiSr}{\@GALOIS{\@GALOIStwoheadrightarrowreduc}{\leftarrow}}%
% \end{macrocode}
% \end{macro}
%
@@ -495,14 +570,14 @@
% \begin{macrocode}
\def\@GALOISmytwoheadleftarrow{\rlap{$\:{\leftarrow}$}{\longleftarrow}}%
\def\@GALOIStwoheadleftarrow{\protect\@GALOISmytwoheadleftarrow}%
-\newcommand{\Galois}[2]{\@GALOIS{#1}{#2}{\rightarrow}{\@GALOIStwoheadleftarrow}}%
+\newcommand{\Galois}{\@GALOIS{\rightarrow}{\@GALOIStwoheadleftarrow}}%
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\GaloiS}
% |\GaloiS{a}{g}| is $\GaloiS{a}{g}$ ($a$ bijective with inverse $g$).
% \begin{macrocode}
-\newcommand{\GaloiS}[2]{\@GALOIS{#1}{#2}%
+\newcommand{\GaloiS}{\@GALOIS%
{\@GALOIStwoheadrightarrow}{\@GALOISmytwoheadleftarrow}}%
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/galois/galois.ins b/Master/texmf-dist/source/latex/galois/galois.ins
index 25b6d13d039..1b7f1c1599e 100644
--- a/Master/texmf-dist/source/latex/galois/galois.ins
+++ b/Master/texmf-dist/source/latex/galois/galois.ins
@@ -4,9 +4,9 @@
%% LaTeX or TeX.
%%
%% This file can be redistributed and/or modified under the terms of
-%% the LaTeX Project Public License from CTAN archives, as described in
-%% macros/latex/base/ lppl.txt in the base LaTeX distribution. Either
-%% version 1.0 or, at your option, any later version.
+%% the LaTeX Project Public License from CTAN archives, as described at
+%% http://www.latex-project.org/lppl.txt. Either LPPL Version 1.3 or,
+%% at your option, any later version.
%%
%% --------------- start of docstrip commands ------------------
%%
diff --git a/Master/texmf-dist/tex/latex/galois/galois.sty b/Master/texmf-dist/tex/latex/galois/galois.sty
index 61ae2847635..cebe8a2bd75 100644
--- a/Master/texmf-dist/tex/latex/galois/galois.sty
+++ b/Master/texmf-dist/tex/latex/galois/galois.sty
@@ -11,8 +11,8 @@
%% distribution. Either version 1.0 or, at your option, any later
%% version.
%%
-\def\fileversion{1.04}
-\def\filedate{1999/05/01}
+\def\fileversion{1.05}
+\def\filedate{2005/03/19}
%% \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
@@ -31,16 +31,26 @@
%%
%%
%% Source File: galois.dtx
-%% Copyright 1994 1998 1999 Patrick.Cousot@ens.fr
+%% Copyright 1994 1998 1999 2006 Patrick.Cousot@ens.fr
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{galois}
[\filedate\space v\fileversion, Galois connections, Patrick.Cousot@ens.fr]
+\DeclareOption{color}{%
+ \def\@GALOIScolor{\color}}
+\ProcessOptions
+\ifx\@GALOIScolor\undefined
+\def\@GALOIScolor#1{\relax}%
+\else
+\RequirePackage{color}%
+\fi
\@ifundefined{comp}{%
-\newcommand{\comp}{\mathchoice{\mathrel{\raisebox{0.2ex}{$\scriptstyle\circ$}}}%
-{\mathrel{\raisebox{0.2ex}{$\scriptstyle\circ$}}}%
-{\mathrel{\raisebox{0.1ex}{$\scriptscriptstyle\circ$}}}%
-{\mathrel{\raisebox{0.1ex}{$\scriptscriptstyle\circ$}}}}%
+\newcommand{\comp}{\@ifnextchar[{\@GALOIScomp}{\@GALOIScomp[black]}}%
+\def\@GALOIScomp[#1]{\mathchoice
+{\mathrel{\raisebox{0.2ex}{$\@GALOIScolor{#1}\scriptstyle\circ$}}}%
+{\mathrel{\raisebox{0.2ex}{$\@GALOIScolor{#1}\scriptstyle\circ$}}}%
+{\mathrel{\raisebox{0.1ex}{$\@GALOIScolor{#1}\scriptscriptstyle\circ$}}}%
+{\mathrel{\raisebox{0.1ex}{$\@GALOIScolor{#1}\scriptscriptstyle\circ$}}}}%
}{}%
\newcommand{\GaloisStyle}{\scriptstyle}%
\newcommand{\GaloisArrowThickness}{0.1ex}%
@@ -66,12 +76,15 @@
\def\@GALOISleftarrowfill#1{$\m@th \mathord{#1} \mkern-7mu%
\cleaders\hbox{$\mkern-2mu \smash- \mkern-2mu$}\hfill%
\mkern-7mu \smash-$}%
-\def\@GALOIS#1#2#3#4{%
+\def\@GALOIS#1#2{\@ifnextchar[{\@GALOISca{#1}{#2}}{\@GALOISca{#1}{#2}[black]}}%
+\def\@GALOISca#1#2[#3]#4{\@ifnextchar[{\@GALOIScacg{#1}{#2}[#3]{#4}}%
+ {\@GALOIScacg{#1}{#2}[#3]{#4}[black]}}%
+\def\@GALOIScacg#1#2[#3]#4[#5]#6{%
\ensuremath{\mathrel{%
-\def\@GALOISalphatag{\ $\GaloisStyle#1$\ }%
-\def\@GALOISgammatag{\ $\GaloisStyle#2$\ }%
-\settowidth{\@GALOISalphaarrowwidth}{$\mathord{#3}$}%
-\settowidth{\@GALOISgammaarrowwidth}{$\mathord{#4}$}%
+\def\@GALOISalphatag{\ $\@GALOIScolor{#3}\GaloisStyle#4$\ }%
+\def\@GALOISgammatag{\ $\@GALOIScolor{#5}\GaloisStyle#6$\ }%
+\settowidth{\@GALOISalphaarrowwidth}{$\mathord{#1}$}%
+\settowidth{\@GALOISgammaarrowwidth}{$\mathord{#2}$}%
\ifdim\@GALOISalphaarrowwidth>\@GALOISgammaarrowwidth%
\settowidth{\@tempdima}{\hbox{\hspace*{\@GALOISalphaarrowwidth}\@GALOISalphatag}}%
\settowidth{\@tempdimb}{\hbox{\hspace*{\@GALOISalphaarrowwidth}\@GALOISgammatag}}%
@@ -84,14 +97,16 @@
\else%
\setlength{\@GALOISwidth}{\@tempdimb}%
\fi%
-\def\@GALOISrightarrow{\hbox to\@GALOISwidth{\@GALOISrightarrowfill{#3}}}%
-\def\@GALOISleftarrow{\hbox to\@GALOISwidth{\@GALOISleftarrowfill{#4}}}%
-\settodepth{\@GALOISalphaarrowhalfheight}{$\mathord{#3}$}%
-\settoheight{\@tempdima}{$\mathord{#3}$}%
+\def\@GALOISrightarrow{\hbox to\@GALOISwidth
+{\@GALOIScolor{#3}\@GALOISrightarrowfill{#1}}}%
+\def\@GALOISleftarrow{\hbox to\@GALOISwidth
+{\@GALOIScolor{#5}\@GALOISleftarrowfill{#2}}}%
+\settodepth{\@GALOISalphaarrowhalfheight}{$\mathord{#1}$}%
+\settoheight{\@tempdima}{$\mathord{#1}$}%
\addtolength{\@GALOISalphaarrowhalfheight}{\@tempdima}%
\divide \@GALOISalphaarrowhalfheight by 2%
-\settodepth{\@GALOISgammaarrowhalfheight}{$\mathord{#4}$}%
-\settoheight{\@tempdima}{$\mathord{#4}$}%
+\settodepth{\@GALOISgammaarrowhalfheight}{$\mathord{#2}$}%
+\settoheight{\@tempdima}{$\mathord{#2}$}%
\addtolength{\@GALOISgammaarrowhalfheight}{\@tempdima}%
\divide \@GALOISgammaarrowhalfheight by 2%
\ifdim\@GALOISalphaarrowhalfheight>\@GALOISgammaarrowhalfheight%
@@ -108,7 +123,7 @@
\setlength{\@GALOISdepth}{\@GALOISalphadepth}%
\addtolength{\@GALOISdepth}{\@GALOISalphaheight}%
\addtolength{\@GALOISdepth}{\GaloisArrowTagSep}%
-\addtolength{\@GALOISdepth}{-\GaloisArrowThickness }% lift from the stem thickness
+\addtolength{\@GALOISdepth}{-\GaloisArrowThickness }%
\setlength{\@GALOISheight}{\@GALOISGap}%
\addtolength{\@GALOISheight}{\GaloisArrowTagSep}%
\addtolength{\@GALOISheight}{\@GALOISgammadepth}%
@@ -137,18 +152,18 @@
\rule[-\@GALOISdepth]{0pt}{\@GALOIStotalheight}% set depth and height
\hspace*{\@GALOISwidth}% set width
}}}%
-\newcommand{\galois}[2]{\@GALOIS{#1}{#2}{\rightarrow}{\leftarrow}}%
+\newcommand{\galois}{\@GALOIS{\rightarrow}{\leftarrow}}%
\def\@GALOISmytwoheadrightarrow{\rlap{$\:\,{\rightarrow}$}{\longrightarrow}}%
\def\@GALOIStwoheadrightarrow{\protect\@GALOISmytwoheadrightarrow}%
-\newcommand{\galoiS}[2]{\@GALOIS{#1}{#2}{\@GALOIStwoheadrightarrow}{\leftarrow}}%
+\newcommand{\galoiS}{\@GALOIS{\@GALOIStwoheadrightarrow}{\leftarrow}}%
\def\@GALOISmytwoheadrightarrowreduc{\rlap{\smash{\hskip1ex\raisebox{0.815ex}%
{\tiny$\equiv$}}}\rlap{$\:\,{\rightarrow}$}{\longrightarrow}}%
\def\@GALOIStwoheadrightarrowreduc{\protect\@GALOISmytwoheadrightarrowreduc}%
-\newcommand{\galoiSr}[2]{\@GALOIS{#1}{#2}{\@GALOIStwoheadrightarrowreduc}{\leftarrow}}%
+\newcommand{\galoiSr}{\@GALOIS{\@GALOIStwoheadrightarrowreduc}{\leftarrow}}%
\def\@GALOISmytwoheadleftarrow{\rlap{$\:{\leftarrow}$}{\longleftarrow}}%
\def\@GALOIStwoheadleftarrow{\protect\@GALOISmytwoheadleftarrow}%
-\newcommand{\Galois}[2]{\@GALOIS{#1}{#2}{\rightarrow}{\@GALOIStwoheadleftarrow}}%
-\newcommand{\GaloiS}[2]{\@GALOIS{#1}{#2}%
+\newcommand{\Galois}{\@GALOIS{\rightarrow}{\@GALOIStwoheadleftarrow}}%
+\newcommand{\GaloiS}{\@GALOIS%
{\@GALOIStwoheadrightarrow}{\@GALOISmytwoheadleftarrow}}%
\endinput
%%
diff --git a/Master/texmf-dist/tpm/galois.tpm b/Master/texmf-dist/tpm/galois.tpm
index 4591c4eab02..d8090c98203 100644
--- a/Master/texmf-dist/tpm/galois.tpm
+++ b/Master/texmf-dist/tpm/galois.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/galois.zip">
<TPM:Name>galois</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:53:40</TPM:Date>
+ <TPM:Date>2006/03/19 15:32:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -15,12 +15,16 @@ A LaTeX package for writing Galois connections (two dimensional notation).
<TPM:Author>Patrick Cousot</TPM:Author>
<TPM:Size>28910</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="8151">
+ <TPM:RunFiles size="8683">
texmf-dist/tex/latex/galois/galois.sty
texmf-dist/tpm/galois.tpm
</TPM:RunFiles>
- <TPM:SourceFiles size="20759">
-texmf-dist/source/latex/galois/README
+ <TPM:DocFiles size="110373">
+texmf-dist/doc/latex/galois/README
+texmf-dist/doc/latex/galois/galois.pdf
+ </TPM:DocFiles>
+ <TPM:SourceFiles size="24403">
+texmf-dist/source/latex/galois/Makefile
texmf-dist/source/latex/galois/galois.dtx
texmf-dist/source/latex/galois/galois.ins
</TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/pstricks-add.tpm b/Master/texmf-dist/tpm/pstricks-add.tpm
index 4e8d00fb185..08967d3dc6b 100644
--- a/Master/texmf-dist/tpm/pstricks-add.tpm
+++ b/Master/texmf-dist/tpm/pstricks-add.tpm
@@ -21,7 +21,7 @@ pst-plot, pst-node, pst-tree and pst-grad.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author>Herbert Voss</TPM:Author>
- <TPM:Size>2007691</TPM:Size>
+ <TPM:Size>2016161</TPM:Size>
<TPM:Build/>
<TPM:RunFiles size="139882">
texmf-dist/dvips/pstricks-add/pstricks-add.pro
diff --git a/Master/texmf/lists/galois b/Master/texmf/lists/galois
index 7496fa1a5dc..05c4c0c6ec0 100644
--- a/Master/texmf/lists/galois
+++ b/Master/texmf/lists/galois
@@ -1,5 +1,6 @@
-
-texmf-dist/source/latex/galois/README
+texmf-dist/doc/latex/galois/README
+texmf-dist/doc/latex/galois/galois.pdf
+texmf-dist/source/latex/galois/Makefile
texmf-dist/source/latex/galois/galois.dtx
texmf-dist/source/latex/galois/galois.ins
texmf-dist/tex/latex/galois/galois.sty