summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-07-28 00:31:21 +0000
committerKarl Berry <karl@freefriends.org>2007-07-28 00:31:21 +0000
commit2ef54cb5455a65133b844bf6328694a81f6c79e0 (patch)
treee1720871cb1176d971197544341658472b2c73ab /Master/texmf-dist/tex
parente2fe2430d15ac78018d547810a14bfdbdacbc9a9 (diff)
curve 1.13 (18jul07)
git-svn-id: svn://tug.org/texlive/trunk@4674 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/curve/curve.cls78
1 files changed, 51 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/curve/curve.cls b/Master/texmf-dist/tex/latex/curve/curve.cls
index 74aaa219716..33f224f80c5 100644
--- a/Master/texmf-dist/tex/latex/curve/curve.cls
+++ b/Master/texmf-dist/tex/latex/curve/curve.cls
@@ -38,9 +38,8 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-
-\ProvidesClass{curve}[2007/01/29 v1.12
- Curriculum Vitae class for LaTeX2e]
+\ProvidesClass{curve}[2007/07/18 v1.13
+ Curriculum Vitae class for LaTeX2e]
\RequirePackage{ltxtable}
\RequirePackage{calc}
@@ -86,16 +85,16 @@
\newcommand\@entry[2][]{%
\gdef\@nextentry{}\@key{#1}%
\egroup% end of \noalign opened in \entry.
- \@@key&\@prefix&#2\\}
+ \@@key&\@prefix&#2\\\par}
\newcommand\@sentry[1][]{%
- \gdef\@nextentry{\\}\@key{#1}%
+ \gdef\@nextentry{\\\par}\@key{#1}%
\egroup% end of \noalign opened in \entry.
\@@key&\@prefix&}
\newcommand\entry{%
\@nextentry
- \noalign\bgroup\gdef\@beforespace{-\subrubricbeforespace}%
+ \noalign\bgroup\gdef\@beforespace{\subrubricbeforespace}%
\@ifstar{\@sentry}{\@entry}}
\newcommand\noentry[1]{\@nextentry
@@ -105,7 +104,7 @@
\newcommand\subrubricfont[1]{\gdef\@subrubricfont{#1}}
\newlength\subrubricbeforespace
-\setlength\subrubricbeforespace{10pt}
+\setlength\subrubricbeforespace{20pt}
\newlength\subrubricspace
\setlength\subrubricspace{5pt}
@@ -113,9 +112,8 @@
\let\@subrubricmark\@gobble
\def\@@subrubric#1{%
- \parbox{0cm}{%
- \raisebox{\@beforespace}{\@subrubricfont#1}%
- \par\vspace\subrubricspace}%
+ \rule{0bp}{\@beforespace}
+ {\@subrubricfont#1}
\@subrubricmark{#1}}
@@ -143,7 +141,7 @@
\newcommand\subrubric[1]{%
\@nextentry
\noalign{\gdef\@nextentry{}}%
- \@subrubric{#1}\\*}
+ \@subrubric{#1}\\*[\subrubricspace]\par}
\newlength{\@almosttextwidth}
\AtBeginDocument{\setlength\@almosttextwidth{\textwidth-\hfuzz}}
@@ -154,15 +152,13 @@
\newlength\rubricspace
\setlength\rubricspace{10pt}
-\def\@@rubrichead#1{\@rubricfont#1\par\vspace\rubricspace}
+\def\@@rubrichead#1{\@rubricfont#1}
-\def\@rubrichead@l#1{\multicolumn{3}{@{}l@{}}{\@@rubrichead{#1}}\\}
-\def\@rubrichead@c#1{\multicolumn{3}{@{}c@{}}{\@@rubrichead{#1}}\\}
-\def\@rubrichead@r#1{\multicolumn{3}{@{}r@{}}{\@@rubrichead{#1}}\\}
-\def\@rubrichead@cl#1{%
- &\multicolumn{2}{@{\@clcccolsep}l@{}}{\@@rubrichead{#1}}\\}
-\def\@rubrichead@cc#1{%
- &\multicolumn{2}{@{\@clcccolsep}c@{}}{\@@rubrichead{#1}}\\}
+\def\@rubrichead@l#1{\multicolumn{3}{@{}l@{}}{\@@rubrichead{#1}}}
+\def\@rubrichead@c#1{\multicolumn{3}{@{}c@{}}{\@@rubrichead{#1}}}
+\def\@rubrichead@r#1{\multicolumn{3}{@{}r@{}}{\@@rubrichead{#1}}}
+\def\@rubrichead@cl#1{&\multicolumn{2}{@{\@clcccolsep}l@{}}{\@@rubrichead{#1}}}
+\def\@rubrichead@cc#1{&\multicolumn{2}{@{\@clcccolsep}c@{}}{\@@rubrichead{#1}}}
\let\@rubrichead\@rubrichead@c
@@ -195,9 +191,9 @@
\global\let\old@pagebreak\pagebreak%
\global\let\old@nopagebreak\nopagebreak
\begin{longtable}{@{}kl@{~}X@{}}
- \@rubrichead{#1}
+ \@rubrichead{#1}\\*[\rubricspace]
\endfirsthead
- \@rubrichead{#1\@continuedname}
+ \@rubrichead{#1\@continuedname}\\*[\rubricspace]
\endhead
\noalign{\@rubricmark{#1}%
\global\let\in@newpage\newpage%
@@ -339,13 +335,38 @@
\newcommand\subtitlefont[1]{\gdef\@subtitlefont{#1}}
\@onlypreamble\subtitlefont
-\newcommand\maketitle{%
- \begin{center}
+\def\@titlealignment@l{\raggedright}
+\def\@titlealignment@c{\centering}
+\def\@titlealignment@r{\raggedleft}
+
+\let\@title@lignment\@titlealignment@c
+
+\def\@titlealignment#1#2{%
+ \def\@curve@temp@a{\let\@title@lignment}
+ \expandafter\@curve@temp@a\csname @titlealignment@#2\endcsname
+ \@ifundefined{@title@lignment}{%
+ \ClassError{curve}{Invalid title alignment}{%
+ You have called \expandafter\string\csname#1\endcsname\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.}}
+}
+
+\newcommand\titlealignment[1]{\@titlealignment{titlealignment}{#1}}
+
+\def\@@maketitle{%
+ \bgroup\trivlist\@title@lignment\item\relax
{\@titlefont\@title}
\ifx\@subtitle\@undefined\else\\\@subtitlefont\@subtitle\fi
- \end{center}
+ \endtrivlist\egroup
\vspace\titlespace}
+\def\@maketitle[#1]{\@titlealignment{maketitle}{#1}\@@maketitle}
+
+\newcommand\maketitle{\@ifnextchar[%]
+ \@maketitle\@@maketitle}
+
\let\@flavor\empty
\newcommand\flavor[1]{\gdef\@flavor{#1}
\ifx\@flavor\empty\else\edef\@flavor{.\@flavor}\fi}
@@ -363,7 +384,7 @@
\renewcommand\input{\@ifnextchar\bgroup\@curveinput\@@input}
-\newcommand\makerubric[1]{\LTXtable{\@almosttextwidth}{#1}}
+\newcommand\makerubric[1]{\LTXtable{\linewidth}{#1}}
\let\newblock\par
\newcounter{bibcount}
@@ -404,8 +425,9 @@
\renewcommand\bibitem{%
%% #### FIXME: Dirty code duplication from \entry
\@nextentry
- \noalign\bgroup\gdef\@beforespace{-\subrubricbeforespace}%
- \@ifnextchar[\@lbibitem\@bibitem}
+ \noalign\bgroup\gdef\@beforespace{\subrubricbeforespace}%
+ \@ifnextchar[%]
+ \@lbibitem\@bibitem}
}
}
@@ -507,6 +529,8 @@
\pagestyle{empty}
\pagenumbering{arabic}
+\newcommand\@makefntext[1]{\noindent\hb@xt@1em{\hss\@makefnmark}#1}
+
\if@twoside
\def\ps@headings{%
\let\@oddfoot\@empty\let\@evenfoot\@empty