diff options
Diffstat (limited to 'macros')
36 files changed, 177 insertions, 38 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile index 9db14d0e6d..2abba8d41a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile @@ -6,20 +6,25 @@ all: $(MAIN).pdf biblatex-styles: stublist mkbiblatexstubs.sh bash mkbiblatexstubs.sh < stublist +biblio.bib: ../swentry.org + ../bin/extract-bibtex.pl < $< > $@ + swentries.tex: ../swentry.org ../bin/export-org-to-latex $< ../bin/extract-entries.pl < ../swentry.tex > $@ -software-biblatex.pdf: software-biblatex.tex swentries.tex history.tex +software-biblatex.pdf: software-biblatex.tex swentries.tex history.tex biblio.bib manual.bib pdflatex software-biblatex.tex bibtex software-biblatex pdflatex software-biblatex.tex pdflatex software-biblatex.tex +sample-use-sty.pdf: biblio.bib + history.tex: git for-each-ref --format="\begin{release}{%(refname:short)}{%(taggerdate:short)} \item %(subject) \end{release}" refs/tags | grep bltx | tac > history.tex -sample.tex : biblatex-styles +sample.tex : biblio.bib biblatex-styles %.pdf: %.tex ifeq (, $(shell PATH=$(PATH) which rubber)) diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib b/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib index 41f7c02532..53b227a4b6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib @@ -84,7 +84,7 @@ author = {Di Cosmo, Roberto and Marco Danelutto}, year = {2020}, version = {1.1.1}, - institution = {Inria}, + institution = {{Inria} and {University of Paris} and {University of Pisa}}, license = {LGPL-2.0}, url = {https://rdicosmo.github.io/parmap/}, repository= {https://github.com/rdicosmo/parmap}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex index e193b2d319..28e960569e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex @@ -1,3 +1,5 @@ +\begin{release}{bltx-v1.1}{2020-04-29} \item Add support for the institution, organization, eprint, eprinttype and eprintclass fields Force urls output when they are the only reference available Updates to the documentation \end{release} +\begin{release}{bltx-v1.0}{2020-04-25} \item First public release \end{release} \begin{release}{bltx-v0.9}{2020-04-25} \item Preparing for public release: Licence, Readme, update documentation, handle suggestions from the Working Group \end{release} \begin{release}{bltx-v0.8}{2020-04-09} \item Make the style usable as an extension, and keep possibility of generating extended styles \end{release} \begin{release}{bltx-v0.7}{2020-04-09} \item Move to diff model approach to be more portable \end{release} @@ -7,4 +9,3 @@ \begin{release}{bltx-v0.3}{2020-04-05} \item Biblatex style with first complete example \end{release} \begin{release}{bltx-v0.2}{2020-04-02} \item Biblatex style sent for review \end{release} \begin{release}{bltx-v0.1}{2020-04-02} \item First version of the biblatex style \end{release} -\begin{release}{bltx-1.0}{2020-04-25} \item First public release \end{release} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/manual.bib b/macros/latex/contrib/biblatex-contrib/biblatex-software/manual.bib index 44b3746534..c9bc76a4ec 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/manual.bib +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/manual.bib @@ -1,3 +1,14 @@ +@software{2013ascl.soft05002P, + author = {{Pontzen}, A. and {Ro{\v s}kar}, R. and {Stinson}, G. and {Woods}, R.}, + title = "{pynbody: N-Body/SPH analysis for python}", + editor = {{Astrophysics Source Code Library}}, + year = 2013, + month = may, + eprint = {1305.002}, + eprinttype = "ascl", + url = {http://adsabs.harvard.edu/abs/2013ascl.soft05002P}, + note = {Provided by the SAO/NASA Astrophysics Data System} +} @manual {scilabdoc, title = {The offical Scilab documentation}, @@ -77,3 +88,4 @@ urllocal = "http://www.dicosmo.org/Articles/2020-CiSE-swhid.pdf", Journal = {Computing in Science and Engineering} } + diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf Binary files differindex 31ee8ffde3..2be521992e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.tex index 93c502933b..918eb4eec5 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.tex @@ -76,6 +76,7 @@ extended with the \texttt{software} module. \item softwaremodule entry Voronoi: from the chain of crossrefs \cite{cgal:lp-gi-20a}, and the from the condensed bibtem \cite{cgal:lp-gi-20a-condensed} (they should be identical) \item software entry Parmap \cite{parmap} \item codefragment entry simplemapper \cite{simplemapper} +\item software entry from the Astrophysics Source Code Library, using the eprint field \cite{2013ascl.soft05002P} \item documentation in a software entry \cite{scilabdoc} \end{itemize} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf Binary files differindex d445d6ed78..e6a6a61245 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex index 71aeac1350..5e04310ba8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex @@ -14,7 +14,7 @@ url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-software/}, author={Roberto Di Cosmo}, email={roberto@dicosmo.org}, - revision={1.0}, + revision={1.1}, date={\today}} \hypersetup{% @@ -199,6 +199,33 @@ of the source code of the software described in the entry. The default is |true| \noindent This option controls the inclusion of the url of the code hosting platform where the software described in the enttry is developed. The default is |true|. +\subsection{Adding support for additional software identifiers} + +It would not be reasonable to have a dedicated field for each of the many software releated identifiers that exist. +If you want to create bibliographic records that use identifiers not natively supported by this package, you +can use the standard Bib\LaTeX\ mechanism that uses the ~eprint~, ~eprinttype~ and ~eprintclass~ fields.\\ + +The default formatting of these fields may be what you want, but if it's not the case, you can define +your own format, as explained in the official Bib\LaTeX\ documentation.\\ + +As an example, this style already contains a specific formatting definition for the Astrophysics Source Code Library (ASCL) software records, +via the following declaration in the ~software.bbx~ file: + +\begin{verbatim} +\DeclareFieldFormat{eprint:ascl}{% + ascl\addcolon\space + \ifhyperref + {\href{https://ascl.net/#1}{% + \nolinkurl{#1}% + \iffieldundef{eprintclass} + {} + {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}} + {\nolinkurl{#1}% + \iffieldundef{eprintclass} + {} + {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}} +\end{verbatim} + \section{Details} The detailed information for this style is contained in the example document and diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx index 3b7f8d0736..007d6e8325 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx @@ -41,17 +41,27 @@ \DeclareLanguageMapping{french}{french-software} % +% Macros +% + +\newbibmacro*{swurl+urldate}{% + \mkbibacro{URL}\addcolon\addspace% + \ifhyperref% + {\href{\strfield{url}}{\nolinkurl{\strfield{url}}}}% + {\nolinkurl{\strfield{url}}}% + \iffieldundef{urlyear}% + {}% + {\setunit*{\addspace}% + \usebibmacro{urldate}}} + +% % Formatting fields for the software entries % \DeclareFieldFormat[softwaremodule,codefragment]{subtitle}{\mkbibquote{#1\isdot}} \DeclareFieldFormat[software,softwareversion,softwaremodule,codefragment]{url}{ \iftoggle{bbx:url}% - {\mkbibacro{URL}\addcolon\addspace% - \ifhyperref% - {\href{#1}{\nolinkurl{#1}}}% - {\nolinkurl{#1}}% - }% + {\usebibmacro{swurl+urldate}} {}% } \DeclareFieldFormat[software,softwareversion,softwaremodule,codefragment]{hal_id}{ @@ -87,6 +97,22 @@ \usebibmacro{list:andothers}} % +% Add here special eprint formats +% +\DeclareFieldFormat{eprint:ascl}{% + ascl\addcolon\space + \ifhyperref + {\href{https://ascl.net/#1}{% + \nolinkurl{#1}% + \iffieldundef{eprintclass} + {} + {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}} + {\nolinkurl{#1}% + \iffieldundef{eprintclass} + {} + {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}} + +% % Macros to format output % \newbibmacro*{swtitleauthoreditoryear}{% @@ -161,11 +187,35 @@ \setunit*{\addcomma\addspace}% \printfield{hal_id}% \setunit*{\addcomma\addspace}% + \iftoggle{bbx:eprint} + {\usebibmacro{eprint}} + {}% + \setunit*{\addcomma\addspace}% \printfield{url}% \setunit*{\addcomma\addspace}% \printfield{repository}% \setunit*{\addcomma\addspace}% \printfield{swhid}% + % + % If only the url is present, output it regardless of bbx:url directive + % + \ifboolexpr{% + not test {\iftoggle{bbx:url}}% + and + not test {\iffieldundef{url}}% + and + test {\iffieldundef{doi}}% + and + test {\iffieldundef{eprint}}% + and + test {\iffieldundef{hal_id}}% + and + test {\iffieldundef{swhid}}% + and + test {\iffieldundef{repository}}% + }% + {\usebibmacro{swurl+urldate}}% + {}% } \newbibmacro*{swrelated}{% @@ -184,6 +234,10 @@ \iftoggle{bbx:swlabels}{\bibstring{software}{\addspace}}{}% \usebibmacro{swtitleauthoreditoryear}% \newunit\newblock% + \printlist{institution} + \newunit\newblock% + \printlist{organization} + \newunit\newblock% \usebibmacro{licenses}% \newunit\newblock% \usebibmacro{swids}% @@ -197,6 +251,10 @@ \iftoggle{bbx:swlabels}{\bibstring{swversion}\addspace}{}% \usebibmacro{swsubtitleauthoreditoryear}% \newunit\newblock% + \printlist{institution} + \newunit\newblock% + \printlist{organization} + \newunit\newblock% \usebibmacro{licenses}% \newunit\newblock% \usebibmacro{swids}% @@ -210,6 +268,10 @@ \iftoggle{bbx:swlabels}{\bibstring{swmodule}\addspace}{}% \usebibmacro{swsubtitleauthoreditoryear}% \newblock\newblock% + \printlist{institution} + \newunit\newblock% + \printlist{organization} + \newunit\newblock% \usebibmacro{licenses}% \newunit\newblock% \usebibmacro{swids}% @@ -223,6 +285,10 @@ \iftoggle{bbx:swlabels}{\bibstring{swexcerpt}\addspace}{}% \usebibmacro{codefragmenttitleauthoreditoryear}% \newunit\newblock% + \printlist{institution} + \newunit\newblock% + \printlist{organization} + \newunit\newblock% \usebibmacro{licenses}% \newunit\newblock% \usebibmacro{swids}% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx index 0542273880..4d45bc7fcc 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx @@ -28,6 +28,9 @@ date, doi, editor, + eprint, + eprintclass, + eprinttype, file, hal_id, hal_version, @@ -69,6 +72,9 @@ date, doi, editor, + eprint, + eprintclass, + eprinttype, file, hal_id, hal_version, @@ -114,6 +120,9 @@ date, doi, editor, + eprint, + eprintclass, + eprinttype, file, hal_id, hal_version, @@ -154,6 +163,9 @@ crossref, date, doi, + eprint, + eprintclass, + eprinttype, file, hal_id, hal_version, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex index 1419970700..03aaee2c9a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex @@ -8,7 +8,7 @@ Computer software. \emph{Required fields:} \texttt{author} / \texttt{editor}, \texttt{title}, \texttt{url}, \texttt{year} -\emph{Optional fields:} \texttt{abstract}, \texttt{date}, \texttt{doi}, \texttt{file}, \texttt{hal\_id}, \texttt{hal\_version}, +\emph{Optional fields:} \texttt{abstract}, \texttt{date}, \texttt{doi}, \texttt{eprint}, \texttt{eprintclass}, \texttt{eprinttype}, \texttt{file}, \texttt{hal\_id}, \texttt{hal\_version}, \texttt{institution}, \texttt{license}, \texttt{month}, \texttt{note}, \texttt{organization}, \texttt{publisher}, \texttt{related}, \texttt{relatedtype}, \texttt{relatedstring}, \texttt{repository}, \texttt{swhid}, \texttt{urldate}, \texttt{version} @@ -18,7 +18,7 @@ fields from the entry mentioned in the \texttt{crossref} field. \emph{Required fields:} \texttt{author} / \texttt{editor}, \texttt{title}, \texttt{url}, \texttt{version}, \texttt{year} -\emph{Optional fields:} \texttt{abstract}, \texttt{crossref}, \texttt{date}, \texttt{doi}, \texttt{file}, \texttt{hal\_id}, \texttt{hal\_version}, +\emph{Optional fields:} \texttt{abstract}, \texttt{crossref}, \texttt{date}, \texttt{doi}, \texttt{eprint}, \texttt{eprintclass}, \texttt{eprinttype}, \texttt{file}, \texttt{hal\_id}, \texttt{hal\_version}, \texttt{institution}, \texttt{introducedin}, \texttt{license}, \texttt{month}, \texttt{note}, \texttt{organization}, \texttt{publisher}, \texttt{related}, \texttt{relatedtype}, \texttt{relatedstring}, \texttt{repository}, \texttt{swhid}, \texttt{subtitle}, \texttt{urldate} @@ -29,7 +29,7 @@ fields from the entry mentioned in the \texttt{crossref} field. \emph{Required fields:} \texttt{author}, \texttt{subtitle}, \texttt{url}, \texttt{year} -\emph{Optional fields:} \texttt{abstract}, \texttt{crossref}, \texttt{date}, \texttt{doi}, \texttt{editor}, \texttt{file}, \texttt{hal\_id}, \texttt{hal\_version}, +\emph{Optional fields:} \texttt{abstract}, \texttt{crossref}, \texttt{date}, \texttt{doi}, \texttt{eprint}, \texttt{eprintclass}, \texttt{eprinttype}, \texttt{editor}, \texttt{file}, \texttt{hal\_id}, \texttt{hal\_version}, \texttt{institution}, \texttt{introducedin}, \texttt{license}, \texttt{month}, \texttt{note}, \texttt{organization}, \texttt{publisher}, \texttt{related}, \texttt{relatedtype}, \texttt{relatedstring}, \texttt{repository}, \texttt{swhid}, \texttt{title}, \texttt{urldate}, \texttt{version} @@ -40,7 +40,7 @@ Inherits values of missing fields from the entry mentioned in the \texttt{crossr \emph{Required fields:} \texttt{url} -\emph{Optional fields:} \texttt{author}, \texttt{abstract}, \texttt{crossref}, \texttt{date}, \texttt{doi}, \texttt{file}, \texttt{hal\_id}, \texttt{hal\_version}, +\emph{Optional fields:} \texttt{author}, \texttt{abstract}, \texttt{crossref}, \texttt{date}, \texttt{doi}, \texttt{eprint}, \texttt{eprintclass}, \texttt{eprinttype}, \texttt{file}, \texttt{hal\_id}, \texttt{hal\_version}, \texttt{institution}, \texttt{introducedin}, \texttt{license}, \texttt{month}, \texttt{note}, \texttt{organization}, \texttt{publisher}, \texttt{related}, \texttt{relatedtype}, \texttt{relatedstring}, \texttt{repository}, \texttt{swhid}, \texttt{subtitle}, \texttt{title}, \texttt{urldate}, \texttt{version}, \texttt{year} @@ -63,6 +63,9 @@ style. It is not used by all standard bibliography styles. \item[{editor}] list (name). The coordinator(s) of large modular software projects. \item[{file}] field (verbatim). A link to download a copy of the work. \item[{doi}] field (verbatim). The Digital Object Identifier of the work. +\item[{eprint [biblatex only]}] field (verbatim). An electronic identifier of the work. This field can be used to accommodate electronic identifiers different from the ones that have a dedicate field in this style. +\item[{eprinttype [biblatex only]}] field (verbatim). The type of eprint identifier, e. g., the name of the archive, repository, service, or system the eprint field refers to. Will be typeset by default as a prefix of the content of the eprint field. +\item[{eprintclass [biblatex only]}] field (verbatim). Additional information related to the resource indicated by the eprinttype field. This could be a section of an archive, a path indicating a service, a classification of some sort. \item[{\texttt{hal\_id} [not in biblatex standard styles]}] field (verbatim). A digital identifier for the software record including its description and metadata on HAL. \item[{\texttt{hal\_version} [not in biblatex standard styles]}] field (verbatim). The version of the HAL software record designated by \texttt{hal\_id}. @@ -74,14 +77,11 @@ For compatibility with BibTeX, one can also use the three letter abbreviations \emph{jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec}, which must be given without any braces or quotes. \item[{note}] field (literal). Release note of the cited version. -\item[{institution}] field (literal). The institution(s) that took part in the -software project. +\item[{institution}] list (literal). The institution(s) that took part in the software project. \item[{introducedin [not in biblatex standard styles]}] field (literal). If this is a software module or fragment, the version of the containing project where it has been first introduced. -\item[{organization}] field (literal). The organization(s) that took part in the -software project. -\item[{publisher}] list (literal). The name(s) of the publisher(s) of the software -record (we need to define the notion of a research software publisher, see issue \href{https://gitlab.inria.fr/gt-sw-citation/bibtex-sw-entry/issues/2}{\#2}). +\item[{organization}] list (literal). The organization(s) that took part in the software project. +\item[{publisher}] list (literal). The name(s) of the publisher(s) of the \emph{qualified} software record. \item[{related [biblatex only]}] field (separated values). Citation keys of other entries which have a relationship to this entry. \item[{relatedtype [biblatex only]}] field (identifier). \item[{relatedstring [biblatex only]}] field (literal). @@ -233,7 +233,7 @@ we can do this as follows: author = {Di Cosmo, Roberto and Marco Danelutto}, year = {2020}, version = {1.1.1}, - institution = {Inria}, + institution = {{Inria} and {University of Paris} and {University of Pisa}}, license = {LGPL-2.0}, url = {https://rdicosmo.github.io/parmap/}, repository= {https://github.com/rdicosmo/parmap}, diff --git a/macros/latex/contrib/jslectureplanner/README b/macros/latex/contrib/jslectureplanner/README index f43cc46989..9d1d09cea4 100644 --- a/macros/latex/contrib/jslectureplanner/README +++ b/macros/latex/contrib/jslectureplanner/README @@ -68,6 +68,11 @@ instructions; also have a look at the example files. == CHANGES == +* V. 1.10 (2020-04-30): - Do not increment session topic counter for cancelled sessions + and breaks. + - Add session option topicnumber to reset topic number in draft mode. + - Recode manual in utf8. + * V. 1.9 (2020-02-04): - Allow \SetBeamerFrameBreak within SessionBlock. - Fix \SetAutoOffset at first session and add optional argument to alter first session (fix contributed by Richard Zach). diff --git a/macros/latex/contrib/jslectureplanner/examples/English/lecturebib-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/lecturebib-english.pdf Binary files differindex 1d8eaeed7a..8ee99de4cd 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/lecturebib-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/lecturebib-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/lecturehandout-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/lecturehandout-english.pdf Binary files differindex 61c1ab3978..174d1d40bb 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/lecturehandout-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/lecturehandout-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/lecturepresentation-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/lecturepresentation-english.pdf Binary files differindex 1c78b890ff..1b8c27038b 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/lecturepresentation-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/lecturepresentation-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/lectureprogram-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/lectureprogram-english.pdf Binary files differindex eaf6da63b4..4be1c094ff 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/lectureprogram-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/lectureprogram-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/lecturescript-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/lecturescript-english.pdf Binary files differindex 30538ff4fd..9183f3c466 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/lecturescript-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/lecturescript-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/membertable-blank-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/membertable-blank-english.pdf Binary files differindex 609f107b66..25e1e676aa 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/membertable-blank-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/membertable-blank-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/membertable-filled-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/membertable-filled-english.pdf Binary files differindex 6c9c7e5b76..52869faee2 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/membertable-filled-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/membertable-filled-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/presencetable-blank-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/presencetable-blank-english.pdf Binary files differindex 23a07d8863..0d7916a417 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/presencetable-blank-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/presencetable-blank-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/presencetable-filled-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/presencetable-filled-english.pdf Binary files differindex bdd8dbaa5e..3374c33a77 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/presencetable-filled-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/presencetable-filled-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/English/presentation-list-english.pdf b/macros/latex/contrib/jslectureplanner/examples/English/presentation-list-english.pdf Binary files differindex 0eb46a1e78..77bdc57f1f 100644 --- a/macros/latex/contrib/jslectureplanner/examples/English/presentation-list-english.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/English/presentation-list-english.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/lecturebib.pdf b/macros/latex/contrib/jslectureplanner/examples/German/lecturebib.pdf Binary files differindex 607a2cd7f9..adfe94072a 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/lecturebib.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/lecturebib.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/lecturehandout.pdf b/macros/latex/contrib/jslectureplanner/examples/German/lecturehandout.pdf Binary files differindex 2182f4979b..3995760271 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/lecturehandout.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/lecturehandout.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/lecturepresentation.pdf b/macros/latex/contrib/jslectureplanner/examples/German/lecturepresentation.pdf Binary files differindex 596a55e08e..f34eddf664 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/lecturepresentation.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/lecturepresentation.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/lectureprogram.pdf b/macros/latex/contrib/jslectureplanner/examples/German/lectureprogram.pdf Binary files differindex e16e751227..a45658c81f 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/lectureprogram.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/lectureprogram.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/lecturescript.pdf b/macros/latex/contrib/jslectureplanner/examples/German/lecturescript.pdf Binary files differindex 19499e9c1b..4b40e63e82 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/lecturescript.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/lecturescript.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/membertable-blank.pdf b/macros/latex/contrib/jslectureplanner/examples/German/membertable-blank.pdf Binary files differindex dd34a9f2be..da80a5f638 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/membertable-blank.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/membertable-blank.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/membertable-filled.pdf b/macros/latex/contrib/jslectureplanner/examples/German/membertable-filled.pdf Binary files differindex 4b270733dd..f4185515ed 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/membertable-filled.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/membertable-filled.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/presencetable-blank.pdf b/macros/latex/contrib/jslectureplanner/examples/German/presencetable-blank.pdf Binary files differindex 5358bf3ccf..cd749eb1e0 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/presencetable-blank.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/presencetable-blank.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/presencetable-filled.pdf b/macros/latex/contrib/jslectureplanner/examples/German/presencetable-filled.pdf Binary files differindex 41c7b8dc25..fd02425a5f 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/presencetable-filled.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/presencetable-filled.pdf diff --git a/macros/latex/contrib/jslectureplanner/examples/German/presentation-list.pdf b/macros/latex/contrib/jslectureplanner/examples/German/presentation-list.pdf Binary files differindex d35b6105fe..8c0539e596 100644 --- a/macros/latex/contrib/jslectureplanner/examples/German/presentation-list.pdf +++ b/macros/latex/contrib/jslectureplanner/examples/German/presentation-list.pdf diff --git a/macros/latex/contrib/jslectureplanner/jslectureplanner.pdf b/macros/latex/contrib/jslectureplanner/jslectureplanner.pdf Binary files differindex b3889d88df..bedf7f4281 100644 --- a/macros/latex/contrib/jslectureplanner/jslectureplanner.pdf +++ b/macros/latex/contrib/jslectureplanner/jslectureplanner.pdf diff --git a/macros/latex/contrib/jslectureplanner/jslectureplanner.sty b/macros/latex/contrib/jslectureplanner/jslectureplanner.sty index 3f589c15dc..975be52a0d 100644 --- a/macros/latex/contrib/jslectureplanner/jslectureplanner.sty +++ b/macros/latex/contrib/jslectureplanner/jslectureplanner.sty @@ -23,8 +23,8 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\filedate{2020/02/04} -\def\fileversion{1.9} +\def\filedate{2020/04/30} +\def\fileversion{1.10} \def\filename{jslectureplanner.sty} \NeedsTeXFormat{LaTeX2e} @@ -869,12 +869,12 @@ \define@key{session}{presstudents}{\csdef{@sespresstudents}{{#1}}} \define@boolkey{session}{cancel}[true]{} \define@boolkey{session}{draft}[true]{} +\define@key{session}{topicnumber}{\setcounter{sestopic}{#1-1}} \define@key{session}{extradate}{\csdef{@xsesdate}{#1}} \define@boolkey{session}{exam}[true]{} % \newcommand*\NewSession[2][]{% \stepcounter{sesunit} - \stepcounter{sestopic} \setcounter{snum}{\thesesunit-\thecancellations} \protected@csxdef{sesnr\thesnum}{\thesnum} \togglefalse{shortinstrdef} @@ -963,6 +963,7 @@ \noexpand\printbibliography[keyword=\csuse{sesbib\thesnum},heading=none]}% }% \else + \stepcounter{sestopic} \ifKV@session@draft \ifcsempty{@sestitle}{\protected@csxdef{sestitle\thesnum}{\sestopic}}{} \fi diff --git a/macros/latex/contrib/jslectureplanner/jslectureplanner.tex b/macros/latex/contrib/jslectureplanner/jslectureplanner.tex index 315435eb6a..a5aff8fa2a 100644 --- a/macros/latex/contrib/jslectureplanner/jslectureplanner.tex +++ b/macros/latex/contrib/jslectureplanner/jslectureplanner.tex @@ -29,7 +29,7 @@ \usepackage[osf]{libertine} \usepackage[scaled=0.7]{beramono} \usepackage[T1]{fontenc} -\usepackage[latin9]{inputenc} +\usepackage[utf8]{inputenc} \usepackage{url} % markup @@ -69,10 +69,10 @@ \title{The \jslp\ bundle} -\author{Jürgen Spitzmüller% +\author{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/jslectureplanner}.}} -\date{Version 1.9, 2020/02/04} +\date{Version 1.10, 2020/04/30} \maketitle @@ -189,7 +189,7 @@ in ``the second \emph{session} of this course''). short form: \emph{PS}, session form: \emph{Sitzung}) \item \joption{se}: Seminar (verbose form: \emph{Seminar}, short form: \emph{SE}, session form: \emph{Sitzung}) -\item \joption{ue}: Practical course (verbose form: \emph{Übung}, short +\item \joption{ue}: Practical course (verbose form: \emph{Ãœbung}, short form: \emph{UE}, session form: \emph{Sitzung}) \item \joption{ko}: Colloquium (verbose form: \emph{Kolloquium}, short form: \emph{KO}, session form: \emph{Sitzung}) @@ -215,7 +215,7 @@ Please also cf. sec.~\ref{sec:styles} on the concept of ``styles''. \item [\joption{semester=\jparam{term}},] where \joption{\jparam{term}} is one of \begin{itemize} -\item \joption{fs}: Spring term (\emph{Frühjahrssemester}, short form: \emph{FS}) +\item \joption{fs}: Spring term (\emph{Frühjahrssemester}, short form: \emph{FS}) \item \joption{hs}: Fall term (\emph{Herbstsemester}, short form: \emph{HS}) \item \joption{ss}: Summer term (\emph{Sommersemester}, short form: \emph{SoSe}) \item \joption{ws}: Winter term (\emph{Wintersemester}, short form: \emph{WS}) @@ -271,7 +271,7 @@ description.} \item \joption{vl}: Lecture (\emph{Vorlesung}) \item \joption{ps}: Undergraduate seminar (\emph{Proseminar}) \item \joption{se}: Seminar (\emph{Seminar}) -\item \joption{ue}: Practical course (\emph{Übung}) +\item \joption{ue}: Practical course (\emph{Ãœbung}) \item \joption{ko}: Colloquium (\emph{Kolloquium}) \item \joption{pv}: Research seminar (\emph{Privatissimum}) \end{itemize} @@ -295,7 +295,7 @@ year of the course; \joption{\jparam{term}} is one of\footnote{See above sec.~\r description.} \begin{itemize} -\item \joption{fs}: Spring term (\emph{Frühjahrssemester}) +\item \joption{fs}: Spring term (\emph{Frühjahrssemester}) \item \joption{hs}: Fall term (\emph{Herbstsemester}) \item \joption{ss}: Summer term (\emph{Sommersemester}) \item \joption{ws}: Winter term (\emph{Wintersemester}) @@ -357,6 +357,9 @@ Valid \joption{\jparam{options}} include: \item \joption{draft=\jparam{true|false}}: If \joption{true}, a placeholder text (by default: ``Thema \jparam{n}'', see sec.~\ref{sec:misccust}) will be output if no session title is defined. This might be handy for planning the schedule. +\item \joption{topicnumber=\jparam{n}}: In draft mode, reset the current topic number of this session to \jparam{n}. + All subsequent topics will be calculated from this unless reset again. This might be useful if only part of + the schedule is still drafted. \item \joption{titlesep=\jparam{separator}}: Separator between session title and subtitle (e.\,g., \verb|titlesep={.\ }|); this overrides any global separator set via \joption{sestitlesep} option or \jcsmacro{SessionTitleSep} macro for the current session @@ -947,11 +950,11 @@ Currently, the package ships three styles: This style can be used as a basis for English styles. The English examples included in the \jslp\ bundle use this style. \item \joption{cologne} provides some specifics current at the University of Cologne - (\emph{Universität zu Köln}): + (\emph{Universität zu Köln}): \begin{itemize} \item Additional course types: \joption{ak} (AK, \emph{Arbeitskurs}), - \joption{as} (AS, \emph{Aufbauseminar}), \joption{es} (ES, \emph{Einführungsseminar}), - \joption{evl} (EVL, \emph{Einführungsvorlesung}), \joption{hs} (HS, \emph{Hauptseminar}). + \joption{as} (AS, \emph{Aufbauseminar}), \joption{es} (ES, \emph{Einführungsseminar}), + \joption{evl} (EVL, \emph{Einführungsvorlesung}), \joption{hs} (HS, \emph{Hauptseminar}). \end{itemize} \end{enumerate} @@ -1188,13 +1191,19 @@ The time span calculation uses code provided by Christian Hupfer at \url{https://tex.stackexchange.com/a/473552/19291}. Thank you, Herbert, Enrico and Christian! Richard Zach provided a fix and enhancement to \jcsmacro{SetAutoOffset}. Many thanks for this. -Finally, Dominik Waßenhoven tested the package and provided +Finally, Dominik Waßenhoven tested the package and provided me with multiple suggestions, which effectively manifested in major new features such as the \jslp\ style files. Thanks, Dominik. \section{Release History} \begin{itemize} +\item 2020/04/30 (v. 1.10): + \begin{itemize} + \item Do not increment session topic counter for cancelled sessions and breaks. + \item Add session option \joption{topicnumber} to reset topic number in draft mode. + \item Recode this manual in utf8. + \end{itemize} \item 2020/02/04 (v. 1.9): \begin{itemize} \item Allow \jcsmacro{SetBeamerFrameBreak} within \joption{SessionBlock}. @@ -1306,7 +1315,7 @@ the \jslp\ style files. Thanks, Dominik. \item Fix expansion issue in \joption{options} option of \jcsmacro{makebeamerprogram}. \item Add option to automatically shift all subsequent sessions by a certain value after every \emph{n}th session (\jcsmacro{SetAutoOffset}). - \item Add \joption{cologne} style file (suggested by Dominik Waßenhoven). + \item Add \joption{cologne} style file (suggested by Dominik Waßenhoven). \end{itemize} \item 2015/02/08 (v. 0.9): \begin{itemize} diff --git a/macros/latex/contrib/jslectureplanner/jsmembertable.sty b/macros/latex/contrib/jslectureplanner/jsmembertable.sty index 27d4be7779..7ec35c292d 100644 --- a/macros/latex/contrib/jslectureplanner/jsmembertable.sty +++ b/macros/latex/contrib/jslectureplanner/jsmembertable.sty @@ -24,8 +24,8 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\filedate{2020/02/04} -\def\fileversion{1.9} +\def\filedate{2020/04/30} +\def\fileversion{1.10} \def\filename{jsmembertable.sty} \NeedsTeXFormat{LaTeX2e} |