summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-04 22:47:11 +0000
committerKarl Berry <karl@freefriends.org>2018-03-04 22:47:11 +0000
commit2e69dbd4075a191dab459d1d8faf9a89fcc36f8a (patch)
tree3104e70572def461b4b90dbae77a3eda79f12291 /Master/texmf-dist/source/latex
parent2dedb6340c3380b7688126a87f171b181b18446e (diff)
adrconv (4mar18)
git-svn-id: svn://tug.org/texlive/trunk@46817 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/adrconv/adrconv.dtx46
-rw-r--r--Master/texmf-dist/source/latex/adrconv/adrconv.ins4
2 files changed, 27 insertions, 23 deletions
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.