diff --git a/base/proposal.pdf b/base/proposal.pdf index e4b2019..bc87682 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index 5b4c913..5080e90 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -38,7 +38,7 @@ \dfg@applicants@private@lines\hline \end{tabular}} \renewenvironment{prop@proposal} -{\ifgeneral% +{\ifgeneral \ifsubmit\setcounter{page}{1}\else \thispagestyle{empty}% \begin{center} diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index c6200cf..dff2cb4 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index d2e91c8..bacf575 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/examples/dfg/lib/dummy.bib b/examples/dfg/lib/dummy.bib index 103921b..42d4583 100644 --- a/examples/dfg/lib/dummy.bib +++ b/examples/dfg/lib/dummy.bib @@ -1,4 +1,3 @@ -@PREAMLE{\usepackage{url}} @misc{Kohlhase:pdpl10, author = {Michael Kohlhase}, title = {Preparing {DFG} Proposals in {\LaTeX} with \texttt{dfgproposal.cls}}, diff --git a/examples/dfg/proposal/Makefile b/examples/dfg/proposal/Makefile index 6c1edc2..d251b39 100644 --- a/examples/dfg/proposal/Makefile +++ b/examples/dfg/proposal/Makefile @@ -6,7 +6,7 @@ ########################################################################### # possibly customize the following variables to your setting PROPOSAL = proposal.tex# # the proposal -BIB = ../lib# # bibTeX databases PROP.dir = ../../..# # The LaTeX-proposal class directory +BIB = $(PROP.dir)/lib/dummy.bib# # bibTeX databases ########################################################################### include $(PROP.dir)/lib/Makefile.dfgproposal diff --git a/examples/dfg/proposal/proposal.pdf b/examples/dfg/proposal/proposal.pdf deleted file mode 100644 index 17c4497..0000000 Binary files a/examples/dfg/proposal/proposal.pdf and /dev/null differ diff --git a/examples/dfg/proposal/proposal.tex b/examples/dfg/proposal/proposal.tex index 0128e19..74e34e2 100644 --- a/examples/dfg/proposal/proposal.tex +++ b/examples/dfg/proposal/proposal.tex @@ -4,7 +4,7 @@ % - public.tex (like submit.tex, but no financials either) \providecommand{\classoptions}{,keys} % to be overwritten in variants \documentclass[RAM,gitinfo\classoptions]{dfgproposal} -\addbibresource{../lib/dummy} +\addbibresource{../lib/dummy.bib} \usepackage[utf8]{inputenc} \input{../lib/WApersons} % temporary fix for biblatex in TeXLive 2016, diff --git a/examples/dfg/report/Makefile b/examples/dfg/report/Makefile index 3b87b11..0ecb810 100644 --- a/examples/dfg/report/Makefile +++ b/examples/dfg/report/Makefile @@ -6,7 +6,7 @@ ########################################################################### # possibly customize the following variables to your setting REPORT = finalreport.tex# # the report -BIB = ../lib/dummy.bib# # bibTeX databases -PROP.dir = ../../..# +PROP.dir = ../../..# # The LaTeX-proposal class directory +BIB = ../lib/dummy.bib# # bibTeX databases ########################################################################### include $(PROP.dir)/lib/Makefile.dfgproposal diff --git a/examples/dfg/report/finalreport.pdf b/examples/dfg/report/finalreport.pdf deleted file mode 100644 index b629498..0000000 Binary files a/examples/dfg/report/finalreport.pdf and /dev/null differ diff --git a/examples/dfg/simple-proposal/Makefile b/examples/dfg/simple-proposal/Makefile index 4af7ec6..45444f9 100644 --- a/examples/dfg/simple-proposal/Makefile +++ b/examples/dfg/simple-proposal/Makefile @@ -5,8 +5,8 @@ # used to prepare official versions (hiding development/private info). ########################################################################### # possibly customize the following variables to your setting -PROPOSAL = proposal.tex# # the proposal -BIB = ../lib/dummy.bib# # bibTeX databases +PROPOSAL = proposal.tex# # the proposal PROP.dir = ../../.. +BIB = ../lib/dummy.bib# # bibTeX databases ########################################################################### include $(PROP.dir)/lib/Makefile.dfgproposal diff --git a/examples/dfg/simple-proposal/proposal.pdf b/examples/dfg/simple-proposal/proposal.pdf deleted file mode 100644 index 2a322db..0000000 Binary files a/examples/dfg/simple-proposal/proposal.pdf and /dev/null differ diff --git a/examples/dfg/simple-proposal/proposal.tex b/examples/dfg/simple-proposal/proposal.tex index d24abae..9b813f2 100644 --- a/examples/dfg/simple-proposal/proposal.tex +++ b/examples/dfg/simple-proposal/proposal.tex @@ -4,7 +4,7 @@ % - public.tex (like submit.tex, but no financials either) \providecommand{\classoptions}{,keys} % to be overwritten in variants \documentclass[gitinfo,noworkareas,RAM\classoptions]{dfgproposal} -\addbibresource{../lib/dummy} +\addbibresource{../lib/dummy.bib} \input{../lib/WApersons} diff --git a/examples/eu/strep/Makefile b/examples/eu/strep/Makefile index c7b6b11..7ae6aa7 100644 --- a/examples/eu/strep/Makefile +++ b/examples/eu/strep/Makefile @@ -6,8 +6,8 @@ ########################################################################### # possibly customize the following variables to your setting PROPOSAL = propB.tex # the proposal -BIB = ../lib/dummy.bib # bibTeX databases -PROP.dir = ../../.. +PROP.dir = ../../..# # The LaTeX-proposal class directory +BIB = $(PROP.dir)/lib/dummy.bib# # bibTeX databases ########################################################################### # the following are computed TSIMP = # pdflatex Targets without bibTeX @@ -61,9 +61,9 @@ $(TBIB.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS) sort $(PROPOSAL:%.tex=%.delivs) > $(PROPOSAL:%.tex=%.deliverables) @if (test -e $(patsubst %.tex, %.idx, $<));\ then makeindex $(patsubst %.tex, %.idx, $<); fi - $(MAKE) -$(MAKEFLAGS) $(BBL) - @if (grep "(re)run BibTeX" $(patsubst %.tex, %.log, $<)> /dev/null);\ - then $(MAKE) -B $(BBL); fi + biber $(basename $<) + @if (grep "(re)run" $(patsubst %.tex, %.log, $<)> /dev/null);\ + then biber $(basename $<); fi $(PDFLATEX) $< || $(RM) $@ @if (grep Rerun $(patsubst %.tex, %.log, $<) > /dev/null);\ then $(PDFLATEX) $< || $(RM) $@; fi diff --git a/examples/eu/strep/propB.pdf b/examples/eu/strep/propB.pdf deleted file mode 100644 index 9698386..0000000 Binary files a/examples/eu/strep/propB.pdf and /dev/null differ diff --git a/examples/eu/strep/propB.tex b/examples/eu/strep/propB.tex index 8dc1c24..3efcc46 100644 --- a/examples/eu/strep/propB.tex +++ b/examples/eu/strep/propB.tex @@ -6,7 +6,7 @@ \documentclass[noworkareas,deliverables,gitinfo,report,propB\classoptions]{euproposal} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} -\addbibresource{../lib/dummy} +\addbibresource{../lib/dummy.bib} \input{../lib/WApersons}% Some sections of the included files depend on this. \begin{document} diff --git a/lib/Makefile.dfgproposal b/lib/Makefile.dfgproposal index d13d31e..fc83213 100644 --- a/lib/Makefile.dfgproposal +++ b/lib/Makefile.dfgproposal @@ -56,8 +56,8 @@ $(TARGET.pdf): %.pdf: %.tex $(SRC) $(BIBS) $(PROPCLS) @if (test -e $(patsubst %.tex, %.idx, $<));\ then makeindex $(patsubst %.tex, %.idx, $<); fi # bbl is up to date $(MAKE) -$(MAKEFLAGS) $(BBL) - @if (grep "(re)run BibTeX" $(patsubst %.tex, %.log, $<)> /dev/null);\ - then $(MAKE) -B $(BBL); fi + @if (grep "(re)run" $(patsubst %.tex, %.log, $<)> /dev/null);\ + then biber $(basename $<); fi $(PDFLATEX) $< || $(RM) $@ @if (grep Rerun $(patsubst %.tex, %.log, $<) > /dev/null);\ then $(PDFLATEX) $< || $(RM) $@; fi