Added the "centeredrule" variant to the banking style

This commit is contained in:
Xavier Danaux
2014-02-01 09:48:24 -05:00
parent 60172e0284
commit 861f0b0b69
2 changed files with 51 additions and 20 deletions

View File

@ -3,7 +3,8 @@ version 1.6.0 (xx MMM 2013)
\moderncvstyle[options]{style}. \moderncvstyle[options]{style}.
- added style options to the banking style, to specify how the section- and - added style options to the banking style, to specify how the section- and
subsectionrules should behave: "fullrules", "shortrules", "mixedrules" subsectionrules should behave: "fullrules", "shortrules", "mixedrules"
(default; full rules for sections, short rules for subsections) and "norules". (default; full rules for sections, short rules for subsections), "centered"
(fullrules with centered title) and "norules" (norules, small caps font).
- corrected the color of \addressstyle to match the one effectively used - corrected the color of \addressstyle to match the one effectively used
(color2). (color2).
- added a check on the emptyness of \title when setting the hyperref document - added a check on the emptyness of \title when setting the hyperref document

View File

@ -10,22 +10,18 @@
% identification % identification
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e} \NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{moderncvstylebanking}[2013/04/29 v1.5.1 modern curriculum vitae and letter style scheme: bank] \ProvidesPackage{moderncvstylebanking}[2013/04/29 v1.5.1 modern curriculum vitae and letter style scheme: banking]
\newcommand*{\sectionrule}{} \newif\if@fullrules\@fullrulesfalse
\newcommand*{\subsectionrule}{} \DeclareOption{fullrules}{\@fullrulestrue\@mixedrulesfalse}
\DeclareOption{fullrules}{ \newif\if@shortrules\@shortrulesfalse
\renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}} \DeclareOption{shortrules}{\@shortrulestrue\@mixedrulesfalse}
\renewcommand*{\subsectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}}% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible} \newif\if@mixedrules\@mixedrulesfalse
\DeclareOption{shortrules}{ \DeclareOption{mixedrules}{\@mixedrulestrue}
\renewcommand*{\sectionrule}{\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}} \newif\if@centeredrules\@centeredrulesfalse
\renewcommand*{\subsectionrule}{\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}}% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}} \DeclareOption{centeredrules}{\@centeredrulestrue\@mixedrulesfalse}
\DeclareOption{mixedrules}{ \newif\if@norules\@norulesfalse
\renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}} \DeclareOption{norules}{\@norulestrue\@mixedrulesfalse}
\renewcommand*{\subsectionrule}{\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}}% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}}
\DeclareOption{norules}{
\renewcommand*{\sectionrule}{}
\renewcommand*{\subsectionrule}{}}
\ExecuteOptions{mixedrules} \ExecuteOptions{mixedrules}
\ProcessOptions\relax \ProcessOptions\relax
@ -123,8 +119,16 @@
\renewcommand*{\titlefont}{\Huge\mdseries\upshape} \renewcommand*{\titlefont}{\Huge\mdseries\upshape}
\renewcommand*{\addressfont}{\normalsize\mdseries\upshape} \renewcommand*{\addressfont}{\normalsize\mdseries\upshape}
\renewcommand*{\quotefont}{\large\slshape} \renewcommand*{\quotefont}{\large\slshape}
\renewcommand*{\sectionfont}{\Large\bfseries\upshape} \renewcommand*{\sectionfont}{%
\renewcommand*{\subsectionfont}{\large\upshape\fontseries{sb}\selectfont} \if@norules%
\Large\bfseries\scshape%
\else%
\Large\bfseries\upshape\fi}
\renewcommand*{\subsectionfont}{%
\if@norules%
\large\mdseries\itshape%
\else%
\large\upshape\fontseries{sb}\selectfont\fi}
\renewcommand*{\hintfont}{\bfseries} \renewcommand*{\hintfont}{\bfseries}
% styles % styles
@ -132,8 +136,16 @@
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}}} \renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}}}
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}} \renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}} \renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}} \renewcommand*{\sectionstyle}[1]{%
\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}} \if@centeredrules%
{\centering\sectionfont\textcolor{color1}{#1}\par}%
\else
{\sectionfont\textcolor{color1}{#1}}\fi}
\renewcommand*{\subsectionstyle}[1]{%
\if@centeredrules%
{\centering\subsectionfont\textcolor{color1}{#1}\par}%
\else
{\subsectionfont\textcolor{color1}{#1}}\fi}
\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}} \renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
% lengths % lengths
@ -193,6 +205,24 @@
\subsectionrule% \subsectionrule%
\par\nobreak\addvspace{0.5ex}\@afterheading} \par\nobreak\addvspace{0.5ex}\@afterheading}
\newcommand*{\sectionrule}{}
\newcommand*{\subsectionrule}{}
\if@fullrules%
\renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
\renewcommand*{\subsectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}
\if@shortrules%
\renewcommand*{\sectionrule}{\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
\renewcommand*{\subsectionrule}{\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}}
\if@mixedrules%
\renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
\renewcommand*{\subsectionrule}{\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}}
\if@centeredrules%
\renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
\renewcommand*{\subsectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% similar to full rules
\if@norules%
\renewcommand*{\sectionrule}{}
\renewcommand*{\subsectionrule}{}\fi
\renewcommand*{\cvitem}[3][.25em]{% \renewcommand*{\cvitem}[3][.25em]{%
\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }{#3}% \ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }{#3}%
\par\addvspace{#1}} \par\addvspace{#1}}