diff --git a/base/pdata.sty b/base/pdata.sty index ac22fc8..e9f6e6d 100644 --- a/base/pdata.sty +++ b/base/pdata.sty @@ -7,7 +7,7 @@ %% proposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{pdata}[2015/11/22 v1.5 Project Data] +\ProvidesPackage{pdata}[2016/03/05 v1.5 Project Data] \RequirePackage{workaddress}[2011/05/03] \RequirePackage{eurosym} \newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax% diff --git a/base/proposal.cls b/base/proposal.cls index ad35615..a9bc119 100644 --- a/base/proposal.cls +++ b/base/proposal.cls @@ -7,7 +7,7 @@ %% proposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{proposal}[2015/11/22 v1.5 Project Proposal] +\ProvidesClass{proposal}[2016/03/05 v1.5 Project Proposal] \newif\if@wpsubsection\@wpsubsectionfalse \newif\ifsubmit\submitfalse \newif\ifgrantagreement\grantagreementfalse diff --git a/base/proposal.dtx b/base/proposal.dtx index 9e6228a..2cbafdd 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{proposal}[2016/03/05 v1.5 Project Proposal] -%\ProvidesPackage{pdata}[2016/03/05 v1.5 Project Data] -%\ProvidesPackage{reporting}[2016/03/05 v1.5 Project Reporting] +%\ProvidesClass{proposal}[2016/04/15 v1.5 Project Proposal] +%\ProvidesPackage{pdata}[2016/04/15 v1.5 Project Data] +%\ProvidesPackage{reporting}[2016/04/15 v1.5 Project Reporting] %<*driver> \documentclass{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} diff --git a/base/proposal.pdf b/base/proposal.pdf index 2ab30dd..c158289 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/base/reporting.cls b/base/reporting.cls index 5060062..10e3ce5 100644 --- a/base/reporting.cls +++ b/base/reporting.cls @@ -7,7 +7,7 @@ %% proposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{reporting}[2015/11/22 v1.5 Project Reporting] +\ProvidesPackage{reporting}[2016/03/05 v1.5 Project Reporting] \newif\if@wpsubsection\@wpsubsectionfalse \newif\ifsubmit\submitfalse \newif\ifgrantagreement\grantagreementfalse diff --git a/dfg/dfgpdata.sty b/dfg/dfgpdata.sty index db7c641..266e852 100644 --- a/dfg/dfgpdata.sty +++ b/dfg/dfgpdata.sty @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dfgpdata}[2015/11/22 v1.4 DFG Project Data] +\ProvidesPackage{dfgpdata}[2016/01/08 v1.4 DFG Project Data] \newif\ifdeutsch\deutschfalse \DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}} \ProcessOptions diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index 01dbbf9..139c024 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{dfgproposal}[2015/11/22 v1.4 DFG Proposal] +\ProvidesClass{dfgproposal}[2016/01/08 v1.4 DFG Proposal] \newif\ifgeneral\generalfalse \DeclareOption{general}{\generaltrue} \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index 8eeffa9..8e9348b 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{dfgproposal}[2016/01/08 v1.4 DFG Proposal] -%\ProvidesPackage{dfgpdata}[2016/01/08 v1.4 DFG Project Data] -%\ProvidesPackage{dfgreporting}[2016/01/08 v1.4 DFG Project Reporting] +%\ProvidesClass{dfgproposal}[2016/04/15 v1.4 DFG Proposal] +%\ProvidesPackage{dfgpdata}[2016/04/15 v1.4 DFG Project Data] +%\ProvidesPackage{dfgreporting}[2016/04/15 v1.4 DFG Project Reporting] %<*driver> \documentclass[twoside]{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index 5ad6cfd..5430d46 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls index c0d17b3..a9c2951 100644 --- a/dfg/dfgreporting.cls +++ b/dfg/dfgreporting.cls @@ -7,7 +7,7 @@ %% dfgproposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dfgreporting}[2015/11/22 v1.4 DFG Project Reporting] +\ProvidesPackage{dfgreporting}[2016/01/08 v1.4 DFG Project Reporting] \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf index c92966a..7ffb59e 100644 Binary files a/dfg/examples/proposal/proposal.pdf and b/dfg/examples/proposal/proposal.pdf differ diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf index 01cd5d1..0715e84 100644 Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf index 6d1a0f9..01f4818 100644 Binary files a/dfg/examples/simple-proposal/proposal.pdf and b/dfg/examples/simple-proposal/proposal.pdf differ diff --git a/eu/eupdata.sty b/eu/eupdata.sty index a26e81b..6cdbea2 100644 --- a/eu/eupdata.sty +++ b/eu/eupdata.sty @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `pdata') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{eupdata}[2015/11/22 v1.5 EU Project Data] +\ProvidesPackage{eupdata}[2016/01/08 v1.5 EU Project Data] \define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}} \define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#1}\pdata@def{prop}{gen}{coordinator}{#1}} \def\prop@gen@challenge{??}\def\prop@gen@challengeid{??} diff --git a/eu/euproposal.cls b/eu/euproposal.cls index 93c3bb7..b82ba6c 100644 --- a/eu/euproposal.cls +++ b/eu/euproposal.cls @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{euproposal}[2015/11/22 v1.5 EU Proposal] +\ProvidesClass{euproposal}[2016/01/08 v1.5 EU Proposal] \newif\ifpartB\partBfalse \DeclareOption{partB}{\partBtrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}} diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index e42ac5e..a61d9b6 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{euproposal}[2016/01/08 v1.5 EU Proposal] -%\ProvidesPackage{eupdata}[2016/01/08 v1.5 EU Project Data] -%\ProvidesPackage{eureporting}[2016/01/08 v1.5 EU Project Reporting] +%\ProvidesClass{euproposal}[2016/04/15 v1.5 EU Proposal] +%\ProvidesPackage{eupdata}[2016/04/15 v1.5 EU Project Data] +%\ProvidesPackage{eureporting}[2016/04/15 v1.5 EU Project Reporting] %<*driver> \documentclass[twoside]{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index ffadf9c..0df50e8 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/eureporting.cls b/eu/eureporting.cls index 9195aec..cec97c6 100644 --- a/eu/eureporting.cls +++ b/eu/eureporting.cls @@ -7,7 +7,7 @@ %% euproposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{eureporting}[2015/11/22 v1.5 EU Project Reporting] +\ProvidesPackage{eureporting}[2016/01/08 v1.5 EU Project Reporting] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions \LoadClass[report,noRAM]{reporting} diff --git a/eu/examples/fetopenstrep/propB.pdf b/eu/examples/fetopenstrep/propB.pdf index b2a590f..3699767 100644 Binary files a/eu/examples/fetopenstrep/propB.pdf and b/eu/examples/fetopenstrep/propB.pdf differ diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf index dbebfbc..910b207 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ diff --git a/lib/Makefile.ctan b/lib/Makefile.ctan index a021610..d24d524 100644 --- a/lib/Makefile.ctan +++ b/lib/Makefile.ctan @@ -58,10 +58,10 @@ ctan: all filedate checksum # this target is run on EXPORTED. It first makes the target tdsext below, # and then copies all necessary stuff into CTANDIR. ctanext: tdsext - @echo "making a CTAN compliant archive in " pwd + @echo "making a CTAN compliant archive in $(CTANDIR)" rm -Rf $(CTANDIR) $(CTANZIP) - @echo " preparing a copy $(CTANDIR) from $(EXPORTED)" - mkdir -p $(CTANDIR) + mkdir -p $(CTANDIR) + @echo " copying material from $(EXPORTED) to $(CTANDIR)" @for d in $(DTXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) lctan) done @for d in $(SRCDIRS) $(DOCDIRS); do (cp -R $$d $(CTANDIR)) done; @for d in $(SRCFILES); do (cp -p $$d $(CTANDIR)) done; diff --git a/lib/Makefile.in b/lib/Makefile.in index 7da4054..e7c518f 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -80,7 +80,7 @@ ltds: lctan: mkdir -p $(CTANDIR) - cp $(DTX.src) $(TDS.src) $(TDS.tex) $(CTANDIR) + cp $(DTX.src) $(DTX.sty) $(DTX.cls) $(TDS.src) $(TDS.tex) $(CTANDIR) cp README $(DTX.pdf) $(EXAMPLE.tex) $(EXAMPLE.pdf) $(TDS.doc) $(CTANDIR) @for d in $(TDS.exdirs); do cp -R $(TDS.exdirs) $(CTANDIR); done