adrconv update (4apr10)

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

4 files changed, 71 insertions, 198 deletions

diff --git a/Master/texmf-dist/bibtex/bst/adrconv/birthday.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst
index 4bdd557b1cb..265a51cacdc 100644
--- a/Master/texmf-dist/bibtex/bst/adrconv/birthday.bst
+++ b/Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst
@@ -1,11 +1,11 @@
 %%
-%% This is file `birthday.bst',
+%% This is file `adrbirthday.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:
 %%
 %% adrconv.dtx  (with options: `bst,birthday')
-%% Copyright 2006 Axel Kielhorn
+%% Copyright 2006, 2010 Axel Kielhorn
 %% 
 %% This file will generate fast loadable files from adrconv.dtx when
 %% run through LaTeX or TeX.
@@ -23,12 +23,8 @@
 %% The adrconv bundle consists at least of the files adrconv.dtx,
 %% adrconv.ins and adrguide.tex.
 %% 
-%% You are NOT ALLOWED to change this file.
-%% 
-%% You are NOT ALLOWED to distribute this file without adrconv.dtx,
-%% adrconv.ins or adrguide.tex.
 %% adrguide.dtx
-%% Copyright 2006 Axel Kielhorn
+%% Copyright 2006, 2010 Axel Kielhorn
 ENTRY
   { name
    sortas
@@ -96,22 +92,33 @@ FUNCTION{address}
     get.names write$ newline$
     "{"
     street empty$
-      { "" }
-      { street " \\ " *}
+      { "" * }
+      { street " \\ " * *}
     if$
-    *
     zip empty$
-      { "" }
-      { zip }
+      { "" * }
+      { zip " " * *}
     if$
-    " " * *
     city empty$
-      { "" }
-      { city }
+    { "" * }
+    { city * }
     if$
-    "}{" * *
+    "}{" *
     format.phone.and.mobile
-    "}{}{}{}{" * *
+    "}" * *
+    email empty$
+      { "{}" * }
+      { "{" email "}" * * * }
+    if$
+     organization empty$
+      { "{}" * }
+      { "{" organization "}" * * *}
+     if$
+    note empty$
+      { "{}" * }
+      { "{" note "}" * * * }
+    if$
+    "{"  *
     birthday empty$
       { "" }
       { birthday }
@@ -119,7 +126,7 @@ FUNCTION{address}
     "}{" * *
     key empty$
       { "" }
-      { "" }
+      { key }
     if$
     "}" * * write$ newline$
   }
diff --git a/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst
index 91c68d5ee0f..d6927724980 100644
--- a/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst
+++ b/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst
@@ -5,7 +5,7 @@
 %% The original source files were:
 %%
 %% adrconv.dtx  (with options: `bst,conv')
-%% Copyright 2006 Axel Kielhorn
+%% Copyright 2006, 2010 Axel Kielhorn
 %% 
 %% This file will generate fast loadable files from adrconv.dtx when
 %% run through LaTeX or TeX.
@@ -23,12 +23,8 @@
 %% The adrconv bundle consists at least of the files adrconv.dtx,
 %% adrconv.ins and adrguide.tex.
 %% 
-%% You are NOT ALLOWED to change this file.
-%% 
-%% You are NOT ALLOWED to distribute this file without adrconv.dtx,
-%% adrconv.ins or adrguide.tex.
 %% adrguide.dtx
-%% Copyright 2006 Axel Kielhorn
+%% Copyright 2006, 2010 Axel Kielhorn
 ENTRY
   { name
    sortas
@@ -93,22 +89,33 @@ FUNCTION{address}
     get.names write$ newline$
     "{"
     street empty$
-      { "" }
-      { street " \\ " *}
+      { "" * }
+      { street " \\ " * *}
     if$
-    *
     zip empty$
-      { "" }
-      { zip }
+      { "" * }
+      { zip " " * *}
     if$
-    " " * *
     city empty$
-      { "" }
-      { city }
+    { "" * }
+    { city * }
     if$
-    "}{" * *
+    "}{" *
     format.phone.and.mobile
-    "}{}{}{}{" * *
+    "}" * *
+    email empty$
+      { "{}" * }
+      { "{" email "}" * * * }
+    if$
+     organization empty$
+      { "{}" * }
+      { "{" organization "}" * * *}
+     if$
+    note empty$
+      { "{}" * }
+      { "{" note "}" * * * }
+    if$
+    "{"  *
     key empty$
       { "" }
       { key }
diff --git a/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst
index ce08a5c989c..582edb751cc 100644
--- a/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst
+++ b/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst
@@ -5,7 +5,7 @@
 %% The original source files were:
 %%
 %% adrconv.dtx  (with options: `bst,fax')
-%% Copyright 2006 Axel Kielhorn
+%% Copyright 2006, 2010 Axel Kielhorn
 %% 
 %% This file will generate fast loadable files from adrconv.dtx when
 %% run through LaTeX or TeX.
@@ -23,12 +23,8 @@
 %% The adrconv bundle consists at least of the files adrconv.dtx,
 %% adrconv.ins and adrguide.tex.
 %% 
-%% You are NOT ALLOWED to change this file.
-%% 
-%% You are NOT ALLOWED to distribute this file without adrconv.dtx,
-%% adrconv.ins or adrguide.tex.
 %% adrguide.dtx
-%% Copyright 2006 Axel Kielhorn
+%% Copyright 2006, 2010 Axel Kielhorn
 ENTRY
   { name
    sortas
@@ -92,22 +88,33 @@ FUNCTION{address}
     get.names write$ newline$
     "{"
     street empty$
-      { "" }
-      { street " \\ " *}
+      { "" * }
+      { street " \\ " * *}
     if$
-    *
     zip empty$
-      { "" }
-      { zip }
+      { "" * }
+      { zip " " * *}
     if$
-    " " * *
     city empty$
-      { "" }
-      { city }
+    { "" * }
+    { city * }
     if$
-    "}{" * *
+    "}{" *
     format.phone.and.fax
-    "}{}{}{}{" * *
+    "}" * *
+    email empty$
+      { "{}" * }
+      { "{" email "}" * * * }
+    if$
+     organization empty$
+      { "{}" * }
+      { "{" organization "}" * * *}
+     if$
+    note empty$
+      { "{}" * }
+      { "{" note "}" * * * }
+    if$
+    "{"  *
     key empty$
       { "" }
       { key }
diff --git a/Master/texmf-dist/bibtex/bst/adrconv/email.bst b/Master/texmf-dist/bibtex/bst/adrconv/email.bst
deleted file mode 100644
index f063a7c2ae7..00000000000
--- a/Master/texmf-dist/bibtex/bst/adrconv/email.bst
+++ /dev/null
@@ -1,148 +0,0 @@
-%%
-%% This is file `email.bst',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% adrconv.dtx  (with options: `bst,email')
-%% 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.
-%% 
-%% The adrconv bundle consists at least of the files adrconv.dtx,
-%% adrconv.ins and adrguide.tex.
-%% 
-%% You are NOT ALLOWED to change this file.
-%% 
-%% You are NOT ALLOWED to distribute this file without adrconv.dtx,
-%% adrconv.ins or adrguide.tex.
-%% adrguide.dtx
-%% Copyright 2006 Axel Kielhorn
-ENTRY
-  { name
-   sortas
-    title
-    organization
-    city
-    zip
-    country
-    street
-    phone
-    mobile
-    fax
-    url
-    email
-    note
-    key
-    birthday
-    nbirthday
-  }
-  {}
-  { adr.char }
-INTEGERS { cur.adr.char }
-FUNCTION {get.names}
-{ name empty$
-   { organization empty$
-      { "{}{}" }
-      { organization "{}" * }
-     if$
-   }
-   { "{" name #1 "{ll}" format.name$ "}" * *
-     "{" name #1 "{ff}{ vv}" format.name$ "}" * * *
-   }
-   if$
-}
-FUNCTION {print.adrchr}
-{ adr.char chr.to.int$ cur.adr.char >
-  { newline$ "\adrchar{" adr.char "}" * * write$ newline$
-    adr.char chr.to.int$ 'cur.adr.char :=
-  }
-  'skip$
-  if$
-}
-FUNCTION{address}
-{
-    print.adrchr
-    "\adrentry" write$
-    get.names write$ newline$
-    "{"
-    street empty$
-      { "" }
-      { street " \\ " *}
-    if$
-    *
-    zip empty$
-      { "" }
-      { zip }
-    if$
-    " " * *
-    city empty$
-      { "" }
-      { city }
-    if$
-    "}{" * *
-    email empty$
-      { "" }
-      { email }
-    if$
-    "}{}{}{}{" * *
-    key empty$
-      { "" }
-      { key }
-    if$
-    "}" * * write$ newline$
-}
-FUNCTION{presort}
-{
-  sortas empty$
-  { name empty$
-    { organization empty$
-      { key empty$
-        { "No name, organization, or key to sort " cite$ * warning$
-          "???"
-        }
-        { key }
-        if$
-      }
-      { organization }
-      if$
-    }
-    { name #1 "{ll},{f }{v }{, j}" format.name$ }
-    if$
-  }
-  { sortas }
-  if$
-  duplicate$
-  'sort.key$ :=
-  #1 #1 substring$
-  'adr.char :=
-}
-READ
-ITERATE {presort}
-SORT
-FUNCTION {begin.bib}
-{
-  "\def\sbscrpt{\_} \catcode`\_=\active \let_=\sbscrpt"
-  write$ newline$
-  preamble$ empty$
-    'skip$
-    { preamble$ write$ newline$ }
-  if$
-  #0 'cur.adr.char :=
-}
-EXECUTE {begin.bib}
-ITERATE {call.type$}
-FUNCTION {end.bib}
-{ newline$ }
-EXECUTE {end.bib}