mirror of
https://github.com/moderncv/moderncv.git
synced 2026-02-06 10:05:19 +01:00
Merge branch 'revive-orphaned-sections' into tweakable_orphaned_sections
This commit is contained in:
daniel
GitHub
commit
621debdcdb
55 changed files with 3660 additions and 1753 deletions
|
|
@ -1,5 +1,5 @@
|
|||
%% start of file `moderncvbodyiii.sty'.
|
||||
%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
|
||||
%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
|
||||
%
|
||||
% This work may be distributed and/or modified under the
|
||||
% conditions of the LaTeX Project Public License version 1.3c,
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
% identification
|
||||
%-------------------------------------------------------------------------------
|
||||
\NeedsTeXFormat{LaTeX2e}
|
||||
\ProvidesPackage{moderncvbodyiii}[2021/01/21 v2.1.0 modern curriculum vitae and letter body variant: 3]
|
||||
\ProvidesPackage{moderncvbodyiii}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 3]
|
||||
|
||||
% rules type options: "fullrules", "shortrules", "mixedrules" (default) or "norules"
|
||||
\@initializeif{\if@fullrules}\@fullrulesfalse
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
%-------------------------------------------------------------------------------
|
||||
% required packages
|
||||
%-------------------------------------------------------------------------------
|
||||
% provides the commands for the skillmatrix as well as the command
|
||||
% provides the commands for the skillmatrix as well as the command
|
||||
% \recompute@cvskillmatrix@lengths
|
||||
\RequirePackage[moderncvbodyiii]{moderncvskillmatrix}
|
||||
|
||||
|
|
@ -61,16 +61,16 @@
|
|||
\renewcommand*{\sectionstyle}[1]{{%
|
||||
\if@center\centering\else%
|
||||
\if@right\raggedleft\fi\fi%
|
||||
\sectionfont\textcolor{color1}{#1}%
|
||||
\sectionfont\textcolor{sectioncolor}{#1}%
|
||||
\if@shortrules\else%
|
||||
\par\fi}}
|
||||
\renewcommand*{\subsectionstyle}[1]{{%
|
||||
\if@center\centering\else%
|
||||
\if@right\raggedleft\fi\fi%
|
||||
\subsectionfont\textcolor{color1}{#1}%
|
||||
\subsectionfont\textcolor{subsectioncolor}{#1}%
|
||||
\if@shortrules\else\if@mixedrules\else%
|
||||
\par\fi\fi}}
|
||||
\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
|
||||
\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{hintstylecolor}{#1}}}
|
||||
|
||||
|
||||
%-------------------------------------------------------------------------------
|
||||
|
|
@ -83,11 +83,14 @@
|
|||
\@initializelength{\maincolumnwidth}
|
||||
% used by \cvdoubleitem
|
||||
\@initializelength{\doubleitemcolumnwidth}
|
||||
% used by \cvtripleitem
|
||||
\@initializelength{\tripleitemcolumnwidth}
|
||||
% used by \cvlistitem
|
||||
\@initializelength{\listitemsymbolwidth} \settowidth{\listitemsymbolwidth}{\listitemsymbol}
|
||||
\@initializelength{\listitemcolumnwidth}
|
||||
% used by \cvlistdoubleitem
|
||||
\@initializelength{\listdoubleitemcolumnwidth}
|
||||
\@initializelength{\listitemsymbolspace} \setlength{\listitemsymbolspace}{0pt}
|
||||
|
||||
% commands
|
||||
\renewcommand*{\recomputecvbodylengths}{%
|
||||
|
|
@ -96,6 +99,8 @@
|
|||
\setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
|
||||
\setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\separatorcolumnwidth}%
|
||||
\setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
|
||||
\setlength{\tripleitemcolumnwidth}{\maincolumnwidth-2\separatorcolumnwidth}%
|
||||
\setlength{\tripleitemcolumnwidth}{0.33\tripleitemcolumnwidth}%
|
||||
\setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
|
||||
\setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
|
||||
\recompute@cvskillmatrix@lengths
|
||||
|
|
@ -143,14 +148,14 @@
|
|||
\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}
|
||||
\renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{bodyrulecolor}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
|
||||
\renewcommand*{\subsectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{bodyrulecolor}\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}}
|
||||
\renewcommand*{\sectionrule}{\leavevmode{\color{bodyrulecolor}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
|
||||
\renewcommand*{\subsectionrule}{\leavevmode{\color{bodyrulecolor}\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}}
|
||||
\renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{bodyrulecolor}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
|
||||
\renewcommand*{\subsectionrule}{\leavevmode{\color{bodyrulecolor}\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@norules%
|
||||
\renewcommand*{\sectionrule}{}
|
||||
\renewcommand*{\subsectionrule}{}\fi
|
||||
|
|
@ -165,16 +170,24 @@
|
|||
\begin{minipage}[t]{\doubleitemcolumnwidth}\ifstrempty{#4}{}{\hintstyle{#4}: }#5\end{minipage}%
|
||||
\par\addvspace{#1}}
|
||||
|
||||
\renewcommand*{\cvtripleitem}[7][.1em]{%
|
||||
\begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}%
|
||||
\hfill% fill of \separatorcolumnwidth
|
||||
\begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#4}: #5\end{minipage}%
|
||||
\hfill% fill of \separatorcolumnwidth
|
||||
\begin{minipage}[t]{\tripleitemcolumnwidth}\ifstrempty{#6}{}{\hintstyle{#6}: }#7\end{minipage}%
|
||||
\par\addvspace{#1}}
|
||||
|
||||
\renewcommand*{\cvlistitem}[2][.25em]{%
|
||||
\listitemsymbol\begin{minipage}[t]{\listitemcolumnwidth}#2\end{minipage}%
|
||||
\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
|
||||
\par\addvspace{#1}}
|
||||
|
||||
\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
|
||||
\cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}%
|
||||
\cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
|
||||
\hfill% fill of \separatorcolumnwidth
|
||||
\ifstrempty{#3}%
|
||||
{}%
|
||||
{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}}
|
||||
{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#3\end{minipage}}}}
|
||||
|
||||
\renewcommand*{\cventry}[7][.25em]{
|
||||
\begin{tabular*}{\maincolumnwidth}{l@{\extracolsep{\fill}}r}%
|
||||
|
|
@ -241,13 +254,14 @@
|
|||
\recomputecvbodylengths%
|
||||
\setlength{\parskip}{6\p@}}
|
||||
|
||||
\renewcommand*{\makeletterclosing}{
|
||||
\@closing\\[3em]%
|
||||
\renewcommand*{\makeletterclosing}{%
|
||||
\@closing\ifthenelse{\isundefined{\@signature}}{\\[3em]}{\\[1em]}% shrink space when signature is set
|
||||
\ifthenelse{\isundefined{\@signature}}{}{{\@signature\\}}
|
||||
{\bfseries\@firstname~\@lastname}%
|
||||
\ifthenelse{\isundefined{\@enclosure}}{}{%
|
||||
\\%
|
||||
\vfil%
|
||||
{\color{color2}\itshape\enclname: \@enclosure}}%
|
||||
{\color{letterclosingcolor}\itshape\enclname: \@enclosure}}%
|
||||
\vfil}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue