bewerbung (23nov20)

git-svn-id: svn://tug.org/texlive/trunk@56998 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 31 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/bewerbung/argetabelle.cls b/Master/texmf-dist/tex/latex/bewerbung/argetabelle.cls
index 3a9d3ca90f1..14f58f3d27e 100644
--- a/Master/texmf-dist/tex/latex/bewerbung/argetabelle.cls
+++ b/Master/texmf-dist/tex/latex/bewerbung/argetabelle.cls
@@ -7,7 +7,7 @@
 %% bewerbung.dtx  (with options: `argetabelle.cls,package')
 %% 
 %%  bewerbung.dtx
-%%  Copyright 2015-07-14:14:18:49 -- Version 1.1 André Hilbig, mail@andrehilbig.de
+%%  Copyright 2020-11-24:11:30:14 -- Version 1.2 André Hilbig, mail@andrehilbig.de
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-casual.sty b/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-casual.sty
index 2110e3203f8..c4e85a1b61e 100644
--- a/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-casual.sty
+++ b/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-casual.sty
@@ -7,7 +7,7 @@
 %% bewerbung.dtx  (with options: `bewerbung-cv-casual.sty,package')
 %% 
 %%  bewerbung.dtx
-%%  Copyright 2015-07-14:14:18:49 -- Version 1.1 André Hilbig, mail@andrehilbig.de
+%%  Copyright 2020-11-24:11:30:14 -- Version 1.2 André Hilbig, mail@andrehilbig.de
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-classic.sty b/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-classic.sty
index 50a977d967a..0567816ac12 100644
--- a/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-classic.sty
+++ b/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-classic.sty
@@ -7,7 +7,7 @@
 %% bewerbung.dtx  (with options: `bewerbung-cv-classic.sty,package')
 %% 
 %%  bewerbung.dtx
-%%  Copyright 2015-07-14:14:18:49 -- Version 1.1 André Hilbig, mail@andrehilbig.de
+%%  Copyright 2020-11-24:11:30:14 -- Version 1.2 André Hilbig, mail@andrehilbig.de
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -85,8 +85,8 @@
 }%
 }%
   \begin{minipage}[b]{\@titlenamewidth}%
+\firstnamestyle{\firstname}\\[0.75em] %
 %% ahilbig begin
-    \firstnamestyle{\firstname}\\ %
     \familynamestyle{\familyname}%
     \ifdefempty{\acadtitle}{}{%
       \\[1.25em]\acadtitlestyle{\acadtitle}}%
diff --git a/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-oldstyle.sty b/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-oldstyle.sty
index 93539f19637..63a6aa46180 100644
--- a/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-oldstyle.sty
+++ b/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv-oldstyle.sty
@@ -7,7 +7,7 @@
 %% bewerbung.dtx  (with options: `bewerbung-cv-oldstyle.sty,package')
 %% 
 %%  bewerbung.dtx
-%%  Copyright 2015-07-14:14:18:49 -- Version 1.1 André Hilbig, mail@andrehilbig.de
+%%  Copyright 2020-11-24:11:30:14 -- Version 1.2 André Hilbig, mail@andrehilbig.de
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv.sty b/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv.sty
index d6d545feaa6..1ac1e59d070 100644
--- a/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv.sty
+++ b/Master/texmf-dist/tex/latex/bewerbung/bewerbung-cv.sty
@@ -7,7 +7,7 @@
 %% bewerbung.dtx  (with options: `bewerbung-cv.sty,package')
 %% 
 %%  bewerbung.dtx
-%%  Copyright 2015-07-14:14:18:49 -- Version 1.1 André Hilbig, mail@andrehilbig.de
+%%  Copyright 2020-11-24:11:30:14 -- Version 1.2 André Hilbig, mail@andrehilbig.de
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/bewerbung/bewerbung.cls b/Master/texmf-dist/tex/latex/bewerbung/bewerbung.cls
index 0e84b383af1..dde8bdeea7b 100644
--- a/Master/texmf-dist/tex/latex/bewerbung/bewerbung.cls
+++ b/Master/texmf-dist/tex/latex/bewerbung/bewerbung.cls
@@ -7,7 +7,7 @@
 %% bewerbung.dtx  (with options: `bewerbung.cls,package')
 %% 
 %%  bewerbung.dtx
-%%  Copyright 2015-07-14:14:18:49 -- Version 1.1 André Hilbig, mail@andrehilbig.de
+%%  Copyright 2020-11-24:11:30:14 -- Version 1.2 André Hilbig, mail@andrehilbig.de
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -59,9 +59,19 @@ setkeys=\kvsetkeys%
 \DeclareStringOption[classic]{lebenslaufStyle}[classic]
 \DeclareStringOption[anschrift.csv]{anschrift}[anschrift.csv]
 \DeclareBoolOption{idPlain}
+\DeclareBoolOption{nophone}
 \ProcessKeyvalOptions{ahbewerbung} % evaluate keyval options
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrlttr2}}
 \ProcessOptions\relax
+\ifahbewerbung@nophone %
+\LoadClass[
+DIN, pagenumber=botright, backaddress=true, parskip=half,%
+fromalign=left, fromemail=true, fromfax=true, %
+fromphone=false, fromurl=false, fromalign=right, %
+fromlogo=false, fromrule=true, foldmarks=true, %
+paper=a4, fontsize=10pt,enlargefirstpage=true, firstfoot=false
+]{scrlttr2}
+\else %
 \LoadClass[
 DIN, pagenumber=botright, backaddress=true, parskip=half,%
 fromalign=left, fromemail=true, fromfax=true, %
@@ -69,6 +79,7 @@ fromphone=true, fromurl=false, fromalign=right, %
 fromlogo=false, fromrule=true, foldmarks=true, %
 paper=a4, fontsize=10pt,enlargefirstpage=true, firstfoot=false
 ]{scrlttr2}
+\fi %
 %% import from komacv.cls for easier maintaining
 \RequirePackage{%
   etoolbox,%
@@ -76,7 +87,7 @@ paper=a4, fontsize=10pt,enlargefirstpage=true, firstfoot=false
   ifluatex,%
   ifxetex,%
 marvosym, %
-  scrpage2,%
+  scrlayer-scrpage,%
   array,%
   graphicx,%
   microtype,%
diff --git a/Master/texmf-dist/tex/latex/bewerbung/bewerbung.sty b/Master/texmf-dist/tex/latex/bewerbung/bewerbung.sty
index f47d9c630fb..6a1c4961937 100644
--- a/Master/texmf-dist/tex/latex/bewerbung/bewerbung.sty
+++ b/Master/texmf-dist/tex/latex/bewerbung/bewerbung.sty
@@ -7,7 +7,7 @@
 %% bewerbung.dtx  (with options: `bewerbung.sty,package')
 %% 
 %%  bewerbung.dtx
-%%  Copyright 2015-07-14:14:18:49 -- Version 1.1 André Hilbig, mail@andrehilbig.de
+%%  Copyright 2020-11-24:11:30:14 -- Version 1.2 André Hilbig, mail@andrehilbig.de
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -77,16 +77,16 @@
 \providecommand{\Sta}[1]{\renewcommand{\sta}{#1}}
 \providecommand{\email}{}
 \providecommand{\EMail}[1]{\renewcommand{\email}{#1}}
-\providecommand{\tel}{}
+\providecommand{\tel}{empty}
 \providecommand{\Tel}[1]{\renewcommand{\tel}{#1}}
 \providecommand{\mobile}{}
 \providecommand{\Mobile}[1]{\renewcommand{\mobile}{#1}}
 \ProvideDocumentCommand{\anhang}{o}{%
 \IfNoValueTF{#1}{%
-Curriculum Vitae.\anhangTmpFlat
+\lebenslaufTitel.\anhangTmpFlat
 }{%
 \item Anschreiben
-\item Curriculum Vitae
+\item \lebenslaufTitel
 \anhangTmpList
 } %
 }
@@ -184,7 +184,9 @@ Curriculum Vitae.\anhangTmpFlat
 \providecommand{\runKomaVar}{%
 \setkomavar{fromname}{\fullname} %
 \setkomavar{fromaddress}{\street\\\plz\xspace\stadt} %
+\ifthenelse{\equal{\tel}{empty}}{}{%
 \setkomavar{fromphone}[\Telefon\enskip]{\tel} %
+}%
 \setkomavar{fromfax}[\Mobilefone\enskip]{\mobile} %
 \setkomavar{fromemail}[\Letter\enskip]{\email} %
 \setkomavar{signature}{\vorname\xspace\name} %
@@ -197,7 +199,9 @@ Curriculum Vitae.\anhangTmpFlat
 \renewcommand*{\addressstreet}{\street} %
 \renewcommand*{\addresscity}{\plz\xspace\stadt} %
 \renewcommand*{\address}{\street\\\plz\xspace\stadt} %
+\ifthenelse{\equal{\tel}{empty}}{}{%
 \renewcommand*{\phonenr}{\tel} %
+}%
 %% \renewcommand*{\extrainfo}{Some extra info}
 } %
 \ProvideDocumentEnvironment{titlepage}{}{%
@@ -236,7 +240,9 @@ Curriculum Vitae.\anhangTmpFlat
 \ProvideDocumentEnvironment{lebenslauf}{oo}{%
 \clearpage
 \newgeometry{top=2.5cm,left=3cm,right=2.5cm,bottom=3cm}
-\pagestyle{empty}
+\pagenumbering{arabic}
+\hypersetup{hidelinks}
+\ofoot{Seite \thepage\ von \pageref{LastPage}}
 \ifthenelse{\equal{#1}{none}}{\renewcommand{\@listitemsymbol}{}}{} %
 %%\clearscrheadfoot
 %%\ifoot{CV~\firstname~\familyname}
@@ -248,6 +254,7 @@ Curriculum Vitae.\anhangTmpFlat
 \fullname\\
 \todayOrt, \todayTime
 \end{tabular}
+\label{LastPage}
 \end{raggedright}
 \IfNoValueF{#2}{%
 \newpage %