updating examples to gitinfo2, testing and fixing bugs

dfg/examples/proposal/funds.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: funds.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/funds.tex $
 \section{Requested Modules/Funds \deu{(Beantragte Module/Mittel)}}
 
 For each applicant, we apply for funding within the Basic Module.

dfg/examples/proposal/preconditions.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: preconditions.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/preconditions.tex $
 \section{Project Requirements \deu{(Voraussetzungen f\"ur die Durchf\"uhrung des Vorhabens)}}
 
 \subsection{Employment status information \deu{(Angaben zur Dienststellung)}}

dfg/examples/proposal/proposal.tex

@@ -1,17 +1,11 @@
 % the document class specification for the proposal writing process, add the 'submit' option
 % for submitting (switches off various draft features); add the 'public' option to exclude
 % any private parts. 
-\documentclass[RAM]{dfgproposal}
+\documentclass[RAM,gitinfo]{dfgproposal}
 %\documentclass[submit]{dfgproposal}
 %\documentclass[submit,public]{dfgproposal}
 \addbibresource{../lib/dummy}
 \usepackage[utf8]{inputenc}
-
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: proposal.tex 22963 2012-01-13 08:47:33Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/proposal.tex $
-%
 \input{../lib/WApersons}
 
 

dfg/examples/proposal/state.tex

@@ -1,6 +1,3 @@
-\svnInfo $Id: state.tex 22814 2011-12-20 15:00:19Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/state.tex $
-
 \section{State of the Art and Preliminary Work \deu{(Stand der Forschung und eigene Vorarbeiten)}}\label{stand}
 
 \subsection{List of Project-Related Publications \deu{(Projektbezogenes Publikationsverzeichnis)}}

dfg/examples/proposal/workplan.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: workplan.tex 23021 2012-01-19 13:30:19Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/workplan.tex $
 \section{Objectives and Work Programme \deu{(Ziele und Arbeitsprogramm)}}
 
 \subsection{Anticipated total duration of the project \deu{(Voraussichtliche Gesamtdauer des Projekts)}}

dfg/examples/proposal/zusammenfassung.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: zusammenfassung.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/zusammenfassung.tex $
 \begin{Abriss}
 \begin{todo}{from the proposal template}
   Fassen Sie hier bitte die wesentlichen Ziele Ihres Vorhabens allgemeinverständlich und

dfg/examples/report/finalreport.tex

@@ -1,15 +1,10 @@
 % the document class specification for the proposal writing process, add the 'submit' option
 % for submitting (switches off various draft features); add the 'public' option to exclude
 % any private parts. 
-\documentclass{dfgreporting}
+\documentclass[gitinfo]{dfgreporting}
 %\documentclass[submit]{dfgproposal}
 %\documentclass[submit,public]{dfgproposal}
 \addbibresource{dummy}
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: finalreport.tex 24314 2013-03-24 14:39:33Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/report/finalreport.tex $
-%
 % define the proposal acronym; 
 % use \texorpdfstring so that it can be used in section headings as well
 % tell the class that this is the proposal acronym

dfg/examples/report/progressreport.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: progressreport.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/report/progressreport.tex $
 \section{Final Progress Report\deu{Arbeits- \& Ergebnisbericht}}
 \begin{todo}{from the report template}
 This is what the reviewers read  (maximum 10 pages of A4)

dfg/examples/report/progresssummary.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: progresssummary.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/report/progresssummary.tex $
 \section{Final Progress Report\deu{Arbeits- \& Ergebnisbericht}}
 \begin{todo}{from the report template}
   This is for the DFG web site and report, made available to the general public (maximum 1 page of A4)

dfg/examples/simple-proposal/preconditions.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: preconditions.tex 22679 2011-12-01 07:08:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/proposal/preconditions.tex $
 \section{Project Requirements \deu{(Voraussetzungen f\"ur die Durchf\"uhrung des Vorhabens)}}
 
 \subsection{Employment status information \deu{(Angaben zur Dienststellung)}}

dfg/examples/simple-proposal/workplan.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: workplan.tex 23021 2012-01-19 13:30:19Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/examples/simple-proposal/workplan.tex $
 \section{Objectives and Work Schedule \deu{(Ziele und Arbeitsprogramm)}}
 
 \subsection{Objectives}

eu/euproposal.cls

@@ -39,7 +39,12 @@
 \end{center}
 {\large\prop@gen@instrument}\\
 {\large\textbf{Date of Preparation: \today}}
-\ifsubmit\else\\{\large\textbf{Revision}: {\svnInfoRevision} of \svnInfoDate}\fi\\[1em]
+\ifsubmit\else\\
+{\large\textbf{Revision}:
+\if@svninfo\svnInfoRevision\fi\if@gitinfo\gitAbbrevHash\fi
+ of
+\if@svninfo\svnInfoDate\fi\if@gitinfo\gitAuthorDate\fi}
+\fi\\[1em]
 {\large}
 \begin{large}
  \begin{description}

eu/euproposal.dtx

@@ -28,7 +28,7 @@
 \RecordChanges
 \usepackage{textcomp,url,paralist,a4wide,xspace}
 \usepackage[show]{ed}
-\usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
+\usepackage[maxnames=6,hyperref=auto,style=alphabetic]{biblatex}
 \bibliography{kwarc}
 \usepackage[bookmarks=true,linkcolor=blue,
  citecolor=blue,urlcolor=blue,colorlinks=true,
@@ -277,7 +277,12 @@
 \end{center}
 {\large\prop@gen@instrument}\\
 {\large\textbf{Date of Preparation: \today}}
-\ifsubmit\else\\{\large\textbf{Revision}: {\svnInfoRevision} of \svnInfoDate}\fi\\[1em]
+\ifsubmit\else\\
+{\large\textbf{Revision}: 
+\if@svninfo\svnInfoRevision\fi\if@gitinfo\gitAbbrevHash\fi
+ of 
+\if@svninfo\svnInfoDate\fi\if@gitinfo\gitAuthorDate\fi}
+\fi\\[1em]
 {\large}
 \begin{large}
  \begin{description}

eu/examples/fetopenstrep/breakthrough.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: breakthrough.tex 21554 2011-04-30 05:53:27Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/breakthrough.tex $
 \section{Targeted breakthrough and long-term vision}\label{sec:objectives}
 \begin{todo}{from the proposal template}
   Describe the breakthrough(s) that you are targeting to achieve. What is the long-term

eu/examples/fetopenstrep/impact.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: impact.tex 22929 2012-01-08 09:25:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/impact.tex $
 \chapter{Impact}\label{chap:impact}
 \ednote{Maximum length for the whole of Section 3 –-- ten pages}
 \begin{todo}{from the proposal template}

eu/examples/fetopenstrep/implementation.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: implementation.tex 22870 2012-01-02 11:01:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/implementation.tex $
 \chapter{Implementation}\label{chap:implementation}
 
 \section{Management Structure and Procedures}\label{chap:management}

eu/examples/fetopenstrep/methodology.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: methodology.tex 22870 2012-01-02 11:01:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/methodology.tex $
 \section[S/T Methodology]{S/T Methodology\footnote{Note that, whereas the scientific and technological methodology is evaluated
 under the criteria ‘S/T quality’, the quality of the
 actual workplan is evaluated under FET-Open under the criteria ‘Implementation’.}}\label{sec:methodology}

eu/examples/fetopenstrep/novelty.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: novelty.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/novelty.tex $
 \section{Novelty and foundational character}\label{sec:progress}
 \begin{todo}{from the proposal template}
   Describe the state-of-the-art in the area(s) concerned, and the advance that the

eu/examples/fetopenstrep/propB.tex

@@ -1,19 +1,13 @@
 % the document class specification for the proposal writing process, add the 'submit' option
 % for submitting (switches off various draft features); add the 'public' option to exclude
 % any private parts. 
-\documentclass[noworkareas,deliverables]{euproposal}
+\documentclass[noworkareas,deliverables,gitinfo]{euproposal}
 %\documentclass[submit,noworkareas,deliverables]{euproposal}
 %\documentclass[submit,public,noworkareas,deliverables]{euproposal}
 %% TODO these don't work with WA (https://trac.kwarc.info/sTeX/ticket/1697)
 %\usepackage[T1]{fontenc}
 %\usepackage[utf8]{inputenc}
 \addbibresource{../lib/dummy}
-
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: propB.tex 24314 2013-03-24 14:39:33Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/propB.tex $
-%
 \input{../lib/WApersons}% Some sections of the included files depend on this.
 
 

eu/examples/fetopenstrep/quality.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: quality.tex 22870 2012-01-02 11:01:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/quality.tex $
 \chapter{Scientific and Technical Quality}\label{chap:quality}
 \begin{todo}{from the proposal template}
   Maximum length for the whole of Section 1 –-- twenty pages, not including the tables in

eu/examples/fetopenstrep/workplan.tex

@@ -1,6 +1,3 @@
-\svnInfo $Id: workplan.tex 22929 2012-01-08 09:25:45Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/fetopenstrep/workplan.tex $
-
 \begin{todo}{from the proposal template}
 \begin{enumerate}
 \item Describe the overall strategy of the work plan\ednote{Maximum length – one page}

eu/examples/strep/deliverables.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: deliverables.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/deliverables.tex $
 \subsection{List of Deliverables}\label{sec:deliverables}
 
 \begin{todo}{from the proposal template}

eu/examples/strep/impact.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: impact.tex 22965 2012-01-13 14:29:23Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/impact.tex $
 \chapter{Impact}\label{chap:impact}
 \ednote{Maximum length for the whole of Section 3 –-- ten pages}
 

eu/examples/strep/implementation.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: implementation.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/implementation.tex $
 \chapter{Implementation}\label{chap:implementation}
 
 \section{Management Structure and Procedures}\label{chap:management}

eu/examples/strep/issues.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: issues.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/issues.tex $
 \chapter{Ethical Issues}\label{chap:ethical}
 \begin{todo}{from the proposal template}
   Describe any ethical issues that may arise in the project. In particular, you should

eu/examples/strep/methodology.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: methodology.tex 22975 2012-01-14 19:43:38Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/methodology.tex $
 \section{Scientific/Technical Methodology and Work Plan}\label{sec:methodology}
 \begin{todo}{from the proposal template}
   A detailed work plan should be presented, broken down into work packages\footnote{A work

eu/examples/strep/milestones.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: milestones.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/milestones.tex $
 \subsection{List of Milestones}\label{sec:milestones}
 
 \begin{todo}{from the proposal template}

eu/examples/strep/objectives.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: objectives.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/objectives.tex $
 \section{Concept and Objectives}\label{sec:objectives}
 \begin{todo}{from the proposal template}
   Explain the concept of your project. What are the main ideas that led you to propose

eu/examples/strep/progress.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: progress.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/progress.tex $
 \section{Progress beyond the State-of-the-Art}\label{sec:progress}
 \begin{todo}{from the proposal template}
  Describe the state-of-the-art in the area concerned, and the advance that the proposed

eu/examples/strep/propB.tex

@@ -1,19 +1,13 @@
 % the document class specification for the proposal writing process, add the 'submit' option
 % for submitting (switches off various draft features); add the 'public' option to exclude
 % any private parts. 
-\documentclass[noworkareas,deliverables]{euproposal}
+\documentclass[noworkareas,deliverables,gitinfo]{euproposal}
 %\documentclass[submit,noworkareas,deliverables]{euproposal}
 %\documentclass[submit,public,noworkareas,deliverables]{euproposal}
 %% TODO these don't work with WA (https://trac.kwarc.info/sTeX/ticket/1697)
 %\usepackage[T1]{fontenc}
 %\usepackage[utf8]{inputenc}
 \addbibresource{../lib/dummy}
-
-% the following lines get updated by subversion keyword replacement. They are used by the 
-% \svninfo package in draft mode to generate metadata. 
-\svnInfo $Id: propB.tex 24314 2013-03-24 14:39:33Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/propB.tex $
-%
 \input{../lib/WApersons}% Some sections of the included files depend on this.
 
 

eu/examples/strep/quality.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: quality.tex 22870 2012-01-02 11:01:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/quality.tex $
 \chapter{Scientific and Technical Quality}\label{chap:quality}
 \begin{todo}{from the proposal template}
   Maximum length for the whole of Section 1 –-- twenty pages, not including the tables in

eu/examples/strep/risks.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: risks.tex 21553 2011-04-30 05:50:58Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/risks.tex $
 \subsection{Significant Risks and Associated Contingency Plans}\label{sec:risks}
 \begin{todo}{from the proposal template}
   Describe any significant risks, and associated contingency plans

eu/examples/strep/site-bar.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: site-bar.tex 21648 2011-05-09 06:47:12Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/site-bar.tex $
 \begin{sitedescription}{bar}
 
 \paragraph{Organization}

eu/examples/strep/site-baz.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: site-baz.tex 21648 2011-05-09 06:47:12Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/site-baz.tex $
 \begin{sitedescription}{baz}
 \paragraph{Organization}
 \paragraph{Main tasks}

eu/examples/strep/site-efo.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: site-efo.tex 21648 2011-05-09 06:47:12Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/site-efo.tex $
 \begin{sitedescription}{efo}
 \paragraph{Organization}
  The EFO is the world leader in futurology, \ldots

eu/examples/strep/site-jacu.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: site-jacu.tex 22989 2012-01-15 18:40:10Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/site-jacu.tex $
 \begin{sitedescription}{jacu}
 
 \paragraph{Organization} Jacobs University Bremen is a private research university patterned

eu/examples/strep/site-templatex.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: site-jacu.tex 6306 2011-11-04 05:13:42Z kohlhase $
-\svnKeyword $HeadURL: https://svn.mathweb.org/repos/mathweb.org/projects/simsalabim/site-jacu.tex $
 \begin{sitedescription}{???}
 
 \paragraph{Organization:}

eu/examples/strep/workplan.tex

@@ -1,6 +1,3 @@
-\svnInfo $Id: workplan.tex 22989 2012-01-15 18:40:10Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/workplan.tex $
-
 \begin{todo}{from the proposal template}
 \begin{enumerate}
 \item Describe the overall strategy of the work plan\ednote{Maximum length – one page}

eu/examples/strep/wp-class.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: wp-class.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/wp-class.tex $
 \begin{workpackage}[id=class,type=RTD,lead=jacu,
                     wphases=3-9!1,
                     title=A {\LaTeX} class for EU Proposals,short=Class,

eu/examples/strep/wp-dissem.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: wp-dissem.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/wp-dissem.tex $
 \begin{workpackage}%
 [id=dissem,type=RTD,lead=efo,
  wphases=10-24!1,

eu/examples/strep/wp-management.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: wp-management.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/wp-management.tex $
 \begin{workpackage}[id=management,type=MGT,wphases=0-24!.2,
   title=Project Management,short=Management,
   jacuRM=2,barRM=2,efoRM=2,bazRM=2]

eu/examples/strep/wp-temple.tex

@@ -1,5 +1,3 @@
-\svnInfo $Id: wp-temple.tex 24014 2013-01-01 15:12:26Z kohlhase $
-\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/examples/strep/wp-temple.tex $
 \begin{workpackage}[id=temple,type=DEM,lead=bar,
   wphases=6-12!1,
   title={\pn} Proposal Template,short=Template,barRM=6,bazRM=6]