moderncv 0.14 (5dec11)

git-svn-id: svn://tug.org/texlive/trunk@24770 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 210 insertions, 80 deletions

diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
index 9878b2570c8..4bf26e69494 100644
--- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
@@ -1,13 +1,18 @@
+version 0.14 (04 December 2011)
+ - adds support for CJK, thanks to the help of P. D'Apice.
+ - the use of \recomputelengths after modifying any length in the preamble is now
+ unnecessary; \recomputelength is automatically called at the start of the document.
+
 version 0.13.1 (11 November 2011)
  - correct a bug introduced by v0.13 in the classic style when no \photo is used,
  as reported by S. Gislais (launchpad bug #888702).
 
 version 0.13 (06 November 2011)
  - added a "black" color option to render the resume in black & white, as suggested
-  by F. Bicarri.
+ by F. Bicarri.
  - removed the pdflatex option when loading hyperref to enable other engines
-  (e.g., dvips, xetex), leftover from the v 0.11 cleanup, as reported by
-  K. Amaterasu and P. Mavrogiorgos (launchpad bugs #754693 and #859834).
+ (e.g., dvips, xetex), leftover from the v 0.11 cleanup, as reported by
+ K. Amaterasu and P. Mavrogiorgos (launchpad bugs #754693 and #859834).
  - added a "purple" color option, as proposed by B. Ravel.
  - added a 3rd optional argument to the \photo command to control the thickness of
  the framebox. Setting it to 0pt will disable the frame around the photo, as
diff --git a/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS b/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
index bc1a20860f8..92a6f36cc08 100644
--- a/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
+++ b/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
@@ -1,5 +1,5 @@
-- The \cvsection command seems to be unable to handle a Chinese argument, using
-  CJK.
+- When using CJK, the last \clearpage required for fancyhdr to work properly kills
+  the "lastpage" counter, hence also the page numbering.
 - Moderncv produces an error ("lonely \item--perhaps a missing list environment")
   when used with bibentry, through the output is actually correct. Amongst other,
   this causes compilation by LyX to stop.
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf
new file mode 100644
index 00000000000..dffb9e40c2e
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..bea945453be
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex
@@ -0,0 +1,133 @@
+%% start of file `template.tex'.
+%% 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,
+% available at http://www.latex-project.org/lppl/.
+
+
+\documentclass[11pt,a4paper]{moderncv}
+
+% moderncv 主题
+\moderncvtheme[blue]{casual}                  % 选项参数是 ‘blue’ (默认)、‘orange’、‘green’、‘red’、‘purple’、‘grey’和‘roman’ (改变无衬线自体为衬线字体)
+%\moderncvtheme[green]{classic}               % 同上
+
+% 字符编码
+\usepackage[utf8]{inputenc}                   % 替换你正在使用的编码
+\usepackage{CJKutf8}
+
+% 调整页面出血
+\usepackage[scale=0.8]{geometry}
+%\setlength{\hintscolumnwidth}{3cm}           % 如果你希望改变日期栏的宽度
+%\setlength{\maketitlenamewidth}{10cm}        % 仅用于经典主题,如果你希望改变你的姓名框的宽度 (以便给地址留出更多的空间)
+
+% 个人信息
+\firstname{小龙}
+\familyname{李}
+\title{简历题目 (可选项)}                      % 可选项、如不需要可删除本行
+\address{街道及门牌号}{邮编及城市}             % 可选项、如不需要可删除本行
+\mobile{手机 (可选项)}                         % 可选项、如不需要可删除本行
+\phone{电话 (可选项)}                          % 可选项、如不需要可删除本行
+\fax{传真 (可选项)}                            % 可选项、如不需要可删除本行
+\email{xiaolong@li.com.cn}                    % 可选项、如不需要可删除本行
+\homepage{www.xialongli.com}                  % 可选项、如不需要可删除本行
+\extrainfo{附加信息 (可选项)}                  % 可选项、如不需要可删除本行
+\photo[64pt][0.4pt]{picture}                  % ‘64pt’是图片必须压缩至的高度、‘0.4pt‘是图片边框的宽度 (如不需要可调节至0pt)、’picture‘ 是图片文件的名字;可选项、如不需要可删除本行
+\quote{引言(可选项)}                           % 可选项、如不需要可删除本行
+
+% 显示索引号;仅用于在简历中使用了引言
+\makeatletter
+\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}
+\makeatother
+
+% 分类索引
+%\usepackage{multibib}
+%\newcites{book,misc}{{Books},{Others}}
+
+%\nopagenumbers{}                             % 消除注释以取消自动页码生成功能
+%----------------------------------------------------------------------------------
+%            内容
+%----------------------------------------------------------------------------------
+\begin{document}
+\begin{CJK}{UTF8}{gbsn}                       % 详情参阅CJK文件包
+\maketitle
+
+\section{教育背景}
+\cventry{年 -- 年}{学位}{院校}{城市}{\textit{成绩}}{说明}  % 第3到第6编码可留白
+\cventry{年 -- 年}{学位}{院校}{城市}{\textit{成绩}}{说明}
+
+\section{毕业论文}
+\cvline{题目}{\emph{题目}}
+\cvline{导师}{导师}
+\cvline{说明}{\small 论文简介}
+
+\section{工作背景}
+\subsection{专业}
+\cventry{年 -- 年}{职位}{公司}{城市}{}{不超过1--2行的概况说明\newline{}%
+工作内容:%
+\begin{itemize}%
+\item 工作内容 1;
+\item 工作内容 2、 含二级内容:
+  \begin{itemize}%
+  \item 二级内容 (a);
+  \item 二级内容 (b)、含三级内容 (不建议使用);
+    \begin{itemize}
+    \item 三级内容 i;
+    \item 三级内容 ii;
+    \item 三级内容 iii;
+    \end{itemize}
+  \item 二级内容 (c);
+  \end{itemize}
+\item 工作内容 3。
+\end{itemize}}
+\cventry{年 -- 年}{职位}{公司}{城市}{}{说明行1\newline{}说明行2}
+\subsection{其他}
+\cventry{年 -- 年}{职位}{公司}{城市}{}{说明}
+
+\section{语言技能}
+\cvlanguage{语言 1}{水平}{评价}
+\cvlanguage{语言 2}{水平}{评价}
+\cvlanguage{语言 3}{水平}{评价}
+
+\section{计算机技能}
+\cvcomputer{类别 1}{XXX, YYY, ZZZ}{类别 4}{XXX, YYY, ZZZ}
+\cvcomputer{类别 2}{XXX, YYY, ZZZ}{类别 5}{XXX, YYY, ZZZ}
+\cvcomputer{类别 3}{XXX, YYY, ZZZ}{类别 6}{XXX, YYY, ZZZ}
+
+\section{个人兴趣}
+\cvline{爱好 1}{\small 说明}
+\cvline{爱好 2}{\small 说明}
+\cvline{爱好 3}{\small 说明}
+
+\section{其他 1}
+\cvlistitem{项目 1}
+\cvlistitem{项目 2}
+\cvlistitem[+]{项目 3}                         % 可选其他符号
+
+\renewcommand{\listitemsymbol}{-}             % 改变列表符号
+
+\section{其他 2}
+\cvlistdoubleitem{项目 1}{项目 4}
+\cvlistdoubleitem{项目 2}{项目 5 \cite{book1}}
+\cvlistdoubleitem{项目 3}{}
+
+% 来自BibTeX文件但不使用multibib包的出版物
+%\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}% BibTeX的数字标签
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{publications}                    % 'publications' 是BibTeX文件的文件名
+
+% 来自BibTeX文件并使用multibib包的出版物
+%\section{出版物}
+%\nocitebook{book1,book2}
+%\bibliographystylebook{plain}
+%\bibliographybook{publications}               % 'publications' 是BibTeX文件的文件名
+%\nocitemisc{misc1,misc2,misc3}
+%\bibliographystylemisc{plain}
+%\bibliographymisc{publications}               % 'publications' 是BibTeX文件的文件名
+
+\clearpage\end{CJK}
+\end{document}
+
+
+%% 文件结尾 `template_zh.tex'.
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
index 58e8277deea..02d33239ead 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 6154fb1d791..aca92429401 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
@@ -10,16 +10,16 @@
 
 % moderncv themes
 \moderncvtheme[blue]{casual}                  % optional argument are 'blue' (default), 'orange', 'green', 'red', 'purple', 'grey' and 'roman' (for roman fonts, instead of sans serif fonts)
-%\moderncvtheme[green]{classic}                % idem
+%\moderncvtheme[green]{classic}               % idem
 
 % character encoding
 \usepackage[utf8]{inputenc}                   % 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.8]{geometry}
-%\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
+%\setlength{\hintscolumnwidth}{3cm}           % if you want to change the width of the column with the dates
+%\setlength{\maketitlenamewidth}{10cm}}       % only for the classic theme, if you want to change the width of your name placeholder (to leave more space for your address details
 
 % personal data
 \firstname{John}
@@ -32,7 +32,7 @@
 \email{email (optional)}                      % optional, remove the line if not wanted
 \homepage{homepage (optional)}                % optional, remove the line if not wanted
 \extrainfo{additional information (optional)} % optional, remove the line if not wanted
-\photo[64pt][0.4pt]{picture}                         % '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; optional, remove the line if not wanted
+\photo[64pt][0.4pt]{picture}                  % '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; optional, remove the line if not wanted
 \quote{Some quote (optional)}                 % optional, remove the line if not wanted
 
 % to show numerical labels in the bibliography; only useful if you make citations in your resume
@@ -49,6 +49,7 @@
 %            content
 %----------------------------------------------------------------------------------
 \begin{document}
+%\begin{CJK*}{UTF8}{gbsn}                    % to typeset your resume in Chinese using CJK
 \maketitle
 
 \section{Education}
@@ -101,9 +102,9 @@ Detailed achievements:%
 \section{Extra 1}
 \cvlistitem{Item 1}
 \cvlistitem{Item 2}
-\cvlistitem[+]{Item 3}            % optional other symbol
+\cvlistitem[+]{Item 3}                       % optional other symbol
 
-\renewcommand{\listitemsymbol}{-} % change the symbol for lists
+\renewcommand{\listitemsymbol}{-}            % change the symbol for lists
 
 \section{Extra 2}
 \cvlistdoubleitem{Item 1}{Item 4}
@@ -113,17 +114,18 @@ Detailed achievements:%
 % Publications from a BibTeX file without multibib\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}% for BibTeX numerical labels
 \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\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_casual_orange.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
index fac47eeb7d0..b0f8cefa864 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
index 14178f59cb9..347b0fdca8d 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
index 71ae6e4a684..1fb4365eb70 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/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index a2e596813ba..b4199d585ea 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
@@ -10,7 +10,7 @@
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{moderncv}[2011/11/11 v0.13.1 modern curriculum vitae document class]
+\ProvidesClass{moderncv}[2011/12/04 v0.14 modern curriculum vitae document class]
 
 
 %-------------------------------------------------------------------------------
@@ -64,10 +64,6 @@
 \newif\if@lmodern\@lmoderntrue
 \DeclareOption{nolmodern}{\@lmodernfalse}
 
-% CJK option
-%\newif\if@CJK\@CJKfalse
-%\DeclareOption{CJK}{\@CJKtrue}
-
 % execute default options
 \ExecuteOptions{a4paper,11pt,color,final}
 
@@ -89,18 +85,12 @@
 % if... then... else... constructs
 \RequirePackage{ifthen}
 
-% latex vs pdflatex vs xelatex vs luatex compilation
-%\RequirePackage{ifpdf}
-
 % color
 \RequirePackage{color}
 
 % font encoding
 \RequirePackage[T1]{fontenc}
 
-% scalable Computer Modern fonts
-%\usepackage{type1cm}
-
 % latin modern fonts
 \if@lmodern
   \RequirePackage{lmodern}\fi
@@ -108,9 +98,6 @@
 % symbols like \Telefon, \Mobilefone, \Letter and \Email
 \RequirePackage{marvosym}
 
-% extended characters of T1 in .ps + other guillemets
-%\RequirePackage{ae,aecompl,aeguill}
-
 % page geometry
 \addtolength{\oddsidemargin}{-54pt}
 \addtolength{\textwidth}{109pt}
@@ -125,15 +112,14 @@
 % load hyperred at the end of the preamble to pass options required by loaded packages (like CJK)
 \AtEndPreamble{
   \@ifpackageloaded{CJK}
-    {\RequirePackage[CJKbookmarks]{hyperref}}
+    {\RequirePackage[unicode]{hyperref}}
     {\RequirePackage{hyperref}}
-  \AtBeginDocument{
     \hypersetup{
       breaklinks,
       baseurl       = http://,
       pdfborder     = 0 0 0,
       pdfpagemode   = UseNone,% do not show thumbnails or bookmarks on opening
-%      pdfstartview  = FitH,
+      pdfpagelabels = false,% to avoid a warning setting it automatically to false anyway, because hyperref detects \thepage as undefined (why?)
       pdfstartpage  = 1,
       pdfcreator    = \LaTeX{} with `moderncv' package,
       pdfproducer   = \LaTeX{},
@@ -141,7 +127,7 @@
       pdfauthor     = \@firstname~\@familyname,
       pdftitle      = \@title,
       pdfsubject    = \@firstname~\@familyname,
-      pdfkeywords   = \@firstname~\@familyname{} curriculum vit\ae{}}}
+      pdfkeywords   = \@firstname~\@familyname{} curriculum vit\ae{}}
   \pagenumbering{arabic}% has to be issued after loading hyperref
 }
 
@@ -170,14 +156,14 @@
 \setlength\lineskip{1\p@}
 \setlength\normallineskip{1\p@}
 \renewcommand\baselinestretch{}
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{0pt}
+\setlength{\parindent}{0\p@}
+\setlength{\parskip}{0\p@}
 \setlength\columnsep{10\p@}
 \setlength\columnseprule{0\p@}
 \setlength\fboxsep{3\p@}
 \setlength\fboxrule{.4\p@}
 
-% TO BE TESTED
+% Not required
 %\setlength\arraycolsep{5\p@}
 %\setlength\tabcolsep{6\p@}
 %\setlength\arrayrulewidth{.4\p@}
@@ -232,12 +218,16 @@
 \providecommand*{\subsectionstyle}[1]{{\subsectionfont\color{subsectioncolor}#1}}
 \providecommand*{\hintstyle}[1]{{\hintfont\color{hintcolor}#1}}
 
-% themes: casual (default), classic, ...
+% makes the cv title
+\newcommand*{\maketitle}{}%
+\title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title
+
+% makes the cv footer
+\newcommand*{\makefooter}
+
+% loads a style
 \newcommand*{\moderncvtheme}[2][]{
-  \def\@moderncvtheme{#2}
-  \def\@moderncvthemeoptions{#1}}
-\moderncvtheme{casual}% default theme
-\AtEndPreamble{\RequirePackage[\@moderncvthemeoptions]{moderncvtheme\@moderncvtheme}}
+  \RequirePackage[#1]{moderncvtheme#2}}
 
 
 %-------------------------------------------------------------------------------
@@ -261,6 +251,7 @@
 \newlength{\quotewidth}
 % section lengths
 \newlength{\hintscolumnwidth}
+\setlength{\hintscolumnwidth}{0.15\textwidth}
 \newlength{\separatorcolumnwidth}
 \setlength{\separatorcolumnwidth}{0.025\textwidth}
 \newlength{\maincolumnwidth}
@@ -294,13 +285,8 @@
   \setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}%
   % fancyhdr lengths
   \renewcommand{\headwidth}{\textwidth}%
-  \recomputethemelengths}
-\setlength{\hintscolumnwidth}{0.15\textwidth}
-\recomputelengths
-
-% makes the cv title
-%\newcommand*{\maketitle}{}%
-\title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title
+  \recomputethemelengths{}}
+\AtBeginDocument{\recomputelengths{}}
 
 % draws a colored rectangle
 % usage: \colorrule[optional height]{width}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
index e32e667f38c..9069a4d5f17 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
@@ -10,7 +10,7 @@
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcompatibility}[2011/11/11 v0.13.1 modern curriculum vitae compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2011/12/04 v0.14 modern curriculum vitae compatibility patches]
 
 
 %-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
index 76332ed49a5..77cd1b58139 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
@@ -10,7 +10,7 @@
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvthemecasual}[2011/11/11 v0.13.1 modern curriculum vitae style: casual]
+\ProvidesPackage{moderncvthemecasual}[2011/12/04 v0.14 modern curriculum vitae style: casual]
 
 
 %-------------------------------------------------------------------------------
@@ -123,26 +123,6 @@
 
 % styles
 
-% maketitle
-\renewcommand*{\maketitle}{%
-  {%
-    \ifthenelse{\isundefined{\@photo}}%
-      {}%
-      {%
-      \setlength\fboxrule{\@photoframewidth}%
-        \ifdim\@photoframewidth=0pt%
-          \setlength{\fboxsep}{0pt}\fi%
-        {\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
-    \hfill%
-%    \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}%
-    \raggedleft{\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}}\\[-.35em]}%
-  {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[2.5em]}%
-% optional quote
-  \ifthenelse{\isundefined{\@quote}}%
-    {}%
-    {{\centering{}\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
-  \par}% to avoid weird spacing bug at the first section if no blank line is left after \maketitle
-
 % cv footer
 \newif\if@firstfooterelement\@firstfooterelementtrue
 \providecommand*{\footersymbol}{}
@@ -150,7 +130,6 @@
   \if@firstfooterelement%
   \else%
     { ~~\color{footersymbolcolor}\textbullet~~~}\fi}
-\providecommand*{\makefooter}{}
 \renewcommand*{\makefooter}{%
   \fancypagestyle{plain}{%
     \fancyfoot[c]{%
@@ -169,7 +148,27 @@
       \ifthenelse{\isundefined{\@extrainfo}}{}{\footersymbol\@extrainfo\@firstfooterelementfalse}}}%
   }%
   \pagestyle{plain}}
-\AtBeginDocument{\makefooter}
+
+% maketitle
+\renewcommand*{\maketitle}{%
+  \makefooter{}%
+  {%
+    \ifthenelse{\isundefined{\@photo}}%
+      {}%
+      {%
+      \setlength\fboxrule{\@photoframewidth}%
+        \ifdim\@photoframewidth=0pt%
+          \setlength{\fboxsep}{0pt}\fi%
+        {\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
+    \hfill%
+%    \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}%
+    \raggedleft{\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}}\\[-.35em]}%
+  {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[2.5em]}%
+% optional quote
+  \ifthenelse{\isundefined{\@quote}}%
+    {}%
+    {{\centering{}\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
+  \par}% to avoid weird spacing bug at the first section if no blank line is left after \maketitle
 
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
index 690f6c35509..799851a5f2a 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
@@ -10,7 +10,7 @@
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvthemeclassic}[2011/11/11 v0.13.1 modern curriculum vitae style: classic]
+\ProvidesPackage{moderncvthemeclassic}[2011/12/04 v0.14 modern curriculum vitae style: classic]
 
 
 %-------------------------------------------------------------------------------
@@ -123,14 +123,11 @@
 % styles
 
 % maketitle
-%   setmaketitlenamemaxwidth to the full name length, capped by \maketitlenamemaxwidth
+%   set \maketitlenamewidth to the desired length, or leave it up to moderncv to try to optimize it
 \newlength{\maketitlenamemaxwidth}
 \setlength{\maketitlenamemaxwidth}{.525\textwidth}
-\newlength{\maketitlenamefullwidth}
-\settowidth{\maketitlenamefullwidth}{\firstnamestyle{\@firstname~}\familynamestyle{\@familyname}}
 \newlength{\maketitlenamewidth}
-\ifnum\maketitlenamemaxwidth<\maketitlenamefullwidth\setlength{\maketitlenamewidth}{\maketitlenamemaxwidth}\else\setlength{\maketitlenamewidth}{\maketitlenamefullwidth}\fi
-%   other lengths
+\setlength{\maketitlenamewidth}{0pt}
 \newlength{\maketitlepicturewidth}
 \newlength{\maketitledetailswidth}
 %   recompute theme-specific lengths, called by class to recompute all lengths
@@ -142,7 +139,6 @@
   	{\setlength{\maketitlepicturewidth}{\@photowidth}
   	\addtolength{\maketitledetailswidth}{-\separatorcolumnwidth}%
   	\addtolength{\maketitledetailswidth}{-\maketitlepicturewidth}}}
-\recomputethemelengths
 \newif\if@firstdetailselement\@firstdetailselementtrue
 \newcommand*{\maketitledetailsnewline}{
   \if@firstdetailselement%
@@ -150,6 +146,15 @@
   \else%
     \\[.2em]\fi}
 \renewcommand*{\maketitle}{%
+  % recompute lengths (necessary to delay the computation of \maketitlenamefullwidth until \maketitle because of potential CJK requirement in \@firstname and \@familyname)
+  \ifdim\maketitlenamewidth=0pt%
+    \newlength{\maketitlenamefullwidth}%
+    \settowidth{\maketitlenamefullwidth}{\firstnamestyle{\@firstname~}\familynamestyle{\@familyname}}%
+    \ifnum\maketitlenamemaxwidth<\maketitlenamefullwidth%
+      \setlength{\maketitlenamewidth}{\maketitlenamemaxwidth}%
+    \else%
+      \setlength{\maketitlenamewidth}{\maketitlenamefullwidth}\fi\fi
+  \recomputethemelengths{}%
   % name and title
   \begin{minipage}[b]{\maketitlenamewidth}%
     \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
index 1433c39c6c2..e2c7d59e884 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
@@ -10,7 +10,7 @@
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvthemeempty}[2011/11/11 v0.13.1 modern curriculum vitae style: empty]
+\ProvidesPackage{moderncvthemeempty}[2011/12/04 v0.14 modern curriculum vitae style: empty]
 
 
 %-------------------------------------------------------------------------------