From 6de8509df43d3ace738f50fc0abe61db8b5a673a Mon Sep 17 00:00:00 2001 From: Michael Kohlhase Date: Tue, 13 Jan 2015 11:25:06 +0100 Subject: [PATCH] adapted to the new production process --- dfg/examples/proposal/proposal.tex | 2 -- dfg/examples/simple-proposal/proposal.tex | 12 ++++++------ eu/examples/fetopenstrep/Makefile | 15 ++++++++++++--- eu/examples/fetopenstrep/propB.tex | 13 ++++++------- eu/examples/strep/Makefile | 13 +++++++++++-- eu/examples/strep/propB.tex | 14 ++++++-------- 6 files changed, 41 insertions(+), 28 deletions(-) diff --git a/dfg/examples/proposal/proposal.tex b/dfg/examples/proposal/proposal.tex index 4d8d5d4..85978d4 100644 --- a/dfg/examples/proposal/proposal.tex +++ b/dfg/examples/proposal/proposal.tex @@ -4,8 +4,6 @@ % - public.tex (like submit.tex, but no financials either) \providecommand{\classoptions}{,keys} % to be overwritten in variants \documentclass[RAM,gitinfo\classoptions]{dfgproposal} -%\documentclass[submit]{dfgproposal} -%\documentclass[submit,public]{dfgproposal} \addbibresource{../lib/dummy} \usepackage[utf8]{inputenc} \input{../lib/WApersons} diff --git a/dfg/examples/simple-proposal/proposal.tex b/dfg/examples/simple-proposal/proposal.tex index eb57181..23dc5cd 100644 --- a/dfg/examples/simple-proposal/proposal.tex +++ b/dfg/examples/simple-proposal/proposal.tex @@ -1,9 +1,9 @@ -% the document class specification for the proposal writing process, add the 'submit' option -% for submitting (switches off various draft features); add the 'public' option to exclude -% any private parts. -\documentclass[RAM,noworkareas,gitinfo]{dfgproposal} -%\documentclass[submit]{dfgproposal} -%\documentclass[submit,public]{dfgproposal} +% The main file for developing the proposal. +% Variants with different class options are +% - submit.tex (no draft stuff, no ednotes, no revision information) +% - 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} \input{../lib/WApersons} diff --git a/eu/examples/fetopenstrep/Makefile b/eu/examples/fetopenstrep/Makefile index 7cd9e01..9b4a6fd 100644 --- a/eu/examples/fetopenstrep/Makefile +++ b/eu/examples/fetopenstrep/Makefile @@ -1,3 +1,9 @@ +########################################################################### +# Automating proposal management by make. +# The participants work on proposal.tex in "draft" mode, which gives a lot +# of information to the developers. Variants submit.tex and public.tex are +# used to prepare official versions (hiding development/private info). +########################################################################### # possibly customize the following variables to your setting PROPOSAL = propB.tex # the proposal BIB = ../lib/dummy.bib # bibTeX databases @@ -14,7 +20,7 @@ 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 2 3 4 -BBL = propB.bbl $(BBL.base:%=propB%-blx.bbl) +BBL = $(PROPOSAL:%.tex=%.bbl) $(BBL.base:%=$(PROPOSAL:%.tex=%)%-blx.bbl) PROPCLS.dir = $(PROP.dir)/base PROPETC.dir = $(PROP.dir)/etc EUPROPCLS.dir = $(PROP.dir)/eu @@ -27,8 +33,11 @@ PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(EUPROPCLS.clssty:%=$(EUPROPCLS. all: $(TBIB.pdf) $(TSIMP.pdf) -cd: # make cd will prepare CD for burning - mkdir CD;make $(TARGET.pdf); cp $(TARGET.pdf) CD +submit: + $(MAKE) -w PROPOSAL=final.tex all + +public: + $(MAKE) -w PROPOSAL=public.tex all bbl: $(BBL) $(BBL): %.bbl: %.aux diff --git a/eu/examples/fetopenstrep/propB.tex b/eu/examples/fetopenstrep/propB.tex index b066d53..5ae09a1 100644 --- a/eu/examples/fetopenstrep/propB.tex +++ b/eu/examples/fetopenstrep/propB.tex @@ -1,10 +1,9 @@ -% the document class specification for the proposal writing process, add the 'submit' option -% for submitting (switches off various draft features); add the 'public' option to exclude -% any private parts. -\documentclass[noworkareas,deliverables,gitinfo]{euproposal} -%\documentclass[submit,noworkareas,deliverables]{euproposal} -%\documentclass[submit,public,noworkareas,deliverables]{euproposal} -%% TODO these don't work with WA (https://trac.kwarc.info/sTeX/ticket/1697) +% The main file for developing the proposal. +% Variants with different class options are +% - submit.tex (no draft stuff, no ednotes, no revision information) +% - public.tex (like submit.tex, but no financials either) +\providecommand{\classoptions}{,keys} % to be overwritten in variants +\documentclass[noworkareas,deliverables,gitinfo,propB\classoptions]{euproposal} %\usepackage[T1]{fontenc} %\usepackage[utf8]{inputenc} \addbibresource{../lib/dummy} diff --git a/eu/examples/strep/Makefile b/eu/examples/strep/Makefile index fea2ef3..9b4a6fd 100644 --- a/eu/examples/strep/Makefile +++ b/eu/examples/strep/Makefile @@ -1,3 +1,9 @@ +########################################################################### +# Automating proposal management by make. +# The participants work on proposal.tex in "draft" mode, which gives a lot +# of information to the developers. Variants submit.tex and public.tex are +# used to prepare official versions (hiding development/private info). +########################################################################### # possibly customize the following variables to your setting PROPOSAL = propB.tex # the proposal BIB = ../lib/dummy.bib # bibTeX databases @@ -27,8 +33,11 @@ PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(EUPROPCLS.clssty:%=$(EUPROPCLS. all: $(TBIB.pdf) $(TSIMP.pdf) -cd: # make cd will prepare CD for burning - mkdir CD;make $(TARGET.pdf); cp $(TARGET.pdf) CD +submit: + $(MAKE) -w PROPOSAL=final.tex all + +public: + $(MAKE) -w PROPOSAL=public.tex all bbl: $(BBL) $(BBL): %.bbl: %.aux diff --git a/eu/examples/strep/propB.tex b/eu/examples/strep/propB.tex index 843e6d9..986826c 100644 --- a/eu/examples/strep/propB.tex +++ b/eu/examples/strep/propB.tex @@ -1,16 +1,14 @@ -% the document class specification for the proposal writing process, add the 'submit' option -% for submitting (switches off various draft features); add the 'public' option to exclude -% any private parts. -\documentclass[noworkareas,deliverables,gitinfo]{euproposal} -%\documentclass[submit,noworkareas,deliverables]{euproposal} -%\documentclass[submit,public,noworkareas,deliverables]{euproposal} -%% TODO these don't work with WA (https://trac.kwarc.info/sTeX/ticket/1697) +% The main file for developing the proposal. +% Variants with different class options are +% - submit.tex (no draft stuff, no ednotes, no revision information) +% - public.tex (like submit.tex, but no financials either) +\providecommand{\classoptions}{,keys} % to be overwritten in variants +\documentclass[noworkareas,deliverables,gitinfo,propB\classoptions]{euproposal} %\usepackage[T1]{fontenc} %\usepackage[utf8]{inputenc} \addbibresource{../lib/dummy} \input{../lib/WApersons}% Some sections of the included files depend on this. - \begin{document} \begin{center}\color{red}\huge This mock proposal is just an example for \texttt{euproposal.cls} it reflects the ICT