summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/curve
diff options
context:
space:
mode:
authorReinhard Kotucha <reinhard.kotucha@web.de>2007-04-08 17:38:50 +0000
committerReinhard Kotucha <reinhard.kotucha@web.de>2007-04-08 17:38:50 +0000
commitfef1c7cc8da3bb031c00eebb78b8e40629c27c03 (patch)
treee37358b71deb52799308443a5a573ac05530b297 /Master/texmf-dist/tex/latex/curve
parenta5394579068e25b9dfb1aa269288fe8af8fdf9db (diff)
curve update to v1.12
git-svn-id: svn://tug.org/texlive/trunk@4128 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/curve')
-rw-r--r--Master/texmf-dist/tex/latex/curve/curve.cls140
1 files changed, 87 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/latex/curve/curve.cls b/Master/texmf-dist/tex/latex/curve/curve.cls
index 725bfbb1906..74aaa219716 100644
--- a/Master/texmf-dist/tex/latex/curve/curve.cls
+++ b/Master/texmf-dist/tex/latex/curve/curve.cls
@@ -8,7 +8,7 @@
%%
-%% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Didier Verna
%% This file is part of CurVe.
@@ -39,8 +39,8 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{curve}[2006/06/07 v1.11
- Curriculum Vitae class for LaTeX2e]
+\ProvidesClass{curve}[2007/01/29 v1.12
+ Curriculum Vitae class for LaTeX2e]
\RequirePackage{ltxtable}
\RequirePackage{calc}
@@ -73,20 +73,25 @@
\def\@maybekey#1{%
\def\@newkey{#1}%
- \ifx\@previouskey\@newkey\else%
- #1\gdef\@previouskey{#1}%
+ \ifx\@previouskey\@newkey\gdef\@@key{}\else%
+ \gdef\@@key{#1}\gdef\@previouskey{#1}%
\fi}
-\def\@key#1{#1}
+\def\@alwayskey#1{%
+ \gdef\@@key{#1}}
+
+\let\@key\@alwayskey
\DeclareOption{skipsamekey}{\let\@key\@maybekey}
\newcommand\@entry[2][]{%
- \gdef\@nextentry{}\egroup% end of \noalign opened in \entry.
- \@key{#1}&\@prefix&#2\\}
+ \gdef\@nextentry{}\@key{#1}%
+ \egroup% end of \noalign opened in \entry.
+ \@@key&\@prefix&#2\\}
\newcommand\@sentry[1][]{%
- \gdef\@nextentry{\\}\egroup% end of \noalign opened in \entry.
- \@key{#1}&\@prefix&}
+ \gdef\@nextentry{\\}\@key{#1}%
+ \egroup% end of \noalign opened in \entry.
+ \@@key&\@prefix&}
\newcommand\entry{%
\@nextentry
@@ -95,6 +100,7 @@
\newcommand\noentry[1]{\@nextentry
\noalign{\gdef\@nextentry{}}#1&&\kill}
+
\def\@subrubricfont{\Large\itshape}
\newcommand\subrubricfont[1]{\gdef\@subrubricfont{#1}}
@@ -148,8 +154,6 @@
\newlength\rubricspace
\setlength\rubricspace{10pt}
-\let\@rubricmark\@gobble
-
\def\@@rubrichead#1{\@rubricfont#1\par\vspace\rubricspace}
\def\@rubrichead@l#1{\multicolumn{3}{@{}l@{}}{\@@rubrichead{#1}}\\}
@@ -173,6 +177,11 @@
Type X <return> to quit, fix the typo, and rerun LaTeX.}}
}
+\newlength\rubricafterspace
+\setlength\rubricafterspace{0pt}
+
+\let\@rubricmark\@gobble
+
\newenvironment{rubric}[1]{%
%% \begin{rubric}
\def\raggedright{%
@@ -199,13 +208,18 @@
\gdef\nopagebreak{\@nextentry\noalign{\gdef\@nextentry{}}\in@nopagebreak}}}{%
%% \end{rubric}
\@nextentry
- \end{longtable}
+ \end{longtable}\par\vspace\rubricafterspace
\global\let\newpage\old@newpage%
\global\let\pagebreak\old@pagebreak%
\global\let\nopagebreak\old@nopagebreak}
\newcommand\continuedname[1]{\gdef\@continuedname{#1}}
+\def\today{\ifcase\month\or
+ January\or February\or March\or April\or May\or June\or
+ July\or August\or September\or October\or November\or December\fi
+ \space\number\day, \number\year}
+
\def\header@scale{.5}
\newcommand\headerscale[1]{\gdef\header@scale{#1}}
\@onlypreamble\headerscale
@@ -344,8 +358,8 @@
\IfFileExists{#1\@flavor.ltx}{\@iinput{#1\@flavor.ltx}}{%
\IfFileExists{#1\@flavor.tex}{\@iinput{#1\@flavor.tex}}{%
\IfFileExists{#1.ltx}{\@iinput{#1.ltx}}{%
- \IfFileExists{#1.tex}{\@iinput{#1.tex}}{%
- \@iinput{#1}}}}}}
+\IfFileExists{#1.tex}{\@iinput{#1.tex}}{%
+ \@iinput{#1}}}}}}
\renewcommand\input{\@ifnextchar\bgroup\@curveinput\@@input}
@@ -354,38 +368,55 @@
\let\newblock\par
\newcounter{bibcount}
-\newif\if@bibentry
-\AtBeginDocument{\@ifpackageloaded{bibentry}{\@bibentrytrue}{}}
+\AtBeginDocument{
+ \@ifpackageloaded{multibbl}{
+ %% multibbl version
+ \def\bibliography#1#2#3{%
+ \@ifundefined{#1@auxfile}{}{\expandafter\immediate%
+\write\csname #1@auxfile\endcsname{\string\bibdata{#2}}}%
+ \def\bibname{#3}%
+ \def\refname{#3}%
+ \IfFileExists{#1.bbl}{\makerubric{#1.bbl}}{%
+\typeout{No file #1.bbl.}}}
+ }{ %% standard version
+ \def\bibliography#1{%
+ \if@filesw
+\immediate\write\@auxout{\string\bibdata{#1}}%
+ \fi
+ \IfFileExists{\jobname.bbl}{\makerubric{\jobname.bbl}}{%
+\typeout{No file \jobname.bbl.}}}
+ }
+}
-\def\bibliography#1{%
- \if@filesw
- \if@bibentry\global\BR@starfalse\fi
- \immediate\write\@auxout{\string\bibdata{#1}}%
- \fi
- \IfFileExists{\jobname.bbl}{\makerubric{\jobname.bbl}}{%
- \typeout{No file \jobname.bbl.}}}
+\AtBeginDocument{
+ \@ifpackageloaded{bibentry}{}{
+ \def\@lbibitem[#1]#2{\@sentry[\@biblabel{#1}]%
+ \if@filesw{%
+\let\protect\noexpand%
+\immediate\write\@auxout{\string\bibcite{#2}{#1}}}
+ \fi%
+ \ignorespaces}
+ \def\@bibitem#1{\stepcounter{bibcount}\@sentry[\@biblabel{\thebibcount}]%
+ \if@filesw%
+\immediate\write\@auxout{\string\bibcite{#1}{\thebibcount}}%
+ \fi%
+ \ignorespaces}
+ \renewcommand\bibitem{%
+ %% #### FIXME: Dirty code duplication from \entry
+ \@nextentry
+ \noalign\bgroup\gdef\@beforespace{-\subrubricbeforespace}%
+ \@ifnextchar[\@lbibitem\@bibitem}
+ }
+}
\newcommand\listpubname[1]{\gdef\@listpubname{#1}}
\newenvironment{thebibliography}[1]{%
- \def\@lbibitem[##1]##2{\@sentry[\@biblabel{##1}]%
- \if@filesw{%
- \let\protect\noexpand%
- \immediate\write\@auxout{\string\bibcite{##2}{##1}}}
- \fi%
- \ignorespaces}
- \def\@bibitem##1{\stepcounter{bibcount}\@sentry[\@biblabel{\thebibcount}]%
- \if@filesw%
- \immediate\write\@auxout{\string\bibcite{##1}{\thebibcount}}%
- \fi%
- \ignorespaces}
- \renewcommand\bibitem{%
- \@nextentry
- \noalign\bgroup\gdef\@beforespace{-\subrubricbeforespace}%
- \@ifnextchar[\@lbibitem\@bibitem}
- \def\@key##1{##1}
+ \let\@key\@alwayskey
\def\@prefix{}
- \begin{rubric}{\@listpubname}
+ \begin{rubric}{\@ifundefined{bibname}{%
+\@ifundefined{refname}{\@listpubname}{\refname}}{%
+\bibname}}
}{%
\end{rubric}
}
@@ -401,6 +432,15 @@
\DeclareOption{spanish}{%
\continuedname{~(contin\'ua)}
\listpubname{Lista de Publicaciones}}
+\DeclareOption{portuges}{%
+ \continuedname{~(continua\c c\~ao)}
+ \listpubname{Publica\c c\~oes}}
+\DeclareOption{portuguese}{%
+ \ExecuteOptions{portuges}}
+\DeclareOption{brazil}{%
+ \ExecuteOptions{portuges}}
+\DeclareOption{brazilian}{%
+ \ExecuteOptions{portuges}}
\DeclareOption{italian}{%
\continuedname{~(continua)}
\listpubname{Pubblicazioni}}
@@ -409,21 +449,15 @@
\listpubname{Verzeichnis der Ver\"offentlichungen}}
\DeclareOption{ngerman}{%
\ExecuteOptions{german}}
-\DeclareOption{danish}{%
- \continuedname{~(fortsat)}
- \listpubname{Udgivelser}}
\DeclareOption{dutch}{%
\continuedname{~(vervolg)}
\listpubname{Publicaties}}
-\DeclareOption{portuges}{%
- \continuedname{~(continua\c c\~ao)}
- \listpubname{Publica\c c\~oes}}
-\DeclareOption{portuguese}{%
- \ExecuteOptions{portuges}}
-\DeclareOption{brazil}{%
- \ExecuteOptions{portuges}}
-\DeclareOption{brazilian}{%
- \ExecuteOptions{portuges}}
+\DeclareOption{danish}{%
+ \continuedname{~(fortsat)}
+ \listpubname{Udgivelser}}
+\DeclareOption{swedish}{%
+ \continuedname{~(forts.)}
+ \listpubname{Publikationer}}
\DeclareOption{a4paper}{
\setlength\paperheight{297mm}