diff --git a/.gitignore b/.gitignore index 7d161da..a5ade2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +SPLIT.at proposal.ctan.zip auto *.acn diff --git a/README.ctan b/README.ctan index 29c2b7e..06a456c 100644 --- a/README.ctan +++ b/README.ctan @@ -1,5 +1,5 @@ LaTeX-proposal: A set of LaTeX classes for preparing proposals for collaborative projects -Version: 2016-04-15 +Version: 2019-03-21 The base proposal class supports many of the general elements of project proposals. It is optimized towards collaborating on writing project proposals. This class is intended to be @@ -13,7 +13,7 @@ lib: Makefiles for the management of self-documenting packages bin: A script that makes GitHub issues from the deliverables of a proposal for project managment if the proposal is granted. -Copyright(c) 2016 Michael Kohlhase +Copyright(c) 2019 Michael Kohlhase The package is distributed under the terms of the LaTeX Project Public License (LPPL) The development version of this package can be found at diff --git a/base/Makefile b/base/Makefile index 848d448..4953ace 100644 --- a/base/Makefile +++ b/base/Makefile @@ -4,7 +4,6 @@ TDSCOLL = proposal DTX.cls.base = proposal DTX = proposal.dtx TDS.tex = reporting.cls pdata.sty -CTAN = $(TDS.tex) REDUNDANT = dcm.sty metakeys.sty sref.sty all: package doc diff --git a/base/README b/base/README index 5077b8f..3f36fa5 100644 --- a/base/README +++ b/base/README @@ -8,5 +8,5 @@ Copyright(c) 2010 Michael Kohlhase The package is distributed under the terms of the LaTeX Project Public License (LPPL) The development version of this package can be found at -https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal +https://github.com/KWARC/LaTeX-proposal diff --git a/base/pdata.sty b/base/pdata.sty index 74760ca..1ace7a9 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}[2016/12/15 v1.6 Project Data] +\ProvidesPackage{pdata}[2019/03/21 v1.6 Project Data] \RequirePackage{workaddress}[2016/07/06] \RequirePackage{eurosym} \newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax% diff --git a/base/proposal.cls b/base/proposal.cls index ab7fc36..ebebd3f 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}[2016/12/15 v1.6 Project Proposal] +\ProvidesClass{proposal}[2019/03/21 v1.6 Project Proposal] \newif\if@wpsubsection\@wpsubsectionfalse \newif\ifsubmit\submitfalse \newif\ifgrantagreement\grantagreementfalse diff --git a/base/proposal.dtx b/base/proposal.dtx index c51f483..ef07ecd 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -13,10 +13,10 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{proposal}[2016/12/15 v1.6 Project Proposal] -%\ProvidesPackage{proposal}[2016/12/15 v1.6 Project Proposal] -%\ProvidesPackage{pdata}[2016/12/15 v1.6 Project Data] -%\ProvidesPackage{reporting}[2016/12/15 v1.6 Project Reporting] +%\ProvidesClass{proposal}[2019/03/21 v1.6 Project Proposal] +%\ProvidesPackage{proposal}[2019/03/21 v1.6 Project Proposal] +%\ProvidesPackage{pdata}[2019/03/21 v1.6 Project Data] +%\ProvidesPackage{reporting}[2019/03/21 v1.6 Project Reporting] %<*driver> \documentclass{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} @@ -326,6 +326,8 @@ % \item In multi-site proposals the \DescribeMacro{lead} |lead| key specifies the work % package or work area lead, the value of this feature should be the short name of the % respective partner. +% \item In multi-site proposals the number of sites can be written as +% |\pdatacount{all}{site}|. % \item For work packages with many prospers the \DescribeMacro{swsites}|swsites| key % can be given (no value needed) to turn the site names sideways to conserve % (horizontal) space. @@ -370,7 +372,7 @@ % run time of the work phase and the optional |!|\meta{force} specifies the work force, % i.e. the intensity of work as a number between 0 and 1. If no force is given, the % default is 1. The main reason for specifying this metadata for tasks is to generate a -% Gantt chart (see Section~\ref{sec:user:gantt}). +% Gantt chart (see Section~\ref{sec:user:gantt}). % % \subsection{Milestones and Deliverables}\label{sec:user:deliverables} % @@ -677,9 +679,9 @@ \RequirePackage[scaled=.90]{helvet} \RequirePackage{textcomp} \if@numericcites -\RequirePackage[style=numeric,hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19] +\RequirePackage[style=numeric,hyperref=auto,defernumbers=true,giveninits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19] \else -\RequirePackage[style=alphabetic,hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19] +\RequirePackage[style=alphabetic,hyperref=auto,defernumbers=true,giveninits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19] \fi \RequirePackage{csquotes} \RequirePackage{mdframed} @@ -701,10 +703,10 @@ % % \begin{macrocode} \ifsubmit -\RequirePackage[hide]{ed} +\RequirePackage[hide,marginnote]{ed} \if@svninfo\RequirePackage[final,today]{svninfo}\fi \else -\RequirePackage[show]{ed} +\RequirePackage[show,marginnote]{ed} \if@svninfo\RequirePackage[eso-foot,today]{svninfo}\fi \if@gitinfo\RequirePackage[mark]{gitinfo2}\fi \fi @@ -910,9 +912,9 @@ % % \begin{environment}{proposal} % The |proposal| environment reads the metadata keys defined above, and if there were no -% |site| keys, then it defines keys |RM| and |RAM| (unless the |noRAM| package option -% was given) for the |workpackage| environment. Also it reads the project data file and -% opens up the project data file |\pdata@out|, which it also closes at the end. +% |site| keys, then it defines keys |RM| and |RAM| (if the |RAM| package option was +% given) for the |workpackage| environment. Also it reads the project data file and +% opens up the project data file |\pdata@out|, which it also closes at the end. % % The environment calls an internal version of the environment |prop@proposal| that can % be customized by the specializing classes. @@ -929,7 +931,9 @@ \newcounter{@PIs} \@ifundefined{prop@gen@PIs}{}{\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}} \newcounter{@sites} -\@ifundefined{prop@gen@sites}{}{\@for\@I:=\prop@gen@sites\do{\stepcounter{@sites}}} +\@ifundefined{prop@gen@sites}{}{\@for\@I:=\prop@gen@sites\do{\stepcounter{@sites}} +\pdata@def{all}{site}{ids}{\prop@gen@sites}% +\pdata@def{all}{site}{count}{\the@site}} \setcounter{page}{0} \begin{prop@proposal}} % \end{macrocode} @@ -937,7 +941,7 @@ % references. % \begin{macrocode} {\end{prop@proposal} -\pdata@def{prop}{page}{last}{\thepage}\ofpagefalse +\pdata@def{prop}{page}{last}{\thepage}\ofpagefalse% \pdata@close} % % \end{macrocode} @@ -986,8 +990,8 @@ % \begin{macro}{\site*} % \begin{macrocode} %<*sty> -\newcommand\site[1]{\hyperlink{site@#1@target}{\wa@ref3{institution}{#1}{acronym}}} -\newcommand\sitename[1]{\hyperlink{site@#1@target}{\wa@ref3{institution}{#1}{name}}} +\newcommand\site[1]{\hyperlink{site@#1@target}{\textbf{\wa@ref3{institution}{#1}{acronym}}}} +\newcommand\sitename[1]{\hyperlink{site@#1@target}{\textbf{\wa@ref3{institution}{#1}{name}}}} % \end{macrocode} % \end{macro} % @@ -1317,9 +1321,10 @@ \else \@ifundefined{@wps}{}{\pdata@def{all}{wp}{ids}\@wps} \fi -\ifdelivs\@ifundefined{mile@stones}{} -{\@for\@I:=\mile@stones\do{% -\pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}}\fi +\ifdelivs\edef\mile@stones{\pdataref@safe{all}{mile}{ids}} +\@for\@I:=\mile@stones\do{% + \message{milestone: \@I, delivs: \csname\@I delivs\endcsname} + \pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}\fi \ifwork@areas\pdata@def{all}{wa}{count}{\thewa}\fi \pdata@def{all}{wp}{count}{\theallwp} \ifdelivs @@ -1346,7 +1351,7 @@ \ifwork@areas \newcommand\task@label[3]{\task@@label{#1.#2.#3}} \else -\newcommand\task@label[2]{\task@@label{T#1.#2}} +\newcommand\task@label[2]{\task@@label{#1.#2}} \fi % \end{macrocode} % We define the keys for the task macro @@ -1361,6 +1366,7 @@ \define@key{task}{issue}{\def\task@issue{#1}} \define@key{task}{status}{\def\task@status{#1}} \def\@@status@canceled{canceled} +\newif\if@taskshowwps\@taskshowwpsfalse \def\task@set#1{\edef\task@id{task\thetask@all} \def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}\def\task@title{} \setkeys{task}{#1}} @@ -1377,7 +1383,7 @@ % The |task| environment. We first set up config stuff % \begin{macrocode} \newcounter{alltasks} -\def\task@post@title@space{ } +\if@taskshowwps\else\def\task@post@title@space{}\fi \newcommand\task@legend@partners{Sites: } \newcommand\task@legend@PM{PM} % \end{macrocode} @@ -1397,6 +1403,7 @@ % \end{macrocode} % now we decode and show the work phases on the task, if they have been specified. % \begin{macrocode} +\if@taskshowwps \def\@initial{0-0}% \ifx\task@wphases\@initial\else% \let\@@sep=\relax\@for\@I:=\task@wphases% @@ -1404,14 +1411,15 @@ \@@sep\show@wphase\wphase@start\wphase@end\wphase@force% \let\@@sep=\sep@wphases}% \fi% initial +\fi% \if@taskshowwps % \end{macrocode} % in non-|submit| mode we give the specified PM for cross-checking % \begin{macrocode} -\ifsubmit\else\ifx\task@PM\@empty\else\task@PM~\task@legend@PM;\fi\fi% +\ifsubmit\else\ifx\task@PM\@empty\else; \task@PM~\task@legend@PM\fi\fi% % \end{macrocode} % and we list the partners who contribute if they are specified. % \begin{macrocode} -\if@sites% +\if@sites;% \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)% \@for\@I:=\task@partners\do{, \site\@I}\\\fi% % \end{macrocode} @@ -1421,7 +1429,7 @@ \xdef\@@involvement{}\xdef\@@inv{}% \xdef\@@sep{, }\def\m@sep{}% do not show the sep the first time around \edef\@@sites{\prop@gen@sites}% -{\let\site\relax% to to render it inert here +{\let\site\relax% to render it insert here \@for\@site:=\@@sites\do{% \edef\@@RM{\pdataref@safe{\wp@id @\task@id}\@site{RM}}% \ifx\@@RM\@empty\else\xdef\@@inv{showit}% @@ -1560,8 +1568,6 @@ % \end{macro} % % \begin{macro}{\*deliv*ref} -% This macro is generally useful to put a comment at the end of the line, possibly -% making a new one if there is not enough space. % \begin{macrocode} \newcommand\delivref[2]{\pdataRef{deliv}{#1@#2}{label}} \newcommand\localdelivref[1]{\delivref{\wp@id}{#1}} @@ -1657,7 +1663,7 @@ \expandafter\ifx\csname\@I delivs\endcsname\relax% Check that the miles@delivs is empty {\expandafter\xdef\csname\@I delivs\endcsname{\wpg@id @\deliv@id}}% if so, skip the separator \else\expandafter\xdef\csname\@I delivs\endcsname%if not add it - {\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}% + {\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}% }% end gray color } % \end{macrocode} @@ -1679,13 +1685,11 @@ % % \begin{macro}{\milestone@label} % \begin{macrocode} -\newcommand\milestone@label[1]{M{#1}} +\newcommand\milestone@label[1]{\textbf{M{#1}}} % \end{macrocode} % \end{macro} % % \begin{macro}{\mileref} -% This macro is generally useful to put a comment at the end of the line, possibly -% making a new one if there is not enough space. % \begin{macrocode} \newcommand\mileref[1]{\pdataRef{mile}{#1}{label}} \newcommand\miletref[1]{\mileref{#1}: \pdataRefFB{mile}{#1}{short}{title}} @@ -2093,10 +2097,12 @@ ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40} \fi} \local@count0\relax% \@for\@site:=\prop@gen@sites\do{\global\advance\local@count by \pdataref@num\@@wp\@site{RM}}% +% XXX does not work XXX \pdata@def{\@site}{RM}{count}{\the\local@count} \xdef\@@wp@line{\@@wp@line &\textbf{\the\local@count}} \if@RAM \global\local@count0\relax% \@for\@site:=\prop@gen@sites\do{\global\advance\local@count by \pdataref@num\@@wp\@site{RAM}}% +% XXX does not work XXX \pdata@def{\@site}{RAM}{count}{\the\local@count} \xdef\@@wp@line{\@@wp@line &\textbf{\the\local@count}} \fi% if@RAM \else% if@sites @@ -2787,4 +2793,7 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje % mode: doctex % TeX-master: t % End: -% LocalWords: 9,maxcitenames multilinguality 2pt,color 2,title +% LocalWords: 9,maxcitenames multilinguality 2pt,color 2,title 5,step true,giveninits +% LocalWords: 9,maxcitenames hide,marginnote show,marginnote if@taskshowwps 2pt,color +% LocalWords: 2,title 5,step 9,maxcitenames 2pt,color 2,title 5,step 9,maxcitenames +% LocalWords: 2pt,color 2,title diff --git a/base/proposal.ins b/base/proposal.ins index 631071a..417db10 100644 --- a/base/proposal.ins +++ b/base/proposal.ins @@ -9,9 +9,6 @@ %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. %% Either version 1.0 or, at your option, any later version. -%% -%% $Id: proposal.ins 21941 2011-06-30 07:02:41Z kohlhase $ -%% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/base/proposal.ins $ \input docstrip \preamble diff --git a/base/proposal.pdf b/base/proposal.pdf index 656da33..e8d2ef4 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/base/proposal.sty b/base/proposal.sty index 9d84dd0..49f5397 100644 --- a/base/proposal.sty +++ b/base/proposal.sty @@ -7,7 +7,7 @@ %% proposal.dtx (with options: `sty') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{proposal}[2016/12/15 v1.6 Project Proposal] +\ProvidesPackage{proposal}[2019/03/21 v1.6 Project Proposal] \RequirePackage{amssymb} \RequirePackage{wasysym} \RequirePackage{url} @@ -29,9 +29,9 @@ \RequirePackage[scaled=.90]{helvet} \RequirePackage{textcomp} \if@numericcites -\RequirePackage[style=numeric,hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19] +\RequirePackage[style=numeric,hyperref=auto,defernumbers=true,giveninits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19] \else -\RequirePackage[style=alphabetic,hyperref=auto,defernumbers=true,backend=bibtex,firstinits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19] +\RequirePackage[style=alphabetic,hyperref=auto,defernumbers=true,giveninits=true,maxbibnames=9,maxcitenames=3]{biblatex}[2010/11-19] \fi \RequirePackage{csquotes} \RequirePackage{mdframed} @@ -42,10 +42,10 @@ citecolor=\prop@link@color,urlcolor=\prop@link@color,colorlinks=true, breaklinks=true, bookmarksopen=true]{hyperref} \ifsubmit -\RequirePackage[hide]{ed} +\RequirePackage[hide,marginnote]{ed} \if@svninfo\RequirePackage[final,today]{svninfo}\fi \else -\RequirePackage[show]{ed} +\RequirePackage[show,marginnote]{ed} \if@svninfo\RequirePackage[eso-foot,today]{svninfo}\fi \if@gitinfo\RequirePackage[mark]{gitinfo2}\fi \fi @@ -105,14 +105,16 @@ \newcounter{@PIs} \@ifundefined{prop@gen@PIs}{}{\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}} \newcounter{@sites} -\@ifundefined{prop@gen@sites}{}{\@for\@I:=\prop@gen@sites\do{\stepcounter{@sites}}} +\@ifundefined{prop@gen@sites}{}{\@for\@I:=\prop@gen@sites\do{\stepcounter{@sites}} +\pdata@def{all}{site}{ids}{\prop@gen@sites}% +\pdata@def{all}{site}{count}{\the@site}} \setcounter{page}{0} \begin{prop@proposal}} {\end{prop@proposal} -\pdata@def{prop}{page}{last}{\thepage}\ofpagefalse +\pdata@def{prop}{page}{last}{\thepage}\ofpagefalse% \pdata@close} -\newcommand\site[1]{\hyperlink{site@#1@target}{\wa@ref3{institution}{#1}{acronym}}} -\newcommand\sitename[1]{\hyperlink{site@#1@target}{\wa@ref3{institution}{#1}{name}}} +\newcommand\site[1]{\hyperlink{site@#1@target}{\textbf{\wa@ref3{institution}{#1}{acronym}}}} +\newcommand\sitename[1]{\hyperlink{site@#1@target}{\textbf{\wa@ref3{institution}{#1}{name}}}} \newcommand\objective@label[1]{O#1} \define@key{obj}{id}{\def\obj@id{#1}\@dmp{id=#1}} \define@key{obj}{title}{\def\obj@title{#1}} @@ -295,9 +297,10 @@ \else \@ifundefined{@wps}{}{\pdata@def{all}{wp}{ids}\@wps} \fi -\ifdelivs\@ifundefined{mile@stones}{} -{\@for\@I:=\mile@stones\do{% -\pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}}\fi +\ifdelivs\edef\mile@stones{\pdataref@safe{all}{mile}{ids}} +\@for\@I:=\mile@stones\do{% + \message{milestone: \@I, delivs: \csname\@I delivs\endcsname} + \pdata@def{mile}\@I{delivs}{\@ifundefined{\@I delivs}{}{\csname\@I delivs\endcsname}}}\fi \ifwork@areas\pdata@def{all}{wa}{count}{\thewa}\fi \pdata@def{all}{wp}{count}{\theallwp} \ifdelivs @@ -311,7 +314,7 @@ \ifwork@areas \newcommand\task@label[3]{\task@@label{#1.#2.#3}} \else -\newcommand\task@label[2]{\task@@label{T#1.#2}} +\newcommand\task@label[2]{\task@@label{#1.#2}} \fi \define@key{task}{id}{\def\task@id{#1}\@dmp{id=#1}} \define@key{task}{wphases}{\def\task@wphases{#1}\@dmp{wphases=#1}} @@ -323,12 +326,13 @@ \define@key{task}{issue}{\def\task@issue{#1}} \define@key{task}{status}{\def\task@status{#1}} \def\@@status@canceled{canceled} +\newif\if@taskshowwps\@taskshowwpsfalse \def\task@set#1{\edef\task@id{task\thetask@all} \def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}\def\task@title{} \setkeys{task}{#1}} \def\task@post@title@space{\;} \newcounter{alltasks} -\def\task@post@title@space{ } +\if@taskshowwps\else\def\task@post@title@space{}\fi \newcommand\task@legend@partners{Sites: } \newcommand\task@legend@PM{PM} \newenvironment{task}[1][]% @@ -340,6 +344,7 @@ \ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi% \else\task@@label\thetask@wp\fi}]% \textbf\task@title\task@post@title@space% +\if@taskshowwps \def\@initial{0-0}% \ifx\task@wphases\@initial\else% \let\@@sep=\relax\@for\@I:=\task@wphases% @@ -347,15 +352,16 @@ \@@sep\show@wphase\wphase@start\wphase@end\wphase@force% \let\@@sep=\sep@wphases}% \fi% initial -\ifsubmit\else\ifx\task@PM\@empty\else\task@PM~\task@legend@PM;\fi\fi% -\if@sites% +\fi% \if@taskshowwps +\ifsubmit\else\ifx\task@PM\@empty\else; \task@PM~\task@legend@PM\fi\fi% +\if@sites;% \ifx\task@lead\@empty\else\ \task@legend@partners\site\task@lead~(\legend@lead)% \@for\@I:=\task@partners\do{, \site\@I}\\\fi% \ifx\task@partners\@empty \xdef\@@involvement{}\xdef\@@inv{}% \xdef\@@sep{, }\def\m@sep{}% do not show the sep the first time around \edef\@@sites{\prop@gen@sites}% -{\let\site\relax% to to render it inert here +{\let\site\relax% to render it insert here \@for\@site:=\@@sites\do{% \edef\@@RM{\pdataref@safe{\wp@id @\task@id}\@site{RM}}% \ifx\@@RM\@empty\else\xdef\@@inv{showit}% @@ -496,12 +502,12 @@ \expandafter\ifx\csname\@I delivs\endcsname\relax% Check that the miles@delivs is empty {\expandafter\xdef\csname\@I delivs\endcsname{\wpg@id @\deliv@id}}% if so, skip the separator \else\expandafter\xdef\csname\@I delivs\endcsname%if not add it - {\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}% + {\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}% }% end gray color } \newenvironment{wadeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wa}\else\deliv@error\fi}{} \newenvironment{wpdeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wp}\else\deliv@error\fi}{} -\newcommand\milestone@label[1]{M{#1}} +\newcommand\milestone@label[1]{\textbf{M{#1}}} \newcommand\mileref[1]{\pdataRef{mile}{#1}{label}} \newcommand\miletref[1]{\mileref{#1}: \pdataRefFB{mile}{#1}{short}{title}} \newcounter{milestone} diff --git a/base/reporting.cls b/base/reporting.cls index 007ac9c..fce49b2 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}[2016/12/15 v1.6 Project Reporting] +\ProvidesPackage{reporting}[2019/03/21 v1.6 Project Reporting] \newif\if@wpsubsection\@wpsubsectionfalse \newif\ifsubmit\submitfalse \newif\ifgrantagreement\grantagreementfalse diff --git a/bin/checksum b/bin/checksum index 9f0e533..427b7a8 100755 --- a/bin/checksum +++ b/bin/checksum @@ -3,7 +3,6 @@ # A tool for updating .dtx files with a correspodning checksum counter # # Copyright (c) 2010, Deyan Ginev, released under the Gnu General Public License (GPL)# # see http://www.gnu.org/copyleft/gpl.html # -# $URL: https://svn.kwarc.info/repos/stex/trunk/bin/checksum$ # ####################################################################################### use strict; diff --git a/bin/filedate b/bin/filedate index af49b65..545b5a6 100755 --- a/bin/filedate +++ b/bin/filedate @@ -3,7 +3,6 @@ # A tool for updating .dtx files with a given package date. # # Copyright (c) 2010, Deyan Ginev, released under the Gnu General Public License (GPL)# # see http://www.gnu.org/copyleft/gpl.html # -# $URL: https://svn.kwarc.info/repos/stex/trunk/bin/filedate$ # ####################################################################################### use strict; diff --git a/dfg/Makefile b/dfg/Makefile index f9d80f9..7346bf0 100644 --- a/dfg/Makefile +++ b/dfg/Makefile @@ -4,7 +4,6 @@ TDSCOLL = proposal DTX.cls.base = dfgproposal DTX = dfgproposal.dtx TDS.tex = dfgreporting.cls dfgpdata.sty -CTAN = $(TDS.tex) all: package doc @for d in $(EXDIRS); do (cd $$d && $(MAKE) -$(MAKEFLAGS) $@); done; diff --git a/dfg/README b/dfg/README index 86dafab..922a2fa 100644 --- a/dfg/README +++ b/dfg/README @@ -11,5 +11,5 @@ Copyright(c) 2010 Michael Kohlhase The package is distributed under the terms of the LaTeX Project Public License (LPPL) The development version of this package can be found at -https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg +https://github.com/KWARC/LaTeX-proposal diff --git a/dfg/dfgpdata.sty b/dfg/dfgpdata.sty index 26a7e9e..b111d16 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}[2016/12/15 v1.4 DFG Project Data] +\ProvidesPackage{dfgpdata}[2019/03/21 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 5b4c913..65a7473 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}[2016/12/15 v1.4 DFG Proposal] +\ProvidesClass{dfgproposal}[2019/03/21 v1.4 DFG Proposal] \newif\ifgeneral\generalfalse \DeclareOption{general}{\generaltrue} \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} @@ -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.dtx b/dfg/dfgproposal.dtx index 365983b..296f2d6 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{dfgproposal}[2016/12/15 v1.4 DFG Proposal] -%\ProvidesPackage{dfgpdata}[2016/12/15 v1.4 DFG Project Data] -%\ProvidesPackage{dfgreporting}[2016/12/15 v1.4 DFG Project Reporting] +%\ProvidesClass{dfgproposal}[2019/03/21 v1.4 DFG Proposal] +%\ProvidesPackage{dfgpdata}[2019/03/21 v1.4 DFG Project Data] +%\ProvidesPackage{dfgreporting}[2019/03/21 v1.4 DFG Project Reporting] %<*driver> \documentclass[twoside]{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} diff --git a/dfg/dfgproposal.ins b/dfg/dfgproposal.ins index 941d63d..f55a7a6 100644 --- a/dfg/dfgproposal.ins +++ b/dfg/dfgproposal.ins @@ -9,9 +9,6 @@ %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. %% Either version 1.0 or, at your option, any later version. -%% -%% $Id: dfgproposal.ins 23009 2012-01-18 10:12:28Z kohlhase $ -%% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/dfgproposal.ins $ \input docstrip \preamble diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index c6200cf..a3bcb14 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls index ac3bf89..f8e56f7 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}[2016/12/15 v1.4 DFG Project Reporting] +\ProvidesPackage{dfgreporting}[2019/03/21 v1.4 DFG Project Reporting] \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions diff --git a/eu/README b/eu/README index 3b08937..41748f0 100644 --- a/eu/README +++ b/eu/README @@ -11,7 +11,7 @@ Copyright(c) 2007 Michael Kohlhase The package is distributed under the terms of the LaTeX Project Public License (LPPL) The development version of this package can be found at -https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu +https://github.com/KWARC/LaTeX-proposal The class eudelivreport.cls is experimental, it is being developed for the OpenDreamKit Project (see http://opendreamkit.org) and will be integrated more tightly diff --git a/eu/eupdata.sty b/eu/eupdata.sty index f990e75..5dc297f 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}[2016/12/15 v1.5 EU Project Data] +\ProvidesPackage{eupdata}[2019/03/21 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 22dfdb7..a3d45b8 100644 --- a/eu/euproposal.cls +++ b/eu/euproposal.cls @@ -7,19 +7,23 @@ %% euproposal.dtx (with options: `cls') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{euproposal}[2016/12/15 v1.5 EU Proposal] +\ProvidesClass{euproposal}[2019/03/21 v1.5 EU Proposal] \newif\ifpartB\partBfalse \DeclareOption{partB}{\partBtrue} +\newif\if@split\@splitfalse +\DeclareOption{split}{\@splittrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}} \ProcessOptions -\ifpartB\LoadClass[report,noRAM]{proposal}\else\LoadClass[noRAM]{proposal}\fi +\ifpartB\LoadClass[report]{proposal}\else\LoadClass{proposal}\fi \RequirePackage{longtable} \RequirePackage{eurosym} \RequirePackage{wrapfig} \RequirePackage{eupdata} +\RequirePackage{datetime} \RequirePackage{chngcntr} \counterwithin{figure}{subsection} \counterwithin{table}{subsection} +\setcounter{secnumdepth}{4} \ifpartB \def\thepart{\Alph{part}} \setcounter{part}{2} @@ -46,7 +50,7 @@ {\huge\textbf\prop@gen@title}\\[.4cm] \ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[2cm]\fi \end{center} -{\large\textbf{Date of Preparation: \today}} +{\large\textbf{Date of Preparation: \today: \currenttime}} \\[1em] \begin{large} \begin{description} @@ -71,7 +75,13 @@ \newpage \fi% ifgrantagreement \setcounter{tocdepth}{2}\setcounter{part}{2}} -{\newpage\printbibliography[heading=warnpubs]} +{\newpage\printbibliography[heading=warnpubs]% +\if@split +\newwrite\@@SPLIT% +\immediate\openout\@@SPLIT=SPLIT.at% +\protected@write\@@SPLIT{}{\thepage}% +\closeout\@@SPLIT% +\fi}% if@split \def\prop@gen@instrument{Proposal Instrument (e.g. IP)} \define@key{site@desc}{box}[true]{\def\site@desc@box{#1}% \pdata@def{sitedesc}{\@site}{box}{#1}} @@ -148,6 +158,8 @@ \define@key{mst}{wdeliv}{\gdef\mst@wdeliv{#1}} \define@key{mst}{wverif}{\gdef\mst@wverif{#1}} \newcommand\milestonetable[1][]{% +\IfFileExists{./\jobname.deliverables}{% to avoid errros +\message{euproposal.cls: Generating Milestones Table}% \def\mst@caption{Milestones, Deliverables, and Verification}% \def\mst@wname{2.5cm}\def\mst@wdeliv{7cm}\def\mst@wverif{4cm} \setkeys{mst}{#1}% @@ -174,14 +186,15 @@ &\textbf{\miles@legend@verif}\\\hline\hline \mst@lines \end{tabular} -\caption{\mst@caption}\label{tab:milestonetable} -\end{table} -\footnotetext\miles@legend@footnote} +\caption{\mst@caption\ ($^\ast$\miles@legend)}\label{tab:milestonetable} +\end{table}} +{\ClassWarning{not formatting mile stones table yet, deliverables are + still missing; generate\jobname.deliverables\ to get it!}}} \newcommand\miles@legend@name{Name} \newcommand\miles@legend@mo{Mo} \newcommand\miles@legend@verif{Means of Verif.} -\newcommand\miles@legend@involved{WPs\footnotemark/Deliverables involved} -\newcommand\miles@legend@footnote{The work package number is the first number in the deliverable number.} +\newcommand\miles@legend@involved{WPs$^\ast$/Deliverables involved} +\newcommand\miles@legend{WP is first number in deliverable label} \newcommand\prop@milesfor[1]{\edef\@delivs{\pdataref@safe{mile}{#1}{delivs}}% \let\m@sep=\relax\def\new@sep{,\ }% \@for\@I:=\@delivs\do{\m@sep\pdataRef{deliv}\@I{label}\let\m@sep=\new@sep}} @@ -191,9 +204,8 @@ \newenvironment{riskcont}[3] {\begin{risk}{#1}{#2}{#3}\textbf{Contingency:} } {\end{risk}} -\newcommand\keypubs[2][]{% -\paragraph{Key publications relevant to the project}% -{\prop@paperlist[#1]{#2}}} +\newcommand\keypubs[1]{% +\begin{refsection}\nocite{#1}\printbibliography[heading=empty]\end{refsection}} \endinput %% %% End of file `euproposal.cls'. diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index 6aca504..5efa9d5 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -13,9 +13,9 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{euproposal}[2016/12/15 v1.5 EU Proposal] -%\ProvidesPackage{eupdata}[2016/12/15 v1.5 EU Project Data] -%\ProvidesPackage{eureporting}[2016/12/15 v1.5 EU Project Reporting] +%\ProvidesClass{euproposal}[2019/03/21 v1.5 EU Proposal] +%\ProvidesPackage{eupdata}[2019/03/21 v1.5 EU Project Data] +%\ProvidesPackage{eureporting}[2019/03/21 v1.5 EU Project Reporting] %<*driver> \documentclass[twoside]{ltxdoc} \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} @@ -113,7 +113,10 @@ % and gives a comma separated list of options specified in~\cite{Kohlhase:pplp:svn}. Some % versions EU proposals want non-standard numbering schemes (e.g. starting with % \textbf{B...} since we are writing Part B.), this can be reached by giving the |propB| -% option. +% option. Finally the |split| option cases the |euproposal| to write a file |SPLIT.at| +% that can be used in the |Makefile| to split the final proposal |final.pdf| into a files +% |final123.pdf| and |final45.pdf| for submission in the EU system (often this has to be +% separated so that the submission system can count pages.) % % \subsection{Proposal Metadata and Title page}\label{sec:user:metadata} % @@ -180,17 +183,16 @@ % \DescribeMacro{riskcont}|riskcont| is a variant, where \meta{title} names a risk and the % body is a description of the contingency plan. % -% \subsection{Relevant Papers}\label{sec:user:papers} +% \subsection{Relevant Papers/Key Publications}\label{sec:user:papers} % % Sometimes we want to list the relevant papers in the site descriptions. We use the % |biblatex| package to automate this. We only need to use % \DescribeMacro{\keypubs}|\keypubs[|\meta{keys}|]{|\meta{refs}|}|, where \meta{keys} that -% specify what papers are selected and \meta{refs} is a comma-separated list of bibtex +% specify what papers are selected and \meta{refs} is a comma-separated list of {bib\TeX} % keys from the bibTeX database used in the proposal. % -% The papers listed in |\keypubs| are put into a special bib\LaTeX category -% \DescribeMacro{featured}|featured|, and can thus be excluded from the general -% bibliography by adding |notcategory=featured| to the final |\printbibliography|. +% The papers listed in |\keypubs| are put into a section bibliography which is displayed +% in place. % % % \begin{newpart}{MK@MK: This is new, and only partially implemented} @@ -252,6 +254,8 @@ %<*cls> \newif\ifpartB\partBfalse \DeclareOption{partB}{\partBtrue} +\newif\if@split\@splitfalse +\DeclareOption{split}{\@splittrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{proposal}} % %\DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} @@ -261,22 +265,27 @@ % Then we load the packages we make use of % % \begin{macrocode} -%\ifpartB\LoadClass[report,noRAM]{proposal}\else\LoadClass[noRAM]{proposal}\fi -%\LoadClass[report,noRAM]{reporting} +%\ifpartB\LoadClass[report]{proposal}\else\LoadClass{proposal}\fi +%\LoadClass[report]{reporting} %<*cls|reporting> \RequirePackage{longtable} \RequirePackage{eurosym} \RequirePackage{wrapfig} \RequirePackage{eupdata} +\RequirePackage{datetime} % \end{macrocode} % we want to change the numbering of figures and tables % \begin{macrocode} \RequirePackage{chngcntr} \counterwithin{figure}{subsection} \counterwithin{table}{subsection} +% \end{macrocode} +% And finally, we set the section numbering depth, so that paragraphs are numbered and +% can be cross-referenced. +% \begin{macrocode} +\setcounter{secnumdepth}{4} % % \end{macrocode} -% % \subsection{Proposal Metadata and Title Page}\label{sec:impl:metadata} % % We extend the metadata keys from the |proposal| class. @@ -354,7 +363,7 @@ \ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[2cm]\fi \end{center} %{\large\prop@gen@instrument}\\ -{\large\textbf{Date of Preparation: \today}} +{\large\textbf{Date of Preparation: \today: \currenttime}} % \ifsubmit\else\if@svninfo\if@gitinfo\\ % {\large\textbf{Revision}: % \if@svninfo\svnInfoRevision\fi\if@gitinfo\gitAbbrevHash\fi @@ -385,7 +394,13 @@ \newpage \fi% ifgrantagreement \setcounter{tocdepth}{2}\setcounter{part}{2}} -{\newpage\printbibliography[heading=warnpubs]} +{\newpage\printbibliography[heading=warnpubs]% +\if@split +\newwrite\@@SPLIT% +\immediate\openout\@@SPLIT=SPLIT.at% +\protected@write\@@SPLIT{}{\thepage}% +\closeout\@@SPLIT% +\fi}% if@split % \end{macrocode} % \end{environment} % @@ -522,13 +537,16 @@ % \end{macro} % % \begin{macro}{milestonetable} -% here we do the work. +% here we do the work, but only if the file |\jobname.deliverables| exists to make sure +% that the deliverables macros are really defined. % \begin{macrocode} \define@key{mst}{caption}{\gdef\mst@caption{#1}} \define@key{mst}{wname}{\gdef\mst@wname{#1}} \define@key{mst}{wdeliv}{\gdef\mst@wdeliv{#1}} \define@key{mst}{wverif}{\gdef\mst@wverif{#1}} \newcommand\milestonetable[1][]{% +\IfFileExists{./\jobname.deliverables}{% to avoid errros +\message{euproposal.cls: Generating Milestones Table}% \def\mst@caption{Milestones, Deliverables, and Verification}% \def\mst@wname{2.5cm}\def\mst@wdeliv{7cm}\def\mst@wverif{4cm} \setkeys{mst}{#1}% @@ -555,17 +573,18 @@ &\textbf{\miles@legend@verif}\\\hline\hline \mst@lines \end{tabular} -\caption{\mst@caption}\label{tab:milestonetable} -\end{table} -\footnotetext\miles@legend@footnote} +\caption{\mst@caption\ ($^\ast$\miles@legend)}\label{tab:milestonetable} +\end{table}} +{\ClassWarning{not formatting mile stones table yet, deliverables are + still missing; generate\jobname.deliverables\ to get it!}}} % \end{macrocode} % now the multilinguality support % \begin{macrocode} \newcommand\miles@legend@name{Name} \newcommand\miles@legend@mo{Mo} \newcommand\miles@legend@verif{Means of Verif.} -\newcommand\miles@legend@involved{WPs\footnotemark/Deliverables involved} -\newcommand\miles@legend@footnote{The work package number is the first number in the deliverable number.} +\newcommand\miles@legend@involved{WPs$^\ast$/Deliverables involved} +\newcommand\miles@legend{WP is first number in deliverable label} % \end{macrocode} % \end{macro} % @@ -599,10 +618,11 @@ % \subsection{Relevant Papers}\label{sec:impl:papers} % % \begin{macro}{\keypubs} +% we just use the {bib\LaTeX} |refsection| facility. NOTE, this needs biber to work +% easily. % \begin{macrocode} -\newcommand\keypubs[2][]{% -\paragraph{Key publications relevant to the project}% -{\prop@paperlist[#1]{#2}}} +\newcommand\keypubs[1]{% +\begin{refsection}\nocite{#1}\printbibliography[heading=empty]\end{refsection}} % % \end{macrocode} % \end{macro} @@ -625,13 +645,19 @@ % LocalWords: cellcolor lightgray keypubs paperlist callname callid callid ifx csname % LocalWords: challengeid challengeid objectiveid objectiveid outcomeid hfill if@gitinfo % LocalWords: outcomeid metakeys workaddress numberline tempdima ifsubmit iconrowheight -% LocalWords: proposal.dtx texttt paperslist workaddress.dtx topicsaddressed thesite +% LocalWords: proposal.dtx texttt paperslist workaddress.dtx topicsaddressed thesite mst % LocalWords: topicsaddressed iconrowheight finalreport.tex printbibliography endcsname -% LocalWords: reportperiod organisation thispagestyle gitAbbrevHash sitedescritpion +% LocalWords: reportperiod organisation thispagestyle gitAbbrevHash sitedescritpion WPs % LocalWords: WAinstitution picv medskip newmdenv frametitle wpdelivs mdframed.sty emph -% LocalWords: surroundwithmdframed emph riskcont prob grav ldots endinput +% LocalWords: surroundwithmdframed emph riskcont prob grav ldots endinput optimized % Local Variables: % mode: doctex % TeX-master: t % End: +% LocalWords: coordinatorsite coordinatorsite verif verif milestonetable milestonetable +% LocalWords: wname wname wdeliv wdeliv wverif wverif biblatex notcategory newif gdef +% LocalWords: grantagreement Initialization ifpartB partBfalse partBtrue report +% LocalWords: chngcntr counterwithin ifgrantagreement currenttime mst@caption delivs +% LocalWords: initialize deliv multilinguality prop@milesfor refsection nocite doctex +% LocalWords: secnumdepth diff --git a/eu/euproposal.ins b/eu/euproposal.ins index eba8cbf..b651f80 100644 --- a/eu/euproposal.ins +++ b/eu/euproposal.ins @@ -9,9 +9,6 @@ %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. %% Either version 1.0 or, at your option, any later version. -%% -%% $Id: euproposal.ins 23009 2012-01-18 10:12:28Z kohlhase $ -%% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/euproposal.ins $ \input docstrip \preamble diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index f6b2460..38039de 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/eureporting.cls b/eu/eureporting.cls index b0976ca..68e9b97 100644 --- a/eu/eureporting.cls +++ b/eu/eureporting.cls @@ -7,17 +7,19 @@ %% euproposal.dtx (with options: `reporting') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{eureporting}[2016/12/15 v1.5 EU Project Reporting] +\ProvidesPackage{eureporting}[2019/03/21 v1.5 EU Project Reporting] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}} \ProcessOptions -\LoadClass[report,noRAM]{reporting} +\LoadClass[report]{reporting} \RequirePackage{longtable} \RequirePackage{eurosym} \RequirePackage{wrapfig} \RequirePackage{eupdata} +\RequirePackage{datetime} \RequirePackage{chngcntr} \counterwithin{figure}{subsection} \counterwithin{table}{subsection} +\setcounter{secnumdepth}{4} \define@key{prop@gen}{reportperiod}{\def\prop@gen@reportperiod{#1}} \define@key{prop@gen}{key}{\@dmp{key=#1}% \@ifundefined{prop@gen@keys}{\xdef\prop@gen@keys{#1}}{\xdef\prop@gen@keys{\prop@gen@keys,#1}}} diff --git a/examples/dfg/lib/dummy.bib b/examples/dfg/lib/dummy.bib index 103921b..4d040e0 100644 --- a/examples/dfg/lib/dummy.bib +++ b/examples/dfg/lib/dummy.bib @@ -1,9 +1,8 @@ -@PREAMLE{\usepackage{url}} @misc{Kohlhase:pdpl10, author = {Michael Kohlhase}, title = {Preparing {DFG} Proposals in {\LaTeX} with \texttt{dfgproposal.cls}}, - 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}, + institution = {KWARC Group, FAU Erlangen-N\"urnberg}, + howpublished = {Self-documenting {\LaTeX} package, \url{https://github.com/KWARC/LaTeX-proposal/tree/master/dfg/dfgproposal.pdf}; ask the author for access}, year = 2010} @misc{providemore,title={\ldots should provide more high-class references \ldots},author = {the proposal authors}} @BOOK{Lamport:ladps94, 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.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/proposal/workplan.tex b/examples/dfg/proposal/workplan.tex index a68a3b5..6a8ca7b 100644 --- a/examples/dfg/proposal/workplan.tex +++ b/examples/dfg/proposal/workplan.tex @@ -192,7 +192,7 @@ We abstract an example from existing proposals \end{workarea} \end{workplan} -\ganttchart[draft,xscale=.45] +\ganttchart[draft,xscale=.45] \ednote{MK: we need to schedule more things in the first 6 months} \subsection{Data Handling}\label{sec:data} 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/README b/examples/dfg/report/README index dabc084..7d928bf 100644 --- a/examples/dfg/report/README +++ b/examples/dfg/report/README @@ -18,5 +18,5 @@ Copyright(c) 2010 Michael Kohlhase The package is distributed under the terms of the LaTeX Project Public License (LPPL) The development version of this package can be found at -https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal/ex - +https://github.com/KWARC/LaTeX-proposal + 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/lib/dummy.bib b/examples/eu/lib/dummy.bib index e3146ba..85c5446 100644 --- a/examples/eu/lib/dummy.bib +++ b/examples/eu/lib/dummy.bib @@ -16,22 +16,55 @@ url = {http://www.w3.org/TR/MathML3}, pubs = {mkohlhase}} -@inproceedings{KohDavGin:psewads11, +@article{KohDavGin:psewads11, + journal = {Procedia Computer Science}, author = {Michael Kohlhase and Joe Corneli and Catalin David and Deyan Ginev and Constantin Jucovschi and Andrea Kohlhase and Christoph Lange and Bogdan Matican and Stefan Mirea and Vyacheslav Zholudev}, - title = {The Planetary System: Web 3.0 \& Active Documents for STEM}, - note = {accepted for publication at ICCS 2011 (Finalist at the Executable Papers Challenge)}, + title = {The Planetary System: Web 3.0 \& Active Documents for {STEM}}, + issuetitle = {Special issue: Proceedings of the International Conference on Computational Science ({ICCS})}, + editor = {Mitsuhisa Sato and Satoshi Matsuoka and Peter M. Sloot and G. Dick van Albada and Jack Dongarra}, + pages = {598--607}, + venue = {Nanyang Technological University, Singapore}, + eventdate = {2011-06-01/2011-06-03}, + note = {Finalist at the Executable Paper Grand Challenge}, year = 2011, - url = {https://svn.mathweb.org/repos/planetary/doc/epc11/paper.pdf}, + volume = 4, + url = {http://kwarc.info/kohlhase/papers/epc11.pdf}, + publisher = {Elsevier}, + doi = {10.1016/j.procs.2011.04.063}, keywords = {conference}, - pubs = {mkohlhase,cdavid,dginev,akohlhase,clange,bmatican,smirea,vzholudev}} + pubs = {mkohlhase,cdavid,dginev,akohlhase,clange,bmatican,smirea,vzholudev,mathhub,omdoc}, + acceptancerate = {14}, + acceptancerateCOMMENT = {10/70 accepted into the finals}} @techreport{Kohlhase:pdpl10, author = {Michael Kohlhase}, title = {Preparing {DFG} Proposals in {\LaTeX} with \texttt{dfgproposal.cls}}, institution = {KWARC Group, Jacobs University Bremen}, type = {Self-documenting {\LaTeX} package}, - url = {https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/dfgproposal.pdf}, + url = {http://github.com/KWARC/LaTeX-proposal/dfg/dfgproposal.pdf}, year = 2010} + + +@article{KohDavGin:psewads11, + journal = {Procedia Computer Science}, + author = {Michael Kohlhase and Joe Corneli and Catalin David and Deyan Ginev and Constantin Jucovschi and Andrea Kohlhase and Christoph Lange and Bogdan Matican and Stefan Mirea and Vyacheslav Zholudev}, + title = {The Planetary System: Web 3.0 \& Active Documents for {STEM}}, + issuetitle = {Special issue: Proceedings of the International Conference on Computational Science ({ICCS})}, + editor = {Mitsuhisa Sato and Satoshi Matsuoka and Peter M. Sloot and G. Dick van Albada and Jack Dongarra}, + pages = {598--607}, + venue = {Nanyang Technological University, Singapore}, + eventdate = {2011-06-01/2011-06-03}, + note = {Finalist at the Executable Paper Grand Challenge}, + year = 2011, + volume = 4, + url = {http://kwarc.info/kohlhase/papers/epc11.pdf}, + publisher = {Elsevier}, + doi = {10.1016/j.procs.2011.04.063}, + keywords = {conference}, + pubs = {mkohlhase,cdavid,dginev,akohlhase,clange,bmatican,smirea,vzholudev,mathhub,omdoc}, + acceptancerate = {14}, + acceptancerateCOMMENT = {10/70 accepted into the finals}} + @BOOK{Kohlhase:omdoc1.2, title = {{\sc OMDoc} -- An open markup format for mathematical documents [Version 1.2]}, booktitle = {{\sc OMDoc} -- An open markup format for mathematical documents [Version diff --git a/examples/eu/strep/Makefile b/examples/eu/strep/Makefile index c7b6b11..0fcde12 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 = ../lib/dummy.bib# # bibTeX databases ########################################################################### # the following are computed TSIMP = # pdflatex Targets without bibTeX @@ -17,9 +17,8 @@ TARGET = $(TSIMP) $(TBIB) # all pdflatex targets TBIB.pdf = $(TBIB:%.tex=%.pdf) # PDFs to be produced TBIB.aux = $(TBIB:%.tex=%.aux) # their aux files. PDATA = $(PROPOSAL:%.tex=%.pdata) # the proposal project data -SRC = $(filter-out $(TARGET),$(shell ls *.tex */*.tex)) # included files +SRC = $(filter-out $(TARGET),$(shell ls *.tex)) # included files PDFLATEX = pdflatex -interaction batchmode -file-line-error -BBL = $(PROPOSAL:%.tex=%.bbl) PROPCLS.dir = $(PROP.dir)/base PROPETC.dir = $(PROP.dir)/etc EUPROPCLS.dir = $(PROP.dir)/eu @@ -35,17 +34,28 @@ PROPCLS = $(PROPCLS.clssty:%=$(PROPCLS.dir)/%) $(EUPROPCLS.clssty:%=$(EUPROPCLS. all: $(TBIB.pdf) $(TSIMP.pdf) submit: - $(MAKE) $(MAKEFLAGS) -w PROPOSAL=final.tex all + $(MAKE) -$(MAKEFLAGS) -w PROPOSAL=submit.tex -public: - $(MAKE) $(MAKEFLAGS) -w PROPOSAL=public.tex all +SPLIT.at = $(shell cat SPLIT.at) +SPLIT = $$(($(SPLIT.at) + 1)) +SSPLIT = $$(($(SPLIT.at) + 2)) +split: submit + qpdf --pages submit.pdf 1-$(SPLIT) -- submit.pdf submit-123.pdf + qpdf --pages submit.pdf $(SSPLIT)-z -- submit.pdf submit-45.pdf + +public: $(SRC) + $(MAKE) -$(MAKEFLAGS) -w PROPOSAL=public.tex all grantagreement: - $(MAKE) $(MAKEFAGS) -w PROPOSAL=grantagreement.tex -W grantagreement.tex all + $(MAKE) -$(MAKEFAGS) -w PROPOSAL=grantagreement.tex -W grantagreement.tex all + pdftk grantagreement.pdf cat 1-35 61-end output grantagreement-striped.pdf + mv grantagreement-striped.pdf grantagreement.pdf -bbl: $(BBL) -$(BBL): %.bbl: %.aux - bibtex -min-crossrefs=100 -terse $< + +install: submit + cp submit.pdf proposal-www.pdf + git commit -m "Updated pdf" proposal-www.pdf + git push $(TSIMP.pdf): %.pdf: %.tex $(PROPCLS) $(PDATA) $(PDFLATEX) $< || $(RM) $@ @@ -61,9 +71,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 @@ -71,11 +81,9 @@ $(TBIB.pdf): %.pdf: %.tex $(SRC) $(BIB) $(PROPCLS) then $(PDFLATEX) $< || $(RM) $@; fi clean: - rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz *.cut + rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg *.run.xml *.synctex.gz *.cut *.toc distclean: clean rm -f *.aux *.ind *.gls *.ps *.dvi *.thm *.out *.run.xml *.bbl *.toc *.deliv* *.pdata *-blx.bib rm -Rf auto - -echo: - @echo $(BBL) + rm -f proposal.fls diff --git a/examples/eu/strep/README b/examples/eu/strep/README index 72aee78..c4c44e3 100644 --- a/examples/eu/strep/README +++ b/examples/eu/strep/README @@ -10,5 +10,5 @@ Copyright(c) 2010 Michael Kohlhase The package is distributed under the terms of the LaTeX Project Public License (LPPL) The development version of this package can be found at -https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/euproposal +https://github.com/KWARC/LaTeX-proposal diff --git a/examples/eu/strep/draft.tex b/examples/eu/strep/draft.tex deleted file mode 100644 index 9b8be16..0000000 --- a/examples/eu/strep/draft.tex +++ /dev/null @@ -1 +0,0 @@ -\input{proposal.tex} diff --git a/examples/eu/strep/ed.sty b/examples/eu/strep/ed.sty new file mode 100644 index 0000000..06e85a3 --- /dev/null +++ b/examples/eu/strep/ed.sty @@ -0,0 +1,155 @@ +%% +%% This is file `ed.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ed.dtx (with options: `package') +%% +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesPackage{ed}[2012/01/29 v1.8 Editorial Notes] +\newif\ifshowednotes\showednotesfalse +\newif\ifmargins\marginstrue +\newif\ifmarginnote\marginnotefalse +\newif\ifednotebookmarks\ednotebookmarksfalse +\DeclareOption{show}{\showednotestrue\message{ed.sty: showing ednotes}} +\DeclareOption{hide}{\showednotesfalse\message{ed.sty: hiding ednotes}} +\DeclareOption{draft}{\showednotestrue\message{ed.sty: showing ednotes}} +\DeclareOption{final}{\showednotesfalse\message{ed.sty: hiding ednotes}} +\DeclareOption{nomargins}{\marginsfalse} +\DeclareOption{marginnote}{\marginnotetrue} +\DeclareOption{pdfbookmarks}{\ednotebookmarkstrue} +\ProcessOptions +\ifshowednotes +\RequirePackage{xcolor} +\ifmarginnote\RequirePackage{marginnote}\fi +\else +\RequirePackage{verbatim} +\fi +\ifednotebookmarks +\RequirePackage{hyperref} +\fi +\newcommand\ednoteshape{\sffamily} +\newcounter{ednote} +\newcommand\ed@foot[3]% text, type, label +{\def\@test{#3}\footnotetext[\arabic{ednote}]% +{{\scshape{#2}\if\@test\@empty\else\label{ed:#3}[{#3}]\fi:} \ednoteshape #1}} +\def\ed@mark@style#1{#1} +\newcommand\ed@mark[1]{\ed@mark@style{\footnotemark[#1]}} +\newcommand\ed@footnote[3]{\ed@mark{\arabic{ednote}}\ed@foot{#1}{#2}{#3}} +\newcommand\ed@margin[1]{\ifmargins\ifmarginnote\marginnote{#1}\else\marginpar{#1}\fi\fi} +\newcommand\Ed@note[3]% text, type, label +{\addtocounter{ednote}{1}\message{#2!}% +\ifshowednotes\ed@footnote{#1}{#2}{#3}\ifednotebookmarks\belowpdfbookmark{#2: #1}{#2.\theednote}\fi\fi} +\newcommand\ed@note[4]% text, type, label, margin +{\Ed@note{#1}{#2}{#3}\ifshowednotes\ed@margin{#4:\arabic{ednote}}\fi} +\newcommand\ednote@label{EdNote} +\newcommand\ednote@margin{\textcolor{red}{EdN}} +\newcommand\ednotelabel[1]{\def\ednote@label{#1}} +\newcommand\ednotemargin[1]{\def\ednote@margin{#1}} +\newcommand{\Ednote}[2][]{\Ed@note{#2}\ednote@label{#1}} +\newcommand{\ednote}[2][]{\ed@note{#2}\ednote@label{#1}\ednote@margin} +\newcommand\tweaklabel[1]{\def\tweak@label{#1}} +\newcommand\tweak@label{Tweak} +\newcommand\tweakmargin[1]{\def\tweak@margin{#1}} +\newcommand\tweak@margin{Tw} +\newcommand{\tweak}[2][]{\ed@note{#2}\tweak@label{#1}\tweak@margin} +\newcommand{\Tweak}[2][]{\Ed@note{#2}\tweak@label{#1}} +\newcommand\edissue@label{Issue} +\newcommand\edissuelabel[1]{\def\edissue@label{#1}} +\newcommand\edissue@margin{Is} +\newcommand\edissuemargin[1]{\def\edissue@margin{#1}} +\providecommand{\issue}[2][]{\ed@note{#2}\edissue@label{#1}\edissue@margin} +\providecommand{\Issue}[2][]{\Ed@note{#2}\edissue@label{#1}} +\newcommand{\edissue}[2][]{\ed@note{#2}\edissue@label{#1}\edissue@margin} +\newcommand{\edIssue}[2][]{\Ed@note{#2}\edissue@label{#1}} +\newenvironment{Ed@part}[3]% text, mess, start +{\addtocounter{ednote}{1}\edef\new@number{\theednote}\message{#2!\new@number} +\ifshowednotes\ed@foot{#1}{#2}{}\fi\ignorespaces} +{} +\def\ed@part#1#2#3#4% text, mess, start, margin +{\Ed@part{#1}{#2}{#3}\ifshowednotes\ed@margin{#4:\new@number}\fi\ignorespaces} +\def\ended@part#1{\endEd@part\ifshowednotes\ed@margin{#1:\new@number}\fi} +\newcommand\b@newpart@label{\textrcolor{red}{BegNP}}\newcommand\e@newpart@label{\textcolor{red}{EndNP}} +\newcommand\b@newpart@margin{\textcolor{red}{BNP}}\newcommand\e@newpart@margin{\textcolor{red}{ENP}} +\newcommand\newpartlabels[2]{\def\b@newpart@label{#1}\def\e@newpart@label{#2}} +\newcommand\newpartmargins[2]{\def\b@newpart@margin{#1}\def\e@newpart@margin{#2}} +\newenvironment{Newpart}[1]{\Ed@part{#1}{New Part}\b@newpart@label}{\endEd@part} +\newenvironment{newpart}[1]{\ed@part{#1}{New Part}\b@newpart@label\b@newpart@margin\ignorespaces}{\ended@part\e@newpart@margin} +\newcommand\oldpartlabels[2]{\def\b@oldpart@label{#1}\def\e@oldpart@label{#2}} +\newcommand\oldpartmargins[2]{\def\b@oldpart@margin{#1}\def\e@oldpart@margin{#2}} +\newcommand\b@oldpart@label{BegOP}\newcommand\e@oldpart@label{EndOP} +\newcommand\b@oldpart@margin{\textcolor{red}{BOP}}\newcommand\e@oldpart@margin{\textcolor{red}{EOP}} +\newenvironment{Oldpart}[1]% +{\Ed@part{#1}{Old Part}\b@oldpart@label\ifshowednotes\color{gray}\fi} +{\endEd@part} +\newenvironment{oldpart}[1]% +{\ed@part{#1}{Old Part}\b@oldpart@label\b@oldpart@margin\ifshowednotes\color{gray}\fi} +{\ended@part\e@oldpart@margin} +\newcommand\todolabels[2]{\def\b@todo@label{#1}\def\e@todo@label{#2}} +\newcommand\todomargins[2]{\def\b@todo@margin{#1}\def\e@todo@margin{#2}} +\newcommand\b@todo@label{ToDo}\newcommand\e@todo@label{Done} +\newcommand\b@todo@margin{ToDo}\newcommand\e@todo@margin{Done} +\newenvironment{Todo}[1]% +{\Ed@part{#1}{To Do}\b@todo@label\ifshowednotes\bgroup\ednoteshape\else\comment\fi} +{\endEd@part\e@todo@label\ifshowednotes\egroup\else\endcomment\fi} +\newenvironment{todo}[1]% +{\ed@part{#1}{To Do}\b@todo@label\b@todo@margin\ifshowednotes\bgroup\ednoteshape\else\comment\fi} +{\ended@part\e@todo@margin\ifshowednotes\egroup\else\endcomment\fi} +\newenvironment{Todolist}[1]{% the comment +\ifshowednotes\message{todolist!}{{\ednoteshape To Do: #1}}\bgroup\ednoteshape\begin{enumerate}% +\else\comment% +\fi} +{\ifshowednotes\end{enumerate}\egroup\else\endcomment\fi} +\newenvironment{todolist}[1]{\ifshowednotes\ed@margin{{\ednoteshape ToDo}}\Todolist{#1}\fi} +{\endTodolist} +\newenvironment{musings}{\ifshowednotes\color{blue}\fi}{} +\def\ed@stubURI{} +\newcommand\edstuURI[1]{\gdef\ed@stubURI{#1}} +\newif\ifhref\hreffalse +\AtBeginDocument{\@ifpackageloaded{hyperref}{\hreftrue}{\hreffalse}} +\newenvironment{edstub}[2][] +{\def\@test{#1}\begin{center}\huge\color{red} +\ifx\@test\@empty The following blue text \else #1 \fi is only a provisional stub\\\Large +the Office document +\ifx\ed@stubURI\@empty{#2}\else\ifhref\href{\ed@stubURI}{#2}\else{#2}\fi\fi\ +contains more text\\which will be merged for the final document + \end{center}\color{blue}} +{} +\newcommand\@ednotemessage{\ifnum\value{ednote}>0\typeout{}% +\typeout{There are still \arabic{ednote} EdNotes, New/Oldparts, and Issues to resolve!}% +\typeout{}\fi} +\AtEndDocument{\@ednotemessage} +\newcommand\ednotemessage{\PackageWarning{ed}{The `\ednotemessage' macro is obsolete, the message + is generated automatically now.}} +\newcommand\edexplanation{\todolist{we will use the ednote system to communicate} +\item use the {\tt{\char92ednote\char123author: some explanatory text\char125}} + like a footnote to say what you have done or what should still be + done\ednote{MiKo: this is an example of an ednote}. Ednotes are numbered and + marked in the margin for easy recognition. +\item use the {\tt{\char92issue\char123author: explanation of the + issue\char125}} variant of ednote for issues\issue{this is an example of + an issue} that still have to be discussed. +\item finally, the {\tt{todolist}} environment is a list environment that can be + used to mark up todo lists. This explanation is an example of a todo list, it + is inserted into the text in a different font. +\item the {\tt{newpart}} environment can be used to mark up changed text blocks. + {\tt{\char92begin\char123newpart\char125}} takes an argument that is + interpreted as a comment and is treated like an {\tt{\char92ednote}} comment. +\item the {\tt{oldpart}} environment is similar to {\tt{newpart}} but is used + for old parts of text copied from another document that still need to be + changed in a document. +\item putting the macro {\tt{\char92ednotemessage}} just before the + {\tt{char92end\char123document\char125}} will generate a message with + cardinality information for the ednotes into the log file. +\item all of these text decorations and meta-annotations are only inserted into + the text, if the {\tt{show}} package option in the {\tt{\char92 usepackage}} + directive in the preamble of the document is set: {\tt{\char92 + usepackage[show]\char123ed\char125}} will show the decorations, while + {\tt{\char92 usepackage\char123ed\char125}} will not. This is useful for + preparing ``clean'' version for outside consumption without loosing the + management metadata. +\endtodolist} +\endinput +%% +%% End of file `ed.sty'. diff --git a/examples/eu/strep/final.tex b/examples/eu/strep/final.tex deleted file mode 100644 index 6c39199..0000000 --- a/examples/eu/strep/final.tex +++ /dev/null @@ -1,7 +0,0 @@ -\newcommand{\classoptions}{,submit} -\input{proposal.tex} - -%%% Local Variables: -%%% mode: LaTeX -%%% TeX-master: t -%%% End: diff --git a/examples/eu/strep/implementation.tex b/examples/eu/strep/implementation.tex index 5d687c9..d6906db 100644 --- a/examples/eu/strep/implementation.tex +++ b/examples/eu/strep/implementation.tex @@ -18,22 +18,6 @@ enter into force as from the date the contract with the European Commission is s \subsection{Quality Procedures}\label{sec:quality-management} \subsection{Internal Evaluation Procedures} \newpage -\section{Individual Participants}\label{sec:partners} -\begin{todo}{from the proposal template} -For each participant in the proposed project, provide a brief description of the legal entity, the main -tasks they have been attributed, and the previous experience relevant to those tasks. Provide also a -short profile of the individuals who will be undertaking the work.\\ -Maximum length for Section 2.2: one page per participant. However, where two or more departments within -an organisation have quite distinct roles within the proposal, one page per department is acceptable.\\ -The maximum length applying to a legal entity composed of several members, each of which is a separate -legal entity (for example an EEIG1), is one page per member, provided that the members have quite distinct -roles within the proposal. -\end{todo} -\newpage -\input{site-jacu}\newpage -\input{site-efo}\newpage -\input{site-bar}\newpage -\input{site-baz}\newpage \section{The {\protect\pn} consortium as a whole} \begin{todo}{from the proposal template} diff --git a/examples/eu/strep/members.tex b/examples/eu/strep/members.tex new file mode 100644 index 0000000..6fe5137 --- /dev/null +++ b/examples/eu/strep/members.tex @@ -0,0 +1,21 @@ +\section{Individual Participants}\label{sec:partners} +\begin{todo}{from the proposal template} +For each participant in the proposed project, provide a brief description of the legal entity, the main +tasks they have been attributed, and the previous experience relevant to those tasks. Provide also a +short profile of the individuals who will be undertaking the work.\\ +Maximum length for Section 2.2: one page per participant. However, where two or more departments within +an organisation have quite distinct roles within the proposal, one page per department is acceptable.\\ +The maximum length applying to a legal entity composed of several members, each of which is a separate +legal entity (for example an EEIG1), is one page per member, provided that the members have quite distinct +roles within the proposal. +\end{todo} +\newpage +\input{site-jacu}\newpage +\input{site-efo}\newpage +\input{site-bar}\newpage +\input{site-baz}\newpage + +%%% Local Variables: +%%% mode: latex +%%% TeX-master: "propB" +%%% End: diff --git a/examples/eu/strep/propB.pdf b/examples/eu/strep/propB.pdf index 9698386..2a76490 100644 Binary files a/examples/eu/strep/propB.pdf and b/examples/eu/strep/propB.pdf differ diff --git a/examples/eu/strep/propB.tex b/examples/eu/strep/propB.tex index 8dc1c24..246dd7b 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} @@ -51,8 +51,9 @@ \include{quality}\newpage \include{implementation}\newpage \include{impact}\newpage -\include{issues} \end{proposal} +\include{members} +\include{issues} \end{document} %%% Local Variables: diff --git a/examples/eu/strep/site-jacu.tex b/examples/eu/strep/site-jacu.tex index 6b4fe3b..40b42c1 100644 --- a/examples/eu/strep/site-jacu.tex +++ b/examples/eu/strep/site-jacu.tex @@ -50,4 +50,4 @@ interest group. %%% End: % LocalWords: site-jacu.tex sitedescription emph textbf keypubs KohDavGin -% LocalWords: psewads11 pdpl10 StaKoh tlcspx10 +% LocalWords: psewads11 pdpl10 StaKoh tlcspx10 KohDavGin:psewads11,Kohlhase:pdpl10 diff --git a/examples/eu/strep/submit.pdf b/examples/eu/strep/submit.pdf index 9fee253..106594c 100644 Binary files a/examples/eu/strep/submit.pdf and b/examples/eu/strep/submit.pdf differ diff --git a/examples/eu/strep/submit.tex b/examples/eu/strep/submit.tex index 5d92f93..02b1017 100644 --- a/examples/eu/strep/submit.tex +++ b/examples/eu/strep/submit.tex @@ -1,6 +1,5 @@ -\newcommand{\classoptions}{submit} -\input{proposal} - +\newcommand{\classoptions}{submit,split} +\input{propB} %%% Local Variables: %%% mode: latex %%% TeX-master: t 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 diff --git a/lib/Makefile.in b/lib/Makefile.in index a9b9ca8..d2729c0 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -78,13 +78,13 @@ ltds: cp README $(DTX.pdf) $(EXAMPLE.tex) $(EXAMPLE.pdf) $(TDS.doc) $(TDSDIR.doc) @for d in $(TDS.exdirs); do cp -R $$d $(TDSDIR.doc); done -lctan: +lctan: filedate mkdir -p $(CTANDIR) - cp $(DTX.src) $(DTX.sty) $(DTX.cls) $(TDS.src) $(TDS.tex) $(CTANDIR) + cp $(DTX.src) $(TDS.src) $(CTANDIR) cp README $(DTX.pdf) $(EXAMPLE.tex) $(EXAMPLE.pdf) $(TDS.doc) $(CTANDIR) @for d in $(TDS.exdirs); do cp -R $$d $(CTANDIR); done # sometimes (when bibLaTeX changes) we have to rerun biber; use make -B biber biber: - pdflatex $(DTX.base:%=%.dtx) + $(PDFLATEX) $(DTX.base:%=%.dtx) biber $(DTX.base) diff --git a/lib/Makefile.vars b/lib/Makefile.vars index 6155fee..346c11c 100644 --- a/lib/Makefile.vars +++ b/lib/Makefile.vars @@ -22,7 +22,6 @@ TDSDIR.src = $(TDSDIR)/source/latex/$(TDSCOLL)/$(PACKAGE) CTANDIR = /tmp/$(TDSCOLL)/$(CTANPREFIX)$(PACKAGE) # the dependencies -SOURCES = $(DTX.sty) $(BIB) TEXINPUTS := .:$(PREFIX)//: BIBINPUTS := .:$(PREFIX)//: BSTINPUTS := .:$(PREFIX)//: