summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/adrconv/adrconv.dtx186
-rw-r--r--Master/texmf-dist/source/latex/adrconv/adrconv.ins14
2 files changed, 132 insertions, 68 deletions
diff --git a/Master/texmf-dist/source/latex/adrconv/adrconv.dtx b/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
index a8bb717d89e..7b84960da55 100644
--- a/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
+++ b/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{490}
+% \CheckSum{541}
% \iffalse
% ====================================================================
%% adrguide.dtx
-%% Copyright 2006 Axel Kielhorn
+%% Copyright 2006, 2010 Axel Kielhorn
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -37,23 +37,24 @@
%</dtx>
%<driver>\ProvidesFile{adrconv.drv}
%<guide>\ProvidesFile{adrguide.tex}
-%<*tex|cfg|dir>
-%<tex|cfg|dir>\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-%<tex|cfg|dir>\ProvidesFile{%
+%<*tex|cfg|dir|montage>
+%<tex|cfg|dir|montage>\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
+%<tex|cfg|dir|montage>\ProvidesFile{%
%<conv> adrconv%
%<fax> adrfax%
%<dir> adrdir%
-%<birthday> birthday%
-%<email> email%
+%<birthday> adrbirthday%
%<planer> adrplaner
%<small> adrsmall
+%<montage&erster> adrmontage1.tex
+%<montage&zweiter> adrmontage2.tex
%<tex> .tex%
%<dir&!cfg> .tex%
%<cfg> .cfg%
-%<tex|cfg|dir> }
-%</tex|cfg|dir>
+%<tex|cfg|dir|montage> }
+%</tex|cfg|dir|montage>
%<*dtx|driver|guide|tex|cfg|dir>
- [2006/04/19 v1.2c LaTeX2e
+ [2010/04/02 v1.3 LaTeX2e
%<*dtx>
adrconv docstrip file]
%</dtx>
@@ -99,7 +100,7 @@
%
% \GetFileInfo{adrconv.dtx}
% \title{\BibTeX{} address database to addressfile
-% converter\footnote{This file hat version number \fileversion, last
+% converter\footnote{This file has version number \fileversion, last
% revised \filedate}}
% \author{Axel Kielhorn\thanks{A.Kielhorn@web.de} \and Markus Kohm}
% \date{\filedate}
@@ -159,8 +160,7 @@
\string\citation{*}^^J%
%<conv> \string\bibstyle{adrconv}^^J%
%<fax> \string\bibstyle{adrfax}^^J%
-%<birthday> \string\bibstyle{birthday}^^J%
-%<email> \string\bibstyle{email}^^J%
+%<birthday> \string\bibstyle{adrbirthday}^^J%
\string\bibdata{\addressfile}%
}
\immediate\closeout\auxfile
@@ -186,7 +186,7 @@
%<*dir>
% \fi
% \begin{macrocode}
-\documentclass[headsepline,10pt,twoside]{scrartcl}
+\documentclass[headsepline,10pt,twoside,pagesize]{scrartcl}
% \end{macrocode}
% Define some new commands
% \begin{macrocode}
@@ -211,6 +211,7 @@
% \begin{macrocode}
\newif\ifGerman
\newif\ifRunningHead
+\newif\ifEmail
% \end{macrocode}
% \begin{macrocode}
\newdimen\leftfield
@@ -246,6 +247,19 @@
\ifx\yes\answer\def\germanpackage{german}\fi\fi\fi\fi
\usepackage{\germanpackage}
\fi
+% \end{macrocode}
+% \changes{v1.3}{2010/04/02}{Added support to print the e-mail Address in the addressbook.}
+% \begin{macrocode}
+\Ask\answer{^^JPrint email? [y/n]^^J%
+ E-Mail ausgeben? [j/n]}
+\ifx\jj\answer\Emailtrue\else
+\ifx\ja\answer\Emailtrue\else
+\ifx\y\answer\Emailtrue\else
+\ifx\yes\answer\Emailtrue\else
+ \Emailfalse\fi\fi\fi\fi
+\ifEmail
+\usepackage{url}
+\fi
\InputIfFileExists{dir.cfg}{%
\typeout{Load local configuration-file.}}{%
\typeout{No local configuration-file found.}}
@@ -315,11 +329,23 @@
% \end{macrocode}
% This command does all the formatting:
% \begin{macrocode}
+%\adrentry
+% 1 {Nachname}
+% 2 {Vorname}
+% 3 {Strasse \\ PLZ Ort}
+% 4 {Telefon\\Mobil}
+% 5 {E-Mail} \ifEmail
+% 6 {Organisation}
+% 7 {Notiz}
+% 8 {Key}
\def\adrentry#1#2#3#4#5#6#7#8{\hspace{\adrindent}%
\parbox[b]{\leftfield}
{\raggedright \hspace{-\adrindent}{\sc #1}%
\def\tempa{#1}\ifx \tempa\empty \else , #2\fi%
\def\tempa{#3}\ifx \tempa\empty \else \par #3\fi%
+ \ifEmail
+ \def\tempa{#5}\ifx \tempa\empty \else \par \url{#5}\fi%
+ \fi
\def\tempa{#7}\ifx \tempa\empty \else \par (#7)\fi%
}%
\hfill%
@@ -373,7 +399,7 @@
% Original was former part of \KOMAScript{}.
%
% \begin{macrocode}
-\setlength{\paperwidth}{210mm}
+\setlength{\paperwidth}{105mm}
\setlength{\textwidth}{85mm}
\setlength{\leftfield}{50mm}
\setlength{\rightfield}{30mm}
@@ -392,7 +418,7 @@
%<*planer>
% \end{macrocode}
% Configfile for organizers (95\,mm $\times$ 172\,mm) maybe from
-% ALDI\footnote{ALDI is a german so called ``Billigheimer''.}.
+% ALDI.
%
% \begin{macrocode}
\setlength{\paperwidth}{95mm}
@@ -411,11 +437,11 @@
% \begin{macrocode}
%<*small>
% \end{macrocode}
-% Configfile for pocket callenders (87\,mm $\times$ 148\,mm)
+% Configfile for pocket calenders (87\,mm $\times$ 148\,mm)
% e.g. ``Sparkassenkalender''.
%
% \begin{macrocode}
-\setlength{\paperwidth}{174mm}
+\setlength{\paperwidth}{87mm}
\setlength{\textwidth}{75mm}
\setlength{\leftfield}{45mm}
\setlength{\rightfield}{30mm}
@@ -444,6 +470,7 @@
\setlength{\textheight}{148mm}
%</planer>
%<*small>
+\setlength{\paperheight}{148mm}
\setlength{\textheight}{112mm}
%</small>
\setlength{\headheight}{1.25\baselineskip}
@@ -451,7 +478,7 @@
\setlength{\footskip}{1.50\baselineskip}
\setlength{\topmargin}{-1in}
%<dir>\addtolength{\topmargin}{8mm}
-%<planer>\addtolength{\topmargin}{7mm}
+%<planer|small>\addtolength{\topmargin}{7mm}
\setlength{\marginparwidth}{0in}
\setlength{\marginparsep}{0in}
\setlength{\marginparpush}{0in}
@@ -549,13 +576,17 @@
% names}
% \changes{v1.1.3}{1996/01/04}{Support for second (mobile)
% telephonenumber}
-% \changes{v1.2}{1999/11/01}{New release independend of KOMA-Script}
+% \changes{v1.2}{1999/11/01}{New release independent 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}
+% \changes{v1.3}{2010/04/02}{Removed \texttt{email.bst}, the email address is now
+% written to the standard \texttt{bbl} by \texttt{adrconv}.}
+% \changes{v1.3}{2010/04/02}{Renamed \texttt{birthday.bst}
+% to \texttt{adrbirthday.bst} to avoid a collision with \texttt{directory.cls}.}
%
-% The \File{birthday.bst} prints the entries with birthdays only. The
+% The \File{adrbirthday.bst} prints the entries with birthdays only. The
% entries are sorted by month and inside one month by date.
%
% \begin{macrocode}
@@ -620,10 +651,10 @@ FUNCTION {print.adrchr}
}
% \end{macrocode}
%\iffalse
-% $% <-- we do this to correct syntax hightlight.
+% $% <-- we do this to correct syntax highlight.
%\fi
% \begin{macrocode}
-%<*conv|birthday>
+%<*!fax>
FUNCTION{format.phone.and.mobile}
{ phone empty$
{
@@ -639,7 +670,7 @@ FUNCTION{format.phone.and.mobile}
}
if$
}
-%</conv|birthday>
+%</!fax>
% \end{macrocode}
% \begin{macrocode}
%<*fax>
@@ -675,29 +706,34 @@ FUNCTION{address}
get.names write$ newline$
"{"
street empty$
- { "" }
- { street " \\ " *}
+ { "" * }
+ { street " \\ " * *}
if$
- *
zip empty$
- { "" }
- { zip }
+ { "" * }
+ { zip " " * *}
if$
- " " * *
city empty$
- { "" }
- { city }
+ { "" * }
+ { city * }
if$
- "}{" * *
-%<conv|birthday> format.phone.and.mobile
+ "}{" *
+%<!fax> format.phone.and.mobile
%<fax> format.phone.and.fax
-%<*email>
+ "}" * *
email empty$
- { "" }
- { email }
+ { "{}" * }
+ { "{" email "}" * * * }
if$
-%</email>
- "}{}{}{}{" * *
+ organization empty$
+ { "{}" * }
+ { "{" organization "}" * * *}
+ if$
+ note empty$
+ { "{}" * }
+ { "{" note "}" * * * }
+ if$
+ "{" *
%<*birthday>
birthday empty$
{ "" }
@@ -707,8 +743,7 @@ FUNCTION{address}
%</birthday>
key empty$
{ "" }
-%<!birthday> { key }
-%<birthday> { "" }
+ { key }
if$
"}" * * write$ newline$
%<*birthday>
@@ -756,7 +791,7 @@ FUNCTION{presort}
'b.month :=
%</birthday>
% \end{macrocode}
-% At every but \File{birthday.bst} the adr.char is the first letter of
+% At every but \File{adrbirthday.bst} the adr.char is the first letter of
% the sort.key.
% \begin{macrocode}
}
@@ -783,10 +818,6 @@ FUNCTION {begin.bib}
alpha.index write$
newline$
%</birthday>
-%<*email>
- "\def\sbscrpt{\_} \catcode`\_=\active \let_=\sbscrpt"
- write$ newline$
-%</email>
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
@@ -827,6 +858,22 @@ EXECUTE {end.bib}
%<*example>
% \fi
% \begin{macrocode}
+
+@address{VornameNachname,
+ name = {Vorname Nachname},
+ street = {Strasse},
+ zip = {PLZ},
+ city = {Ort},
+ phone = {Telefon},
+ email = {E-mail@domain},
+ mobile = {Mobil},
+ birthday = {Geburtstag},
+ note = {Notiz},
+ organization = {Organisation},
+ key = {Key},
+ nbirthday = {0101},
+}
+
@address{mustermann,
name = {Hans Mustermann},
city = {Heimstatt},
@@ -835,7 +882,7 @@ EXECUTE {end.bib}
street = {Einbahnstra{\ss}e 1},
phone = {01234 / 5 67 89},
fax = {01234 / 5 67 89},
- email = {hm{@}work.com},
+ email = {hm@work.com},
note = {Alles nur Erfindung},
}
@address{AxelK,
@@ -845,7 +892,7 @@ EXECUTE {end.bib}
street = {Lange Stra{\ss}e 17},
phone = {04231 / 12 34 56},
fax = {04231 / 65 34 21},
- email = {a.kielhorn{@}web.de},
+ email = {a.kielhorn@web.de},
key = {Aki},
note = {Author of the modified addressen.bst},
birthday = {16.05.1967},
@@ -872,17 +919,17 @@ EXECUTE {end.bib}
nbirthday = 1113,
}
@address{OEKZ,
- name = {{{"O}kologisches Zentrum~e.\,V.}},
- sortas = {Okologisches Zentrum},
+ 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},
+ 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.}},
@@ -892,7 +939,7 @@ EXECUTE {end.bib}
city = {Heidelberg},
phone = {0 62 21 / 2 97 66},
fax = {0 62 21 / 16 79 06},
- email = {dante{@}dante.de},
+ email = {dante@dante.de},
url = {http://www.dante.de},
key = {DANTE},
birthday = {14. April 1989},
@@ -905,6 +952,27 @@ EXECUTE {end.bib}
%</example>
%</bib>
% \fi
+% \changes{v1.3}{2010/04/02}{Added support for PDF workflow.}
+%<*montage>
+% \begin{macrocode}
+\documentclass{article}
+\usepackage{geometry}
+\geometry{verbose,twoside,nofoot,pdftex,%
+%<erster>a5paper, top=0mm,bottom=0mm,inner=0mm}
+%<zweiter>a4paper,top=0mm,bottom=0mm,inner=0mm}
+\usepackage{pdfpages}
+\begin{document}
+\includepdf[pages={-},
+landscape,
+nup=1x2,
+%<erster>signature=16,
+%<zweiter>signature=4,
+%<erster>noautoscale,scale=1]{adrdir.pdf}
+%<zweiter>noautoscale,scale=1]{adrmontage1.pdf}
+\end{document}
+% \end{macrocode}
+%</montage>
+%
% \Finale
\endinput
%
diff --git a/Master/texmf-dist/source/latex/adrconv/adrconv.ins b/Master/texmf-dist/source/latex/adrconv/adrconv.ins
index e0caec50646..f33b5d1947f 100644
--- a/Master/texmf-dist/source/latex/adrconv/adrconv.ins
+++ b/Master/texmf-dist/source/latex/adrconv/adrconv.ins
@@ -1,5 +1,5 @@
%% adrguide.ins
-%% Copyright 2006 Axel Kielhorn
+%% Copyright 2006, 2010 Axel Kielhorn
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -51,7 +51,7 @@
}
\preamble
-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.
@@ -69,26 +69,22 @@ 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.
\endpreamble
\generate{%
\file{adrconv.tex}{\from{adrconv.dtx}{tex,conv}}
\file{adrfax.tex}{\from{adrconv.dtx}{tex,fax}}
\file{birthday.tex}{\from{adrconv.dtx}{tex,birthday}}
- \file{email.tex}{\from{adrconv.dtx}{tex,email}}
\file{adrdir.tex}{\from{adrconv.dtx}{dir}}% Don't set tex
\file{adrdir.cfg}{\from{adrconv.dtx}{cfg,dir}}
\file{adrplaner.cfg}{\from{adrconv.dtx}{cfg,planer}}
\file{adrsmall.cfg}{\from{adrconv.dtx}{cfg,small}}
+ \file{adrmontage1.tex}{\from{adrconv.dtx}{montage,erster}}
+ \file{adrmontage2.tex}{\from{adrconv.dtx}{montage,zweiter}}
\nopostamble
\file{adrfax.bst}{\from{adrconv.dtx}{bst,fax}}
\file{adrconv.bst}{\from{adrconv.dtx}{bst,conv}}
- \file{birthday.bst}{\from{adrconv.dtx}{bst,birthday}}
- \file{email.bst}{\from{adrconv.dtx}{bst,email}}
+ \file{adrbirthday.bst}{\from{adrconv.dtx}{bst,birthday}}
\file{example.bib}{\from{adrconv.dtx}{bib,example}}
}