diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/curve/NEWS | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/curve/curve.el | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/curve/curve.pdf | bin | 174338 -> 178580 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/curve/cv.pdf | bin | 24791 -> 24549 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/curve/cv.tex | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/curve/rubric.tex | 19 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/curve/curve.dtx | 162 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/curve/curve.ins | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/curve/curve.cls | 78 |
9 files changed, 181 insertions, 103 deletions
diff --git a/Master/texmf-dist/doc/latex/curve/NEWS b/Master/texmf-dist/doc/latex/curve/NEWS index 8648e4c15a4..a7495a2629e 100644 --- a/Master/texmf-dist/doc/latex/curve/NEWS +++ b/Master/texmf-dist/doc/latex/curve/NEWS @@ -16,6 +16,20 @@ version 1999/06/01 or later. CurVe consists of the files listed in the file `README'. +* Version 1.13 +============== +** Support for title alignment +suggested by Lars Kasper +** Support for footnotes +suggested by Alain Coletta +** Let rubrics honor the current \linewidth +so that they can be used inside minipage environments for instance +** Changed default value of \subrubricbeforespace +to 20pt +** Fix some overfull boxes +reported by Nico Schlömer +** FAQ and documentation update + * Version 1.12 ============== ** Support for Swedish diff --git a/Master/texmf-dist/doc/latex/curve/curve.el b/Master/texmf-dist/doc/latex/curve/curve.el index f4c10ec8808..2be0f6b509b 100644 --- a/Master/texmf-dist/doc/latex/curve/curve.el +++ b/Master/texmf-dist/doc/latex/curve/curve.el @@ -1,11 +1,11 @@ ;;; curve.el --- AUC-TeX style file for CurVe -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Didier Verna. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Didier Verna. ;; Author: Didier Verna <didier@lrde.epita.fr> ;; Maintainer: Didier Verna <didier@lrde.epita.fr> ;; Created: Tue Apr 18 14:49:29 2000 -;; Last Revision: Wed Jun 7 10:13:51 2006 +;; Last Revision: Wed Jul 18 17:28:55 2007 ;; Keywords: tex abbrev data ;; This file is part of CurVe. @@ -71,6 +71,7 @@ the choosen file name sans the last TWO extensions." '("subtitle" "Subtitle") '("titlespace") '("titlefont" "Font for title") + '("titlealignment" "Alignment (l, c, r)") '("subtitlefont" "Font for subtitle") '("maketitle") diff --git a/Master/texmf-dist/doc/latex/curve/curve.pdf b/Master/texmf-dist/doc/latex/curve/curve.pdf Binary files differindex 463920c1404..2f2dfc13943 100644 --- a/Master/texmf-dist/doc/latex/curve/curve.pdf +++ b/Master/texmf-dist/doc/latex/curve/curve.pdf diff --git a/Master/texmf-dist/doc/latex/curve/cv.pdf b/Master/texmf-dist/doc/latex/curve/cv.pdf Binary files differindex c9079d15269..5c320b46cec 100644 --- a/Master/texmf-dist/doc/latex/curve/cv.pdf +++ b/Master/texmf-dist/doc/latex/curve/cv.pdf diff --git a/Master/texmf-dist/doc/latex/curve/cv.tex b/Master/texmf-dist/doc/latex/curve/cv.tex index afe0391328a..f9d972222df 100644 --- a/Master/texmf-dist/doc/latex/curve/cv.tex +++ b/Master/texmf-dist/doc/latex/curve/cv.tex @@ -29,7 +29,6 @@ \rightheader{Right Header\\ Idem} - \title{Your CV's Title} \subtitle{and the subtitle} diff --git a/Master/texmf-dist/doc/latex/curve/rubric.tex b/Master/texmf-dist/doc/latex/curve/rubric.tex index ce9cb3fee52..ac231b278cb 100644 --- a/Master/texmf-dist/doc/latex/curve/rubric.tex +++ b/Master/texmf-dist/doc/latex/curve/rubric.tex @@ -19,16 +19,12 @@ %% CurVe consists of the files listed in the file `README'. - \begin{rubric}{The Rubric's Title} - \entry*[A Key] - This is an entry with a key. The key is displayed on the left, - and you're reading the entry's contents. As you can see, this entry does - not belong to a subrubric. - - \subrubric{\parbox{5cm}{A First Subrubric\\and the sequel}} - + This is an entry with a key. The key is displayed on the left, and you're + reading the entry's contents. As you can see, this entry does not belong to + a subrubric. +\subrubric{A First Subrubric} \entry*[A Key] This entry belongs to the first subrubric. Before the subrubric, some space is added to separate it from the previous entry. @@ -42,9 +38,7 @@ This is another entry, but this one has no key. Note the text bullet which serves as a visual clue, especially when several entries share the same key. - - \subrubric{A Second Subrubric} - +\subrubric{A Second Subrubric} \entry*[A Key] This entry belongs to the second subrubric. \entry* @@ -53,16 +47,13 @@ This is another entry with a new key. \entry* This is another entry, but this one has no key. - \subrubric{} - \entry*[A Key] If you want to separate some entries from the subrubric above, you can for instance make an empty subrubric. \entry* You can include other rubrics below. Rubrics can even be split across pages. The titles will then be repeated. - \end{rubric} %% rubric.tex ends here. diff --git a/Master/texmf-dist/source/latex/curve/curve.dtx b/Master/texmf-dist/source/latex/curve/curve.dtx index 6c833cec7d1..c6a849cca3d 100644 --- a/Master/texmf-dist/source/latex/curve/curve.dtx +++ b/Master/texmf-dist/source/latex/curve/curve.dtx @@ -7,7 +7,7 @@ % Author: Didier Verna <didier@lrde.epita.fr> % Maintainer: Didier Verna <didier@lrde.epita.fr> % Created: Thu Dec 10 16:04:01 1998 -% Last Revision: Wed Jun 7 10:14:29 2006 +% Last Revision: Tue Jun 12 11:03:35 2007 % % This file is part of CurVe. % @@ -50,7 +50,7 @@ % \fi % % \catcode`\¡=14 -% \CheckSum{1068} +% \CheckSum{1115} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -67,37 +67,34 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} % -% ^^A @@@@ % \newcommand{\version}{v@VERSION@} -% \newcommand{\version}{v1.12} -% ^^A @@@@ % \newcommand{\releasedate}{@RELEASE_DATE@} -% \newcommand{\releasedate}{2007/01/29} -% ^^A @@@@ % \newcommand{\packagecopyright}{Copyright \copyright{} @COPYRIGHT_YEARS@ Didier Verna} -% \newcommand{\packagecopyright}{Copyright \copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Didier Verna} -% \newcommand{\auctex}{AUC-\TeX} -% \newcommand{\cv}{\textsc{CV}} +% \newcommand\version{1.13} +% \newcommand\releasedate{2007/07/18} +% \newcommand\packagecopyright{Copyright \copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Didier Verna} +% \newcommand\auctex{AUC-\TeX} +% \newcommand\cv{\textsc{CV}} % \MakeShortVerb{\|} % \date{\today} % \title{\curve{} -- a \LaTeXe{} class package for making \textbf{Cur}ricula -% \textbf{V}ita\textbf{e}. \thanks{This document describes \curve{} -% \version, release date \releasedate.}} +% \textbf{V}ita\textbf{e}.\thanks{This document describes \curve{} \version, +% release date \releasedate.}} % \author{Didier Verna\\ -% \texttt{mailto:didier@lrde.epita.fr}\\ -% \texttt{http://www.lrde.epita.fr/\~{}didier}} +% \texttt{mailto:didier@lrde.epita.fr}\\ +% \texttt{http://www.lrde.epita.fr/\~{}didier}} % \maketitle % % % \begin{abstract} -% \curve{} provides a \LaTeXe{} class that hopefully will make your life -% easier when you want to write your \cv. It provides you with a set of -% commands to create rubrics, entries in these rubrics etc. \curve{} will then -% properly format your \cv{} for you (possibly splitting it onto multiple -% pages), which is usually the most painful part of \cv{} writing. Another -% nice feature of \curve{} is its ability to manage different \cv{} ``flavors'' -% simultaneously. It is in fact often the case that you want to maintain -% slightly divergent versions of your \cv{} at the same time, in order to -% emphasize on different aspects of your background.\par -% The \curve{} package is \packagecopyright{}, and distributed under the terms -% of the LPPL license. +% \curve{} provides a \LaTeXe{} class that hopefully will make your life +% easier when you want to write your \cv. It provides you with a set of +% commands to create rubrics, entries in these rubrics etc. \curve{} will +% then properly format your \cv{} for you (possibly splitting it onto +% multiple pages), which is usually the most painful part of \cv{} writing. +% Another nice feature of \curve{} is its ability to manage different \cv{} +% ``flavors'' simultaneously. It is in fact often the case that you want to +% maintain slightly divergent versions of your \cv{} at the same time, in +% order to emphasize on different aspects of your background.\par +% The \curve{} package is \packagecopyright{}, and distributed under the +% terms of the LPPL license. % \end{abstract} % % \section{Getting \curve} @@ -130,6 +127,10 @@ % them however. As of version 1.11, \curve{} provides a new convenience % macro to do something similar: see section \ref{sec:noentry}. % \item +% \textbf{How can I change the interline spacing ?}\\ +% Internally, \curve{} uses \LaTeX{} tabular-based environments. As such, +% you can play with |\arraystretch| to modify the space between rows. +% \item % \textbf{When a page break occurs in the middle of a rubric, the same % alignment is kept on both pages, which might result in suboptimal % layout.}\\ @@ -201,8 +202,8 @@ % married and so on. These headers will respectively be left and right aligned. % As of version 1.4, \curve{} lets you insert a small identity photo in the % headers, either on the left, on the right, or between them. After these -% headers come an optional title and/or subtitle, which will be centered on -% the page. +% headers come an optional title and/or subtitle, which can be centered on +% the page, or flushed either left or right. % \subsubsection{Rubrics} % The remaining of the document is composed of sections called ``rubrics'' in % the \curve{} terminology. A rubric represents a major topic that you want @@ -319,7 +320,14 @@ % \DescribeMacro{\title}\DescribeMacro{\subtitle} % The |\title| and |\subtitle| macros take one mandatory argument which % define respectively your \cv's title and subtitle. They can be used in -% the document's preamble only. These titles will be centered on the page.\par +% the document's preamble only.\par +% \DescribeMacro{\titlealignment} +% By default, titles are centered on the page. However, you can also have them +% aligned to the left or right side of the page. To specify your preferred +% title alignment, call |\titlealignment| with an argument of either +% \texttt{l}, \texttt{c} or \texttt{r}, the meaning of which should be +% obvious. You can also achieve the same effect by passing an optional +% argument to |\maketitle| (see below).\par % \DescribeMacro{\titlespace} % |\titlespace| is the amount of extra vertical space to put after the % title(s). This is a \LaTeX{} length that defaults to \texttt{0pt}.\par @@ -333,7 +341,9 @@ % by calling |\maketitle| after the beginning of your document, and just after % |\makeheaders| if you happen use it. It is possible to omit the subtitle, % but if you call |\maketitle| without having defined at least a title, an -% error will be signaled. +% error will be signaled. |\maketitle| accepts an optional argument for +% specifying the title alignment scheme. This argument is the same as in +% |\titlealignment|, and takes precedence over it. % % \subsubsection{Choosing a Flavor} % As you already know, each rubric must reside in its own separate file. For @@ -602,6 +612,13 @@ % belongs to its duty. The \texttt{geometry} package comes in handy if you % want to reduce your margins. % +% \subsection{Vertical spacing} +% For readability, you might be tempted to leave empty lines here and there in +% your rubric environments. I advise you against this because this may +% (currently, at least) affect vertical spacing. It is better to stick entries +% and subrubrics together, and play with the spacing commands to achieve the +% desired layout. +% % \subsection{The \texttt{ltx} Extension} % Personally, I prefer to keep \texttt{.tex} for \TeX{} files, and use the % \texttt{ltx} extension for \LaTeX. This is supported by \curve{} which will @@ -687,6 +704,12 @@ % % \section{Changes} % \begin{itemize} +% \item[v1.13] Support for title alignment, suggested by Lars Kasper\\ +% Support for footnotes, suggested by Alain Coletta\\ +% Let rubrics honor the current |\linewidth|\\ +% Changed default value of |\subrubricbeforespace| to \texttt{20pt}\\ +% Fix some overfull boxes, reported by Nico Schl\"olmer\\ +% FAQ and documentation update % \item[v1.12] Support for Swedish thanks to Konrad Skeri Persson\\ % |<konrad@skeri.com>|\\ % New customizable length |\rubricafterspace| defining the space between @@ -748,9 +771,8 @@ % First, the class announcement and the initial requirements: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -¡ @@@@ \ProvidesClass{curve}[@RELEASE_DATE@ v@VERSION@ -\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} @@ -827,16 +849,16 @@ \newcommand\@entry[2][]{% \gdef\@nextentry{}\@key{#1}% \egroup% end of \noalign opened in \entry. - \@@key&\@prefix\\} + \@@key&\@prefix\\\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}} % \end{macrocode} @@ -857,7 +879,7 @@ \newcommand\subrubricfont[1]{\gdef\@subrubricfont{#1}} \newlength\subrubricbeforespace -\setlength\subrubricbeforespace{10pt} +\setlength\subrubricbeforespace{20pt} \newlength\subrubricspace \setlength\subrubricspace{5pt} @@ -872,9 +894,8 @@ \let\@subrubricmark\@gobble \def\@@subrubric#1{% - \parbox{0cm}{% - \raisebox{\@beforespace}{\@subrubricfont#1}% - \par\vspace\subrubricspace}% + \rule{0bp}{\@beforespace} + {\@subrubricfont#1} \@subrubricmark{#1}} % \end{macrocode} @@ -911,7 +932,7 @@ \newcommand\subrubric[1]{% \@nextentry \noalign{\gdef\@nextentry{}}% - \@subrubric{#1}\\*} + \@subrubric{#1}\\*[\subrubricspace]\par} % \end{macrocode} % \subsubsection{Rubrics} @@ -932,15 +953,13 @@ % \end{macrocode} % \DescribeMacro{\rubricalignment} % \begin{macrocode} -\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 @@ -985,9 +1004,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% @@ -1174,15 +1193,43 @@ \@onlypreamble\subtitlefont % \end{macrocode} +% \DescribeMacro{\titlealignment} +% \begin{macrocode} +\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}} + +% \end{macrocode} % \DescribeMacro{\maketitle} % \begin{macrocode} -\newcommand\maketitle{% - \begin{center} +\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} + % \end{macrocode} % \subsubsection{Rubric Inclusion} % \DescribeMacro{\flavor} @@ -1210,7 +1257,7 @@ % \end{macrocode} % \DescribeMacro{\makerubric} % \begin{macrocode} -\newcommand\makerubric[1]{\LTXtable{\@almosttextwidth}{#1}} +\newcommand\makerubric[1]{\LTXtable{\linewidth}{#1}} % \end{macrocode} % \subsubsection{Bibliography} @@ -1270,8 +1317,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} } } @@ -1396,6 +1444,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 diff --git a/Master/texmf-dist/source/latex/curve/curve.ins b/Master/texmf-dist/source/latex/curve/curve.ins index b080b0420e6..db3bbcfbfda 100644 --- a/Master/texmf-dist/source/latex/curve/curve.ins +++ b/Master/texmf-dist/source/latex/curve/curve.ins @@ -1,11 +1,11 @@ %%% curve.ins --- Installation file for CurVe -*- mode: LaTeX -*- -%% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Didier Verna. +%% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007 Didier Verna. %% Author: Didier Verna <didier@lrde.epita.fr> %% Maintainer: Didier Verna <didier@lrde.epita.fr> %% Created: Thu Dec 10 16:04:01 1998 -%% Last Revision: Fri Feb 6 17:23:08 2004 +%% Last Revision: Tue Jun 12 11:04:29 2007 %% This file is part of CurVe. @@ -34,7 +34,6 @@ \preamble ^^J^^J -%% @@@@ Copyright (C) @COPYRIGHT_YEARS@ Didier Verna^^J Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Didier Verna^^J This file is part of CurVe.^^J CurVe may be distributed and/or modified under the 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\\} + \@@key&\@prefix\\\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 |