Switch to new, officially sanctioned EMI class
authorZdeněk Šustr <sustr4@cesnet.cz>
Fri, 1 Apr 2011 14:43:26 +0000 (14:43 +0000)
committerZdeněk Šustr <sustr4@cesnet.cz>
Fri, 1 Apr 2011 14:43:26 +0000 (14:43 +0000)
org.glite.lb.doc/src/LBAG.tex
org.glite.lb.doc/src/LBDG.tex
org.glite.lb.doc/src/LBTG.tex
org.glite.lb.doc/src/LBTP.tex
org.glite.lb.doc/src/LBUG.tex
org.glite.lb.doc/src/copyright.tex
org.glite.lb.doc/src/emi.cls

index 1964069..4d9ea92 100644 (file)
 \DocIdentifier{glite-lb-doc-ag-\version}
 \DeliverableId{}
 \Date{\today}
-\Activity{JRA1: Middleware Engineering}
-\DocStatus{FINAL, version \version}
-\Dissemination{PUBLIC}
+%\Activity{JRA1: Middleware Engineering}
+\DocStatus{FINAL}
+\DocVersion{\version}
+%\Dissemination{PUBLIC}
 \DocumentLink{\url{http://egee.cesnet.cz/cvsweb/LB/LBAG.pdf}}
 \Abstract{\input{LBAG-Abstract}}
 
 \begin{document}
 
-\input{frontmatter}
+%\input{frontmatter}
+\input{copyright}
 \newpage
 \tableofcontents
 
index 04e3756..bcb26c5 100644 (file)
 \DocIdentifier{glite-lb-doc-dg-\version}
 \DeliverableId{}
 \Date{\today}
-\Activity{JRA1: Middleware Engineering}
-\DocStatus{DRAFT, version \version}
-\Dissemination{PUBLIC}
+%\Activity{JRA1: Middleware Engineering}
+\DocStatus{DRAFT}
+\DocVersion{\version}
+%\Dissemination{PUBLIC}
 \DocumentLink{\url{http://egee.cesnet.cz/cvsweb/LB/LBDG.pdf}}
 \Abstract{\input{LBDG-Abstract}}
 
@@ -78,7 +79,8 @@
 
 % ----- END COPY -----
 
-\input{frontmatter}
+%\input{frontmatter}
+\input{copyright}
 \tableofcontents
 
 \newpage
index 0b401b1..edcfc00 100644 (file)
@@ -1,5 +1,5 @@
-%
-%% Copyright (c) Members of the EGEE Collaboration. 2004-2010.
+%%
+%%%% Copyright (c) Members of the EGEE Collaboration. 2004-2010.
 %% See http://www.eu-egee.org/partners for details on the copyright holders.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 \DocIdentifier{glite-lb-doc-tg-\version}
 \DeliverableId{}
 \Date{\today}
-\Activity{JRA1: Middleware Engineering}
-\DocStatus{FINAL, version \version}
-\Dissemination{PUBLIC}
+%\Activity{JRA1: Middleware Engineering}
+\DocStatus{FINAL}
+\DocVersion{\version}
+%\Dissemination{PUBLIC}
 \DocumentLink{\url{http://egee.cesnet.cz/cvsweb/LB/LBTG.pdf}}
 \Abstract{\input{LBTG-Abstract}}
 
 \begin{document}
 
-\input{frontmatter}
+%\input{frontmatter}
+\input{copyright}
 \tableofcontents
 
 \newpage
index 6124f70..b4c7411 100644 (file)
 \DocIdentifier{glite-lb-doc-tp-\version}
 \DeliverableId{}
 \Date{\today}
-\Activity{SA3: Integration, Testing and Certification}
-\DocStatus{FINAL, version \version}
-\Dissemination{PUBLIC}
+%\Activity{SA3: Integration, Testing and Certification}
+\DocStatus{FINAL}
+\DocVersion{\version}
+%\Dissemination{PUBLIC}
 \DocumentLink{\url{http://egee.cesnet.cz/cvsweb/LB/LBTP.pdf}}
 \Abstract{\input{LBTP-Abstract}}
 
 \begin{document}
 
-\input{frontmatter}
+%\input{frontmatter}
+\input{copyright}
 \tableofcontents
 
 \newpage
index d2b5754..dc26e2c 100644 (file)
 \DocIdentifier{glite-lb-doc-ug-\version}
 \DeliverableId{}
 \Date{\today}
-\Activity{JRA1: Middleware Engineering}
-\DocStatus{FINAL, version \version}
-\Dissemination{PUBLIC}
+%\Activity{JRA1: Middleware Engineering}
+\DocStatus{FINAL}
+\DocVersion{\version}
+%\Dissemination{PUBLIC}
 \DocumentLink{\url{http://egee.cesnet.cz/cvsweb/LB/LBUG.pdf}}
 \Abstract{\input{LBUG-Abstract}}
 
 \begin{document}
 
-\input{frontmatter}
+%\input{frontmatter}
+\input{copyright}
 \tableofcontents
 
 \newpage
index 41d9fc9..1ad5864 100644 (file)
@@ -17,6 +17,8 @@
 % Taken from:
 % https://twiki.cern.ch/twiki/bin/view/EGEE/EGEEgLiteSoftwareLicense
 %
+~
+
 \vfill{}
 
 {\bf
@@ -37,4 +39,4 @@ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations under the License.
 }
-
+\clearpage
index 793e57a..2c6bfa1 100644 (file)
@@ -1,89 +1,35 @@
-% egee.cls: 
-%
-% $Id$
-%
-% $Log$
-% Revision 1.1  2011/03/25 14:02:28  zsustr
-% Use ami document class
-%
-% Revision 1.1.1.1  2010/06/28 14:11:00  jwhite
-% EMI MJRA1.1 latex sources
-%
-% Revision 1.14  2006/09/21 07:51:58  szamsu
-% fix bug#19743
-%
-% Revision 1.13  2004/08/31 19:24:27  szamsu
-% Fixing overfull problem in page headers. Saving the logo and reusing it later, instead of loading in again.
-%
-% Revision 1.12  2004/08/09 14:03:54  szamsu
-% proper IST number
-%
-% Revision 1.11  2004/08/03 17:02:21  szamsu
-% Information Society Infrastrcutures logo replacing the old IST logo
-%
-% Revision 1.10  2004/08/03 13:34:37  szamsu
-% Removed 'compat2' option on geometry, because it has also specified
-% 'scale{0.8,0.9}' for page size, which we define otherwise. Added the
-% 'centering' and 'includeheadfoot' options, which were defined in
-% 'compat2'.
-%
-% Revision 1.9  2004/07/09 16:06:52  leanne
-% Removed the Lead partner which is not used in egee
-%
-% Revision 1.8  2004/06/03 09:56:11  leanne
-% removed lead partner
+% emi.cls: 
+% Branched from egee.cls 1.6 
+% revision 1.1 [removed Activity and Lead Partner fields]
+% Emidio Giorgio -- emidio.giorgio@ct.infn.it 
+% March 31, 2011 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% License 
+%
+% This work is licensed under Creative Commons Attribution-ShareAlike 3.0.
+%              http://creativecommons.org/licenses/by/3.0/
+% You are free:
+%   * to Share Ñ to copy, distribute and transmit the work
+%   * to Remix Ñ to adapt the work
+%
+% Under the following conditions:
+%   * Attribution. You must attribute the work in the manner specified by the author or licensor 
+% (but not in any way that suggests that they endorse you or your use of the work).
+%   * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting 
+% work only under the same, similar or a compatible license.
+%   
+%   * For any reuse or distribution, you must make clear to others the license terms of this work. 
+% The best way to do this is with a link to this web page : http://creativecommons.org/licenses/by/3.0/
+%   * Any of the above conditions can be waived if you get permission from the copyright holder.
+%   * Nothing in this license impairs or restricts the author's moral rights.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% Revision 1.8  2004/06/03 09:56:11  diana
-% updated the front page
-%
-% Revision 1.7  2004/05/26 09:38:55  leanne
-% Removed DocumentLink in pdfinfo - it was causing errors
-%
-% Revision 1.6  2004/05/26 08:36:58  leanne
-% Updated IST number in template
-%
-% Revision 1.5  2004/05/24 13:25:04  diana
-% added template for egee latex documents
-%
-% Revision 1.4  2004/05/17 10:56:51  diana
-% added compat2 option to geometry and hypertex option to hyperref to get logo and links back on the page
-%
-% Revision 1.3  2004/02/18 18:08:48  leanne
-% Modified Document identifiers to mauch the EGEE Word templates
-%
-% Revision 1.2  2004/02/18 17:23:21  leanne
-% Changed Work Package to Activity. Included definition of Document Link.
-%
-% Revision 1.1.1.1  2004/02/18 11:17:44  leanne
-% Initial version of EGGE LaTeX Style files based on the EDG LaTeX Style
-%
-%
-% Revision 1.0 2004/02/17 leanne
-% Took the datagrid.cls file and modified it for the EGEE project
-% Original Authors:
-%  Frohner Akos <Akos.Frohner@cern.ch>
-%  Diana Bosio <diana.bosio@cern.ch>
-%  Paul Millar <paulm@physics.gla.ac.uk>
-%  Thanks are due to Norman Gray
-%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{egee}[2002/06/20 EGEE LaTeX Class]
-\typeout{EGEE LaTeX class -- 2002/06/13  Rock Lobster!}
+\ProvidesClass{emi}[2011/03/24 EMI LaTeX Class]
+\typeout{EMI LaTeX class -- 2011/03/24}
 %
-%% Notes: This class file tries, as largely as possible, to copy the Microsoft
-%% Word template document EDMS 2098656 v2.2.  Differences and notes are listed
-%% below:
-%%   o  The Word Template uses 11pt for the main body, but 12 point
-%%      occasionally. Any such occurrence of 12pt is mapped into 11pt in this
-%%      class-file.
-%%   o  This class inherits 11pt article. In that class Huge=30pt and
-%%      LARGE=22pt, which matches the required point-size for the title page.
-%%   o  The parskip in the Word doc is exactly 1.4mm (0.7mm above and below).
-%%      Here we've taken the liberty of adding some glue to make things fit
-%%      better.
-%%   o  The Word Template shows all the (sub)sections on the contents page in 
-%%      capitals and subsubsections in italics. The LateX class doesn't.
-
 %% Interface - example of an option, should we want to use these later.
 %\newif\ifmonotitle\monotitlefalse
 
 %%
 % From Template file
 \geometry{centering,includeheadfoot}
-% \geometry{a4paper,top=12.5mm,headheight=12.5mm,headsep=5mm,foot=\footsize,footskip=13.3mm,bottom=12.5mm}
-\geometry{a4paper,top=10.00mm,headheight=25.0mm,headsep=5mm,foot=\footsize,footskip=13.3mm,bottom=12.5mm}
+\geometry{a4paper,top=12.5mm,headheight=12.5mm,headsep=5mm,foot=\footsize,footskip=13.3mm,bottom=12.5mm}
 \geometry{right=25mm,left=25mm}
 
 
+
 % APM -- I don't think these are right, my impression is above is correct
 %\geometry{a4paper,margin=0.98in,headheight=0.72in}
 
   \def\@oddfoot{\vbox to \footsize {%
     {\color{blue}\hrule width \textwidth height 1pt depth 0pt}%
     \vfil
-    \small\hbox to \textwidth{\ISTNumber%
-                \hfil
-                \hbox{\@Copyright}%
-                \hfil
-                \hbox{\colorbox{yellow}{\MakeUppercase{\@Dissemination}}}%
+    %\small\hbox to \textwidth{\ISTNumber%
+    \small\hbox to \textwidth{%
+                %\hfil
+                %\hbox{\colorbox{yellow}{\MakeUppercase{\@Dissemination}}}%
                 \hfil
                 \hbox{\thepage/\pageref{LastPage}}}%
     }%
 
 \def\ps@title{%
   \@defaultfooter
-  \def\@oddhead{\hbox to \textwidth{\LargeEGEELogo\hfil\CESNETLogo\hfil\ISTLogo}}
+  \def\@oddhead{\hbox to \textwidth{\LargeEMILogo\hfil\LargeCESNETLogo}}
 }
 
 \def\ps@headings{%
 %\hrule width \textwidth height 1pt\relax
       \vbox to 0.75\headheight{%
         \hbox to \textwidth{%
-          \hbox to 0pt{\EGEELogo\hss}%
+          \hbox to 0pt{\EMILogo\hss}%
           \hfil
          \hbox to 8cm{%
            \vbox to 0.75\headheight{%
              \parbox{8cm}{%
                \centering\color{blue}%
                 \textbf{\MakeUppercase{\@title}}%
-\ifx\@Subtitle\@empty\else
-              \par\textbf{\scriptsize\@Subtitle}%
-\fi
+%\ifx\@Subtitle\@empty\else
+%              \par\textbf{\scriptsize\@Subtitle}%
+%\fi
  }%
              \vfil
            }%
         \DeclareGraphicsExtensions{.jpg,.pdf,.png}
         \pdfcompresslevel=9
 %      \pdfinfo{ /Title (\@DocumentLink) }
-       \pdfinfo{ /Title (EGEE) }
+       \pdfinfo{ /Title (EMI) }
 \else   
         \DeclareGraphicsExtensions{.eps}
 \fi
 \hbox{}% Force top of page
 \vfill
 {\centering
-        \Huge\bf\textsf{\textcolor{blue}{European Middleware Initiative}}\\[20mm]%
+        \Huge\bf\textsf{\textcolor{blue}{EMI}}\\[20mm]%
         \LARGE\sc\textsf{\bf \@title}\\[5mm]%
         \ifx\@Subtitle\@empty\else
             \normalsize\textsf{\@Subtitle}\\[10mm]%
             \LARGE\sc\textsf{\bf \@DeliverableId}\\[5mm]%
         \fi
 }%
-
 \vfill
-
-{%% \centering
 \hbox to \textwidth{
-%% \hbox{
-      %% \hfil
+      \hfil
       \vbox{
       {\color{blue}\hrule width \frontboxwidth height 1mm depth 0pt}
-      %% \hbox to \frontboxwidth{\sf
-      \hbox{ \sf
+      \hbox to \frontboxwidth{\sf
           \begin{tabularx}{\frontboxwidth}{l>{\raggedright\arraybackslash}X}
                 Document identifier: & \textbf{\@DocIdentifier}\\[3mm]
+                Document version: & \textbf{\@DocVersion}\\[3mm]
                 Date: & \textbf{\@Date}\\[3mm]
-                Activity:& \textbf{\@Activity}\\[3mm]
-                Lead Partner:& \textbf{\@LeadPartner}\\[3mm]
+                %Activity:& \textbf{\@Activity}\\[3mm]
+                       %                Lead Partner: & \textbf{\@LeadPartner}\\[3mm]
                 Document status: & \textbf{\@DocStatus}\\[3mm]
                 Document link:& \textbf{\@DocumentLink}\\[3mm]
           \end{tabularx}
       {\color{blue}\hrule width \frontboxwidth height 1mm depth 0pt}
      }
 }
-}%
 \vfill
 {\sf\underline{Abstract}: \@Abstract}
 \vfill
 
 
 %
-% EGEE style small-capital section titles.
+% EMI style small-capital section titles.
 %
 % The numbering is aligned with the WinWord style, 
 % although it is not common in the english typography...
 %
 \newcommand{\sectionbreak}{\newpage}
-\renewcommand{\thesection}{\arabic{section}.}
-\renewcommand{\thesubsection}{\thesection\arabic{subsection}.}
-\renewcommand{\thesubsubsection}{\thesubsection\arabic{subsubsection}.}
+%\renewcommand{\thesection}{\arabic{section}.}
+%\renewcommand{\thesubsection}{\thesection\arabic{subsection}.}
+%\renewcommand{\thesubsubsection}{\thesubsection\arabic{subsubsection}.}
 
 \renewcommand\section{\@startsection {section}{1}{\z@}%
                                    {-3.5ex \@plus -1ex \@minus -.2ex}%
 %
 % common constants
 %
-\def\ISTNumber{INFSO-RI-261611}
-\newsavebox{\@EGEELogo}
-\savebox{\@EGEELogo}{\includegraphics[height=0.75\headheight]{EMI_Logo_std.pdf}}
-\def\EGEELogo{\usebox{\@EGEELogo}}
-\def\LargeEGEELogo{\includegraphics[height=0.7\headheight]{EMI_Logo_std.pdf}}
-\def\ISTLogo{\includegraphics[height=0.6\headheight]{e-infra}}
-\def\gLiteLogo{\includegraphics[width=0.6\textwidth]{glite}}
-\def\CESNETLogo{\includegraphics[height=0.8\headheight]{cesnet}}
-
+\def\ISTNumber{INFSO-RI-508833}
+\newsavebox{\@EMILogo}
+\savebox{\@EMILogo}{\includegraphics[height=0.75\headheight]{EMI_Logo_std}}
+\def\EMILogo{\usebox{\@EMILogo}}
+\def\LargeEMILogo{\includegraphics[height=\headheight]{EMI_Logo_std}}
+\def\LargeCESNETLogo{\includegraphics[height=\headheight]{cesnet}}
+% DEL \def\ISTLogo{\includegraphics[height=\headheight]{isi}}
 
 %
 % parameters to be supplied by the author
 
 \def\DocIdentifier#1{\gdef\@DocIdentifier{#1}}
 \gdef\@DocIdentifier{\@latex@warning@no@line{No \noexpand\DocIdentifier given %
-        (e.g. EGEE-JRA1-TEC-edmsId-v0-1)}}
+        (e.g. EMI-NA2-TEC-edmsId-v0-1)}}
+        
+\def\DocVersion#1{\gdef\@DocVersion{#1}}
+\gdef\@DocVersion{\@latex@warning@no@line{No \noexpand\DocVersion given %
+        (e.g. 0.1.2)}}
 
 \def\Date#1{\gdef\@Date{#1}}
 \gdef\@Date{\@latex@warning@no@line{No \noexpand\Date given %
-        (e.g. 01/01/2004)}}
+        (e.g. 01/04/2010)}}
 
-\def\Activity#1{\gdef\@Activity{#1}}
-\gdef\@Activity{\@latex@warning@no@line{No \noexpand\Activity given %
-        (e.g. JRA1 Middleware Engineering and Integration )}}
+%\def\Activity#1{\gdef\@Activity{#1}}
+%\gdef\@Activity{\@latex@warning@no@line{No \noexpand\Activity given %
+%       (e.g. NA2 Dissemination and Outreach )}}
 
-\def\LeadPartner#1{\gdef\@LeadPartner{#1}}
-\gdef\@LeadPartner{\@latex@warning@no@line{No \noexpand\Lead Partner given %
-        (e.g. JRA1 Middleware Engineering and Integration )}}
+%\def\LeadPartner#1{\gdef\@LeadPartner{#1}}
+%\gdef\@LeadPartner{\@latex@warning@no@line{No \noexpand\LeadPartner given %
+%        (e.g. CERN, RAL )}}
 
 \def\DocStatus#1{\gdef\@DocStatus{#1}}
 \gdef\@DocStatus{\@latex@warning@no@line{No \noexpand\DocStatus given %
         (e.g. DRAFT, WORKING, DELIVERED)}}
 
-\def\Copyright#1{\gdef\@Copyright{#1}}
-\gdef\@Copyright{\@latex@warning@no@line{No \noexpand\Copyright given %
-        (e.g. PUBLIC, INTERNAL, ...)}}
-
-\def\Dissemination#1{\gdef\@Dissemination{#1}}
-\gdef\@Dissemination{\@latex@warning@no@line{No \noexpand\Dissemination given %
-        (e.g. PUBLIC, INTERNAL, ...)}}
+%\def\Dissemination#1{\gdef\@Dissemination{#1}}
+%\gdef\@Dissemination{\@latex@warning@no@line{No \noexpand\Dissemination given %
+%        (e.g. PUBLIC, INTERNAL, ...)}}
 
 \def\DocumentLink#1{\gdef\@DocumentLink{#1}}
 \gdef\@DocumentLink{\@latex@warning@no@line{No \noexpand\DocumentLink given %
-        (e.g. http://cern.ch)}}
+        (e.g. http://www.eu-emi.eu)}}
 
 \long\def\Abstract#1{\gdef\@Abstract{#1}}
 \gdef\@Abstract{\@latex@warning@no@line{No \noexpand\Abstract given}}
 \def\@part[#1]#2{%
     \ifnum \c@secnumdepth >\m@ne
       \refstepcounter{part}%
-      \addcontentsline{toc}{part}{\thepart\hspace{1em}\bf\uppercase{#1}}%
+      \addcontentsline{toc}{part}{\thepart\hspace{1em}\uppercase{#1}}%
     \else
-      \addcontentsline{toc}{part}{\parskip\bf\uppercase{#1}}%
+      \addcontentsline{toc}{part}{\uppercase{#1}}%
     \fi
     {\parindent \z@ \raggedright
      \interlinepenalty \@M
 %               if TITLE includes a \numberline command.
 %
 
-\def\l@part{\@dottedtocline{1}{-1em}{2.0em}}
+\def\l@part{\@dottedtocline{1}{4em}{2.0em}}
 \def\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
 \def\l@subsubsection{\@dottedtocline{3}{3.8em}{3.2em}}
 \def\l@paragraph{\@dottedtocline{4}{7.0em}{4.1em}}