pst-uml update

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

3 files changed, 40 insertions, 188 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-uml/Changes b/Master/texmf-dist/doc/generic/pst-uml/Changes
new file mode 100644
index 00000000000..6a3a98530ff
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-uml/Changes
@@ -0,0 +1,11 @@
+----- pst-uml.tex
+0.82  2006-12-19  adapted for use with array package (JHf)
+		  fix bug with keyset for debug (hv)
+0.81  2005-05-10  using pst-xkey and pstricks (hv)
+...
+0.10  1998-03-01  utilsation des cl\'e pour les option de \umlClass
+0.01  1998-02-22  creation
+
+
+hv	Herbert Voss
+JHf	Jobst Hoffmann
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/generic/pst-uml/pst-uml-doc.pdf b/Master/texmf-dist/doc/generic/pst-uml/pst-uml-doc.pdf
index f01876605c0..88f12edba5e 100644
--- a/Master/texmf-dist/doc/generic/pst-uml/pst-uml-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-uml/pst-uml-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-uml/pst-uml-doc.tex b/Master/texmf-dist/doc/generic/pst-uml/pst-uml-doc.tex
index 801b9e422d5..5403df5d058 100644
--- a/Master/texmf-dist/doc/generic/pst-uml/pst-uml-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-uml/pst-uml-doc.tex
@@ -1,109 +1,43 @@
 \documentclass[11pt,a4paper,twoside]{article}
 \usepackage[T1]{fontenc}
   % \usepackage[applemac]{inputenc}
-\usepackage[latin1]{inputenc}
-
-  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  % Format de la  mise en page
-  \setlength{\hoffset}{-1in}
-  \setlength{\voffset}{-1in}
-  \setlength{\oddsidemargin}{2cm}
-  \setlength{\evensidemargin}{2cm}
-  \setlength{\topmargin}{1.8cm}
-  % \setlength{\headheight}{0cm}
-  % \setlength{\headsep}{0cm}
-  \setlength{\textwidth}{16.5cm}
-  \setlength{\textheight}{24.0cm}
-
-  % Pour que LaTeX n'essaie pas de justifier les pages verticalement
-  \raggedbottom
-  \usepackage{pst-uml}
-  
+\usepackage[latin9]{inputenc}
+\usepackage[dvips,lmargin=2cm,rmargin=2cm,bmargin=2cm,tmargin=2.5cm]{geometry}
+\raggedbottom
+\usepackage{pst-uml}
 
 % LA SUITE NE MARCHE PAS CAR "fvrb-ex" cherche "fancyvrb", meme
 % si celui-ci est deja chargé !
 % 
-%   % on utilise le nouveau package "fancyvrb.sty" de TVZ et son extension
-%   % fvrb-ex.sty de Denis GIROU pour les exemples LATEX :
-%   
-%   \IfFileExists{fvrb-ex.sty}{%
-%        \RequirePackage{fvrb-ex}% 
-%   }{%
-%        \PackageWarning{doc_pst-uml}{%
-%           *** You should install packages "fancyvrb" and "fvrb-ex" ***}%
-%        \RequirePackage{needed/fancyvrb}%
-%        \RequirePackage{needed/fvrb-ex}%
-%   }
-  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  
-  % Utilisation de "fancyvrb.sty" :
-  % 
-  % fournit l'environnement "Verbatim" (idem envir verbatim avec 
-  % nombreuses options et la commande "\VerbatimInput"
-  % 
-  % Exemple :
-  %
-  %   \VerbatimInput{../SOURCES/iloveleda.cc}
-  % 
-  % On peut aussi passer des options à la pstricks (au hasard :-)
-  % ou par la commande "\fvset{key1,value1,key2,value2,...}"
-  % 
-  %   \VerbatimInput[%
-  %      baselinestretch=0.9,% pour tasser les lignes (si long listing)
-  %      fontsize=\small,%     pour un fonte plus petite
-  %      numbers=left,%        pour numeroter les lignes a gauche
-  %      frame=single,%        pour encadrer
-  %      gobble=0%             nbr de caratere de debut a ignorer
-  %   ]{../SOURCES/iloveleda.cc}
-  % 
-  \usepackage{fancyvrb}
-  
-  % pour les environnement CenterExample...
-  \usepackage[pstricks]{fvrb-ex}
-  \fvset{frame=single,numbers=left}
+\usepackage{fancyvrb}
+% pour les environnement CenterExample...
+\usepackage[pstricks]{fvrb-ex}
+\fvset{frame=single,numbers=left,fontsize=\footnotesize}
   % 
-  \providecommand{\showgrid}{\psgrid[subgriddiv=0, griddots=10]}
-  \psset{subgriddiv=0, griddots=10}
+\providecommand{\showgrid}{\psgrid[subgriddiv=0, griddots=10]}
+\psset{subgriddiv=0, griddots=10}
   
-  \DefineShortVerb{\|}
-  % \UndefineShortVerb{\|}  % pour annuler 
+\DefineShortVerb{\|}
+% \UndefineShortVerb{\|}  % pour annuler 
 
-  \pagestyle{headings}
+\pagestyle{headings}
   
-  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-  % Quelques commandes locales
-  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-  % \printtime
-  % 
-  % commande d'impression de l'heure courante
-  % 
-  % Exemple : "Fichier compil\'{e} le \today{} \`{a} \printtime."
-  \usepackage{calc}
-  \usepackage{ifthen}
-  \newcounter{hours}\newcounter{minutes}
-  \newcommand{\printtime}{%
-    \setcounter{hours}{\time/60}%
-    \setcounter{minutes}{\time-\value{hours}*60}%
-    \thehours h%
-    % on veut obtenir 15h03mn et non 15h3mn...
-    \ifthenelse{\theminutes<10}{0}{}\theminutes mn%
-  }
+\usepackage{calc}
+\usepackage{ifthen}
+\newcounter{hours}\newcounter{minutes}
+\newcommand{\printtime}{%
+  \setcounter{hours}{\time/60}%
+  \setcounter{minutes}{\time-\value{hours}*60}%
+  \thehours h%
+ % on veut obtenir 15h03mn et non 15h3mn...
+  \ifthenelse{\theminutes<10}{0}{}\theminutes mn}
  
-% \Stabilo
-% 
-% Permet de surligner en jaune (gris clair en NB) le parametre
-% La version \fStabilo rajoute une frame rouge autour.
-% 
-% Syntaxe : \Stabilo{textInportant}
-
 \newcommand{\Stabilo}[1]{\colorbox[rgb]{1,1,0.2}{#1}}
 \newcommand{\fStabilo}[1]{\fcolorbox[rgb]{1,0,0}{1,1,0.2}{#1}}
   
-  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-  % Quelques abbreviations
-  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+% Quelques abbreviations
   
-  % Conventions g\'{e}n\'{e}rales pour les formats de pr\'{e}sentation
+% Conventions g\'{e}n\'{e}rales pour les formats de pr\'{e}sentation
   \newcommand{\strong}[1]{\textbf{\emph{#1}}} % plus fort que \emph
   \newcommand{\tech}[1]{\textsf{#1}}          % terme technique
   \newcommand{\file}[1]{\texttt{#1}} % noms de fichiers et de r\'{e}pertoires
@@ -128,13 +62,8 @@
 % pas disponible sur les vielles versions de Babel (comme à l'ENSTA).
 \NoAutoSpaceBeforeFDP
       
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \title{Interface utilisateur du package \pstuml}
 \author{%
    Maurice \textsc{Diamantini}%
@@ -148,16 +77,9 @@
 }
 
 \maketitle
-
 \tableofcontents
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Introduction}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Présentation}
 
 Ce document présente l'utilisation d'un certain nombre de macro 
@@ -1439,121 +1361,40 @@ total de segments présents dans le dernier connecteur utilisé ??).
 % 
 % 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Principales commandes \pstricks{} utilisées (A FAIRE)}
 
-\cleardoublepage
-
 \appendix
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Exemple de diagramme de classe}
 
 \input{diagClass.tex}
 \VerbatimInput[gobble=0]{diagClass.tex}
 
 % % % % % % % % % \end{document}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\clearpage
 \section{Exemple de diagramme des cas d'utilisation}
 
 
 \input{diagCase.tex}
 \VerbatimInput[gobble=0]{diagCase.tex}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\clearpage
 \section{Exemple de diagramme de séquences}
 
 
 \input{diagSeq.tex}
 \VerbatimInput[gobble=0]{diagSeq.tex}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\clearpage
 \section{Exemple de diagramme d'états}
 
 
 \input{diagState.tex}
 \VerbatimInput[gobble=0]{diagState.tex}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\clearpage
 \section{Listing du package \texttt{pst-uml.sty}}
 
-\VerbatimInput[%
-   baselinestretch=0.9,%
-   fontsize=\small,%
-   gobble=0% nbr de caratere de debut a ignorer
-]{pst-uml.sty}
-pour connaitre le numero de la derniere page
-\label{verylast}\mbox{}
+\VerbatimInput[baselinestretch=0.9,fontsize=\small,
+    gobble=0]{pst-uml.sty}\label{verylast}
+%\small
+%\VerbatimInput{test.sty}\label{verylast}
+\mbox{}
 
 \end{document}
 
-% PRESSE-PAPIER :
-% 
-% \begin{SideBySideExample}[xrightmargin=6cm]
-%   \begin{pspicture}(0,0)(5,5)\psgrid
-% 
-%   \end{pspicture}
-% \end{SideBySideExample}
-% \begin{CenterExample}
-%   \begin{pspicture}(0,0)(5,5)\psgrid
-% 
-%   \end{pspicture}
-% \end{CenterExample}
-
-%%%% EXEMPLE DE DESCRIPTION DE COMMANDE :
-% 
-% \begin{description}
-%   \item[Syntaxe]  \mbox{}
-% 
-%     \begin{verbatim}
-%         \umlClass[keyOptions]{title}{body}
-%     \end{verbatim}
-%     
-%     Permet de dessiner une classe. 
-% 
-%   \item[Paramètres (un seul)]  \mbox{}
-% 
-%     \begin{description}
-%         
-%         \item[\texttt{title} :] nom de la classe, celui-ci sera centré 
-%         et écrit en gras.  Il peut tenir sur plusieurs lignes.
-%     
-%         \item[\texttt{body} :]  corps de la classe propremment dit. En 
-%         particulier contient les attributs et méthodes justifiées à gauche.
-%         Les différentes lignes sont séparées par |\\| et éventuellement 
-%         des |\hline|.     
-%     \end{description}
-% 
-%   \item[Options]  \mbox{}
-% 
-%     \begin{description}
-%                     
-%         \item[\texttt{umlShadow} (boolean : true)] :  
-%         si vrai, un cadre ombré de fond gris entoure la classe \\
-%         sinon, un cadre simple sur fond blanc est utilisé.
-%                         
-%     \end{description}
-% 
-%   \item[Bug]  \mbox{}
-% 
-%   \item[\`A faire]  \mbox{}
-%   
-%   \item[Exemples 1]  \mbox{}
-%       
-% \end{description}
-