From 5e01c8cec94f305040890bc4bb4491e0f3280a5c Mon Sep 17 00:00:00 2001 From: Xavier Danaux Date: Thu, 14 Feb 2013 02:07:42 -0500 Subject: [PATCH] Deprecated \firstname and \familyname in favour of \name --- CHANGELOG | 3 +++ examples/template-es.pdf | Bin 171988 -> 171988 bytes examples/template-zh.pdf | Bin 241627 -> 241627 bytes examples/template.pdf | Bin 235045 -> 235045 bytes examples/template.tex | 3 +-- examples/template_banking_red.pdf | Bin 169202 -> 169202 bytes examples/template_casual_orange.pdf | Bin 235052 -> 235052 bytes examples/template_classic_green.pdf | Bin 279245 -> 279245 bytes examples/template_multibib.pdf | Bin 235582 -> 235582 bytes examples/template_oldstyle_grey.pdf | Bin 70640 -> 70640 bytes moderncv.cls | 17 +++++++---------- moderncvcompatibility.sty | 6 ++++++ moderncvstylebanking.sty | 4 ++-- moderncvstylecasual.sty | 6 +++--- moderncvstyleclassic.sty | 6 +++--- moderncvstyleoldstyle.sty | 6 +++--- 16 files changed, 28 insertions(+), 23 deletions(-) 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 3c83697aa5a0fbc73c4c3d8550836a72ea120e0c..e9562ef16d32f78722937097c109e19ce5cc3d22 100644 GIT binary patch delta 115 zcmcbzpX|-jE#(@E39CahV!;NuV7xw?BwQVWNKmI>TGCe lVqxIqZ06)@Y3$-;;O1=LoL delta 117 zcmcb8pYQg4zJ?aY7N#xC5-T_iEDa2ejExPaE39CahV!;NuV7xw?Bwcf>11eWV&URy lV(w&M?rLu2YT)MP=49aN>gZ~0VPdCXLqN%PqczMcnE|?TAD;jK diff --git a/examples/template.pdf b/examples/template.pdf index 5a363561706e44bac8d1e8ba57e88d0a30c5e5ae..74a844559ad66abe3eb3dce6b0c92f7b115ce41e 100644 GIT binary patch delta 139 zcmZ3whHvQ_zJ?aY7N#xC>$|-j1A0n4NTPy4AeEb^nLSFToOxC6*OF|j0_Bo z4UAw)w%_b#e$Vb~YG7dLY-C|->FR81Zs}s|W@u?_WZ-JzYT@eUXyEK*r(i=!$#(83 H%u-AMWUnKw delta 139 zcmZ3whHvQ_zJ?aY7N#xC>$IMetnq2z6`6(`mC8-J;E>=bchQIMetnq2z6`6(`mC8-J;E>=bchQm>~8Q3Y<5K^*Tbu!ag FMgZjgBQ5{{ diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf index c4f0c3e11b25183a9723778fa669da7a922f2968..2c32f8045a5a99ba83dc0ba7e6b1f10721e85cb1 100644 GIT binary patch delta 118 zcmZ3phHuRpzJ?aY7N#xC+qyXnO$>|-j14TO@9SokhV!;R>}Gz??rh{{YHDKPW@ct? lU}oZCWMW}pXku*UXl&}@>f-3)W^AWmLrBSX;VI0LOaS^SA432D delta 118 zcmZ3phHuRpzJ?aY7N#xC+qyXnEDa2ej1A4F@9SokhV!;R>}Gz??rh-fWMXFEYGQ2W kXy|5Y31k@<8yc9qm>64{7@CEYfh^_RSV77ulU%jm#{~4crVY noDAH|EnQrljZMr=%nXbT91Ts(oZQ^(6l@47*?!!Cg^dXSt*IV_ delta 120 zcmX@xDtNY4u%U&qg{g&k3rmLuhk>Pmp^>qn<@5;_EYfh^_RSV77ulT+Eu72^O&nc~ n%q?BbOx!FjT^%hAER9_aolJ~f3{70^6l@47*?!!Cg^dXSx%VEj diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf index b9ca93897706913e1635a1d0b627df5658f93fc8..4dac1a25618a5649a88b3e3b692d2eb753f1ca6b 100644 GIT binary patch delta 118 zcmdnDfp6aizJ?aY7N#xCfju0CCI&_Z#zv;oBYT*o;k@lNJOVoBYT*o;k@lNJJY lZkCot&aSTJE=JBqt}Yhl7H-B)26hTIgp_O-nZ~Te1OSN?9w`6- diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf index 88b8a99f9de70024371c62c6c7330ad1948da4e7..6c0a1ae164da6049d65db9717f2113096d617b8d 100644 GIT binary patch delta 114 zcmeycoaMuEmWC~imv}i0O$>|-j15hv-{NJIhV!=n}+Og;b!1sWN6}MYHVp> hWa4b}+Ie>|$bS;AU=YZe;9i hZtmu2Zei?dZs_7@>SSbTYGkKiLrBSXT_MK9i~u~H9hU$A 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%