summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/adrconv/adrdir.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc/latex/adrconv/adrdir.tex')
-rw-r--r--Master/texmf-dist/doc/latex/adrconv/adrdir.tex35
1 files changed, 16 insertions, 19 deletions
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