From 44edae68ae5421ecf63bfcc931a9e00fb208aea0 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 7 Nov 2011 23:28:40 +0000
Subject: moderncv 0.13 (7nov11)

git-svn-id: svn://tug.org/texlive/trunk@24535 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/moderncv/moderncv.cls')

diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index f83caf1986a..7f66e19ab1a 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-2010 Xavier Danaux (xdanaux@gmail.com).
+%% Copyright 2006-2011 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}[2010/08/03 v0.12 modern curriculum vitae document class]
+\ProvidesClass{moderncv}[2011/11/06 v0.13 modern curriculum vitae document class]
 
 
 %-------------------------------------------------------------------------------
@@ -64,10 +64,6 @@
 \newif\if@lmodern\@lmoderntrue
 \DeclareOption{nolmodern}{\@lmodernfalse}
 
-% nocolor option
-\newif\if@color\@colortrue
-\DeclareOption{nocolor}{\@colorfalse}
-
 % CJK option
 %\newif\if@CJK\@CJKfalse
 %\DeclareOption{CJK}{\@CJKtrue}
@@ -130,7 +126,7 @@
 \AtEndPreamble{
   \@ifpackageloaded{CJK}
     {\RequirePackage[CJKbookmarks]{hyperref}}
-    {\RequirePackage[pdftex]{hyperref}}
+    {\RequirePackage{hyperref}}
   \AtBeginDocument{
     \hypersetup{
       breaklinks,
@@ -160,6 +156,9 @@
   \fancyhf{}}
 \pagestyle{plain}
 
+% advanced command arguments
+\RequirePackage{xargs}
+
 % compatibility package with older versions of moderncv
 \RequirePackageWithOptions{moderncvcompatibility}
 
@@ -175,6 +174,8 @@
 \setlength{\parskip}{0pt}
 \setlength\columnsep{10\p@}
 \setlength\columnseprule{0\p@}
+\setlength\fboxsep{3\p@}
+\setlength\fboxrule{.4\p@}
 
 % TO BE TESTED
 %\setlength\arraycolsep{5\p@}
@@ -182,8 +183,6 @@
 %\setlength\arrayrulewidth{.4\p@}
 %\setlength\doublerulesep{2\p@}
 %\setlength\tabbingsep{\labelsep}
-%\setlength\fboxsep{3\p@}
-%\setlength\fboxrule{.4\p@}
 
 \pagestyle{empty}
 \raggedbottom
@@ -254,8 +253,7 @@
 \newcommand*{\email}[1]{\def\@email{#1}}
 \newcommand*{\homepage}[1]{\def\@homepage{#1}}
 \newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
-\def\@photowidth{0pt}
-\newcommand*{\photo}[2][64pt]{\def\@photowidth{#1}\def\@photo{#2}}
+\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.
 \newcommand*{\quote}[1]{\def\@quote{#1}}
 
 % length used by the moderncv layout
-- 
cgit v1.2.3

