diff --git a/Makefile b/Makefile index 21b3e63..d2c3015 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ package doc: # - tex (*.sty and *.cls, etc that LaTeX reads) # of the CTAN and TDS submissions SRCDIRS = -DOCDIRS = #eu/examples dfg/examples +DOCDIRS = eu/examples/strep dfg/examples/proposal DTXDIRS = base dfg eu # targets for CTAN. diff --git a/base/pdata.sty b/base/pdata.sty index c947e00..fb8f99c 100644 --- a/base/pdata.sty +++ b/base/pdata.sty @@ -7,7 +7,7 @@ %% proposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{pdata}[2015/11/20 v1.5 Project Data] +\ProvidesPackage{pdata}[2015/11/22 v1.5 Project Data] \RequirePackage{workaddress}[2011/05/03] \RequirePackage{eurosym} \newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax% diff --git a/base/proposal.cls b/base/proposal.cls index 9a65c59..94f2250 100644 --- a/base/proposal.cls +++ b/base/proposal.cls @@ -7,7 +7,7 @@ %% proposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{proposal}[2015/11/20 v1.5 Project Proposal] +\ProvidesClass{proposal}[2015/11/22 v1.5 Project Proposal] \newif\if@wpsubsection\@wpsubsectionfalse \newif\ifsubmit\submitfalse \newif\ifgrantagreement\grantagreementfalse diff --git a/base/proposal.dtx b/base/proposal.dtx index 1c08b66..ba30594 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{proposal}[2015/11/20 v1.5 Project Proposal] -%\ProvidesPackage{pdata}[2015/11/20 v1.5 Project Data] -%\ProvidesPackage{reporting}[2015/11/20 v1.5 Project Reporting] +%\ProvidesClass{proposal}[2015/11/22 v1.5 Project Proposal] +%\ProvidesPackage{pdata}[2015/11/22 v1.5 Project Data] +%\ProvidesPackage{reporting}[2015/11/22 v1.5 Project Reporting] %<*driver> \documentclass{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} @@ -35,6 +35,7 @@ breaklinks=true, bookmarksopen=true]{hyperref} \makeindex \def\subversion{\textsc{Subversion}\xspace} +\def\git{\textsc{Git}\xspace} \begin{document} \DocInput{proposal.dtx} \end{document} @@ -86,19 +87,38 @@ % % Writing grant proposals is a collaborative effort that requires the integration of % contributions from many individuals. The use of an ASCII-based format like {\LaTeX} -% allows to coordinate the process via a source code control system like -% \subversion, allowing the proposal writing team to concentrate on the contents -% rather than the mechanics of wrangling with text fragments and revisions. +% allows to coordinate the process via a source code control system like \git or +% \subversion, allowing the proposal writing team to concentrate on the contents rather +% than the mechanics of wrangling with text fragments and revisions. In fact the +% |proposal| package has evolved out of a series of collaborative proposal writing +% efforts, where large teams (up to 30 individuals from up to 20 sites) have written a +% 100-page proposal in three weeks (with over 2000 commits). Such collaborative writing +% sprints are impossible without a revision control system and a ``semantic'' document +% class that generates tables, charts, and deliverable lists from content markup and thus +% takes care of many of the routine tasks of keeping information consistent. % % The |proposal| class supports many of the generic elements of Grant Proposals. The % package documentation is still preliminary, fragmented and incomplete. % % The |proposal| class is distributed under the terms of the LaTeX Project Public License % from CTAN archives in directory |macros/latex/base/lppl.txt|. Either version 1.0 or, at -% your option, any later version. The CTAN archive always contains the latest stable -% version, the development version can be found on GitHub at -% \url{https://github.com/KWARC/LaTeX-proposal}. For bug reports please use the issue -% tracker there. +% your option, any later version. +% +% The CTAN archive always contains the latest stable version, the development version can +% be found on GitHub at \url{https://github.com/KWARC/LaTeX-proposal}. For bug reports +% please use the issue tracker there. Please feel free to fork the repository and provide +% extensions and improvements. +% +% The development version also contains example proposals and a very useful script that +% generates GitHub issues for all the workpackages, tasks, and deliverables. This is a +% great way of starting up a project and controlling its progress. The OpenDreamKit EU +% project (see \url{http://opendreamkit.org}) uses this for its (very public) project +% planning on the issue tracker at \url{https://github.com/OpenDreamKit} after (also +% publicly) developing the proposal on GitHub. +% +% Finally, the GitHub reposistory contains example project proposals and specialized +% Makefiles that help start off the proposal development process. These are not part of +% the CTAN/TeXLive distributions. % % \section{The User Interface}\label{sec:user-interface} % diff --git a/base/proposal.pdf b/base/proposal.pdf index 63fd3ee..9918ecf 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/base/reporting.cls b/base/reporting.cls index 28f381f..4ba4de4 100644 --- a/base/reporting.cls +++ b/base/reporting.cls @@ -7,7 +7,7 @@ %% proposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{reporting}[2015/11/20 v1.5 Project Reporting] +\ProvidesPackage{reporting}[2015/11/22 v1.5 Project Reporting] \newif\if@wpsubsection\@wpsubsectionfalse \newif\ifsubmit\submitfalse \newif\ifgrantagreement\grantagreementfalse diff --git a/dfg/dfgpdata.sty b/dfg/dfgpdata.sty index 1518547..214ef50 100644 --- a/dfg/dfgpdata.sty +++ b/dfg/dfgpdata.sty @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dfgpdata}[2015/11/20 v1.4 DFG Project Data] +\ProvidesPackage{dfgpdata}[2015/11/22 v1.4 DFG Project Data] \newif\ifdeutsch\deutschfalse \DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}} \ProcessOptions diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index affc2a0..01dbbf9 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{dfgproposal}[2015/11/20 v1.4 DFG Proposal] +\ProvidesClass{dfgproposal}[2015/11/22 v1.4 DFG Proposal] \newif\ifgeneral\generalfalse \DeclareOption{general}{\generaltrue} \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index caeec62..fb6bc4e 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{dfgproposal}[2015/11/20 v1.4 DFG Proposal] -%\ProvidesPackage{dfgpdata}[2015/11/20 v1.4 DFG Project Data] -%\ProvidesPackage{dfgreporting}[2015/11/20 v1.4 DFG Project Reporting] +%\ProvidesClass{dfgproposal}[2015/11/22 v1.4 DFG Proposal] +%\ProvidesPackage{dfgpdata}[2015/11/22 v1.4 DFG Project Data] +%\ProvidesPackage{dfgreporting}[2015/11/22 v1.4 DFG Project Reporting] %<*driver> \documentclass[twoside]{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index 128a1b8..e1ea14f 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls index 254204b..c0d17b3 100644 --- a/dfg/dfgreporting.cls +++ b/dfg/dfgreporting.cls @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dfgreporting}[2015/11/20 v1.4 DFG Project Reporting] +\ProvidesPackage{dfgreporting}[2015/11/22 v1.4 DFG Project Reporting] \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf index 3a21874..a3a8b53 100644 Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ diff --git a/eu/eupdata.sty b/eu/eupdata.sty index 5beaa53..a26e81b 100644 --- a/eu/eupdata.sty +++ b/eu/eupdata.sty @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{eupdata}[2015/11/20 v1.5 EU Project Data] +\ProvidesPackage{eupdata}[2015/11/22 v1.5 EU Project Data] \define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}} \define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#1}\pdata@def{prop}{gen}{coordinator}{#1}} \def\prop@gen@challenge{??}\def\prop@gen@challengeid{??} diff --git a/eu/euproposal.cls b/eu/euproposal.cls index 66b835c..93c3bb7 100644 --- a/eu/euproposal.cls +++ b/eu/euproposal.cls @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{euproposal}[2015/11/20 v1.5 EU Proposal] +\ProvidesClass{euproposal}[2015/11/22 v1.5 EU Proposal] \newif\ifpartB\partBfalse \DeclareOption{partB}{\partBtrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}} diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index 0b6a4b2..610e0a1 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{euproposal}[2015/11/20 v1.5 EU Proposal] -%\ProvidesPackage{eupdata}[2015/11/20 v1.5 EU Project Data] -%\ProvidesPackage{eureporting}[2015/11/20 v1.5 EU Project Reporting] +%\ProvidesClass{euproposal}[2015/11/22 v1.5 EU Proposal] +%\ProvidesPackage{eupdata}[2015/11/22 v1.5 EU Project Data] +%\ProvidesPackage{eureporting}[2015/11/22 v1.5 EU Project Reporting] %<*driver> \documentclass[twoside]{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index a7607cc..1db4fbe 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/eureporting.cls b/eu/eureporting.cls index 4dddb54..9195aec 100644 --- a/eu/eureporting.cls +++ b/eu/eureporting.cls @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{eureporting}[2015/11/20 v1.5 EU Project Reporting] +\ProvidesPackage{eureporting}[2015/11/22 v1.5 EU Project Reporting] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions \LoadClass[report,noRAM]{reporting}