From b47f5f2d46724e285083ea548036a718d8c849af Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Mar 2010 22:26:27 +0000 Subject: pst-dbicons update (25mar10) git-svn-id: svn://tug.org/texlive/trunk@17556 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-dbicons/Changes | 2 - Master/texmf-dist/doc/generic/pst-dbicons/README | 5 +- .../doc/generic/pst-dbicons/mondial-ER.tex | 196 +++++++++++++++++++ .../texmf-dist/source/generic/pst-dbicons/Makefile | 48 ----- .../source/generic/pst-dbicons/pst-dbicons.drv | 14 +- .../source/generic/pst-dbicons/pst-dbicons.dtx | 213 +++++---------------- .../source/generic/pst-dbicons/pst-dbicons.ins | 2 +- .../tex/latex/pst-dbicons/pst-dbicons.sty | 10 +- 8 files changed, 260 insertions(+), 230 deletions(-) delete mode 100644 Master/texmf-dist/doc/generic/pst-dbicons/Changes create mode 100644 Master/texmf-dist/doc/generic/pst-dbicons/mondial-ER.tex delete mode 100644 Master/texmf-dist/source/generic/pst-dbicons/Makefile diff --git a/Master/texmf-dist/doc/generic/pst-dbicons/Changes b/Master/texmf-dist/doc/generic/pst-dbicons/Changes deleted file mode 100644 index 31b371c36e6..00000000000 --- a/Master/texmf-dist/doc/generic/pst-dbicons/Changes +++ /dev/null @@ -1,2 +0,0 @@ -pst-dbicons.sty -------- -v 0.20 2006-11-26 first CTAN Version (hv) diff --git a/Master/texmf-dist/doc/generic/pst-dbicons/README b/Master/texmf-dist/doc/generic/pst-dbicons/README index 044a5954a3b..10efa3119af 100644 --- a/Master/texmf-dist/doc/generic/pst-dbicons/README +++ b/Master/texmf-dist/doc/generic/pst-dbicons/README @@ -1,5 +1,6 @@ The pst-dbicons package is based on PSTricks and is intended to be -used by programmers to create a ER model. +used by to typeset Entity Relationship Models (ER-Models) for +designing database applications. This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html @@ -21,4 +22,4 @@ ps2pdf pst-dbicons.ps ------------------------------ -Herbert Voss 2006-11-26 \ No newline at end of file +Wolfgang May 2010-03-25 diff --git a/Master/texmf-dist/doc/generic/pst-dbicons/mondial-ER.tex b/Master/texmf-dist/doc/generic/pst-dbicons/mondial-ER.tex new file mode 100644 index 00000000000..8f3d99a71f1 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-dbicons/mondial-ER.tex @@ -0,0 +1,196 @@ +\ifx\TeXMaster\undefined +% +\documentclass{article} +\usepackage{pstricks,pst-node,pst-coil,color,pst-dbicons} +\addtolength{\topmargin}{-2.5cm} +\special{landscape} +\textheight17cm +\textwidth28cm +\evensidemargin-1.2cm +\oddsidemargin-1.2cm + +\newcommand{\Mondial}{\textsc{Mondial}} + +\begin{document} + +\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newif\ifblackwhite +%\blackwhitefalse +\blackwhitetrue +\ifblackwhite + \newgray{verylightgray}{0.95} + \seticonparams{entity}{shadow=true,fillcolor=lightgray,fillstyle=solid} + \seticonparams{attribute}{fillcolor=lightgray,fillstyle=solid} + \seticonparams{relationship}{shadow=true,fillcolor=lightgray,fillstyle=solid} +\else + \newrgbcolor{lightblue}{0.68 0.85 0.95} + \newrgbcolor{verylightblue}{0.34 0.42 0.5} + \newrgbcolor{lightgreen}{0.00 0.98 0.60} + \newrgbcolor{verylightgreen}{0.00 0.5 0.30} + \newrgbcolor{lightred}{1.00 0.71 0.76} + \newrgbcolor{verylightred}{0.50 0.351 0.38} + \seticonparams{entity}{shadow=true,fillcolor=lightred,fillstyle=solid} + \seticonparams{attribute}{fillcolor=lightblue,fillstyle=solid} + \seticonparams{relationship}{shadow=true,fillcolor=lightgreen,fillstyle=solid} +\fi + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\ifx\TeXMaster\undefined +\begin{center} +{\huge\bf ER-Diagram of the \Mondial\ Database} +\bigskip +\end{center} +\fi + +\thispagestyle{empty} + +\psset{nodesep=0pt} + +\hspace*{2cm} +\begin{tabular}{ccc} + % lang/rel/ethn + \begin{tabular}{c} + \entity{Language} \\[12em] + \entity{EthnicGrp}[Ethnic Grp] \\[12em] + \entity{Religion} + \end{tabular} + \hspace{10em} + % cities/countries/provinces + \begin{tabular}{c@{\hspace{10em}}c} + &\entity[weak]{City} \\[2em] + \entity{Organization}\\[12em] + \entity{Country} \\[12em] + \entity{Continent}\\[2em] + &\entity[weak]{Province} + \end{tabular} + \hspace{10em} + % geo + \begin{tabular}{c} + \entity{Lake} \\[5em] + \entity{River} \\[5em] + \entity{Sea}\\[9em] + \entity{Mountain}\\[7em] + \entity{Island}\\[7em] + \entity{Desert} + \end{tabular} +\end{tabular} +\nodeconnections{\small + \relationshipbetween{Country}{City}{capital}[is\_capital] + \relationshipbetween{Province}{City}{capital}[is\_capital](0.4) + \relationshipbetween[ident]{Province}{City}{in}/\ncarc[arcangle=-30]/ + \relationshipbetween[weak]{Province}{Country}{of} +% + \relationshipbetween{Country}{Organization}{ismember}[is\_member](0.6) + \relationshipbetween{Organization}{City}{has\_hq\_in} +% + \relationshipbetween{Country}{Continent}{encompasses}(0.8) +% + \relationshipbetween{Country}(A) + /\ncline[nodesepB=-1cm,offsetA=0.1em,offsetB=0.4cm]/ + {Country}(B) + /\ncline[nodesepB=-1cm,offsetA=-0.1em,offsetB=-0.4cm]/ + {borders}(7em,0) +% + \relationshipbetween{Province}{Lake}{in} + \relationshipbetween{Province}{River}{in} + \relationshipbetween{Province}{Sea}{in} + \relationshipbetween{Province}{Mountain}{in} + \relationshipbetween{Province}{Island}{in} + \relationshipbetween{Province}{Desert}{in} +% + \relationshipbetween{City}{Lake}{at} + \relationshipbetween{City}{River}{at} + \relationshipbetween{City}{Sea}{at} + % + \inrelationship{River}(main)/\ncarc[arcangle=30]/{flows into} + [flows into](4em,0) + \inrelationship{River}(trib.)/\ncarc[arcangle=-30]/{flowsinto} + \inrelationship{Lake}{flowsinto} + \inrelationship{Sea}{flowsinto} +% + \relationshipbetween{Sea}(A){Sea}(B){merges}(4em,270) +% + \relationshipbetween{EthnicGrp}{Country}{belong}(0.3) + \relationshipbetween{Religion}{Country}{believe}(0.3) + \relationshipbetween{Language}{Country}{speak}(0.4) +% + \attributeof{City}{90}[key]{name} + \attributeof{City}{45}{pop.} + \attributeof{City}{0}{longitude} + \attributeof{City}{-45}{latitude} +% + \attributeof{Organization}{70}[key]{abbrev} + \attributeof{Organization}{130}{name} + \attributeof{Organization}[4em]{1800}{establ.} +% + \attributeof{ismember}{40}{type} +% + \attributeof{borders}{60}{length} +% + \attributeof{Country}[3em]{30}{name} + \attributeof{Country}{70}[key]{code} + \attributeof{Country}{130}{pop.} + \attributeof{Country}[3em]{190}{area} + \attributeof{Country}{230}{gov.} + \attributeof{Country}{280}{infl.} + \attributeof{Country}[3em]{330}{gdp} + \attributeof{Country}[4em]{100}{pop.grw} + \attributeof{Country}[5em]{160}{inf.mort} + \attributeof{Country}[6.5em]{-30}{gdp.agr} + \attributeof{Country}[5.5em]{-50}{gdp.serv} + \attributeof{Country}[5em]{-80}{gdp.ind} + \attributeof{Country}[5em]{-120}{governm.} +% + \attributeof{Continent}{-60}[key]{name} + \attributeof{Continent}{-120}{area} +% + \attributeof{Language}{90}[key]{name} + \attributeof{speak}{60}{percent} +% + \attributeof{EthnicGrp}{90}[key]{name} + \attributeof{belong}{-90}{percent} +% + \attributeof{Religion}{90}[key]{name} + \attributeof{believe}{-90}{percent} +% + \attributeof{encompasses}[4em]{-160}{percent} +% + \attributeof{Province}[4em]{180}[key]{name} + \attributeof{Province}{225}{pop.} + \attributeof{Province}{270}{area} +% + \attributeof{Lake}{0}[key]{name} + \attributeof{Lake}{180}{area} +% + \attributeof{River}{90}[key]{name} + \attributeof{River}{180}{length} +% + \attributeof{Sea}{0}[key]{name} + \attributeof{Sea}{180}{depth} +% + \attributeof{Mountain}{135}[key]{name} + \attributeof{Mountain}{45}{height} + \attributeof{Mountain}{-90}{mtcoord}[geo coord] + \attributeof{mtcoord}[3em]{20}{longitude} + \attributeof{mtcoord}[3em]{-20}{latitude} +% + \attributeof{Island}{90}[key]{name} + \attributeof{Island}{40}{islands} + \attributeof{Island}{-90}{islcoord}[geo coord] + \attributeof{islcoord}[3em]{20}{longitude} + \attributeof{islcoord}[3em]{-20}{latitude} +% + \attributeof{Desert}{90}[key]{name} + \attributeof{Desert}{0}{area} +} + +\ifx\TeXMaster\undefined +\end{document} +\fi + +% Local Variables: +% TeX-command-default: "LaTeX" +% TeX-master: t +% End: diff --git a/Master/texmf-dist/source/generic/pst-dbicons/Makefile b/Master/texmf-dist/source/generic/pst-dbicons/Makefile deleted file mode 100644 index 08da3af84d7..00000000000 --- a/Master/texmf-dist/source/generic/pst-dbicons/Makefile +++ /dev/null @@ -1,48 +0,0 @@ - -# `Makefile' for `pst-dbicons.pdf', hv, 2006/08/11 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -MAIN = pst-dbicons - -LATEX = latex - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(MAIN).dtx $(MAIN).ins Makefile - -all : $(MAIN).sty doc clean - -$(MAIN).sty : $(MAIN).dtx -%.sty : %.dtx - tex $(basename $<).ins - -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps - GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).dtx - $(LATEX) $< - if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi - if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi - makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ - $(basename $<).glo - makeindex -s gind.ist -t $(basename $<).ilg -o $(basename $<).ind \ - $(basename $<).idx - $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out) - $(RM) $(addprefix $(MAIN), .dvi .ps) - -veryclean : clean - $(RM) $(MAIN).pdf - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -# EOF diff --git a/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.drv b/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.drv index 8fe99595502..dab795b2388 100644 --- a/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.drv +++ b/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.drv @@ -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/26} -\def\docdate{2006/11/26} -\def\fileversion{0.2} +\def\filedate{2010/03/25} +\def\docdate{2010/09/25} +\def\fileversion{0.16} \def\basename{pst-dbicons} %% \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 @@ -39,11 +39,9 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\documentclass{ltxdoc} -\usepackage[dvips]{geometry} -\usepackage{latexsym} -\usepackage{pst-dbicons,lscape} -\parindent0pt\hfuzz2pt +\documentclass{ltxdoc} \usepackage{latexsym} +\usepackage{pstricks,pst-node} \usepackage{pst-dbicons} +\parindent0pt\hfuzz2pt \setlength{\textwidth}{360pt} \begin{document} \DocInput{pst-dbicons.dtx} \end{document} diff --git a/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.dtx b/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.dtx index a2d49316cb1..43d1b4df9d7 100644 --- a/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.dtx +++ b/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.dtx @@ -1,22 +1,38 @@ -\def\filedate{2006/11/26} -\def\docdate{2006/11/26} -\def\fileversion{0.2} +\def\filedate{2010/03/25} +\def\docdate{2010/09/25} +\def\fileversion{0.16} \def\basename{pst-dbicons} % % \iffalse meta-comment % -% Package 'pst-dbicons to use with LaTeX2e and PSTricks -% Copyright 1997-2006 by Wolfgang May. -% may@informatik.uni-goettingen.de +% Package 'pst-dbicons' to use with LaTeX2e and PSTricks +% (formerly dbicons) +% Copyright 1997-2010 by Wolfgang May. All rights reserved. % -% This program can be redistributed and/or modified under the terms -% of the LaTeX Project Public License Distributed from CTAN archives -% in directory macros/latex/base/lppl.txt. +% This package is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +% +% Written and maintained by +% Wolfgang May % -% \fi +% Error Reports in case of UNCHANGED versions to +% +% Wolfgang May +% Institut f"ur Informatik, Universit"at G"ottingen +% Goldschmidtstrasse 7 +% D-37077 Goettingen, Germany +% e-mail: may@informatik.uni-goettingen.de % -% \changes{v0.20}{2006/11/26}{First CTAN release (hv)} +% You are not allowed to change this file. +% +% You are allowed to distribute this file under the condition that +% it is distributed UNCHANGED. You are NOT ALLOWED to take money for +% the distribution or use of either this file or a changed version, +% except for a nominal charge for copying etc. +% \fi % +% \CheckSum{576} %% \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 @@ -48,13 +64,20 @@ % % \title{PSTricks Macros for Databases\thanks{This % file has version number \fileversion{}, last revised \filedate.}} -% \author{Wolfgang May\thanks{\texttt{may@informatik.uni-goettingen.de}}} +% \author{Wolfgang May\\ +% \texttt{may@informatik.uni-freiburg.de}\\ +% Institut f\"ur Informatik \\ +% Universit\"at G\"ottingen \\ +% Goldschmidtstrasse 7 \\ +% D-37077 G\"ottingen\\ +% Germany} % \date{\filedate} % \maketitle % % \begin{abstract} % \noindent -% The \emph{pst-dbicons} package provides some useful macros in the +% The \emph{pst-dbicons} package (originally called \em{dbicons} only) +% provides some useful macros in the % database area. It focusses on typesetting ER-Diagrams in a % declarative style, i.e., by positioning some nodes and defining % the position of all other nodes relative to them by using the @@ -150,7 +173,7 @@ % Note that with \emph{phone\_no}, the optional argument is % used for the node text (in case that the node text contains % stuff that is not allowed in internal postscript ids -- -% as a rough rule, only characters (and since dbicons 1.14, +% as a rough rule, only characters (and since dbicons v1.14, % underscores) are allowed in ids). % % In Section~\ref{sec-relationships}, relationship nodes are defined @@ -466,138 +489,7 @@ % % \subsection{Example} % -% \begin{landscape} -% \newcommand*{\Mondial}{\textsc{Mondial}} -% \newif\ifblackwhite -% \blackwhitefalse -% \ifblackwhite -% \definecolor{verylightgray}{gray}{0.95} -% \seticonparams{entity}{shadow=true,fillcolor=lightgray,fillstyle=solid} -% \seticonparams{attribute}{fillcolor=lightgray,fillstyle=solid} -% \seticonparams{relationship}{shadow=true,fillcolor=lightgray,fillstyle=solid} -% \else -% \definecolor{lightblue}{rgb}{0.68, 0.85, 0.95} -% \definecolor{verylightblue}{rgb}{0.34, 0.42, 0.5} -% \definecolor{lightgreen}{rgb}{0.00, 0.98, 0.60} -% \definecolor{verylightgreen}{rgb}{0.00, 0.5, 0.30} -% \definecolor{lightred}{rgb}{1.00, 0.71, 0.76} -% \definecolor{verylightred}{rgb}{0.50, 0.351, 0.38} -% \seticonparams{entity}{shadow=true,fillcolor=lightred,fillstyle=solid} -% \seticonparams{attribute}{fillcolor=lightblue,fillstyle=solid} -% \seticonparams{relationship}{shadow=true,fillcolor=lightgreen,fillstyle=solid} -% \fi -% -% \psset{nodesep=0pt} -% \resizebox{1.25\textheight}{!}{% -% \begin{tabular}{ccc} -% \begin{tabular}{c} -% \entity{Language} \\[12em] -% \entity{EthnicGrp}[Ethnic Grp] \\[12em] -% \entity{Religion} -% \end{tabular} -% \hspace{10em} -% \begin{tabular}{c@{\hspace{10em}}c} -% &\entity[weak]{City} \\[2em] -% \entity{Organization}\\[12em] -% \entity{Country} \\[12em] -% \entity{Continent}\\[2em] -% &\entity[weak]{Province} -% \end{tabular} -% \hspace{10em} -% \begin{tabular}{c} -% \entity{Lake} \\[5em] -% \entity{River} \\[5em] -% \entity{Sea}\\[9em] -% \entity{Mountain}\\[7em] -% \entity{Island}\\[7em] -% \entity{Desert} -% \end{tabular} -% \end{tabular} -% \nodeconnections{\small -% \relationshipbetween{Country}{City}{capital}[is\_capital] -% \relationshipbetween{Province}{City}{capital}[is\_capital](0.4) -% \relationshipbetween[ident]{Province}{City}{in}/\ncarc[arcangle=-30]/ -% \relationshipbetween[weak]{Province}{Country}{of} -% \relationshipbetween{Country}{Organization}{ismember}[is\_member](0.6) -% \relationshipbetween{Organization}{City}{hashqin}[has\_hq\_in] -% \relationshipbetween{Country}{Continent}{encompasses}(0.8) -% \relationshipbetween{Country}(A) -% /\ncline[nodesepB=-1cm,offsetA=0.1em,offsetB=0.4cm]/ -% {Country}(B) -% /\ncline[nodesepB=-1cm,offsetA=-0.1em,offsetB=-0.4cm]/ -% {borders}(7em,0) -% \relationshipbetween{Province}{Lake}{in} -% \relationshipbetween{Province}{River}{in} -% \relationshipbetween{Province}{Sea}{in} -% \relationshipbetween{Province}{Mountain}{in} -% \relationshipbetween{Province}{Island}{in} -% \relationshipbetween{Province}{Desert}{in} -% \relationshipbetween{City}{Lake}{at} -% \relationshipbetween{City}{River}{at} -% \relationshipbetween{City}{Sea}{at} -% \inrelationship{River}(main)/\ncarc[arcangle=30]/{flows into} -% [flows into](4em,0) -% \inrelationship{River}(trib.)/\ncarc[arcangle=-30]/{flowsinto} -% \inrelationship{Lake}{flowsinto} -% \inrelationship{Sea}{flowsinto} -% \relationshipbetween{Sea}(A){Sea}(B){merges}(4em,270) -% \relationshipbetween{EthnicGrp}{Country}{belong}(0.3) -% \relationshipbetween{Religion}{Country}{believe}(0.3) -% \relationshipbetween{Language}{Country}{speak}(0.4) -% \attributeof{City}{90}[key]{name} -% \attributeof{City}{45}{pop.} -% \attributeof{City}{0}{longitude} -% \attributeof{City}{-45}{latitude} -% \attributeof{Organization}{70}[key]{abbrev} -% \attributeof{Organization}{130}{name} -% \attributeof{Organization}[4em]{1800}{establ.} -% \attributeof{ismember}{40}{type} -% \attributeof{borders}{60}{length} -% \attributeof{Country}[3em]{30}{name} -% \attributeof{Country}{70}[key]{code} -% \attributeof{Country}{130}{pop.} -% \attributeof{Country}[3em]{190}{area} -% \attributeof{Country}{230}{gov.} -% \attributeof{Country}{280}{infl.} -% \attributeof{Country}[3em]{330}{gdp} -% \attributeof{Country}[4em]{100}{pop.grw} -% \attributeof{Country}[5em]{160}{inf.mort} -% \attributeof{Country}[6.5em]{-30}{gdp.agr} -% \attributeof{Country}[5.5em]{-50}{gdp.serv} -% \attributeof{Country}[5em]{-80}{gdp.ind} -% \attributeof{Country}[5em]{-120}{governm.} -% \attributeof{Continent}{-60}[key]{name} -% \attributeof{Continent}{-120}{area} -% \attributeof{Language}{90}[key]{name} -% \attributeof{speak}{60}{percent} -% \attributeof{EthnicGrp}{90}[key]{name} -% \attributeof{belong}{-90}{percent} -% \attributeof{Religion}{90}[key]{name} -% \attributeof{believe}{-90}{percent} -% \attributeof{encompasses}[4em]{-160}{percent} -% \attributeof{Province}[4em]{180}[key]{name} -% \attributeof{Province}{225}{pop.} -% \attributeof{Province}{270}{area} -% \attributeof{Lake}{0}[key]{name} -% \attributeof{Lake}{180}{area} -% \attributeof{River}{90}[key]{name} -% \attributeof{River}{180}{length} -% \attributeof{Sea}{0}[key]{name} -% \attributeof{Sea}{180}{depth} -% \attributeof{Mountain}{135}[key]{name} -% \attributeof{Mountain}{45}{height} -% \attributeof{Mountain}{-90}{mtcoord}[geo coord] -% \attributeof{mtcoord}[3em]{20}{longitude} -% \attributeof{mtcoord}[3em]{-20}{latitude} -% \attributeof{Island}{90}[key]{name} -% \attributeof{Island}{40}{islands} -% \attributeof{Island}{-90}{islcoord}[geo coord] -% \attributeof{islcoord}[3em]{20}{longitude} -% \attributeof{islcoord}[3em]{-20}{latitude} -% \attributeof{Desert}{90}[key]{name} -% \attributeof{Desert}{0}{area} -% }} -% \end{landscape} +% TO BE FILLED % % \subsection{Miscellaneous} % @@ -688,11 +580,9 @@ % % \begin{macrocode} %<*driver> -\documentclass{ltxdoc} -\usepackage[dvips]{geometry} -\usepackage{latexsym} -\usepackage{pst-dbicons,lscape} -\parindent0pt\hfuzz2pt +\documentclass{ltxdoc} \usepackage{latexsym} +\usepackage{pstricks,pst-node} \usepackage{pst-dbicons} +\parindent0pt\hfuzz2pt \setlength{\textwidth}{360pt} \begin{document} \DocInput{pst-dbicons.dtx} \end{document} @@ -702,14 +592,6 @@ % \setcounter{CodelineNo}{0} %\iffalse %<*package>\fi -% -% Required packages from the PSTricks bundle -% -% \begin{macrocode} -\RequirePackage{pstricks} -\RequirePackage{pst-node} -% \end{macrocode} -% % \begin{macrocode} \typeout{Style `\basename', Version \fileversion\space <\filedate>} \ProvidesPackage{pst-dbicons}[\filedate \space\fileversion] @@ -797,9 +679,10 @@ % \end{macrocode} % % \Codelabel{attributeof} +% \changes{v0.16}{2010/03/25}{fixed first optional argument} % \begin{macrocode} \def\attributeof#1{% - \@ifnextchar[{\attributeof@i{#1}}{\attributeof@i{#1}[\attrdist]}} + \@ifnextchar[{\attributeof@i{#1}}{\attributeof@i{#1}[\@attrdist]}} \def\attributeof@i#1[#2]#3{% \@ifnextchar[{\attributeof@ii{#1}[#2]{#3}}{\attributeof@ii{#1}[#2]{#3}[sv]}} \def\attributeof@ii#1[#2]#3[#4]#5{% @@ -1036,14 +919,13 @@ % \end{macro} % %\iffalse -% -%\fi +%\fi % \GlossaryPrologue{} % % \IfFileExists{pst-dbicons.gls}{\PrintChanges} % {\begin{quote}You should create the list of changes by % -% ~~~ \texttt{makeindex -s gglo.ist -o dbicons.gls dbicons.glo} +% ~~~ \texttt{makeindex -s gglo.ist -o pst-dbicons.gls pst-dbicons.glo} % % and running \texttt{latex pst-dbicons.drv} again.\end{quote}} % @@ -1056,3 +938,8 @@ % \Finale \endinput +% Local Variables: +% TeX-command-default: "LaTeX" +% TeX-master: t +% End: +% mode: latex diff --git a/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.ins b/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.ins index 411e431cf8a..fe934b9e813 100644 --- a/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.ins +++ b/Master/texmf-dist/source/generic/pst-dbicons/pst-dbicons.ins @@ -1,4 +1,4 @@ -\def\filedate{2006/11/26} +\def\filedate{2010/03/25} \def\batchfile{pst-dbicons.ins} \input docstrip.tex \generateFile{pst-dbicons.drv}{t}{\from{pst-dbicons.dtx}{driver}} diff --git a/Master/texmf-dist/tex/latex/pst-dbicons/pst-dbicons.sty b/Master/texmf-dist/tex/latex/pst-dbicons/pst-dbicons.sty index 69d82e57b93..15bbc6a0352 100644 --- a/Master/texmf-dist/tex/latex/pst-dbicons/pst-dbicons.sty +++ b/Master/texmf-dist/tex/latex/pst-dbicons/pst-dbicons.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/26} -\def\docdate{2006/11/26} -\def\fileversion{0.2} +\def\filedate{2010/03/25} +\def\docdate{2010/09/25} +\def\fileversion{0.16} \def\basename{pst-dbicons} %% \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 @@ -39,8 +39,6 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\RequirePackage{pstricks} -\RequirePackage{pst-node} \typeout{Style `\basename', Version \fileversion\space <\filedate>} \ProvidesPackage{pst-dbicons}[\filedate \space\fileversion] \def\seticonparams#1#2{\expandafter\def\csname #1@parm\endcsname{[#2]}} @@ -86,7 +84,7 @@ \@attrdist2em % Default value for distance of attribute from entity \def\attrdist#1{\@attrdist#1} % set default distance \def\attributeof#1{% - \@ifnextchar[{\attributeof@i{#1}}{\attributeof@i{#1}[\attrdist]}} + \@ifnextchar[{\attributeof@i{#1}}{\attributeof@i{#1}[\@attrdist]}} \def\attributeof@i#1[#2]#3{% \@ifnextchar[{\attributeof@ii{#1}[#2]{#3}}{\attributeof@ii{#1}[#2]{#3}[sv]}} \def\attributeof@ii#1[#2]#3[#4]#5{% -- cgit v1.2.3