diff --git a/README b/README deleted file mode 100644 index c027bb1..0000000 --- a/README +++ /dev/null @@ -1,20 +0,0 @@ -*proposal.cls: A set of LaTeX classes for preparing proposals for collaborative projects - -The base proposal class supports many of the general elemenst of project proposals. It is -optimized towards collaborate projects. This class is intended to be specialized to -particular funding bodies that have their own styles. - -MANIFEST: -base: the base proposal class -dfg: the instance for Deutsche Forschungsgemeinschaft -eu: the instance for EU proposals -etc: style files from the sTeX bundle added for convenience - (only in SVN, not on CTAN) -lib: Makefiles for the management of self-documenting packages - -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 - diff --git a/README.md b/README.md index 4e8426a..9d041a6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,22 @@ LaTeX-proposal ============== +*proposal.cls: A set of LaTeX classes for preparing proposals for collaborative projects + +The base proposal class supports many of the general elemenst of project proposals. It is +optimized towards collaborate projects. This class is intended to be specialized to +particular funding bodies that have their own styles. + +MANIFEST: +base: the base proposal class +dfg: the instance for Deutsche Forschungsgemeinschaft +eu: the instance for EU proposals +etc: style files from the sTeX bundle added for convenience + (only on GitHub, not on CTAN) +lib: Makefiles for the management of self-documenting packages + +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://github.com/KWARC/LaTeX-proposal -The Proposal package for LaTeX diff --git a/base/proposal.dtx b/base/proposal.dtx index f12baf5..b0ce8e5 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -8,7 +8,7 @@ % Either version 1.0 or, at your option, any later version. % % The development version of this file can be found at -% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/base/proposal.dtx $ +% https://github.com/KWARC/LaTeX-proposal % \fi % % \iffalse @@ -28,8 +28,7 @@ \RecordChanges \usepackage{textcomp,url,paralist,a4wide,xspace} \usepackage[show]{ed} -\usepackage[eso-foot,today,draft]{svninfo} -\usepackage[maxbibnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex} +\usepackage[maxbibnames=6,hyperref=auto,style=alphabetic]{biblatex} \bibliography{kwarc} \usepackage[bookmarks=true,linkcolor=blue, citecolor=blue,urlcolor=blue,colorlinks=true, @@ -37,8 +36,6 @@ \makeindex \def\subversion{\textsc{Subversion}\xspace} \begin{document} -\svnInfo $Id: proposal.dtx 24314 2013-03-24 14:39:33Z kohlhase $ -\svnKeyword $URL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/base/proposal.dtx $ \DocInput{proposal.dtx} \end{document} % @@ -95,13 +92,12 @@ % The |proposal| class supports many of the generic elements of Grant Proposals. The % package documentation is still preliminary, fragmented and incomplete. % -% The |proposal| class 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. The CTAN archive always contains the latest -% stable version, the development version can be found at -% {\url{https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal}}. For bug -% reports please use the sTeX trac at {\url{https://trac.kwarc.info/sTeX/}} with component -% |proposal|. +% The |proposal| class 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. The CTAN archive always contains the latest stable +% version, the development version can be found at +% \url{https://github.com/KWARC/LaTeX-proposal}. For bug reports please use the sTeX trac +% at \url{https://github.com/KWARC/LaTeX-proposal/issues}. % % \section{The User Interface}\label{sec:user-interface} % diff --git a/base/proposal.pdf b/base/proposal.pdf index e2b0d53..09cbf41 100644 Binary files a/base/proposal.pdf and b/base/proposal.pdf differ diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls index b28bb16..86f4d8f 100644 --- a/dfg/dfgproposal.cls +++ b/dfg/dfgproposal.cls @@ -42,15 +42,14 @@ \begin{center} {\LARGE \prop@gen@instrument}\\[.2cm] {\LARGE\textbf{\prop@gen@title}}\\[.3cm] -%{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm] -%{\large\today}\\[1em] +{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm] +{\large\today}\\[1em] \WAauthorblock[aff]\prop@gen@PIs\\[2cm] \end{center} -\ifgeneral \edef\keep@tocdepth{\value{tocdepth}} \setcounter{tocdepth}{2}\tableofcontents \setcounter{tocdepth}{\keep@tocdepth} -\setcounter{section}{-1} +\ifgeneral\setcounter{section}{-1} \newpage\thispagestyle{empty} \ifdeutsch\section{Allgemeine Angaben (nur f\"ur ELAN)}\else \section{General Information (for the ELAN system only)}\fi diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx index 6664fa9..10e2f2a 100644 --- a/dfg/dfgproposal.dtx +++ b/dfg/dfgproposal.dtx @@ -8,7 +8,7 @@ % Either version 1.0 or, at your option, any later version. % % The development version of this file can be found at -% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/dfgproposal.dtx $ +% https://github.com/KWARC/LaTeX-proposal % \fi % % \iffalse @@ -28,7 +28,6 @@ \RecordChanges \usepackage{textcomp,url,paralist,a4wide,xspace} \usepackage[show]{ed} -\usepackage[eso-foot,today,draft]{svninfo} \usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex} \bibliography{kwarc} \usepackage[bookmarks=true,linkcolor=blue, @@ -37,8 +36,6 @@ \makeindex \newcommand\subversion{\textsc{Subversion}\xspace} \begin{document} -\svnInfo $Id: dfgproposal.dtx 24385 2013-05-12 09:53:03Z kohlhase $ -\svnKeyword $URL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/dfg/dfgproposal.dtx $ \DocInput{dfgproposal.dtx} \end{document} % @@ -93,10 +90,8 @@ % 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. The CTAN archive always contains the latest stable version, the development -% version can be found at -% {\url{https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal}}. For bug reports -% please use the sTeX trac at {\url{https://trac.kwarc.info/sTeX/}} with component -% |dfgproposal|. +% version can be found at \url{https://github.com/KWARC/LaTeX-proposal}. For bug reports +% please use the sTeX trac at \url{https://github.com/KWARC/LaTeX-proposal/issues}. % % \section{The User Interface}\label{sec:user-interface} % diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf index ba6cc57..27dc6d1 100644 Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf index e007aab..cdd1178 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 6a044ea..e071950 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-blx.bib b/dfg/examples/simple-proposal/proposal-blx.bib index 86bcc8c..9e405b3 100644 --- a/dfg/examples/simple-proposal/proposal-blx.bib +++ b/dfg/examples/simple-proposal/proposal-blx.bib @@ -1,5 +1,5 @@ @Comment{$ biblatex control file $} -@Comment{$ biblatex version 2.1 $} +@Comment{$ biblatex version 2.3 $} 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.1:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+}, + options = {2.3:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+}, } diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf index 314e4ad..846c9d3 100644 Binary files a/dfg/examples/simple-proposal/proposal.pdf and b/dfg/examples/simple-proposal/proposal.pdf differ diff --git a/eu/euproposal.cls b/eu/euproposal.cls index f7b592f..bafeea5 100644 --- a/eu/euproposal.cls +++ b/eu/euproposal.cls @@ -25,7 +25,7 @@ \xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @name}} \xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @acronym}} \xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @countryshort}\tabularnewline\hline}}} -\begin{tabular}{|l|p{8cm}|l|l|}\hline +\begin{tabular}{|l|p{8cm}|l|l|}\hline%| \# & Participant organisation name & Short name & Country\\\hline\hline \@@table \end{tabular}} diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx index 3a119af..3352422 100644 --- a/eu/euproposal.dtx +++ b/eu/euproposal.dtx @@ -8,7 +8,7 @@ % Either version 1.0 or, at your option, any later version. % % The development version of this file can be found at -% $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/euproposal.dtx $ +% https://github.com/KWARC/LaTeX-proposal % \fi % % \iffalse @@ -28,7 +28,6 @@ \RecordChanges \usepackage{textcomp,url,paralist,a4wide,xspace} \usepackage[show]{ed} -\usepackage[eso-foot,today,draft]{svninfo} \usepackage[maxnames=6,hyperref=auto,style=alphabetic,backend=bibtex]{biblatex} \bibliography{kwarc} \usepackage[bookmarks=true,linkcolor=blue, @@ -37,8 +36,6 @@ \makeindex \newcommand\subversion{\textsc{Subversion}\xspace} \begin{document} -\svnInfo $Id: euproposal.dtx 24071 2013-01-13 12:52:43Z kohlhase $ -\svnKeyword $HeadURL: https://svn.kwarc.info/repos/kwarc/doc/macros/forCTAN/proposal/eu/euproposal.dtx $ \DocInput{euproposal.dtx} \end{document} % @@ -96,10 +93,8 @@ % 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. The CTAN archive always contains the latest stable version, the development -% version can be found at -% {\url{https://svn.kwarc.info/repos/kwarc/doc/macros/euproposal}} For bug reports -% please use the sTeX trac at {\url{https://trac.kwarc.info/sTeX/}} with component -% |euproposal|. +% version can be found at \url{https://github.com/KWARC/LaTeX-proposal}. For bug reports +% please use the sTeX trac at \url{https://github.com/KWARC/LaTeX-proposal/issues}. % % \section{The User Interface}\label{sec:user-interface} % @@ -263,7 +258,7 @@ \xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @name}} \xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @acronym}} \xdef\@@table{\@@table&\@nameuse{wa@institution@\@I @countryshort}\tabularnewline\hline}}} -\begin{tabular}{|l|p{8cm}|l|l|}\hline +\begin{tabular}{|l|p{8cm}|l|l|}\hline%| \# & Participant organisation name & Short name & Country\\\hline\hline \@@table \end{tabular}} diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf index c1e3ef9..24fed92 100644 Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ diff --git a/eu/examples/fetopenstrep/propB.pdf b/eu/examples/fetopenstrep/propB.pdf index d720245..a5101c9 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 f42c5d3..a2fe9da 100644 Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ diff --git a/lib/Makefile.in b/lib/Makefile.in index bf78ffc..7e26f9b 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -7,7 +7,7 @@ doc: $(DTX.pdf) $(EXAMPLE.pdf) $(EXAMPLE.pdf): %.pdf: %.tex $(DTX.sty) $(DTX.cls) $(IMG) $(EXAMPLE.deps) $(PDFLATEX) $(firstword $<) @if (grep Citation $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ - then bibtex $(patsubst %.dtx, %, $(firstword $<));fi + then biber $(patsubst %.dtx, %, $(firstword $<));fi @if (grep "Writing index file" $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ then makeindex\ -o $(patsubst %.dtx, %.ind, $(firstword $<))\ @@ -27,7 +27,7 @@ $(DTX.pdf): %.pdf: %.dtx $(IMG) $(PDFLATEX) $(patsubst %.pdf,%.ins,$@) $(PDFLATEX) $(firstword $<) @if (grep Citation $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ - then bibtex $(patsubst %.dtx, %, $(firstword $<));fi + then biber $(patsubst %.dtx, %, $(firstword $<));fi @if (grep "Writing glossary file" $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ then makeindex\ -o $(patsubst %.dtx, %.gls, $(firstword $<))\