diff --git a/base/proposal.dtx b/base/proposal.dtx index 636c08e..ca14e58 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -2444,15 +2444,18 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % \end{macro} % % \begin{macro}{\prop@paperlist} -% We generate a subsection with a |refsection| (this makes a separate bibliography for -% this section) and activate the keys via |\nocite|. Then we just print the bibliography -% with the empty header we created before. +% |\prop@paperlist{|\meta{keys}|}{|\meta{refs}|}| generates a paper list from a list +% \meta{keys} of bibliography keys. It makes some local adaptions to the appearance of +% the bibliography, and then adds \meta{refs} to the citable papers marks them as +% |featured|. Then it uses |\printbibliography| to make a bibliography of the cited +% papers. Note that these are not cited again in the main bibliography\ednote{MK: we may +% want to make this optional controlled by a package option eventually.} % \begin{macrocode} \newcommand\prop@paperlist[2][]{% \let\biboldfont\bibfont% \renewcommand{\bibfont}{\footnotesize}% -\renewcommand{\baselinestretch}{.9} -\def\do##1{\addtocategory{featured}{##1}}\docsvlist{#2}% +\renewcommand{\baselinestretch}{.9}% +\nocite{#2}\def\do##1{\addtocategory{featured}{##1}}\docsvlist{#2}% \setkeys{paperlist}{#1} \@ifundefined{prop@rl}{}{\@latex@warning{some papers are not classified!}} \if@allpapers\printbibliography[category=featured,heading=empty]\fi% diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index a33d6b0..4d0be88 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -133,12 +133,9 @@ % % Since August 2010, DFG requests list of ``project-related papers'' as section 2.2. We % use the |biblatex| package to automate this. We only need to use -% \DescribeMacro{\dfgprojpapers}|\dfgprojpapers{|\meta{keys}|}|, where \meta{keys} is a -% comma-separated list of keys from the bibTeX database used in the proposal. Note that -% you will have to run |bibtex -min-crossrefs=999 proposal1-blx.aux| to generate file -% |proposal1.bbl| that generates the bibliography list. To automate this (at least on Unix -% systems), we have added the field |Makefile.template|, which allows you do do any -% necessary steps by just typing |make|. +% \DescribeMacro{\dfgprojpapers}|\dfgprojpapers[|\meta{keys}|]{|\meta{refs}|}|, where +% \meta{keys} that specify what papers are selected and \meta{refs} is a comma-separated +% list of bibtex keys from the bibTeX database used in the proposal. % % The papers listed in |\dfgprojpapers| are put into a special bib\LaTeX category % \DescribeMacro{featured}|featured|, and can thus be excluded from the general diff --git a/dfg/examples/proposal/Makefile b/dfg/examples/proposal/Makefile index beed5c7..332b947 100644 --- a/dfg/examples/proposal/Makefile +++ b/dfg/examples/proposal/Makefile @@ -16,8 +16,7 @@ TARGET.aux = $(TARGET:%.tex=%.aux) # their aux files. PDATA = $(PROPOSAL:%.tex=%.pdata) # the proposal project data SRC = $(filter-out $(TARGET),$(shell ls *.tex)) # included files PDFLATEX = pdflatex -interaction batchmode -file-line-error -BBL.base = 1 -BBL = $(PROPOSAL:%.tex=%.bbl) $(BBL.base:%=$(PROPOSAL:%.tex=%)%-blx.bbl) +BBL = $(PROPOSAL:%.tex=%.bbl) PROPCLS.dir = $(PROP.dir)/base PROPETC.dir = $(PROP.dir)/etc DFGPROPCLS.dir = $(PROP.dir)/dfg diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf index 67937f6..5cea2b6 100644 Binary files a/dfg/examples/proposal/proposal.pdf and b/dfg/examples/proposal/proposal.pdf differ diff --git a/dfg/examples/proposal/proposal.tex b/dfg/examples/proposal/proposal.tex index 6feedb5..1fcd664 100644 --- a/dfg/examples/proposal/proposal.tex +++ b/dfg/examples/proposal/proposal.tex @@ -8,7 +8,6 @@ \usepackage[utf8]{inputenc} \input{../lib/WApersons} - \begin{document} \begin{center}\color{red}\huge diff --git a/dfg/examples/proposal/state.tex b/dfg/examples/proposal/state.tex index 245c513..b3b37a1 100644 --- a/dfg/examples/proposal/state.tex +++ b/dfg/examples/proposal/state.tex @@ -37,10 +37,9 @@ publications so far. \end{todo} -\subsubsection{Peer-Reviewed Articles} +\subsubsection{Peer-Reviewed Articles}\label{sec:peer-rev} \dfgprojpapers{Kohlhase:pdpl10,providemore} - \ednote{Anmerkung Jens: Ein nützliches Feature wäre hier, wenn das Paket eine (eventuell über Optionen der Dokumentklasse unterdrückbare) Warnung ausgeben würde, wenn zu viele Publikationen entsprechend DFG-Richtlinien angegeben werden. Die Anzahl ist sehr eng diff --git a/dfg/examples/simple-proposal/Makefile b/dfg/examples/simple-proposal/Makefile index 34237fa..6b69c8f 100644 --- a/dfg/examples/simple-proposal/Makefile +++ b/dfg/examples/simple-proposal/Makefile @@ -16,8 +16,7 @@ TARGET.aux = $(TARGET:%.tex=%.aux) # their aux files. PDATA = $(PROPOSAL:%.tex=%.pdata) # the proposal project data SRC = $(filter-out $(TARGET),$(shell ls *.tex)) # included files PDFLATEX = pdflatex -interaction batchmode -file-line-error -BBL.base = 1 -BBL = $(PROPOSAL:%.tex=%.bbl) $(BBL.base:%=$(PROPOSAL:%.tex=%)%-blx.bbl) +BBL = $(PROPOSAL:%.tex=%.bbl) PROPCLS.dir = $(PROP.dir)/base PROPETC.dir = $(PROP.dir)/etc DFGPROPCLS.dir = $(PROP.dir)/dfg diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf index 53d065e..1e2a940 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ