europecv (27jun14)

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

1 files changed, 17 insertions, 1 deletions

diff --git a/Master/texmf-dist/tex/latex/europecv/europecv.cls b/Master/texmf-dist/tex/latex/europecv/europecv.cls
index 0c9a4ef3c0b..ef749e5f8fe 100644
--- a/Master/texmf-dist/tex/latex/europecv/europecv.cls
+++ b/Master/texmf-dist/tex/latex/europecv/europecv.cls
@@ -6,13 +6,17 @@
 % See  http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
 % for the details of that license
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{europecv}[2006/04/24 (beta) European curriculum vitae class]
+\ProvidesClass{europecv}[2006/04/24 (beta+Unicode TeX detection) European curriculum vitae class]
 
 % CV models and instructions:
 %   http://europass.cedefop.eu.int/htm/index.htm
 % Recommendations:
 %   http://europa.eu.int/scadplus/leg/en/cha/c11057.htm
 
+% Additional code to detect xetex and luatex added (with permission)
+% by David Carlisle
+% See comment below.
+
 \newcommand\ecv@utf[1]{{\inputencoding{utf8x}#1}}
 
 % Set language
@@ -292,8 +296,20 @@
 \ProcessOptions\relax
 
 \LoadClass{article}
+
+%% start of addition (with permission) by David Carlisle
+\ifx\Umathchar\@undefined
+%% encoding support for pdftex and classic TeX 
 \RequirePackage{ucs}
 \RequirePackage[utf8x]{inputenc}
+\else
+%% do not use ucs/inputenc for lualatex or xelatex
+%% use UTF-8 input and load a suitable unicode font with fontspec
+%% or for lualatex use \usepackage[utf8]{luainputenc}
+\renewcommand\ecv@utf[1]{{#1}}
+\fi
+%% end of addition by David Carlisle
+
 \RequirePackage{array}
 \RequirePackage{longtable}
 \RequirePackage{fancyhdr} % For page numbering