From e5a190efd9b3905dc35b8a4b24ddc8923bafa2eb Mon Sep 17 00:00:00 2001
From: Xavier Danaux <xdanaux@gmail.com>
Date: Mon, 17 Feb 2014 16:05:52 -0500
Subject: [PATCH] Simplified the \section and \subsection code of the classic
 style variant

---
 moderncvstyleclassic.sty | 46 ++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/moderncvstyleclassic.sty b/moderncvstyleclassic.sty
index 58b7d27..3626418 100644
--- a/moderncvstyleclassic.sty
+++ b/moderncvstyleclassic.sty
@@ -57,17 +57,17 @@
 \renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
 
 % lengths
-\newlength{\quotewidth}
-\newlength{\hintscolumnwidth}
+\@initializelength{\quotewidth}
+\@initializelength{\hintscolumnwidth}
 \setlength{\hintscolumnwidth}{0.175\textwidth}
-\newlength{\separatorcolumnwidth}
+\@initializelength{\separatorcolumnwidth}
 \setlength{\separatorcolumnwidth}{0.025\textwidth}
-\newlength{\maincolumnwidth}
-\newlength{\doubleitemmaincolumnwidth}
-\newlength{\listitemsymbolwidth}
+\@initializelength{\maincolumnwidth}
+\@initializelength{\doubleitemmaincolumnwidth}
+\@initializelength{\listitemsymbolwidth}
 \settowidth{\listitemsymbolwidth}{\listitemsymbol}
-\newlength{\listitemmaincolumnwidth}
-\newlength{\listdoubleitemmaincolumnwidth}
+\@initializelength{\listitemmaincolumnwidth}
+\@initializelength{\listdoubleitemmaincolumnwidth}
 
 % commands
 \renewcommand*{\recomputecvlengths}{%
@@ -147,26 +147,22 @@
     {{\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 \makecvtitle
 
-\newlength{\baseletterheight}
+\@initializelength{\baseletterheight}
 \settoheight{\baseletterheight}{\sectionstyle{o}}
 \setlength{\baseletterheight}{\baseletterheight-0.95ex}
 \RenewDocumentCommand{\section}{sm}{%
   \par\addvspace{2.5ex}%
   \phantomsection{}% reset the anchor for hyperrefs
   \addcontentsline{toc}{section}{#2}%
-  \parbox[t]{\hintscolumnwidth}{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}%
-  \hspace{\separatorcolumnwidth}%
-  \parbox[t]{\maincolumnwidth}{\strut\sectionstyle{#2}}%
+  \cvitem[0ex]{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}{\strut\sectionstyle{#2}}%
   \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading
 
 \RenewDocumentCommand{\subsection}{sm}{%
   \par\addvspace{1ex}%
   \phantomsection{}% reset the anchor for hyperrefs
   \addcontentsline{toc}{subsection}{#2}%
-  \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
-    \raggedleft\hintstyle{} &{\strut\subsectionstyle{#2}}%
-  \end{tabular}%
-  \par\nobreak\addvspace{0.5ex}\@afterheading}% to avoid a pagebreak after the heading
+  \cvitem[0ex]{}{\strut\subsectionstyle{#2}}%
+  \par\nobreak\addvspace{.5ex}\@afterheading}% to avoid a pagebreak after the heading
 
 \renewcommand*{\cvitem}[3][.25em]{%
   \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
@@ -175,12 +171,12 @@
   \par\addvspace{#1}}
 
 \renewcommand*{\cvdoubleitem}[5][.25em]{%
- \cvitem[#1]{#2}{%
-   \begin{minipage}[t]{\doubleitemmaincolumnwidth}#3\end{minipage}%
-   \hfill% fill of \separatorcolumnwidth
-   \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#4}\end{minipage}%
-   \hspace*{\separatorcolumnwidth}%
-   \begin{minipage}[t]{\doubleitemmaincolumnwidth}#5\end{minipage}}}
+  \cvitem[#1]{#2}{%
+    \begin{minipage}[t]{\doubleitemmaincolumnwidth}#3\end{minipage}%
+    \hfill% fill of \separatorcolumnwidth
+    \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#4}\end{minipage}%
+    \hspace*{\separatorcolumnwidth}%
+    \begin{minipage}[t]{\doubleitemmaincolumnwidth}#5\end{minipage}}}
 
 \renewcommand*{\cvlistitem}[2][.25em]{%
   \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}}}
@@ -202,9 +198,9 @@
     \ifx&#7&%
       \else{\newline{}\begin{minipage}[t]{\linewidth}\small#7\end{minipage}}\fi}}
 
-\newbox{\cvitemwithcommentmainbox}
-\newlength{\cvitemwithcommentmainlength}
-\newlength{\cvitemwithcommentcommentlength}
+\@initializebox{\cvitemwithcommentmainbox}
+\@initializelength{\cvitemwithcommentmainlength}
+\@initializelength{\cvitemwithcommentcommentlength}
 \renewcommand*{\cvitemwithcomment}[4][.25em]{%
   \savebox{\cvitemwithcommentmainbox}{{\bfseries#3}}%
   \setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}%