curve update to v1.12

git-svn-id: svn://tug.org/texlive/trunk@4128 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 298 insertions, 183 deletions

diff --git a/Master/texmf-dist/doc/latex/curve/NEWS b/Master/texmf-dist/doc/latex/curve/NEWS
index 0ecb440477e..8648e4c15a4 100644
--- a/Master/texmf-dist/doc/latex/curve/NEWS
+++ b/Master/texmf-dist/doc/latex/curve/NEWS
@@ -1,10 +1,7 @@
-
-
 			     WHAT'S NEW IN CURVE
 
 
-
-*** 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.
 
@@ -19,6 +16,18 @@ version 1999/06/01 or later.
 CurVe consists of the files listed in the file `README'.
 
 
+* Version 1.12
+==============
+** Support for Swedish
+thanks to Konrad Skeri Persson <konrad@skeri.com>
+** New customizable length \rubricafterspace
+defining the space between each rubric
+** Fix incompatibilities with the Multibbl package
+** Honor bibliography titles (if) provided by multibib or multibbl
+** New command \today
+** FAQ update
+** Fix implementation of skipsamekey option
+
 * Version 1.11
 ==============
 ** New FAQ section in the doc
@@ -99,6 +108,7 @@ thanks to Harald Harders <h.harders@tu-bs.de>
 ** Support for Italian
 thanks to Riccardo Murri <murri@phc.unipi.it>
 
+
 
 
 Local Variables:
diff --git a/Master/texmf-dist/doc/latex/curve/curve.el b/Master/texmf-dist/doc/latex/curve/curve.el
index 14067e3eb06..f4c10ec8808 100644
--- a/Master/texmf-dist/doc/latex/curve/curve.el
+++ b/Master/texmf-dist/doc/latex/curve/curve.el
@@ -1,6 +1,6 @@
 ;;; 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 Didier Verna.
 
 ;; Author:        Didier Verna <didier@lrde.epita.fr>
 ;; Maintainer:    Didier Verna <didier@lrde.epita.fr>
@@ -66,6 +66,7 @@ the choosen  file name sans the last TWO extensions."
       '("headerspace")
       '("makeheaders" [ "Alignment (t, c or b)" ])
 
+      ;; no need to support \today since it is a standard command
       '("title" "Title")
       '("subtitle" "Subtitle")
       '("titlespace")
@@ -79,6 +80,7 @@ the choosen  file name sans the last TWO extensions."
       '("rubricalignment" "Alignment (l, c, r, cl, cc)")
       '("rubricfont" "For for rubrics")
       '("rubricspace")
+      '("rubricafterspace")
 
       '("subrubric" "Subrubric name")
       '("subrubricalignment" "Alignment (l, c, r, cl, cc)")
@@ -94,12 +96,9 @@ the choosen  file name sans the last TWO extensions."
       '("prefix" "Prefix command")
 
       '("continuedname" "Continuation name")
-      '("listpubname" "List of publications name")
-      )
+      '("listpubname" "List of publications name"))
      (LaTeX-add-environments
-      '("rubric" "Name")
-      )
-     )))
+      '("rubric" "Name")))))
 
 
 
diff --git a/Master/texmf-dist/doc/latex/curve/curve.pdf b/Master/texmf-dist/doc/latex/curve/curve.pdf
new file mode 100644
index 00000000000..463920c1404
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..c9079d15269
--- /dev/null
+++ 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 33410079b60..afe0391328a 100644
--- a/Master/texmf-dist/doc/latex/curve/cv.tex
+++ b/Master/texmf-dist/doc/latex/curve/cv.tex
@@ -2,8 +2,6 @@
 
 %% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Didier Verna.
 
-%% PRCS: $Id: cv.tex 1.7 Tue, 01 Mar 2005 11:18:45 +0100 didier $
-
 %% Author:        Didier Verna <didier@lrde.epita.fr>
 %% Maintainer:    Didier Verna <didier@lrde.epita.fr>
 %% Created:       Thu Dec 10 16:04:01 2000
diff --git a/Master/texmf-dist/doc/latex/curve/rubric.tex b/Master/texmf-dist/doc/latex/curve/rubric.tex
index 337f272d709..ce9cb3fee52 100644
--- a/Master/texmf-dist/doc/latex/curve/rubric.tex
+++ b/Master/texmf-dist/doc/latex/curve/rubric.tex
@@ -2,8 +2,6 @@
 
 %% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Didier Verna.
 
-%% PRCS: $Id: rubric.tex 1.7 Tue, 01 Mar 2005 11:18:45 +0100 didier $
-
 %% Author:        Didier Verna <didier@lrde.epita.fr>
 %% Maintainer:    Didier Verna <didier@lrde.epita.fr>
 %% Created:       Thu Dec 10 16:04:01 2000
diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R
index ce20cbaf563..19c1c8770c7 100644
--- a/Master/texmf-dist/ls-R
+++ b/Master/texmf-dist/ls-R
@@ -5598,6 +5598,7 @@ cidoc.tex
 circ.dvi
 circ.txt
 cisyms.tex
+missfont.log
 
 ./doc/latex/cite:
 README
diff --git a/Master/texmf-dist/source/latex/curve/curve.dtx b/Master/texmf-dist/source/latex/curve/curve.dtx
index c0b0aa7bfcf..6c833cec7d1 100644
--- a/Master/texmf-dist/source/latex/curve/curve.dtx
+++ b/Master/texmf-dist/source/latex/curve/curve.dtx
@@ -2,9 +2,7 @@
 %
 % curve.dtx --- Doc file for the CurVe package (code and documentation)
 %
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 2006 Didier Verna.
-%
-% PRCS: $Id: curve.dtx 1.55 Wed, 07 Jun 2006 10:16:54 +0200 didier $
+% 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>
@@ -52,7 +50,7 @@
 % \fi
 %
 % \catcode`\¡=14
-% \CheckSum{1007}
+% \CheckSum{1068}
 %% \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
@@ -69,12 +67,12 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %
-% ^^A $Format: "% \\newcommand{\\version}{v$Version$}"$
-% \newcommand{\version}{v1.11}
-% ^^A $Format: "% \\newcommand{\\releasedate}{$ReleaseDate$}"$
-% \newcommand{\releasedate}{2006/06/07}
-% ^^A $Format: "% \\newcommand{\\packagecopyright}{$LaTeXCopyright$}"$
-% \newcommand{\packagecopyright}{Copyright \copyright{}  2000, 2001, 2002, 2003, 2004, 2005, 2006 Didier Verna}
+% ^^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}}
 % \MakeShortVerb{\|}
@@ -142,16 +140,41 @@
 %   into different ones, starting at the appropriate entries to avoid page
 %   breaking in the middle.
 % \item
-%   \textbf{How can I make subrubrics with more than one line ?}\\
+%   \textbf{How can I make multi-line subrubrics ?}\\
 %   Here are two ideas:
 %   \begin{itemize}
 %   \item Put your text in several consecutive subrubrics (one per line).
 %     However, this might not give you the desired vertical spacing.
 %   \item Probably better, put your material in a parbox:\\
-%     \verb|\subrubric{\parbox{width}{first blah blah\\next blah blah}}|\\
+%     |\subrubric{\parbox{width}{first blah blah\\next blah blah}}|\\
 %     This is a bit dirty because you have to figure out a suitable width for
 %     your parbox, but this will work.
 %   \end{itemize}
+% \item
+%   \textbf{How can I make multi-line keys ?}\\
+%   The trick is to temporarily change the key cell type to a paragraph one
+%   (remember that we're in a tabular environment).
+%   \begin{enumerate}
+%   \item Recover the key formatting by doing something like this near
+%     the beginning of your document:\\
+%     |\makeatletter\let\mykeyfont\@keyfont\makeatother|
+%   \item Use something like this where you need a multi-line key (you will
+%   have to adjust the paragraph width manually):
+% \begin{verbatim}
+% \entry*[\multicolumn{1}{@{}>{\mykeyfont}p{2cm}}{%
+%   long key\newline long key}]
+%   Entry text. Entry text. Entry ...
+% \end{verbatim}
+%   \end{enumerate}
+% \item
+%   \textbf{How to deal with long keys ?}\\
+%   The best thing to do is to make them multi-line manually. Please refer to
+%   the previous question.
+% \item
+%   \textbf{Can I change the prefix locally ?}\\
+%   Yes and no. The |\prefix| command can only be used in the preamble or
+%   between rubrics. Otherwise, there is currently no way to change the prefix
+%   for a single entry. This limitation will disappear in a future release.
 % \end{enumerate}
 %
 % \section{Overview}
@@ -343,7 +366,11 @@
 % file specific for the current flavor in use, (e.g.
 % \texttt{experience.dvr.tex}). If that fails, it will fall back to a
 % non-flavored file (here, \texttt{experience.tex}). This allows you to
-% specialize only the required rubrics and use the default ones otherwise.
+% specialize only the required rubrics and use the default ones otherwise.\par
+% \DescribeMacro{\rubricafterspace}
+% As of version 1.12, \curve{} provides a new \LaTeX{} length,
+% |\rubricafterspace| controlling the amount of extra vertical space to put
+% after a rubric (hence, before the next one). The default is \texttt{0pt}.
 %
 % \subsection{Writing a Rubric File}
 % \subsubsection{The \texttt{rubric} Environment}
@@ -533,24 +560,20 @@
 % followed by a call to |\bibliography|. In \curve, this uses the |bbl| file
 % as a rubric one.\par
 %
-% Finally, note that \curve{} is compatible with the |bibentry| package.
+% As of version 1.9, \curve{} is compatible with the |bibentry| package. Note
+% however that there is an incompatibility between |bibentry| and |hyperref|,
+% and a workaround described in the |hyperref| README file.
+%
+% As of version 1.12, \curve{} is compatible with the |multibbl| package.
 %
 % \subsubsection{Internationalization}
-% \DescribeEnv{english}
-% \DescribeEnv{french, francais}
-% \DescribeEnv{spanish}
-% \DescribeEnv{italian}
-% \DescribeEnv{german, ngerman}
-% \DescribeEnv{danish}
-% \DescribeEnv{dutch}
-% \DescribeEnv{portuges, portuguese}
-% \DescribeEnv{brazilian, brazil}
-% \curve{} currently supports English, French, Spanish, Italian, German,
-% Danish, Dutch and Portuguese. You can select the language you want to use by
-% using the corresponding option. The \texttt{french} and \texttt{francais}
-% options are synonyms. The \texttt{german} and \texttt{ngerman} options are
-% currently equivalent. So are the \texttt{portuges}, \texttt{portuguese},
-% \texttt{brazil} and \texttt{brazilian} options.\par
+% \curve{} currently supports 11 languages via the following options:
+% \texttt{english}, \texttt{french} (or \texttt{francais}), \texttt{spanish},
+% \texttt{portuguese} (or \texttt{portuges}), \texttt{brazilian} (or
+% \texttt{brazil}), \texttt{italian}, \texttt{german}, \texttt{ngerman},
+% \texttt{dutch}, \texttt{danish} and \texttt{swedish}. The \texttt{german}
+% and \texttt{ngerman} options are currently equivalent; so are the
+% \texttt{portuguese} and \texttt{brazilian} ones.\par
 % If you want a finer grain on the language-dependent parts of \curve, the
 % following macros are provided.\par
 % \DescribeMacro{\continuedname}
@@ -563,7 +586,10 @@
 % \DescribeMacro{\listpubname}
 % The |\listpubname| macro takes one mandatory argument which redefines the
 % title of the bibliographic section (when you use the provided bibliography
-% support). By default, ``List of Publications'' is used in English.
+% support). By default, ``List of Publications'' is used in English. Note that
+% for compatibility with the |multibbl| and |multibib| packages, \curve{}
+% honors the existence of |\bibname| or |\refname| macros prior to
+% |\listpubname| for deciding which title to give to the bibliographic rubric.
 %
 %
 % \section{Hints, Tricks, Tips}
@@ -661,6 +687,15 @@
 %
 % \section{Changes}
 % \begin{itemize}
+% \item[v1.12] Support for Swedish thanks to Konrad Skeri Persson\\
+%   |<konrad@skeri.com>|\\
+%   New customizable length |\rubricafterspace| defining the space between
+%   each rubric\\
+%   Fix incompatibilities with the |multibbl| package.\\
+%   Honor bibliography titles (if) provided by |multibib| or |multibbl|\\
+%   New command |\today|\\
+%   FAQ update\\
+%   Fix implementation of \texttt{skipsamekey} option
 % \item[v1.11] New FAQ section in the documentation\\
 %   New command |\noentry| to manually enlarge too narrow rubrics\\
 %   Make |\pagebreak|, |\nopagebreak| and |\newpage| work in rubrics,
@@ -713,9 +748,9 @@
 % First, the class announcement and the initial requirements:
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-¡ $Format: "\\ProvidesClass{curve}[$ReleaseDate$ v$Version$"$
-\ProvidesClass{curve}[2006/06/07 v1.11
-                      Curriculum Vitae class for LaTeX2e]
+¡ @@@@ \ProvidesClass{curve}[@RELEASE_DATE@ v@VERSION@
+\ProvidesClass{curve}[2007/01/29 v1.12
+		      Curriculum Vitae class for LaTeX2e]
 
 \RequirePackage{ltxtable}
 \RequirePackage{calc}
@@ -779,20 +814,25 @@
 %    \begin{macrocode}
 \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
@@ -805,6 +845,7 @@
 %    \begin{macrocode}
 \newcommand\noentry[1]{\@nextentry
   \noalign{\gdef\@nextentry{}}#1&&\kill}
+
 %    \end{macrocode}
 %
 % \subsubsection{Subrubrics}
@@ -890,10 +931,7 @@
 
 %    \end{macrocode}
 % \DescribeMacro{\rubricalignment}
-% \DescribeEnv{rubric}
 %    \begin{macrocode}
-\let\@rubricmark\@gobble
-
 \def\@@rubrichead#1{\@rubricfont#1\par\vspace\rubricspace}
 
 \def\@rubrichead@l#1{\multicolumn{3}{@{}l@{}}{\@@rubrichead{#1}}\\}
@@ -918,6 +956,13 @@
 }
 
 %    \end{macrocode}
+% \DescribeMacro{\rubricafterspace}
+%    \begin{macrocode}
+\newlength\rubricafterspace
+\setlength\rubricafterspace{0pt}
+
+%    \end{macrocode}
+% \DescribeEnv{rubric}
 % Marking commands don't seem to work in longtable headings. So the rubric
 % mark is issued just after it.\par
 % As of version 1.7, |\raggedleft| and |\raggedright| are redefined in order
@@ -925,6 +970,8 @@
 % removing the |\\| definition since it's not available anyway, and also to
 % remove the |\parskip| setting since it's |Opt| in the whole class.
 %    \begin{macrocode}
+\let\@rubricmark\@gobble
+
 \newenvironment{rubric}[1]{%
   %% \begin{rubric}
   \def\raggedright{%
@@ -951,7 +998,7 @@
       \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}
@@ -965,6 +1012,15 @@
 %
 % \subsection{The Skeleton File}
 %
+% \subsubsection{Utilities}
+% \DescribeMacro{\today}
+%    \begin{macrocode}
+\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}
+
+%    \end{macrocode}
 % \subsubsection{Headers}
 % \DescribeMacro{\headerscale}
 % \DescribeMacro{\headerspace}
@@ -1146,8 +1202,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}
 
@@ -1164,19 +1220,60 @@
 
 %    \end{macrocode}
 % \DescribeMacro{\bibliography}
-% The following switch is used later in |\bibliography| to shut up a
-% |bibentry| warning.
+% Define |\bibliography| to issue a |\makerubric| call on the |bbl| file. As
+% of version 1.12, handle |multibbl| syntax if the package is loaded.
 %    \begin{macrocode}
-\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.}}}
+%    \end{macrocode}
+% \DescribeMacro{\bibitem}
+% Redefine |\bibitem| and its internal implementation to behave like |\entry|.
+%
+% Do this late to overwrite a possible |hyperref| redefinition back again (it
+% is arguable whether we should preserve |hyperref| functionality or not, but
+% the current answer is no).
+%
+% One exception: if |bibentry| is used, don't get in the way. It redefines its
+% own bibliographic environment and stuff.
+%    \begin{macrocode}
+\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}
+  }
+}
 
 %    \end{macrocode}
 % \DescribeMacro{\listpubname}
@@ -1185,51 +1282,23 @@
 
 %    \end{macrocode}
 % \DescribeEnv{thebibliography}
+% Note that |bibentry| overrides this definition.
 %    \begin{macrocode}
 \newenvironment{thebibliography}[1]{%
 %    \end{macrocode}
-% The internal bibitem macro definitions are postponed until here for two
-% reasons:
-% \begin{enumerate}
-% \item First, they have to be delayed until the beginning of the document
-%   because \texttt{hyperref} redefines them, so we have to override these new
-%   definitions yet again (that's assuming we're not interested in Hyperref's
-%   definition).
-% \item Second, a question of compatibility with |bibentry|: this package
-%   defines its own bibliographic environment, in which case the standard
-%   bibitem internals should be used.
-% \end{enumerate}
-%    \begin{macrocode}
-  \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}
-%    \end{macrocode}
-% \DescribeMacro{\bibitem}
-% Version 1.8 broke support for standard bibliography because of the
-% |\noalign| trickery. To avoid ``misplaced noalign'' errors, the solution I
-% found is to issue the |\noalign| as soon as possible, hence the following
-% redefinition of |\bibitem| which actually duplicates the job of |\entry|.
-% Maybe there is a better solution to this problem.
+% Disable the |skipsamekey| mechanism and the prefix which would get in the
+% way.
 %    \begin{macrocode}
-  \renewcommand\bibitem{%
-    \@nextentry
-    \noalign\bgroup\gdef\@beforespace{-\subrubricbeforespace}%
-    \@ifnextchar[\@lbibitem\@bibitem}
+  \let\@key\@alwayskey
+  \def\@prefix{}
 %    \end{macrocode}
-%    Also, disable the |skipsamekey| mechanism and the prefix which would get
-%    in the way.
+% For compatibility with bibliographic packages such as |multibib|, the
+% bibliography title is set (by order of priority) to either |\bibname|,
+% |\refname| or |\@listpubname|.
 %    \begin{macrocode}
-  \def\@key##1{##1}
-  \def\@prefix{}
-  \begin{rubric}{\@listpubname}
+  \begin{rubric}{\@ifundefined{bibname}{%
+	\@ifundefined{refname}{\@listpubname}{\refname}}{%
+	\bibname}}
   }{%
   \end{rubric}
 }
@@ -1248,6 +1317,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}}
@@ -1256,21 +1334,16 @@
   \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}}
+
 
 %    \end{macrocode}
 % \subsection{Standard Class Processing}
diff --git a/Master/texmf-dist/source/latex/curve/curve.ins b/Master/texmf-dist/source/latex/curve/curve.ins
index a3294ceeeae..b080b0420e6 100644
--- a/Master/texmf-dist/source/latex/curve/curve.ins
+++ b/Master/texmf-dist/source/latex/curve/curve.ins
@@ -2,8 +2,6 @@
 
 %% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Didier Verna.
 
-%% PRCS: $Id: curve.ins 1.8 Tue, 01 Mar 2005 11:18:45 +0100 didier $
-
 %% Author:        Didier Verna <didier@lrde.epita.fr>
 %% Maintainer:    Didier Verna <didier@lrde.epita.fr>
 %% Created:       Thu Dec 10 16:04:01 1998
@@ -36,8 +34,8 @@
 
 \preamble
 ^^J^^J
-%% $Format: "$TextCopyright$^^J"$
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Didier Verna^^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
 conditions of the LaTeX Project Public License, either version 1.1
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}
diff --git a/Master/texmf-dist/tpm/curve.tpm b/Master/texmf-dist/tpm/curve.tpm
index 890850b2457..eefc748d5fe 100644
--- a/Master/texmf-dist/tpm/curve.tpm
+++ b/Master/texmf-dist/tpm/curve.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/curve.zip">
     <TPM:Name>curve</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/06/08 21:58:39</TPM:Date>
+    <TPM:Date>2007/01/29 15:55:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>A LaTeX2e class for making curriculum vitae.</TPM:Title>
@@ -24,18 +24,20 @@ comes with support for AUC-TeX.
     <TPM:Size>89551</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="17759">
+    <TPM:RunFiles size="18639">
 texmf-dist/tex/latex/curve/curve.cls
 texmf-dist/tpm/curve.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="11604">
+    <TPM:DocFiles size="211057">
 texmf-dist/doc/latex/curve/NEWS
 texmf-dist/doc/latex/curve/README
 texmf-dist/doc/latex/curve/curve.el
+texmf-dist/doc/latex/curve/curve.pdf
+texmf-dist/doc/latex/curve/cv.pdf
 texmf-dist/doc/latex/curve/cv.tex
 texmf-dist/doc/latex/curve/rubric.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="60188">
+    <TPM:SourceFiles size="62936">
 texmf-dist/source/latex/curve/curve.dtx
 texmf-dist/source/latex/curve/curve.ins
     </TPM:SourceFiles>
diff --git a/Master/texmf/lists/curve b/Master/texmf/lists/curve
index c53b22e341d..8e750b35108 100644
--- a/Master/texmf/lists/curve
+++ b/Master/texmf/lists/curve
@@ -1,6 +1,8 @@
 texmf-dist/doc/latex/curve/NEWS
 texmf-dist/doc/latex/curve/README
 texmf-dist/doc/latex/curve/curve.el
+texmf-dist/doc/latex/curve/curve.pdf
+texmf-dist/doc/latex/curve/cv.pdf
 texmf-dist/doc/latex/curve/cv.tex
 texmf-dist/doc/latex/curve/rubric.tex
 texmf-dist/source/latex/curve/curve.dtx