From 217fb8a95dd3f919789e9ce3787a24279e710a4b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 4 Apr 2010 22:52:57 +0000 Subject: adrconv update (4apr10) git-svn-id: svn://tug.org/texlive/trunk@17683 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bib/adrconv/example.bib | 103 ------------- .../texmf-dist/bibtex/bst/adrconv/adrbirthday.bst | 168 +++++++++++++++++++++ Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst | 39 +++-- Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst | 39 +++-- Master/texmf-dist/bibtex/bst/adrconv/birthday.bst | 161 -------------------- Master/texmf-dist/bibtex/bst/adrconv/email.bst | 148 ------------------ 6 files changed, 214 insertions(+), 444 deletions(-) delete mode 100644 Master/texmf-dist/bibtex/bib/adrconv/example.bib create mode 100644 Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst delete mode 100644 Master/texmf-dist/bibtex/bst/adrconv/birthday.bst delete mode 100644 Master/texmf-dist/bibtex/bst/adrconv/email.bst (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 deleted file mode 100644 index e1728430423..00000000000 --- a/Master/texmf-dist/bibtex/bib/adrconv/example.bib +++ /dev/null @@ -1,103 +0,0 @@ -%% -%% This is file `example.bib', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% adrconv.dtx (with options: `bib,example') -%% 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 -@address{mustermann, - name = {Hans Mustermann}, - city = {Heimstatt}, - zip = 01234, - country = {D -}, - street = {Einbahnstra{\ss}e 1}, - phone = {01234 / 5 67 89}, - fax = {01234 / 5 67 89}, - email = {hm{@}work.com}, - note = {Alles nur Erfindung}, -} -@address{AxelK, - name = {Axel Kielhorn}, - city = {Verden}, - zip = 27283, - street = {Lange Stra{\ss}e 17}, - phone = {04231 / 12 34 56}, - fax = {04231 / 65 34 21}, - email = {a.kielhorn{@}web.de}, - key = {Aki}, - note = {Author of the modified addressen.bst}, - birthday = {16.05.1967}, - nbirthday = 0516, -} -@address{RalfK, - name = {Ralf Kielhorn}, - city = {Braunschweig}, - zip = 38116, - street = {Gro{\ss}e Stra{\ss}e 17}, - phone = {0531 / 12 34 56}, - key = {Rki}, - birthday = {05.08.1969}, - nbirthday = 0805, -} -@address{SabineK, - name = {Sabine Kielhorn}, - city = {Oldenburg}, - zip = 26133, - street = {Fraunhoferstra{\ss}e 21}, - phone = {0441 / 12 34 56}, - key = {Ski}, - 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/adrbirthday.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst new file mode 100644 index 00000000000..265a51cacdc --- /dev/null +++ b/Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst @@ -0,0 +1,168 @@ +%% +%% This is file `adrbirthday.bst', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% adrconv.dtx (with options: `bst,birthday') +%% Copyright 2006, 2010 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. +%% +%% adrguide.dtx +%% Copyright 2006, 2010 Axel Kielhorn +ENTRY + { name + sortas + title + organization + city + zip + country + street + phone + mobile + fax + url + email + note + key + birthday + nbirthday + } + {} + { b.month } +STRINGS { cur.month num.index alpha.index } +FUNCTION {get.names} +{ name empty$ + { organization empty$ + { "{}{}" } + { organization "{}" * } + if$ + } + { "{" name #1 "{ll}" format.name$ "}" * * + "{" name #1 "{ff}{ vv}" format.name$ "}" * * * + } + if$ +} +FUNCTION {print.adrchr} +{ b.month cur.month = + 'skip$ + { newline$ "\adrchar{\convdate{" b.month "}}" * * write$ newline$ + b.month 'cur.month := + } + if$ +} +FUNCTION{format.phone.and.mobile} +{ phone empty$ + { + mobile empty$ + { "" } + { mobile } + if$ + }{ + mobile empty$ + { phone } + { phone "\\" mobile * * } + if$ + } + if$ +} +FUNCTION{address} +{ + nbirthday empty$ + 'skip$ + { + print.adrchr + "\adrentry" write$ + get.names write$ newline$ + "{" + street empty$ + { "" * } + { street " \\ " * *} + if$ + zip empty$ + { "" * } + { zip " " * *} + if$ + city empty$ + { "" * } + { city * } + if$ + "}{" * + format.phone.and.mobile + "}" * * + email empty$ + { "{}" * } + { "{" email "}" * * * } + if$ + organization empty$ + { "{}" * } + { "{" organization "}" * * *} + if$ + note empty$ + { "{}" * } + { "{" note "}" * * * } + if$ + "{" * + birthday empty$ + { "" } + { birthday } + if$ + "}{" * * + key empty$ + { "" } + { key } + if$ + "}" * * write$ newline$ + } + if$ +} +FUNCTION{presort} +{ nbirthday empty$ + { "" } + { nbirthday } + if$ + duplicate$ + 'sort.key$ := + #1 #2 substring$ + 'b.month := +} +READ +ITERATE {presort} +SORT +FUNCTION {begin.bib} +{ + "\def\convdate#1{\ifcase#1 \or 1 \or 2 \or 3 \or 4 \or 5 " + "\or 6 \or 7 \or 8 \or 9 \or 10 \or 11 \or 12 \fi}" * 'num.index := + "\def\convdate#1{\ifcase#1 \or Januar \or Februar \or " + " M{^^b a}rz \or April \or Mai \or Juni \or Juli " + "\or August \or September \or Oktober \or November \or Dezember \fi}" + * * 'alpha.index := + alpha.index write$ + newline$ + preamble$ empty$ + 'skip$ + { preamble$ write$ newline$ } + if$ + "00" 'cur.month := +} +EXECUTE {begin.bib} +ITERATE {call.type$} +FUNCTION {end.bib} +{ newline$ } +EXECUTE {end.bib} 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/birthday.bst b/Master/texmf-dist/bibtex/bst/adrconv/birthday.bst deleted file mode 100644 index 4bdd557b1cb..00000000000 --- a/Master/texmf-dist/bibtex/bst/adrconv/birthday.bst +++ /dev/null @@ -1,161 +0,0 @@ -%% -%% This is file `birthday.bst', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% adrconv.dtx (with options: `bst,birthday') -%% 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 - } - {} - { b.month } -STRINGS { cur.month num.index alpha.index } -FUNCTION {get.names} -{ name empty$ - { organization empty$ - { "{}{}" } - { organization "{}" * } - if$ - } - { "{" name #1 "{ll}" format.name$ "}" * * - "{" name #1 "{ff}{ vv}" format.name$ "}" * * * - } - if$ -} -FUNCTION {print.adrchr} -{ b.month cur.month = - 'skip$ - { newline$ "\adrchar{\convdate{" b.month "}}" * * write$ newline$ - b.month 'cur.month := - } - if$ -} -FUNCTION{format.phone.and.mobile} -{ phone empty$ - { - mobile empty$ - { "" } - { mobile } - if$ - }{ - mobile empty$ - { phone } - { phone "\\" mobile * * } - if$ - } - if$ -} -FUNCTION{address} -{ - nbirthday empty$ - 'skip$ - { - print.adrchr - "\adrentry" write$ - get.names write$ newline$ - "{" - street empty$ - { "" } - { street " \\ " *} - if$ - * - zip empty$ - { "" } - { zip } - if$ - " " * * - city empty$ - { "" } - { city } - if$ - "}{" * * - format.phone.and.mobile - "}{}{}{}{" * * - birthday empty$ - { "" } - { birthday } - if$ - "}{" * * - key empty$ - { "" } - { "" } - if$ - "}" * * write$ newline$ - } - if$ -} -FUNCTION{presort} -{ nbirthday empty$ - { "" } - { nbirthday } - if$ - duplicate$ - 'sort.key$ := - #1 #2 substring$ - 'b.month := -} -READ -ITERATE {presort} -SORT -FUNCTION {begin.bib} -{ - "\def\convdate#1{\ifcase#1 \or 1 \or 2 \or 3 \or 4 \or 5 " - "\or 6 \or 7 \or 8 \or 9 \or 10 \or 11 \or 12 \fi}" * 'num.index := - "\def\convdate#1{\ifcase#1 \or Januar \or Februar \or " - " M{^^b a}rz \or April \or Mai \or Juni \or Juli " - "\or August \or September \or Oktober \or November \or Dezember \fi}" - * * 'alpha.index := - alpha.index write$ - newline$ - preamble$ empty$ - 'skip$ - { preamble$ write$ newline$ } - if$ - "00" 'cur.month := -} -EXECUTE {begin.bib} -ITERATE {call.type$} -FUNCTION {end.bib} -{ newline$ } -EXECUTE {end.bib} 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} -- cgit v1.2.3