From 4ced46483f40846bb18f28d2ab0011fceb84b9e9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 Aug 2007 17:55:43 +0000 Subject: adrconv update (12nov06) git-svn-id: svn://tug.org/texlive/trunk@4718 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bib/adrconv/example.bib | 48 ++++++++++++++++++----- Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst | 41 +++++++++++-------- Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst | 41 +++++++++++-------- Master/texmf-dist/bibtex/bst/adrconv/birthday.bst | 21 +++++----- Master/texmf-dist/bibtex/bst/adrconv/email.bst | 41 +++++++++++-------- 5 files changed, 123 insertions(+), 69 deletions(-) (limited to 'Master/texmf-dist/bibtex') diff --git a/Master/texmf-dist/bibtex/bib/adrconv/example.bib b/Master/texmf-dist/bibtex/bib/adrconv/example.bib index 3309ce2ed3c..e1728430423 100644 --- a/Master/texmf-dist/bibtex/bib/adrconv/example.bib +++ b/Master/texmf-dist/bibtex/bib/adrconv/example.bib @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `bib,example') -%% 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. @@ -27,6 +27,8 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn @address{mustermann, name = {Hans Mustermann}, city = {Heimstatt}, @@ -71,3 +73,31 @@ 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} + } + diff --git a/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst index 2535490a3ea..91c68d5ee0f 100644 --- a/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst +++ b/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `bst,conv') -%% 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. @@ -27,8 +27,11 @@ %% %% 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 @@ -114,19 +117,23 @@ FUNCTION{address} } FUNCTION{presort} { - 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 } if$ duplicate$ 'sort.key$ := diff --git a/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst index b4f0f9f7c93..ce08a5c989c 100644 --- a/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst +++ b/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `bst,fax') -%% 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. @@ -27,8 +27,11 @@ %% %% 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 @@ -113,19 +116,23 @@ FUNCTION{address} } FUNCTION{presort} { - 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 } if$ duplicate$ 'sort.key$ := diff --git a/Master/texmf-dist/bibtex/bst/adrconv/birthday.bst b/Master/texmf-dist/bibtex/bst/adrconv/birthday.bst index 9fe2a9029bb..4bdd557b1cb 100644 --- a/Master/texmf-dist/bibtex/bst/adrconv/birthday.bst +++ b/Master/texmf-dist/bibtex/bst/adrconv/birthday.bst @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `bst,birthday') -%% 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. @@ -27,8 +27,11 @@ %% %% 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 diff --git a/Master/texmf-dist/bibtex/bst/adrconv/email.bst b/Master/texmf-dist/bibtex/bst/adrconv/email.bst index 47cc1fe4ba6..f063a7c2ae7 100644 --- a/Master/texmf-dist/bibtex/bst/adrconv/email.bst +++ b/Master/texmf-dist/bibtex/bst/adrconv/email.bst @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `bst,email') -%% 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. @@ -27,8 +27,11 @@ %% %% 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 @@ -102,19 +105,23 @@ FUNCTION{address} } FUNCTION{presort} { - 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 } if$ duplicate$ 'sort.key$ := -- cgit v1.2.3