From 6bfc2a032b7e1ab83cab838ecb9855b8d0fea406 Mon Sep 17 00:00:00 2001 From: Xavier Danaux Date: Fri, 15 Feb 2013 02:06:59 -0500 Subject: [PATCH] Removed the use of the suffix package --- CHANGELOG | 7 ++++--- 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_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 | 9 +++------ moderncvstylebanking.sty | 12 ++++++------ moderncvstyleclassic.sty | 14 +++++++------- moderncvstyleoldstyle.sty | 12 ++++++------ 13 files changed, 26 insertions(+), 28 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1e54a59..fd3f793 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ version 1.4.0 (dd MMM 2013) - deprecated \firstname and \familyname in favour of \name{}{}. + - removed the use of the suffix package. version 1.3.0 (09 Feb 2013) - added a new environment to create multiple columns: cvcolumns. Each column @@ -16,7 +17,7 @@ version 1.3.0 (09 Feb 2013) \address to specify a country, as requested on launchpad (launchpad bug #1063995). - compacted list environments further. - - replaced the usage of the xargs package by the xparse one. + - replaced the use of the xargs package by the xparse one. version 1.2.1 (04 Dec 2012) - fixed a regression bug introduced in version 1.2.0 in the header of the @@ -70,8 +71,8 @@ version 1.1.0 (29 Jul 2012) - changed the handling of the "sans" and "roman" class options, to be reflected at the beginning of the document and override style font choices. - turned unicode support in hyperref on by default. - - tweaked the usage of \textbullet to avoid the fall-back to Computer Modern - fonts and prepared the usage of symbols from the MarVoSym font for fontspec + - tweaked the use of \textbullet to avoid the fall-back to Computer Modern + fonts and prepared the use of symbols from the MarVoSym font for fontspec (LauLaTeX or XeLaTeX). - tweaked the \subsectionfill of the "banking" style to distribute extra space evenly between leaders. diff --git a/examples/template-es.pdf b/examples/template-es.pdf index e9562ef16d32f78722937097c109e19ce5cc3d22..19d98fbe251b752939b586a1d831fe4158d2f4ec 100644 GIT binary patch delta 113 zcmcbzpX{q fz|_Ln3@GAcWbEQ(?qX_Wr(i=!$@ZvuOjV2klKmdc delta 113 zcmcbzpXSX9@=w@kQYG7gD=3-=F;bLIqWT#+5NXd5NHOwoR0f)C9!~g&Q delta 116 zcmcb8pYQg4zJ?aY7N#xCk}KFv42%qnjf|!%tYDUbake|JU|!4Y?B-@G9smFU diff --git a/examples/template.pdf b/examples/template.pdf index 74a844559ad66abe3eb3dce6b0c92f7b115ce41e..1430aaf6dd8806375c13434c2414a2eaf44da066 100644 GIT binary patch delta 138 zcmZ3whHvQ_zJ?aY7N#xC>$|l~4U7y73@vmGOw|nx)HS*Eee+XX5=&AQG+eBV3=EA8 zj0~Ylw%_b#e$Vdg>SkbU?CfajY-#9hW@ut=>E>o?>}F`}YU1i-=IY{Rr(i=!$#(83 H%u-AMSHvUQ delta 138 zcmZ3whHvQ_zJ?aY7N#xC>$|l~42%qn4a{{7Ow|nx)HS*Eee+XX5=&AQG+eBV3=EA8 zj0~Ylw%_b#e$Vb~YG7dLY-C|->FR81Zs}s|W@u?_WZ-JzYT@eUXyEK*r(i=!$#(83 H%u-AMM!_R| diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf index 152f6e49f2b9845939a975a1b3c1e4cb2b5f601a..9ab606b81c87786970abb3a3178d68fd4efe8677 100644 GIT binary patch delta 136 zcmeyglIzn-u7(!IElj+9TBZg@1_s6^x(24|1_tVyT>8HGDK3d6sR|k{Rz?Pf#s)@) zP$k>V`8HGDK3d6sR|k{Rz?Pf#s)@) zP$k>V`CK4U7zcX!^cxW*Hb~`@?SL_w3GwuCB(8CZ?7qZpKD# jPR1r~W^OJ0^I delta 116 zcmZ3phHuRpzJ?aY7N#xC+q>CK42%qn4J@bc>t>dLakf9~W`57^Y~*HYYGUDLW@c_+ kX5wOGVqsutVr=GUZ0h3b;^^XLY^PvDNXd5LDa?{g0L8Z+;Q#;t diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf index 81534d305498917c7f2d3c344d55a54488002085..dcff6f8641a8e03ff60461f3fb25791173cef9ea 100644 GIT binary patch delta 118 zcmX@xDtNY4u%U&qg{g&k3rnX3yQzVZfq{|n^a&O$GBD2e%@!;d*`3Wy%v~*=oQ#dk mTwGiXot!M)EFGO44Gb;J%`7ZkTukj0YzQgYe%yhDjR^pbG9H`& delta 118 zcmX@xDtNY4u%U&qg{g&k3rnX3yNQ93fw7_C^a&O$GBD2e%@!;d*_~aD%q-0f+zc$7 m4BX5uU0j`wP0UTq42%sN4Nc6P+}!LGYzQgYe%yhDjR^pGyB;C{ diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf index 4dac1a25618a5649a88b3e3b692d2eb753f1ca6b..7b80226462fc8bebc6cb4f617643acaa5878fd95 100644 GIT binary patch delta 116 zcmdnDfp6aizJ?aY7N#xCK|SoI21W)3CMMG(dzfWlob5F|%%Pmlj!uqlPDU1{&Mrny krY^4Ljs|8HZUzRX&IV3Kj?QLob_zCxlx!E7#;nBz0AkM`1poj5 delta 116 zcmdnDfp6aizJ?aY7N#xCK|Smy21W+PMyAsvdzfWlob5F|%%PmlPKFjvZe|81re>B- kPG&}C7H+1l29_q4MlQy#=1#^Ib_zCxlx!E7#;nBz07=;$bpQYW diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf index 6c0a1ae164da6049d65db9717f2113096d617b8d..35c60d32817eb9086b0879e87546b1e3f98bab6a 100644 GIT binary patch delta 112 zcmeycoaMuEmWC~imwDMu4U7y7j18vW;$@V9akl^EWqix*Y~pC(WaMJzXl!a|Y-C|> g=4x*0V(MaU=wfJQW@zT(YNudBNXd3xA;!au00u4{F8}}l delta 112 zcmeycoaMuEmWC~imwDMu42%qn4Na%t;$@V9akl^EWqix*Y-VcVX5eCEXyRsSY-wO* g;%w?_;%sJUVs2^TXyRgQW~X37NXd3xA;!au00W5~2><{9 diff --git a/moderncv.cls b/moderncv.cls index 8b395bf..92a06ca 100644 --- a/moderncv.cls +++ b/moderncv.cls @@ -357,15 +357,12 @@ % makes a resume section % usage: \section{} -\newcommand*{\section}[1]{} -% starred variant, which is identical but defined to allow its use (e.g. for natbib compatibility, who uses \section*{} for the bibliography header) -\RequirePackage{suffix} -\AtBeginDocument{\WithSuffix\newcommand\section*{\section}} +% identical starred and non-starred variants should be defined for compatibility with other packages (e.g. with natbib, that uses \section*{} for the bibliography header) +\NewDocumentCommand{\section}{sm}{} % makes a resume subsection % usage: \subsection{title} -\newcommand*{\subsection}[1]{} -\AtBeginDocument{\WithSuffix\newcommand\subsection*{\subsection}} +\NewDocumentCommand{\subsection}{sm}{} % makes a resume line with a header and a corresponding text % usage: \cvitem[spacing]{header}{text} diff --git a/moderncvstylebanking.sty b/moderncvstylebanking.sty index e1a73a9..9f26cb8 100644 --- a/moderncvstylebanking.sty +++ b/moderncvstylebanking.sty @@ -167,20 +167,20 @@ {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}% \par}% to avoid weird spacing bug at the first section if no blank line is left after \maketitle} -\renewcommand*{\section}[1]{% +\RenewDocumentCommand{\section}{sm}{% \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{section}{#1}% - \strut\sectionstyle{#1}% + \addcontentsline{toc}{section}{#2}% + \strut\sectionstyle{#2}% {\color{color1}\hrule}% \par\nobreak\addvspace{1ex}\@afterheading} \newcommand{\subsectionfill}{\xleaders\hbox to 0.35em{\scriptsize.}\hfill}% different subsectionfills 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*{\subsection}[1]{% +\RenewDocumentCommand{\subsection}{sm}{% \par\addvspace{1ex}% \phantomsection{}% - \addcontentsline{toc}{subsection}{#1}% - \strut\subsectionstyle{#1}{\color{color1}{\subsectionfill}}% + \addcontentsline{toc}{subsection}{#2}% + \strut\subsectionstyle{#2}{\color{color1}{\subsectionfill}}% \par\nobreak\addvspace{0.5ex}\@afterheading} \renewcommand*{\cvitem}[3][.25em]{% diff --git a/moderncvstyleclassic.sty b/moderncvstyleclassic.sty index 95d50de..946fdd5 100644 --- a/moderncvstyleclassic.sty +++ b/moderncvstyleclassic.sty @@ -155,27 +155,27 @@ \newlength{\baseletterheight} \settoheight{\baseletterheight}{\sectionstyle{o}} \setlength{\baseletterheight}{\baseletterheight-0.95ex} -\renewcommand*{\section}[1]{% +\RenewDocumentCommand{\section}{sm}{% \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{section}{#1}% + \addcontentsline{toc}{section}{#2}% \parbox[t]{\hintscolumnwidth}{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}% \hspace{\separatorcolumnwidth}% - \parbox[t]{\maincolumnwidth}{\strut\sectionstyle{#1}}% + \parbox[t]{\maincolumnwidth}{\strut\sectionstyle{#2}}% \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading -\renewcommand*{\subsection}[1]{% +\RenewDocumentCommand{\subsection}{sm}{% \par\addvspace{1ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{subsection}{#1}% + \addcontentsline{toc}{subsection}{#2}% \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% - \raggedleft\hintstyle{} &{\strut\subsectionstyle{#1}}% + \raggedleft\hintstyle{} &{\strut\subsectionstyle{#2}}% \end{tabular}% \par\nobreak\addvspace{0.5ex}\@afterheading}% to avoid a pagebreak after the heading \renewcommand*{\cvitem}[3][.25em]{% \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% - \raggedleft\hintstyle{#2} &{#3}% + \raggedleft\hintstyle{#2} &{#3}% \end{tabular}% \par\addvspace{#1}} diff --git a/moderncvstyleoldstyle.sty b/moderncvstyleoldstyle.sty index 3effd3d..ff818f6 100644 --- a/moderncvstyleoldstyle.sty +++ b/moderncvstyleoldstyle.sty @@ -160,18 +160,18 @@ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httplink{\@homepage}}% \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}} -\renewcommand*{\section}[1]{% +\RenewDocumentCommand{\section}{sm}{% \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{section}{#1}% - \strut\sectionstyle{#1}% + \addcontentsline{toc}{section}{#2}% + \strut\sectionstyle{#2}% \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading -\renewcommand*{\subsection}[1]{% +\RenewDocumentCommand{\subsection}{sm}{% \par\addvspace{1ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{subsection}{#1}% - \strut\subsectionstyle{#1}% + \addcontentsline{toc}{subsection}{#2}% + \strut\subsectionstyle{#2}% \par\nobreak\addvspace{0.5ex}\@afterheading}% to avoid a pagebreak after the heading \renewcommand*{\cvitem}[3][.25em]{%