Add an optional argument to control the thickness of \photo

This commit is contained in:
Xavier Danaux
2011-11-06 19:33:45 +01:00
parent 63669b90c6
commit 698e722b82
5 changed files with 20 additions and 8 deletions

View File

@ -5,6 +5,9 @@ version 0.13 (xx August 2010)
(e.g., dvips, xetex), leftover from the v 0.11 cleanup, as reported by (e.g., dvips, xetex), leftover from the v 0.11 cleanup, as reported by
K. Amaterasu and P. Mavrogiorgos. K. Amaterasu and P. Mavrogiorgos.
- added a "purple" color option, as proposed by B. Ravel. - added a "purple" color option, as proposed by B. Ravel.
- added a 3rd optional argument to the \photo command to control the thickness of
the framebox. Setting it to 0pt will disable the frame around the photo, as
requested by T. Krennwallner.
version 0.12 (03 August 2010) version 0.12 (03 August 2010)
- prevents pagebreaks after sections and subsections (launchpad bug #409902), - prevents pagebreaks after sections and subsections (launchpad bug #409902),

View File

@ -9,7 +9,7 @@
\documentclass[11pt,a4paper]{moderncv} \documentclass[11pt,a4paper]{moderncv}
% moderncv themes % moderncv themes
\moderncvtheme[blue]{casual} % optional argument are 'blue' (default), 'orange', 'red', 'green', 'grey' and 'roman' (for roman fonts, instead of sans serif fonts) \moderncvtheme[blue]{casual} % optional argument are 'blue' (default), 'orange', 'green', 'red', 'purple', 'grey' and 'roman' (for roman fonts, instead of sans serif fonts)
%\moderncvtheme[green]{classic} % idem %\moderncvtheme[green]{classic} % idem
% character encoding % character encoding
@ -32,7 +32,7 @@
\email{email (optional)} % optional, remove the line if not wanted \email{email (optional)} % optional, remove the line if not wanted
\homepage{homepage (optional)} % optional, remove the line if not wanted \homepage{homepage (optional)} % optional, remove the line if not wanted
\extrainfo{additional information (optional)} % optional, remove the line if not wanted \extrainfo{additional information (optional)} % optional, remove the line if not wanted
\photo[64pt]{picture} % '64pt' is the height the picture must be resized to and 'picture' is the name of the picture file; optional, remove the line if not wanted \photo[64pt][0.4pt]{picture} % '64pt' is the height the picture must be resized to, 0.4pt is the thickness of the frame around it (put it to 0pt for no frame) and 'picture' is the name of the picture file; optional, remove the line if not wanted
\quote{Some quote (optional)} % optional, remove the line if not wanted \quote{Some quote (optional)} % optional, remove the line if not wanted
% to show numerical labels in the bibliography; only useful if you make citations in your resume % to show numerical labels in the bibliography; only useful if you make citations in your resume

View File

@ -156,6 +156,9 @@
\fancyhf{}} \fancyhf{}}
\pagestyle{plain} \pagestyle{plain}
% advanced command arguments
\RequirePackage{xargs}
% compatibility package with older versions of moderncv % compatibility package with older versions of moderncv
\RequirePackageWithOptions{moderncvcompatibility} \RequirePackageWithOptions{moderncvcompatibility}
@ -171,6 +174,8 @@
\setlength{\parskip}{0pt} \setlength{\parskip}{0pt}
\setlength\columnsep{10\p@} \setlength\columnsep{10\p@}
\setlength\columnseprule{0\p@} \setlength\columnseprule{0\p@}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
% TO BE TESTED % TO BE TESTED
%\setlength\arraycolsep{5\p@} %\setlength\arraycolsep{5\p@}
@ -178,8 +183,6 @@
%\setlength\arrayrulewidth{.4\p@} %\setlength\arrayrulewidth{.4\p@}
%\setlength\doublerulesep{2\p@} %\setlength\doublerulesep{2\p@}
%\setlength\tabbingsep{\labelsep} %\setlength\tabbingsep{\labelsep}
%\setlength\fboxsep{3\p@}
%\setlength\fboxrule{.4\p@}
\pagestyle{empty} \pagestyle{empty}
\raggedbottom \raggedbottom
@ -250,8 +253,7 @@
\newcommand*{\email}[1]{\def\@email{#1}} \newcommand*{\email}[1]{\def\@email{#1}}
\newcommand*{\homepage}[1]{\def\@homepage{#1}} \newcommand*{\homepage}[1]{\def\@homepage{#1}}
\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}} \newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
\def\@photowidth{0pt} \newcommandx*{\photo}[3][1=64pt,2=0.4pt,usedefault]{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}% the 1st (optional) argument is the width of the photo, the 2nd (optional) argument is the thickness of the frame around it.
\newcommand*{\photo}[2][64pt]{\def\@photowidth{#1}\def\@photo{#2}}
\newcommand*{\quote}[1]{\def\@quote{#1}} \newcommand*{\quote}[1]{\def\@quote{#1}}
% length used by the moderncv layout % length used by the moderncv layout

View File

@ -128,7 +128,11 @@
{% {%
\ifthenelse{\isundefined{\@photo}}% \ifthenelse{\isundefined{\@photo}}%
{}% {}%
{{\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}% {%
\setlength\fboxrule{\@photoframewidth}%
\ifdim\@photoframewidth=0pt%
\setlength{\fboxsep}{0pt}\fi%
{\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
\hfill% \hfill%
% \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}% % \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}%
\raggedleft{\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}}\\[-.35em]}% \raggedleft{\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}}\\[-.35em]}%

View File

@ -175,7 +175,10 @@
{% {%
\hspace*{\separatorcolumnwidth}% \hspace*{\separatorcolumnwidth}%
\begin{minipage}[b]{\maketitlepicturewidth}% \begin{minipage}[b]{\maketitlepicturewidth}%
\raggedleft{}\addressfont\color{addresscolor}% required to correctly align content \raggedleft{}\addressfont\color{addresscolor}% required to correctly align content
\setlength\fboxrule{\@photoframewidth}%
\ifdim\@photoframewidth=0pt%
\setlength{\fboxsep}{0pt}\fi%
\framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}% \framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}%
\end{minipage}}\\[3em]% \end{minipage}}\\[3em]%
% optional quote % optional quote