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

base/Makefile

@@ -12,6 +12,11 @@ include $(PREFIX)/Makefile.vars
 TEXINPUTS = .:
 include $(PREFIX)/Makefile.in
 
+clean: clean-local
+	@for d in $(EXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
+distclean: distclean-local
+	@for d in $(EXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
+
 echo:	
 	echo $(PACKAGEDATE)
 

base/proposal-blx.bib

@@ -1,11 +0,0 @@
-@Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.6 $}
-Do not modify this file!
-
-This is an auxiliary file used by the 'biblatex' package.
-This file may safely be deleted. It will be recreated as
-required.
-
-@Control{biblatex-control,
-  options = {2.6:0:0:1:0:0:1:1:0:1:0:0:12:1:3:1:79:+},
-}

base/proposal.cls

@@ -1021,7 +1021,6 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
                    use the pubspage key in the proposal environment!}}
   {\prop@warnpubs@message%
  \@for\@I:=\prop@gen@pubspages\do{\par\noindent\csname\@I\endcsname}}}
-\defbibheading{empty}{}
 \endinput
 %%
 %% End of file `proposal.cls'.

base/proposal.dtx

@@ -4,7 +4,7 @@
 % Copyright (c) 2011 Michael Kohlhase, all rights reserved
 %
 % This file is distributed under the terms of the LaTeX Project Public
-% License from CTAN archives in directory  macros/latex/base/lppl.txt.
+% License from CTAN archives in directory  macros/latex/base/lppl.txt.la
 % Either version 1.0 or, at your option, any later version.
 %
 % The development version of this file can be found at
@@ -30,6 +30,8 @@
 \usepackage[show]{ed}
 \usepackage[maxbibnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex}
 \addbibresource{../lib/proposal.bib}
+% temporary fix due to http://tex.stackexchange.com/questions/311426/bibliography-error-use-of-blxbblverbaddi-doesnt-match-its-definition-ve
+\makeatletter\def\blx@maxline{77}\makeatother
 \usepackage[bookmarks=true,linkcolor=blue,
  citecolor=blue,urlcolor=blue,colorlinks=true,
  breaklinks=true, bookmarksopen=true]{hyperref}
@@ -2442,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
+%   |\prop@paperlist{|\meta{keys}|}{|\meta{refs}|}| generates a paper list from a list
-%   this section) and activate the keys via |\nocite|. Then we just print the bibliography
+%   \meta{keys} of bibliography keys. It makes some local adaptions to the appearance of
-%   with the empty header we created before.
+%   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}
+\renewcommand{\baselinestretch}{.9}%
-\def\do##1{\addtocategory{featured}{##1}}\docsvlist{#2}%
+\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%
@@ -2458,7 +2463,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
 %    \end{macrocode}
 % \end{macro}
 %
-% We only have to define the |warnpubs| and |empty| heading constructors
+% We define the |warnpubs| heading constructor. 
 %
 %    \begin{macrocode}
 \def\prop@warnpubs@message{Many of the proposers' publications are online at one of the following URIs:}
@@ -2469,7 +2474,6 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
                    use the pubspage key in the proposal environment!}}
   {\prop@warnpubs@message%
  \@for\@I:=\prop@gen@pubspages\do{\par\noindent\csname\@I\endcsname}}}
-\defbibheading{empty}{}
 %</cls|reporting>
 %    \end{macrocode}
 %

base/reporting.cls

@@ -151,7 +151,6 @@
                    use the pubspage key in the proposal environment!}}
   {\prop@warnpubs@message%
  \@for\@I:=\prop@gen@pubspages\do{\par\noindent\csname\@I\endcsname}}}
-\defbibheading{empty}{}
 \endinput
 %%
 %% End of file `reporting.cls'.

dfg/Makefile

@@ -15,5 +15,11 @@ include $(PREFIX)/Makefile.vars
 TEXINPUTS = .:
 include $(PREFIX)/Makefile.in
 
+clean: clean-local
+	@for d in $(EXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
+distclean: distclean-local
+	@for d in $(EXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
+
+
 
 

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
+% \DescribeMacro{\dfgprojpapers}|\dfgprojpapers[|\meta{keys}|]{|\meta{refs}|}|, where
-% comma-separated list of keys from the bibTeX database used in the proposal. Note that
+% \meta{keys} that specify what papers are selected and \meta{refs} is a comma-separated
-% you will have to run |bibtex -min-crossrefs=999 proposal1-blx.aux| to generate file
+% list of bibtex keys from the bibTeX database used in the proposal. 
-% |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|. 
 % 
 % The papers listed in |\dfgprojpapers| are put into a special bib\LaTeX category
 % \DescribeMacro{featured}|featured|, and can thus be excluded from the general

dfg/examples/Makefile

@@ -1,3 +1,4 @@
 DIRS = proposal report simple-proposal
-all: 
+all clean distclean: 
 	@for d in $(DIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
+

dfg/examples/lib/dummy.bib

@@ -5,7 +5,7 @@
   institution = {KWARC Group, Jacobs University Bremen},
   howpublished = {Self-documenting {\LaTeX} package, \url{https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal.pdf}; ask the author for access},
   year = 2010}
-@misc{providemore,title={\ldots}}
+@misc{providemore,title={\ldots should provide more high-class references \ldots},author = {the proposal authors}}
 @BOOK{Lamport:ladps94,
   title = {LaTeX: A Document Preparation System, 2/e},
   publisher = {Addison Wesley},

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 = $(PROPOSAL:%.tex=%.bbl) $(BBL.base:%=$(PROPOSAL:%.tex=%)%-blx.bbl)
 PROPCLS.dir = $(PROP.dir)/base
 PROPETC.dir = $(PROP.dir)/etc
 DFGPROPCLS.dir = $(PROP.dir)/dfg
@@ -64,11 +63,11 @@ $(TARGET.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS)
 	    then $(PDFLATEX)  $<  || $(RM) $@; fi
 
 clean: 
-	rm -f *.log *.blg *~ *.synctex.gz *.cut
+	rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz *.cut
 
 distclean: clean
-	rm -f *.aux *.out *.run.xml *.bbl *.toc *.deliv* *.pdata
+	rm -f *.aux *.ind *.gls *.ps *.dvi *.thm *.out *.run.xml *.bbl *.toc *.deliv* *.pdata *-blx.bib
 	rm -Rf auto
 
 echo:
-	echo $(BIBINPUTS)
+	@echo $(BIBINPUTS)

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

dfg/examples/report/Makefile

@@ -57,10 +57,10 @@ $(TBIB.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS)
 	    then $(PDFLATEX)  $<  || $(RM) $@; fi
 
 clean: 
-	rm -f *.log *.blg *~ *.synctex.gz *.cut
+	rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz *.cut
 
 distclean: clean
-	rm -f *.aux *.out *.run.xml *.bbl *.toc *.deliv* *.pdata
+	rm -f *.aux *.ind *.gls *.ps *.dvi *.thm *.out *.run.xml *.bbl *.toc *.deliv* *.pdata *-blx.bib
 	rm -Rf auto
 
 echo:

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 = $(PROPOSAL:%.tex=%.bbl) $(BBL.base:%=$(PROPOSAL:%.tex=%)%-blx.bbl)
 PROPCLS.dir = $(PROP.dir)/base
 PROPETC.dir = $(PROP.dir)/etc
 DFGPROPCLS.dir = $(PROP.dir)/dfg
@@ -64,11 +63,11 @@ $(TARGET.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS)
 	    then $(PDFLATEX)  $<  || $(RM) $@; fi
 
 clean: 
-	rm -f *.log *.blg *~ *.synctex.gz *.cut
+	rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz *.cut
 
 distclean: clean
-	rm -f *.aux *.out *.run.xml *.bbl *.toc *.deliv* *.pdata
+	rm -f *.aux *.ind *.gls *.ps *.dvi *.thm *.out *.run.xml *.bbl *.toc *.deliv* *.pdata  *-blx.bib
 	rm -Rf auto
 
 echo:
-	echo $(BIBINPUTS)
+	@echo $(BIBINPUTS)

dfg/examples/simple-proposal/proposal-blx.bib

@@ -1,11 +0,0 @@
-@Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.6 $}
-Do not modify this file!
-
-This is an auxiliary file used by the 'biblatex' package.
-This file may safely be deleted. It will be recreated as
-required.
-
-@Control{biblatex-control,
-  options = {2.6:0:0:1:0:0:1:1:0:1:0:0:12:1:3:1:79:+},
-}

eu/Makefile

@@ -14,3 +14,8 @@ include $(PREFIX)/Makefile.vars
 TEXINPUTS = .:
 include $(PREFIX)/Makefile.in
 
+clean: clean-local
+	@for d in $(EXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
+distclean: distclean-local
+	@for d in $(EXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;
+

eu/examples/Makefile

@@ -1,3 +1,3 @@
 DIRS = strep 
-all: 
+all clean distclean: 
 	@for d in $(DIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done;

eu/examples/strep/Makefile

@@ -67,11 +67,11 @@ $(TBIB.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS)
 	    then $(PDFLATEX)  $<  || $(RM) $@; fi
 
 clean: 
-	rm -f *.log *.blg *~ *.synctex.gz *.cut
+	rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz *.cut
 
 distclean: clean
-	rm -f *.aux *.out *.run.xml *.bbl *.toc *.deliv* *.pdata
+	rm -f *.aux *.ind *.gls *.ps *.dvi *.thm *.out *.run.xml *.bbl *.toc *.deliv* *.pdata *-blx.bib
 	rm -Rf auto
 
 echo:
-	echo $(BBL)
+	@echo $(BBL)

lib/Makefile.in

@@ -41,11 +41,11 @@ $(DTX.pdf): %.pdf: %.dtx $(DTX.sty) $(DTX.cls)
 	@if (grep Rerun $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\
 	    then $(PDFLATEX) $(firstword $<); fi
 
-clean:     
+clean-local:     
-	rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg 
+	rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz
 
-distclean: 	clean
+distclean-local: clean-local
-	rm -f *.aux *.ind *.gls *.ps *.dvi *.toc *.thm
+	rm -f *.aux *.ind *.gls *.ps *.dvi *.toc *.thm *.bbl *.bcf *-blx.bib
 	rm -Rf auto	
 
 filedate: