koma-moderncvclassic (8dec10)

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

4 files changed, 60 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/koma-moderncvclassic/README b/Master/texmf-dist/doc/latex/koma-moderncvclassic/README
new file mode 100644
index 00000000000..aedbdf4cd88
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/koma-moderncvclassic/README
@@ -0,0 +1,19 @@
+KOMA-MODERNCVCLASSIC v0.2
+=========================
+
+This package provides an imitation of the moderncv-class with the classic style (by Xavier Danaux), to be used in conjunction with the koma-classes (usually scrartcl).
+
+Thus it is possible to configure pagelayout, headings etc. the way it is done in koma-classes. Moreover, it is possible to use biblatex, while the original moderncv-class is incompatible with biblatex. (This, actually, was the main reason for building this package.)
+
+To be able to use the moderncvclassic-package,
+download the gzip-archive, unpack it and copy the file moderncvlassic.sty to your local tex-directory. Run texhash on your local tex-directory.
+
+With \usepackage{koma-moderncvlassic} the moderncvclassic definitions and commands become available in your document.
+
+The cvbasic-file, which is included in the gzip-archive, shows exemplarily, how a document with koma-moderncvclassic might be structured, which commands are available and how they are to be used. Things are self-explanatory, so there comes no documentation with this package.
+
+Version 0.2 fixes some problems of v0.1 with including a picture and adjusting page margins. Options frame and noframe are added for pictures.
+
+Have fun!!
+Suggestions, wishes, bug reports:
+salome.soedergran@gmx.ch
diff --git a/Master/texmf-dist/doc/latex/koma-moderncvclassic/README.txt b/Master/texmf-dist/doc/latex/koma-moderncvclassic/README.txt
deleted file mode 100644
index 7253b0f1c83..00000000000
--- a/Master/texmf-dist/doc/latex/koma-moderncvclassic/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-KOMA-MODERNCVCLASSIC 0.1
-========================
-
-This package provides an imitation of the moderncv-class with the classic style (by Xavier Danaux), to be used in conjunction with the koma-classes (usually scrartcl).
-
-Thus it is possible to configure pagelayout, headings etc. the way it is done in koma-classes. Moreover, it is possible to use biblatex, while the original moderncv-class is incompatible with biblatex. (This, actually, was the main reason for building this package.)
-
-To be able to use the moderncvclassic-package,
-download the gzip-archive, unpack it and copy the file moderncvlassic.sty to your local tex-directory.
-With
-\usepackage{koma-moderncvlassic}
-the moderncvclassic definitions are available in your document.
-
-The file cvbasic.tex, which is included in the gzip-archive, shows exemplarily, how a document with koma-moderncvclassic might be structured, which commands are available and how they are to be used.
-
-Have fun!!
-Suggestions, wishes, bug reports:
-salome.soedergran@gmx.ch
diff --git a/Master/texmf-dist/doc/latex/koma-moderncvclassic/cvbasic.tex b/Master/texmf-dist/doc/latex/koma-moderncvclassic/cvbasic.tex
index b390368a2be..cb7f804dc01 100644
--- a/Master/texmf-dist/doc/latex/koma-moderncvclassic/cvbasic.tex
+++ b/Master/texmf-dist/doc/latex/koma-moderncvclassic/cvbasic.tex
@@ -1,3 +1,8 @@
+%% start of file `cvbasic.tex'; shows exemplarily the use of koma-moderncvclassic
+%% Copyright 2010 Salome Södergran (salome.soedergran@gmx.ch)
+%%
+\ProvidesFile{cvbasic.tex}[v0.2 2010/12/03]
+%%
 \RequirePackage{filecontents}
 \begin{filecontents}{\jobname.bib}
 @ARTICLE{2006,
@@ -20,9 +25,8 @@ a4paper,%
 pagesize,%
 headinclude,footinclude,%
 headings=normal,%
-%draft,%
-%oneside% 
 ]{scrartcl}
+%\usepackage[left=2cm,right=2cm,top=3cm,bottom=5cm]{geometry} % page layout
 \usepackage{scrpage2}
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
@@ -53,25 +57,25 @@ headings=normal,%
 %\newcommand*{\extrainfo}{}
 %\renewcommand*{\quote}{}
 
-% Foto
-%\photo[3cm]{minna.jpg}
-% '3cm' is the height the picture must be resized to;
-% 'picture' is the name of the picture file;
-
 % ===========================
 %    KOMA-MODERNCVCLASSIC
 % ===========================
 
 \usepackage[myblue]{koma-moderncvclassic} % color theme as option; default = myblue; other predefined colors that may be used: red, green, blue, cyan, magenta, yellow, black, white, darkgray, gray, lightgray
 
+% Foto
+%\photo[noframe]{3cm}{picture.jpg}
+% 'frame' gives a frame around the picture (=default), 'noframe' does not;
+% '3cm' is the width the picture must be resized to;
+% 'picture' is the name of the picture file
+
 
 % ===========================
-%    PAGELAYOUT and
 %    ADAPTIONS
 % ===========================
 
-%\usepackage[left=2cm,right=2cm,top=3cm,bottom=5cm]{geometry}
-\renewcommand*{\familydefault}{\sfdefault}% default font sans-serif
+%\renewcommand*{\familydefault}{\sfdefault}% default font sans-serif
+%\renewcommand*{\addressfont}{\normalsize\sffamily\mdseries\slshape}% sans-serif font for address, too
 %\renewcommand{\firstnamefont}{\fontsize{24}{26}\sffamily\mdseries\upshape} % name in smaller font
 \newcommand*{\totalpagemark}{\usekomafont{pagenumber}\thepage/\pageref{lastpage}}% for page and pagetotal
  
diff --git a/Master/texmf-dist/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty b/Master/texmf-dist/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty
index 7922c6138bc..db807cceb7d 100644
--- a/Master/texmf-dist/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty
+++ b/Master/texmf-dist/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty
@@ -1,5 +1,6 @@
 %% start of file `koma-moderncvclassic.sty'.
 %% Copyright 2010 Salome Södergran (salome.soedergran@gmx.ch)
+%% Thanks to Dominik Wassenhoven for helpful suggestions!
 %%
 %% Adaption of moderncv, theme classic
 %% (Copyright 2006-2008 Xavier Danaux (xdanaux@gmail.com))
@@ -13,7 +14,7 @@
 %     IDENTIFICATION
 % ==============================
 
-\ProvidesPackage{koma-moderncvclassic}[2010/10/11 v0.1]
+\ProvidesPackage{koma-moderncvclassic}[2010/12/03 v0.2]
 \NeedsTeXFormat{LaTeX2e}
 
 % ==============================
@@ -186,21 +187,20 @@ marvosym% for symbols like \Telefon, \Letter, \Email
 \settowidth{\maketitlenamefullwidth}{\firstnamestyle{\firstname~}\familynamestyle{\familyname}}
 \newlength{\maketitlenamewidth}
 \ifnum\maketitlenamemaxwidth<\maketitlenamefullwidth\setlength{\maketitlenamewidth}{\maketitlenamemaxwidth}\else\setlength{\maketitlenamewidth}{\maketitlenamefullwidth}\fi
-%   other lengths
 
-\def\@photowidth{0pt}
-\newcommand*{\photo}[2][64pt]{\def\@photowidth{#1}\def\@photo{#2}}
-\newlength{\maketitlepicturewidth}
-\setlength{\maketitlepicturewidth}{\@photowidth}
+%  other lengths
+\newlength{\photowidth}
+\newcommand{\photo}[3][frame]{%
+  \newcommand{\pictureframe}{#1}%
+  \setlength{\photowidth}{#2}%
+  \newcommand{\photoname}{#3}} 
 
 \newlength{\maketitledetailswidth}
-% %   recompute theme-specific lengths, called by class to recompute all lengths
-% \renewcommand*{\recomputethemelengths}{%
   \setlength{\maketitledetailswidth}{\textwidth}%
   \addtolength{\maketitledetailswidth}{-\maketitlenamewidth}%
-  \addtolength{\maketitledetailswidth}{-\separatorcolumnwidth}%
-  \addtolength{\maketitledetailswidth}{-\maketitlepicturewidth}
-% \recomputethemelengths
+ \addtolength{\maketitledetailswidth}{-\separatorcolumnwidth}%
+ \AtBeginDocument{%
+  \addtolength{\maketitledetailswidth}{-\photowidth}}
 
 \newif\if@firstdetailselement\@firstdetailselementtrue
 \newcommand*{\maketitledetailsnewline}{
@@ -212,15 +212,15 @@ marvosym% for symbols like \Telefon, \Letter, \Email
 \renewcommand*{\maketitle}{%
   % name and title
   \begin{minipage}[b]{\maketitlenamewidth}%
-    \firstnamestyle{%\@
-\firstname~}\familynamestyle{%\@
+    \firstnamestyle{%
+\firstname~}\familynamestyle{%
 \familyname}%
-    \ifthenelse{\equal{%\@
-\acadtitle}{}}{}{\\[1.25em]\acadtitlestyle{%\@
+    \ifthenelse{\equal{%
+\acadtitle}{}}{}{\\[1.25em]\acadtitlestyle{%
 \acadtitle}}%
   \end{minipage}%
   % optional data
-  \begin{minipage}[b]{\maketitledetailswidth}%
+\begin{minipage}[b]{\maketitledetailswidth}%
     \raggedleft\addressfont\color{addresscolor}%
     \ifthenelse{\isundefined{\addressstreet}}{}{%
       \maketitledetailsnewline%
@@ -232,12 +232,18 @@ marvosym% for symbols like \Telefon, \Letter, \Email
     \ifthenelse{\isundefined{\email}}{}{\maketitledetailsnewline\emailsymbol~\emaillink{\email}}%
     \ifthenelse{\isundefined{\extrainfo}}{}{\maketitledetailsnewline\extrainfo}%
   \end{minipage}%
-  % optional photo
-  \ifthenelse{\isundefined{\@photo}}%
+% optional photo
+  \ifthenelse{\isundefined{\photoname}}%
     {}%
-{\hspace*{\separatorcolumnwidth}\color{firstnamecolor}\framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}}\\[3em]%
-  % optional quote
-  \ifthenelse{\isundefined{%\@
+    {\hspace*{\separatorcolumnwidth}%
+     \ifthenelse{\equal{\pictureframe}{noframe}}
+      {\begin{minipage}[b]{\photowidth}
+         \includegraphics[width=\photowidth]{\photoname}
+       \end{minipage}}
+      {\color{firstnamecolor}%
+       \framebox{\includegraphics[width=\photowidth]{\photoname}}}} 
+% optional quote
+  \ifthenelse{\isundefined{%
 \quote}}%
     {}%
     {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\quote}\end{minipage}}%\\[2.5em]