merge
This commit is contained in:
commit
0b50e941a8
144
README.md
144
README.md
@ -1,4 +1,4 @@
|
||||
# LaTeX-proposal: A set of LaTeX classes for preparing proposals
|
||||
# LaTeX-proposal: A set of LaTeX classes for preparing proposals
|
||||
|
||||
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
|
||||
@ -6,7 +6,7 @@ coordinate the process via a source code control system like Git or Subversion,
|
||||
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
|
||||
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
|
||||
@ -14,15 +14,15 @@ keeping information consistent.
|
||||
|
||||
## Using the LaTeX Proposal Class
|
||||
|
||||
In the simplest case, just clone the repository, and extend your `TEXINPUTS`
|
||||
In the simplest case, just clone the repository, and extend your `TEXINPUTS`
|
||||
environment variable so that it can find it. On a UNIX system something like the following
|
||||
should work.
|
||||
should work.
|
||||
```
|
||||
cd /path/to/your/project
|
||||
cd /path/to/project
|
||||
git clone https://github.com/KWARC/LaTeX-proposal
|
||||
echo 'export TEXINPUTS = "$(TEXINPUTS):/path/to/your/project/LaTeX-proposal//:"' >> ~/.bashrc
|
||||
echo 'export TEXINPUTS = "$(TEXINPUTS):/path/to/project/LaTeX-proposal//:"' >> ~/.bashrc
|
||||
```
|
||||
Of course you will have to replace `/path/to/your/project` with a path appropriate to
|
||||
Of course you will have to replace `/path/to/project` with a path appropriate to
|
||||
your system. A simple `git pull` will update you to the newest version.
|
||||
|
||||
## Getting Started with a New Proposal
|
||||
@ -34,16 +34,14 @@ the three variables in the upper section of the `Makefile` accordingly, if you w
|
||||
a revision control system for a larger group, read (far) below.
|
||||
|
||||
Here is what you would do on a UNIX system after the initial steps above to prepare a DFG
|
||||
proposal (or an EU proposal the same setup works as well, but with suitably adapted
|
||||
proposal (for an EU proposal the same setup works as well, but with suitably adapted
|
||||
paths).
|
||||
```
|
||||
cp examples/dfg/proposal .
|
||||
sed -i .bak s/PROP.dir = ..\/..\/..\//Prop.dir = ./ proposal/Makefile
|
||||
sed -i .bak s/BIB = ..\/lib/BIB = ./ proposal/Makefile
|
||||
|
||||
sed -i .bak s/PROP.dir = ..\/..\/..\//Prop.dir = ./ proposal/Makefile
|
||||
sed -i .bak s/BIB = ..\/lib/BIB = ./ proposal/Makefile
|
||||
```
|
||||
|
||||
|
||||
## Disclaimer
|
||||
|
||||
The LaTeX proposal class has been developed to "scratch my own itch" over many proposals
|
||||
@ -56,14 +54,14 @@ me and saves me (and my friends who use it) a lot of work.
|
||||
## License
|
||||
|
||||
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
|
||||
CTAN archives, see the file `macros/latex/base/lppl.txt` at CTAN, either version 1.0 or, at your
|
||||
option, any later version.
|
||||
|
||||
## Help wanted; submit issues, feature requests, & pull requests
|
||||
## Help wanted: submit issues, feature requests, pull requests
|
||||
|
||||
As this is just a side project for me, please submit issues and feature requests to the
|
||||
[issue tracker](issues). Even better, improve the code and submit a
|
||||
[pull request](https://help.github.com/articles/about-pull-requests/)
|
||||
[pull request](https://help.github.com/articles/about-pull-requests/).
|
||||
|
||||
## Repository Layout
|
||||
|
||||
@ -77,10 +75,10 @@ specialized to particular funding bodies that have their own styles.
|
||||
* `examples`: example proposal (stubs).
|
||||
* `etc`: style files from the sTeX bundle added for convenience (only on GitHub, not on CTAN)
|
||||
* `lib`: Makefiles for the management of self-documenting packages
|
||||
* `bin`: utilities, e.g. a script that makes GitHub issues from the deliverables of a proposal for project managment if the proposal is granted.
|
||||
* `bin`: utilities, e.g. a script that makes GitHub issues from the deliverables of a proposal for project management if the proposal is granted.
|
||||
|
||||
|
||||
# Using this repo in a paper repository
|
||||
## Using this repo in a paper repository
|
||||
|
||||
The best way to write a collaborative proposal is to use a revision control system. It is
|
||||
usually a good idea to make this repository into an external sub-repository that can be
|
||||
@ -88,59 +86,111 @@ updated as necessary. In the instructions below we assume that you - as the pape
|
||||
maintainer - want to add the proposal classes as a sub-repository at path
|
||||
`lib/LaTeX-proposal` from the top of the paper repository.
|
||||
|
||||
## The best way for GIT
|
||||
### The best way for Git
|
||||
|
||||
is via the `git-subrepo` extension of `git`. Unfortunately this is not part of git
|
||||
is via the `git-subrepo` extension of `git`. Unfortunately this is not part of Git
|
||||
(yet). So you as the paper repos maintainer have to
|
||||
[install it first](https://github.com/git-commands/git-subrepo#readme) if you want to
|
||||
install the proposal classes as a subrepos. Your users do not, they will get the subrepos
|
||||
automatically on `git clone` or `git pull`.
|
||||
|
||||
1. go to the top of your paper prehistory: `cd path/to/top` (you can only make a
|
||||
"subrepo" from there)
|
||||
2. add the LaTeX-proposal distribution repos as a "subrepo": `git subrepo clone git@github.com:KWARC/LaTeX-proposal.git LaTeX-proposal`
|
||||
1. go to the top of your paper prehistory:
|
||||
```
|
||||
cd /path/to/top
|
||||
```
|
||||
(you can only make a"subrepo" from there)
|
||||
2. add the LaTeX-proposal distribution repos as a "subrepo":
|
||||
```
|
||||
git subrepo clone git@github.com:KWARC/LaTeX-proposal.git LaTeX-proposal
|
||||
```
|
||||
|
||||
Note that under `git-subrepo` the "external" is not updated automatically, a
|
||||
maintainer has to "pull" it. This can be seen as a feature and not a bug (there is less of
|
||||
a chance to break things).
|
||||
|
||||
1. go to the top of your paper repository: `cd path/to/top` (you can only pull from there)
|
||||
2. pull the proposal classes repos as a "subrepo": `git subrepo pull LaTeX-proposal`
|
||||
1. go to the top of your paper repository:
|
||||
```
|
||||
cd /path/to/top
|
||||
```
|
||||
(you can only pull from there)
|
||||
2. pull the proposal classes repos as a "subrepo":
|
||||
```
|
||||
git subrepo pull LaTeX-proposal
|
||||
```
|
||||
|
||||
To contribute changes back to the the LaTeX-proposal repository, you analogously do
|
||||
To contribute changes back to the the LaTeX-proposal repository, you analogously do
|
||||
|
||||
1. go to the top of your paper prehistory: `cd path/to/top` (you can only push from there)
|
||||
2. do the push: `git subrepo push LaTeX-proposal`
|
||||
1. go to the top of your paper prehistory:
|
||||
```
|
||||
cd /path/to/top
|
||||
```
|
||||
(you can only push from there)
|
||||
2. do the push:
|
||||
```
|
||||
git subrepo push LaTeX-proposal
|
||||
```
|
||||
|
||||
easypeasy!
|
||||
Easypeasy!
|
||||
|
||||
### The second best way for Git
|
||||
|
||||
## The second best way for GIT
|
||||
is via `git subtree`.
|
||||
|
||||
1. go to the top of your paper repository: `cd path/to/top`
|
||||
2. add the LaTeX-proposal repos as a remote: `git remote add LaTeX-proposal
|
||||
git@github.com:KWARC/LaTeX-proposal.git` under the name `LaTex-proposal`.
|
||||
3. add the remote `LaTeX-proposal` as a subtree: `git subtree add --prefix=LaTeX-proposal LaTeX-proposal master --squash`
|
||||
(here under the path `LaTeX-proposal`). The `--squash` reduces history noise.
|
||||
1. go to the top of your paper repository:
|
||||
```
|
||||
cd /path/to/top
|
||||
```
|
||||
2. add the LaTeX-proposal repos as a remote:
|
||||
```
|
||||
git remote add LaTeX-proposal git@github.com:KWARC/LaTeX-proposal.git
|
||||
```
|
||||
under the name `LaTex-proposal`.
|
||||
3. add the remote `LaTeX-proposal` as a subtree:
|
||||
```
|
||||
git subtree add --prefix=LaTeX-proposal LaTeX-proposal master --squash
|
||||
```
|
||||
(here under the path `LaTeX-proposal`). The `--squash` reduces history noise.
|
||||
|
||||
When you want to update the subrepository to the newest version, you have to "subtree
|
||||
pull" as above:
|
||||
pull" as below:
|
||||
|
||||
1. go to the top of your paper repository: `cd path/to/top`
|
||||
2. subtree-pull: `git subtree pull --prefix=LaTeX-proposal LaTeX-proposal master --squash`
|
||||
this is a bit inconvenient, but works well.
|
||||
1. go to the top of your paper repository:
|
||||
```
|
||||
cd /path/to/top
|
||||
```
|
||||
2. subtree-pull:
|
||||
```
|
||||
git subtree pull --prefix=LaTeX-proposal LaTeX-proposal master --squash
|
||||
```
|
||||
|
||||
Contributing back to the LaTeX-proposal repository is somewhat more complex; RTFM!
|
||||
This is a bit inconvenient, but works well.
|
||||
|
||||
## Externals in SVN
|
||||
In a subversion repository you can must make an external by
|
||||
Contributing back to the LaTeX-proposal repository is somewhat more complex; RTFM!
|
||||
|
||||
1. go to the top of your paper prehistory: `cd path/to/top`
|
||||
2. make the `lib` subdir if necessary: `mkdir lib`
|
||||
3. add the external: `svn propedit svn:externals lib`
|
||||
4. an editor will appear, add the line `LaTeX-proposal LaTeX-proposal https://github.com/KWARC/LaTeX-proposal/trunk`
|
||||
5. commit your work: `svn commit -m'adding external for the LaTeX-proposal '`
|
||||
### Externals in SVN
|
||||
|
||||
In a Subversion repository you must make an external by
|
||||
|
||||
1. go to the top of your paper prehistory:
|
||||
```
|
||||
cd /path/to/top
|
||||
```
|
||||
2. make the `lib` subdir if necessary:
|
||||
```
|
||||
mkdir lib
|
||||
```
|
||||
3. add the external:
|
||||
```
|
||||
svn propedit svn:externals lib
|
||||
```
|
||||
4. an editor will appear, add the line
|
||||
```
|
||||
LaTeX-proposal LaTeX-proposal https://github.com/KWARC/LaTeX-proposal/trunk
|
||||
```
|
||||
5. commit your work:
|
||||
```
|
||||
svn commit -m 'adding external for the LaTeX-proposal'
|
||||
```
|
||||
|
||||
Note that in SVN any `svn update`@ will update the LaTeX-proposal repository in the
|
||||
external as well.
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
%% proposal.dtx (with options: `pdata')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesPackage{pdata}[2019/03/21 v1.6 Project Data]
|
||||
\ProvidesPackage{pdata}[2020/08/21 v1.7 Project Data]
|
||||
\RequirePackage{eurosym}
|
||||
\newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax%
|
||||
\newcounter{@site}%
|
||||
|
@ -7,7 +7,7 @@
|
||||
%% proposal.dtx (with options: `cls')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesClass{proposal}[2019/03/21 v1.6 Project Proposal]
|
||||
\ProvidesClass{proposal}[2020/08/21 v1.7 Project Proposal]
|
||||
\newif\if@wpsubsection\@wpsubsectionfalse
|
||||
\newif\ifsubmit\submitfalse
|
||||
\newif\ifgrantagreement\grantagreementfalse
|
||||
|
@ -13,10 +13,10 @@
|
||||
%
|
||||
% \iffalse
|
||||
%<cls|sty|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
%<cls>\ProvidesClass{proposal}[2019/03/21 v1.6 Project Proposal]
|
||||
%<sty>\ProvidesPackage{proposal}[2019/03/21 v1.6 Project Proposal]
|
||||
%<pdata>\ProvidesPackage{pdata}[2019/03/21 v1.6 Project Data]
|
||||
%<reporting>\ProvidesPackage{reporting}[2019/03/21 v1.6 Project Reporting]
|
||||
%<cls>\ProvidesClass{proposal}[2020/08/21 v1.7 Project Proposal]
|
||||
%<sty>\ProvidesPackage{proposal}[2020/08/21 v1.7 Project Proposal]
|
||||
%<pdata>\ProvidesPackage{pdata}[2020/08/21 v1.7 Project Data]
|
||||
%<reporting>\ProvidesPackage{reporting}[2020/08/21 v1.7 Project Reporting]
|
||||
%<*driver>
|
||||
\documentclass{ltxdoc}
|
||||
\DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
|
||||
@ -70,6 +70,7 @@
|
||||
% \changes{v1.5}{2014/01/14}{many layout tweaks support for CVs, milestones in gantt}
|
||||
% \changes{v1.6}{2016/10/26}{splitting off proposal.sty so that documentation becomes easier}
|
||||
% \changes{v1.6}{2017/02/01}{adding site RM/RAM to tasks for fine-grained effort specification}
|
||||
% \changes{v1.7}{2020/08/21}{removing dependency on workaddress}
|
||||
%
|
||||
% \GetFileInfo{proposal.cls}
|
||||
%
|
||||
|
Binary file not shown.
@ -7,7 +7,7 @@
|
||||
%% proposal.dtx (with options: `sty')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesPackage{proposal}[2019/03/21 v1.6 Project Proposal]
|
||||
\ProvidesPackage{proposal}[2020/08/21 v1.7 Project Proposal]
|
||||
\RequirePackage{amssymb}
|
||||
\RequirePackage{wasysym}
|
||||
\RequirePackage{url}
|
||||
|
@ -7,7 +7,7 @@
|
||||
%% proposal.dtx (with options: `reporting')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesPackage{reporting}[2019/03/21 v1.6 Project Reporting]
|
||||
\ProvidesPackage{reporting}[2020/08/21 v1.7 Project Reporting]
|
||||
\newif\if@wpsubsection\@wpsubsectionfalse
|
||||
\newif\ifsubmit\submitfalse
|
||||
\newif\ifgrantagreement\grantagreementfalse
|
||||
|
@ -7,7 +7,7 @@
|
||||
%% dfgproposal.dtx (with options: `pdata')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesPackage{dfgpdata}[2019/03/21 v1.4 DFG Project Data]
|
||||
\ProvidesPackage{dfgpdata}[2020/08/21 v1.5 DFG Project Data]
|
||||
\newif\ifdeutsch\deutschfalse
|
||||
\DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}}
|
||||
\ProcessOptions
|
||||
|
@ -7,7 +7,7 @@
|
||||
%% dfgproposal.dtx (with options: `cls')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesClass{dfgproposal}[2019/03/21 v1.4 DFG Proposal]
|
||||
\ProvidesClass{dfgproposal}[2020/08/21 v1.5 DFG Proposal]
|
||||
\newif\ifgeneral\generalfalse
|
||||
\DeclareOption{general}{\generaltrue}
|
||||
\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
|
||||
|
@ -13,9 +13,9 @@
|
||||
%
|
||||
% \iffalse
|
||||
%<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
%<cls>\ProvidesClass{dfgproposal}[2019/03/21 v1.4 DFG Proposal]
|
||||
%<pdata>\ProvidesPackage{dfgpdata}[2019/03/21 v1.4 DFG Project Data]
|
||||
%<reporting>\ProvidesPackage{dfgreporting}[2019/03/21 v1.4 DFG Project Reporting]
|
||||
%<cls>\ProvidesClass{dfgproposal}[2020/08/21 v1.5 DFG Proposal]
|
||||
%<pdata>\ProvidesPackage{dfgpdata}[2020/08/21 v1.5 DFG Project Data]
|
||||
%<reporting>\ProvidesPackage{dfgreporting}[2020/08/21 v1.5 DFG Project Reporting]
|
||||
%<*driver>
|
||||
\documentclass[twoside]{ltxdoc}
|
||||
\DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
|
||||
@ -43,6 +43,7 @@
|
||||
%
|
||||
%\iffalse\CheckSum{629}\fi
|
||||
%
|
||||
% \changes{v1.5}{2020/08/21}{removing dependency on workaddress}
|
||||
% \changes{v1.1}{2011/03/18}{separating out from new proposal class}
|
||||
% \changes{v1.1}{2011/12/09}{various tweaks and corrections}
|
||||
%
|
||||
|
@ -7,7 +7,7 @@
|
||||
%% dfgproposal.dtx (with options: `reporting')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesPackage{dfgreporting}[2019/03/21 v1.4 DFG Project Reporting]
|
||||
\ProvidesPackage{dfgreporting}[2020/08/21 v1.5 DFG Project Reporting]
|
||||
\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
|
||||
\PassOptionsToClass{11pt}{article}
|
||||
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
|
||||
|
@ -7,7 +7,7 @@
|
||||
%% euproposal.dtx (with options: `pdata')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesPackage{eupdata}[2019/03/21 v1.5 EU Project Data]
|
||||
\ProvidesPackage{eupdata}[2020/08/21 v1.7 EU Project Data]
|
||||
\define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
|
||||
\define@key{prop@gen}{Csite}{\def\prop@gen@Csite{#1}\pdata@def{prop}{gen}{Csite}{#1}}
|
||||
\define@key{prop@gen}{Cemail}{\def\prop@gen@Cemail{#1}\pdata@def{prop}{gen}{Cemail}{#1}}
|
||||
|
@ -7,7 +7,7 @@
|
||||
%% euproposal.dtx (with options: `cls')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesClass{euproposal}[2019/03/21 v1.5 EU Proposal]
|
||||
\ProvidesClass{euproposal}[2020/08/21 v1.7 EU Proposal]
|
||||
\newif\ifpartB\partBfalse
|
||||
\DeclareOption{partB}{\partBtrue}
|
||||
\newif\if@split\@splitfalse
|
||||
@ -32,10 +32,10 @@
|
||||
\fi% ifpartB
|
||||
\newcommand\prop@sites@table{\def\@@table{}
|
||||
{\let\tabularnewline\relax\let\hline\relax
|
||||
\@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref{site}\@I{number}}
|
||||
\xdef\@@table{\@@table&\pdataref{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
|
||||
\xdef\@@table{\@@table&\pdataref{site}\@I{acronym}}
|
||||
\xdef\@@table{\@@table&\pdataref{site}\@I{countryshort}\tabularnewline\hline}}}
|
||||
\@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref@safe{site}\@I{number}}
|
||||
\xdef\@@table{\@@table&\pdataref@safe{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
|
||||
\xdef\@@table{\@@table&\pdataref@safe{site}\@I{acronym}}
|
||||
\xdef\@@table{\@@table&\pdataref@safe{site}\@I{countryshort}\tabularnewline\hline}}}
|
||||
\begin{tabular}{|l|p{8cm}|l|l|}\hline%|
|
||||
\# & Participant organisation name & Short name & Country\\\hline\hline
|
||||
\@@table
|
||||
@ -69,7 +69,7 @@
|
||||
\begin{center}
|
||||
\prop@sites@table\vfill
|
||||
\@ifundefined{prop@gen@iconrowheight}{}
|
||||
{\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref{site}\@site{logo}}\qquad}}
|
||||
{\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref@safe{site}\@site{logo}}\qquad}}
|
||||
\end{center}
|
||||
\newpage
|
||||
\fi% ifgrantagreement
|
||||
@ -104,14 +104,14 @@
|
||||
\ifx\@site@desc@logo\@true% if we want a logo
|
||||
\includegraphics[height=\site@desc@width]{#2}\\[1ex]%
|
||||
\fi% end logo
|
||||
\textbf{\pdataref{site}{#2}{type}.\hfill \pdataref{site}{#2}{country}}\\%
|
||||
\small\pdataref{site}{#2}{streetaddress}, \pdataref{site}{#2}{townzip}\\\hline%
|
||||
\textbf{\pdataref@safe{site}{#2}{type}.\hfill \pdataref@safe{site}{#2}{country}}\\%
|
||||
\small\pdataref@safe{site}{#2}{streetaddress}, \pdataref@safe{site}{#2}{townzip}\\\hline%
|
||||
\end{tabular}\vspace{-2.5ex}%
|
||||
\end{wrapfigure}%
|
||||
\fi% end box
|
||||
\pdata@target{site}{#2}%
|
||||
{\subsubsection{\pdataref{site}{#2}{acronym}: % space here
|
||||
{\textsc{\pdataref{site}{#2}{shortname}} (\pdataref{site}{#2}{countryshort})}}}%
|
||||
{\subsubsection{\pdataref@safe{site}{#2}{acronym}: % space here
|
||||
{\textsc{\pdataref@safe{site}{#2}{shortname}} (\pdataref@safe{site}{#2}{countryshort})}}}%
|
||||
\small%
|
||||
\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
|
||||
{0.25ex \@plus1ex \@minus.2ex}%
|
||||
|
@ -13,9 +13,9 @@
|
||||
%
|
||||
% \iffalse
|
||||
%<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
%<cls>\ProvidesClass{euproposal}[2019/03/21 v1.5 EU Proposal]
|
||||
%<pdata>\ProvidesPackage{eupdata}[2019/03/21 v1.5 EU Project Data]
|
||||
%<reporting>\ProvidesPackage{eureporting}[2019/03/21 v1.5 EU Project Reporting]
|
||||
%<cls>\ProvidesClass{euproposal}[2020/08/21 v1.7 EU Proposal]
|
||||
%<pdata>\ProvidesPackage{eupdata}[2020/08/21 v1.7 EU Project Data]
|
||||
%<reporting>\ProvidesPackage{eureporting}[2020/08/21 v1.7 EU Project Reporting]
|
||||
%<*driver>
|
||||
\documentclass[twoside]{ltxdoc}
|
||||
\DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
|
||||
@ -49,8 +49,8 @@
|
||||
% \changes{v0.3a}{2008/01/18}{error corrections and more documentation}
|
||||
% \changes{v1.3}{2011/05/18}{basing this on proposal.cls}
|
||||
% \changes{v1.4}{2012/01/18}{various tweaks for the Jan 2012 proposal deadline}
|
||||
% \changes{v1.4}{2015/01/14}{lots of tweaks}
|
||||
%
|
||||
% \changes{v1.4}{2015/01/14}{lots of tweaks}%
|
||||
% \changes{v1.5}{2020/08/21}{removing dependency on workaddress}
|
||||
% \GetFileInfo{euproposal.cls}
|
||||
%
|
||||
% \MakeShortVerb{\|}
|
||||
@ -342,10 +342,10 @@
|
||||
% \begin{macrocode}
|
||||
\newcommand\prop@sites@table{\def\@@table{}
|
||||
{\let\tabularnewline\relax\let\hline\relax
|
||||
\@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref{site}\@I{number}}
|
||||
\xdef\@@table{\@@table&\pdataref{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
|
||||
\xdef\@@table{\@@table&\pdataref{site}\@I{acronym}}
|
||||
\xdef\@@table{\@@table&\pdataref{site}\@I{countryshort}\tabularnewline\hline}}}
|
||||
\@for\@I:=\prop@gen@sites\do{\xdef\@@table{\@@table\pdataref@safe{site}\@I{number}}
|
||||
\xdef\@@table{\@@table&\pdataref@safe{site}\@I{shortname}\ifx\@I\prop@gen@coordinatorsite (coordinator)\fi}
|
||||
\xdef\@@table{\@@table&\pdataref@safe{site}\@I{acronym}}
|
||||
\xdef\@@table{\@@table&\pdataref@safe{site}\@I{countryshort}\tabularnewline\hline}}}
|
||||
\begin{tabular}{|l|p{8cm}|l|l|}\hline%|
|
||||
\# & Participant organisation name & Short name & Country\\\hline\hline
|
||||
\@@table
|
||||
@ -391,7 +391,7 @@
|
||||
\begin{center}
|
||||
\prop@sites@table\vfill
|
||||
\@ifundefined{prop@gen@iconrowheight}{}
|
||||
{\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref{site}\@site{logo}}\qquad}}
|
||||
{\@for\@site:=\prop@gen@sites\do{\includegraphics[height=\prop@gen@iconrowheight]{\pdataref@safe{site}\@site{logo}}\qquad}}
|
||||
\end{center}
|
||||
\newpage
|
||||
\fi% ifgrantagreement
|
||||
@ -442,14 +442,14 @@
|
||||
\ifx\@site@desc@logo\@true% if we want a logo
|
||||
\includegraphics[height=\site@desc@width]{#2}\\[1ex]%
|
||||
\fi% end logo
|
||||
\textbf{\pdataref{site}{#2}{type}.\hfill \pdataref{site}{#2}{country}}\\%
|
||||
\small\pdataref{site}{#2}{streetaddress}, \pdataref{site}{#2}{townzip}\\\hline%
|
||||
\textbf{\pdataref@safe{site}{#2}{type}.\hfill \pdataref@safe{site}{#2}{country}}\\%
|
||||
\small\pdataref@safe{site}{#2}{streetaddress}, \pdataref@safe{site}{#2}{townzip}\\\hline%
|
||||
\end{tabular}\vspace{-2.5ex}%
|
||||
\end{wrapfigure}%
|
||||
\fi% end box
|
||||
\pdata@target{site}{#2}%
|
||||
{\subsubsection{\pdataref{site}{#2}{acronym}: % space here
|
||||
{\textsc{\pdataref{site}{#2}{shortname}} (\pdataref{site}{#2}{countryshort})}}}%
|
||||
{\subsubsection{\pdataref@safe{site}{#2}{acronym}: % space here
|
||||
{\textsc{\pdataref@safe{site}{#2}{shortname}} (\pdataref@safe{site}{#2}{countryshort})}}}%
|
||||
\small%
|
||||
\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
|
||||
{0.25ex \@plus1ex \@minus.2ex}%
|
||||
|
Binary file not shown.
@ -7,7 +7,7 @@
|
||||
%% euproposal.dtx (with options: `reporting')
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
|
||||
\ProvidesPackage{eureporting}[2019/03/21 v1.5 EU Project Reporting]
|
||||
\ProvidesPackage{eureporting}[2020/08/21 v1.7 EU Project Reporting]
|
||||
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
|
||||
\ProcessOptions
|
||||
\LoadClass[report]{reporting}
|
||||
|
BIN
examples/eu/strep/fau_logo.png
Normal file
BIN
examples/eu/strep/fau_logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.0 KiB |
BIN
examples/eu/strep/logo.jpg
Normal file
BIN
examples/eu/strep/logo.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.9 KiB |
Binary file not shown.
@ -21,7 +21,7 @@
|
||||
faucountryshort=D,
|
||||
faucountry=Germany,
|
||||
fautype=University,
|
||||
faulogo=jacobs-logo.png,
|
||||
faulogo=fau_logo.png,
|
||||
fauacronym=FAU,
|
||||
faushortname=FAU Erlangen N\"urnberg,
|
||||
fauRM=36,
|
||||
@ -34,6 +34,7 @@
|
||||
efotownzip={Utrecht, 3kd89},
|
||||
efostreetaddress={Kruislann 777},
|
||||
efotype=NGO,
|
||||
efologo=logo.jpg,
|
||||
efoacronym=EFO,
|
||||
efoRM=36,
|
||||
% Site 3
|
||||
@ -44,6 +45,7 @@
|
||||
barstreetaddress={Rue de Montparnasse}
|
||||
bartownzip={Paris},
|
||||
bartype=University,
|
||||
barlogo=logo.jpg,
|
||||
baracronym=BAR,
|
||||
barshortname=Universit\'e de BAR,
|
||||
barRM=36,
|
||||
@ -55,6 +57,7 @@
|
||||
bazstreetaddress={4711 Silicon Glen Drive},
|
||||
baztownzip={Westerfield U3F2B},
|
||||
baztype=SME,
|
||||
bazlogo=logo.jpg,
|
||||
bazshortname=BAZ International,
|
||||
bazacronym=BAZ,
|
||||
bazRM=36,
|
||||
@ -75,7 +78,8 @@
|
||||
% Coordinator
|
||||
coordinator=Prof. Dr. Michael Kohlhase,
|
||||
Cemail=michael.kohlhase@fau.de,
|
||||
Ctelfax=(49) 9131-85-64052/55,
|
||||
Ctelfax=(49) 9131-85-64052/55,
|
||||
iconrowheight=1.5cm,% for the logo line on the title page
|
||||
compactht]
|
||||
\begin{abstract}
|
||||
Writing grant proposals is a collaborative effort that requires the integration of
|
||||
|
Loading…
Reference in New Issue
Block a user