diff options
Diffstat (limited to 'Master')
19 files changed, 366 insertions, 216 deletions
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$ := diff --git a/Master/texmf-dist/tex/latex/adrconv/adrconv.tex b/Master/texmf-dist/doc/latex/adrconv/adrconv.tex index b0e6e457c1a..7104f52c2f2 100644 --- a/Master/texmf-dist/tex/latex/adrconv/adrconv.tex +++ b/Master/texmf-dist/doc/latex/adrconv/adrconv.tex @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `tex,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,12 +27,14 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{% adrconv% .tex% } - [2002/06/23 v1.2b LaTeX2e + [2006/04/19 v1.2c LaTeX2e Interactive driver of BibTeX database to addressfile converter] \catcode`\@=11 \newlinechar`\^^J diff --git a/Master/texmf-dist/tex/latex/adrconv/adrdir.tex b/Master/texmf-dist/doc/latex/adrconv/adrdir.tex index 57981c477be..43d1d9541cc 100644 --- a/Master/texmf-dist/tex/latex/adrconv/adrdir.tex +++ b/Master/texmf-dist/doc/latex/adrconv/adrdir.tex @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `dir') -%% 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,12 +27,14 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{% adrdir% .tex% } - [2002/06/23 v1.2b LaTeX2e + [2006/04/19 v1.2c LaTeX2e Interactive address directory generation] \documentclass[headsepline,10pt,twoside]{scrartcl} \newcommand*\jj {j} diff --git a/Master/texmf-dist/tex/latex/adrconv/adrfax.tex b/Master/texmf-dist/doc/latex/adrconv/adrfax.tex index 150f4409f60..3a244e4a038 100644 --- a/Master/texmf-dist/tex/latex/adrconv/adrfax.tex +++ b/Master/texmf-dist/doc/latex/adrconv/adrfax.tex @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `tex,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,12 +27,14 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{% adrfax% .tex% } - [2002/06/23 v1.2b LaTeX2e + [2006/04/19 v1.2c LaTeX2e Interactive driver of BibTeX database to addressfile converter] \catcode`\@=11 \newlinechar`\^^J diff --git a/Master/texmf-dist/doc/latex/adrconv/adrguide.pdf b/Master/texmf-dist/doc/latex/adrconv/adrguide.pdf Binary files differindex 3908effee49..0be90f262db 100644 --- a/Master/texmf-dist/doc/latex/adrconv/adrguide.pdf +++ b/Master/texmf-dist/doc/latex/adrconv/adrguide.pdf diff --git a/Master/texmf-dist/doc/latex/adrconv/adrguide.tex b/Master/texmf-dist/doc/latex/adrconv/adrguide.tex index 547e6dca80f..ef5cd5ab908 100644 --- a/Master/texmf-dist/doc/latex/adrconv/adrguide.tex +++ b/Master/texmf-dist/doc/latex/adrconv/adrguide.tex @@ -1,4 +1,35 @@ +%% adrguide.tex +%% Copyright 2006 Axel Kielhorn +% +% 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 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. +% +% Use +% tex adrconv.ins +% or +% latex adrconv.ins +% to generate the other files, which are indirect parts of the +% bundle. Use +% latex adrconv.dtx +% to generate the implementation documentation. Use +% latex adrguide.tex +% to generate the user documentation. + \documentclass{article} +\usepackage[T1]{fontenc} +\usepackage{ae} \usepackage{german} \newcommand*{\File}[1]{\texttt{#1}} @@ -8,9 +39,9 @@ \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}} -\title{ADRconv Anleitung\\Version 1.2b} -\author{Axel Kielhorn} -\date{31. Mai 2003} +\title{ADRconv Anleitung\\Version 1.2c} +\author{Axel Kielhorn\thanks{A.Kielhorn@web.de}} +\date{19. April 2006} \begin{document} \maketitle @@ -78,6 +109,19 @@ in einer \File{bib}-Datei: birthday = {13. August anno muri}, nbirthday = {0813} } + @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}, + } \end{verbatim} \end{small} @@ -89,6 +133,11 @@ ausf"uhrliche Form zeigt die Version~1.2. \begin{description} \item[name] Der Name im normalen Bib\TeX\ Format: Vorname von Nachname + + \item[sortas] Wenn der Name mit einem Umlaut beginnt, wird er falsch + einsortiert, bei der Verwendung von UTF-8 kodierten Datenbanken kommt + es sogar zu einem Bib\TeX\ Fehler. \texttt{sortas} hat Vorrang vor + \texttt{name}. (Neu in Version 1.2c.) \item[title] Akademischer Titel oder "ahnliches (Wird z.\,Zt. nicht unterst\"{u}tzt) @@ -113,7 +162,7 @@ ausf"uhrliche Form zeigt die Version~1.2. Erstellen eines Telefaxbuches verwendet. \item[email] E-mail Adresse, wird von \File{email.bst} zum - erstellen eines E-mail Verzeichnisses benutzt. + Erstellen eines E-mail Verzeichnisses benutzt. \item[url] Ein Link auf die Homepage. Hier w"are jetzt ein Konverter nach HTML gefragt. @@ -258,6 +307,7 @@ der so aussehen k"onnte: \begin{verbatim} @address{DANTE, name = {{DANTE~e.\,V.}}, + sortas = {Dante}, street = {Postfach 10 18 40}, zip = {69008}, city = {Heidelberg}, @@ -337,7 +387,7 @@ Die konvertierte Adressdatei hat folgenden Inhalt: {Langer Weg 17 \\ 38118 Braunschweig}{0531 / 113 34 89}{}{}{}{} \adrentry{Kohlmeise}{Rudolf} - {Stra{\ss}e des 11.~September 17 \\ + {Stra{\ss}e des 11.~September 73 \\ 12345 Neu Jorg}{0513 / 89 55 66}{}{}{}{} \adrentry{Kuchennascher}{Mattse} {Fichtenstra{\ss}e 1 \\ @@ -348,24 +398,16 @@ Die konvertierte Adressdatei hat folgenden Inhalt: {Einbahnstra{\ss}e 1 \\ 01234 Heimstatt}{01234 / 5 67 89}{}{}{}{} - \adrchar{{} + \adrchar{D} \adrentry{{DANTE~e.\,V.}}{} {Postfach 10 18 40 \\ 69008 Heidelberg}{0 62 21 / 2 97 66}{}{}{}{DANTE} \end{verbatim} \end{small} -Der fehlende Vorname f"uhrt hier zu einem Fehler im -\Macro{adrchar}-Eintrag. Nachdem Sie ihn in: - -\begin{small} -\begin{verbatim} - \adrchar{D} -\end{verbatim} -\end{small} +In Version 1.2~c musste man den \Macro{adrchar}-Eintrag noch von Hand korrigieren, durch den \texttt{sortas}-Eintrag erfolgt das nun automatisch. -verbessert und zusammen mit dem Adress-Eintrag an die richtige Stelle -verschoben haben, k"onnen Sie einen Brief an DANTE~e.\,V. dann +Einen Brief an DANTE~e.\,V. k"onnen Sie mit Hilfe der \KOMAScript{} Briefklasse so beginnen: \begin{small} @@ -384,11 +426,10 @@ Adressdatenbank vorgenommen haben. Bitte beachten Sie dabei, dass die drei Programme zum Erzeugen der \File{aux}-Datei (\File{adrconv.tex}, \File{birthday.tex} und -\File{email.tex}) sowohl mit (Plain)\TeX{} als auch mit \LaTeX{} -aufgerufen werden k"onnen, w"ahrend die beiden Programme -\File{dir.tex} und \File{phone.tex}, die Sie nach erfolgreicher -Konvertierung auf Ihre Adressdatei anwenden k"onnen, um daraus fertige -Adress-, E-Mail- bzw. +\File{email.tex}) sowohl mit (Plain)\TeX{} als auch mit \LaTeX{} aufgerufen +werden k"onnen, w"ahrend die beiden Programme \File{dir.tex} und +\File{phone.tex}, die Sie nach erfolgreicher Konvertierung auf Ihre +Adressdatei anwenden k"onnen, um daraus fertige Adress-, E-Mail- bzw. Telefonverzeichnisse zu produzieren, nur mit \LaTeX{} funktionieren. diff --git a/Master/texmf-dist/tex/latex/adrconv/birthday.tex b/Master/texmf-dist/doc/latex/adrconv/birthday.tex index fe11ac9a512..c98438a4a80 100644 --- a/Master/texmf-dist/tex/latex/adrconv/birthday.tex +++ b/Master/texmf-dist/doc/latex/adrconv/birthday.tex @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `tex,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,12 +27,14 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{% birthday% .tex% } - [2002/06/23 v1.2b LaTeX2e + [2006/04/19 v1.2c LaTeX2e Interactive driver of BibTeX database to addressfile converter] \catcode`\@=11 \newlinechar`\^^J diff --git a/Master/texmf-dist/tex/latex/adrconv/email.tex b/Master/texmf-dist/doc/latex/adrconv/email.tex index 030801f3190..528ef61974b 100644 --- a/Master/texmf-dist/tex/latex/adrconv/email.tex +++ b/Master/texmf-dist/doc/latex/adrconv/email.tex @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `tex,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,12 +27,14 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{% email% .tex% } - [2002/06/23 v1.2b LaTeX2e + [2006/04/19 v1.2c LaTeX2e Interactive driver of BibTeX database to addressfile converter] \catcode`\@=11 \newlinechar`\^^J diff --git a/Master/texmf-dist/source/latex/adrconv/XtraStuf.mac/adrconv.xml b/Master/texmf-dist/source/latex/adrconv/XtraStuf.mac/adrconv.xml Binary files differdeleted 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 Binary files differdeleted 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. diff --git a/Master/texmf-dist/tex/latex/adrconv/adrdir.cfg b/Master/texmf-dist/tex/latex/adrconv/adrdir.cfg index 2610542141c..d4ee397ad06 100644 --- a/Master/texmf-dist/tex/latex/adrconv/adrdir.cfg +++ b/Master/texmf-dist/tex/latex/adrconv/adrdir.cfg @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `cfg,dir') -%% 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,12 +27,14 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{% adrdir% .cfg% } - [2002/06/23 v1.2b LaTeX2e + [2006/04/19 v1.2c LaTeX2e adrconv configuration file] \setlength{\paperwidth}{210mm} \setlength{\textwidth}{85mm} diff --git a/Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg b/Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg index e0f25827855..5c37f8809c0 100644 --- a/Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg +++ b/Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `cfg,planer') -%% 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,12 +27,14 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{% adrplaner .cfg% } - [2002/06/23 v1.2b LaTeX2e + [2006/04/19 v1.2c LaTeX2e adrconv configuration file] \setlength{\paperwidth}{95mm} \setlength{\textwidth}{70mm} diff --git a/Master/texmf-dist/tex/latex/adrconv/adrsmall.cfg b/Master/texmf-dist/tex/latex/adrconv/adrsmall.cfg index b8ae8f61a75..1450065251b 100644 --- a/Master/texmf-dist/tex/latex/adrconv/adrsmall.cfg +++ b/Master/texmf-dist/tex/latex/adrconv/adrsmall.cfg @@ -5,20 +5,20 @@ %% The original source files were: %% %% adrconv.dtx (with options: `cfg,small') -%% 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,12 +27,14 @@ %% %% You are NOT ALLOWED to distribute this file without adrconv.dtx, %% adrconv.ins or adrguide.tex. +%% adrguide.dtx +%% Copyright 2006 Axel Kielhorn \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{% adrsmall .cfg% } - [2002/06/23 v1.2b LaTeX2e + [2006/04/19 v1.2c LaTeX2e adrconv configuration file] \setlength{\paperwidth}{174mm} \setlength{\textwidth}{75mm} |