diff --git a/base/proposal-blx.bib b/base/proposal-blx.bib index 0bf384d..4381008 100644 --- a/base/proposal-blx.bib +++ b/base/proposal-blx.bib @@ -1,5 +1,5 @@ @Comment{$ biblatex control file $} -@Comment{$ biblatex version 2.6 $} +@Comment{$ biblatex version 2.7 $} Do not modify this file! This is an auxiliary file used by the 'biblatex' package. @@ -7,5 +7,5 @@ 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:+}, + options = {2.7:0:0:1:0:1:1:0:1:0:0:12:3:1:77:+:anyt}, } diff --git a/base/proposal.dtx b/base/proposal.dtx index bc56ace..7c304c1 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} diff --git a/base/proposal.pdf b/base/proposal.pdf index 222d108..cee7b6f 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/dfg/Makefile b/dfg/Makefile index 4132489..d5bb39b 100644 --- a/dfg/Makefile +++ b/dfg/Makefile @@ -15,5 +15,9 @@ include $(PREFIX)/Makefile.vars TEXINPUTS = .: include $(PREFIX)/Makefile.in +clean distclean: + @for d in $(EXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done; + + 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/proposal/Makefile b/dfg/examples/proposal/Makefile index 44336c1..618a3cd 100644 --- a/dfg/examples/proposal/Makefile +++ b/dfg/examples/proposal/Makefile @@ -64,11 +64,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 rm -Rf auto echo: - echo $(BIBINPUTS) + @echo $(BIBINPUTS) diff --git a/dfg/examples/simple-proposal/Makefile b/dfg/examples/simple-proposal/Makefile index 3d5e2b0..1c01aae 100644 --- a/dfg/examples/simple-proposal/Makefile +++ b/dfg/examples/simple-proposal/Makefile @@ -64,11 +64,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 rm -Rf auto echo: - echo $(BIBINPUTS) + @echo $(BIBINPUTS) diff --git a/lib/Makefile.in b/lib/Makefile.in index f4d02df..ac73ac7 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -42,7 +42,7 @@ $(DTX.pdf): %.pdf: %.dtx $(DTX.sty) $(DTX.cls) then $(PDFLATEX) $(firstword $<); fi clean: - rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg + rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz distclean: clean rm -f *.aux *.ind *.gls *.ps *.dvi *.toc *.thm *.bbl *.bcf