diff --git a/base/proposal.dtx b/base/proposal.dtx index f5170ef..e90e7bb 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -863,7 +863,7 @@ % \end{macrocode} % % \begin{macro}{\prop@tl} -% An auxiliary macro that is handy for making tables of WorkAddress data. +% An auxiliary macro that is handy for making tables of metadata. % \begin{macrocode} \newcommand\prop@tl[2]{\xdef\tab@line{} \@for\tl@ext:={#1}\do{\xdef\tab@line{\tab@line}} @@ -2733,8 +2733,8 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % LocalWords: hyperref LaTeX workpackage PIs thema acrolong anzungsantrag im Mitarbeiter % LocalWords: Einzelverfahren tabline Allgemeine Angaben Antragsteller worktel ifsvninfo % LocalWords: bitabline personaltitle academictitle birthdate Dienstanschrift Hilfskraft -% LocalWords: workaddress atabline workfax Privatanschrift privaddress privtel ifgitinfo -% LocalWords: dt Kennwort Fachgebiet und Arbeitsrichtung Voraussichtliche wa fancyfoot +% LocalWords: atabline workfax Privatanschrift privaddress privtel ifgitinfo +% LocalWords: Kennwort Fachgebiet und Arbeitsrichtung Voraussichtliche wa fancyfoot % LocalWords: Gesamtdauer Antragszeitraum Zusammenfassung workarea wp wps num prop@gen % LocalWords: refundefinedtrue lightgray gantt xstep Unterschriften Id areas acro Lutz % LocalWords: submit hide ed public article paper today array comment wide RE tweakable diff --git a/base/proposal.pdf b/base/proposal.pdf index 68ea30a..e369721 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index a540207..175b89c 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index 0609363..0ee4efb 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -143,8 +143,7 @@ % \item \DescribeMacro{topicsaddressed}|topicsaddressed| allows to enter free-form text % instead of specifying the |challenge*|, |objective*|, and |outcome*| keys. % \item The \DescribeMacro{coordinator}|coordinator| key full name of the proposal -% coordinator. The |euproposal| package uses the |workaddress| package for -% representation of personal metadata, see~\cite{Kohlhase:workaddress:ctan} for details. +% coordinator. % \item The \DescribeMacro{Csite}|Csite|, \DescribeMacro{Cemail}|Cemail|, and % \DescribeMacro{Ctelfax}|Ctelfax| keys give further metadata of the coordinator (for % the table). @@ -631,6 +630,17 @@ % % \Finale \endinput +% Local Variables: +% mode: doctex +% TeX-master: t +% 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 openout +% LocalWords: chngcntr counterwithin ifgrantagreement currenttime mst@caption delivs +% LocalWords: initialize deliv multilinguality prop@milesfor refsection nocite doctex +% LocalWords: secnumdepth newwrite thepage jobname.deliverables % LocalWords: iffalse cls euproposal euproposal.dtx tt maketitle newpage wpwa eudata dfg % LocalWords: tableofcontents ednote euproposal DescribeEnv compactitem impl eureporting % LocalWords: longtable eurosym pdata thepart setcounter env vfill qquad NeedsTeXFormat @@ -646,20 +656,9 @@ % LocalWords: newcounter sitespt addtocounter textsf smallskip ignorespaces pn setkeys % LocalWords: cellcolor lightgray keypubs paperlist callname callid callid ifx csname % LocalWords: challengeid challengeid objectiveid objectiveid outcomeid hfill if@gitinfo -% LocalWords: outcomeid metakeys workaddress numberline tempdima ifsubmit iconrowheight -% LocalWords: proposal.dtx texttt paperslist workaddress.dtx topicsaddressed thesite mst +% LocalWords: outcomeid metakeys numberline tempdima ifsubmit iconrowheight +% LocalWords: proposal.dtx texttt paperslist topicsaddressed thesite mst % LocalWords: topicsaddressed iconrowheight finalreport.tex printbibliography endcsname % LocalWords: reportperiod organisation thispagestyle gitAbbrevHash sitedescritpion WPs % LocalWords: WAinstitution picv medskip newmdenv frametitle wpdelivs mdframed.sty emph % LocalWords: surroundwithmdframed emph riskcont prob grav ldots endinput optimized - -% Local Variables: -% mode: doctex -% TeX-master: t -% 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 openout -% LocalWords: chngcntr counterwithin ifgrantagreement currenttime mst@caption delivs -% LocalWords: initialize deliv multilinguality prop@milesfor refsection nocite doctex -% LocalWords: secnumdepth newwrite thepage jobname.deliverables diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index 6b7e621..4e9313b 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/examples/dfg/proposal/Makefile b/examples/dfg/proposal/Makefile index d251b39..a03d0f7 100644 --- a/examples/dfg/proposal/Makefile +++ b/examples/dfg/proposal/Makefile @@ -7,6 +7,6 @@ # possibly customize the following variables to your setting PROPOSAL = proposal.tex# # the proposal PROP.dir = ../../..# # The LaTeX-proposal class directory -BIB = $(PROP.dir)/lib/dummy.bib# # bibTeX databases +BIB = ../lib# # bibTeX databases ########################################################################### include $(PROP.dir)/lib/Makefile.dfgproposal diff --git a/examples/dfg/report/Makefile b/examples/dfg/report/Makefile index 0ecb810..0e7682c 100644 --- a/examples/dfg/report/Makefile +++ b/examples/dfg/report/Makefile @@ -7,6 +7,6 @@ # possibly customize the following variables to your setting REPORT = finalreport.tex# # the report PROP.dir = ../../..# # The LaTeX-proposal class directory -BIB = ../lib/dummy.bib# # bibTeX databases +BIB = ../lib# # bibTeX databases ########################################################################### include $(PROP.dir)/lib/Makefile.dfgproposal diff --git a/examples/dfg/simple-proposal/Makefile b/examples/dfg/simple-proposal/Makefile index 45444f9..e7bf5e1 100644 --- a/examples/dfg/simple-proposal/Makefile +++ b/examples/dfg/simple-proposal/Makefile @@ -6,7 +6,7 @@ ########################################################################### # possibly customize the following variables to your setting PROPOSAL = proposal.tex# # the proposal -PROP.dir = ../../.. -BIB = ../lib/dummy.bib# # bibTeX databases +PROP.dir = ../../..# # The LaTeX-proposal class directory +BIB = ../lib# # bibTeX databases ########################################################################### include $(PROP.dir)/lib/Makefile.dfgproposal diff --git a/examples/eu/strep/propB.pdf b/examples/eu/strep/propB.pdf index c587faa..a643acc 100644 Binary files a/examples/eu/strep/propB.pdf and b/examples/eu/strep/propB.pdf differ diff --git a/lib/Makefile.dfgproposal b/lib/Makefile.dfgproposal index a7b3286..53a6a83 100644 --- a/lib/Makefile.dfgproposal +++ b/lib/Makefile.dfgproposal @@ -25,7 +25,7 @@ PROPCLS.dir = $(PROP.dir)/base DFGPROPCLS.dir = $(PROP.dir)/dfg TEXINPUTS := $(PROPCLS.dir)//:$(DFGPROPCLS.dir)//: BIBINPUTS := $(BIB):$(BIBINPUTS) -BIBS := $(shell ls *.bib) $(shell ls $(BIB)/*.bib) +BIBS := $(shell ls *.bib 2>/dev/null) $(shell ls $(BIB)/*.bib 2>/dev/null) PROPCLS.clssty = proposal.cls pdata.sty reporting.cls DFGPROPCLS.clssty = dfgproposal.cls dfgpdata.sty dfgreporting.cls PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(DFGPROPCLS.clssty:%=$(DFGPROPCLS.dir)/%) diff --git a/lib/proposal.bib b/lib/proposal.bib index daf8aa0..33902cf 100644 --- a/lib/proposal.bib +++ b/lib/proposal.bib @@ -25,18 +25,6 @@ urldate = {2014-10-26}, url = {http://mirrors.ctan.org/macros/latex/contrib/gitinfo2/gitinfo2.pdf}} -@techreport{Kohlhase:workaddress:ctan,crossref={Kohlhase:workaddress:base}, - institution = {Comprehensive {\TeX} Archive Network (CTAN)}, - url = {http://mirror.ctan.org/macros/latex/contrib/stex/sty/workaddress/workaddress.pdf}, - pubs = {mkohlhase,projects/stex}} -@techreport{Kohlhase:workaddress:svn,crossref={Kohlhase:workaddress:base}, - url = {https://github.com/KWARC/sTeX/raw/master/sty/stex/workaddress/workaddress.pdf}} -@techreport{Kohlhase:workaddress:base, - author = {Michael Kohlhase}, - title = {{\texttt{workaddress.sty}}: An Infrastructure for marking up {Dublin Core} Metadata in {\LaTeX} documents}, - type = {Self-documenting {\LaTeX} package}, - year = stexyear} - @techreport{Kohlhase:pdrp:ctan,crossref={Kohlhase:pdrp:base}, institution = {Comprehensive {\TeX} Archive Network (CTAN)}, url = {http://mirror.ctan.org/macros/latex/contrib/proposal/dfg/dfgproposal.pdf},