diff --git a/CHANGELOG b/CHANGELOG index 38a86c6..1e54a59 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +version 1.4.0 (dd MMM 2013) + - deprecated \firstname and \familyname in favour of \name{}{}. + version 1.3.0 (09 Feb 2013) - added a new environment to create multiple columns: cvcolumns. Each column is then created by \cvcolumn[width]{header}{content}, where the optional width diff --git a/examples/template-es.pdf b/examples/template-es.pdf index 3c83697..e9562ef 100644 Binary files a/examples/template-es.pdf and b/examples/template-es.pdf differ diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf index 5d7081f..14fa3fc 100644 Binary files a/examples/template-zh.pdf and b/examples/template-zh.pdf differ diff --git a/examples/template.pdf b/examples/template.pdf index 5a36356..74a8445 100644 Binary files a/examples/template.pdf and b/examples/template.pdf differ diff --git a/examples/template.tex b/examples/template.tex index 3e092e7..2c342a7 100644 --- a/examples/template.tex +++ b/examples/template.tex @@ -24,8 +24,7 @@ %\setlength{\makecvtitlenamewidth}{10cm} % for the 'classic' style, if you want to force the width allocated to your name and avoid line breaks. be careful though, the length is normally calculated to avoid any overlap with your personal info; use this at your own typographical risks... % personal data -\firstname{John} -\familyname{Doe} +\name{John}{Doe} \title{Resumé title} % optional, remove / comment the line if not wanted \address{street and number}{postcode city}{country}% optional, remove / comment the line if not wanted; the "postcode city" and and "country" arguments can be omitted or provided empty \mobile{+1~(234)~567~890} % optional, remove / comment the line if not wanted diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf index 4a432f6..152f6e4 100644 Binary files a/examples/template_banking_red.pdf and b/examples/template_banking_red.pdf differ diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf index c4f0c3e..2c32f80 100644 Binary files a/examples/template_casual_orange.pdf and b/examples/template_casual_orange.pdf differ diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf index 07ae629..81534d3 100644 Binary files a/examples/template_classic_green.pdf and b/examples/template_classic_green.pdf differ diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf index b9ca938..4dac1a2 100644 Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf index 88b8a99..6c0a1ae 100644 Binary files a/examples/template_oldstyle_grey.pdf and b/examples/template_oldstyle_grey.pdf differ diff --git a/moderncv.cls b/moderncv.cls index 58f4e59..8b395bf 100644 --- a/moderncv.cls +++ b/moderncv.cls @@ -136,10 +136,10 @@ % pdfproducer = {\LaTeX{}},% will/should be set automatically to the correct TeX engine used bookmarksopen = true, bookmarksdepth= 2,% to show sections and subsections - pdfauthor = {\@firstname{}~\@familyname{}}, - pdftitle = {\@firstname{}~\@familyname{} -- \@title{}}, - pdfsubject = {Resum\'{e} of \@firstname{}~\@familyname{}}, - pdfkeywords = {\@firstname{}~\@familyname{}, curriculum vit\ae{}, resum\'{e}}}} + pdfauthor = {\@firstname{}~\@lastname{}}, + pdftitle = {\@firstname{}~\@lastname{} -- \@title{}}, + pdfsubject = {Resum\'{e} of \@firstname{}~\@lastname{}}, + pdfkeywords = {\@firstname{}~\@lastname{}, curriculum vit\ae{}, resum\'{e}}}} % graphics \RequirePackage{graphicx} @@ -225,12 +225,9 @@ % overall design commands definitions %------------------------------------------------------------------------------- % elements -% defines one's first name -% usage: \firstname{} -\newcommand*{\firstname}[1]{\def\@firstname{#1}} -% defines one's family name -% usage: \familyname{} -\newcommand*{\familyname}[1]{\def\@familyname{#1}} +% defines one's name +% usage: \name{}{} +\newcommand*{\name}[2]{\def\@firstname{#1}\def\@lastname{#2}} % defines one's title (optional) % usage: \title{} \renewcommand*{\title}[1]{\def\@title{#1}} diff --git a/moderncvcompatibility.sty b/moderncvcompatibility.sty index 3b1d13c..7aab158 100644 --- a/moderncvcompatibility.sty +++ b/moderncvcompatibility.sty @@ -79,6 +79,12 @@ \title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title \newcommand*{\maketitlenamewidth}{\makecvtitlenamewidth} +% compatibility with versions <= 1.3.0 +\newcommand*{\firstname}[1]{\def\@firstname{#1}} +\newcommand*{\lastname}[1]{\def\@lastname{#1}} +\newcommand*{\givenname}[1]{\def\@firstname{#1}} +\newcommand*{\familyname}[1]{\def\@lastname{#1}} +\def\@familyname{\@lastname} \endinput diff --git a/moderncvstylebanking.sty b/moderncvstylebanking.sty index 9717999..e1a73a9 100644 --- a/moderncvstylebanking.sty +++ b/moderncvstylebanking.sty @@ -88,7 +88,7 @@ \parbox{\maketitlewidth}{% \centering% % name and title - \namestyle{\@firstname~\@familyname}% + \namestyle{\@firstname~\@lastname}% \ifthenelse{\equal{\@title}{}}{}{\titlestyle{~|~\@title}}\\% \isundefined doesn't work on \@title, as LaTeX itself defines \@title (before it possibly gets redefined by \title) % detailed information \addressfont\color{color2}% @@ -284,7 +284,7 @@ \renewcommand*{\makeletterclosing}{ \@closing\\[3em]% - {\bfseries \@firstname~\@familyname}% + {\bfseries \@firstname~\@lastname}% \ifthenelse{\isundefined{\@enclosure}}{}{% \\% \vfill% diff --git a/moderncvstylecasual.sty b/moderncvstylecasual.sty index 8682d78..c3639d2 100644 --- a/moderncvstylecasual.sty +++ b/moderncvstylecasual.sty @@ -91,7 +91,7 @@ \@initializelength{\makecvtitlepicturewidth}% \settowidth{\makecvtitlepicturewidth}{\usebox{\makecvtitlepicturebox}}% \parbox[b]{\textwidth-\makecvtitlepicturewidth}{% - \raggedleft\namefont{\color{color2!50}\@firstname} {\color{color2}\@familyname}}\\[-.35em]% alternate design: \MakeLowercase and no space + \raggedleft\namefont{\color{color2!50}\@firstname} {\color{color2}\@lastname}}\\[-.35em]% alternate design: \MakeLowercase and no space {\color{color2!50}\rule{\textwidth}{.25ex}}% % optional title \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\null\hfill\titlestyle{\@title}}\\[2.5em]% \null is required as there is no box on the line after \\, so glue (and leaders) disappears; this is in contrast to after \par, where the next line starts with an indent box (even after \noindent). @@ -157,7 +157,7 @@ \centering% \addressfont\color{color2}% \vspace{-\baselineskip}% to cancel out the extra vertical space taken by the name (below) and ensure perfect alignment of letter and cv footers - \strut{\bfseries\upshape\@firstname~\@familyname}\\% the \strut is required to ensure the line is exactly \baselineskip tall + \strut{\bfseries\upshape\@firstname~\@lastname}\\% the \strut is required to ensure the line is exactly \baselineskip tall \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}% \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty \ifthenelse{\equal{\@addresscountry}{}}{}{\addtofooter[~--~]{\@addresscountry}}% @@ -174,7 +174,7 @@ \renewcommand*{\makeletterclosing}{ \@closing\\[3em]% - {\bfseries\@firstname~\@familyname}% + {\bfseries\@firstname~\@lastname}% \ifthenelse{\isundefined{\@enclosure}}{}{% \\% \vfil% diff --git a/moderncvstyleclassic.sty b/moderncvstyleclassic.sty index 1da3078..95d50de 100644 --- a/moderncvstyleclassic.sty +++ b/moderncvstyleclassic.sty @@ -138,7 +138,7 @@ {\setlength{\makecvtitlenamewidth}{\textwidth-\makecvtitledetailswidth-\makecvtitlepicturewidth}}% {}% \begin{minipage}[b]{\makecvtitlenamewidth}% - \namestyle{\@firstname\ \@familyname}% + \namestyle{\@firstname\ \@lastname}% \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}% \end{minipage}% \hfill% @@ -260,7 +260,7 @@ \begin{minipage}{.5\textwidth}% \raggedleft% \addressfont\textcolor{color2}{% - {\bfseries\upshape\@firstname~\@familyname}\@firstdetailselementfalse% + {\bfseries\upshape\@firstname~\@lastname}\@firstdetailselementfalse% \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet% \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}% @@ -291,7 +291,7 @@ \renewcommand*{\makeletterclosing}{ \@closing\\[3em]% - {\bfseries \@firstname~\@familyname}% + {\bfseries \@firstname~\@lastname}% \ifthenelse{\isundefined{\@enclosure}}{}{% \\% \vfill% diff --git a/moderncvstyleoldstyle.sty b/moderncvstyleoldstyle.sty index f32b4a0..3effd3d 100644 --- a/moderncvstyleoldstyle.sty +++ b/moderncvstyleoldstyle.sty @@ -138,7 +138,7 @@ \newlength{\makecvtitlepicturewidth}\settowidth{\makecvtitlepicturewidth}{\usebox{\makecvtitlepicturebox}}% \newlength{\makecvtitlenamewidth}\setlength{\makecvtitlenamewidth}{\textwidth-\makecvtitlepicturewidth}% \begin{minipage}[b]{\makecvtitlenamewidth}% - \namestyle{\@firstname\ \@familyname}% + \namestyle{\@firstname\ \@lastname}% \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}% \end{minipage}% % optional photo @@ -290,7 +290,7 @@ \hspace{0pt}% \marginpar{% \addressfont\textcolor{color2}{% - {\bfseries\@firstname~\@familyname}\@firstdetailselementfalse% + {\bfseries\@firstname~\@lastname}\@firstdetailselementfalse% \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet% \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}% @@ -306,7 +306,7 @@ \renewcommand*{\makeletterclosing}{ \@closing\\[3em]% - {\bfseries\@firstname~\@familyname}% + {\bfseries\@firstname~\@lastname}% \ifthenelse{\isundefined{\@enclosure}}{}{% \\% \vfill%