guit update

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

2 files changed, 229 insertions, 109 deletions

diff --git a/Master/texmf-dist/tex/latex/GuIT/guit.cfg b/Master/texmf-dist/tex/latex/GuIT/guit.cfg
index cb4472a9e95..5466564e239 100644
--- a/Master/texmf-dist/tex/latex/GuIT/guit.cfg
+++ b/Master/texmf-dist/tex/latex/GuIT/guit.cfg
@@ -6,7 +6,7 @@
 %%
 %% guit.dtx  (with options: `cfg')
 %% 
-%%  Copyright 2003, 2004, 2005 Gruppo Utilizzatori Italiani di TeX
+%%  Copyright 2003, 2004, 2005, 2006 Gruppo Utilizzatori Italiani di TeX
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either
@@ -21,17 +21,23 @@
 %%  This work has the LPPL maintenance status "author-maintained".
 %% 
 %%  This work consists of the files: README, guit.dtx, guit.ins and the
-%%  derived files guit.sty, guit.cfg and guittext.tex
+%%  derived files guit.sty, guit.cfg and guittest.tex
 %% 
-\ProvidesFile{guit.cfg}[2005/04/08 v0.8.2 File di configurazione di guit.sty]
+\ProvidesFile{guit.cfg}[2006/05/24 v0.9 File di configurazione di guit.sty]
 %% Esempi:
 %% \GuITcolor{1, 0, 1, 0.6}
 %% \DeclareGuITLogoCommand{ptm}{-0.27em}{0.5475ex}{-0.125em}{-0.125em}
+%% \DeclareGuITLogoCommand{ptm}[bx]{-0.345em}{0.68ex}{-0.125em}{-0.125em}
 %% \DeclareGuITLogoCommand{ppl}{-0.276em}{0.717ex}{-0.125em}{-0.125em}
+%% \DeclareGuITLogoCommand{ppl}[bx]{-0.33em}{0.689ex}{-0.125em}{-0.125em}
 %% \DeclareGuITLogoCommand{pnc}{-0.322em}{0.678ex}{-0.125em}{-0.125em}
+%% \DeclareGuITLogoCommand{pnc}[bx]{-0.36em}{0.656ex}{-0.125em}{-0.125em}
 %% \DeclareGuITLogoCommand{put}{-0.285em}{0.61ex}{-0.125em}{-0.125em}
+%% \AliasGuITLogoCommand{put}{bx}{put}{m}
 %% \DeclareGuITLogoCommand{bch}{-0.28em}{0.58ex}{-0.125em}{-0.125em}
+%% \DeclareGuITLogoCommand{bch}[bx]{-0.31em}{0.56ex}{-0.125em}{-0.125em}
 %% \DeclareGuITLogoCommand{pbk}{-0.3em}{0.59ex}{-0.125em}{-0.125em}
+%% \DeclareGuITLogoCommand{pbk}[bx]{-0.34em}{0.52ex}{-0.125em}{-0.125em}
 \endinput
 %%
 %% End of file `guit.cfg'.
diff --git a/Master/texmf-dist/tex/latex/GuIT/guit.sty b/Master/texmf-dist/tex/latex/GuIT/guit.sty
index a2e30095b0a..9adfe9c944f 100644
--- a/Master/texmf-dist/tex/latex/GuIT/guit.sty
+++ b/Master/texmf-dist/tex/latex/GuIT/guit.sty
@@ -6,7 +6,7 @@
 %%
 %% guit.dtx  (with options: `style')
 %% 
-%%  Copyright 2003, 2004, 2005 Gruppo Utilizzatori Italiani di TeX
+%%  Copyright 2003, 2004, 2005, 2006 Gruppo Utilizzatori Italiani di TeX
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either
@@ -21,148 +21,262 @@
 %%  This work has the LPPL maintenance status "author-maintained".
 %% 
 %%  This work consists of the files: README, guit.dtx, guit.ins and the
-%%  derived files guit.sty, guit.cfg and guittext.tex
+%%  derived files guit.sty, guit.cfg and guittest.tex
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{guit}[2005/04/08 v0.8.2 Logo del GuIT]
-\RequirePackage{url}
+\ProvidesPackage{guit}[2006/05/24 v0.9 Logo del GuIT]
+\RequirePackage{hyperref, graphics, url}
+\RequirePackage{xcolor}[2004/07/04]
+\RequirePackage{xkeyval}[2005/05/07]
 \newif\if@guit@colorized
-\@guit@colorizedtrue
-\newif\if@guit@always@colorized
-\newif\if@guit@xcolorized
 \newif\if@guit@link
-\DeclareOption{color}{%
-  \@guit@colorizedtrue
-  \@guit@always@colorizedtrue}
-\DeclareOption{nocolor}{%
-  \@guit@colorizedfalse
-  \@guit@always@colorizedfalse}
-\DeclareOption{link}{\@guit@linktrue}
+\DeclareOption{color}{\AtEndOfPackage{\setupGuIT[color=yes]}}
+\DeclareOption{nocolor}{\AtEndOfPackage{\setupGuIT[color=no]}}
+\DeclareOption{link}{\AtEndOfPackage{\setupGuIT[link=yes]}}
 \ProcessOptions\relax
+\DeclareRobustCommand{\setupGuIT}[1][color=no, link=no, family=, series=, url=http://www.guit.sssup.it, document=, year=, style=display]{%
+  \setkeys*{guit}{#1}%
+  \ignorespaces}
+\let\setupguit\setupGuIT
+\define@choicekey*{guit}{color}[\val\nr]{yes,true,no,false}[yes]{%
+  \ifcase\nr\relax
+    \@guit@colorizedtrue
+  \or
+    \@guit@colorizedtrue
+  \or
+    \@guit@colorizedfalse
+  \or
+    \@guit@colorizedfalse
+  \fi}
+\define@choicekey*{guit}{link}[\val\nr]{yes,true,no,false}[yes]{%
+  \ifcase\nr\relax
+    \@guit@linktrue
+  \or
+    \@guit@linktrue
+  \or
+    \@guit@linkfalse
+  \or
+    \@guit@linkfalse
+  \fi}
+\define@key{guit}{family}{\def\@guit@family{#1}}
+\define@key{guit}{series}{\def\@guit@series{#1}}
 \DeclareRobustCommand*{\GuITcolor}{%
   \@ifstar\x@guit@color@imp\@guit@color@imp}
-\if@guit@colorized
-  \IfFileExists{xcolor.sty}%
-    {\RequirePackage{xcolor}\@guit@xcolorizedtrue}%
-    {\RequirePackage{color}\@guit@xcolorizedfalse}
-  \if@guit@xcolorized
-    \newcommand*{\@guit@color@imp}[2][cmyk]{%
-      \xdefinecolor{coloredelGuIT}{#1}{#2}}
-    \newcommand*{\x@guit@color@imp}[2][\@empty]{%
-      \ifx\@empty#1%
-        \colorlet{coloredelGuIT}{#2}%
-      \else
-        \colorlet{coloredelGuIT}[#1]{#2}%
-      \fi}
+\newcommand*{\@guit@color@imp}[2][cmyk]{%
+  \definecolor{coloredelGuIT}{#1}{#2}}
+\newcommand*{\x@guit@color@imp}[2][\@empty]{%
+  \edef\@tempa{#1}%
+  \ifx\@empty\@tempa
+    \colorlet{coloredelGuIT}{#2}%
   \else
-    \newcommand*{\@guit@color@imp}[2][cmyk]{%
-      \definecolor{coloredelGuIT}{#1}{#2}}
-    \newcommand*{\x@guit@color@imp}[2][]{\relax}
-  \fi
-  \GuITcolor{1, 0, 1, 0.6}
-\else
-  \newcommand*{\@guit@color@imp}[2][]{\relax}
-  \newcommand*{\x@guit@color@imp}[2][]{\relax}
-\fi
+    \colorlet{coloredelGuIT}[#1]{#2}%
+  \fi}
+\GuITcolor{1, 0, 1, 0.6}
 \let\guitcolor\GuITcolor
-\def\@guit@url{http://www.guit.sssup.it}
-\if@guit@link
-  \RequirePackage{hyperref}
-  \def\@guitimp#1{%
-    \begingroup
+\define@cmdkey{guit}[@guit@]{url}{\relax}
+\def\@guitimp#1{%
+  \begingroup
+    \setkeys*{guit}{#1}%
+    \if@guit@colorized
+      \def\@colorize@guit{\color{coloredelGuIT}}%
+      \def\@decolorize@guit{\normalcolor}%
+    \else
+      \def\@colorize@guit{}%
+      \def\@decolorize@guit{}%
+    \fi
+    \edef\@tempa{\@guit@family}%
+    \ifx\@empty\@tempa
+      \let\@guit@family\f@family
+    \fi
+    \edef\@tempa{\@guit@series}%
+    \ifx\@empty\@tempa
+      \let\@guit@series\f@series
+    \fi
+    \if@guit@link
       \Hy@colorlinksfalse
       \def\@pdfborder{0 0 0}%
-      \href{\@guit@url}{\@@guitimp{#1}}%
-    \endgroup}
-\else
-  \def\@guitimp#1{\@@guitimp{#1}}
-\fi
+      \href{\@guit@url}{\@@guitimp{\@guit@family\@guit@series}}%
+    \else
+      \@@guitimp{\@guit@family\@guit@series}%
+    \fi
+  \endgroup}
 \DeclareRobustCommand*{\DeclareGuITLogoCommand}{%
   \@gen@guit@fntcmd}
 \@onlypreamble\DeclareGuITLogoCommand
-\def\@gen@guit@fntcmd#1#2#3#4#5{%
-  \@namedef{@guit#1}{%
-    \fontfamily{#1}\mdseries\scshape
-    \@colorize@guit g\kern #2\lower #3\hbox{u}%
-    \@decolorize@guit\kern #4 I\@colorize@guit\kern #5 t}}
-\def\@guitcmr{%
-  \fontencoding{OT1}\fontfamily{cmr}\mdseries\scshape
+\def\@gen@guit@fntcmd#1{%
+  \@ifnextchar[%
+    {\@gen@guit@fntcmd@imp#1}%
+    {\@gen@guit@fntcmd@imp#1[m]}}
+\def\@gen@guit@fntcmd@imp#1[#2]#3#4#5#6{%
+  \define@key{guit}{#1}[#1]{\def\@guit@family{#1}}%
+  \define@key{guit}{#1/#2}[#1/#2]{%
+    \def\@guit@family{#1}%
+    \def\@guit@series{#2}}%
+  \@namedef{@guit#1#2}{%
+    \fontfamily{#1}\fontseries{#2}\scshape
+    \@colorize@guit g\kern #3\lower #4\hbox{u}%
+    \@decolorize@guit\kern #5 I\@colorize@guit\kern #6 t}}
+\DeclareRobustCommand*{\AliasGuITLogoCommand}[4]{%
+  \define@key{guit}{#1/#2}[#1/#2]{%
+    \def\@guit@family{#3}%
+    \def\@guit@series{#4}}%
+  \expandafter\let\csname @guit#1#2\expandafter\endcsname\csname @guit#3#4\endcsname}
+\@onlypreamble\AliasGuITLogoCommand
+\def\@guitcmrm{%
+  \fontencoding{OT1}\fontfamily{cmr}\fontseries{m}\scshape
   \@colorize@guit g\kern -0.26em\lower 0.714ex\hbox{u}%
   \@decolorize@guit\kern -0.125em I\@colorize@guit\kern -0.125em t}
+\define@key{guit}{cmr}[cmr]{\def\@guit@family{cmr}}
+\define@key{guit}{cmr/m}[cmr/m]{%
+  \def\@guit@family{cmr}%
+  \def\@guit@series{m}}
 \@gen@guit@fntcmd{ptm}{-0.27em}{0.5475ex}{-0.125em}{-0.125em}
+\@gen@guit@fntcmd{ptm}[bx]{-0.345em}{0.68ex}{-0.125em}{-0.125em}
 \@gen@guit@fntcmd{ppl}{-0.276em}{0.717ex}{-0.125em}{-0.125em}
+\@gen@guit@fntcmd{ppl}[bx]{-0.33em}{0.689ex}{-0.125em}{-0.125em}
 \@gen@guit@fntcmd{pnc}{-0.322em}{0.678ex}{-0.125em}{-0.125em}
+\@gen@guit@fntcmd{pnc}[bx]{-0.36em}{0.656ex}{-0.125em}{-0.125em}
 \@gen@guit@fntcmd{put}{-0.285em}{0.61ex}{-0.125em}{-0.125em}
+\AliasGuITLogoCommand{put}{bx}{put}{m}
 \@gen@guit@fntcmd{bch}{-0.28em}{0.58ex}{-0.125em}{-0.125em}
+\@gen@guit@fntcmd{bch}[bx]{-0.31em}{0.56ex}{-0.125em}{-0.125em}
 \@gen@guit@fntcmd{pbk}{-0.3em}{0.59ex}{-0.125em}{-0.125em}
+\@gen@guit@fntcmd{pbk}[bx]{-0.34em}{0.52ex}{-0.125em}{-0.125em}
 \def\@@guitimp#1{%
-  \begingroup
-    \@ifundefined{@guit#1}{\@guitcmr}{\@nameuse{@guit#1}}%
-  \endgroup}
-\if@guit@colorized
-  \newcommand*{\@guit@color@on}[1][\f@family]{%
-    \def\@colorize@guit{\color{coloredelGuIT}}%
-    \def\@decolorize@guit{\normalcolor}%
-    \@guitimp{#1}\ignorespaces}
-\else
-  \newcommand*{\@guit@color@on}[1][\f@family]{%
-    \def\@colorize@guit{\normalcolor}%
-    \def\@decolorize@guit{\normalcolor}%
-    \@guitimp{#1}\ignorespaces}
-\fi
-\if@guit@always@colorized
-  \let\@guit@color@off\@guit@color@on
-\else
-  \newcommand*{\@guit@color@off}[1][\f@family]{%
-    \def\@colorize@guit{\normalcolor}%
-    \def\@decolorize@guit{\normalcolor}%
-    \@guitimp{#1}\ignorespaces}
-\fi
+  \@ifundefined{@guit#1}{\@guitcmrm}{\@nameuse{@guit#1}}}
+\newcommand*{\@guit@color@on}[1][]{%
+  \@guitimp{color, #1}\ignorespaces}
+\newcommand*{\@guit@color@off}[1][]{%
+  \@guitimp{#1}\ignorespaces}
 \DeclareRobustCommand*{\GuIT}{%
   \@ifstar\@guit@color@on\@guit@color@off}
 \let\guit\GuIT
-\if@guit@colorized
-  \DeclareRobustCommand*{\swapGuITcommands}{%
-    \begingroup
-      \let\reserved@a\@guit@color@on
-      \global\let\@guit@color@on\@guit@color@off
-      \global\let\@guit@color@off\reserved@a
-    \endgroup
-    \PackageWarning{guit}{Swapping \string\GuIT* and \string\GuIT}}
-\else
-  \let\swapGuITcommands\relax
-\fi
-\if@guit@link
-  \DeclareRobustCommand*{\GuITtext}{%
-    \href{\@guit@url}{Gruppo Utilizzatori Italiani di \TeX}}
-\else
-  \DeclareRobustCommand*{\GuITtext}{%
-    Gruppo Utilizzatori Italiani di \TeX}
-\fi
+\DeclareRobustCommand*{\GuITtext}[1][]{%
+  \begingroup
+    \setkeys*{guit}{#1}%
+    \if@guit@link
+      \href{\@guit@url}{Gruppo Utilizzatori Italiani di \TeX}%
+    \else
+      Gruppo Utilizzatori Italiani di \TeX
+    \fi
+  \endgroup
+  \ignorespaces}
 \let\guittext\GuITtext
-\DeclareRobustCommand*{\GuITurl}{%
-  \expandafter\url\expandafter{\@guit@url}}
+\DeclareRobustCommand*{\GuITtextEn}[1][]{%
+  \begingroup
+    \setkeys*{guit}{#1}%
+    \if@guit@link
+      \href{\@guit@url}{Italian \TeX\ User Group}%
+    \else
+      Italian \TeX\ User Group%
+    \fi
+  \endgroup
+  \ignorespaces}
+\let\guittexten\GuITtextEn
+\DeclareRobustCommand*{\GuITurl}[1][]{%
+  \begingroup
+    \setkeys*{guit}{#1}%
+    \if@guit@link
+      \let\@guit@url@imp\url
+    \else
+      \let\@guit@url@imp\@guit@url@nolink
+    \fi
+    \edef\@tempa{\@guit@url}%
+    \ifx\@empty\@tempa
+      \relax
+    \else
+      \edef\@tempa{\@guit@document}%
+      \ifx\@empty\@tempa
+        \expandafter\@guit@url@imp\expandafter{\@guit@url}%
+      \else
+        \expandafter\expandafter\expandafter\@guit@url@imp%
+          \expandafter\expandafter\expandafter{%
+          \expandafter\@guit@url\expandafter/\@guit@document}%
+      \fi
+    \fi
+  \endgroup
+  \ignorespaces}
+\DeclareUrlCommand\@guit@url@nolink{}
+\define@cmdkey{guit}[@guit@]{document}{\relax}
 \let\guiturl\GuITurl
-\DeclareRobustCommand*{\GuITforum}{%
-  \expandafter\url\expandafter{\@guit@url /phpbb}}
+\DeclareRobustCommand*{\GuITforum}[1][]{%
+  \guiturl[#1, document=forum]}
 \let\guitforum\GuITforum
 \DeclareRobustCommand*{\GuITmeeting}{%
   \@ifstar\@guit@meeting@color@on\@guit@meeting@color@off}
-\def\@guit@meeting@color@on{%
+\newcommand*{\@guit@meeting@color@on}[1][]{%
+  \@guit@meeting@imp{*}{#1}}
+\newcommand*{\@guit@meeting@color@off}[1][]{%
+  \@guit@meeting@imp{}{#1}}
+\define@cmdkey{guit}[@guit@]{year}{\relax}
+\newif\if@guit@inline
+\define@choicekey*{guit}{style}[\val\nr]{inline,display}{%
+  \ifcase\nr\relax
+    \@guit@inlinetrue
+  \or
+    \@guit@inlinefalse
+  \fi}
+\def\@guit@meeting@imp#1#2{%
   \begingroup
+    \setkeys*{guit}{#2}%
     \fontencoding{OT1}\fontfamily{cmr}\fontseries{m}\selectfont
-    \guit*\@guit@meeting@part
-  \endgroup
-  \ignorespaces}
-\def\@guit@meeting@color@off{%
-  \begingroup
-    \fontencoding{OT1}\fontfamily{cmr}\fontseries{m}\selectfont
-    \guit\@guit@meeting@part
+    \guit#1
+    \if@guit@inline
+      \@guit@meeting@part\@guit@meeting@year
+    \else
+      \@guit@meeting@year\@guit@meeting@part
+    \fi
   \endgroup
   \ignorespaces}
 \def\@guit@meeting@part{%
-  \kern -2.02ex\lower 1.25ex\hbox{\textit{meeting}}}
+  \if@guit@inline
+    \textit{meeting}%
+  \else
+    \kern -2.02ex\lower 1.25ex\hbox{\textit{meeting}}%
+  \fi}
+\def\@guit@meeting@year{%
+  \edef\@tempa{\@guit@year}%
+  \ifx\@empty\@tempa
+    \relax
+  \else
+    \@guit@meeting@year@imp{\@guit@year}%
+  \fi}
+\def\@guit@meeting@year@imp#1{%
+  \if@guit@inline
+    \fontfamily{pzc}\selectfont #1
+  \else
+    \rlap{%
+      \hskip0.7em\fontfamily{pzc}\selectfont
+      \raise 0.5ex\hbox{\scalebox{0.85}{#1}}}%
+  \fi}
 \let\guitmeeting\GuITmeeting
+\setupGuIT
+\DeclareRobustCommand*{\Ars}{%
+  \textsf{\lower -.48ex\hbox{\rotatebox{-20}{A}}\kern -.3em{rs}}%
+  \kern -.05em\TeX\kern -.17em\lower -.357ex\hbox{nica}}
+\DeclareRobustCommand*{\Arsob}{\rotatebox{20}{\Ars}}
+\DeclareRobustCommand*{\ars}{%
+  \textsf{\lower -.48ex\hbox{\rotatebox{-20}{A}}\kern -.3em{rs}}}
+\DeclareRobustCommand*{\tecnica}{%
+  \TeX\kern -.17em\lower -.357ex\hbox{nica}}
+\DeclareRobustCommand*{\arsta}{%
+  \ars \kern -0.65em\lower -1.3ex\hbox{\scalebox{0.18}{\hbox{%
+    \TeX\kern -.17em\lower -.357ex\hbox{nica}}}}}
+\DeclareRobustCommand*{\arstb}{%
+  \ars \kern -0.65em\lower -1.25ex\hbox{\scalebox{0.34}{\hbox{%
+    \TeX\kern -.17em\lower -.357ex\hbox{nica}}}}}
+\DeclareRobustCommand*{\arstv}{%
+  \ars \kern -0.05em\lower -1.818ex\hbox{\rotatebox{-90}{\hbox{%
+    \scalebox{0.225}{\hbox{%
+      \TeX\kern -.17em\lower -.357ex\hbox{nica}}}}}}}
+\DeclareRobustCommand*{\arsto}{%
+  \rotatebox{49}{\lower -.84ex\hbox{\scalebox{0.214}{\hbox{%
+    \TeX\kern -.17em\lower -.357ex\hbox{nica}}}}}%
+  \kern -.74em\hbox{\ars}}
+\DeclareRobustCommand*{\Arsto}{%
+  \rotatebox{49}{\lower -.84ex\hbox{\scalebox{0.214}{\hbox{%
+    \TeX\kern -.17em\lower -.357ex\hbox{nica}}}}}%
+  \kern -.74em\hbox{\Ars}}
 \InputIfFileExists{guit.cfg}%
   {\relax}%
   {\PackageWarning{guit}{Configuration file not found}}