summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/moderncv
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-12-05 23:58:58 +0000
committerKarl Berry <karl@freefriends.org>2011-12-05 23:58:58 +0000
commit447c1d22bf02017dfb91166824a5d15cb643ed04 (patch)
treeb890d9255a5b5a23b526daa334a0026720948f15 /Master/texmf-dist/tex/latex/moderncv
parent4863930a95d1335988d5114d94d30984305aa49c (diff)
moderncv 0.14 (5dec11)
git-svn-id: svn://tug.org/texlive/trunk@24770 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/moderncv')
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncv.cls52
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty45
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty19
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty2
5 files changed, 55 insertions, 65 deletions
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index a2e596813ba..b4199d585ea 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{moderncv}[2011/11/11 v0.13.1 modern curriculum vitae document class]
+\ProvidesClass{moderncv}[2011/12/04 v0.14 modern curriculum vitae document class]
%-------------------------------------------------------------------------------
@@ -64,10 +64,6 @@
\newif\if@lmodern\@lmoderntrue
\DeclareOption{nolmodern}{\@lmodernfalse}
-% CJK option
-%\newif\if@CJK\@CJKfalse
-%\DeclareOption{CJK}{\@CJKtrue}
-
% execute default options
\ExecuteOptions{a4paper,11pt,color,final}
@@ -89,18 +85,12 @@
% if... then... else... constructs
\RequirePackage{ifthen}
-% latex vs pdflatex vs xelatex vs luatex compilation
-%\RequirePackage{ifpdf}
-
% color
\RequirePackage{color}
% font encoding
\RequirePackage[T1]{fontenc}
-% scalable Computer Modern fonts
-%\usepackage{type1cm}
-
% latin modern fonts
\if@lmodern
\RequirePackage{lmodern}\fi
@@ -108,9 +98,6 @@
% symbols like \Telefon, \Mobilefone, \Letter and \Email
\RequirePackage{marvosym}
-% extended characters of T1 in .ps + other guillemets
-%\RequirePackage{ae,aecompl,aeguill}
-
% page geometry
\addtolength{\oddsidemargin}{-54pt}
\addtolength{\textwidth}{109pt}
@@ -125,15 +112,14 @@
% load hyperred at the end of the preamble to pass options required by loaded packages (like CJK)
\AtEndPreamble{
\@ifpackageloaded{CJK}
- {\RequirePackage[CJKbookmarks]{hyperref}}
+ {\RequirePackage[unicode]{hyperref}}
{\RequirePackage{hyperref}}
- \AtBeginDocument{
\hypersetup{
breaklinks,
baseurl = http://,
pdfborder = 0 0 0,
pdfpagemode = UseNone,% do not show thumbnails or bookmarks on opening
-% pdfstartview = FitH,
+ pdfpagelabels = false,% to avoid a warning setting it automatically to false anyway, because hyperref detects \thepage as undefined (why?)
pdfstartpage = 1,
pdfcreator = \LaTeX{} with `moderncv' package,
pdfproducer = \LaTeX{},
@@ -141,7 +127,7 @@
pdfauthor = \@firstname~\@familyname,
pdftitle = \@title,
pdfsubject = \@firstname~\@familyname,
- pdfkeywords = \@firstname~\@familyname{} curriculum vit\ae{}}}
+ pdfkeywords = \@firstname~\@familyname{} curriculum vit\ae{}}
\pagenumbering{arabic}% has to be issued after loading hyperref
}
@@ -170,14 +156,14 @@
\setlength\lineskip{1\p@}
\setlength\normallineskip{1\p@}
\renewcommand\baselinestretch{}
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{0pt}
+\setlength{\parindent}{0\p@}
+\setlength{\parskip}{0\p@}
\setlength\columnsep{10\p@}
\setlength\columnseprule{0\p@}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
-% TO BE TESTED
+% Not required
%\setlength\arraycolsep{5\p@}
%\setlength\tabcolsep{6\p@}
%\setlength\arrayrulewidth{.4\p@}
@@ -232,12 +218,16 @@
\providecommand*{\subsectionstyle}[1]{{\subsectionfont\color{subsectioncolor}#1}}
\providecommand*{\hintstyle}[1]{{\hintfont\color{hintcolor}#1}}
-% themes: casual (default), classic, ...
+% makes the cv title
+\newcommand*{\maketitle}{}%
+\title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title
+
+% makes the cv footer
+\newcommand*{\makefooter}
+
+% loads a style
\newcommand*{\moderncvtheme}[2][]{
- \def\@moderncvtheme{#2}
- \def\@moderncvthemeoptions{#1}}
-\moderncvtheme{casual}% default theme
-\AtEndPreamble{\RequirePackage[\@moderncvthemeoptions]{moderncvtheme\@moderncvtheme}}
+ \RequirePackage[#1]{moderncvtheme#2}}
%-------------------------------------------------------------------------------
@@ -261,6 +251,7 @@
\newlength{\quotewidth}
% section lengths
\newlength{\hintscolumnwidth}
+\setlength{\hintscolumnwidth}{0.15\textwidth}
\newlength{\separatorcolumnwidth}
\setlength{\separatorcolumnwidth}{0.025\textwidth}
\newlength{\maincolumnwidth}
@@ -294,13 +285,8 @@
\setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}%
% fancyhdr lengths
\renewcommand{\headwidth}{\textwidth}%
- \recomputethemelengths}
-\setlength{\hintscolumnwidth}{0.15\textwidth}
-\recomputelengths
-
-% makes the cv title
-%\newcommand*{\maketitle}{}%
-\title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title
+ \recomputethemelengths{}}
+\AtBeginDocument{\recomputelengths{}}
% draws a colored rectangle
% usage: \colorrule[optional height]{width}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
index e32e667f38c..9069a4d5f17 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcompatibility}[2011/11/11 v0.13.1 modern curriculum vitae compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2011/12/04 v0.14 modern curriculum vitae compatibility patches]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
index 76332ed49a5..77cd1b58139 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvthemecasual}[2011/11/11 v0.13.1 modern curriculum vitae style: casual]
+\ProvidesPackage{moderncvthemecasual}[2011/12/04 v0.14 modern curriculum vitae style: casual]
%-------------------------------------------------------------------------------
@@ -123,26 +123,6 @@
% styles
-% maketitle
-\renewcommand*{\maketitle}{%
- {%
- \ifthenelse{\isundefined{\@photo}}%
- {}%
- {%
- \setlength\fboxrule{\@photoframewidth}%
- \ifdim\@photoframewidth=0pt%
- \setlength{\fboxsep}{0pt}\fi%
- {\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
- \hfill%
-% \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}%
- \raggedleft{\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}}\\[-.35em]}%
- {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[2.5em]}%
-% optional quote
- \ifthenelse{\isundefined{\@quote}}%
- {}%
- {{\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
-
% cv footer
\newif\if@firstfooterelement\@firstfooterelementtrue
\providecommand*{\footersymbol}{}
@@ -150,7 +130,6 @@
\if@firstfooterelement%
\else%
{ ~~\color{footersymbolcolor}\textbullet~~~}\fi}
-\providecommand*{\makefooter}{}
\renewcommand*{\makefooter}{%
\fancypagestyle{plain}{%
\fancyfoot[c]{%
@@ -169,7 +148,27 @@
\ifthenelse{\isundefined{\@extrainfo}}{}{\footersymbol\@extrainfo\@firstfooterelementfalse}}}%
}%
\pagestyle{plain}}
-\AtBeginDocument{\makefooter}
+
+% maketitle
+\renewcommand*{\maketitle}{%
+ \makefooter{}%
+ {%
+ \ifthenelse{\isundefined{\@photo}}%
+ {}%
+ {%
+ \setlength\fboxrule{\@photoframewidth}%
+ \ifdim\@photoframewidth=0pt%
+ \setlength{\fboxsep}{0pt}\fi%
+ {\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
+ \hfill%
+% \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}%
+ \raggedleft{\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}}\\[-.35em]}%
+ {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[2.5em]}%
+% optional quote
+ \ifthenelse{\isundefined{\@quote}}%
+ {}%
+ {{\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
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
index 690f6c35509..799851a5f2a 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvthemeclassic}[2011/11/11 v0.13.1 modern curriculum vitae style: classic]
+\ProvidesPackage{moderncvthemeclassic}[2011/12/04 v0.14 modern curriculum vitae style: classic]
%-------------------------------------------------------------------------------
@@ -123,14 +123,11 @@
% styles
% maketitle
-% setmaketitlenamemaxwidth to the full name length, capped by \maketitlenamemaxwidth
+% set \maketitlenamewidth to the desired length, or leave it up to moderncv to try to optimize it
\newlength{\maketitlenamemaxwidth}
\setlength{\maketitlenamemaxwidth}{.525\textwidth}
-\newlength{\maketitlenamefullwidth}
-\settowidth{\maketitlenamefullwidth}{\firstnamestyle{\@firstname~}\familynamestyle{\@familyname}}
\newlength{\maketitlenamewidth}
-\ifnum\maketitlenamemaxwidth<\maketitlenamefullwidth\setlength{\maketitlenamewidth}{\maketitlenamemaxwidth}\else\setlength{\maketitlenamewidth}{\maketitlenamefullwidth}\fi
-% other lengths
+\setlength{\maketitlenamewidth}{0pt}
\newlength{\maketitlepicturewidth}
\newlength{\maketitledetailswidth}
% recompute theme-specific lengths, called by class to recompute all lengths
@@ -142,7 +139,6 @@
{\setlength{\maketitlepicturewidth}{\@photowidth}
\addtolength{\maketitledetailswidth}{-\separatorcolumnwidth}%
\addtolength{\maketitledetailswidth}{-\maketitlepicturewidth}}}
-\recomputethemelengths
\newif\if@firstdetailselement\@firstdetailselementtrue
\newcommand*{\maketitledetailsnewline}{
\if@firstdetailselement%
@@ -150,6 +146,15 @@
\else%
\\[.2em]\fi}
\renewcommand*{\maketitle}{%
+ % recompute lengths (necessary to delay the computation of \maketitlenamefullwidth until \maketitle because of potential CJK requirement in \@firstname and \@familyname)
+ \ifdim\maketitlenamewidth=0pt%
+ \newlength{\maketitlenamefullwidth}%
+ \settowidth{\maketitlenamefullwidth}{\firstnamestyle{\@firstname~}\familynamestyle{\@familyname}}%
+ \ifnum\maketitlenamemaxwidth<\maketitlenamefullwidth%
+ \setlength{\maketitlenamewidth}{\maketitlenamemaxwidth}%
+ \else%
+ \setlength{\maketitlenamewidth}{\maketitlenamefullwidth}\fi\fi
+ \recomputethemelengths{}%
% name and title
\begin{minipage}[b]{\maketitlenamewidth}%
\firstnamestyle{\@firstname~}\familynamestyle{\@familyname}%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
index 1433c39c6c2..e2c7d59e884 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvthemeempty}[2011/11/11 v0.13.1 modern curriculum vitae style: empty]
+\ProvidesPackage{moderncvthemeempty}[2011/12/04 v0.14 modern curriculum vitae style: empty]
%-------------------------------------------------------------------------------