diff --git a/base/proposal.cls b/base/proposal.cls index 010f03b..0c08cd2 100644 --- a/base/proposal.cls +++ b/base/proposal.cls @@ -564,8 +564,7 @@ ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40} \else\begin{tabular}{|l|l|*{\thewpfig@options}{r|}|*{\the@sites}{r|}|r|}\hline\fi%| \wpfig@headline\\\hline\hline} {\end{tabular}\smallskip\\ -\wpfig@legend@RAM@expl -\if@sites; \wpfig@legend@lead@expl\fi +\wpfig@legend@RAM@expl\if@sites; \wpfig@legend@lead@expl\fi \@ifundefined{wpfig@label}{\caption{\wpfig@legend@caption}}{\caption{\wpfig@caption}} \@ifundefined{wpfig@label}{\label{fig:wplist}}{\label{\wpfig@label}} \end{center}\end{table}} diff --git a/base/proposal.dtx b/base/proposal.dtx index 957378b..ff20bab 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -29,7 +29,7 @@ \usepackage{textcomp,url,paralist,a4wide,xspace} \usepackage[show]{ed} \usepackage[maxbibnames=6,hyperref=auto,style=alphabetic]{biblatex} -\bibliography{kwarc} +\bibliography{proposal} \usepackage[bookmarks=true,linkcolor=blue, citecolor=blue,urlcolor=blue,colorlinks=true, breaklinks=true, bookmarksopen=true]{hyperref} @@ -1817,8 +1817,7 @@ ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40} \else\begin{tabular}{|l|l|*{\thewpfig@options}{r|}|*{\the@sites}{r|}|r|}\hline\fi%| \wpfig@headline\\\hline\hline} {\end{tabular}\smallskip\\ -\wpfig@legend@RAM@expl -\if@sites; \wpfig@legend@lead@expl\fi +\wpfig@legend@RAM@expl\if@sites; \wpfig@legend@lead@expl\fi \@ifundefined{wpfig@label}{\caption{\wpfig@legend@caption}}{\caption{\wpfig@caption}} \@ifundefined{wpfig@label}{\label{fig:wplist}}{\label{\wpfig@label}} \end{center}\end{table}} diff --git a/base/proposal.pdf b/base/proposal.pdf index d58a139..f35a0d9 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/dfg/dfgpdata.sty b/dfg/dfgpdata.sty index 214ef50..6852557 100644 --- a/dfg/dfgpdata.sty +++ b/dfg/dfgpdata.sty @@ -40,6 +40,9 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \ifdeutsch Arbeitsgebiet\else Fields of work\fi: \prop@gen@areas} \newcommand\dfgprojpapers[2][]{\prop@paperlist[#1]{#2}} \ifdeutsch +\newcommand\prop@count[1]{\ifcase #1 null\or ein\or zwei\or drei\or vier\or f"unf\or sechs\or sieben\or + acht\or neun\or zehn\or elf\or zw"olf\else#1\fi} + \renewcommand\prop@of@pages[2]{Seite~#1\ifofpage~von~#2\fi} \renewcommand\wp@mk@title[1]{Arbeitspaket {#1}} \renewcommand\wp@label[1]{AP{#1}} @@ -62,9 +65,9 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \renewcommand\wpfig@legend@totalRAM{Summe HM} \renewcommand\wpfig@legend@RM{PM} \renewcommand\wpfig@legend@RAM{HM} -\renewcommand\wpfig@legend@RAM@expl{\if@RAM P/HM $\widehat=$ Personen/Hilfskraft Monate;\else\ Aufw\"ande in Personenmonaten\\\fi} -\renewcommand\wpfig@legend@lead@expl{(Arbeitspaketleiter sind \wp@lead@style@explained} -\renewcommand\wp@lead@style@explained{grau und kursiv markiert)} +\renewcommand\wpfig@legend@RAM@expl{\if@RAM P/HM $\widehat=$ Personen/Hilfskraft Monate\else\ Aufw\"ande in Personenmonaten\fi} +\renewcommand\wpfig@legend@lead@expl{Arbeitspaketleiter sind \wp@lead@style@explained} +\renewcommand\wp@lead@style@explained{grau und kursiv markiert} \renewcommand\wpfig@legend@caption{{\ifwork@areas Arbeitsbereiche und \fi}Arbeitspakete} \renewcommand\wp@legend@site{Partner} \renewcommand\wp@legend@effort{Aufwand\if@RAM{ (PM+HM)}\fi} diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index 7119b78..ee41aa7 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -29,7 +29,7 @@ \usepackage{textcomp,url,paralist,a4wide,xspace} \usepackage[show]{ed} \usepackage[maxnames=6,hyperref=auto,style=alphabetic]{biblatex} -\bibliography{kwarc} +\bibliography{proposal} \usepackage[bookmarks=true,linkcolor=blue, citecolor=blue,urlcolor=blue,colorlinks=true, breaklinks=true, bookmarksopen=true]{hyperref} @@ -72,10 +72,10 @@ % \subversion, allowing the proposal writing team to concentrate on the contents % rather than the mechanics of wrangling with text fragments and revisions. % -% The |dfgproposal| class extends the |proposal| class~\cite{Kohlhase:pplp:svn} and +% The |dfgproposal| class extends the |proposal| class~\cite{Kohlhase:pplp:ctan} and % supports many of the specific elements of a DFG Proposal. The package documentation % is still preliminary, fragmented and incomplete and only dwells on the particulars of -% DFG proposals, so we treat~\cite{Kohlhase:pplp:svn} as a prerequisite. Please consult +% DFG proposals, so we treat~\cite{Kohlhase:pplp:ctan} as a prerequisite. Please consult % the example proposal |dfg/proposal.tex|, which comes with the package and shows the usage of % the class in action. It is intended as a template for your proposal, but please bear in % mind that the DFG guidelines may change, if in doubt, please consult the DFG guide for @@ -106,7 +106,7 @@ % % As usual in {\LaTeX}, the package is loaded by % |\documentclass[|\meta{options}|]{dfgproposal}|, where |[|\meta{options}|]| is optional -% and gives a comma separated list of options specified in~\cite{Kohlhase:pplp:svn}. The +% and gives a comma separated list of options specified in~\cite{Kohlhase:pplp:ctan}. The % |dfgproposal| class adds the two options % \begin{compactenum} % \item \DescribeMacro{general}|general|, which allows generates a first section with @@ -507,9 +507,13 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% % \subsection{German Reports}\label{sec:impl:german} % % We have to redefine some macros for German reports. +% % \begin{macrocode} %<*pdata> \ifdeutsch +\newcommand\prop@count[1]{\ifcase #1 null\or ein\or zwei\or drei\or vier\or f"unf\or sechs\or sieben\or + acht\or neun\or zehn\or elf\or zw"olf\else#1\fi} + \renewcommand\prop@of@pages[2]{Seite~#1\ifofpage~von~#2\fi} \renewcommand\wp@mk@title[1]{Arbeitspaket {#1}} \renewcommand\wp@label[1]{AP{#1}} @@ -532,9 +536,9 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% \renewcommand\wpfig@legend@totalRAM{Summe HM} \renewcommand\wpfig@legend@RM{PM} \renewcommand\wpfig@legend@RAM{HM} -\renewcommand\wpfig@legend@RAM@expl{\if@RAM P/HM $\widehat=$ Personen/Hilfskraft Monate\else\ Aufw\"ande in Personenmonaten\\\fi} -\renewcommand\wpfig@legend@lead@expl{(Arbeitspaketleiter sind \wp@lead@style@explained} -\renewcommand\wp@lead@style@explained{grau und kursiv markiert)} +\renewcommand\wpfig@legend@RAM@expl{\if@RAM P/HM $\widehat=$ Personen/Hilfskraft Monate\else\ Aufw\"ande in Personenmonaten\fi} +\renewcommand\wpfig@legend@lead@expl{Arbeitspaketleiter sind \wp@lead@style@explained} +\renewcommand\wp@lead@style@explained{grau und kursiv markiert} \renewcommand\wpfig@legend@caption{{\ifwork@areas Arbeitsbereiche und \fi}Arbeitspakete} \renewcommand\wp@legend@site{Partner} \renewcommand\wp@legend@effort{Aufwand\if@RAM{ (PM+HM)}\fi} diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index 4199d2a..ca38bd0 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/examples/lib/dummy.bib b/dfg/examples/lib/dummy.bib index 245b32c..91c2cd9 100644 --- a/dfg/examples/lib/dummy.bib +++ b/dfg/examples/lib/dummy.bib @@ -21,3 +21,37 @@ publisher = {The University of Chicago Press}, year = 1992, author = {Donald E. Knuth}} +@article{KohDavGin:psewads11, + journal = {Procedia Computer Science}, + author = {Michael Kohlhase and Joe Corneli and Catalin David and Deyan Ginev and Constantin Jucovschi and Andrea Kohlhase and Christoph Lange and Bogdan Matican and Stefan Mirea and Vyacheslav Zholudev}, + title = {The Planetary System: Web 3.0 \& Active Documents for STEM}, + issuetitle = {Special issue: Proceedings of the International Conference on Computational Science (ICCS)}, + editor = {Mitsuhisa Sato and Satoshi Matsuoka and Peter M. Sloot and G. Dick van Albada and Jack Dongarra}, + pages = {598--607}, + venue = {Nanyang Technological University, Singapore}, + eventdate = {2011-06-01/2011-06-03}, + note = {Finalist at the Executable Paper Grand Challenge}, + year = 2011, + volume = 4, + url = {http://kwarc.info/kohlhase/papers/epc11.pdf}, + publisher = {Elsevier}, + doi = {10.1016/j.procs.2011.04.063}, + keywords = {conference}, + pubs = {mkohlhase,cdavid,dginev,akohlhase,clange,bmatican,smirea,vzholudev,projects/planetary,projects/ikyda2012}, + acceptancerate = {14}, + acceptancerateCOMMENT = {10/70 accepted into the finals}} +@InProceedings{Lange:OpenMathCDLinkedData10, + author = {Christoph Lange}, + title = {Towards {OpenMath} Content Dictionaries as Linked Data}, + crossref = {OM10}, + eprint = {1006.4057v1}, + eprinttype = {arxiv}, + eprintclass = {cs.DL}, + pubs = {clange,projects/ikyda2012}} +@PROCEEDINGS{OM10, + editor = {Michael Kohlhase and Christoph Lange}, + title = {23\textsuperscript{rd} OpenMath Workshop}, + booktitle = {23\textsuperscript{rd} OpenMath Workshop}, + url = {http://cicm2010.cnam.fr/om/}, + year = {2010}, + month = jul} diff --git a/dfg/examples/proposal/funds.tex b/dfg/examples/proposal/funds.tex index 93faf32..fa6ba16 100644 --- a/dfg/examples/proposal/funds.tex +++ b/dfg/examples/proposal/funds.tex @@ -65,7 +65,7 @@ an average duration of 3 weeks, we estimate the cost of one visit at 600 {\texte traveling and 70 {\texteuro} per night for accommodation, amounting to 2040 \texteuro per visit. -\subsubsubsection{-- 4.1.2.6, 4.1.3 (Expenses for Laboratory Animals / Other Costs +\subsubsection*{-- 4.1.2.6, 4.1.3 (Expenses for Laboratory Animals / Other Costs / Project Related Publication Expenses / Instrumentation) \sf\qquad n/a} % \subsubsection{Expenses for Laboratory Animals} None. diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf new file mode 100644 index 0000000..371fcd0 Binary files /dev/null and b/dfg/examples/proposal/proposal.pdf differ diff --git a/dfg/examples/proposal/proposal.tex b/dfg/examples/proposal/proposal.tex index e586fc2..6feedb5 100644 --- a/dfg/examples/proposal/proposal.tex +++ b/dfg/examples/proposal/proposal.tex @@ -79,7 +79,6 @@ of publications. Non-published works must be included with the proposal. Funding proposal XYZ-83282 has been submitted prior to this proposal on related topic XYZ. \end{proposal} - \end{document} %%% Local Variables: diff --git a/dfg/examples/proposal/public.pdf b/dfg/examples/proposal/public.pdf index 2c9e43a..3d49aea 100644 Binary files a/dfg/examples/proposal/public.pdf and b/dfg/examples/proposal/public.pdf differ diff --git a/dfg/examples/proposal/submit.pdf b/dfg/examples/proposal/submit.pdf index 9fee253..df7b10b 100644 Binary files a/dfg/examples/proposal/submit.pdf and b/dfg/examples/proposal/submit.pdf differ diff --git a/dfg/examples/proposal/submit.tex b/dfg/examples/proposal/submit.tex index 5d92f93..3f1c606 100644 --- a/dfg/examples/proposal/submit.tex +++ b/dfg/examples/proposal/submit.tex @@ -1,4 +1,4 @@ -\newcommand{\classoptions}{submit} +\newcommand{\classoptions}{,submit} \input{proposal} %%% Local Variables: diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf index 3a66728..745a747 100644 Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf new file mode 100644 index 0000000..56c0fd3 Binary files /dev/null and b/dfg/examples/simple-proposal/proposal.pdf differ diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index 8231056..0919789 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -29,7 +29,7 @@ \usepackage{textcomp,url,paralist,a4wide,xspace} \usepackage[show]{ed} \usepackage[maxnames=6,hyperref=auto,style=alphabetic]{biblatex} -\bibliography{kwarc} +\bibliography{proposal} \usepackage[bookmarks=true,linkcolor=blue, citecolor=blue,urlcolor=blue,colorlinks=true, breaklinks=true, bookmarksopen=true]{hyperref} diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index fe7cd30..4308262 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/examples/fetopenstrep/propB.pdf b/eu/examples/fetopenstrep/propB.pdf index e05e337..5aafbe3 100644 Binary files a/eu/examples/fetopenstrep/propB.pdf and b/eu/examples/fetopenstrep/propB.pdf differ diff --git a/eu/examples/fetopenstrep/propB.tex b/eu/examples/fetopenstrep/propB.tex index 5ae09a1..503ce66 100644 --- a/eu/examples/fetopenstrep/propB.tex +++ b/eu/examples/fetopenstrep/propB.tex @@ -6,7 +6,7 @@ \documentclass[noworkareas,deliverables,gitinfo,propB\classoptions]{euproposal} %\usepackage[T1]{fontenc} %\usepackage[utf8]{inputenc} -\addbibresource{../lib/dummy} +%\addbibresource{../lib/dummy} \input{../lib/WApersons}% Some sections of the included files depend on this. diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf index b2dc20f..8d92e57 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ diff --git a/lib/Makefile.vars b/lib/Makefile.vars index d9a6169..7d7cacb 100644 --- a/lib/Makefile.vars +++ b/lib/Makefile.vars @@ -24,7 +24,7 @@ CTANDIR = /tmp/$(TDSCOLL)/$(CTANPREFIX)$(PACKAGE) # the dependencies SOURCES = $(DTX.sty) $(BIB) TEXINPUTS := .:$(PREFIX)//: -BIBINPUTS := .:$(PREFIX)/../bib//: +BIBINPUTS := .:$(PREFIX)//: BSTINPUTS := .:$(PREFIX)//: # we want to quiet down pdflatex diff --git a/lib/proposal.bib b/lib/proposal.bib new file mode 100644 index 0000000..6359832 --- /dev/null +++ b/lib/proposal.bib @@ -0,0 +1,64 @@ +@STRING{stexyear = 2015} +@online{gitinfo2:on, + title = {gitinfo2.sty}, + subtitle = {A package for accessing metadata from the git dvcs}, + author = {Brent Longborough}, + 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}, + pubs = {mkohlhase,projects/stex}} +@techreport{Kohlhase:pdrp:svn,crossref={Kohlhase:pdrp:base}, + url = {http://github.com/KWARC/LaTeX-proposal/dfg/dfgproposal.pdf}} +@techreport{Kohlhase:pdrp:base, + author = {Michael Kohlhase}, + title = {Preparing DFG Proposals and Reports in {\LaTeX} with {\texttt{dfgproposal.cls}}}, + type = {Self-documenting {\LaTeX} package}, + year = stexyear} + +@techreport{Kohlhase:pplp:ctan,crossref={Kohlhase:pplp:base}, + institution = {Comprehensive {\TeX} Archive Network (CTAN)}, + url = {http://mirror.ctan.org/macros/latex/contrib/proposal/base/proposal.pdf}, + pubs = {mkohlhase,projects/stex}} +@techreport{Kohlhase:pplp:svn,crossref={Kohlhase:pplp:base}, + url = {http://github.com/KWARC/LaTeX-proposal/base/proposal.pdf}} +@techreport{Kohlhase:pplp:base, + author = {Michael Kohlhase}, + title = {Preparing Proposals in {\LaTeX} with {\tt{proposal.cls}}}, + type = {Self-documenting {\LaTeX} package}, + year = stexyear} + +@Manual{DFG:102e, + title = {Research Grants, Guidelines and Proposal Preparation Instructions}, + organization = {German Research Foundation (DFG)}, + url = {http://www.dfg.de/download/programme/emmy_noether_programm/antragstellung/1_02_e/1_02e.pdf}, + month = oct, + year = 2010} + +@Manual{DFG:2012e, + title = {Guidelines for the Use of Funds International Research Grants with Guidelines for Final Reports}, + organization = {German Research Foundation (DFG)}, + url = {http://www.dfg.de/download/programme/sachbeihilfe/antragstellung/2_012_e/2_012e.pdf}, + month = jul, + year = 2010} + +@Manual{DFG:201, + title = {Verwendungsrichtlinien, Sachbeihilfen mit Leitfaden f{\"ur}r Abschlussberichte und Regeln guter wissenschaftlicher Praxis}, + organization = {German Research Foundation (DFG)}, + url = {http://www.dfg.de/download/programme/sachbeihilfe/abschlussberichte/2_01/2_01.pdf}, + month = jun, + year = 2010}