summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/uml/Changes3
-rw-r--r--Master/texmf-dist/doc/latex/uml/example.tex6
-rw-r--r--Master/texmf-dist/doc/latex/uml/uml.pdfbin612123 -> 507386 bytes
-rw-r--r--Master/texmf-dist/source/latex/uml/uml.dtx28
-rw-r--r--Master/texmf-dist/source/latex/uml/uml.ins2
-rw-r--r--Master/texmf-dist/tex/latex/uml/uml.sty14
6 files changed, 28 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/uml/Changes b/Master/texmf-dist/doc/latex/uml/Changes
index ea4b8f5e906..8ce7e502701 100644
--- a/Master/texmf-dist/doc/latex/uml/Changes
+++ b/Master/texmf-dist/doc/latex/uml/Changes
@@ -1,2 +1,5 @@
uml.dtx --------
+0.11 2010-01-17 - make it compatible with the latest
+ pstricks.tex version (hv)
+ - use umllinestyle instead of linestyle
0.10 2006-11-23 first CTAN version (hv)
diff --git a/Master/texmf-dist/doc/latex/uml/example.tex b/Master/texmf-dist/doc/latex/uml/example.tex
index daa07da3ba8..d8c1c3fa7ec 100644
--- a/Master/texmf-dist/doc/latex/uml/example.tex
+++ b/Master/texmf-dist/doc/latex/uml/example.tex
@@ -20,9 +20,9 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-\def\filedate{2006/11/28}
-\def\docdate{2006/11/28}
-\def\fileversion{0.10}
+\def\filedate{2010/03/17}
+\def\docdate{2010/03/17}
+\def\fileversion{0.11}
\def\basename{uml}
%% Package 'uml' to use with LaTeX2e and PSTricks
%% Copyright 2006 by Ellef Fange Gjelstad.
diff --git a/Master/texmf-dist/doc/latex/uml/uml.pdf b/Master/texmf-dist/doc/latex/uml/uml.pdf
index 4b5ad0e7107..6c6091f1b66 100644
--- a/Master/texmf-dist/doc/latex/uml/uml.pdf
+++ b/Master/texmf-dist/doc/latex/uml/uml.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/uml/uml.dtx b/Master/texmf-dist/source/latex/uml/uml.dtx
index 06f0ee909ba..6c5a442c52a 100644
--- a/Master/texmf-dist/source/latex/uml/uml.dtx
+++ b/Master/texmf-dist/source/latex/uml/uml.dtx
@@ -1,6 +1,6 @@
-\def\filedate{2006/11/28}
-\def\docdate{2006/11/28}
-\def\fileversion{0.10}
+\def\filedate{2010/03/17}
+\def\docdate{2010/03/17}
+\def\fileversion{0.11}
\def\basename{uml}
%
% \iffalse meta-comment
@@ -592,7 +592,7 @@
% \umlAttribute[type=length]{relationArmA}
% \umlAttribute[type=angle]{relationAngleA}
% \umlAttribute[type=angle]{relationArmAngleA}
-% \umlAttribute[default=solid]{linestyle}
+% \umlAttribute[default=solid]{umllinestyle}
% \umlAttribute[type=color]{relationcolor}
% \umlAttribute[type=color]{/linecolor}
% \umlAttribute[type=length]{nodesep}
@@ -1687,7 +1687,7 @@
% named option:
%
% \begin{description}
-% \item["linestyle"] A\DescribeMacro{linestyle-} linestyle to draw the
+% \item["umllinestyle"] A\DescribeMacro{umllinestyle-} umllinestyle to draw the
% connector. Default is "solid".
% \item["linecolor"] The color of the line.\DescribeMacro{linecolor-}
% \end{description}
@@ -2958,7 +2958,7 @@
\RequirePackage{pst-node}
% \end{macrocode}
-% \noindent\packageName{xkeyval} [xKeyval] is the package which handles
+% \noindent\packageName{pst-xkey} [xKeyval] is the package which handles
% \index{keyval}\index{xkeyval} Keys can be set as usual for PStricks related
% package with "\psset[uml]{...}", where the family name "uml" is optional.
% named options (like \verb+[name=Name, reference=Ref]+).
@@ -4233,10 +4233,10 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{linestyle-}
+% \begin{macro}{umllinestyle-}
% Legal values are "none", "solid", "hashed" and "dotted".
% \begin{macrocode}
-\define@key[psset]{uml}{linestyle}{\def\umlLinestyle{#1}}
+\define@key[psset]{uml}{umllinestyle}{\def\umlLinestyle{#1}}
% \end{macrocode}
% \end{macro}
%
@@ -4533,11 +4533,11 @@
\psline(-\umlSymbolWidthDefault, -\umlSymbolHeightDefault)%
(0,0)%
(\umlSymbolWidthDefault, -\umlSymbolHeightDefault)}%
- \umlRelation[kind={Instance-of}, linestyle=dashed, #1]{#2}{#3}{%
+ \umlRelation[kind={Instance-of}, umllinestyle=dashed, #1]{#2}{#3}{%
\umlSymbol[fraction=B]{\umlReference}{\umlEndSymbol}}
}
% \end{macrocode}
-% \index{linestyle-!dashed in Instance}
+% \index{umllinestyle-!dashed in Instance}
% \end{macro}
%
% \subsection{Aggregation}\label{sec:aggregation}\label{sec:impAggregation}
@@ -4653,12 +4653,12 @@
%
% \begin{macro}{\umlAssociationClass}
% Relation from a relation to a schema symbol.
-%\index{linestyle!dashed in AssociationClass}
+%\index{umllinestyle!dashed in AssociationClass}
% \index{posMeetLine!AssociationClass}
% \begin{macrocode}
\newcommand\umlAssociationSchema[3][]{%
\umlToRelation[kind=AssociationSchema,
- posMeetLine=.5, linestyle=dashed,#1]{#2}{#3}%
+ posMeetLine=.5, umllinestyle=dashed,#1]{#2}{#3}%
}
\newcommand\umlAssociationClass[3][]{%
\umlAssociationSchema[kind=AssociationClass,#1]{#2}{#3}}
@@ -4670,12 +4670,12 @@
%
% \begin{macro}{\umlArgumentRelation}
% Relation from an application to an argument.
-%\index{linestyle!dottedin ArgumentRelation}
+%\index{umllinestyle!dottedin ArgumentRelation}
% \index{posMeetLine!ArgumentRelation}
% \begin{macrocode}
\newcommand\umlArgumentRelation[3][]{%
\umlToRelation[kind=ArgumentRelation,
- posMeetLine=.2,linestyle=dotted,#1]{#2}{#3}%
+ posMeetLine=.2,umllinestyle=dotted,#1]{#2}{#3}%
}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/uml/uml.ins b/Master/texmf-dist/source/latex/uml/uml.ins
index b79d1759153..e54e19fc354 100644
--- a/Master/texmf-dist/source/latex/uml/uml.ins
+++ b/Master/texmf-dist/source/latex/uml/uml.ins
@@ -1,4 +1,4 @@
-\def\filedate{2006/11/26}
+\def\filedate{2010/03/17}
\def\batchfile{uml.ins}
\input docstrip.tex
\generateFile{uml.sty}{t}{\from{uml.dtx}{package}}
diff --git a/Master/texmf-dist/tex/latex/uml/uml.sty b/Master/texmf-dist/tex/latex/uml/uml.sty
index 58a18f1ab7c..61a4dcee186 100644
--- a/Master/texmf-dist/tex/latex/uml/uml.sty
+++ b/Master/texmf-dist/tex/latex/uml/uml.sty
@@ -20,9 +20,9 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-\def\filedate{2006/11/28}
-\def\docdate{2006/11/28}
-\def\fileversion{0.10}
+\def\filedate{2010/03/17}
+\def\docdate{2010/03/17}
+\def\fileversion{0.11}
\def\basename{uml}
%% Package 'uml' to use with LaTeX2e and PSTricks
%% Copyright 2006 by Ellef Fange Gjelstad.
@@ -518,7 +518,7 @@
\newcommand\umlRelationNullVisual{%
\def\umlLinestyle{solid}%
}
-\define@key[psset]{uml}{linestyle}{\def\umlLinestyle{#1}}
+\define@key[psset]{uml}{umllinestyle}{\def\umlLinestyle{#1}}
\define@key[psset]{uml}{relationColor}[black]{\pst@getcolor{#1}\pslinecolor}
\define@key[psset]{uml}{linecolor}{\pst@getcolor{#1}\pslinecolor}
\newcommand\umlRelationNull{%
@@ -623,7 +623,7 @@
\psline(-\umlSymbolWidthDefault, -\umlSymbolHeightDefault)%
(0,0)%
(\umlSymbolWidthDefault, -\umlSymbolHeightDefault)}%
- \umlRelation[kind={Instance-of}, linestyle=dashed, #1]{#2}{#3}{%
+ \umlRelation[kind={Instance-of}, umllinestyle=dashed, #1]{#2}{#3}{%
\umlSymbol[fraction=B]{\umlReference}{\umlEndSymbol}}
}
\newcommand\umlAggregation[3][]{%
@@ -683,13 +683,13 @@
}
\newcommand\umlAssociationSchema[3][]{%
\umlToRelation[kind=AssociationSchema,
- posMeetLine=.5, linestyle=dashed,#1]{#2}{#3}%
+ posMeetLine=.5, umllinestyle=dashed,#1]{#2}{#3}%
}
\newcommand\umlAssociationClass[3][]{%
\umlAssociationSchema[kind=AssociationClass,#1]{#2}{#3}}
\newcommand\umlArgumentRelation[3][]{%
\umlToRelation[kind=ArgumentRelation,
- posMeetLine=.2,linestyle=dotted,#1]{#2}{#3}%
+ posMeetLine=.2,umllinestyle=dotted,#1]{#2}{#3}%
}
\newcommand\umlAssociationEndNull{%
\def\umlAEOffset{\umlAEOffsetDefault}%
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 00:33:22 +0000