diff --git a/base/proposal.dtx b/base/proposal.dtx index ed25dfd..c46149e 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -1419,9 +1419,11 @@ % \end{macrocode} % and we list the partners who contribute if they are specified. % \begin{macrocode} -\if@sites;% +\if@sites% +\ifx\task@title\@empty\else;\ \fi% deal with spaces and separator \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)% -\@for\@I:=\task@partners\do{, \site\@I}\\\fi% +\@for\@I:=\task@partners\do{, \site\@I}\\% +\fi% if@sites % \end{macrocode} % if there are no partners, then we show the RM/RAM contributions specified (if any) % \begin{macrocode} @@ -2714,7 +2716,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % LocalWords: subbibliography,title featured,heading renewbibmacro iffieldundef showit % LocalWords: proposal dtx xkohlhase areastrue svninfo noworkareas twoside emph gitinfo % LocalWords: areasfalse wa textcomp amssymb url graphicx colortbl xcolor RO OJBref sl -% LocalWords: fancyhdr keyval eurosym tikz calc USenglish ngerman linkcolor ne WPref gen +% LocalWords: fancyhdr keyval eurosym tikz calc ngerman linkcolor ne WPref gen 5,step % LocalWords: citecolor urlcolor colorlinks pagecolor breaklinks bookmarksopen WPref doi % LocalWords: hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im Mitarbeiter % LocalWords: Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel ifsvninfo @@ -2796,4 +2798,4 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % LocalWords: 9,maxcitenames multilinguality 2pt,color 2,title 5,step true,giveninits % LocalWords: 9,maxcitenames hide,marginnote show,marginnote if@taskshowwps 2pt,color % LocalWords: 2,title 5,step 9,maxcitenames 2pt,color 2,title 5,step 9,maxcitenames -% LocalWords: 2pt,color 2,title +% LocalWords: 2pt,color 2,title 9,maxcitenames 2pt,color 2,title diff --git a/base/proposal.sty b/base/proposal.sty index a5470e8..ed7cbbf 100644 --- a/base/proposal.sty +++ b/base/proposal.sty @@ -354,9 +354,11 @@ \fi% initial \fi% \if@taskshowwps \ifsubmit\else\ifx\task@PM\@empty\else; \task@PM~\task@legend@PM\fi\fi% -\if@sites;% +\if@sites% +\ifx\task@title\@empty\else;\ \fi% deal with spaces and separator \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)% -\@for\@I:=\task@partners\do{, \site\@I}\\\fi% +\@for\@I:=\task@partners\do{, \site\@I}\\% +\fi% if@sites \ifx\task@partners\@empty \xdef\@@involvement{}\xdef\@@inv{}% \xdef\@@sep{, }\def\m@sep{}% do not show the sep the first time around diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index 65a7473..dafba8e 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -17,7 +17,7 @@ \RequirePackage{eurosym} \RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} -\else\RequirePackage[ngerman,USenglish]{babel}\fi +\else\RequirePackage[ngerman,english]{babel}\fi \newenvironment{sitedescription}[2][]% {\def\@test{#1}\def\@@title{\ifx\@test\@empty\wa@ref3{institution}{#2}{acronym}\else #1\fi: \textsc{\wa@ref3{institution}{#2}{name}}} @@ -74,7 +74,7 @@ \prop@gen@months\quad Months starting \prop@gen@start \@ifundefined{prop@gen@fundsuntil}{} { (\ifdeutsch Mittel reichen bis\else funds last until\fi\ \prop@gen@fundsuntil)} -\ifdeutsch\else\selectlanguage{USenglish}\fi +\ifdeutsch\else\selectlanguage{english}\fi \newpage \setcounter{page}{0}% \fi\fi}% ifsubmit ifgeneral diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index 296f2d6..789cac0 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -220,7 +220,7 @@ \RequirePackage{eurosym} \RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} -\else\RequirePackage[ngerman,USenglish]{babel}\fi +\else\RequirePackage[ngerman,english]{babel}\fi % % \end{macrocode} % @@ -382,7 +382,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \prop@gen@months\quad Months starting \prop@gen@start \@ifundefined{prop@gen@fundsuntil}{} { (\ifdeutsch Mittel reichen bis\else funds last until\fi\ \prop@gen@fundsuntil)} -\ifdeutsch\else\selectlanguage{USenglish}\fi +\ifdeutsch\else\selectlanguage{english}\fi \newpage \setcounter{page}{0}% \fi\fi}% ifsubmit ifgeneral @@ -453,7 +453,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \newcommand\prop@assoc[2]{\let\@tmpop=\relax\@for\@I:=#2\do{\@tmpop\@I\let\@tmpop=#1}} \newcommand\show@prop@gen@keys{\def\@cb{, }\@ifundefined{prop@gen@keys}{??:???? ?/?}{\prop@assoc\@cb\prop@gen@keys}} \renewenvironment{prop@report} -{\selectlanguage{USenglish} +{\selectlanguage{english} \thispagestyle{empty}% \begin{center} {\LARGE Final Project Report}\\[.2cm] @@ -576,7 +576,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \endinput % LocalWords: dfgproposal dtx kohlhase areastrue svninfo noworkareas twoside notcategory % LocalWords: areasfalse wa textcomp amssymb url graphicx colortbl xcolor RO Abriss Rabe -% LocalWords: fancyhdr keyval eurosym tikz calc USenglish ngerman linkcolor ne ifgeneral +% LocalWords: fancyhdr keyval eurosym tikz calc english ngerman linkcolor ne ifgeneral % LocalWords: citecolor urlcolor colorlinks pagecolor breaklinks bookmarksopen ifdeutsch % LocalWords: hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im generaltrue % LocalWords: Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel Deutscher @@ -619,7 +619,7 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% % LocalWords: csname endcsname dfgcount ifcase cellcolor wptable widehat qquad Aufw ande % LocalWords: tabularnewline wplist ifgantt drafttrue RMdisclaimer draftfalse Hilfskraft % LocalWords: RMdisclaimerfalse RMdisclaimertrue newdimen taskwps thetaskwps intendierte -% LocalWords: whilenum hfill marginpar texteuro officialeuro texttt newpage cb grau +% LocalWords: whilenum hfill marginpar texteuro officialeuro texttt newpage cb grau wprm % LocalWords: min-crossrefs pdata xdef newcommand hline aff NeedsTeXFormat dfgreporting % LocalWords: renewenvironment nameuse paperlist applareas applareas dfgpdata kursiv % LocalWords: Gesch aftszeichen projpapers shortname sitedescription ednote generalfalse @@ -636,6 +636,6 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% % mode: doctex % TeX-master: t % End: -% LocalWords: localized sec:implementation Initialization ngerman,USenglish itemize +% LocalWords: localized sec:implementation Initialization ngerman itemize customized % LocalWords: selectlanguage sec:ourpubs confpapers inproceedings wspapers techreports -% LocalWords: books,articles,inproceedings +% LocalWords: books,articles,inproceedings books,articles,confpapers ngerman,english diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls index f8e56f7..ea20abf 100644 --- a/dfg/dfgreporting.cls +++ b/dfg/dfgreporting.cls @@ -15,7 +15,7 @@ \RequirePackage{eurosym} \RequirePackage{dfgpdata} \ifdeutsch\RequirePackage[ngerman]{babel} -\else\RequirePackage[ngerman,USenglish]{babel}\fi +\else\RequirePackage[ngerman,english]{babel}\fi \define@key{prop@gen}{reportperiod}{\def\prop@gen@reportperiod{#1}} \define@key{prop@gen}{applareas}{\def\prop@gen@applareas{#1}} \define@key{prop@gen}{key}{\@dmp{key=#1}% @@ -36,7 +36,7 @@ \newcommand\prop@assoc[2]{\let\@tmpop=\relax\@for\@I:=#2\do{\@tmpop\@I\let\@tmpop=#1}} \newcommand\show@prop@gen@keys{\def\@cb{, }\@ifundefined{prop@gen@keys}{??:???? ?/?}{\prop@assoc\@cb\prop@gen@keys}} \renewenvironment{prop@report} -{\selectlanguage{USenglish} +{\selectlanguage{english} \thispagestyle{empty}% \begin{center} {\LARGE Final Project Report}\\[.2cm] diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index 5efa9d5..94bad0e 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -545,7 +545,7 @@ \define@key{mst}{wdeliv}{\gdef\mst@wdeliv{#1}} \define@key{mst}{wverif}{\gdef\mst@wverif{#1}} \newcommand\milestonetable[1][]{% -\IfFileExists{./\jobname.deliverables}{% to avoid errros +\IfFileExists{./\jobname.deliverables}{% to avoid errors \message{euproposal.cls: Generating Milestones Table}% \def\mst@caption{Milestones, Deliverables, and Verification}% \def\mst@wname{2.5cm}\def\mst@wdeliv{7cm}\def\mst@wverif{4cm} @@ -657,7 +657,7 @@ % End: % LocalWords: coordinatorsite coordinatorsite verif verif milestonetable milestonetable % LocalWords: wname wname wdeliv wdeliv wverif wverif biblatex notcategory newif gdef -% LocalWords: grantagreement Initialization ifpartB partBfalse partBtrue report +% LocalWords: grantagreement Initialization ifpartB partBfalse partBtrue report openout % LocalWords: chngcntr counterwithin ifgrantagreement currenttime mst@caption delivs % LocalWords: initialize deliv multilinguality prop@milesfor refsection nocite doctex -% LocalWords: secnumdepth +% LocalWords: secnumdepth newwrite thepage jobname.deliverables diff --git a/examples/dfg/README.md b/examples/dfg/README.md index e9837cb..7958adf 100644 --- a/examples/dfg/README.md +++ b/examples/dfg/README.md @@ -6,5 +6,5 @@ proposal/dfgproposal class. `proposal`: a DFG proposal 'Einzelverfahren' in the new template (valid from Oct 2011. (provided by Jens Lehmann; thanks) `report`: a corresponding report `simple-proposal`: a simple DFG proposal (no work areas, no sites), re-uses files from above -`lib`: shared files (affiliation database, bibTeX, logos) +`lib`: shared files (affiliation database, bibTeX databases, logos) `dfgdocs`: DFG documents explaining the proposal/reporting process diff --git a/examples/dfg/proposal/proposal.pdf b/examples/dfg/proposal/proposal.pdf new file mode 100644 index 0000000..6a920c2 Binary files /dev/null and b/examples/dfg/proposal/proposal.pdf differ diff --git a/examples/dfg/proposal/proposal.tex b/examples/dfg/proposal/proposal.tex index e73b48c..75fd0bf 100644 --- a/examples/dfg/proposal/proposal.tex +++ b/examples/dfg/proposal/proposal.tex @@ -92,7 +92,7 @@ Funding proposal XYZ-83282 has been submitted prior to this proposal on related %%% TeX-master: t %%% End: -% LocalWords: empty bibflorian systems rabe institutions modal historical pub +% LocalWords: empty bibflorian systems rabe institutions modal historical pub ednotes % LocalWords: kwarc till formalsafe miko gc ipower ipowerlong Antr agen Beitr % LocalWords: acrolong intellegible kollaboratives koh arenten ussen Proze pcg diff --git a/examples/dfg/simple-proposal/proposal.pdf b/examples/dfg/simple-proposal/proposal.pdf new file mode 100644 index 0000000..8f3f1ec Binary files /dev/null and b/examples/dfg/simple-proposal/proposal.pdf differ diff --git a/examples/dfg/simple-proposal/proposal.tex b/examples/dfg/simple-proposal/proposal.tex index 3377b52..d2bfb38 100644 --- a/examples/dfg/simple-proposal/proposal.tex +++ b/examples/dfg/simple-proposal/proposal.tex @@ -3,7 +3,13 @@ % - submit.tex (no draft stuff, no ednotes, no revision information) % - public.tex (like submit.tex, but no financials either) \providecommand{\classoptions}{,keys} % to be overwritten in variants -\documentclass[gitinfo,noworkareas,RAM\classoptions]{dfgproposal} +\documentclass[ % the options control the appearance, see the documentation + gitinfo, % show GIT information + noworkareas, % do not generate work areas, this is a simple proposal + RAM, % also manage research assistant (HiWi) months + general, % make a title page, etc. + \classoptions] % the other class options from above, they can be overwritten e.g. in submit/final,tex + {dfgproposal} \addbibresource{../lib/dummy.bib} \renewcommand{\familydefault}{\sfdefault} \RequirePackage[scaled=.90]{helvet} diff --git a/examples/eu/README.md b/examples/eu/README.md index 334bfd9..74d1bc4 100644 --- a/examples/eu/README.md +++ b/examples/eu/README.md @@ -4,7 +4,7 @@ This directory contains examples for EU proposals and reports marked up with the proposal/euproposal class. `strep`: a STREP proposal -`lib`: shared files (affiliation database, bibTeX, logos) +`lib`: shared files (affiliation database, bibTeX databases, logos) It would be great to have mock proposals for other EU proposal categories here (please help). diff --git a/lib/Makefile.dfgproposal b/lib/Makefile.dfgproposal index fc83213..a2b893a 100644 --- a/lib/Makefile.dfgproposal +++ b/lib/Makefile.dfgproposal @@ -42,7 +42,7 @@ cd: # make cd will prepare CD for bu bbl: $(BBL) $(BBL): %.bbl: %.aux - bibtex -min-crossrefs=100 -terse $< + biber -min-crossrefs=100 -terse $< $(PDATA): %.pdata: %.tex $(PDFLATEX) $< diff --git a/lib/gitinfo2-hook.sh b/lib/gitinfo2-hook.sh old mode 100644 new mode 100755