summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-05 00:45:07 +0000
committerKarl Berry <karl@freefriends.org>2012-05-05 00:45:07 +0000
commita455f43001821386f0613ac75a8a844f43fbf236 (patch)
tree0c421ada0a42fb557d972f261c3920652a6a58fc /Master/texmf-dist/tex/latex
parentdc0cf2e0c1315a1e8130c74d70a08ebd7b4bde2c (diff)
mycv (30apr12)
git-svn-id: svn://tug.org/texlive/trunk@26208 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/mycv/mycv.cls13
-rw-r--r--Master/texmf-dist/tex/latex/mycv/mycv_base.def6
-rw-r--r--Master/texmf-dist/tex/latex/mycv/mycv_dec.sty (renamed from Master/texmf-dist/tex/latex/mycv/mycv_dec.def)9
-rw-r--r--Master/texmf-dist/tex/latex/mycv/mycv_misc.def14
-rw-r--r--Master/texmf-dist/tex/latex/mycv/mycv_style.sty (renamed from Master/texmf-dist/tex/latex/mycv/mycv_style.def)29
5 files changed, 42 insertions, 29 deletions
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 %