summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-11-27 15:25:39 +0000
committerNorbert Preining <preining@logic.at>2007-11-27 15:25:39 +0000
commit7e2204f4ea41a8f2ef3d1749332042f0b050d365 (patch)
tree0c46e67af083c0f43e741461c5fb218577de3873 /Master/texmf-dist/tex
parentae5896870fe7ac8b1ab8d75fe0ea65ec6efcae17 (diff)
update curve from CTAN
git-svn-id: svn://tug.org/texlive/trunk@5621 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/curve/curve.cls59
1 files changed, 36 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/curve/curve.cls b/Master/texmf-dist/tex/latex/curve/curve.cls
index 33f224f80c5..80819249fd5 100644
--- a/Master/texmf-dist/tex/latex/curve/curve.cls
+++ b/Master/texmf-dist/tex/latex/curve/curve.cls
@@ -38,17 +38,13 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{curve}[2007/07/18 v1.13
+\ProvidesClass{curve}[2007/11/27 v1.14
Curriculum Vitae class for LaTeX2e]
\RequirePackage{ltxtable}
+\RequirePackage{ifthen}
\RequirePackage{calc}
-\newif\ifstrok\strokfalse
-\def\strtest#1#2{%
- \def\@strone{#1}\def\@strtwo{#2}%
- \ifstrok\else\ifx\@strone\@strtwo\stroktrue\fi\fi}
-
\gdef\@nextentry{}
\def\@keyfont{}
@@ -56,16 +52,15 @@
\newcolumntype{k}{>{\@keyfont}l}
\newcommand\keyalignment[1]{%
- \strokfalse\strtest{#1}{l}\strtest{#1}{r}\strtest{#1}{c}%
- \ifstrok\else%
- \ClassError{curve}{Invalid key alignment}{%
- You have called \protect\keyalignment\space with an invalid value.%
- \MessageBreak
- Valid options include l, c, and r.\MessageBreak
- Type X <return> to quit, fix the typo, and rerun LaTeX.}%
- \fi
- \newcolumntype{k}{>{\@keyfont}#1}
-}
+ \ifthenelse{\equal{#1}{l}}{}{%
+ \ifthenelse{\equal{#1}{r}}{}{%
+ \ifthenelse{\equal{#1}{c}}{}{%
+ \ClassError{curve}{Invalid key alignment}{%
+ You have called \protect\keyalignment\space with an invalid value.%
+ \MessageBreak
+ Valid options include l, c, and r.\MessageBreak
+ Type X <return> to quit, fix the typo, and rerun LaTeX.}}}}%
+ \newcolumntype{k}{>{\@keyfont}#1}}
\def\@prefix{\textbullet}
\newcommand\prefix[1]{\gdef\@prefix{#1}}
@@ -252,9 +247,11 @@
\newcommand\photo[2][l]{%
\RequirePackage{graphicx}
- \strokfalse\strtest{#1}{l}\strtest{#1}{r}\strtest{#1}{c}%
- \ifstrok\else\ClassError{curve}{Invalid argument to \protect\photo}{%
- Argument 2 of \protect\photo must be `l', `r' or `c'.}\fi
+ \ifthenelse{\equal{#1}{l}}{}{%
+ \ifthenelse{\equal{#1}{r}}{}{%
+ \ifthenelse{\equal{#1}{c}}{}{%
+ \ClassError{curve}{Invalid argument to \protect\photo}{%
+ Argument 2 of \protect\photo must be `l', `r' or `c'.}}}}%
\def\tmp@cmd{\global\let\makeheaders@}
\expandafter\tmp@cmd\csname makeheaders@#1\endcsname
\gdef\photo@file{#2}}
@@ -310,9 +307,11 @@
\parbox[#1]{\rightheader@width}{\raggedleft\@rightheader}}
\newcommand\makeheaders[1][c]{%
- \strokfalse\strtest{#1}{t}\strtest{#1}{b}\strtest{#1}{c}%
- \ifstrok\else\ClassError{curve}{Invalid argument to \protect\makeheaders}{%
- Argument of \protect\makeheaders must be `t', `b' or `c'.}\fi
+ \ifthenelse{\equal{#1}{t}}{}{%
+ \ifthenelse{\equal{#1}{b}}{}{%
+ \ifthenelse{\equal{#1}{c}}{}{%
+ \ClassError{curve}{Invalid argument to \protect\makeheaders}{%
+ Argument of \protect\makeheaders must be `t', `b' or `c'.}}}}%
\def\tmp@cmd{\global\let\includephoto@}
\expandafter\tmp@cmd\csname includephoto@#1\endcsname
\makeheaders@{#1}%
@@ -388,6 +387,10 @@
\let\newblock\par
\newcounter{bibcount}
+\newcounter{bibtotal}
+
+\newif\ifcurve@revbib\curve@revbibfalse
+\DeclareOption{revbib}{\curve@revbibtrue}
\AtBeginDocument{
\@ifpackageloaded{multibbl}{
@@ -417,7 +420,9 @@
\immediate\write\@auxout{\string\bibcite{#2}{#1}}}
\fi%
\ignorespaces}
- \def\@bibitem#1{\stepcounter{bibcount}\@sentry[\@biblabel{\thebibcount}]%
+ \def\@bibitem#1{\stepcounter{bibcount}%
+ \@sentry[\@biblabel{\ifcurve@revbib\thebibtotal\else\thebibcount\fi}]%
+ \ifcurve@revbib\addtocounter{bibtotal}{-1}\fi%
\if@filesw%
\immediate\write\@auxout{\string\bibcite{#1}{\thebibcount}}%
\fi%
@@ -431,6 +436,11 @@
}
}
+\AtEndDocument{%
+ \if@filesw%
+ \immediate\write\@auxout{\string\setcounter{bibtotal}{\thebibcount}}%
+ \fi}
+
\newcommand\listpubname[1]{\gdef\@listpubname{#1}}
\newenvironment{thebibliography}[1]{%
@@ -480,6 +490,9 @@
\DeclareOption{swedish}{%
\continuedname{~(forts.)}
\listpubname{Publikationer}}
+\DeclareOption{polish}{
+ \continuedname{~(kontynuacja)}
+ \listpubname{Publikacje}}
\DeclareOption{a4paper}{
\setlength\paperheight{297mm}