adrconv update (12nov06)

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

4 files changed, 85 insertions, 46 deletions

diff --git a/Master/texmf-dist/source/latex/adrconv/XtraStuf.mac/adrconv.xml b/Master/texmf-dist/source/latex/adrconv/XtraStuf.mac/adrconv.xml
deleted file mode 100644
index 622c2775710..00000000000
--- a/Master/texmf-dist/source/latex/adrconv/XtraStuf.mac/adrconv.xml
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/adrconv/XtraStuf.mac/adrguide.tex b/Master/texmf-dist/source/latex/adrconv/XtraStuf.mac/adrguide.tex
deleted file mode 100644
index 2245af18946..00000000000
--- a/Master/texmf-dist/source/latex/adrconv/XtraStuf.mac/adrguide.tex
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/adrconv/adrconv.dtx b/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
index 68501d8d851..a8bb717d89e 100644
--- a/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
+++ b/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
@@ -1,21 +1,25 @@
 % \CheckSum{490}
 % \iffalse
 % ====================================================================
-% adrconv.dtx
-% Copyright (c) 1999 - 2003 Axel Kielhorn
+%% adrguide.dtx
+%% Copyright 2006 Axel Kielhorn
 %
-% This file is part of the adrconv bundle.
-%
-% This file can be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, either version 1.2 of the license
-% or (at you option) any later version.
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
 % The latest version of this license is in
 %   http://www.latex-project.org/lppl.txt
-% and version 1.2 or later ist part of all distributions of LaTeX
-% version 1999/12/01 or later.
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+% 
+% This Current Maintainer of this work is Axel Kielhorn (A.Kielhorn@web.de)
+%
+% This work consists of the files adrconv.ins, adrconv.dtx, adrguide.tex
+% and the derived file adrguide.pdf. 
 %
-% The adrconv bundle consists at least of the files adrconv.dtx,
-% adrconv.ins and adrguide.tex. Use
+% Use
 %   tex adrconv.ins
 % or
 %   latex adrconv.ins
@@ -25,6 +29,7 @@
 % to generate the implementation documentation. Use
 %   latex adrguide.tex
 % to generate the user documentation.
+%
 % ====================================================================
 %
 %<*dtx>
@@ -48,7 +53,7 @@
 %<tex|cfg|dir>  }
 %</tex|cfg|dir>
 %<*dtx|driver|guide|tex|cfg|dir>
-  [2002/06/23 v1.2b LaTeX2e
+  [2006/04/19 v1.2c LaTeX2e
 %<*dtx>
   adrconv docstrip file]
 %</dtx>
@@ -96,7 +101,7 @@
 % \title{\BibTeX{} address database to addressfile
 %   converter\footnote{This file hat version number \fileversion, last
 %     revised \filedate}}
-% \author{Axel Kielhorn}
+% \author{Axel Kielhorn\thanks{A.Kielhorn@web.de} \and Markus Kohm}
 % \date{\filedate}
 % \maketitle
 % \begin{abstract}
@@ -547,6 +552,8 @@
 % \changes{v1.2}{1999/11/01}{New release independend of KOMA-Script}
 % \changes{v1.2a}{2001/10/11}{\Package{docstrip} version}
 % \changes{v1.2b}{2002/06/23}{Documentation updated}
+% \changes{v1.2c}{2006/04/19}{Documentation updated, license information
+% updated to LPPL 1.3}
 %
 % The \File{birthday.bst} prints the entries with birthdays only. The
 % entries are sorted by month and inside one month by date.
@@ -554,6 +561,7 @@
 %    \begin{macrocode}
 ENTRY
   { name
+  	sortas
     title
     organization
     city
@@ -713,19 +721,23 @@ FUNCTION{address}
 FUNCTION{presort}
 %<*!birthday>
 {
-  name empty$
-  { organization empty$
-    { key empty$
-      { "No name, organization, or key to sort " cite$ * warning$
-        "???"
+  sortas empty$
+  { name empty$
+    { organization empty$
+      { key empty$
+        { "No name, organization, or key to sort " cite$ * warning$
+          "???"
+        }
+        { key }
+        if$
       }
-      { key }
+      { organization }
       if$
     }
-    { organization }
+    { name #1 "{ll},{f }{v }{, j}" format.name$ }
     if$
   }
-  { name #1 "{ll},{f }{v }{, j}" format.name$ }
+  { sortas }
 %</!birthday>
 %<*birthday>
 { nbirthday empty$
@@ -859,6 +871,34 @@ EXECUTE {end.bib}
    birthday =  {13.11.1970},
    nbirthday = 1113,
 }
+@address{OEKZ,
+   name =      {{{"O}kologisches Zentrum~e.\,V.}},
+   sortas =    {Okologisches Zentrum},
+   organization = {Verband der Vereine},
+   city =      {Heimstatt},
+   zip =       01234,
+   country =   {Germany},
+   street =    {Mauerstra{\ss}e 1},
+   phone =     {01234 / 5 67 89},
+   fax =       {01234 / 5 67 89},
+   email =     {hm{@}work.com},
+   key =       {OEKZ},
+}
+@address{DANTE,
+  name      = {{DANTE~e.\,V.}},
+  sortas    = {Dante},
+  street    = {Postfach 10 18 40},
+  zip       = {69008},
+  city      = {Heidelberg},
+  phone     = {0 62 21 / 2 97 66},
+  fax       = {0 62 21 / 16 79 06},
+  email     = {dante{@}dante.de},
+  url       = {http://www.dante.de},
+  key       = {DANTE},
+  birthday  = {14. April 1989},
+  nbirthday = {0414}
+  }
+
 %    \end{macrocode}
 %
 % \iffalse
diff --git a/Master/texmf-dist/source/latex/adrconv/adrconv.ins b/Master/texmf-dist/source/latex/adrconv/adrconv.ins
index f579d3e7520..e0caec50646 100644
--- a/Master/texmf-dist/source/latex/adrconv/adrconv.ins
+++ b/Master/texmf-dist/source/latex/adrconv/adrconv.ins
@@ -1,22 +1,22 @@
-% ====================================================================
-% adrconv.ins
-% Copyright (c) 2001 Axel Kielhorn
+%% adrguide.ins
+%% Copyright 2006 Axel Kielhorn
 %
-% This file will generate fast loadable files from adrconv.dtx when
-% run through LaTeX or TeX.
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
 %
-% This file is part of the adrconv bundle.
+% This work has the LPPL maintenance status "maintained".
+% 
+% This Current Maintainer of this work is A.Kielhorn@web.de
 %
-% This file can be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, either version 1.2 of the license
-% or (at you option) any later version.
-% The latest version of this license is in
-%   http://www.latex-procejt.org/lppl.txt
-% and version 1.2 or later ist part of all distributions of LaTeX
-% version 1999/12/01 or later.
+% This work consists of the files adrconv.ins, adrconv.dtx, adrguide.tex
+% and the derived file adrguide.pdf. 
 %
-% The adrconv bundle consists at least of the files adrconv.dtx,
-% adrconv.ins and adrguide.tex. Use
+% Use
 %   tex adrconv.ins
 % or
 %   latex adrconv.ins
@@ -26,7 +26,6 @@
 % to generate the implementation documentation. Use
 %   latex adrguide.tex
 % to generate the user documentation.
-% ====================================================================
 %
 % ------------------ start of docstrip commands ----------------------
 \def\batchfile{adrconv.ins}
@@ -52,20 +51,20 @@
 }
 
 \preamble
-Copyright (c) 2001 Axel Kielhorn
+Copyright 2006 Axel Kielhorn
 
 This file will generate fast loadable files from adrconv.dtx when
 run through LaTeX or TeX.
 
-This file is part of the adrconv bundle.
-
-This file can be distributed and/or modified under the conditions of
-the LaTeX Project Public License, either version 1.2 of the license
-or (at you option) any later version.
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
 The latest version of this license is in
-  http://www.latex-procejt.org/lppl.txt
-and version 1.2 or later ist part of all distributions of LaTeX
-version 1999/12/01 or later.
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2003/12/01 or later.
+
+This file is part of the adrconv bundle.
 
 The adrconv bundle consists at least of the files adrconv.dtx,
 adrconv.ins and adrguide.tex.