elbioimp (18mar11)

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

2 files changed, 87 insertions, 56 deletions

diff --git a/Master/texmf-dist/source/latex/elbioimp/elbioimp.dtx b/Master/texmf-dist/source/latex/elbioimp/elbioimp.dtx
index 9009b02dac8..e36fc10008a 100644
--- a/Master/texmf-dist/source/latex/elbioimp/elbioimp.dtx
+++ b/Master/texmf-dist/source/latex/elbioimp/elbioimp.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2010 by Dag Langmyhr
+% Copyright (C) 2011 by Dag Langmyhr
 %
 % This file may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, see
@@ -15,7 +15,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{elbioimp}
 %<*class>
-    [2010/11/03 v1.1 Document class for Journal of Electrical Bioimpedance]
+    [2011/03/02 v1.2 Document class for Journal of Electrical Bioimpedance]
 %</class>
 %
 %<*driver>
@@ -33,8 +33,6 @@
 %</driver>
 % \fi
 %
-% \CheckSum{0}
-%
 % \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
@@ -51,38 +49,40 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% % \CheckSum{222}
+% % \CheckSum{224}
+%
+% \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
+% \newcommand{\Cname}{\textsf{elbioimp}}
+% \newcommand{\Jname}{\emph{Journal of Electrical Bioimpedance}}
 %
 % \changes{v1.0}{2010/01/20}{Initial version}
 % \changes{v1.1}{2010/11/02}{Line spacing modified}
+% \changes{v1.2}{2011/03/01}{Added \cmd{subsection},
+%   \cmd{affiliation}, and \cmd{sameaffiliation}}
 %
 % \GetFileInfo{elbioimp.dtx}
 %
 % \DoNotIndex{\,}
-% \DoNotIndex{\abstractname,\arabic,\AtBeginDocument,\@author}
-% \DoNotIndex{\baselineskip,\begin,\bf}
-% \DoNotIndex{\captionsetup,\ClassWarningNoLine,\CurrentOption}
+% \DoNotIndex{\abstractname,\addtocounter,\arabic,\AtBeginDocument,\@author}
+% \DoNotIndex{\baselineskip,\begin,\bf,\bibliographystyle}
+% \DoNotIndex{\captionsetup,\ClassWarningNoLine,\columnwidth,\CurrentOption}
 % \DoNotIndex{\DeclareCaptionLabelFormat,\DeclareMathSizes,\DeclareOption,\def}
 % \DoNotIndex{\end,\equal}
 % \DoNotIndex{\footnote,\footnoterule}
 % \DoNotIndex{\ifthenelse,\@ifundefined,\ignorespaces,\it,\itemsep}
 % \DoNotIndex{\leftmargin,\leftmargini,\let,\@listi,\@listI,\LoadClass}
-% \DoNotIndex{\@makefntext}
+% \DoNotIndex{\@makefnmark,\@makefntext}
 % \DoNotIndex{\newcommand,\newenvironment,\noindent,\normalfont}
-% \DoNotIndex{\par,\parindent,\parsep,\ProcessOptions}
+% \DoNotIndex{\pagestyle,\par,\parindent,\parsep,\ProcessOptions}
 % \DoNotIndex{\relax,\renewcommand,\renewenvironment,\RequirePackage,\rule}
 % \DoNotIndex{\setcounter,\@setfontsize,\setlength,\space,\@startsection}
-% \DoNotIndex{\textbf,\textwidth,\@thefnmark,%
+% \DoNotIndex{\textbf,\@textsuperscript,\textwidth,\@thefnmark,%
 %  \thempfootnote,\@title,\topsep,\twocolumn}
+% \DoNotIndex{\urlstyle}
 % \DoNotIndex{\vspace}
 %
-% \newcommand{\Cname}{\textsf{elbioimp}}
-% \newcommand{\Jname}{\emph{Journal of Electrical Bioimpedance}}
-%
-% \title{The \Cname{} class\thanks{This document
-%   corresponds to \Cname{}~\fileversion,
-%   dated \filedate.}}
-% \author{Dag Langmyhr\thanks{Department of Informatics,
+% \title{The \Cname{} class}
+% \author{Dag Langmyhr\affiliation{Department of Informatics,
 %   University of Oslo, \textsf{dag@ifi.uio.no}}}
 %
 % \maketitle
@@ -90,10 +90,11 @@
 % \begin{abstract}
 %   \noindent
 %   This paper describes the implementation of the document class
-%   \Cname{} which is intended for writing articles in the \Jname.
+%   \Cname{} which has been designed for writing articles in the \Jname.
+%   It corresponds to \Cname{}~\fileversion, dated \filedate.
 % \end{abstract}
-%
 % 
+%
 % \section{Introduction}
 % The \Jname{} (see its web page at
 % \url{https://www.journals.uio.no/index.php/bioimpedance}) has
@@ -101,13 +102,12 @@
 % based on recommendations from the \emph{US National institute of
 % health}\cite{NIH}. The \LaTeX{} document class \Cname{} implements
 % this style.
+% As an example, this documentation uses the \Cname{} class.
 %
 % This \LaTeX{} code is published with a \textbf{\LaTeX{} project
-% public license} as described in
+% public license}, as described in
 % \url{http://www.latex-project.org/lppl/}. 
 %
-% As an example, this documentation uses the \Cname{} class.
-%
 %
 % \section{Usage}
 % To use this document class, you must first put the
@@ -123,21 +123,43 @@
 % The document class is based on the standard \emph{article} class and
 % is used just like that class, with three exceptions:
 % \begin{enumerate}
-% \item The authors' affiliations are given with the \verb:\thanks:
-%   command, as in
+% \item The authors' affiliations (to companies or academic institutions)
+%   are given with the \verb:\affiliation: command:
+%   \begin{verbatim}
+%\author{My name\affiliation{My univerisity, 
+%    My city, My country}}
+%   \end{verbatim}
+%   If there is more than one author, their names should be separated
+%   by an \verb:\and: command.
+% 
+%   If two authors have the same affiliation, the latter one may use the
+%   \verb:\sameaffiliation: command, as in
+%   \begin{verbatim}
+%\author{First Author\affiliation{My university, 
+%  My city, My country}\and
+%  Second Author\sameaffiliation}
+%   \end{verbatim}
+%
+%   In case there should be three or more authors and some have identical
+%   affiliations, \verb:\sameaffiliation: may be given a
+%   numeric option referencing a previous author; for example, if the
+%   first and the third author belong to the same institution, you may
+%   write: 
 %   \begin{verbatim}
-%\author{My name\thanks{My univerisity, 
-%    My country}}
+%\author{A Bee\affiliation{Uni A}\and
+%    C Dee\affiliation{Uni B}\and
+%    E Eff\sameaffiliation[1]}
 %   \end{verbatim}
 %
-% \item The author may indicate any keywords by empoying the
+% \item The author may indicate keywords by empoying the
 % \verb:\keyword: command.
 %
 % \item The document class will function poorly unless there is an
-% \verb:abstract: environment.
+% \verb:abstract: environment and a \verb:\maketitle: command.
 % \end{enumerate}
 %
-% \StopEventually{\newpage\bibliography{elbioimp}\onecolumn\PrintIndex}
+% \StopEventually{\bibliography{elbioimp}%
+%   \onecolumn\PrintChanges\PrintIndex}
 %
 %
 % \section{Class headers}
@@ -145,7 +167,7 @@
 % specifications. 
 %
 % \subsection{Class options}
-% The document class has no options.
+% This document class has no options.
 %    \begin{macrocode}
 \DeclareOption*{\ClassWarningNoLine
   {elbioimp}{Class option \CurrentOption
@@ -180,11 +202,13 @@
 %
 % \section{Document title area}
 % The title area has its own particular design.
+% It is implemented by redefining the \verb:\maketitle: command.
 %    \begin{macrocode}
 \AtBeginDocument{\renewcommand{\maketitle}{%
   \twocolumn[\begin{minipage}{\textwidth}
     \renewcommand{\and}{, }
-    \let \thanks = \footnote
+    \let \thanks = \affiliation
+    \let \samethanks = \sameaffiliation
     \renewcommand{\footnoterule}{}
     \def \@makefntext ##1{\noindent
       \small \@thefnmark. \it ##1}
@@ -197,6 +221,21 @@
   \elb@rule{\textwidth}\vspace{11pt}]}}
 \newcommand{\elb@rule}[1]{\rule{#1}{0.6pt}}
 %    \end{macrocode}
+% (The names \verb:\thanks: and \verb:\samethanks: are kept for
+% historic reasons.)
+%
+% \subsection{Affiliations}
+% Affiliations are specified using the \verb:\affiliation: and
+% \verb:\sameaffiliation: commands.
+%    \begin{macrocode}
+\newcommand{\affiliation}[1]{\footnote{#1}}
+\newcommand{\sameaffiliation}[1][0]{%
+  \addtocounter{mpfootnote}{-1}%
+  \ifthenelse{#1<1}
+    {\@makefnmark}
+    {\@textsuperscript{\normalfont#1}}%
+  \addtocounter{mpfootnote}{1}}
+%    \end{macrocode}
 %
 % \subsection{Keywords}
 % An additional command \verb:\keywords: makes it possible to specify
@@ -258,9 +297,9 @@
 \RequirePackage{mathptmx}
 %    \end{macrocode}
 % The \emph{mathptmx} package retains the \textsf{Computer Modern Sans
-% Serif} and \texttt{Computer Modern Teletype} fonts, but they blend reasonably
-% well with \emph{Times Roman} (at least in my opinion) so I will keep
-% them. 
+%   Serif} and \texttt{Computer Modern Teletype} fonts, but they blend
+% reasonably well with \emph{Times Roman} (at least in my opinion) so
+% I will keep them. 
 %
 % \subsection{Text sizes}
 % The specified text sizes are shown in Table\vref{tab:sizes}.
@@ -282,7 +321,7 @@
 %   \caption{Text sizes in \Cname\label{tab:sizes}}
 % \end{table}
 %    \begin{macrocode}
-\renewcommand{\Huge}{\@setfontsize%
+\renewcommand{\Huge}{\@setfontsize
   \Huge {20}{26}}
 \renewcommand{\huge}{\@setfontsize
   \huge {16}{20.8}}
@@ -293,7 +332,7 @@
 \renewcommand{\large}{\@setfontsize
   \large {11}{14.3}}
 \renewcommand{\normalsize}{%
-   \@setfontsize \normalsize {10}{13}
+   \@setfontsize \normalsize {10}{13}%
    \abovedisplayskip =
      10pt plus 2pt minus 5pt
    \abovedisplayshortskip =
@@ -370,27 +409,14 @@
   {-11pt plus -6pt minus -2pt}%
   {11pt plus 6pt minus 2pt}%
   {\normalfont\normalsize\it}}
-%    \end{macrocode}
-% More detailed levels than \verb:\subsection: are not defined for
-% this style, so I define them to have the same appearance as
-% \verb:\subsection:. 
-%    \begin{macrocode}
 \renewcommand{\subsubsection}{\@startsection
   {subsubsection}{3}{0pt}%
   {-11pt plus -6pt minus -2pt}%
   {11pt plus 6pt minus 2pt}%
-  {\normalfont\normalsize\it}}
-\renewcommand{\paragraph}{\@startsection
-  {paragraph}{4}{0pt}%
-  {-11pt plus -6pt minus -2pt}%
-  {11pt plus 6pt minus 2pt}%
-  {\normalfont\normalsize\it}}
-\renewcommand{\subparagraph}{\@startsection
-  {subparagraph}{5}{0pt}%
-  {-11pt plus -6pt minus -2pt}%
-  {11pt plus 6pt minus 2pt}%
-  {\normalfont\normalsize\it}}
+  {\normalfont\normalsize}}
 %    \end{macrocode}
+% The default definitions of \verb:\paragraph: and
+% \verb:\subparagraph: are retained.
 %
 % \subsection{Section numbering}
 % No sections should be numbered.
@@ -412,10 +438,15 @@
   aboveskip=5pt]{caption}
 \DeclareCaptionLabelFormat{fig}
   {\ifthenelse{\equal{#1}%
-    {Figure}}{Fig}{Tab}.\,#2}
+    {Figure}}{Fig}{Tab}.~#2}
 \captionsetup{labelformat=fig}
+%    \end{macrocode}
+% We also adjust the spacing around the floats, and we do not want
+% half-empty float-columns.
+%    \begin{macrocode}
 \setlength{\floatsep}{6pt plus 3pt}
 \setlength{\textfloatsep}{\floatsep}
+\renewcommand{\floatpagefraction}{0.8}
 %    \end{macrocode}
 % 
 %
diff --git a/Master/texmf-dist/source/latex/elbioimp/elbioimp.ins b/Master/texmf-dist/source/latex/elbioimp/elbioimp.ins
index a2ae77e3f05..03ee3fc61b3 100644
--- a/Master/texmf-dist/source/latex/elbioimp/elbioimp.ins
+++ b/Master/texmf-dist/source/latex/elbioimp/elbioimp.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2010 by Dag Langmyhr
+%% Copyright (C) 2011 by Dag Langmyhr
 %%
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, see
@@ -14,7 +14,7 @@
 \preamble
 This is a generated file.
 
-Copyright (C) 2010 by Dag Langmyhr
+Copyright (C) 2011 by Dag Langmyhr
 
 This file may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, see