diff --git a/base/pdata.sty b/base/pdata.sty index 30ba879..255c49a 100644 --- a/base/pdata.sty +++ b/base/pdata.sty @@ -127,7 +127,6 @@ \def\@dmp#1{\ifkeys\marginpar{#1}\fi} \renewcommand\euro{\officialeuro\xspace} - \endinput %% %% End of file `pdata.sty'. diff --git a/base/proposal.cls b/base/proposal.cls index bb380a8..ab7fc36 100644 --- a/base/proposal.cls +++ b/base/proposal.cls @@ -39,7 +39,6 @@ \LoadClass[a4paper,twoside]{\proposal@class} \RequirePackage{proposal} - \endinput %% %% End of file `proposal.cls'. diff --git a/base/proposal.dtx b/base/proposal.dtx index c66af80..8de1288 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -2584,16 +2584,29 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje \printbibliography[heading=subbibliography,title=Unclassified,#1]}% \define@key{paperlist}{unclassified}[true]{\message{unclass: \prop@rl}\prop@prl\prop@rl} % \end{macrocode} -% with this, we define a couple of keys that generate +% with this, we define a couple of keys that use |\prop@ppl| generate the +% sub-bibliographies and add that to the |\prop@rl| token register. We also make the +% headings configurable. % \begin{macrocode} -\define@key{paperlist}{articles}[true]{\prop@ppl{article}{Articles}} -\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{Book Chapters}} -\define@key{paperlist}{confpapers}[true]{\prop@ppl[,keyword=conference]{inproceedings}{Conference Papers}} -\define@key{paperlist}{wspapers}[true]{\prop@ppl[,notkeyword=conference]{inproceedings}{Workshop Papers}} -\define@key{paperlist}{theses}[true]{\prop@ppl{thesis}{Theses}} -\define@key{paperlist}{submitted}[true]{\prop@ppl[,keyword=submitted]{unpublished}{Submitted}} -\define@key{paperlist}{books}[true]{\prop@ppl{book}{Monographs}} -\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}} +\newcommand\prop@articles@heading{Articles} +\define@key{paperlist}{articles}[true]{\prop@ppl{article}{\prop@articles@heading}} +\newcommand\prop@chapters@heading{Book Chapters} +\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{\prop@chapters@heading}} +\newcommand\prop@confpapers@heading{Conference Papers} +\define@key{paperlist}{confpapers}[true]% +{\prop@ppl[,keyword=conference]{inproceedings}{\prop@confpapers@heading}} +\newcommand\prop@wspapers@heading{Workshop Papers} +\define@key{paperlist}{wspapers}[true]% +{\prop@ppl[,notkeyword=conference]{inproceedings}{\prop@wspapers@heading}} +\newcommand\prop@theses@heading{Theses} +\define@key{paperlist}{theses}[true]{\prop@ppl{thesis}{\prop@theses@heading}} +\newcommand\prop@submitted@heading{Submitted} +\define@key{paperlist}{submitted}[true]% +{\prop@ppl[,keyword=submitted]{unpublished}{\prop@submitted@heading}} +\newcommand\prop@books@heading {Monographs} +\define@key{paperlist}{books}[true]{\prop@ppl{book}{\prop@books@heading}} +\newcommand\prop@techreports@heading{Technical Reports} +\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{\prop@techreports@heading}} % \end{macrocode} % % \begin{macro}{featured} @@ -2683,13 +2696,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % \end{macrocode} % \end{macro} % \Finale -% \endinput - -% Local Variables: -% mode: doctex -% TeX-master: t -% End: - +% \endinput % LocalWords: localization sec:user-interface standardizes initialization referencable % LocalWords: pages,start,length,caption sec:implwptable draft,yscale organization % LocalWords: tab:collaboration sec:limitations sec:implementation ifgrantagreement @@ -2775,3 +2782,8 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % LocalWords: numericcites LaTeX-proposal:git numeric,hyperref auto,defernumbers % LocalWords: 9,maxcitenames alphabetic,hyperref bigcentering rightskip parindent % LocalWords: parfillskip endbigcenter endtrivlist 2,title + +% Local Variables: +% mode: doctex +% TeX-master: t +% End: diff --git a/base/proposal.pdf b/base/proposal.pdf index a0b2369..269c8d7 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/base/proposal.sty b/base/proposal.sty index f08b672..9e3a651 100644 --- a/base/proposal.sty +++ b/base/proposal.sty @@ -1037,14 +1037,25 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje \newcommand\prop@prl[1]{\message{unclassified: #1}% \printbibliography[heading=subbibliography,title=Unclassified,#1]}% \define@key{paperlist}{unclassified}[true]{\message{unclass: \prop@rl}\prop@prl\prop@rl} -\define@key{paperlist}{articles}[true]{\prop@ppl{article}{Articles}} -\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{Book Chapters}} -\define@key{paperlist}{confpapers}[true]{\prop@ppl[,keyword=conference]{inproceedings}{Conference Papers}} -\define@key{paperlist}{wspapers}[true]{\prop@ppl[,notkeyword=conference]{inproceedings}{Workshop Papers}} -\define@key{paperlist}{theses}[true]{\prop@ppl{thesis}{Theses}} -\define@key{paperlist}{submitted}[true]{\prop@ppl[,keyword=submitted]{unpublished}{Submitted}} -\define@key{paperlist}{books}[true]{\prop@ppl{book}{Monographs}} -\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}} +\newcommand\prop@articles@heading{Articles} +\define@key{paperlist}{articles}[true]{\prop@ppl{article}{\prop@articles@heading}} +\newcommand\prop@chapters@heading{Book Chapters} +\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{\prop@chapters@heading}} +\newcommand\prop@confpapers@heading{Conference Papers} +\define@key{paperlist}{confpapers}[true]% +{\prop@ppl[,keyword=conference]{inproceedings}{\prop@confpapers@heading}} +\newcommand\prop@wspapers@heading{Workshop Papers} +\define@key{paperlist}{wspapers}[true]% +{\prop@ppl[,notkeyword=conference]{inproceedings}{\prop@wspapers@heading}} +\newcommand\prop@theses@heading{Theses} +\define@key{paperlist}{theses}[true]{\prop@ppl{thesis}{\prop@theses@heading}} +\newcommand\prop@submitted@heading{Submitted} +\define@key{paperlist}{submitted}[true]% +{\prop@ppl[,keyword=submitted]{unpublished}{\prop@submitted@heading}} +\newcommand\prop@books@heading {Monographs} +\define@key{paperlist}{books}[true]{\prop@ppl{book}{\prop@books@heading}} +\newcommand\prop@techreports@heading{Technical Reports} +\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{\prop@techreports@heading}} \DeclareBibliographyCategory{featured} \newcommand\prop@paperlist[2][]{% \let\biboldfont\bibfont% @@ -1077,7 +1088,6 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje {\usebibmacro{url+urldate}} {}} - \endinput %% %% End of file `proposal.sty'. diff --git a/base/reporting.cls b/base/reporting.cls index 946662b..007ac9c 100644 --- a/base/reporting.cls +++ b/base/reporting.cls @@ -65,7 +65,6 @@ \setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}} {} - \endinput %% %% End of file `reporting.cls'. diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index e506da6..8f20137 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -133,11 +133,20 @@ % % 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}|]{|\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. +% \DescribeMacro{\dfgprojpapers}|\dfgprojpapers[|\meta{keys}|]{|\meta{refs}|}|, +% \meta{refs} is a comma-separated list of {bib\TeX} keys from the {bib\TeX} database used +% in the proposal. The \meta{keys} that specify whether sub-bibliographies are generated +% (if \meta{keys} is non-empty) and which, and in which order. The \meta{keys} includes +% any of the following: |articles|, |chapters|, |confpapers|, |inproceedings|, |wspapers|, +% |theses|, |submitted|, |books|, and |techreports|. +% +% So |\dfgprojpapers[books,articles,inproceedings]{|\meta{keys}|}| splits the generate +% bibliography in to three sub-bibliographies with the titles: ``Articles'' , +% ``Monographs'', and ``Conference Papers''. The headings can be customized -- e.g. to +% another language by adding |\def\prop@|\meta{key}|@heading{|\meta{Heading}|}| in the +% preamble. % -% The papers listed in |\dfgprojpapers| are put into a special bib\LaTeX category +% The papers listed in |\dfgprojpapers| are put into a special {bib\LaTeX} category % \DescribeMacro{featured}|featured|, and can thus be excluded from the general % bibliography by adding |notcategory=featured| to the final |\printbibliography|. % @@ -620,4 +629,5 @@ Applicant\if@sites\ifnum\the@PIs>1{s}\fi\fi\ \deu{(Antragsteller)}}% % TeX-master: t % End: % LocalWords: localized sec:implementation Initialization ngerman,USenglish itemize -% LocalWords: selectlanguage sec:ourpubs +% LocalWords: selectlanguage sec:ourpubs confpapers inproceedings wspapers techreports +% LocalWords: books,articles,inproceedings diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index 9479000..65be0a2 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/examples/proposal/state.tex b/dfg/examples/proposal/state.tex index b3b37a1..5823fa4 100644 --- a/dfg/examples/proposal/state.tex +++ b/dfg/examples/proposal/state.tex @@ -19,6 +19,7 @@ meeting to enable reviewers to read through the information. Reviews will be based only on the text of the actual proposal. \end{todo} + \subsection{List of Project-Related Publications}\label{sec:projpapers} \begin{todo}{from the proposal template} @@ -39,7 +40,7 @@ \subsubsection{Peer-Reviewed Articles}\label{sec:peer-rev} -\dfgprojpapers{Kohlhase:pdpl10,providemore} +\dfgprojpapers[articles,books,confpapers]{Kohlhase:pdpl10,Lamport:ladps94,Knuth:ttb84,KohDavGin:psewads11,Lange:OpenMathCDLinkedData10,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/eu/eupdata.sty b/eu/eupdata.sty index 7822683..f990e75 100644 --- a/eu/eupdata.sty +++ b/eu/eupdata.sty @@ -8,7 +8,6 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{eupdata}[2016/12/15 v1.5 EU Project Data] - \define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}} \define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#1}\pdata@def{prop}{gen}{coordinator}{#1}} \def\prop@gen@challenge{??}\def\prop@gen@challengeid{??} @@ -20,8 +19,8 @@ \def\prop@gen@outcome{??}\def\prop@gen@outcomeid{??} \define@key{prop@gen}{outcome}{\def\prop@gen@outcome{#1}\pdata@def{prop}{gen}{outcome}{#1}} \define@key{prop@gen}{outcomeid}{\def\prop@gen@outcomeid{#1}\pdata@def{prop}{gen}{outcomeid}{#1}} -\define@key{prop@gen}{callname}{\def\prop@gen@call{#1}\pdata@def{prop}{gen}{callname}{#1}} -\define@key{prop@gen}{callid}{\def\prop@gen@call{#1}\pdata@def{prop}{gen}{callid}{#1}} +\define@key{prop@gen}{callname}{\def\prop@gen@callname{#1}\pdata@def{prop}{gen}{callname}{#1}} +\define@key{prop@gen}{callid}{\def\prop@gen@callid{#1}\pdata@def{prop}{gen}{callid}{#1}} \define@key{prop@gen}{iconrowheight}{\def\prop@gen@iconrowheight{#1}} \define@key{prop@gen}{topicsaddressed}{\def\prop@gen@topicsaddressed{#1}} \endinput diff --git a/eu/euproposal.cls b/eu/euproposal.cls index f90f357..22dfdb7 100644 --- a/eu/euproposal.cls +++ b/eu/euproposal.cls @@ -8,7 +8,6 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{euproposal}[2016/12/15 v1.5 EU Proposal] - \newif\ifpartB\partBfalse \DeclareOption{partB}{\partBtrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}} diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index c553d6f..6aca504 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -293,8 +293,8 @@ \def\prop@gen@outcome{??}\def\prop@gen@outcomeid{??} \define@key{prop@gen}{outcome}{\def\prop@gen@outcome{#1}\pdata@def{prop}{gen}{outcome}{#1}} \define@key{prop@gen}{outcomeid}{\def\prop@gen@outcomeid{#1}\pdata@def{prop}{gen}{outcomeid}{#1}} -\define@key{prop@gen}{callname}{\def\prop@gen@call{#1}\pdata@def{prop}{gen}{callname}{#1}} -\define@key{prop@gen}{callid}{\def\prop@gen@call{#1}\pdata@def{prop}{gen}{callid}{#1}} +\define@key{prop@gen}{callname}{\def\prop@gen@callname{#1}\pdata@def{prop}{gen}{callname}{#1}} +\define@key{prop@gen}{callid}{\def\prop@gen@callid{#1}\pdata@def{prop}{gen}{callid}{#1}} \define@key{prop@gen}{iconrowheight}{\def\prop@gen@iconrowheight{#1}} \define@key{prop@gen}{topicsaddressed}{\def\prop@gen@topicsaddressed{#1}} % diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index 088f195..18b2b81 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/eureporting.cls b/eu/eureporting.cls index e0b4a62..b0976ca 100644 --- a/eu/eureporting.cls +++ b/eu/eureporting.cls @@ -8,7 +8,6 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{eureporting}[2016/12/15 v1.5 EU Project Reporting] - \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions \LoadClass[report,noRAM]{reporting} diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf index ddbea8f..7dfca9c 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ