8 files changed, 81 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/latex/ecv/README b/Master/texmf-dist/doc/latex/ecv/README
index 5951fea580c..e99aa43829d 100644
--- a/Master/texmf-dist/doc/latex/ecv/README
+++ b/Master/texmf-dist/doc/latex/ecv/README
@@ -1,5 +1,5 @@
               -----------------------------
-              Version 0.1 of the ecv class
+              Version 0.2 of the ecv class
                C. Neumann, B. Haberstumpf
               -----------------------------
 
@@ -13,6 +13,13 @@ As this class is created mainly for ourselves it does not
 contain evil low-level TeX magic but instead uses many other
 fancy LaTeX packages that we hope you have already installed.
 
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
 
 Required Packages
 -----------------
@@ -67,3 +74,4 @@ found. Just unzip the template.zip, cd to template and run make to get the
 pdf.
 
 /Bernd Haberstumpf, <poldi@kabatrinker.de>, 2007-01-06
+/Christoph Neumann, <c.p.neumann+ecv@gmail.com>, 2009-10-21
diff --git a/Master/texmf-dist/doc/latex/ecv/ecv.pdf b/Master/texmf-dist/doc/latex/ecv/ecv.pdf
index 84c750aa80b..75b19eb3dae 100644
--- a/Master/texmf-dist/doc/latex/ecv/ecv.pdf
+++ b/Master/texmf-dist/doc/latex/ecv/ecv.pdf
diff --git a/Master/texmf-dist/doc/latex/ecv/template/CV-template_de.pdf b/Master/texmf-dist/doc/latex/ecv/template/CV-template_de.pdf
index c8c3e585245..c6cdd7e932f 100644
--- a/Master/texmf-dist/doc/latex/ecv/template/CV-template_de.pdf
+++ b/Master/texmf-dist/doc/latex/ecv/template/CV-template_de.pdf
diff --git a/Master/texmf-dist/doc/latex/ecv/template/CV-template_en.tex b/Master/texmf-dist/doc/latex/ecv/template/CV-template_en.tex
index b920e2f38ff..15b574012c3 100644
--- a/Master/texmf-dist/doc/latex/ecv/template/CV-template_en.tex
+++ b/Master/texmf-dist/doc/latex/ecv/template/CV-template_en.tex
@@ -72,7 +72,7 @@
                 {<List of the major subjects>}
 \ecvENR{Minor subjects}
                 {<List of minor subjects>}
-\ecvENR{Grade}   {Evarage grade <overall evarage grade>}
+\ecvENR{Grade}   {Avarage grade <overall avarage grade>}
 % Schule
 \ecvEFR{Period}{<Year>--<Year>}
 \ecvENR{Accquired qualifications}
diff --git a/Master/texmf-dist/source/latex/ecv/ecv.dtx b/Master/texmf-dist/source/latex/ecv/ecv.dtx
index 7110c07318e..17f787b5aac 100644
--- a/Master/texmf-dist/source/latex/ecv/ecv.dtx
+++ b/Master/texmf-dist/source/latex/ecv/ecv.dtx
@@ -1,16 +1,16 @@
 %\iffalse
 % ecv.dtx generated using makedtx version 0.91b (c) Nicola Talbot
 % Command line args:
-%   -dir "src"
-%   -silent "1"
-%   -src "(ecv.cls|ecvNLS.sty|ecvGerman.ldf|ecvEnglish.ldf)=>\1"
-%   -author "Christoph Neumann & Bernd Haberstumpf"
 %   -macrocode ".*"
-%   -setambles ".*=>\nopreamble"
+%   -src "(ecv.cls|ecvNLS.sty|ecvGerman.ldf|ecvEnglish.ldf)=>\1"
+%   -author "Christoph P. Neumann & Bernd Haberstumpf"
+%   -dir "src"
 %   -usedir "tex/latex/ecv"
+%   -setambles ".*=>\nopreamble"
 %   -doc "doc/ecv.tex"
+%   -silent "1"
 %   ecv
-% Created on 2007/2/11 12:25
+% Created on 2009/8/26 0:15
 %\fi
 %\iffalse
 %<*package>
@@ -33,7 +33,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2007 Christoph Neumann & Bernd Haberstumpf, all rights reserved.
+% Copyright (C) 2009 Christoph P. Neumann & Bernd Haberstumpf, all rights reserved.
 % \fi
 % \iffalse
 %<*driver>
@@ -77,7 +77,7 @@
 %
 %\title{\textsf{ecv}\\
 %A fancy Curriculum Vitae Class} 
-%\author{Christoph Neumann \texttt{$<$c.p.neumann@web.de$>$}, \\
+%\author{Christoph P.\ Neumann \texttt{$<$c.p.neumann+ecv@gmail.com$>$}, \\
 %Bernd Haberstumpf \texttt{$<$poldi@kabatrinker.de$>$}} 
 %\maketitle 
 %\PrintChanges
@@ -616,7 +616,7 @@
 
 \ProvidesClass{ecv}[\filedate %
   \space Version \fileversion\space by %
-  Christoph Neumann & Bernd Haberstumpf %
+  Christoph P.\ Neumann & Bernd Haberstumpf %
 ]
 
 
@@ -639,18 +639,14 @@
 % Load base class
 % 
 
-\LoadClass[a4paper,11pt]{scrartcl}
+\LoadClass[a4paper,11pt]{article}
 
 % define command to check for pdf
-\newif\ifpdf 
-  \ifx\pdfoutput\undefined 
-  \pdffalse                     % we are not running pdflatex 
-\else 
-  \pdfoutput=1                  % we are running pdflatex 
-  \pdfcompresslevel=9           % compression level fortext and image;
-  \pdftrue 
-\fi
+\RequirePackage{ifpdf}
 
+\ifpdf
+  \pdfcompresslevel=9           % compression level fortext and image;
+\fi 
 
 %
 % Load packages
@@ -682,13 +678,23 @@
 \RequirePackage{helvet}
 
 % Colors for the sections
-\RequirePackage{color}
+\RequirePackage{xcolor}
 
 % Needed for the footline to redefine the footline
 \RequirePackage{fancyhdr}
 
 % Inputencoding (latin1 with euro sign)
-\RequirePackage[latin9]{inputenc} % = latin1, but also with euro sign
+%\RequirePackage[latin9]{inputenc} % = latin1, but also with euro sign
+% Better variant than inputenc:
+\RequirePackage{selinput}
+% SelectInputMappings seems not to be necessary? ...
+% If it is used in the cls file it makes problems if used 
+% in a Windows environment... ?!?
+%\SelectInputMappings{
+%	adieresis={ä},
+%	germandbls={ß},
+%	Euro={€},
+%}
 
 % Outputencoding
 \RequirePackage[T1]{fontenc}
@@ -918,6 +924,14 @@
   }{}%
 }
 \newcommand{\ecvTagFirst}[2][\ecv@lang]{\ecvTF[#1]{#2}}
+% tag with first line mark (triange bullet left column entry)
+% but WITHOUT the line break!
+\newcommand{\ecvTI}[2][\ecv@lang]{%
+  \ifthenelse{\equal{#1}{\ecv@lang}}{%
+    \ecvLeft{\ecvBulletedFirst{#2}}%
+  }{}%
+}
+\newcommand{\ecvTagIntermediate}[2][\ecv@lang]{\ecvTI[#1]{#2}}
 % tag with first follow line mark (circle bullet left column entry)
 \newcommand{\ecvTN}[2][\ecv@lang]{%
   \ifthenelse{\equal{#1}{\ecv@lang}}{%
@@ -967,6 +981,16 @@
   \ecvTF[#1]{#2} & \ecvVB[#1]{#3} %
 }
 \newcommand{\ecvTagFirstValueBlocked}[3][\ecv@lang]{\ecvEFB[#1]{#2}{#3}}
+% bulleted intermediate tag with ragged value
+\newcommand{\ecvEIR}[3][\ecv@lang]{%
+  \ecvTI[#1]{#2} & \ecvVR[#1]{#3} %
+}
+\newcommand{\ecvTagIntermediateValueRagged}[3][\ecv@lang]{\ecvEIR[#1]{#2}{#3}}
+% bulleted intermediate tag with blocked value
+\newcommand{\ecvEIB}[3][\ecv@lang]{%
+  \ecvTI[#1]{#2} & \ecvVB[#1]{#3} %
+}
+\newcommand{\ecvTagIntermediateValueBlocked}[3][\ecv@lang]{\ecvEIB[#1]{#2}{#3}}
 % bulleted next tag with ragged value
 \newcommand{\ecvENR}[3][\ecv@lang]{%
   \ecvTN[#1]{#2} & \ecvVR[#1]{#3} %
@@ -1106,7 +1130,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesFile{ecvGerman.ldf}[2007/01/05]
+\ProvidesFile{ecvEnglish.ldf}[2007/01/05]
 
 \def\ecvNLS@Page{Page}
 \def\ecvNLS@Title{Curriculum Vitae}
diff --git a/Master/texmf-dist/source/latex/ecv/ecv.ins b/Master/texmf-dist/source/latex/ecv/ecv.ins
index 35dbccada5b..e4dd7fb648f 100644
--- a/Master/texmf-dist/source/latex/ecv/ecv.ins
+++ b/Master/texmf-dist/source/latex/ecv/ecv.ins
@@ -1,8 +1,8 @@
-% ecv.ins generated using makedtx version 0.91b 2007/2/11 12:25
+% ecv.ins generated using makedtx version 0.91b 2009/8/26 0:15
 \input docstrip
 
 \preamble
-Copyright (C) 2007 Christoph Neumann & Bernd Haberstumpf, all rights reserved.
+Copyright (C) 2009 Christoph P. Neumann & Bernd Haberstumpf, all rights reserved.
 If you modify this file, you must change its name first.
 You are NOT ALLOWED to distribute this file alone. You are NOT
 ALLOWED to take money for the distribution or use of either this
@@ -16,9 +16,9 @@ etc.
 
 \usedir{tex/latex/ecv}
 
-\generate{\file{ecvGerman.ldf}{\nopreamble\from{ecv.dtx}{ecvGerman.ldf}}
+\generate{\file{ecvEnglish.ldf}{\nopreamble\from{ecv.dtx}{ecvEnglish.ldf}}
 \file{ecv.cls}{\nopreamble\from{ecv.dtx}{ecv.cls}}
-\file{ecvEnglish.ldf}{\nopreamble\from{ecv.dtx}{ecvEnglish.ldf}}
+\file{ecvGerman.ldf}{\nopreamble\from{ecv.dtx}{ecvGerman.ldf}}
 \file{ecvNLS.sty}{\nopreamble\from{ecv.dtx}{ecvNLS.sty}}
 }
 
diff --git a/Master/texmf-dist/tex/latex/ecv/ecv.cls b/Master/texmf-dist/tex/latex/ecv/ecv.cls
index 9cb7dac4c6a..cf62caec0fb 100644
--- a/Master/texmf-dist/tex/latex/ecv/ecv.cls
+++ b/Master/texmf-dist/tex/latex/ecv/ecv.cls
@@ -28,7 +28,7 @@
 
 \ProvidesClass{ecv}[\filedate %
   \space Version \fileversion\space by %
-  Christoph Neumann & Bernd Haberstumpf %
+  Christoph P.\ Neumann & Bernd Haberstumpf %
 ]
 
 
@@ -43,15 +43,12 @@
 \ProcessOptions
 
 
-\LoadClass[a4paper,11pt]{scrartcl}
+\LoadClass[a4paper,11pt]{article}
 
-\newif\ifpdf
-  \ifx\pdfoutput\undefined
-  \pdffalse                     % we are not running pdflatex
-\else
-  \pdfoutput=1                  % we are running pdflatex
+\RequirePackage{ifpdf}
+
+\ifpdf
   \pdfcompresslevel=9           % compression level fortext and image;
-  \pdftrue
 \fi
 
 
@@ -73,11 +70,11 @@
 
 \RequirePackage{helvet}
 
-\RequirePackage{color}
+\RequirePackage{xcolor}
 
 \RequirePackage{fancyhdr}
 
-\RequirePackage[latin9]{inputenc} % = latin1, but also with euro sign
+\RequirePackage{selinput}
 
 \RequirePackage[T1]{fontenc}
 
@@ -252,6 +249,12 @@
   }{}%
 }
 \newcommand{\ecvTagFirst}[2][\ecv@lang]{\ecvTF[#1]{#2}}
+\newcommand{\ecvTI}[2][\ecv@lang]{%
+  \ifthenelse{\equal{#1}{\ecv@lang}}{%
+    \ecvLeft{\ecvBulletedFirst{#2}}%
+  }{}%
+}
+\newcommand{\ecvTagIntermediate}[2][\ecv@lang]{\ecvTI[#1]{#2}}
 \newcommand{\ecvTN}[2][\ecv@lang]{%
   \ifthenelse{\equal{#1}{\ecv@lang}}{%
     \ecvLeft{\ecvBulleted{#2}}%
@@ -290,6 +293,14 @@
   \ecvTF[#1]{#2} & \ecvVB[#1]{#3} %
 }
 \newcommand{\ecvTagFirstValueBlocked}[3][\ecv@lang]{\ecvEFB[#1]{#2}{#3}}
+\newcommand{\ecvEIR}[3][\ecv@lang]{%
+  \ecvTI[#1]{#2} & \ecvVR[#1]{#3} %
+}
+\newcommand{\ecvTagIntermediateValueRagged}[3][\ecv@lang]{\ecvEIR[#1]{#2}{#3}}
+\newcommand{\ecvEIB}[3][\ecv@lang]{%
+  \ecvTI[#1]{#2} & \ecvVB[#1]{#3} %
+}
+\newcommand{\ecvTagIntermediateValueBlocked}[3][\ecv@lang]{\ecvEIB[#1]{#2}{#3}}
 \newcommand{\ecvENR}[3][\ecv@lang]{%
   \ecvTN[#1]{#2} & \ecvVR[#1]{#3} %
 }
diff --git a/Master/texmf-dist/tex/latex/ecv/ecvEnglish.ldf b/Master/texmf-dist/tex/latex/ecv/ecvEnglish.ldf
index 5e2d5477b73..c72e1c5f37e 100644
--- a/Master/texmf-dist/tex/latex/ecv/ecvEnglish.ldf
+++ b/Master/texmf-dist/tex/latex/ecv/ecvEnglish.ldf
@@ -23,7 +23,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesFile{ecvGerman.ldf}[2007/01/05]
+\ProvidesFile{ecvEnglish.ldf}[2007/01/05]
 
 \def\ecvNLS@Page{Page}
 \def\ecvNLS@Title{Curriculum Vitae}