diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/moderncv/CHANGELOG | 17 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf | bin | 150303 -> 153886 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf | bin | 216856 -> 225545 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 151 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty | 57 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty | 4 |
10 files changed, 135 insertions, 125 deletions
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG index 8c0e49a8b53..c1d10bc5937 100644 --- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG +++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG @@ -1,3 +1,20 @@ +version 0.7 (17 June 2008) + - corrected an outstanding spacing bug (space between cvlines longer + than 1 line). + - removed the need to use \closesection and \emptysection as internal + tabulars are now always closed. This allows she use of bibliography packages + such as bibunits. + - changed the definition of \photo: the first (optional) argument should + give the desired width of the picture, instead of its height + - corrected an alignment bug for \cvlistitems longer than 1 line, as + reported by S. Nikolopoulos. + - deprecated the commands \sethintscolumnlength and \sethintscolumntowidth. + Instead, just set \hintscolumnwidth to the desired length by using the regular + \setlength or \settowidth commands, and call \recomputelengths. + - added the ability to control the width of the name placeholder in the classic + theme, by setting the length \maketitlenamewidth. Again, don't forget to call + \recomputelengths afterward. + version 0.6 (28 May 2007) - corrected some spacing bugs and cleaned up the code. - corrected a bug in the bibliography file of the examples spotted by diff --git a/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS b/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS index 061bf42fb21..93940991301 100644 --- a/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS +++ b/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS @@ -1,3 +1,2 @@ -- moderncv doesn't work with natbib - The \cvsection command seems to be unable to handle a Chinese argument, using CJK. diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex index 8722001efa2..3ed87b0e501 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex @@ -1,5 +1,5 @@ %% start of file `template_en.tex'. -%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-1008 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -17,7 +17,9 @@ % adjust the page margins \usepackage[scale=0.8]{geometry} -\recomputelengths % required when changes are made to page layout lengths +%\setlength{\hintscolumnwidth}{3cm} % if you want to change the width of the column with the dates +%\AtBeginDocument{\setlength{\maketitlenamewidth}{6cm}} % only for the classic theme, if you want to change the width of your name placeholder (to leave more space for your address details +\AtBeginDocument{\recomputelengths} % required when changes are made to page layout lengths % personal data \firstname{John} @@ -72,7 +74,6 @@ \cvline{hobby 2}{\small Description} \cvline{hobby 3}{\small Description} -\closesection{} % needed to renewcommands \renewcommand{\listitemsymbol}{-} % change the symbol for lists \section{Extra 1} diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf Binary files differindex 415e19eaae0..e1db45ba2c4 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf Binary files differindex 839351296e1..9128c8c4976 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index 44c4877b94a..ff667f8beeb 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls +++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls @@ -1,5 +1,5 @@ %% start of file `moderncv.cls'. -%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2008 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{moderncv}[2007/05/28 v0.6 modern curriculum vitae document class] +\ProvidesClass{moderncv}[2008/06/17 v0.7 modern curriculum vitae document class] %------------------------------------------------------------------------------- @@ -120,34 +120,27 @@ % hyperrefs \RequirePackage{url} \ifpdf - \RequirePackage[pdftex]{hyperref} + \RequirePackage[pdftex,]{hyperref} \else \RequirePackage[dvips]{hyperref}\fi +\hypersetup{% + breaklinks, + baseurl = http://,% + pdfborder = 0 0 0,% + pdfpagemode = UseNone,% +% pdfstartview = XYZ,% + pdfstartpage = 1,% + pdfcreator = \LaTeX{} with `moderncv' package,% + pdfproducer = \LaTeX} \AtEndOfClass{% \AtBeginDocument{% \hypersetup{% - breaklinks, - baseurl = http://, - pdfborder = 0 0 0, - pdfpagemode = None, - pdfstartview = XYZ, - pdfstartpage = 1, pdfauthor = \@firstname~\@familyname,% pdftitle = \@title,% pdfsubject = \@firstname~\@familyname,% - pdfkeywords = \@firstname~\@familyname{} curriculum vit\ae{},% - pdfcreator = \LaTeX{} with `moderncv' package,% - pdfproducer = \LaTeX}}} + pdfkeywords = \@firstname~\@familyname{} curriculum vit\ae{}}}} \urlstyle{tt} -% tables that split across multiple pages -\RequirePackage[]{longtable} -% spacing between sections -\setlength{\LTpre}{\smallskipamount} -\setlength{\LTpost}{\smallskipamount} -\setlength{\LTleft}{0pt} -\setlength{\LTright}{0pt} - % graphics \ifpdf \RequirePackage[pdftex]{graphicx} @@ -245,7 +238,8 @@ \renewcommand*{\fax}[1]{\def\@fax{#1}} \newcommand*{\email}[1]{\def\@email{#1}} \newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}} -\newcommand*{\photo}[2][64pt]{\def\@photoheight{#1}\def\@photo{#2}} +\def\@photowidth{0pt} +\newcommand*{\photo}[2][64pt]{\def\@photowidth{#1}\def\@photo{#2}} \newcommand*{\quote}[1]{\def\@quote{#1}} % length used by the moderncv layout @@ -256,27 +250,25 @@ \newlength{\separatorcolumnwidth} \setlength{\separatorcolumnwidth}{0.025\textwidth} \newlength{\maincolumnwidth} -\newcommand*{\sethintscolumnlength}[1]{ - \setlength{\hintscolumnwidth}{#1}% - \setlength{\maincolumnwidth}{\textwidth}% - \addtolength{\maincolumnwidth}{-\separatorcolumnwidth}% - \addtolength{\maincolumnwidth}{-\hintscolumnwidth}} -\newcommand*{\sethintscolumntowidth}[1]{ - \settowidth{\hintscolumnwidth}{#1}% - \setlength{\maincolumnwidth}{\textwidth}% - \addtolength{\maincolumnwidth}{-\separatorcolumnwidth}% - \addtolength{\maincolumnwidth}{-\hintscolumnwidth}} % doubleitem lengths \newlength{\doubleitemmaincolumnwidth} % listitem lengths \newlength{\listitemsymbolwidth} \settowidth{\listitemsymbolwidth}{\listitemsymbol{}~} +\newlength{\listitemmaincolumnwidth} % listdoubleitem lengths \newlength{\listdoubleitemmaincolumnwidth} % recompute all the lengths that depends on the text width +\newcommand*{\recomputethemelengths}{} \newcommand*{\recomputelengths}{% \setlength{\quotewidth}{0.65\textwidth}% - \sethintscolumnlength{\hintscolumnwidth}% + % main lenghts + \setlength{\maincolumnwidth}{\textwidth}% + \addtolength{\maincolumnwidth}{-\separatorcolumnwidth}% + \addtolength{\maincolumnwidth}{-\hintscolumnwidth}% + % listitem lengths + \setlength{\listitemmaincolumnwidth}{\maincolumnwidth}% + \addtolength{\listitemmaincolumnwidth}{-\listitemsymbolwidth}% % doubleitem lengths \setlength{\doubleitemmaincolumnwidth}{\maincolumnwidth}% \addtolength{\doubleitemmaincolumnwidth}{-\hintscolumnwidth}% @@ -287,67 +279,50 @@ \addtolength{\listdoubleitemmaincolumnwidth}{-\listitemsymbolwidth}% \setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}% % fancyhdr lengths - \renewcommand{\headwidth}{\textwidth}} -\sethintscolumnlength{0.15\textwidth} + \renewcommand{\headwidth}{\textwidth}% + \recomputethemelengths} +\setlength{\hintscolumnwidth}{0.15\textwidth} \recomputelengths % makes the cv title +\title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title \renewcommand*{\maketitle}{}% % draws a colored rectangle % usage: \colorrule[optional height]{width} %\newcommand*{\colorrule}[2][1ex]{{\color{sectionrectanglecolor}{\rule{#2}{#1}}}} -\newif\if@sectionopen\@sectionopenfalse -\newif\if@firstcvlineofsection\@firstcvlineofsectionfalse % bug if initially set to true... -% usage: \closesection{} to force a section to be closed (and the tabular layout it generates) -\newcommand*{\closesection}{% - \if@sectionopen% - \end{longtable}% -% \phantomsection% reset the anchor for hyperrefs -% \par\null% - \@sectionopenfalse\fi} -\AtEndDocument{\closesection{}} -% usage: \section{<title>}, or \emptysection{} +% usage: \section{<title>} \newcommand*{\section}[1]{% - \closesection{}% - \@sectionopentrue% + \vspace*{2.5ex \@plus 1ex \@minus .2ex}% \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{part}{#1}% - \begin{longtable}[l]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% - {\color{sectionrectanglecolor}\rule{\hintscolumnwidth}{1ex}} &\sectionstyle{#1}\\[1ex]% - \@firstcvlineofsectiontrue% - } -\newcommand*{\emptysection}{% - \closesection{}% - \@sectionopentrue% - \begin{longtable}[l]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% - \@firstcvlineofsectiontrue% - } + \parbox[m]{\hintscolumnwidth}{\raggedleft\hintfont{\color{sectionrectanglecolor}\rule{\hintscolumnwidth}{1ex}}}% + \hspace{\separatorcolumnwidth}% + \parbox[m]{\maincolumnwidth}{\sectionstyle{#1}}\\[1ex]} +% \cvline[1ex]{\color{sectionrectanglecolor}\rule[0]{\hintscolumnwidth}{1ex}}{\sectionstyle{#1}}}% gives bad alignment of rectangle; too bad m{width} columns seem not to work as a valid column definition for tabular environments -% usage (inside section): \subsection{title} +% usage: \subsection{title} \newcommand*{\subsection}[1]{% - \cvline[0.65em]{}{\subsectionstyle{#1}}} + \cvline[0.45em]{}{\subsectionstyle{#1}}} -% usage (inside section): \cvline{leftmark}{text} +% usage: \cvline{margintext}{linetext} \newcommand*{\cvline}[3][.25em]{% - \if@firstcvlineofsection% - \@firstcvlineofsectionfalse% - \else% - \\[#1]\fi% - \raggedleft\hintfont{#2} } + \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% + \raggedleft\hintfont{#2} &{#3}% + \end{tabular}\\[#1]} -% usage (inside section}: \cvdoubleitem{subtitle}{text}{subtitle}{text} +% usage: \cvdoubleitem{subtitle}{text}{subtitle}{text} \newcommand*{\cvdoubleitem}[4]{% \cvline{#1}{\begin{minipage}[t]{\doubleitemmaincolumnwidth}#2\end{minipage}% \hfill% \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintfont{#3}\end{minipage}\hspace*{\separatorcolumnwidth}\begin{minipage}[t]{\doubleitemmaincolumnwidth}#4\end{minipage}}} -% usage (inside section): \cvlistitem{point1} +% usage: \cvlistitem[symbol]{point1} \newcommand*{\cvlistitem}[2][\listitemsymbol{}]{% - \cvline[0pt]{}{#1~#2}} + \cvline[0pt]{}{#1~\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}}} -% usage (inside section): \cvlistdoubleitem{point1}{point2} +% usage: \cvlistdoubleitem[symbol]{point1}{point2} \newcommand*{\cvlistdoubleitem}[3][\listitemsymbol{}]{% \cvline[0pt]{}{#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}% \hfill% @@ -355,17 +330,16 @@ {}% {#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#3\end{minipage}}}} -% usage : \cventry{years}{degree/job title}{institution/employer}{localization}{optionnal: grade/...}{optional: comment/job description} +% usage: \cventry{years}{degree/job title}{institution/employer}{localization}{optionnal: grade/...}{optional: comment/job description} \newcommand*{\cventry}[6]{% \cvline{#1}{% {\bfseries#2}% - \ifthenelse{\equal{#3}{}}{}{, {\slshape#3}}% - \ifthenelse{\equal{#4}{}}{}{, #4}% - \ifthenelse{\equal{#5}{}}{}{, #5}% + \ifx#3\else{, {\slshape#3}}\fi% + \ifx#4\else{, #4}\fi% + \ifx#5\else{, #5}\fi% .% - \ifthenelse{\equal{#6}{}}{}{\newline{}\small#6} + \ifx#6\else{\newline{}\begin{minipage}[t]{\linewidth}\small#6\end{minipage}}\fi }}% -% \ifthenelse{\equal{#6}{}}{}{\cvline[0pt]{}{\small#6}}} % usage (inside 'language' cvsection environment): \cvlanguage{name}{level}{comment} \newcommand*{\cvlanguage}[3]{% @@ -375,26 +349,23 @@ \newcommand*{\cvcomputer}[4]{% \cvdoubleitem{#1}{\small#2}{#3}{\small#4}} -% usage: \weblink[optional text]{link} -\newcommand*{\weblink}[2][]{% +% usage: \link[optional text]{link} +\newcommand*{\link}[2][]{% \ifthenelse{\equal{#1}{}}% - {\def\@linktext{#2}}% - {\def\@linktext{#1}}% - \href{#2}{\@linktext{}}} + {\href{#2}{#2}}% + {\href{#2}{#1}}} % usage: \httplink[optional text]{link} \newcommand*{\httplink}[2][]{% \ifthenelse{\equal{#1}{}}% - {\def\@linktext{#2}}% - {\def\@linktext{#1}}% - \href{http://#2}{\@linktext{}}} + {\href{http://#2}{#2}}% + {\href{http://#2}{#1}}} % usage: \emaillink[optional text]{link} \newcommand*{\emaillink}[2][]{% \ifthenelse{\equal{#1}{}}% - {\def\@linktext{#2}}% - {\def\@linktext{#1}}% - \href{mailto:#2}{\@linktext{}}} + {\href{mailto:#2}{#2}}% + {\href{mailto:#2}{#1}}} % usage: \nopagenumbers{} \newif\if@displaypagenumbers\@displaypagenumberstrue @@ -413,18 +384,12 @@ \newcommand{\refname}{Publications} \newlength{\bibindent} \setlength{\bibindent}{1.5em} -% trick to force the previous section to close before the thebibliography environment -\let\oldbibliography\bibliography -\renewcommand*{\bibliography}[1]{% - \closesection{}% - \oldbibliography{#1}} % bibliography item label \newcommand*{\bibliographyitemlabel}{}% use \@biblabel{\arabic{enumiv}} for BibTeX labels \newenvironment{thebibliography}[1]% {% \section{\refname}% - \closesection{}% - \vspace*{-1.65em}% +% \vspace*{-0.65em}% \small% \begin{list}{\bibliographyitemlabel}% {% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index 04f95016236..19b62d88345 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcompatibility.sty'. -%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2008 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcompatibility}[2007/05/28 v0.6 modern curriculum vitae compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2008/06/17 v0.7 modern curriculum vitae compatibility patches] %------------------------------------------------------------------------------- @@ -56,6 +56,16 @@ \newcommand*{\cvitem}[2]{\cvline{#1}{#2}} \newcommand*{\moderncvstyle}[1]{\moderncvtheme{#1}} +% compatibility with versions <=0.7 +\newcommand*{\closesection}{} +\newcommand*{\emptysection}{} +\newcommand*{\sethintscolumnlength}[1]{% + \setlength{\hintscolumnwidth}{#1}% + \recomputelengths} +\newcommand*{\sethintscolumntowidth}[1]{% + \settowidth{\hintscolumnwidth}{#1}% + \recomputelengths} + \endinput diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty index 58f25c710a4..ebb7dd2455c 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}[2007/05/28 v0.6 modern curriculum vitae style: casual] +\ProvidesPackage{moderncvthemecasual}[2008/06/17 v0.7 modern curriculum vitae style: casual] %------------------------------------------------------------------------------- @@ -109,9 +109,10 @@ {% \ifthenelse{\isundefined{\@photo}}% {}% - {{\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}}% + {{\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}% \hfill% - \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}% +% \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}}% @@ -136,7 +137,7 @@ \ifthenelse{\isundefined{\@addressstreet}}{}{% \addresssymbol~\@addressstreet% \@firstfooterelementfalse% - \ifthenelse{\isundefined{\@addresscity}}{}{\footersymbol\@addresscity}\\\@firstfooterelementtrue}% + \ifthenelse{\isundefined{\@addresscity}}{}{~--~\@addresscity}\\\@firstfooterelementtrue}% \ifthenelse{\isundefined{\@mobile}}{}{\footersymbol\mobilesymbol~\@mobile\@firstfooterelementfalse}% \ifthenelse{\isundefined{\@phone}}{}{\footersymbol\phonesymbol~\@phone\@firstfooterelementfalse}% \ifthenelse{\isundefined{\@fax}}{}{\footersymbol\faxsymbol~\@fax\@firstfooterelementfalse}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty index a9c44f3904b..872d67d5796 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty @@ -1,5 +1,5 @@ %% start of file `moderncvthemeclassic.sty'. -%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2008 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvthemeclassic}[2007/05/28 v0.6 modern curriculum vitae style: classic] +\ProvidesPackage{moderncvthemeclassic}[2008/06/17 v0.7 modern curriculum vitae style: classic] %------------------------------------------------------------------------------- @@ -106,36 +106,53 @@ % styles % maketitle +% setmaketitlenamemaxwidth to the full name length, capped by \maketitlenamemaxwidth +\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 +\newlength{\maketitlepicturewidth} +\setlength{\maketitlepicturewidth}{\@photowidth} +\newlength{\maketitledetailswidth} +% recompute theme-specific lengths, called by class to recompute all lengths +\renewcommand*{\recomputethemelengths}{% + \setlength{\maketitledetailswidth}{\textwidth}% + \addtolength{\maketitledetailswidth}{-\maketitlenamewidth}% + \addtolength{\maketitledetailswidth}{-\separatorcolumnwidth}% + \addtolength{\maketitledetailswidth}{-\maketitlepicturewidth}} +\recomputethemelengths +\newif\if@firstdetailselement\@firstdetailselementtrue +\newcommand*{\maketitledetailsnewline}{ + \if@firstdetailselement% + \@firstdetailselementfalse% + \else% + \\[.2em]\fi} \renewcommand*{\maketitle}{% % name and title - \if@DEBUG\framebox{\fi - \begin{minipage}[b]{.525\textwidth}% + \begin{minipage}[b]{\maketitlenamewidth}% \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}% - \ifthenelse{\isundefined{\@title}}% - {}% - {\\[1.25em]\titlestyle{\@title}}% + \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}% \end{minipage}% - \if@DEBUG}\fi - \hfill% - \if@DEBUG\framebox{\fi% % optional data - \begin{minipage}[b]{.225\textwidth}% + \begin{minipage}[b]{\maketitledetailswidth}% \raggedleft\addressfont\color{addresscolor}% \ifthenelse{\isundefined{\@addressstreet}}{}{% + \maketitledetailsnewline% \addresssymbol~\@addressstreet% - \ifthenelse{\isundefined{\@addresscity}}{}{\\\@addresscity}% - \\[.2em]}% - \ifthenelse{\isundefined{\@mobile}}{}{\mobilesymbol~\@mobile\\[.2em]}% - \ifthenelse{\isundefined{\@phone}}{}{\phonesymbol~\@phone\\[.2em]}% - \ifthenelse{\isundefined{\@fax}}{}{\faxsymbol~\@fax\\[.2em]}% - \ifthenelse{\isundefined{\@email}}{}{\emailsymbol~\emaillink{\@email}\\[.2em]}% - \ifthenelse{\isundefined{\@extrainfo}}{}{\@extrainfo\\[.2em]}% + \ifthenelse{\isundefined{\@addresscity}}{}{\\\@addresscity}}% + \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol~\@mobile}% + \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol~\@phone}% + \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol~\@fax}% + \ifthenelse{\isundefined{\@email}}{}{\maketitledetailsnewline\emailsymbol~\emaillink{\@email}}% + \ifthenelse{\isundefined{\@extrainfo}}{}{\maketitledetailsnewline\@extrainfo}% \end{minipage}% % optional photo \ifthenelse{\isundefined{\@photo}}% {}% - {\hspace*{0.75em}\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}\\[3em]% - \if@DEBUG}\fi% + {\hspace*{\separatorcolumnwidth}\color{firstnamecolor}\framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}}\\[3em]% % optional quote \ifthenelse{\isundefined{\@quote}}% {}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty index 5c823af8e24..de6c94a3a54 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty @@ -1,5 +1,5 @@ %% start of file `moderncvthemeempty.sty'. -%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2008 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvthemeempty}[2007/05/28 v0.6 modern curriculum vitae style: empty] +\ProvidesPackage{moderncvthemeempty}[2008/06/17 v0.7 modern curriculum vitae style: empty] %------------------------------------------------------------------------------- |