diff options
27 files changed, 239 insertions, 241 deletions
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG index 0c93999fe84..38a86c6489d 100644 --- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG +++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG @@ -1,3 +1,20 @@ +version 1.3.0 (09 Feb 2013) + - added a new environment to create multiple columns: cvcolumns. Each column + is then created by \cvcolumn[width]{header}{content}, where the optional width + is given as a fraction of the total width (between 0 and 1). The header and + content are robust and can contain any paragraph command (e.g., a nest itemize + environment). + - added a macro (\pdfpagemode) to control what is visible upon opening compiled + pdfs (assuming pdf reader support), as suggested by U. Stöhr. + Possible values include: "UseNone" (only the document), "UseThumbs" (show + thumbnails), "UseOutlines" (show bookmarks) and "FullScreen" (open in + fullscreen mode). + - added a 3rd, fully optional (can be omitted or left blank) argument to + \address to specify a country, as requested on launchpad (launchpad bug + #1063995). + - compacted list environments further. + - replaced the usage of the xargs package by the xparse one. + version 1.2.1 (04 Dec 2012) - fixed a regression bug introduced in version 1.2.0 in the header of the "banking" style when no title is used, as reported on tex.stackexchange diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf Binary files differindex 6ae1109e34d..3c83697aa5a 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-es.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.tex index f259a384880..4f7b7bf56f4 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template-es.tex +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.tex @@ -1,5 +1,5 @@ %% Inicio del archivo `template-es.tex'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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, diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf Binary files differindex db9fd4ab0df..5d7081f089a 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex index d7805264e79..bdef670d413 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex @@ -1,5 +1,5 @@ %% start of file `template-zh.tex'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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, diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf Binary files differindex e50a6776113..5a363561706 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex index 7a009a683fc..3e092e7fb62 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex @@ -1,46 +1,47 @@ %% start of file `template.tex'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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, % available at http://www.latex-project.org/lppl/. -\documentclass[11pt,a4paper,sans]{moderncv} % possible options include font size ('10pt', '11pt' and '12pt'), paper size ('a4paper', 'letterpaper', 'a5paper', 'legalpaper', 'executivepaper' and 'landscape') and font family ('sans' and 'roman') +\documentclass[11pt,a4paper,sans]{moderncv} % possible options include font size ('10pt', '11pt' and '12pt'), paper size ('a4paper', 'letterpaper', 'a5paper', 'legalpaper', 'executivepaper' and 'landscape') and font family ('sans' and 'roman') % moderncv themes -\moderncvstyle{casual} % style options are 'casual' (default), 'classic', 'oldstyle' and 'banking' -\moderncvcolor{blue} % color options 'blue' (default), 'orange', 'green', 'red', 'purple', 'grey' and 'black' -%\renewcommand{\familydefault}{\sfdefault} % to set the default font; use '\sfdefault' for the default sans serif font, '\rmdefault' for the default roman one, or any tex font name -%\nopagenumbers{} % uncomment to suppress automatic page numbering for CVs longer than one page +\moderncvstyle{casual} % style options are 'casual' (default), 'classic', 'oldstyle' and 'banking' +\moderncvcolor{blue} % color options 'blue' (default), 'orange', 'green', 'red', 'purple', 'grey' and 'black' +%\renewcommand{\familydefault}{\sfdefault} % to set the default font; use '\sfdefault' for the default sans serif font, '\rmdefault' for the default roman one, or any tex font name +%\nopagenumbers{} % uncomment to suppress automatic page numbering for CVs longer than one page % character encoding -%\usepackage[utf8]{inputenc} % if you are not using xelatex ou lualatex, replace by the encoding you are using -%\usepackage{CJKutf8} % if you need to use CJK to typeset your resume in Chinese, Japanese or Korean +%\usepackage[utf8]{inputenc} % if you are not using xelatex ou lualatex, replace by the encoding you are using +%\usepackage{CJKutf8} % if you need to use CJK to typeset your resume in Chinese, Japanese or Korean % adjust the page margins \usepackage[scale=0.75]{geometry} -%\setlength{\hintscolumnwidth}{3cm} % if you want to change the width of the column with the dates -%\setlength{\makecvtitlenamewidth}{10cm} % for the 'classic' style, if you want to force the width allocated to your name and avoid line breaks. be careful though, the length is normally calculated to avoid any overlap with your personal info; use this at your own typographical risks... +%\setlength{\hintscolumnwidth}{3cm} % if you want to change the width of the column with the dates +%\setlength{\makecvtitlenamewidth}{10cm} % for the 'classic' style, if you want to force the width allocated to your name and avoid line breaks. be careful though, the length is normally calculated to avoid any overlap with your personal info; use this at your own typographical risks... % personal data \firstname{John} \familyname{Doe} -\title{Resumé title} % optional, remove / comment the line if not wanted -\address{street and number}{postcode city} % optional, remove / comment the line if not wanted -\mobile{+1~(234)~567~890} % optional, remove / comment the line if not wanted -\phone{+2~(345)~678~901} % optional, remove / comment the line if not wanted -\fax{+3~(456)~789~012} % optional, remove / comment the line if not wanted -\email{john@doe.org} % optional, remove / comment the line if not wanted -\homepage{www.johndoe.com} % optional, remove / comment the line if not wanted -\extrainfo{additional information} % optional, remove / comment the line if not wanted -\photo[64pt][0.4pt]{picture} % optional, remove / comment the line if not wanted; '64pt' is the height the picture must be resized to, 0.4pt is the thickness of the frame around it (put it to 0pt for no frame) and 'picture' is the name of the picture file -\quote{Some quote} % optional, remove / comment the line if not wanted +\title{Resumé title} % optional, remove / comment the line if not wanted +\address{street and number}{postcode city}{country}% optional, remove / comment the line if not wanted; the "postcode city" and and "country" arguments can be omitted or provided empty +\mobile{+1~(234)~567~890} % optional, remove / comment the line if not wanted +\phone{+2~(345)~678~901} % optional, remove / comment the line if not wanted +\fax{+3~(456)~789~012} % optional, remove / comment the line if not wanted +\email{john@doe.org} % optional, remove / comment the line if not wanted +\homepage{www.johndoe.com} % optional, remove / comment the line if not wanted +\extrainfo{additional information} % optional, remove / comment the line if not wanted +\photo[64pt][0.4pt]{picture} % optional, remove / comment the line if not wanted; '64pt' is the height the picture must be resized to, 0.4pt is the thickness of the frame around it (put it to 0pt for no frame) and 'picture' is the name of the picture file +\quote{Some quote} % optional, remove / comment the line if not wanted % to show numerical labels in the bibliography (default is to show no labels); only useful if you make citations in your resume %\makeatletter %\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}} %\makeatother +%\renewcommand*{\bibliographyitemlabel}{[\arabic{enumiv}]}% CONSIDER REPLACING THE ABOVE BY THIS % bibliography with mutiple entries %\usepackage{multibib} @@ -49,7 +50,7 @@ % content %---------------------------------------------------------------------------------- \begin{document} -%\begin{CJK*}{UTF8}{gbsn} % to typeset your resume in Chinese using CJK +%\begin{CJK*}{UTF8}{gbsn} % to typeset your resume in Chinese using CJK %----- resume --------------------------------------------------------- \makecvtitle @@ -103,30 +104,35 @@ Detailed achievements:% \section{Extra 1} \cvlistitem{Item 1} \cvlistitem{Item 2} -\cvlistitem{Item 3} - -\renewcommand{\listitemsymbol}{-~} % change the symbol for lists +\cvlistitem{Item 3. This item is particularly long and therefore normally spans over several lines. Did you notice the indentation when the line wraps?} \section{Extra 2} \cvlistdoubleitem{Item 1}{Item 4} \cvlistdoubleitem{Item 2}{Item 5\cite{book1}} -\cvlistdoubleitem{Item 3}{} +\cvlistdoubleitem{Item 3}{Item 6. Like item 3 in the single column list before, this item is particularly long to wrap over several lines.} + +\section{References} +\begin{cvcolumns} + \cvcolumn{Category 1}{\begin{itemize}\item Person 1\item Person 2\item Person 3\end{itemize}} + \cvcolumn{Category 2}{Amongst others:\begin{itemize}\item Person 1, and\item Person 2\end{itemize}(more upon request)} + \cvcolumn[0.5]{All the rest \& some more}{\textit{That} person, and \textbf{those} also (all available upon request).} +\end{cvcolumns} % Publications from a BibTeX file without multibib -% for numerical labels: \renewcommand{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}} +% for numerical labels: \renewcommand{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}% CONSIDER MERGING WITH PREAMBLE PART % to redefine the heading string ("Publications"): \renewcommand{\refname}{Articles} \nocite{*} \bibliographystyle{plain} -\bibliography{publications} % 'publications' is the name of a BibTeX file +\bibliography{publications} % 'publications' is the name of a BibTeX file % Publications from a BibTeX file using the multibib package %\section{Publications} %\nocitebook{book1,book2} %\bibliographystylebook{plain} -%\bibliographybook{publications} % 'publications' is the name of a BibTeX file +%\bibliographybook{publications} % 'publications' is the name of a BibTeX file %\nocitemisc{misc1,misc2,misc3} %\bibliographystylemisc{plain} -%\bibliographymisc{publications} % 'publications' is the name of a BibTeX file +%\bibliographymisc{publications} % 'publications' is the name of a BibTeX file \clearpage %----- letter --------------------------------------------------------- @@ -135,7 +141,7 @@ Detailed achievements:% \date{January 01, 1984} \opening{Dear Sir or Madam,} \closing{Yours faithfully,} -\enclosure[Attached]{curriculum vit\ae{}} % use an optional argument to use a string other than "Enclosure", or redefine \enclname +\enclosure[Attached]{curriculum vit\ae{}} % use an optional argument to use a string other than "Enclosure", or redefine \enclname \makelettertitle Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ullamcorper neque sit amet lectus facilisis sed luctus nisl iaculis. Vivamus at neque arcu, sed tempor quam. Curabitur pharetra tincidunt tincidunt. Morbi volutpat feugiat mauris, quis tempor neque vehicula volutpat. Duis tristique justo vel massa fermentum accumsan. Mauris ante elit, feugiat vestibulum tempor eget, eleifend ac ipsum. Donec scelerisque lobortis ipsum eu vestibulum. Pellentesque vel massa at felis accumsan rhoncus. @@ -150,7 +156,7 @@ Albert Einstein discovered that $e=mc^2$ in 1905. \makeletterclosing -%\clearpage\end{CJK*} % if you are typesetting your resume in Chinese using CJK; the \clearpage is required for fancyhdr to work correctly with CJK, though it kills the page numbering by making \lastpage undefined +%\clearpage\end{CJK*} % if you are typesetting your resume in Chinese using CJK; the \clearpage is required for fancyhdr to work correctly with CJK, though it kills the page numbering by making \lastpage undefined \end{document} diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex.new b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex.new deleted file mode 100644 index d67fd0d27be..00000000000 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex.new +++ /dev/null @@ -1,158 +0,0 @@ -%% start of file `template.tex'. -%% Copyright 2006-2012 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, -% available at http://www.latex-project.org/lppl/. - - -\documentclass[11pt,a4paper,sans]{moderncv} % possible options include font size ('10pt', '11pt' and '12pt'), paper size ('a4paper', 'letterpaper', 'a5paper', 'legalpaper', 'executivepaper' and 'landscape') and font family ('sans' and 'roman') - -% moderncv themes -\moderncvstyle{casual} % style options are 'casual' (default), 'classic', 'oldstyle' and 'banking' -\moderncvcolor{blue} % color options 'blue' (default), 'orange', 'green', 'red', 'purple', 'grey' and 'black' -%\renewcommand{\familydefault}{\sfdefault} % to set the default font; use '\sfdefault' for the default sans serif font, '\rmdefault' for the default roman one, or any tex font name -%\nopagenumbers{} % uncomment to suppress automatic page numbering for CVs longer than one page - -% character encoding -%\usepackage[utf8]{inputenc} % if you are not using xelatex ou lualatex, replace by the encoding you are using -%\usepackage{CJKutf8} % if you need to use CJK to typeset your resume in Chinese, Japanese or Korean - -% adjust the page margins -\usepackage[scale=0.75]{geometry} -%\setlength{\hintscolumnwidth}{3cm} % if you want to change the width of the column with the dates -%\setlength{\makecvtitlenamewidth}{10cm} % for the 'classic' style, if you want to force the width allocated to your name and avoid line breaks. be careful though, the length is normally calculated to avoid any overlap with your personal info; use this at your own typographical risks... - -% personal data -\firstname{John} -\familyname{Doe} -\title{Resumé title} % optional, remove / comment the line if not wanted -\address{street and number}{postcode city} % optional, remove / comment the line if not wanted -\mobile{+1~(234)~567~890} % optional, remove / comment the line if not wanted -\phone{+2~(345)~678~901} % optional, remove / comment the line if not wanted -\fax{+3~(456)~789~012} % optional, remove / comment the line if not wanted -\email{john@doe.org} % optional, remove / comment the line if not wanted -\homepage{www.johndoe.com} % optional, remove / comment the line if not wanted -\extrainfo{additional information} % optional, remove / comment the line if not wanted -\photo[64pt][0.4pt]{picture} % optional, remove / comment the line if not wanted; '64pt' is the height the picture must be resized to, 0.4pt is the thickness of the frame around it (put it to 0pt for no frame) and 'picture' is the name of the picture file -\quote{Some quote} % optional, remove / comment the line if not wanted - -% to show numerical labels in the bibliography (default is to show no labels); only useful if you make citations in your resume -%\makeatletter -%\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}} -%\makeatother -%\renewcommand*{\bibliographyitemlabel}{[\arabic{enumiv}]% CONSIDER REPLACING THE ABOVE BY THIS - -% bibliography with mutiple entries -%\usepackage{multibib} -%\newcites{book,misc}{{Books},{Others}} -%---------------------------------------------------------------------------------- -% content -%---------------------------------------------------------------------------------- -\begin{document} -%\begin{CJK*}{UTF8}{gbsn} % to typeset your resume in Chinese using CJK -%----- resume --------------------------------------------------------- -\makecvtitle - -\section{Education} -\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} -\cvitem{title}{\emph{Title}} -\cvitem{supervisors}{Supervisors} -\cvitem{description}{Short thesis abstract} - -\section{Experience} -\subsection{Vocational} -\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} - -\section{Languages} -\cvitemwithcomment{Language 1}{Skill level}{Comment} -\cvitemwithcomment{Language 2}{Skill level}{Comment} -\cvitemwithcomment{Language 3}{Skill level}{Comment} - -\section{Computer skills} -\cvdoubleitem{category 1}{XXX, YYY, ZZZ}{category 4}{XXX, YYY, ZZZ} -\cvdoubleitem{category 2}{XXX, YYY, ZZZ}{category 5}{XXX, YYY, ZZZ} -\cvdoubleitem{category 3}{XXX, YYY, ZZZ}{category 6}{XXX, YYY, ZZZ} - -\section{Interests} -\cvitem{hobby 1}{Description} -\cvitem{hobby 2}{Description} -\cvitem{hobby 3}{Description} - -\section{Extra 1} -\cvlistitem{Item 1} -\cvlistitem{Item 2} -\cvlistitem{Item 3} - -\renewcommand{\listitemsymbol}{-~} % change the symbol for lists - -\section{Extra 2} -\cvlistdoubleitem{Item 1}{Item 4} -\cvlistdoubleitem{Item 2}{Item 5\cite{book1}} -\cvlistdoubleitem{Item 3}{} - -% Publications from a BibTeX file without multibib -% for numerical labels: \renewcommand{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}} -% to redefine the heading string ("Publications"): \renewcommand{\refname}{Articles} -\nocite{*} -\bibliographystyle{plain} -\bibliography{publications} % 'publications' is the name of a BibTeX file - -% Publications from a BibTeX file using the multibib package -%\section{Publications} -%\nocitebook{book1,book2} -%\bibliographystylebook{plain} -%\bibliographybook{publications} % 'publications' is the name of a BibTeX file -%\nocitemisc{misc1,misc2,misc3} -%\bibliographystylemisc{plain} -%\bibliographymisc{publications} % 'publications' is the name of a BibTeX file - -\clearpage -%----- letter --------------------------------------------------------- -% recipient data -\recipient{Company Recruitment team}{Company, Inc.\\123 somestreet\\some city} -\date{January 01, 1984} -\opening{Dear Sir or Madam,} -\closing{Yours faithfully,} -\enclosure[Attached]{curriculum vit\ae{}} % use an optional argument to use a string other than "Enclosure", or redefine \enclname -\makelettertitle - -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ullamcorper neque sit amet lectus facilisis sed luctus nisl iaculis. Vivamus at neque arcu, sed tempor quam. Curabitur pharetra tincidunt tincidunt. Morbi volutpat feugiat mauris, quis tempor neque vehicula volutpat. Duis tristique justo vel massa fermentum accumsan. Mauris ante elit, feugiat vestibulum tempor eget, eleifend ac ipsum. Donec scelerisque lobortis ipsum eu vestibulum. Pellentesque vel massa at felis accumsan rhoncus. - -Suspendisse commodo, massa eu congue tincidunt, elit mauris pellentesque orci, cursus tempor odio nisl euismod augue. Aliquam adipiscing nibh ut odio sodales et pulvinar tortor laoreet. Mauris a accumsan ligula. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse vulputate sem vehicula ipsum varius nec tempus dui dapibus. Phasellus et est urna, ut auctor erat. Sed tincidunt odio id odio aliquam mattis. Donec sapien nulla, feugiat eget adipiscing sit amet, lacinia ut dolor. Phasellus tincidunt, leo a fringilla consectetur, felis diam aliquam urna, vitae aliquet lectus orci nec velit. Vivamus dapibus varius blandit. - -Duis sit amet magna ante, at sodales diam. Aenean consectetur porta risus et sagittis. Ut interdum, enim varius pellentesque tincidunt, magna libero sodales tortor, ut fermentum nunc metus a ante. Vivamus odio leo, tincidunt eu luctus ut, sollicitudin sit amet metus. Nunc sed orci lectus. Ut sodales magna sed velit volutpat sit amet pulvinar diam venenatis. - -Albert Einstein discovered that $e=mc^2$ in 1905. - -\[ e=\lim_{n \to \infty} \left(1+\frac{1}{n}\right)^n \] - -\makeletterclosing - -%\clearpage\end{CJK*} % if you are typesetting your resume in Chinese using CJK; the \clearpage is required for fancyhdr to work correctly with CJK, though it kills the page numbering by making \lastpage undefined -\end{document} - - -%% end of file `template.tex'. diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdf Binary files differindex 1a1e4586e1a..4a432f64b0c 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdf 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 Binary files differindex 5ef4213441d..c4f0c3e11b2 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 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 Binary files differindex 0849d101951..07ae629a8c9 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 diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf Binary files differindex 422a6ea628f..b9ca9389770 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf Binary files differindex 998f4beac5e..88b8a99f9de 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index d6b8f63fe75..08b24c9a1ae 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 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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}[2012/12/04 v1.2.1 modern curriculum vitae and letter document class] +\ProvidesClass{moderncv}[2013/02/09 v1.3.0 modern curriculum vitae and letter document class] %------------------------------------------------------------------------------- @@ -120,6 +120,7 @@ %\fi % hyper links (hyperref is loaded at the end of the preamble to pass options required by loaded packages such as CJK) +\newcommand*\pdfpagemode{UseNone}% do not show thumbnails or bookmarks on opening (on supporting browsers); set \pdfpagemode to "UseOutlines" to show bookmarks \RequirePackage{url} \urlstyle{tt} \AtEndPreamble{ @@ -129,7 +130,7 @@ breaklinks, baseurl = http://, pdfborder = 0 0 0, - pdfpagemode = UseNone,% do not show thumbnails or bookmarks on opening + pdfpagemode = \pdfpagemode, pdfstartpage = 1, pdfcreator = {\LaTeX{} with 'moderncv' package}, % pdfproducer = {\LaTeX{}},% will/should be set automatically to the correct TeX engine used @@ -165,11 +166,27 @@ \AtEndDocument{\label{lastpage}}\else\fi}} \pagestyle{plain} +% reduced list spacing +% package providing hooks into lists +% originally developped by Jakob Schiøtz (see http://dcwww.camd.dtu.dk/~schiotz/comp/LatexTips/tweaklist.sty) +% modified and distributed with moderncv(not available otherwise on ctan) +\RequirePackage{tweaklist} +\renewcommand*{\itemhook}{% + \@minipagetrue% removes spacing before lists as they use \addvspace, which doesn't add vertical space inside minipages + \@noparlisttrue% removes spacing at end of lists, caused by \par + \setlength{\topsep}{0pt}% normally not required thanks to \@minipagetrue + \setlength{\partopsep}{0pt}% normally not required thanks to \@minipagetrue + \setlength{\parsep}{0pt}% not required when \itemsep and \parskip are set to 0pt (?) + \setlength{\parskip}{0pt}% + \setlength{\itemsep}{0pt}} +\renewcommand*{\enumhook}{\itemhook{}} +\renewcommand*{\deschook}{\itemhook{}} + % lengths calculations \RequirePackage{calc} % advanced command arguments (LaTeX 3) -\RequirePackage{xargs} +\RequirePackage{xparse} % TODO (?): replace all \newcommand by \NewDocumentCommand % micro-typography (e.g., character protrusion, font expansion, hyphenatable letterspacing) @@ -208,15 +225,37 @@ % overall design commands definitions %------------------------------------------------------------------------------- % elements +% defines one's first name +% usage: \firstname{<firstname>} \newcommand*{\firstname}[1]{\def\@firstname{#1}} +% defines one's family name +% usage: \familyname{<familyname>} \newcommand*{\familyname}[1]{\def\@familyname{#1}} +% defines one's title (optional) +% usage: \title{<title>} \renewcommand*{\title}[1]{\def\@title{#1}} -\newcommand*{\address}[2]{\def\@addressstreet{#1}\def\@addresscity{#2}} +% defines one's address (optional) +% usage: \address{<street>}{<city>}{<country>} +% where the <city> and <country> arguments can be omitted or provided empty +\NewDocumentCommand{\address}{mG{}G{}}{\def\@addressstreet{#1}\def\@addresscity{#2}\def\@addresscountry{#3}} +% defines one's mobile phone number (optional) +% usage: \mobile{<number>} \newcommand*{\mobile}[1]{\def\@mobile{#1}} +% defines one's fixed phone number (optional) +% usage: \phone{<number>} \newcommand*{\phone}[1]{\def\@phone{#1}} +% defines one's fax number (optional) +% usage: \fax{<number>} \newcommand*{\fax}[1]{\def\@fax{#1}} +% defines one's email address (optional) +% usage: \email{<email>} \newcommand*{\email}[1]{\def\@email{#1}} +% defines one's home page (optional) +% usage: \homepage{<url>} \newcommand*{\homepage}[1]{\def\@homepage{#1}} +% defines additional personal information (optional) +% usage: \extrainfo{<text>} +\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}} % colors \definecolor{color0}{rgb}{0,0,0}% main default color, normally left to black @@ -276,8 +315,9 @@ % resume design commands definitions %------------------------------------------------------------------------------- % elements -\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}} -\newcommandx*{\photo}[3][1=64pt,2=0.4pt,usedefault]{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}% the 1st (optional) argument is the width of the photo, the 2nd (optional) argument is the thickness of the frame around it. +% defines one's picture (optional) +% usage: photo[<picture width>][<picture frame thickness>]{<picture filename>} +\NewDocumentCommand{\photo}{O{64pt}O{0.4pt}m}{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}} \newcommand*{\quote}[1]{\def\@quote{#1}} % fonts @@ -375,6 +415,98 @@ {\href{mailto:#2}{#2}}% {\href{mailto:#2}{#1}}} +% cvcolumns environment, where every column is created through \cvcolumn +% usage: \begin{cvcolumns} +% \cvcolumn[width]{head}{content} +% \cvcolumn[width]{head}{content} +% ... +% \end{cvcolumns} +% where "width" is the width as a fraction of the line length (between 0 and 1), "head" is the column header and "content" its content +\newcounter{cvcolumnscounter}% counter for the number of columns +\newcounter{cvcolumnsautowidthcounter}% counter for the number of columns with no column width provided, and which will then be equally distributed +\newcounter{tmpiteratorcounter}% counter for any temporary purpose (e.g., iterating loops) +\newlength{\cvcolumnsdummywidth}\setlength{\cvcolumnsdummywidth}{1000pt}% dummy width for total width, in order to enable arithmetics (TeX has no float variables, only integer counters or lengths) +\newlength{\cvcolumnswidth}% total width available for head / content +\newlength{\cvcolumnsautowidth}% total width of columns with no explicit width provided +\newlength{\cvcolumnautowidth}% width of one of the columns with no explicit width provided (based on equal distribution of remaining space) +\newif\if@cvcolumns@head@empty% whether or not at least one of the columns has a header +\newenvironment*{cvcolumns}% + {% at environment opening: reset counters, lengths and ifs + \setcounter{cvcolumnscounter}{0}% + \setcounter{cvcolumnsautowidthcounter}{0}% + \setlength{\cvcolumnsautowidth}{\cvcolumnsdummywidth}% + \setlength{\cvcolumnautowidth}{0pt}% + \@cvcolumns@head@emptytrue}% + {% at environment closing: typeset environment + % compute the width of each cvcolumn, considering a spacing of \separatorcolumnwidth and the columns with set width + \ifnum\thecvcolumnscounter>0% + \setlength{\cvcolumnswidth}{\maincolumnwidth-\value{cvcolumnscounter}\separatorcolumnwidth+\separatorcolumnwidth}% + \setlength{\cvcolumnautowidth}{\cvcolumnswidth*\ratio{\cvcolumnsautowidth}{\cvcolumnsdummywidth}/\value{cvcolumnsautowidthcounter}}\fi% + % pre-aggregate the tabular definition, heading and content (required before creating the tabular, as the tabular environment doesn't like loops --- probably because "&" generates a \endgroup) + % - the tabular definition is the aggregation of the different "\cvcolumn<i>@def" (by default "p{\cvcolumnautowidth}"), separated by "@{\hspace*{\separatorcolumnwidth}}" + % - the tabular heading is the aggregation of the different "\cvcolumn<i>@head", separated by "&" + % - the tabular content is the aggregation of the different "\cvcolumn<i>@content", separated by "&" + % to aggregate the different elements, \protected@edef or \g@addto@macro is required to avoid that \cvcolumns@def, -@head and -@content get expanded in subsequent redefinitions, which would cause errors due to the expansions of \hspace, of \subsectionstyle and possibly of user content/argument such as font commands + \def\cvcolumns@def{}% + \def\cvcolumns@head{}% + \def\cvcolumns@content{}% + \setcounter{tmpiteratorcounter}{0}% + % loop based on \g@addto@macro + \loop\ifnum\thetmpiteratorcounter<\thecvcolumnscounter% + \ifnum\thetmpiteratorcounter=0\else% + \g@addto@macro\cvcolumns@def{@{\hspace*{\separatorcolumnwidth}}}% + \g@addto@macro\cvcolumns@head{&}% + \g@addto@macro\cvcolumns@content{&}\fi% + \expandafter\g@addto@macro\expandafter\cvcolumns@def\expandafter{\csname cvcolumn\roman{tmpiteratorcounter}@def\endcsname}% + \expandafter\g@addto@macro\expandafter\cvcolumns@head\expandafter{\csname cvcolumn\roman{tmpiteratorcounter}@head\endcsname}% + \expandafter\g@addto@macro\expandafter\cvcolumns@content\expandafter{\csname cvcolumn\roman{tmpiteratorcounter}@content\endcsname}% + \stepcounter{tmpiteratorcounter}% + \repeat% +% % same loop based on \protected@edef +% \loop\ifnum\thetmpiteratorcounter<\thecvcolumnscounter% +% \ifnum\thetmpiteratorcounter=0\else% +% \protected@edef\cvcolumns@def{\cvcolumns@def @{\hspace*{\separatorcolumnwidth}}}% +% \protected@edef\cvcolumns@head{\cvcolumns@head &}% +% \protected@edef\cvcolumns@content{\cvcolumns@content &}\fi% +% \expandafter\protected@edef\expandafter\cvcolumns@def\expandafter{\expandafter\cvcolumns@def\expandafter\protect\csname cvcolumn\roman{tmpiteratorcounter}@def\endcsname}% +% \expandafter\protected@edef\expandafter\cvcolumns@head\expandafter{\expandafter\cvcolumns@head\expandafter\protect\csname cvcolumn\roman{tmpiteratorcounter}@head\endcsname}% +% \expandafter\protected@edef\expandafter\cvcolumns@content\expandafter{\expandafter\cvcolumns@content\expandafter\protect\csname cvcolumn\roman{tmpiteratorcounter}@content\endcsname}% +% \stepcounter{tmpiteratorcounter}% +% \repeat% + % create the tabular + \cvitem{}{% + \begin{tabular}{\cvcolumns@def}% + \if@cvcolumns@head@empty\else% + \cvcolumns@head\\[-.8em]% + {\color{color1}\rule{\maincolumnwidth}{.25pt}}\\\fi% + \cvcolumns@content% + \end{tabular}}} + +% cvcolumn command, to create a column inside a cvcolumns environment +% usage: \cvcolumn[width]{head}{content} +% where "width" is the width as a fraction of the line length (between 0 and 1), "head" is the column header and "content" its content ("head" and "content" can contain "\\", "\newline" or any other paragraph command such as "itemize") +\newcommand*{\cvcolumn}[3][\cvcolumnautowidth]{% +% \def\cvcolumn@width{}% + \ifthenelse{\equal{#1}{\cvcolumnautowidth}}% + {% if no width fraction is provided, count this column as auto-adjusted and set its width to \cvcolumnsautowidth + \stepcounter{cvcolumnsautowidthcounter}% + \expandafter\expandafter\expandafter\def\expandafter\csname cvcolumn\roman{cvcolumnscounter}@def\endcsname{p{\cvcolumnautowidth}}% + \expandafter\expandafter\expandafter\def\expandafter\csname cvcolumn\roman{cvcolumnscounter}@head\endcsname{\protect\parbox[b]{\cvcolumnautowidth}{\protect\subsectionstyle{#2}}}}% + {% if a width is provided, set the width of the column to it and decrease the available space for auto-adjusted columns + \addtolength{\cvcolumnsautowidth}{-#1\cvcolumnsdummywidth}% + \expandafter\expandafter\expandafter\def\expandafter\csname cvcolumn\roman{cvcolumnscounter}@def\endcsname{p{#1\cvcolumnswidth}}% + \expandafter\expandafter\expandafter\def\expandafter\csname cvcolumn\roman{cvcolumnscounter}@head\endcsname{\protect\parbox[b]{#1\cvcolumnswidth}{\protect\subsectionstyle{#2}}}}% + \ifthenelse{\equal{#2}{}}{}{\@cvcolumns@head@emptyfalse}% + \expandafter\expandafter\expandafter\def\expandafter\csname cvcolumn\roman{cvcolumnscounter}@content\endcsname{\protect\cvcolumncell{#3}}% + \stepcounter{cvcolumnscounter}} + +% internal cvcolumncell command, that enables a cvcolumn cell to contain paragraph commands (lists, newlines, etc) +\newcommand*{\cvcolumncell}[1]{{% put cell inside a group, so that command redefinitions are only local + % roughly restore \\ to its regular definition (outside of tabular) + \renewcommand*{\\}{\newline}% + % enclose the contents of the cell inside a vertical box, to allow paragraph commands + \protect\vtop{#1}}} + % thebibliography environment, for use with BibTeX and possibly multibib \newlength{\bibindent} \setlength{\bibindent}{1.5em} @@ -412,15 +544,6 @@ \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{\parsep}{0pt}% - \setlength{\parskip}{0pt}% - \setlength{\itemsep}{0pt}} -\renewcommand*{\enumhook}{\itemhook{}} -\renewcommand*{\deschook}{\itemhook{}} % classical \today definition \def\today{\ifcase\month\or @@ -467,4 +590,4 @@ \endinput -%% end of file `moderncv.cls'.
\ No newline at end of file +%% end of file `moderncv.cls'. diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty index 903db803591..3a6e1477f32 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorblack.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvcolorblack}[2012/12/04 v1.2.1 modern curriculum vitae and letter color scheme: black] +\ProvidesPackage{moderncvcolorblack}[2013/02/09 v1.3.0 modern curriculum vitae and letter color scheme: black] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty index c497b543d64..7b949c704ac 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorblue.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvcolorblue}[2012/12/04 v1.2.1 modern curriculum vitae and letter color scheme: blue] +\ProvidesPackage{moderncvcolorblue}[2013/02/09 v1.3.0 modern curriculum vitae and letter color scheme: blue] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty index 8184748a31b..4de7f848a04 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorgreen.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvcolorgreen}[2012/12/04 v1.2.1 modern curriculum vitae and letter color scheme: green] +\ProvidesPackage{moderncvcolorgreen}[2013/02/09 v1.3.0 modern curriculum vitae and letter color scheme: green] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty index d9173e7a0bb..9018726a238 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorgrey.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvcolorgrey}[2012/12/04 v1.2.1 modern curriculum vitae and letter color scheme: grey] +\ProvidesPackage{moderncvcolorgrey}[2013/02/09 v1.3.0 modern curriculum vitae and letter color scheme: grey] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty index af5a976566f..134ae240113 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolororange.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvcolororange}[2012/12/04 v1.2.1 modern curriculum vitae and letter color scheme: orange] +\ProvidesPackage{moderncvcolororange}[2013/02/09 v1.3.0 modern curriculum vitae and letter color scheme: orange] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty index 1be6af93167..d3dc5345b08 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorpurple.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvcolorpurple}[2012/12/04 v1.2.1 modern curriculum vitae and letter color scheme: purple] +\ProvidesPackage{moderncvcolorpurple}[2013/02/09 v1.3.0 modern curriculum vitae and letter color scheme: purple] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty index bb8318e9ffe..681181997d3 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorred.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvcolorred}[2012/12/04 v1.2.1 modern curriculum vitae and letter color scheme: red] +\ProvidesPackage{moderncvcolorred}[2013/02/09 v1.3.0 modern curriculum vitae and letter color scheme: red] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index 2640bce143a..3b1d13c11c7 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 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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}[2012/12/04 v1.2.1 modern curriculum vitae and letter compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2013/02/09 v1.3.0 modern curriculum vitae and letter compatibility patches] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty index ab82f5720b6..9717999060a 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstylebanking.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvstylebanking}[2012/12/04 v1.2.1 modern curriculum vitae and letter style scheme: banking] +\ProvidesPackage{moderncvstylebanking}[2013/02/09 v1.3.0 modern curriculum vitae and letter style scheme: banking] %------------------------------------------------------------------------------- @@ -93,7 +93,9 @@ % detailed information \addressfont\color{color2}% \ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle{\addresssymbol\@addressstreet}% - \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle\@firstmaketitleelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty + \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty + \ifthenelse{\equal{\@addresscountry}{}}{}{\addtomaketitle[~--~]{\@addresscountry}}% + \flushmaketitle\@firstmaketitleelementtrue\\}% \ifthenelse{\isundefined{\@mobile}}{}{\addtomaketitle{\mobilesymbol\@mobile}}% \ifthenelse{\isundefined{\@phone}}{}{\addtomaketitle{\phonesymbol\@phone}}% \ifthenelse{\isundefined{\@fax}}{}{\addtomaketitle{\faxsymbol\@fax}}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty index 5d48e0382f2..8682d7806ee 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstylecasual.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvstylecasual}[2012/12/04 v1.2.1 modern curriculum vitae and letter style scheme: casual] +\ProvidesPackage{moderncvstylecasual}[2013/02/09 v1.3.0 modern curriculum vitae and letter style scheme: casual] %------------------------------------------------------------------------------- @@ -109,7 +109,9 @@ \centering% \color{color2}\addressfont% \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}% - \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty + \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty + \ifthenelse{\equal{\@addresscountry}{}}{}{\addtofooter[~--~]{\@addresscountry}}% + \flushfooter\@firstfooterelementtrue\\}% \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}% \ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}% \ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}% @@ -157,7 +159,9 @@ \vspace{-\baselineskip}% to cancel out the extra vertical space taken by the name (below) and ensure perfect alignment of letter and cv footers \strut{\bfseries\upshape\@firstname~\@familyname}\\% the \strut is required to ensure the line is exactly \baselineskip tall \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}% - \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty + \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty + \ifthenelse{\equal{\@addresscountry}{}}{}{\addtofooter[~--~]{\@addresscountry}}% + \flushfooter\@firstfooterelementtrue\\}% \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}% \ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}% \ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty index ed7b2be1231..1da3078867b 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstyleclassic.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvstyleclassic}[2012/12/04 v1.2.1 modern curriculum vitae and letter style scheme: classic] +\ProvidesPackage{moderncvstyleclassic}[2013/02/09 v1.3.0 modern curriculum vitae and letter style scheme: classic] %------------------------------------------------------------------------------- @@ -109,7 +109,8 @@ \addressfont\color{color2}% \begin{tabular}[b]{@{}r@{}}% \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet% - \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}}% if \addresstreet is defined, \addresscity will always be defined but could be empty + \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty + \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}% \ifthenelse{\isundefined{\@mobile}}{}{\makenewline\mobilesymbol\@mobile}% \ifthenelse{\isundefined{\@phone}}{}{\makenewline\phonesymbol\@phone}% \ifthenelse{\isundefined{\@fax}}{}{\makenewline\faxsymbol\@fax}% @@ -261,7 +262,8 @@ \addressfont\textcolor{color2}{% {\bfseries\upshape\@firstname~\@familyname}\@firstdetailselementfalse% \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet% - \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}}% + \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty + \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}% \ifthenelse{\isundefined{\@mobile}}{}{\makenewline\mobilesymbol\@mobile}% \ifthenelse{\isundefined{\@phone}}{}{\makenewline\phonesymbol\@phone}% \ifthenelse{\isundefined{\@fax}}{}{\makenewline\faxsymbol\@fax}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty index 36c962fef31..85932464d1c 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstyleempty.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvstyleempty}[2012/12/04 v1.2.1 modern curriculum vitae scheme: empty] +\ProvidesPackage{moderncvstyleempty}[2013/02/09 v1.3.0 modern curriculum vitae scheme: empty] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty index 30427b210f6..f32b4a09db3 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstyleoldstyle.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 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{moderncvstyleoldstyle}[2012/12/04 v1.2.1 modern curriculum vitae and letter style scheme: oldstyle] +\ProvidesPackage{moderncvstyleoldstyle}[2013/02/09 v1.3.0 modern curriculum vitae and letter style scheme: oldstyle] %------------------------------------------------------------------------------- @@ -151,7 +151,8 @@ \makecvinfo{% \addressfont\color{color2}% \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet% - \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}}% if \addresstreet is defined, \addresscity will always be defined but could be empty + \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty + \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}% \ifthenelse{\isundefined{\@mobile}}{}{\makenewline\mobilesymbol\@mobile}% \ifthenelse{\isundefined{\@phone}}{}{\makenewline\phonesymbol\@phone}% \ifthenelse{\isundefined{\@fax}}{}{\makenewline\faxsymbol\@fax}% @@ -291,7 +292,8 @@ \addressfont\textcolor{color2}{% {\bfseries\@firstname~\@familyname}\@firstdetailselementfalse% \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet% - \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}}% + \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty + \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}% \ifthenelse{\isundefined{\@mobile}}{}{\makenewline\mobilesymbol\@mobile}% \ifthenelse{\isundefined{\@phone}}{}{\makenewline\phonesymbol\@phone}% \ifthenelse{\isundefined{\@fax}}{}{\makenewline\faxsymbol\@fax}% |