dcpic no doc sources

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

7 files changed, 239 insertions, 54 deletions

diff --git a/Master/texmf-dist/doc/latex/dcpic/README b/Master/texmf-dist/doc/latex/dcpic/README
new file mode 100644
index 00000000000..34e8945af01
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/dcpic/README
@@ -0,0 +1,9 @@
+DCpic is a package of TeX macros for graph modeling (e.g. 
+commutative diagrams) in a (La)TeX or ConTeXt document. 
+Its distinguishing features are: the use of PiCTeX a 
+powerful graphical engine, and a simple specification 
+syntax. A graph is described in terms of its objects and 
+its edges. The objects are textual elements and the edges 
+can have various straight or curved forms.
+
+It is under the LaTeX Project Public License
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/dcpic/README.TEXLIVE b/Master/texmf-dist/doc/latex/dcpic/README.TEXLIVE
new file mode 100644
index 00000000000..54936b3ccf1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/dcpic/README.TEXLIVE
@@ -0,0 +1,7 @@
+The following files have been removed in the TeX Live installation of
+the current package, typically due to duplication, lack of space, or
+missing source code.  You can find these files on CTAN.  If questions or
+concerns, email tex-live.org.
+
+	manPT_dcpic.pdf
+	man_dcpic.pdf
diff --git a/Master/texmf-dist/doc/latex/dcpic/examples.tex b/Master/texmf-dist/doc/latex/dcpic/examples.tex
index 2c1c94cc603..a24dcbb5ee1 100644
--- a/Master/texmf-dist/doc/latex/dcpic/examples.tex
+++ b/Master/texmf-dist/doc/latex/dcpic/examples.tex
@@ -1,5 +1,8 @@
+% $Id: examples.tex,v 1.3 2007/12/13 17:20:09 pedro Exp pedro $
 \documentclass[a4paper]{article}
 \usepackage{pictexwd,dcpic}
+\usepackage{rcs}
+
 
 \voffset=-2cm
 \hoffset=-1cm
@@ -9,21 +12,28 @@
 \newcommand{\barraA}{\vrule height2em width0em depth0em}
 \newcommand{\barraB}{\vrule height1.6em width0em depth0em}
 
+
+
+
 \begin{document}
+\RCS $Revision: 1.3 $
+
 \begin{center}
-  DCpic - Examples
+  DCpic - Examples (Version \RCSRevision)
 \end{center}
 
 
-\paragraph{Commutative Diagrams --- Curved arrows.} A rectangular
-curve with rounded corners is easy to specify and should cater for
-most needs. With this in mind we give the following tip to the user:
-to specify a rectangular, with rounded corners, curve we choose the
-points which give us the {\em expanded chess-horse movement}, that is,
-$(x,y)$, $(x\pm4,y\mp1)$, $(x\mp1,y\pm4)$, or $(x,y)$,$(x\pm1,y\mp4)$,
-$(x\mp4,y\pm1)$, those sets of points will give us the four corners of
-the rectangle; to form the whole line it is only necessary to add an
-odd number of points joining the two (or more) corners.
+\paragraph{Commutative Diagrams --- Curved arrows.} 
+
+A rectangular curve with rounded corners is easy to specify and should
+cater for most needs. With this in mind we give the following tip to
+the user: to specify a rectangular, with rounded corners, curve we
+choose the points which give us the {\em expanded chess-horse
+  movement}, that is, $(x,y)$, $(x\pm4,y\mp1)$, $(x\mp1,y\pm4)$, or
+$(x,y)$,$(x\pm1,y\mp4)$, $(x\mp4,y\pm1)$, those sets of points will give us
+the four corners of the rectangle; to form the whole line it is only
+necessary to add an odd number of points joining the two (or more)
+corners.
 
 {\footnotesize
 \begin{verbatim}
@@ -118,8 +128,8 @@ $$
 
 
 \paragraph{Commutative Diagrams --- Size Adjusting.} With the new
-version (v4.1) two new features are introduced, relative specification
-``mor{objSum}{objB}'' instead of ``mor(1,3)(4,5)'', and the arrows now
+version (v4.0) two new features are introduced, relative specification
+{\tt $\backslash$mor\{objA\}\{objB\}} instead of {\tt $\backslash$mor(1,3)(4,5)}, and the arrows now
 automatically adjust their size to the object's box size.
 
 
@@ -608,7 +618,6 @@ $$
 
 
 {\scriptsize
-}
 \begin{verbatim}
 \begindc{\digraph}[25]
 \obj(1,5){A}[\west]
@@ -625,8 +634,119 @@ $$
 \mor{C}{G}{7}
 \enddc
 \end{verbatim}
-\end{document}
+}
+
+\paragraph{Circled Directed Graphs}
+
+$$
+\begindc{\cdigraph}[20]
+\obj(6,6){18}[1]
+\obj(12,6){17}[1]
+\mor{18}{17}{}
+\enddc
+$$
+
+{\scriptsize
+\begin{verbatim}
+\begindc{\cdigraph}[20]
+\obj(6,6){18}[1]
+\obj(12,6){17}[1]
+\mor{18}{17}{}
+\enddc
+\end{verbatim}
+}
+
+\paragraph{Circled Undirected Graphs}
+
+Some fine adjustment is nedeeded in some lines.
+
+$$\small
+\begindc{\cundigraph}[11]
+\obj(6,4){18}[\south]\obj(18,4){17}[\south]
+\obj(8,7){11}[\west]\obj(12,8){12}[\south]
+\obj(16,7){13}[\east]\obj(8,11){10}[\west]
+\obj(10,12)[6]{6}[\south]\obj(12,10)[5]{5}[\east]
+\obj(14,12){4}[\northeast]\obj(16,11){14}[\east]
+\obj(2,16){19}[\west]\obj(6,15){9}
+\obj(9,16){8}\obj(11,14){7}[\west]
+\obj(13,14){3}\obj(15,16){2}
+\obj(18,15){15}\obj(22,16){16}[\east]
+\obj(12,19){1}[\west]\obj(12,22){20}[\north]
+\mor{18}{17}[7,7]{}\mor{18}{11}{}\mor{18}{19}{}\mor{11}{12}{}
+\mor{11}{10}{}\mor{12}{13}{}\mor{12}{5}{}\mor{10}{6}{}
+\mor{10}{9}{}\mor{5}{6}{}\mor{5}{4}{}\mor{13}{17}[8,6]{}
+\mor{13}{14}{}\mor{9}{19}{}\mor{9}{8}{}\mor{6}{7}{}
+\mor{4}{3}{}\mor{4}{14}{}\mor{19}{20}{}\mor{8}{1}{}
+\mor{8}{7}{}\mor{7}{3}{}\mor{3}{2}{}\mor{2}{1}{}
+\mor{2}{15}{}\mor{14}{15}{}\mor{17}{16}{}\mor{16}{20}{}
+\mor{1}{20}{}\mor{15}{16}{}
+\enddc
+$$
+
+{\scriptsize
+\begin{verbatim}
+\begindc{\cundigraph}[13]
+\obj(6,4){18}[\south]\obj(18,4){17}[\south]
+\obj(8,7){11}[\west]\obj(12,8){12}[\south]
+\obj(16,7){13}[\east]\obj(8,11){10}[\west]
+\obj(10,12)[6]{6}[\south]\obj(12,10)[5]{5}[\east]
+\obj(14,12){4}[\northeast]\obj(16,11){14}[\east]
+\obj(2,16){19}[\west]\obj(6,15){9}
+\obj(9,16){8}\obj(11,14){7}[\west]
+\obj(13,14){3}\obj(15,16){2}
+\obj(18,15){15}\obj(22,16){16}[\east]
+\obj(12,19){1}[\west]\obj(12,22){20}[\north]
+\mor{18}{17}[7,7]{}\mor{18}{11}{}\mor{18}{19}{}\mor{11}{12}{}
+\mor{11}{10}{}\mor{12}{13}{}\mor{12}{5}{}\mor{10}{6}{}
+\mor{10}{9}{}\mor{5}{6}{}\mor{5}{4}{}\mor{13}{17}[8,6]{}
+\mor{13}{14}{}\mor{9}{19}{}\mor{9}{8}{}\mor{6}{7}{}
+\mor{4}{3}{}\mor{4}{14}{}\mor{19}{20}{}\mor{8}{1}{}
+\mor{8}{7}{}\mor{7}{3}{}\mor{3}{2}{}\mor{2}{1}{}
+\mor{2}{15}{}\mor{14}{15}{}\mor{17}{16}{}\mor{16}{20}{}
+\mor{1}{20}{}\mor{15}{16}{}
+\enddc
+\end{verbatim}
+}
+
+\paragraph{New arrows and Lines in v4.1}
+
+\paragraph{Surjective arrow}
+
+
+$$
+\begindc{\commdiag}[3]
+\obj(10,15){$A$}
+\obj(40,15)[Al]{$A$}
+\obj(25,15){$B$}
+\obj(40,5){$A^\prime$}
+\mor{$A$}{$B$}{$f$}[\atleft,\surjectivearrow]
+\mor{$B$}{Al}{$g$}[\atleft,\surjectivearrow]
+\mor{$B$}{$A^\prime$}{$g^\prime$}[\atright,\surjectivearrow]
+\enddc
+$$
+
+\paragraph{Dashed and Dotted lines}
+
 
+$$
+\begindc{\commdiag}[3]
+\obj(10,20){$A$}
+\obj(40,30)[Al]{$A$}
+\obj(25,30){$B$}
+\obj(40,40){$A^\prime$}
+\obj(40,10)[Ald]{$A$}
+\obj(25,10)[Bd]{$B$}
+\obj(40,0)[Apd]{$A^\prime$}
+\mor{$A$}{$B$}{}[\atleft,\dashline]
+\mor{$B$}{Al}{}[\atleft,\dashline]
+\mor{$B$}{$A^\prime$}{}[\atright,\dashline]
+\mor{$A$}{Bd}{}[\atleft,\dotline]
+\mor{Bd}{Ald}{}[\atleft,\dotline]
+\mor{Bd}{Apd}{}[\atright,\dotline]
+\enddc
+$$
+
+\end{document}
 
 %%% Local Variables: 
 %%% mode: latex
diff --git a/Master/texmf-dist/doc/latex/dcpic/man4.0-pt.pdf b/Master/texmf-dist/doc/latex/dcpic/man4.0-pt.pdf
deleted file mode 100644
index c4e13e78814..00000000000
--- a/Master/texmf-dist/doc/latex/dcpic/man4.0-pt.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/dcpic/man4.0.pdf b/Master/texmf-dist/doc/latex/dcpic/man4.0.pdf
deleted file mode 100644
index dd9400896e0..00000000000
--- a/Master/texmf-dist/doc/latex/dcpic/man4.0.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/dcpic/dcpic.sty b/Master/texmf-dist/tex/latex/dcpic/dcpic.sty
index b1a65327c08..9a613845837 100644
--- a/Master/texmf-dist/tex/latex/dcpic/dcpic.sty
+++ b/Master/texmf-dist/tex/latex/dcpic/dcpic.sty
@@ -1,15 +1,29 @@
-% $Id: dcpic.sty,v 1.24 2002/11/25 13:51:57 pedro Exp $
+% $Id: dcpic.sty,v 1.31 2007/12/13 17:34:57 pedro Exp pedro $
 %% DC-PiCTeX
-%% Realizado por Pedro Quaresma de Almeida, Coimbra 
-%% 11/1990 (vers{\~a}o 1.0); 10/1991 (vers{\~a}o 1.1);
-%%  9/1993 (vers{\~a}o 1.2);  3/1995 (vers{\~a}o 1.3);
-%%  7/1996 (vers{\~a}o 2.1);
-%%  5/2001 (vers{\~a}o 3.0); 11/2001 (vers{\~a}o 3.1);
-%%  1/2002 (vers{\~a}o 3.2)
-%%  5/2002 (versão 4.0)
-\immediate\write10{Package DCpic 2002/05/16 v4.0}
+%% Copyright (c) 1990-2007 Pedro Quaresma de Almeida, Coimbra 
+%% 11/1990 (version 1.0); 
+%%   10/1991 (version 1.1);
+%%    9/1993 (version 1.2);  
+%%    3/1995 (version 1.3);
+%%  7/1996 (version 2.1);
+%%  5/2001 (version 3.0); 
+%%   11/2001 (version 3.1);
+%%    1/2002 (version 3.2)
+%%  5/2002 (version 4.0); 
+%%    3/2003 (version 4.1); 
+%%      12/2004 (version 4.1.1)
+%%       3/2007 (version 4.1.2)
 
-%% Copyright (c) 1990-2002 Pedro Quaresma <pedro@mat.uc.pt>
+\immediate\write10{Package DCpic 2007/03/01 v4.1.2}
+
+\ProvidesPackage{dcpic}[2007/03/01 v4.1.2]
+
+%% Version X.Y.Z
+%%   X - major versions
+%%   Y - minor versions
+%%   Z - bug corrections
+%%
+%% Copyright (c) 1990-2007 Pedro Quaresma <pedro@mat.uc.pt>
 %% The DCpic package is free software; you can redistribute it and/or
 %% modify it under the terms of the GNU General Public License as
 %% published by the Free Software Foundation; either version 2 of the
@@ -25,7 +39,7 @@
 %% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %%
 %%
-%% Coimbra, 16 de Maio de 2002
+%% Coimbra, 13 de Dezembro de 2007
 %% Pedro Quaresma de Almeida
 %%
 %%  DCpic is a package of \TeX\ macros for graph modelling in a
@@ -62,10 +76,12 @@
 %%
 %% The environment:
 %%   \begindc{#1}[#2]
-%%        Tipo do grafo
-%%          0 = "commdiag" (diagrama comutativo)
-%%          1 = "digraph" (grafo orientado)
-%%          2 = "undigraph" (grafo não orientado)             
+%%        #1 - Graph type
+%%          0 = "commdiag" (commutative diagram)
+%%          1 = "digraph" (direct graph)
+%%          2 = "undigraph" (undirect graph)
+%%          3 = "cdigraph" with incircled objects
+%%          4 = "cundigraph" with incircled objects
 %%        (optional) #2 - magnification factor (default value, 30)
 %%
 %%   \enddc
@@ -76,7 +92,7 @@
 %% (optional) #3 - Label, to be used in the morphims command, if not
 %%                 present the #4 will be used to that purpose
 %%            #4 - Object contents
-%%            #5 - placement of the object (default value \north)
+%% (optional) #5 - placement of the object (default value \north)
 %%                   0="\pcent", center
 %%                   1="\north", north
 %%                   2="\northeast", northeast
@@ -119,36 +135,39 @@
 %%
 %% Now we can describe all the arguments
 %%
-%%        #1 and #2 - coordenates (beginning)
-%%        #3 and #4 - coordenantes (ending)
-%%(optional)#5,#6 - correction factor (defaul value, 10 and 10)
-%%        #5 - actual beginning of the edge 
-%%        #6 - actual ending of the edge 
-%%        #7 - text (morphism label)
+%%          #1 and #2 - coordinates (beginning)
+%%          #3 and #4 - coordinates (ending)
+%%(optional)#5,#6 - correction factors (defaul values, 10 and 10)
+%%          #5 - actual beginning of the edge 
+%%          #6 - actual ending of the edge 
+%%          #7 - text (morphism label)
 %%(optional)#8,#9
-%%        #8 - label placement
+%%          #8 - label placement
 %%               1 = \atright, at right, default value
 %%              -1 = \atleft, at left
-%%        #9 - edge type
+%%          #9 - edge type
 %%               0 = "\solidarrow", default edge
 %%               1 = "\dasharrow"
 %%               2 = "\solidline"
-%%               3 = "\injectionarrow"
-%%               4 = "\aplicationarrow"
+%%               3 = "\dashline"
+%%               4 = "\dotline"
+%%               5 = "\injectionarrow"   --- old value 3
+%%               6 = "\aplicationarrow"  --- old value 4
+%%               7 = "\surjectivearrow"  --- old value 5
 %%
 %% Note: insert a space after the command.
 %%
 %% Curved Morphisms (quadratic edges):
 %%   \cmor(#1) #2(#3,#4){#5}[#6]
-%%       #1 - list of points (odd number)
-%%       #2 - tip direction
+%%          #1 - list of points (odd number)
+%%          #2 - tip direction
 %%              0 = "\pup", pointing up
 %%              1 = "\pdown", pointing down
 %%              2 = "\pright", pointing right
 %%              3 = "\pleft",  pointing left
-%%       #3 and #4 - coordenates of the label
-%%       #5 - morphism label
-%%       #6 - edge type
+%%          #3 and #4 - coordenates of the label
+%%          #5 - morphism label
+%%(optional)#6 - edge type
 %%              0 ="\solidarrow", default value
 %%              1 = "\dasharrow"
 %%              2 = "\solidline"
@@ -231,7 +250,7 @@
 %%       foi acrescentado o tipo de seta de aplica{\c c}{\~a}o
 %%       (op{\c c}{\~a}o 4) a dist{\^a}ncia da etiqueta {\`a} seta respectiva
 %%       passou a ser fixa  (10 unidades de medida).
-%% 15/7/1996 (versão 2.1)
+%% 15/7/1996 (vers{\~a}o 2.1)
 %%       O comando "\mor" passou a ter uma sintaxe distinta. Os
 %%       par{\^a}metros 5 e 6 passaram a ser a dist{\^a}ncia entre os
 %%       objectos e os extremos da seta o par{\^a}metro 7 {\'e} o nome do
@@ -263,7 +282,7 @@
 %%       querer especificar:
 %%         "commdiag" (0), para diagramas comutativos
 %%         "digraph" (1), para grafos orientados
-%%         "undigraph" (1), para grafos não orientados
+%%         "undigraph" (2), para grafos não orientados
 %%       O comando "obj" modificou a sua sintaxe passou a ter um (após
 %%       a especificação das coordenadas, um argumento opcional, um
 %%       argumento obrigatório, e um argumento opcional. O primeiro
@@ -278,6 +297,16 @@
 %%       especificada pelo último dos argumentos deste comando, o
 %%       valor por omissão é o "norte".
 %%
+%% 3/2003 (versão 4.1)
+%%       A pedido de Jon Barker <jeb1@soton.ac.uk> criei um novo tipo
+%%       de seta, a seta de sobrejecção.
+%%       Para já a dupla seta só fica bem nas setas horizontais ou 
+%%       verticais.
+%% 12/2004 (versão 4.1.1)
+%%       Nova versão das setas de sobrejecção que corrigue
+%%       completamente os problemas da solução anterior.
+%% 3/2007 (versão 4.1.2)
+%%       Acrescenta linhas a tracejado e a ponteado
 %%-----------------//-------------
 
 \catcode`!=11 %  ***** THIS MUST NEVER BE OMITTED (Ver PiCTeX)
@@ -408,8 +437,11 @@
 \def\solidarrow{0}
 \def\dasharrow{1}
 \def\solidline{2}
-\def\injectionarrow{3}
-\def\aplicationarrow{4}
+\def\dashline{3}
+\def\dotline{4}
+\def\injectionarrow{5}
+\def\aplicationarrow{6}
+\def\surjectivearrow{7}
 %% Name definitions for edge label placement
 \def\atright{-1}
 \def\atleft{1}
@@ -852,16 +884,26 @@
   \!distnomemor{\number\x}{\number\y}{\number\xl}{\number\yl}{#7}{\dnm}%
   \!ucoord{\number\y}{\number\yl}{\number\xmed}{\number\dnm}{\number\d}{\xc}{-#8}% 
   \!ucoord{\number\x}{\number\xl}{\number\ymed}{\number\dnm}{\number\d}{\yc}{#8}%
-\ifcase #9  % seta s{\'o}lida
+\ifcase #9            % Seta S{\'o}lida
   \arrow <4pt> [.2,1.1] from {\xa} {\ya} to {\xb} {\yb}
-\or  % seta a tracejado
+\or                   % Seta a Tracejado
   \setdashes
   \arrow <4pt> [.2,1.1] from {\xa} {\ya} to {\xb} {\yb}
   \setsolid
-\or  % linha s{\'o}lida
+\or                   % Linha S{\'o}lida
+  \setlinear
+  \plot {\xa} {\ya}  {\xb} {\yb} /
+\or                   % Linha Tracejado
+  \setdashes
+  \setlinear
+  \plot {\xa} {\ya}  {\xb} {\yb} /
+  \setsolid
+\or                   % Linha a Ponteado
+  \setdots
   \setlinear
   \plot {\xa} {\ya}  {\xb} {\yb} /
-\or  % seta de injec{\c c}{\~a}o
+  \setsolid
+\or                   % Seta de Injec{\c c}{\~a}o
 %% C{\'a}lculos auxiliares
 %%
 %% 3 valor para o raio do "rabo" da "seta"
@@ -881,7 +923,7 @@
   \arrow <4pt> [.2,1.1] from {\xa} {\ya} to {\xb} {\yb}
 %% e do seu "rabo"
   \circulararc -180 degrees from {\xa} {\ya} center at {\xd} {\yd}
-\or  % seta de aplica{\c c}{\~a}o ("|-->")
+\or                   % Seta de Aplica{\c c}{\~a}o ("|-->")
   \auxa=3% valor para o meio-segmento do "rabo" da "seta"
 %% c{\'a}lculo dos pontos (xmed,ymed) e (xd,yd) para o segmento de recta que
 %% define o "rabo" da seta
@@ -894,6 +936,11 @@
 %% e do seu "rabo"
   \setlinear
   \plot {\xmed} {\ymed}  {\xd} {\yd} /
+\or                   % Seta de Sobrejec{\c c}{\~a}o ("-->>")
+  \arrow <4pt> [.2,1.1] from {\xa} {\ya} to {\xb} {\yb}
+%% e da segunda "seta"
+  \setlinear
+  \arrow <6pt> [0,.72] from {\xa} {\ya} to {\xb} {\yb}
 \fi
 %% Coloca{\c c}{\~a}o do nome do morfismo.
 %% Se os morfismos s{\~a}o horizontais ou verticais constro{\'\i} uma caixa
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 0aa2bd7fe59..59aeea40ac9 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -85,6 +85,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'bera',	"&MAKEunzipandflatten",
  'biblatex',	"die 'skipping, still experimental'",
  'biblatex-dw',	"die 'skipping, depends on experimental biblatex'",
+ 'biblatex-mla',"die 'skipping, depends on experimental biblatex'",
  'bibleref',	"&MAKEflatten",
  'bibtopicprefix', "&MAKEflatten",
  'blanks',	"die 'skipping, unknown license (and c.1992)'",
@@ -1279,6 +1280,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'chessfss'	=> 'chessfonts_gallery.pdf|chessfss.pdf',
  'comprehensive'=> 'symbols-letter.pdf',	# a4 is enough
  'dateiliste'   => 'dateiliste.README*',	# already in dist
+ 'dcpic'	=> '.*.pdf',			# no source
  'din1505'      => 'leitbild3.pdf|normpatsoft.pdf', # no source
  'ecclesiastic' => 'ecclesiastic-sample.pdf',   # no source
  'ednotes'	=> 'perpage.sty',		# copy from bigfoot