summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-01 23:06:22 +0000
committerKarl Berry <karl@freefriends.org>2010-06-01 23:06:22 +0000
commitf4d364d450d3bb42f7a9d4904f9467dee51f9b45 (patch)
tree970d85326d6406f9d4589f6e6c005463c88f2b8e
parentfe3102c2b4b99f358423d81a51d6a54e4f305589 (diff)
moderncvs update (1jun10)
git-svn-id: svn://tug.org/texlive/trunk@18684 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/CHANGELOG3
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template.pdfbin164477 -> 166073 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template.tex44
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdfbin164482 -> 164484 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdfbin230583 -> 230582 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdfbin164678 -> 164681 bytes
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncv.cls43
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty1
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty1
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/tweaklist.sty52
10 files changed, 127 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
index cf604533b2f..a6e94bab75f 100644
--- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
@@ -1,3 +1,6 @@
+version 0.9 (31 May 2010)
+ - added support for the itemize, enumerate and description environments.
+
version 0.8 (24 May 2010)
- added support for multibib.
- added a command to indicate your personal homepage (\homepage{url}), as
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
index 8db04f4f33b..5c376ae89cb 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
index a2e05297a2e..d426fe1766a 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
@@ -35,10 +35,10 @@
\photo[64pt]{picture} % '64pt' is the height the picture must be resized to and 'picture' is the name of the picture file; optional, remove the line if not wanted
\quote{Some quote (optional)} % optional, remove the line if not wanted
-% for BibTeX numerical labels
-%\makeatletter
-%\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}
-%\makeatother
+% to show numerical labels in the bibliography; only useful if you make citations in your resume
+\makeatletter
+\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}
+\makeatother
% bibliography with mutiple entries
%\usepackage{multibib}
@@ -52,8 +52,8 @@
\maketitle
\section{Education}
-\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description} % arguments 3 to 6 are optional
-\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description} % arguments 3 to 6 are optional
+\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description} % arguments 3 to 6 can be left empty
+\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description}
\section{Master thesis}
\cvline{title}{\emph{Title}}
@@ -62,10 +62,26 @@
\section{Experience}
\subsection{Vocational}
-\cventry{year--year}{Job title}{Employer}{City}{}{Description} % arguments 3 to 6 are optional
-\cventry{year--year}{Job title}{Employer}{City}{}{Description} % arguments 3 to 6 are optional
+\cventry{year--year}{Job title}{Employer}{City}{}{General description no longer than 1--2 lines.\newline{}%
+Detailed achievements:%
+\begin{itemize}%
+\item Achievement 1;
+\item Achievement 2, with sub-achievements:
+ \begin{itemize}%
+ \item Sub-achievement (a);
+ \item Sub-achievement (b), with sub-sub-achievements (don't do this!);
+ \begin{itemize}
+ \item Sub-sub-achievement i;
+ \item Sub-sub-achievement ii;
+ \item Sub-sub-achievement iii;
+ \end{itemize}
+ \item Sub-achievement (c);
+ \end{itemize}
+\item Achievement 3.
+\end{itemize}}
+\cventry{year--year}{Job title}{Employer}{City}{}{Description line 1\newline{}Description line 2}
\subsection{Miscellaneous}
-\cventry{year--year}{Job title}{Employer}{City}{}{Description line 1\newline{}Description line 2}% arguments 3 to 6 are optional
+\cventry{year--year}{Job title}{Employer}{City}{}{Description}
\section{Languages}
\cvlanguage{Language 1}{Skill level}{Comment}
@@ -82,17 +98,17 @@
\cvline{hobby 2}{\small Description}
\cvline{hobby 3}{\small Description}
-\renewcommand{\listitemsymbol}{-} % change the symbol for lists
-
\section{Extra 1}
\cvlistitem{Item 1}
\cvlistitem{Item 2}
\cvlistitem[+]{Item 3} % optional other symbol
+\renewcommand{\listitemsymbol}{-} % change the symbol for lists
+
\section{Extra 2}
-\cvlistdoubleitem[\Neutral]{Item 1}{Item 4}
-\cvlistdoubleitem[\Neutral]{Item 2}{Item 5\cite{book1}}
-\cvlistdoubleitem[\Neutral]{Item 3}{}
+\cvlistdoubleitem{Item 1}{Item 4}
+\cvlistdoubleitem{Item 2}{Item 5 \cite{book1}}
+\cvlistdoubleitem{Item 3}{}
% Publications from a BibTeX file without multibib\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}% for BibTeX numerical labels
\nocite{*}
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
index 77c75ac3eb5..9244d437d85 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
index b6df167df3f..64d4811c1ba 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
index 3b6d98d0f76..e1cda007c20 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index f06b0e7d760..28101252ecd 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
@@ -206,7 +206,7 @@
% style commands definitions
%-------------------------------------------------------------------------------
% symbols used
-\providecommand*{\listitemsymbol}{\textbullet}
+\providecommand*{\listitemsymbol}{\Neutral}%{{\fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102}}}
\providecommand*{\addresssymbol}{}
\providecommand*{\mobilesymbol}{\Mobilefone}
\providecommand*{\phonesymbol}{\Telefon}
@@ -450,6 +450,47 @@
\newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em}
\let\@openbib@code\@empty
+% itemize, enumerate and description environment
+\setlength{\leftmargini} {1.2em}
+\leftmargin\leftmargini
+\setlength{\leftmarginii} {1em}
+\setlength{\leftmarginiii} {1.87em}
+\setlength{\leftmarginiv} {1.7em}
+\setlength{\leftmarginv} {1em}
+\setlength{\leftmarginvi} {1em}
+\setlength{\labelsep} {.5em}
+\setlength{\labelwidth} {\leftmargini}
+\addtolength{\labelwidth} {-\labelsep}
+\@beginparpenalty -\@lowpenalty
+\@endparpenalty -\@lowpenalty
+\@itempenalty -\@lowpenalty
+% itemize labels
+\newcommand\labelitemi{\listitemsymbol{}}
+\newcommand\labelitemii{{\large\bfseries-}}
+\newcommand\labelitemiii{\textperiodcentered}%{\textasteriskcentered}
+\newcommand\labelitemiv{\textperiodcentered}
+% enumerate labels
+\renewcommand\theenumi{\@arabic\c@enumi}
+\renewcommand\theenumii{\@alph\c@enumii}
+\renewcommand\theenumiii{\@roman\c@enumiii}
+\renewcommand\theenumiv{\@Alph\c@enumiv}
+\newcommand\labelenumi{\theenumi.}
+\newcommand\labelenumii{(\theenumii)}
+\newcommand\labelenumiii{\theenumiii.}
+\newcommand\labelenumiv{\theenumiv.}
+\renewcommand\p@enumii{\theenumi}
+\renewcommand\p@enumiii{\p@enumii(\theenumii)}
+\renewcommand\p@enumiv{\p@enumiii\theenumiii}
+% description label
+\newcommand*\descriptionlabel[1]{\hspace\labelsep\normalfont\bfseries#1}
+% hooks to adjust spacing (idea by Jakob Schiøtz; see http://dcwww.camd.dtu.dk/~schiotz/comp/LatexTips/tweaklist.sty)
+\RequirePackage{tweaklist}% distributed with moderncv, not found on ctan and slightly modified
+\renewcommand*{\itemhook}{
+ \setlength{\topsep}{0pt}%
+ \setlength{\itemsep}{0pt}}
+\renewcommand*{\enumhook}{\itemhook{}}
+\renewcommand*{\deschook}{\itemhook{}}
+
% classical \today definition
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
index e5b3ea42b7d..aa3e3e8d97d 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
@@ -56,7 +56,6 @@
% style definition
%-------------------------------------------------------------------------------
% symbols used
-\renewcommand*{\listitemsymbol}{\textbullet}
% colors
\definecolor{firstnamecolor}{rgb}{0.65,0.65,0.65}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
index 2d2f191a4b1..c0d1e1e894c 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
@@ -56,7 +56,6 @@
% style definition
%-------------------------------------------------------------------------------
% symbols used
-\renewcommand*{\listitemsymbol}{\textbullet}
% colors
\definecolor{firstnamecolor}{rgb}{0,0,0}
diff --git a/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty b/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty
new file mode 100644
index 00000000000..096bc3f4590
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty
@@ -0,0 +1,52 @@
+%% start of file `tweaklist.sty'.
+%% Original by Jakob Schiøtz, downloaded from http://dcwww.camd.dtu.dk/~schiotz/comp/LatexTips/tweaklist.sty; not found on ctan.
+%% Modified by Xavier Danaux (xdanaux@gmail.com).
+%
+% The tweaklist.sty package redefines the itemize, enumerate and description packages, so that all parameters can be adjusted.
+% This was done by copying the original definitions, and adding "hook commands" that are executed when entering the environment.
+% The hook commands are initially empty, but can be redefined with \renewcommand.
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License version 1.3c,
+% available at http://www.latex-project.org/lppl/.
+
+
+% hooks for the itemize environment
+\def\itemhook{}
+\def\itemhooki{}
+\def\itemhookii{}
+\def\itemhookiii{}
+\def\itemhookiv{}
+% hooks for the enumerate environment
+\def\enumhook{}
+\def\enumhooki{}
+\def\enumhookii{}
+\def\enumhookiii{}
+\def\enumhookiv{}
+% hook for the description environment
+\def\deschook{}
+% original environment definitions, with hooks added
+\def\enumerate{%
+ \ifnum \@enumdepth >\thr@@\@toodeep\else
+ \advance\@enumdepth\@ne
+ \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
+ \expandafter
+ \list
+ \csname label\@enumctr\endcsname
+ {\usecounter\@enumctr\def\makelabel##1{\hss\llap{##1}}%
+ \enumhook \csname enumhook\romannumeral\the\@enumdepth\endcsname}%
+ \fi}
+\def\itemize{%
+ \ifnum \@itemdepth >\thr@@\@toodeep\else
+ \advance\@itemdepth\@ne
+ \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
+ \expandafter
+ \list
+ \csname\@itemitem\endcsname
+ {\def\makelabel##1{\hss\llap{##1}}%
+ \itemhook \csname itemhook\romannumeral\the\@itemdepth\endcsname}%
+ \fi}
+\newenvironment{description}
+ {\list{}{\labelwidth\z@ \itemindent-\leftmargin
+ \let\makelabel\descriptionlabel\deschook}}
+ {\endlist}