summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst4
-rw-r--r--Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst4
-rw-r--r--Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst4
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/README50
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrconv.pdfbin0 -> 264469 bytes
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrconv.tex6
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrdir.tex35
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrfax.tex6
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrguide.pdfbin396721 -> 380436 bytes
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrguide.tex8
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrmontage1.tex4
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrmontage2.tex4
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/birthday.tex6
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/example.bib4
-rw-r--r--Master/texmf-dist/source/latex/adrconv/adrconv.dtx46
-rw-r--r--Master/texmf-dist/source/latex/adrconv/adrconv.ins4
-rw-r--r--Master/texmf-dist/tex/latex/adrconv/adrdir.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/adrconv/adrsmall.cfg6
19 files changed, 128 insertions, 75 deletions
diff --git a/Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst
index 265a51cacdc..4c0457ac17f 100644
--- a/Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst
+++ b/Master/texmf-dist/bibtex/bst/adrconv/adrbirthday.bst
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `bst,birthday')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,7 +24,7 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
ENTRY
{ name
sortas
diff --git a/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrconv.bst
index d6927724980..2fbf3890af2 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, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,7 +24,7 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
ENTRY
{ name
sortas
diff --git a/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst b/Master/texmf-dist/bibtex/bst/adrconv/adrfax.bst
index 582edb751cc..d2fa2a310ce 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, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,7 +24,7 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
ENTRY
{ name
sortas
diff --git a/Master/texmf-dist/doc/latex/adrconv/README b/Master/texmf-dist/doc/latex/adrconv/README
new file mode 100644
index 00000000000..99ba9662a85
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adrconv/README
@@ -0,0 +1,50 @@
+adrconv is a collection of bibtex programs to convert an adress database
+into a tex file that is suitable for the mail merge function of scrletter.
+
+adrconv uses a simple entry format:
+
+ @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}
+ }
+
+I addition to that it offers some tex files to generate an adress book.
+(For those of us who don´t use smart phones.)
+
+Note: The Manual is only available in german.
+
+---
+
+adrconv ist eine Sammlung von bibtex Programmen, mit denen man Einträge aus einer
+Datenbank als tex Datei formatieren kann. Diese Datei kann dann für die
+Serienbrieffunktion von scrlettter aus dem KOMA.Script Paket benutzt werden.
+
+adrconv benutzt ein einfaches Datenformat:
+
+ @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 = {info{@}dante.de},
+ url = {http://www.dante.de},
+ key = {DANTE},
+ birthday = {14. April 1989},
+ nbirthday = {0414}
+ }
+
+Außerdem lassen sich Addressbücher in unterschiedlichen Formaten (A6,
+Taschenkalender) erstellen.
diff --git a/Master/texmf-dist/doc/latex/adrconv/adrconv.pdf b/Master/texmf-dist/doc/latex/adrconv/adrconv.pdf
new file mode 100644
index 00000000000..15d7a0123c2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adrconv/adrconv.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/adrconv/adrconv.tex b/Master/texmf-dist/doc/latex/adrconv/adrconv.tex
index 2318699e5fb..dd766441206 100644
--- a/Master/texmf-dist/doc/latex/adrconv/adrconv.tex
+++ b/Master/texmf-dist/doc/latex/adrconv/adrconv.tex
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `tex,conv')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,13 +24,13 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrconv%
.tex%
}
- [2010/04/02 v1.3 LaTeX2e
+ [2018/01/30 v1.4 LaTeX2e
Interactive driver of BibTeX database to addressfile converter]
\catcode`\@=11
\newlinechar`\^^J
diff --git a/Master/texmf-dist/doc/latex/adrconv/adrdir.tex b/Master/texmf-dist/doc/latex/adrconv/adrdir.tex
index 0d63f7039cf..0d9f9d20ef9 100644
--- a/Master/texmf-dist/doc/latex/adrconv/adrdir.tex
+++ b/Master/texmf-dist/doc/latex/adrconv/adrdir.tex
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `dir')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,13 +24,13 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrdir%
.tex%
}
- [2010/04/02 v1.3 LaTeX2e
+ [2018/01/30 v1.4 LaTeX2e
Interactive address directory generation]
\documentclass[headsepline,10pt,twoside,pagesize]{scrartcl}
\newcommand*\jj {j}
@@ -111,21 +111,14 @@
\ifx\yes\answer\RunningHeadtrue\else
\RunningHeadfalse\fi\fi\fi\fi
\ifRunningHead
-\usepackage{scrpage}
-\renewpagestyle{headings}{%
- (0pt,0pt)%
- {\strut\rightmark\ -- \leftmark\hfil}%
- {\hfil\strut\rightmark\ -- \leftmark}%
- {\hfil\strut\rightmark\ -- \leftmark\hfil}%
- (\textwidth,.4pt)%
- }{%
- (0pt,0pt)%
- {\pagemark\hfill}%
- {\hfill\pagemark}%
- {\hfill\pagemark\hfill}%
- (0pt,0pt)}
+\usepackage[manualmark,headsepline]{scrlayer-scrpage}
+\clearpairofpagestyles
+\ohead{\if@twoside\rightmark\ -- \leftmark\fi}
+\chead{\if@twoside\else\rightmark\ -- \leftmark\fi}
+\ofoot{\if@twoside\pagemark\fi}
+\cfoot{\if@twoside\else\pagemark\fi}
\fi
-\def\headfont{\sffamily\bfseries}
+\setkomafont{pagehead}{\sffamily\bfseries}
\ifx\adrformat\empty
\def\adrformat{adrdir}
\fi
@@ -143,7 +136,7 @@
\fi
\def\adrentry#1#2#3#4#5#6#7#8{\hspace{\adrindent}%
\parbox[b]{\leftfield}
- {\raggedright \hspace{-\adrindent}{\sc #1}%
+ {\raggedright \hspace{-\adrindent}{\normalfont\scshape #1}%
\def\tempa{#1}\ifx \tempa\empty \else , #2\fi%
\def\tempa{#3}\ifx \tempa\empty \else \par #3\fi%
\ifEmail
@@ -161,12 +154,16 @@
\markboth{#1}{#1}
\fi
}
+\def\addrentry#1#2#3#4#5#6#7#8#9{%
+ \adrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#9}%
+}
+\def\addrchar{\adrchar}
\ifx\adrfile\empty \else
\InputIfFileExists{\adrfile.adr}{%
\pagestyle{empty}
\null\vfil
\begin{center}
- {\Large \sfb \adrtitle\par}
+ {\Large \normalfont\sffamily\bfseries \adrtitle\par}
\end{center}
\vfil\vfil\null
\cleardoublepage
diff --git a/Master/texmf-dist/doc/latex/adrconv/adrfax.tex b/Master/texmf-dist/doc/latex/adrconv/adrfax.tex
index 6d316393da0..ed087bc3adf 100644
--- a/Master/texmf-dist/doc/latex/adrconv/adrfax.tex
+++ b/Master/texmf-dist/doc/latex/adrconv/adrfax.tex
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `tex,fax')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,13 +24,13 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrfax%
.tex%
}
- [2010/04/02 v1.3 LaTeX2e
+ [2018/01/30 v1.4 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
index c2e29e57b41..af8f064bd12 100644
--- a/Master/texmf-dist/doc/latex/adrconv/adrguide.pdf
+++ b/Master/texmf-dist/doc/latex/adrconv/adrguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/adrconv/adrguide.tex b/Master/texmf-dist/doc/latex/adrconv/adrguide.tex
index 28ada4c73a7..358fa745f85 100644
--- a/Master/texmf-dist/doc/latex/adrconv/adrguide.tex
+++ b/Master/texmf-dist/doc/latex/adrconv/adrguide.tex
@@ -1,5 +1,5 @@
%% adrguide.tex
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,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.3}
+\title{ADRconv Anleitung\\Version 1.4}
\author{Axel Kielhorn\thanks{A.Kielhorn@web.de}}
-\date{2. April 2010}
+\date{3. M"arz 2018}
\begin{document}
\maketitle
@@ -568,6 +568,8 @@ Dokumentation verbessert, Lizenz auf LPPL 1.3 ge"andert.
\File{birthday.bst} in \File{adrbirthday.bst} umbenannt um Kollisionen mit \File{directory.cls} zu vermeiden.
\File{adrdir.tex} druckt optional die E-Mail Adresse und immer die Notiz.
Unterst"utzung f"ur PDF-Workflow. DVIDVI wird nicht mehr ben"otigt.
+\subsection{1.4}
+Anpassungen an das neue (inzwischen 10 Jahre alte) \KOMAScript\ durch Markus Kohm.
\section{Danksagungen}
diff --git a/Master/texmf-dist/doc/latex/adrconv/adrmontage1.tex b/Master/texmf-dist/doc/latex/adrconv/adrmontage1.tex
index 2871537ed6e..aeac2bda23a 100644
--- a/Master/texmf-dist/doc/latex/adrconv/adrmontage1.tex
+++ b/Master/texmf-dist/doc/latex/adrconv/adrmontage1.tex
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `montage,erster')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,7 +24,7 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrmontage1.tex
diff --git a/Master/texmf-dist/doc/latex/adrconv/adrmontage2.tex b/Master/texmf-dist/doc/latex/adrconv/adrmontage2.tex
index 4bda8623261..859404f9b3c 100644
--- a/Master/texmf-dist/doc/latex/adrconv/adrmontage2.tex
+++ b/Master/texmf-dist/doc/latex/adrconv/adrmontage2.tex
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `montage,zweiter')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,7 +24,7 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrmontage2.tex
diff --git a/Master/texmf-dist/doc/latex/adrconv/birthday.tex b/Master/texmf-dist/doc/latex/adrconv/birthday.tex
index a00dee2fccf..b86d7f9d4f9 100644
--- a/Master/texmf-dist/doc/latex/adrconv/birthday.tex
+++ b/Master/texmf-dist/doc/latex/adrconv/birthday.tex
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `tex,birthday')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,13 +24,13 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrbirthday%
.tex%
}
- [2010/04/02 v1.3 LaTeX2e
+ [2018/01/30 v1.4 LaTeX2e
Interactive driver of BibTeX database to addressfile converter]
\catcode`\@=11
\newlinechar`\^^J
diff --git a/Master/texmf-dist/doc/latex/adrconv/example.bib b/Master/texmf-dist/doc/latex/adrconv/example.bib
index 5ab1887475a..dd126267c63 100644
--- a/Master/texmf-dist/doc/latex/adrconv/example.bib
+++ b/Master/texmf-dist/doc/latex/adrconv/example.bib
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `bib,example')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,7 +24,7 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
@address{VornameNachname,
name = {Vorname Nachname},
diff --git a/Master/texmf-dist/source/latex/adrconv/adrconv.dtx b/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
index 7b84960da55..c42d578a9cd 100644
--- a/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
+++ b/Master/texmf-dist/source/latex/adrconv/adrconv.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{541}
+% \CheckSum{547}
% \iffalse
% ====================================================================
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -54,7 +54,7 @@
%<tex|cfg|dir|montage> }
%</tex|cfg|dir|montage>
%<*dtx|driver|guide|tex|cfg|dir>
- [2010/04/02 v1.3 LaTeX2e
+ [2018/01/30 v1.4 LaTeX2e
%<*dtx>
adrconv docstrip file]
%</dtx>
@@ -281,26 +281,21 @@
\ifx\yes\answer\RunningHeadtrue\else
\RunningHeadfalse\fi\fi\fi\fi
% \end{macrocode}
+% \changes{v1.4}{2018/01/30}{usage of \Package{scrlayer-scrpage}}
% Since the file uses \Class{scrartcl} it assumes that
-% \Package{scrpage} is available. We use \Package{scrpage} and not
-% \Package{scrpage2}, because of maybe old \KOMAScript.
+% \Package{scrlayer-scrpage} is available. We do not use \Package{scrpage} any
+% longer, because it is not longer part of the \KOMAScript{} bundle for more
+% than 10 years.
% \begin{macrocode}
\ifRunningHead
-\usepackage{scrpage}
-\renewpagestyle{headings}{%
- (0pt,0pt)%
- {\strut\rightmark\ -- \leftmark\hfil}%
- {\hfil\strut\rightmark\ -- \leftmark}%
- {\hfil\strut\rightmark\ -- \leftmark\hfil}%
- (\textwidth,.4pt)%
- }{%
- (0pt,0pt)%
- {\pagemark\hfill}%
- {\hfill\pagemark}%
- {\hfill\pagemark\hfill}%
- (0pt,0pt)}
+\usepackage[manualmark,headsepline]{scrlayer-scrpage}
+\clearpairofpagestyles
+\ohead{\if@twoside\rightmark\ -- \leftmark\fi}
+\chead{\if@twoside\else\rightmark\ -- \leftmark\fi}
+\ofoot{\if@twoside\pagemark\fi}
+\cfoot{\if@twoside\else\pagemark\fi}
\fi
-\def\headfont{\sffamily\bfseries}
+\setkomafont{pagehead}{\sffamily\bfseries}
% \end{macrocode}
% Loading the Layout definition.
% If no filename is specified, adrdir will be used.
@@ -327,6 +322,11 @@
\def\adrchar#1{\clearpage\typeout{#1}\markboth{#1}{#1}}
\fi
% \end{macrocode}
+% \changes{v1.4}{2018/01/30}{replaced old font command \cs{sc} by NFSS2 font
+% command}
+% \changes{v1.4}{2018/01/30}{replaced old font command \cs{sfb} by NFSS2 font
+% command}
+% \changes{v1.4}{2018/01/30}{support for \cs{addrchar} and \cs{addrentry}}
% This command does all the formatting:
% \begin{macrocode}
%\adrentry
@@ -340,7 +340,7 @@
% 8 {Key}
\def\adrentry#1#2#3#4#5#6#7#8{\hspace{\adrindent}%
\parbox[b]{\leftfield}
- {\raggedright \hspace{-\adrindent}{\sc #1}%
+ {\raggedright \hspace{-\adrindent}{\normalfont\scshape #1}%
\def\tempa{#1}\ifx \tempa\empty \else , #2\fi%
\def\tempa{#3}\ifx \tempa\empty \else \par #3\fi%
\ifEmail
@@ -358,12 +358,16 @@
\markboth{#1}{#1}
\fi
}
+\def\addrentry#1#2#3#4#5#6#7#8#9{%
+ \adrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#9}%
+}
+\def\addrchar{\adrchar}
\ifx\adrfile\empty \else
\InputIfFileExists{\adrfile.adr}{%
\pagestyle{empty}
\null\vfil
\begin{center}
- {\Large \sfb \adrtitle\par}
+ {\Large \normalfont\sffamily\bfseries \adrtitle\par}
\end{center}
\vfil\vfil\null
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/adrconv/adrconv.ins b/Master/texmf-dist/source/latex/adrconv/adrconv.ins
index f33b5d1947f..6b6ad1860dc 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, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 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, 2010 Axel Kielhorn
+Copyright 2006, 2010, 2018 Axel Kielhorn
This file will generate fast loadable files from adrconv.dtx when
run through LaTeX or TeX.
diff --git a/Master/texmf-dist/tex/latex/adrconv/adrdir.cfg b/Master/texmf-dist/tex/latex/adrconv/adrdir.cfg
index 7675276ad6b..c8f3b6b6f7a 100644
--- a/Master/texmf-dist/tex/latex/adrconv/adrdir.cfg
+++ b/Master/texmf-dist/tex/latex/adrconv/adrdir.cfg
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `cfg,dir')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,13 +24,13 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrdir%
.cfg%
}
- [2010/04/02 v1.3 LaTeX2e
+ [2018/01/30 v1.4 LaTeX2e
adrconv configuration file]
\setlength{\paperwidth}{105mm}
\setlength{\textwidth}{85mm}
diff --git a/Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg b/Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg
index ba96893dd33..3c8ee8a82c5 100644
--- a/Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg
+++ b/Master/texmf-dist/tex/latex/adrconv/adrplaner.cfg
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `cfg,planer')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,13 +24,13 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrplaner
.cfg%
}
- [2010/04/02 v1.3 LaTeX2e
+ [2018/01/30 v1.4 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 d7888dc4394..b1d75ae5d6d 100644
--- a/Master/texmf-dist/tex/latex/adrconv/adrsmall.cfg
+++ b/Master/texmf-dist/tex/latex/adrconv/adrsmall.cfg
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% adrconv.dtx (with options: `cfg,small')
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
%%
%% This file will generate fast loadable files from adrconv.dtx when
%% run through LaTeX or TeX.
@@ -24,13 +24,13 @@
%% adrconv.ins and adrguide.tex.
%%
%% adrguide.dtx
-%% Copyright 2006, 2010 Axel Kielhorn
+%% Copyright 2006, 2010, 2018 Axel Kielhorn
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{%
adrsmall
.cfg%
}
- [2010/04/02 v1.3 LaTeX2e
+ [2018/01/30 v1.4 LaTeX2e
adrconv configuration file]
\setlength{\paperwidth}{87mm}
\setlength{\textwidth}{75mm}