Merge branch 'master' of http://github.com/KWARC/LaTeX-proposal

base/pdata.sty

@@ -127,7 +127,6 @@
 \def\@dmp#1{\ifkeys\marginpar{#1}\fi}
 \renewcommand\euro{\officialeuro\xspace}
 
-
 \endinput
 %%
 %% End of file `pdata.sty'.

base/proposal.cls

@@ -39,7 +39,6 @@
 \LoadClass[a4paper,twoside]{\proposal@class}
 \RequirePackage{proposal}
 
-
 \endinput
 %%
 %% End of file `proposal.cls'.

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}}
+\newcommand\prop@articles@heading{Articles}
-\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{Book Chapters}}
+\define@key{paperlist}{articles}[true]{\prop@ppl{article}{\prop@articles@heading}}
-\define@key{paperlist}{confpapers}[true]{\prop@ppl[,keyword=conference]{inproceedings}{Conference Papers}}
+\newcommand\prop@chapters@heading{Book Chapters}
-\define@key{paperlist}{wspapers}[true]{\prop@ppl[,notkeyword=conference]{inproceedings}{Workshop Papers}}
+\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{\prop@chapters@heading}}
-\define@key{paperlist}{theses}[true]{\prop@ppl{thesis}{Theses}}
+\newcommand\prop@confpapers@heading{Conference Papers}
-\define@key{paperlist}{submitted}[true]{\prop@ppl[,keyword=submitted]{unpublished}{Submitted}}
+\define@key{paperlist}{confpapers}[true]%
-\define@key{paperlist}{books}[true]{\prop@ppl{book}{Monographs}}
+{\prop@ppl[,keyword=conference]{inproceedings}{\prop@confpapers@heading}}
-\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}}
+\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
+% \endinput 
-
-% Local Variables:
-% mode: doctex
-% TeX-master: t
-% End:
-
 %  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:

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}}
+\newcommand\prop@articles@heading{Articles}
-\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{Book Chapters}}
+\define@key{paperlist}{articles}[true]{\prop@ppl{article}{\prop@articles@heading}}
-\define@key{paperlist}{confpapers}[true]{\prop@ppl[,keyword=conference]{inproceedings}{Conference Papers}}
+\newcommand\prop@chapters@heading{Book Chapters}
-\define@key{paperlist}{wspapers}[true]{\prop@ppl[,notkeyword=conference]{inproceedings}{Workshop Papers}}
+\define@key{paperlist}{chapters}[true]{\prop@ppl{inbook}{\prop@chapters@heading}}
-\define@key{paperlist}{theses}[true]{\prop@ppl{thesis}{Theses}}
+\newcommand\prop@confpapers@heading{Conference Papers}
-\define@key{paperlist}{submitted}[true]{\prop@ppl[,keyword=submitted]{unpublished}{Submitted}}
+\define@key{paperlist}{confpapers}[true]%
-\define@key{paperlist}{books}[true]{\prop@ppl{book}{Monographs}}
+{\prop@ppl[,keyword=conference]{inproceedings}{\prop@confpapers@heading}}
-\define@key{paperlist}{techreports}[true]{\prop@ppl{techreport}{Technical Reports}}
+\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'.

base/reporting.cls

@@ -65,7 +65,6 @@
 \setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}}
 {}
 
-
 \endinput
 %%
 %% End of file `reporting.cls'.

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
+% \DescribeMacro{\dfgprojpapers}|\dfgprojpapers[|\meta{keys}|]{|\meta{refs}|}|,
-% \meta{keys} that specify what papers are selected and \meta{refs} is a comma-separated
+% \meta{refs} is a comma-separated list of {bib\TeX} keys from the {bib\TeX} database used
-% list of bibtex keys from the bibTeX database used in the proposal. 
+% 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

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

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}{callname}{\def\prop@gen@callname{#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}{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

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}}

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}{callname}{\def\prop@gen@callname{#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}{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}}
 %</pdata>

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}