From 3f2cc686dc4659a63429682967ad9f37864fc0d8 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 27 Jan 2021 20:30:38 +0100 Subject: [PATCH] introduce \cvsectionstretchability and \cvsubsectionstretchability --- manual/moderncv_userguide.tex | 38 +++++++++++++++++++---------------- moderncv.cls | 5 ++++- moderncvbodyi.sty | 12 +++++------ moderncvbodyiii.sty | 15 ++++++-------- moderncvbodyiv.sty | 15 ++++++-------- moderncvbodyv.sty | 15 ++++++-------- 6 files changed, 49 insertions(+), 51 deletions(-) diff --git a/manual/moderncv_userguide.tex b/manual/moderncv_userguide.tex index 61e8d13..384544b 100644 --- a/manual/moderncv_userguide.tex +++ b/manual/moderncv_userguide.tex @@ -675,28 +675,18 @@ The labels used in \Code{itemize} environments or the \Moderncv macros \code{cvl This will leave the definitions of \Code{itemize} environments untouched. \end{itemize} -\subsection{Tips and Tricks} -\subsubsection{Legal disclaimer at the end of CV} -Some countries (e.g. Italy) require to add the permission to treat the personal data contained in the CV. This can be achieved by the command \code{\\vfill}. At the end of the last entry to your -CV, add the following:% -\footnote{Example provided by Cristina Sambo} % -\begin{lstlisting} - \vfill - \begin{center} - \textit{\small Ai sensi del D. Lgs. 196/2003 ...} - \end{center} -\end{lstlisting} - -\subsubsection{Orphaned sections} +\subsection{Pagebreaks and orphaned section headers} +\todox{explain things properly} If \latex~ breaks pages just after \code{\\section} or \code{\\subsection} commands, try adjusting the the stretchability of the page \begin{lstlisting} - \setlength{\cvstretchability}{}, + \setlength{\cvsectionstretchability}{} % + \setlength{\cvsubsectionstretchability}{}, \end{lstlisting} for example \begin{lstlisting} - \setlength{\cvstretchability}{\baselineskip} % or - % \setlength{\cvstretchability}{100pt}, + \setlength{\cvsectionstretchability}{\baselineskip} % or + % \setlength{\cvsubsectionstretchability}{100pt}, \end{lstlisting} in the document. It tells \latex that it needs approximately \Code{} extra length after section and subsection commands. @@ -717,7 +707,7 @@ Internally a custom needspace command is being used: \endgroup } \end{lstlisting} -This means that alternatively to setting \code{\\cvstretchability}, penalties for pagebreaks can be influenced by redefining the internal penalties: +This means that alternatively to setting \Code{\\cvsectionstretchability} and/or \code{\\cvsubsectionstretchability} , penalties for pagebreaks can be influenced by redefining the internal penalties: \begin{lstlisting} % must be between -100 and 9999. The higher the less likely a page break will occur. % This is where the page break should occur, so this number should not bee too high @@ -733,6 +723,20 @@ The penalties must be between -100 and 9999. The higher the value the less likel +\subsection{Tips and Tricks} +\subsubsection{Legal disclaimer at the end of CV} +Some countries (e.g. Italy) require to add the permission to treat the personal data contained in the CV. This can be achieved by the command \code{\\vfill}. At the end of the last entry to your +CV, add the following:% +\footnote{Example provided by Cristina Sambo} % +\begin{lstlisting} + \vfill + \begin{center} + \textit{\small Ai sensi del D. Lgs. 196/2003 ...} + \end{center} +\end{lstlisting} + + + \section{Implementation details} \label{section:implementationDetails} diff --git a/moderncv.cls b/moderncv.cls index 951f7ee..e57cec2 100644 --- a/moderncv.cls +++ b/moderncv.cls @@ -443,7 +443,10 @@ % custom needspace command to avoid orphaned sections % adapted from the explanations given on % https://tex.stackexchange.com/questions/348994/understanding-needspace -\@initializelength{\cvstretchability} +% the stretchabilities are zero by default and are only there to be changed +% by the user if needed. +\@initializelength{\cvsectionstretchability} +\@initializelength{\cvsubsectionstretchability} % must be between -100 and 9999. The higher the less likely a page break will occur. % This is where the page break should occur, so this number should not bee too high \NewDocumentCommand\withinstretchpenalty{}{0} diff --git a/moderncvbodyi.sty b/moderncvbodyi.sty index 601171d..c8752eb 100644 --- a/moderncvbodyi.sty +++ b/moderncvbodyi.sty @@ -70,16 +70,16 @@ \settoheight{\baseletterheight}{\sectionstyle{o}} \setlength{\baseletterheight}{\baseletterheight-0.95ex} -% Set \cvstretchability to the height of E for Experience -% \settoheight{\cvstretchability}{\sectionstyle{IT}+10ex} -\setlength{\cvstretchability}{.9\baselineskip}%3\baselineskip +% leave the stretchability zero by default +% \setlength{\cvsectionstretchability}{0.0pt} +% \setlength{\cvsubsectionstretchability}{0.0pt} % must be between -100 and 9999. The higher the less likely a page break will occur. % This is where the page break should occur, so this number should not bee too high -\RenewDocumentCommand\withinstretchpenalty{}{0} +% \RenewDocumentCommand\withinstretchpenalty{}{0} % must be between -100 and 9999. The higher the less likely a page break will occur. % \RenewDocumentCommand\poststretchpenalty{}{9999} \RenewDocumentCommand{\section}{sm}{% - \@cvneedspace{\cvstretchability}% avoit orphaned sections + \@cvneedspace{\cvsectionstretchability}% avoid orphaned sections \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{section}{#2}% @@ -87,7 +87,7 @@ \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading \RenewDocumentCommand{\subsection}{sm}{% - \@cvneedspace{\cvstretchability}% avoit orphaned sections + \@cvneedspace{\cvsubsectionstretchability}% avoid orphaned sections \par\addvspace{1ex}% \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{subsection}{#2}% diff --git a/moderncvbodyiii.sty b/moderncvbodyiii.sty index 2859814..b8bffde 100644 --- a/moderncvbodyiii.sty +++ b/moderncvbodyiii.sty @@ -102,19 +102,16 @@ % regular lengths \setlength{\parskip}{0\p@}} -\@initializelength{\baseletterheight} -\settoheight{\baseletterheight}{\sectionstyle{o}} -\setlength{\baseletterheight}{\baseletterheight-0.95ex} -% Set \cvstretchability to the height of E for Experience -% \settoheight{\cvstretchability}{\sectionstyle{E}} -\setlength{\cvstretchability}{\baseletterheight}%3\baselineskip +% leave the stretchability zero by default +% \setlength{\cvsectionstretchability}{0.0pt} +% \setlength{\cvsubsectionstretchability}{0.0pt} % must be between -100 and 9999. The higher the less likely a page break will occur. % This is where the page break should occur, so this number should not bee too high -\RenewDocumentCommand\withinstretchpenalty{}{40} +% \RenewDocumentCommand\withinstretchpenalty{}{0} % must be between -100 and 9999. The higher the less likely a page break will occur. % \RenewDocumentCommand\poststretchpenalty{}{9999} \RenewDocumentCommand{\section}{sm}{% - \@cvneedspace{\cvstretchability}% avoit orphaned sections + \@cvneedspace{\cvsectionstretchability}% avoid orphaned sections \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{section}{#2}% @@ -130,7 +127,7 @@ \par\nobreak\addvspace{1ex}\@afterheading} \RenewDocumentCommand{\subsection}{sm}{% - \@cvneedspace{\cvstretchability}% avoit orphaned sections + \@cvneedspace{\cvsubsectionstretchability}% avoid orphaned sections \par\addvspace{1ex}% \phantomsection{}% \addcontentsline{toc}{subsection}{#2}% diff --git a/moderncvbodyiv.sty b/moderncvbodyiv.sty index c0f7c0a..88907db 100644 --- a/moderncvbodyiv.sty +++ b/moderncvbodyiv.sty @@ -63,19 +63,16 @@ % regular lengths \setlength{\parskip}{0\p@}} -\@initializelength{\baseletterheight} -\settoheight{\baseletterheight}{\sectionstyle{o}} -\setlength{\baseletterheight}{\baseletterheight-0.95ex} -% Set \cvstretchability to the height of E for Experience -% \settoheight{\cvstretchability}{\sectionstyle{E}} -\setlength{\cvstretchability}{\baseletterheight}%3\baselineskip +% leave the stretchability zero by default +% \setlength{\cvsectionstretchability}{0.0pt} +% \setlength{\cvsubsectionstretchability}{0.0pt} % must be between -100 and 9999. The higher the less likely a page break will occur. % This is where the page break should occur, so this number should not bee too high -\RenewDocumentCommand\withinstretchpenalty{}{40} +% \RenewDocumentCommand\withinstretchpenalty{}{0} % must be between -100 and 9999. The higher the less likely a page break will occur. % \RenewDocumentCommand\poststretchpenalty{}{9999} \RenewDocumentCommand{\section}{sm}{% - \@cvneedspace{\cvstretchability}% avoit orphaned sections + \@cvneedspace{\cvsectionstretchability}% avoid orphaned sections \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{section}{#2}% @@ -83,7 +80,7 @@ \par\nobreak\addvspace{1ex}\@afterheading} \RenewDocumentCommand{\subsection}{sm}{% - \@cvneedspace{\cvstretchability}% avoit orphaned sections + \@cvneedspace{\cvsubsectionstretchability}% avoid orphaned sections \par\addvspace{1ex}% \phantomsection{}% \addcontentsline{toc}{subsection}{#2}% diff --git a/moderncvbodyv.sty b/moderncvbodyv.sty index 8f29ad9..910e7a1 100644 --- a/moderncvbodyv.sty +++ b/moderncvbodyv.sty @@ -67,21 +67,18 @@ % regular lengths \setlength{\parskip}{0\p@}} -\@initializelength{\baseletterheight} -\settoheight{\baseletterheight}{\sectionstyle{o}} -\setlength{\baseletterheight}{\baseletterheight-0.95ex} -% Set \cvstretchability to the height of E for Experience -% \settoheight{\cvstretchability}{\sectionstyle{E}} -\setlength{\cvstretchability}{\baseletterheight}%3\baselineskip +% leave the stretchability zero by default +% \setlength{\cvsectionstretchability}{0.0pt} +% \setlength{\cvsubsectionstretchability}{0.0pt} % must be between -100 and 9999. The higher the less likely a page break will occur. % This is where the page break should occur, so this number should not bee too high -\RenewDocumentCommand\withinstretchpenalty{}{40} +% \RenewDocumentCommand\withinstretchpenalty{}{0} % must be between -100 and 9999. The higher the less likely a page break will occur. % \RenewDocumentCommand\poststretchpenalty{}{9999} \@initializeif{\if@aftersection}\@aftersectionfalse% \RenewDocumentCommand{\section}{sm}{% - \@cvneedspace{\cvstretchability}% avoit orphaned sections + \@cvneedspace{\cvsectionstretchability}% avoid orphaned sections \addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{section}{#2}% @@ -90,7 +87,7 @@ %\@initializeif{\if@aftersubsection}\@aftersubsectionfalse% \RenewDocumentCommand{\subsection}{sm}{% - \@cvneedspace{\cvstretchability}% avoit orphaned sections + \@cvneedspace{\cvsubsectionstretchability}% avoid orphaned sections %\addvspace{1ex}% \vspace*{-\arrayrulewidth}% HACK; I don't understand where the space is coming from, nor what it's exact value is :( \if@aftersection%