diff --git a/base/Makefile b/base/Makefile index d72521d..848d448 100644 --- a/base/Makefile +++ b/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) diff --git a/base/proposal-blx.bib b/base/proposal-blx.bib deleted file mode 100644 index 0bf384d..0000000 --- a/base/proposal-blx.bib +++ /dev/null @@ -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:+}, -} diff --git a/base/proposal.cls b/base/proposal.cls index 4260e31..ea45eaa 100644 --- a/base/proposal.cls +++ b/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'. diff --git a/base/proposal.dtx b/base/proposal.dtx index bc56ace..ca14e58 100644 --- a/base/proposal.dtx +++ b/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 -% 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% @@ -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}{} % % \end{macrocode} % diff --git a/base/proposal.pdf b/base/proposal.pdf index 222d108..02dd588 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/base/reporting.cls b/base/reporting.cls index f9ce015..984c99e 100644 --- a/base/reporting.cls +++ b/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'. diff --git a/dfg/Makefile b/dfg/Makefile index 4132489..6a35e70 100644 --- a/dfg/Makefile +++ b/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; + + 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/dfgproposal.pdf b/dfg/dfgproposal.pdf index 2b718ba..0fca60d 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/examples/Makefile b/dfg/examples/Makefile index 3674fb3..95d7dbe 100644 --- a/dfg/examples/Makefile +++ b/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; + diff --git a/dfg/examples/lib/dummy.bib b/dfg/examples/lib/dummy.bib index 91c2cd9..103921b 100644 --- a/dfg/examples/lib/dummy.bib +++ b/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}, diff --git a/dfg/examples/proposal/Makefile b/dfg/examples/proposal/Makefile index 44336c1..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 @@ -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) diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf index 7144892..5cea2b6 100644 Binary files a/dfg/examples/proposal/proposal.pdf and b/dfg/examples/proposal/proposal.pdf differ 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/report/Makefile b/dfg/examples/report/Makefile index 3408045..aa97163 100644 --- a/dfg/examples/report/Makefile +++ b/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: diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf index 4ae10d4..db65851 100644 Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ diff --git a/dfg/examples/simple-proposal/Makefile b/dfg/examples/simple-proposal/Makefile index 3d5e2b0..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 @@ -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) diff --git a/dfg/examples/simple-proposal/proposal-blx.bib b/dfg/examples/simple-proposal/proposal-blx.bib deleted file mode 100644 index 0bf384d..0000000 --- a/dfg/examples/simple-proposal/proposal-blx.bib +++ /dev/null @@ -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:+}, -} diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf index 0f68d8f..e9fc554 100644 Binary files a/dfg/examples/simple-proposal/proposal.pdf and b/dfg/examples/simple-proposal/proposal.pdf differ diff --git a/eu/Makefile b/eu/Makefile index 3a8a3af..29023ab 100644 --- a/eu/Makefile +++ b/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; + diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index 8d3cd25..f38d6b4 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/examples/Makefile b/eu/examples/Makefile index fbcd447..411e5dc 100644 --- a/eu/examples/Makefile +++ b/eu/examples/Makefile @@ -1,3 +1,3 @@ DIRS = strep -all: +all clean distclean: @for d in $(DIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done; diff --git a/eu/examples/strep/Makefile b/eu/examples/strep/Makefile index 9b4a6fd..32d4809 100644 --- a/eu/examples/strep/Makefile +++ b/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) diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf index 9e59291..1e2a940 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ diff --git a/lib/Makefile.in b/lib/Makefile.in index 57da62f..a9b9ca8 100644 --- a/lib/Makefile.in +++ b/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: - rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg +clean-local: + rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz -distclean: clean - rm -f *.aux *.ind *.gls *.ps *.dvi *.toc *.thm +distclean-local: clean-local + rm -f *.aux *.ind *.gls *.ps *.dvi *.toc *.thm *.bbl *.bcf *-blx.bib rm -Rf auto filedate: