mycv (30apr12)

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

23 files changed, 338 insertions, 175 deletions

diff --git a/Master/texmf-dist/doc/latex/mycv/CHANGELOG b/Master/texmf-dist/doc/latex/mycv/CHANGELOG
index 1caad0492d0..7bd5602f3d5 100644
--- a/Master/texmf-dist/doc/latex/mycv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/mycv/CHANGELOG
@@ -1,19 +1,40 @@
 
-------------------------------------------------
+================================================
 Fri Apr 13 00:42:35 CEST 2012 -- Version <1.5.2>
-------------------------------------------------
+================================================
 
-    + First public release
+    [+] First public release.
 
-------------------------------------------------
+================================================
 Sat Apr 14 20:17:28 CEST 2012 -- Version <1.5.3>
-------------------------------------------------
+================================================
 
-    ° Name and date of main files are now
-      extracted from my SVN repository so
-      as to prevent future oversights
+    [c] Name and date of main files are now
+        extracted from my SVN repository so
+        as to prevent future oversights.
 
-    ° Renamed "*.tex" files in the bundle
-      base directory to "*.def"
+    [c] Renamed "*.tex" files in the bundle
+        base directory to "*.def".
 
-    ° Some documentation adjustments
\ No newline at end of file
+    [c] Some documentation adjustments.
+
+================================================
+Sat Apr 28 13:19:33 CEST 2012 -- Version <1.5.4>
+================================================
+
+    [x] Fixed a bug in the file name regex
+        that could yield a LaTeX error when
+        used along with optional arguments
+        of a command.
+
+    [+] Added a new example of usage (also
+        did some changes to the old ones)
+        and updated the doc accordingly.
+
+    [c] Changed the extension (from .def to
+        .sty) of the files 'mycv_dec.*' and
+        'mycv_style.*'.
+
+    [c] Modified the default geometry of a
+        document and did other minor changes
+        to the style file.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Doc/Chapters/Fundamentals.tex b/Master/texmf-dist/doc/latex/mycv/Doc/Chapters/Fundamentals.tex
index 8533ce5d527..7384694f9ec 100644
--- a/Master/texmf-dist/doc/latex/mycv/Doc/Chapters/Fundamentals.tex
+++ b/Master/texmf-dist/doc/latex/mycv/Doc/Chapters/Fundamentals.tex
@@ -49,13 +49,13 @@ The class \classname is composed by five files. A short brief of each one is giv
       it contains all the commands and definitions dealing with the layout components of a
       \CV~\myref{sec:layout-components}: it is the core-system file;
       \end{myindent}
-   \item \ctext{mycv\_style.def}
+   \item \ctext{mycv\_style.sty}
       \begin{myindent}
       it contains the default style commands~\myref{sub:style-commands} provided by this class: if
       the default style is not used, %~\myref{sec:class-options}
       this file will not be included by \textit{mycv.cls};
       \end{myindent}
-   \item \ctext{mycv\_dec.def}
+   \item \ctext{mycv\_dec.sty}
       \begin{myindent}
       it contains the decoration commands~\myref{sub:decoration-commands}: if decorations are not
       enabled%
@@ -192,7 +192,8 @@ Options for a sub-component are of different types, as listed below:
    \item \optname{*}varname\optvsep
       filename\optname{@}\optdsep
       \argname{varname} is a macro that expands to the name of a file (with the \CV contents),
-      while \argname{filename} is directly the name itself.
+      while \argname{filename} is directly the name itself (the only \textit{non-alphanumeric}
+      characters allowed are ``\_'' and ``-'').
       Example: \ctext[\tmpcolor]{\texttt{*headerfile}}, where the macro \textit{headerfile}
       is somewhere defined.
 \squishend
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Doc/Chapters/Usage.tex b/Master/texmf-dist/doc/latex/mycv/Doc/Chapters/Usage.tex
index 43cfcbccad6..b79a542827e 100644
--- a/Master/texmf-dist/doc/latex/mycv/Doc/Chapters/Usage.tex
+++ b/Master/texmf-dist/doc/latex/mycv/Doc/Chapters/Usage.tex
@@ -7,21 +7,24 @@
 
 \section{Requirements}
 
-When \textit{decorations} are not enabled and the \textit{default style} is not used, \classname has
-(apart from \ctLaTeXe) the following requirements:\codeskip
-\begin{lstlisting}[firstnumber=1,numbers=none]
+When \textit{decorations} are not enabled and the \textit{default style} is not used, \classname
+has, in addiction to \ctLaTeXe{} obviously, the following requirements:\codeskip
+{\small{\begin{lstlisting}[firstnumber=1,numbers=none]
 \RequirePackage{kvoptions} % for options
 \RequirePackage{etextools} % for lists and other useful tools
 \RequirePackage{ifthen}    % for \ifthenelse command
-\RequirePackage{pifont}    % for ding style (itemize environment)
 \RequirePackage{xstring}   % for string utilities
 \RequirePackage{svn-prov}  % for file info extracted from SVN
-\RequirePackage{xparse}    % for commands with multiple default arguments
-\end{lstlisting}\codeskip
+\RequirePackage{hyperref}  % for hypertext links and other stuff
+\end{lstlisting}}}\codeskip
 
-In addiction, if the default style is used, by means of the class option
-``\textit{style}''~\myref{sec:class-options}, this class requires:\codeskip
+Besides, if the default style is used, by means of the class option
+``\textit{style}''~\myref{sec:class-options}, this class requires (in addiction to
+\textit{hyperref} and \textit{svn-prov}):\codeskip
+{\small{
 \begin{lstlisting}[firstnumber=1,numbers=none]
+\RequirePackage{xparse}    % for commands with multiple default arguments
+\RequirePackage{pifont}    % for ding style (itemize environment)
 \RequirePackage{titlesec}  % for title format and spacing
 \RequirePackage{fancyhdr}  % for custom footer
 \RequirePackage{xcolor}    % for color
@@ -29,13 +32,15 @@ In addiction, if the default style is used, by means of the class option
 \RequirePackage{times}     % times font
 \RequirePackage{marvosym}  % symbols - phone
 \RequirePackage{amssymb}   % symbols - email
-\end{lstlisting}\codeskip
+\end{lstlisting}}}\codeskip
 
-Finally, if decorations are enabled, by using the class option
-``\textit{withDec}``~\myref{sec:class-options}, this class also requires:\codeskip
+Finally, if decorations are enabled, by using the class
+option ``\textit{withDec}``~\myref{sec:class-options}, this class also requires (in addiction
+to \textit{svn-prov} and \textit{xparse}):\codeskip
+{\small{
 \begin{lstlisting}[firstnumber=1,numbers=none]
-RequirePackage{tikz} % for graphics
-\end{lstlisting}\codeskip
+\RequirePackage{tikz}      % for graphics
+\end{lstlisting}}}\codeskip
 
 \section{Class options}
 \label{sec:class-options}
@@ -55,8 +60,8 @@ addiction, it provides the following options:
    \end{myindent}
 \item {\color{red}style=<\argname[\tmpcolor]{filemane}>}
    \begin{myindent}
-   specifies the file name (without the extension ``.tex'' if any) with the style commands.
-   By default, the file \textit{mycv\_style.def}, provided by the class itself, is that used.
+   specifies the file name (with or without the extension ``.sty'') containing the style commands.
+   By default, the file \textit{mycv\_style.sty}, provided by the class itself, is that used.
    It is also possible to not use any file by specifying the value ``none'' as file name;
    \end{myindent}
 \item {\color{red}mdlname=<\argname[\tmpcolor]{name}>}
@@ -67,7 +72,7 @@ addiction, it provides the following options:
    \end{myindent}
 \item {\color{red}withDec}
    \begin{myindent}
-   enables support for decorations (provided by the \textit{TikZ} package);
+   enables support for decorations (provided by the \textit{TikZ} package).
    \end{myindent}
 \squishend
 
@@ -121,6 +126,9 @@ for an optional argument of a command.
    \marg{text}\cmddsep
    adds \argname{text} to the page footer. It may be useful, for example, to show information
    about the last document update.% (\textbackslash{}mycfoot\{Last update \textbackslash{}today\}).
+\item \cmdname{myitemize}
+   \cmddsep
+   a list environment that uses the \textit{ding} style.
 \squishend
 
 \subsection{Decorations}
@@ -213,10 +221,6 @@ functionality), but is enough for this class purposes. The only \textit{TikZ} pa
    temporarily changes the language in use (\textit{babel} package) to \argname{language} for
    \argname{text}.
 
-\item \cmdname{myitemize}
-   \cmddsep
-   a list environment that uses the \textit{ding} style.
-
 \item \cmdname{mychangemargin}
    \marg{left-margin}\arghsep
    \marg{right-margin}\cmddsep
@@ -244,32 +248,62 @@ contents: these files are not listed in the present document, as they do not con
 being mentioned for the purpose of these notes.
 
 First and foremost, to keep the code organized, we need a file containing the layout components
-for the \DPL (\textit{model-dpl.tex}) and another one for the
-\SPL (\textit{model-spl.tex}).
-%For our intents,
+for the \DPL (\textit{model-dpl.tex}) and another one for the \SPL (\textit{model-spl.tex}).
 We opt for having the header and footer components being shared, so we create a third file named
-\textit{model-common.tex} such as this:
-\lstinputlisting[firstnumber=1,caption=model-common.tex,label=lst:model-common]{
-../Examples/Models/model-common.tex}\codeskip
-
-Notice that in listing~\ref{lst:model-common}, for the \DPL, we used some decoration commands.
-Obviously, it is also possible to not use decorations (simply by not using the relative class
-option), but in that case the showed code would yield some compilation errors, since decoration
-commands would be called without being defined.\\
-A possible solution makes the use of the conditional command \textit{\textbackslash{}ifoption}, so
-that the first part of the code would become something like in listing~\ref{lst:model-common-hint}.
-\begin{lstlisting}[firstnumber=1,label=lst:model-common-hint,caption=model-common-hint]
-\ifmodel{verDPL}{%
-   \ifoption{withDec}{%
-      [...]
-   }{\newcommand{\cvdec}{}}
-}{\newcommand{\cvdec}{}}
-\end{lstlisting}\codeskip
+\textit{model-common.tex}, such as in listing~\ref{lst:model-common}:
+\begin{lstlisting}[firstnumber=1,caption=model-common.tex,label=lst:model-common]
+\def\headerlayoutlist{%
+   &MainHeaderPageBegin&:<postcmd:vspace=10pt>,
+      % --------------------------------- left header
+      |SubHeaderPageBegin|:<precmd:hfill>,
+         $header_title@$,    % header file one
+      |SubHeaderPageEnd|:<postcmd:hfill>,
+      % --------------------------------- right header
+      |SubHeaderPageBegin|,
+         $header_contacts@$, % header file two
+      |SubHeaderPageEnd|,
+   &MainHeaderPageEnd&%
+}
+\def\footerlayoutlist{footer_sign@} % footer file
+\end{lstlisting}
+\codeskip
 
-Now we can deal with the layout components specific for the \DPL (\textit{model-dpl.tex})
+Now we can deal with the layout components specific for the \DPL (\textit{model-dpl.tex}),
 as in listing~\ref{lst:dplmodel}.
-\lstinputlisting[firstnumber=1,caption=model-dpl.tex,label=lst:dplmodel]{
-../Examples/Models/model-dpl.tex }
+%\lstinputlisting[firstnumber=1,caption=model-dpl.tex,label=lst:dplmodel]{
+%../Examples/Models/model-dpl.tex}
+\begin{lstlisting}[firstnumber=1,caption=model-dpl.tex,label=lst:dplmodel]
+\input{Models/model-common}
+\def\bodylayoutlist{%
+   % ---------------------------------------------------------
+   % moves the right margin to the left (text and title rules)
+   % ---------------------------------------------------------
+   &MainBodyPageBegin&:<0.96>,
+      % ---------------------------------------------------------
+      % the 2 directives below are just used as a trick to do the
+      % same thing for the left margin (it is moved to the right)
+      % ---------------------------------------------------------
+      |SubBodyPageBegin|,
+      |SubBodyPageEnd|,
+      % -----------------------------------------
+      % left page (0.48 of textwidth)
+      % -----------------------------------------
+      |SubBodyPageBegin|:<0.48>,
+         $contents_partA@$:<precmd:vspace=10pt:sectionnumber=1>,
+         $contents_partB@$:<precmd:vspace=10pt:sectionnumber=2>,
+         $contents_partC@$:<precmd:vspace=10pt:sectionnumber=3>,
+      |SubBodyPageEnd|:<postcmd:hfill>,
+      % -----------------------------------------
+      % right page (0.48 of textwidth)
+      % -----------------------------------------
+      |SubBodyPageBegin|:<0.48>,
+         $contents_partA@$:<precmd:vspace=10pt:sectionnumber=4>,
+         $contents_partB@$:<precmd:vspace=10pt:sectionnumber=5>,
+      |SubBodyPageEnd|,
+      % -----------------------------------------
+   &MainBodyPageEnd&%
+}
+\end{lstlisting}
 \codeskip
 
 %The directive colored in red moves the right margin to the left (text and title rules) while the
@@ -282,23 +316,36 @@ as in listing~\ref{lst:dplmodel}.
 %\end{lstlisting}
 
 As far as the \DPL, we have done; we still have to deal with the layout components specific for
-the \SPL (\textit{model-dpl.tex}). In this case, we do not need to use \verb|*PageBegin| components,
-but it is sufficient to directly include the files with the contents. The resulting code is showed
-in listing~\ref{lst:splmodel}.
-\lstinputlisting[firstnumber=1,caption=model-spl.tex,label=lst:splmodel]{
-../Examples/Models/model-spl.tex }\codeskip
+the \SPL (\textit{model-spl.tex}). In this case, we do not need to use the \verb|*PageBegin|
+components, but it is sufficient to directly include the files with the contents. The resulting code
+is showed in listing~\ref{lst:splmodel}.
+%\lstinputlisting[firstnumber=1,caption=model-spl.tex,label=lst:splmodel]{
+%../Examples/Models/model-spl.tex }\codeskip
+\begin{lstlisting}[firstnumber=1,caption=model-spl.tex,label=lst:splmodel]
+\input{Models/model-common}
+\def\bodylayoutlist{%
+   % ---------------------------------------------------
+   $contents_partA@$:<precmd:vspace=10pt:sectionnumber=1>,
+   $contents_partB@$:<precmd:vspace=10pt:sectionnumber=2>,
+   $contents_partC@$:<precmd:vspace=10pt:sectionnumber=3>,
+   $contents_partA@$:<precmd:vspace=10pt:sectionnumber=4>,
+   $contents_partB@$:<precmd:vspace=10pt:sectionnumber=5>
+   % ---------------------------------------------------
+}
+\end{lstlisting}
+\codeskip
 
 At this point, we both have the components for the double and single page layouts and we can
 proceed writing the main files (\textit{mycv-example-dpl.tex} and \textit{mycv-example-spl.tex})
 that pick and use them.\\
-We start by setting up some options for the \classname class; we have chosen to store the \CV
-contents files in the directory ``Contents'' (that is the default one where the class searches
-for the contents files), so there is not need to specify the directory path with the option
-``\textit{cntdir}''~\myref{sec:class-options}.
+We start by setting up some options for the %\classname
+class; we have chosen to store the \CV contents files in the directory ``Contents'' (that is the
+default one where the class searches for the contents files), so there is not need to specify the
+path with the option ``\textit{cntdir}''~\myref{sec:class-options}.
 \\
-The options we want to pass to the class are those related to the decorations support and language;
+The options we want to pass to the class are those related to the decorations and language support;
 in addiction, we pass the name of the layout (model) we mean to use.
-% (see the listings~~\ref{lst:dplmodel} or ~\ref{lst:splmodel}).
+% (see the listings~~\ref{lst:dplmodel} or~\ref{lst:splmodel}).
 \\
 Here we take the \DPL as an example (listing~\ref{lst:mycv-example-dpl}), but switching to the
 \SPL would just be a matter of changing the ``\textit{mdlname}'' option from \keyword{verDPL} to
@@ -306,22 +353,34 @@ Here we take the \DPL as an example (listing~\ref{lst:mycv-example-dpl}), but sw
 \begin{lstlisting}[firstnumber=1,label=lst:mycv-example-dpl,caption=mycv-example-dpl.tex]
 \documentclass[10pt,mdlname=verDPL,withDec,language=english]{mycv}
 \input{mycv-example-common}
+
+\begin{document}
+\cvdec\myrenderlayout\mycfoot{Last update: \today}
+\end{document}
 \end{lstlisting}\codeskip
 
-What remains to do is just to include the appropriate layout components file (\ref{lst:dplmodel} or
-\ref{lst:splmodel}) and process them with the \textit{\textbackslash{}myrenderlayout} command, as
-showed in listing~\ref{lst:example-common}; since this portion of code is shared between
-\textit{mycv-example-dpl.tex} and \textit{mycv-example-spl.tex}, we need to use
-\textit{\textbackslash{}ifmodel} for selecting the right file to be included.
+The input file \textit{mycv-example-common[.tex]}, showed in listing~\ref{lst:example-common},
+selects the appropriate layout components (\ref{lst:dplmodel} or \ref{lst:splmodel}) to be included
+(\textit{\textbackslash{}ifmodel} conditional command), which will be subsequently processed by
+the command \textit{\textbackslash{}myrenderlayout}.\\
+%showed in listing~\ref{lst:example-common}. Since this portion of code is shared between
+%\textit{mycv-example-dpl.tex} and \textit{mycv-example-spl.tex}, we need to use
+%\textit{\textbackslash{}ifmodel} for selecting the right file to be included.
+In addiction, that file contains some decoration commands, which need to be picked up only when the
+class option ``\textit{withDec}' is being used; this is the reason why the conditional command
+\textit{\textbackslash{}ifoption} is also used.
 \begin{lstlisting}[firstnumber=1,caption=mcv-example-common.tex,label=lst:example-common]
 [...]
-\ifmodel{verSPL}{\input{Models/model-spl}}{\relax}
-\ifmodel{verDPL}{\input{Models/model-dpl}}{\relax}
+\ifoption{withDec}{%
+   \newcommand{\cvdec}{
+      \mydecorationsSetLineWidth[0.3mm]%
+      \mydecorationsPathmorphing*{coil}<radial><lightgray>
+   }%
+}{\newcommand{\cvdec}{}}
 
-\begin{document}
-\myrenderlayout % all components
+\ifmodel{verSPL}{\input{Models/model-spl}[...]}{\relax}
+\ifmodel{verDPL}{\input{Models/model-dpl}[...]}{\relax}
 [...]
-\end{document}
 \end{lstlisting}
 %\lstinputlisting[firstnumber=1,caption=mcv-example-common.tex,label=lst:example]{
 %../Examples/mycv-example-common.tex}
@@ -340,38 +399,74 @@ This can be done by using a counter that keeps track of the number of times a sa
 when the counter is equal $1$, a part of the section contents is included in the left page,
 otherwise is the remaining one to be included in the right page.
 Listing~\ref{lst:split-contents-example} shows a practical example of what just discussed.
-
 \begin{lstlisting}[firstnumber=1,label=lst:split-contents-example,caption=split-contents-example]
 % ---------------------------------------------------------
 % file with the section contents: i.e. <section_skills.tex>
 % ---------------------------------------------------------
-% increase the counter 'acounter', that is defined outside this file
+
+% increases the counter 'acounter'
+% (it's defined outside this file)
 \stepcounter{acounter}
-\newcommand{\conditionalblock}[2]{\ifthenelse{\value{acounter}<2}{#1}{#2}}
-\textconditionalblock%
+
+\newcommand{\conditionalblock}[2]{%
+   \ifthenelse{\value{acounter}<2}{#1}{#2}%
+}
+
+% selects the appropriate part of the file contents
+\conditionalblock%
    {skills section contents part A}%
    {skills section contents part B (the remaining part)}
+
 % --------------------------------------------------
 % file with the DPL components: i.e. <model-dpl.tex>
 % --------------------------------------------------
+
 \def\bodylayoutlist{%
    |SubBodyPageBegin|:<0.48>, % left page
       % include part A in the left page
-      section_skills@,
+      $section_skills@$,
       [...]
    |SubBodyPageEnd|,
    |SubBodyPageBegin|:<0.48>, % right page
       % include part B in the right page
-      section_skills@,
+      $section_skills@$,
       [...]
    |SubBodyPageEnd|
 }
 \end{lstlisting}\codeskip
 
 Of course the proposed workaround is not the best we could wish for, since it requires manual
-operations. Unfortunately, at the moment, I would not know how to solve the problem with a brighter
-idea. Any advice or comment is greatly appreciated, either for the specific problem or for this
-work in general.
+operations.\\% (any advice about that is greatly appreciated).\\
+As an alternative, it is possible to not use the \verb|*PageBegin| and \verb|*PageEnd| mechanism,
+delegating the double page layout to an external package (i.e. \textit{multicols}).
+This kind of approach is showed in listings~\ref{lst:model-dpl2} and~\ref{lst:mycv-example-dpl2}.
+%(respectively files \textit{model-dpl2.tex} and \textit{mycv-example-dpl2.tex}).
+\bigskip
+%\lstinputlisting[firstnumber=1,caption=model-dpl2.tex,label=lst:model-dpl2]{
+%../Examples/Models/model-dpl2.tex }
+\begin{lstlisting}[firstnumber=1,caption=model-dpl2.tex,label=lst:model-dpl2]
+\input{Models/model-common}
+
+\newcommand{\mcbegin}{\begin{multicols}{2}}
+\newcommand{\mcend}{\end{multicols}}
+
+\def\bodylayoutlist{%
+    $contents_partA@$:<precmd:vspace=10pt:mcbegin:sectionnumber=1>,%
+    $contents_partB@$:<precmd:vspace=10pt:sectionnumber=2>,%
+    $contents_partA@$:<precmd:vspace=10pt:sectionnumber=3>,%
+    $contents_partC@$:<precmd:vspace=10pt:sectionnumber=4>,%
+    $contents_partA@$:<precmd:vspace=10pt:sectionnumber=5>,%
+    $contents_partB@$:<precmd:vspace=10pt:sectionnumber=6>:%
+      <postcmd:mcend>,%
+}
+\end{lstlisting}\codeskip
+
+Notice the usage of the commands \textit{\textbackslash{mcbegin}} and
+\textit{\textbackslash{mcend}}, which act as a wrapper for the \textit{multicols} environment.
+
+\lstinputlisting[firstnumber=1,label=lst:mycv-example-dpl2,caption=mycv-example-dpl2.tex]{
+../Examples/mycv-example-dpl2.tex}
+\codeskip
 
 \bigskip\bigskip
 That's all, {\color{brown}happy \LaTeX{}ing!}\\[5pt]
diff --git a/Master/texmf-dist/doc/latex/mycv/Doc/mycv-macros.sty b/Master/texmf-dist/doc/latex/mycv/Doc/mycv-macros.sty
index 118cb560e65..ad9c624aab5 100644
--- a/Master/texmf-dist/doc/latex/mycv/Doc/mycv-macros.sty
+++ b/Master/texmf-dist/doc/latex/mycv/Doc/mycv-macros.sty
@@ -8,7 +8,7 @@
 
 \RequirePackage{svn-prov}
 \ProvidesPackageSVN
-   {$Id: mycv-macros.sty 60 2012-04-14 23:33:21Z ghangenit $}
+   {$Id: mycv-macros.sty 66 2012-04-28 14:38:41Z ghangenit $}
    [\version][A package providing some useful commands]
 
 \ifdraft
@@ -270,6 +270,7 @@
    frameround=ftff,
    frame=lines,
    moredelim=[is][\color{orange}]{|}{|},
+   moredelim=[is][\color{brown}]{$}{$},
    moredelim=[is][\color{red}]{&}{&},
    backgroundcolor=\color{lightergray}
 }
@@ -280,10 +281,11 @@
       RequirePackage,newboolean,DeclareOption,setboolean,%
       ProcessOptions,PackageError,ifthenelse,boolean,%
       MakeTextLowercase,@ifpackageloaded,undefined,%
-      DeclareRobustCommand,MakeTextUppercase,%
-      color,titlerule,titlespacing,%
-      labelitemi,hypersetup,setlength,%
-      definecolor,includegraphics,ifdefined,%
+      DeclareRobustCommand,MakeTextUppercase,conditionalblock,%
+      color,titlerule,titlespacing,ifmodel,ifoption,%
+      labelitemi,hypersetup,setlength,mydecorationsSetLineWidth,
+      mydecorationsPathmorphing,mycfoot,myrenderlayout,cvdec,%
+      definecolor,includegraphics,ifdefined,mcbegin,mcend,%
       ProvidesPackage,PackageInfo,PackageWarningNoLine,%
       @ifclassloaded,ExecuteOptions,PackageWarning,textcolor%
    },%
diff --git a/Master/texmf-dist/doc/latex/mycv/Doc/mycv.tex b/Master/texmf-dist/doc/latex/mycv/Doc/mycv.tex
index 7efdc8fe34c..3cd4bce9786 100644
--- a/Master/texmf-dist/doc/latex/mycv/Doc/mycv.tex
+++ b/Master/texmf-dist/doc/latex/mycv/Doc/mycv.tex
@@ -1,4 +1,4 @@
-\def\version{1.5.3}
+\def\version{1.5.4}
 \newif\ifdraft
 %\drafttrue % se decommentato utilizza formato bozza
 
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/Models/NOTES b/Master/texmf-dist/doc/latex/mycv/Examples/Models/NOTES
deleted file mode 100644
index d0d57c8ae85..00000000000
--- a/Master/texmf-dist/doc/latex/mycv/Examples/Models/NOTES
+++ /dev/null
@@ -1,11 +0,0 @@
-
-================================================
----------------
-IMPORTANT NOTES
----------------
-
-  In files 'model-dpl.tex' & 'model-spl.tex' the
-  '|' and '&' symbols are used as delimiters for
-  the listings package. They are not part of the
-  syntax (however, they do not create problems).
-================================================
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-common.tex b/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-common.tex
index 46b130cc2ae..ef32a3098a0 100644
--- a/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-common.tex
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-common.tex
@@ -1,24 +1,15 @@
-% file with the common layout components: header and footer
-\ifmodel{verDPL}{%
-   \newcommand{\cvdec}{%
-      mydecorationsSetLineWidth=@0.3mm:%
-      mydecorationsPathmorphing=*=coil=!radial=!lightgray%
-   }
-}{\newcommand{\cvdec}{}}
-\newcommand{\sectionnumber}[1]{\section{Section #1}}
-
 \def\headerlayoutlist{%
-   &MainHeaderPageBegin&:<postcmd:vspace=10pt>,
+   MainHeaderPageBegin:<postcmd:vspace=10pt>,
       % ---------------------------------------- left header
-      |SubHeaderPageBegin|:<precmd:\cvdec:hfill>,
+      SubHeaderPageBegin:<precmd:hfill>,
          header_title@,    % header file one
-      |SubHeaderPageEnd|:<postcmd:hfill>,
+      SubHeaderPageEnd:<postcmd:hfill>,
       % ---------------------------------------- right header
-      |SubHeaderPageBegin|,
+      SubHeaderPageBegin,
          header_contacts@, % header file two
-      |SubHeaderPageEnd|,
+      SubHeaderPageEnd,
    % -------------------------------------------
-  &MainHeaderPageEnd&
+   MainHeaderPageEnd%
 }
 
 \def\footerlayoutlist{footer_sign@} % footer file
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-dpl.tex b/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-dpl.tex
index 7a9fa039d8e..20f88f11e5a 100644
--- a/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-dpl.tex
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-dpl.tex
@@ -3,28 +3,28 @@
    % ---------------------------------------------------------
    % moves the right margin to the left (text and title rules)
    % ---------------------------------------------------------
-   &MainBodyPageBegin&:<0.96>,
+   MainBodyPageBegin:<0.96>,
       % ---------------------------------------------------------
       % the 2 directives below are just used as a trick to do the
       % same thing for the left margin (it is moved to the right)
       % ---------------------------------------------------------
-      |SubBodyPageBegin|,
-      |SubBodyPageEnd|,
+      SubBodyPageBegin,
+      SubBodyPageEnd,
       % -----------------------------------------
       % left page (0.48 of textwidth)
       % -----------------------------------------
-      |SubBodyPageBegin|:<0.48>,
+      SubBodyPageBegin:<0.48>,
          contents_partA@:<precmd:vspace=10pt:sectionnumber=1>,
          contents_partB@:<precmd:vspace=10pt:sectionnumber=2>,
          contents_partC@:<precmd:vspace=10pt:sectionnumber=3>,
-      |SubBodyPageEnd|:<postcmd:hfill>,
+      SubBodyPageEnd:<postcmd:hfill>,
       % -----------------------------------------
       % right page (0.48 of textwidth)
       % -----------------------------------------
-      |SubBodyPageBegin|:<0.48>,
+      SubBodyPageBegin:<0.48>,
          contents_partA@:<precmd:vspace=10pt:sectionnumber=4>,
          contents_partB@:<precmd:vspace=10pt:sectionnumber=5>,
-      |SubBodyPageEnd|,
+      SubBodyPageEnd,
       % -----------------------------------------
-   &MainBodyPageEnd&%
+   MainBodyPageEnd%
 }
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-dpl2.tex b/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-dpl2.tex
new file mode 100644
index 00000000000..7826702826d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/Models/model-dpl2.tex
@@ -0,0 +1,14 @@
+\input{Models/model-common}
+
+\newcommand{\mcbegin}{\begin{multicols}{2}}
+\newcommand{\mcend}{\end{multicols}}
+
+\def\bodylayoutlist{%
+    contents_partA@:<precmd:vspace=10pt:mcbegin:sectionnumber=1>,%
+    contents_partB@:<precmd:vspace=10pt:sectionnumber=2>,%
+    contents_partA@:<precmd:vspace=10pt:sectionnumber=3>,%
+    contents_partC@:<precmd:vspace=10pt:sectionnumber=4>,%
+    contents_partA@:<precmd:vspace=10pt:sectionnumber=5>,%
+    contents_partB@:<precmd:vspace=10pt:sectionnumber=6>:%
+      <postcmd:mcend>,%
+}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-common.tex b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-common.tex
index e31e45838b6..3cfb9f7a721 100644
--- a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-common.tex
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-common.tex
@@ -1,15 +1,29 @@
-\mypdfauthor{Andrea}
-\mypdftitle{Just a CV example}
-
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage{lipsum}
 \usepackage{tikz}
 
-\ifmodel{verSPL}{\input{Models/model-spl}}{\relax}
-\ifmodel{verDPL}{\input{Models/model-dpl}}{\relax}
+\ifoption{withDec}{%
+   \newcommand{\cvdec}{
+      \mydecorationsSetLineWidth[0.3mm]%
+      \mydecorationsPathmorphing*{coil}<radial><lightgray>
+   }%
+}{\newcommand{\cvdec}{}}
+
+\ifmodel{verSPL}{
+   \input{Models/model-spl}
+   \mypdftitle{Simple CV example: SPL}
+}{\relax}
+
+\ifmodel{verDPL}{
+   \input{Models/model-dpl}
+   \mypdftitle{Simple CV example: DPL}
+}{\relax}
+
+\ifmodel{verDPL2}{
+   \input{Models/model-dpl2}
+   \mypdftitle{Simple CV example: DPL2}
+}{\relax}
 
-\begin{document}
-\myrenderlayout % all components
-\mycfoot{Last update: \today}
-\end{document}
\ No newline at end of file
+\newcommand{\sectionnumber}[1]{\section{Section #1}}
+\mypdfauthor{Andrea}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl.pdf b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl.pdf
index ebe8f5e63ad..20c2c9267e2 100644
--- a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl.pdf
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl.pdf
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl.tex b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl.tex
index b8b35ecca89..8e97e087af6 100644
--- a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl.tex
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl.tex
@@ -1,2 +1,9 @@
 \documentclass[10pt,mdlname=verDPL,withDec,language=english]{mycv}
+
+\usepackage{mycv_style}
+\usepackage{mycv_dec}
 \input{mycv-example-common}
+
+\begin{document}
+\cvdec\myrenderlayout\mycfoot{Last update: \today}
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl2.pdf b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl2.pdf
new file mode 100644
index 00000000000..80ce1baacba
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl2.pdf
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl2.tex b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl2.tex
new file mode 100644
index 00000000000..30a452e83a5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-dpl2.tex
@@ -0,0 +1,10 @@
+\documentclass[10pt,mdlname=verDPL2,language=english]{mycv}
+\input{mycv-example-common}
+
+\usepackage{multicol}
+\setlength{\columnsep}{2.0pc}
+\setlength\columnseprule{.4pt}
+
+\begin{document}
+\myrenderlayout\mycfoot{Last update: \today}
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-spl.pdf b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-spl.pdf
index 45658136c45..d17cad83403 100644
--- a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-spl.pdf
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-spl.pdf
diff --git a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-spl.tex b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-spl.tex
index bb404b8af0d..5bdb8dcde23 100644
--- a/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-spl.tex
+++ b/Master/texmf-dist/doc/latex/mycv/Examples/mycv-example-spl.tex
@@ -1,2 +1,6 @@
-\documentclass[10pt,mdlname=verSPL,language=english]{mycv}
+\documentclass[10pt,mdlname=verSPL,withDec,language=english]{mycv}
 \input{mycv-example-common}
+
+\begin{document}
+\cvdec\myrenderlayout\mycfoot{Last update: \today}
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/README b/Master/texmf-dist/doc/latex/mycv/README
index 9b105f2306e..91a5fb6b656 100644
--- a/Master/texmf-dist/doc/latex/mycv/README
+++ b/Master/texmf-dist/doc/latex/mycv/README
@@ -1,6 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                           %
-%                    MyCV class (v1.5.3)                    %
+%                    MyCV class (v1.5.4)                    %
+%                        2012-04-28                         %
 %                                                           %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -49,6 +50,7 @@ and sub-directories:
 'mycv.cls'     -- the main class file (**)
 'mycv_*.def'   -- files to support the main
                   class implementation (**)
+'mycv_*.sty'   -- class extensions (**)
 'mycv.pdf'     -- the documentation file
 <Examples>     -- directory with some examples
 <Doc>          -- contains the documentation sources
@@ -57,15 +59,15 @@ and sub-directories:
 Installation
 ------------
 
-In order to install the MyCV class, move all 'mycv_*.def'
-and 'mycv.cls' files, marked with '**' in the list above,
-into a folder searched by LaTeX; the refresh of the LaTeX
-database might be necessary to complete the installation.
+In order to install the MyCV class, move all 'mycv_*.def',
+'mycv_*.sty' and 'mycv.cls' files, marked with '**' in the
+list above, into a folder searched by LaTeX; the update of
+the LaTeX db might be necessary to finish the installation.
 
 To produce the files with examples, move to the directory
-<Examples> and run 'mycv-example-[dpl or spl].tex through
-pdfLaTeX. For 'mycv-example-dpl.tex' might be required to
-repeat the operation twice.
+<Examples> and run 'mycv-example-[dpl*|spl].tex' through
+pdfLaTeX. Except for the file 'mycv-example-dpl2.tex', it
+might be necessary to repeat the operation twice.
 
 To create the documentation, move to the <Doc> directory
-and run 'mycv.tex' twice through pdfLaTeX.
+and run 'mycv.tex' twice through pdfLaTeX.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mycv/mycv.pdf b/Master/texmf-dist/doc/latex/mycv/mycv.pdf
index 927eeba7032..a1e2318aca7 100644
--- a/Master/texmf-dist/doc/latex/mycv/mycv.pdf
+++ b/Master/texmf-dist/doc/latex/mycv/mycv.pdf
diff --git a/Master/texmf-dist/tex/latex/mycv/mycv.cls b/Master/texmf-dist/tex/latex/mycv/mycv.cls
index adee0b52d61..32136a21e68 100644
--- a/Master/texmf-dist/tex/latex/mycv/mycv.cls
+++ b/Master/texmf-dist/tex/latex/mycv/mycv.cls
@@ -21,11 +21,11 @@
 \NeedsTeXFormat{LaTeX2e}
 
 \RequirePackage{svn-prov}
-\def\@versionstr{1.5.3}
+\def\@versionstr{1.5.4}
 
 \ProvidesClassSVN
-   {$Id: mycv.cls 60 2012-04-14 23:33:21Z ghangenit $}
-   [\@versionstr][My Curriculum Vitae class]
+   {$Id: mycv.cls 66 2012-04-28 14:38:41Z ghangenit $}
+   [v\@versionstr][My Curriculum Vitae class]
 
 % ========
 % Packages
@@ -34,7 +34,6 @@
 \RequirePackage{kvoptions} % see the comment above
 \RequirePackage{etextools} % for lists and other useful tools
 \RequirePackage{ifthen}    % for <\ifthenelse> command
-\RequirePackage{pifont}    % 'ding' style for item of itemize env
 \RequirePackage{xstring}   % string utilities
 
 % =============
@@ -48,7 +47,7 @@
 
 \DeclareStringOption[english]{language}
 \DeclareStringOption[Contents]{cntdir}
-\DeclareStringOption[mycv_style.def]{style}
+\DeclareStringOption[mycv_style]{style}
 \DeclareStringOption[]{mdlname}
 \ProcessKeyvalOptions*
 
@@ -76,13 +75,13 @@
 % -------------------------------------
 \ifthenelse{\equal{\mycv@style}{none}}%
    {\relax}% file style is not wanted
-   {\input{\mycv@style}}
+   {\RequirePackage{\mycv@style}}
 
 % ----------------------
 % use decorations or not
 % ----------------------
 \ifthenelse{\boolean{mycv@withDec}}%
-   {\input{mycv_dec.def}}%
+   {\RequirePackage{mycv_dec}}%
    {\relax}
 
 \DeclareRobustCommand{\ifmodel}[1]{%
diff --git a/Master/texmf-dist/tex/latex/mycv/mycv_base.def b/Master/texmf-dist/tex/latex/mycv/mycv_base.def
index 4e72424b43b..b3e976e6139 100644
--- a/Master/texmf-dist/tex/latex/mycv/mycv_base.def
+++ b/Master/texmf-dist/tex/latex/mycv/mycv_base.def
@@ -6,8 +6,8 @@
 % -------------------------------------------------------
 
 \ProvidesFileSVN
-   {$Id: mycv_base.def 60 2012-04-14 23:33:21Z ghangenit $}
-   [\@versionstr][Base system core]
+   {$Id: mycv_base.def 66 2012-04-28 14:38:41Z ghangenit $}
+   [v\@versionstr][Base system core]
 
 %%%%%%%%%%%%%%%%%%
 %                %
@@ -74,7 +74,7 @@
 \def\@regexPageSize{<([0-9.]+)>}
 \def\@regexMarginLE{/endml/}
 \def\@regexMarginRE{/endmr/}
-\def\@regexFileName{^(.+)@}
+\def\@regexFileName{^([_\-a-zA-Z0-9]+)@}
 \def\@regexCmdName{([a-zA-Z]+)}
 \def\@regexFileVar{^.{1}([A-Za-z]+)}
 \def\@regexParamTypeA{^[@]}
diff --git a/Master/texmf-dist/tex/latex/mycv/mycv_dec.def b/Master/texmf-dist/tex/latex/mycv/mycv_dec.sty
index ab44b606e80..d7d563f910e 100644
--- a/Master/texmf-dist/tex/latex/mycv/mycv_dec.def
+++ b/Master/texmf-dist/tex/latex/mycv/mycv_dec.sty
@@ -5,9 +5,12 @@
 % 1.3c, available at 'http://www.latex-project.org/lppl'.
 % -------------------------------------------------------
 
-\ProvidesFileSVN
-   {$Id: mycv_dec.def 60 2012-04-14 23:33:21Z ghangenit $}
-   [\@versionstr][Decorations commands]
+\RequirePackage{svn-prov}
+\def\versionstr{1.5.4}
+
+\ProvidesPackageSVN
+   {$Id: mycv_dec.sty 66 2012-04-28 14:38:41Z ghangenit $}
+   [v\@versionstr][Decorations commands]
 
 \RequirePackage{tikz} % for graphics
 \usetikzlibrary{shapes,decorations,shadows,fadings}
diff --git a/Master/texmf-dist/tex/latex/mycv/mycv_misc.def b/Master/texmf-dist/tex/latex/mycv/mycv_misc.def
index deac4e5ca5a..f1d69bb39ad 100644
--- a/Master/texmf-dist/tex/latex/mycv/mycv_misc.def
+++ b/Master/texmf-dist/tex/latex/mycv/mycv_misc.def
@@ -6,8 +6,8 @@
 % -------------------------------------------------------
 
 \ProvidesFileSVN
-   {$Id: mycv_misc.def 60 2012-04-14 23:33:21Z ghangenit $}
-   [\@versionstr][Miscellaneous commands]
+   {$Id: mycv_misc.def 66 2012-04-28 14:38:41Z ghangenit $}
+   [v\@versionstr][Miscellaneous commands]
 
 \RequirePackage{hyperref}
 
@@ -59,16 +59,6 @@
    }%
    {\end{list}}
 
-%%%%%%%%%%%%%%%%%%%
-%                 %
-% Customized list %
-%                 %
-%%%%%%%%%%%%%%%%%%%
-
-\newenvironment{myitemize}%
-   {\renewcommand{\labelitemi}{\ding{43}}\begin{itemize}}%
-   {\end{itemize}}
-
 %%%%%%%%%%%%%%%
 %             %
 % Other stuff %
diff --git a/Master/texmf-dist/tex/latex/mycv/mycv_style.def b/Master/texmf-dist/tex/latex/mycv/mycv_style.sty
index 55b7ec1daf7..c1a09c981c7 100644
--- a/Master/texmf-dist/tex/latex/mycv/mycv_style.def
+++ b/Master/texmf-dist/tex/latex/mycv/mycv_style.sty
@@ -5,17 +5,22 @@
 % 1.3c, available at 'http://www.latex-project.org/lppl'.
 % -------------------------------------------------------
 
-\ProvidesFileSVN
-   {$Id: mycv_style.def 60 2012-04-14 23:33:21Z ghangenit $}
-   [\@versionstr][Default style file]
+\RequirePackage{svn-prov}
+\def\versionstr{1.5.4}
+
+\ProvidesPackageSVN
+   {$Id: mycv_style.sty 66 2012-04-28 14:38:41Z ghangenit $}
+   [v\@versionstr][Default style file]
 
 \RequirePackage{titlesec}  % for title format and spacing
 \RequirePackage{fancyhdr}  % custom footer
 \RequirePackage{xcolor}    % for color
 \RequirePackage{calligra}  % for calligra font 
 \RequirePackage{times}     % times font
+\RequirePackage{pifont}    % 'ding' style for itemize env.
 \RequirePackage{marvosym}  % symbols - phone
 \RequirePackage{amssymb}   % symbols - email
+\RequirePackage{hyperref}  % for hypertext links and other stuff
 \RequirePackage{xparse}
 
 %%%%%%%%%%%
@@ -28,7 +33,13 @@
 % passing the option 'showframe' to the package permits
 % to see the page margins: that may be useful for debug
 % -----------------------------------------------------
-\RequirePackage[hmargin=1.25cm,vmargin=1.5cm]{geometry}
+\RequirePackage[
+   paperwidth=210mm,
+   paperheight=297mm,
+   textwidth=495pt,
+   vmargin=1.5cm,
+   columnsep=18pt
+]{geometry}
 
 %%%%%%%%%%%%%%%%%%%%%
 %                   %
@@ -92,6 +103,16 @@
 \mysectionTitleFormat
 \mysectionTitleSpacing
 
+%%%%%%%%%%%%%%%%%%%
+%                 %
+% Customized list %
+%                 %
+%%%%%%%%%%%%%%%%%%%
+
+\newenvironment{myitemize}%
+   {\renewcommand{\labelitemi}{\ding{43}}\begin{itemize}}%
+   {\end{itemize}}
+
 %%%%%%%%%%%%%%%
 %             %
 % Other stuff %