From 575ab7d0e7534edd510bbc89a2ef4b04582af591 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 4 Mar 2022 03:01:04 +0000 Subject: CTAN sync 202203040301 --- .../biblatex-contrib/biblatex-software/Changes | 17 +++++++- .../biblatex-contrib/biblatex-software/biblio.bib | 38 ++++++++++++++--- .../biblatex-contrib/biblatex-software/history.tex | 3 +- .../biblatex-software/sample-content.tex | 2 +- .../biblatex-software/sample-use-sty.pdf | Bin 128718 -> 129373 bytes .../biblatex-software/software-biblatex.pdf | Bin 171367 -> 172786 bytes .../biblatex-software/software-biblatex.tex | 15 +++++-- .../biblatex-software/software.bbx | 21 ++++++++-- .../biblatex-software/software.dbx | 1 + .../biblatex-software/swentries.tex | 45 ++++++++++++++++++--- 10 files changed, 122 insertions(+), 20 deletions(-) mode change 120000 => 100644 macros/latex/contrib/biblatex-contrib/biblatex-software/Changes (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes b/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes deleted file mode 120000 index 3c0375f0f7..0000000000 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes +++ /dev/null @@ -1 +0,0 @@ -history.tex \ No newline at end of file diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes b/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes new file mode 100644 index 0000000000..76f1661405 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes @@ -0,0 +1,16 @@ +\begin{release}{bltx-v1.2-4}{2022-03-03} \item Add support for displaying short SWHID \end{release} +\begin{release}{bltx-v1.2-3}{2021-08-20} \item Support backrefs. \end{release} +\begin{release}{bltx-v1.2-2}{2020-06-27} \item Fix handling of related field; use date instead of year/month in examples; add swMATH definition \end{release} +\begin{release}{bltx-v1.2-1}{2020-06-01} \item Fix mishandling of SWHIDs and HALids when hyperref is not loaded. Fix wrong origins in some SWHIDs in the examples. Improve ASCL example. \end{release} +\begin{release}{bltx-v1.2}{2020-05-29} \item Bump version to 1.2 with clean support of multiline SWHIDs \end{release} +\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} +\begin{release}{bltx-v0.6}{2020-04-08} \item Standardise file names, make softwarebib.tex self contained, separate out sample.tex, update Makefile, use printdate macro \end{release} +\begin{release}{bltx-v0.5}{2020-04-08} \item Added standard list format for licenses \end{release} +\begin{release}{bltx-v0.4}{2020-04-07} \item Added repository and licence field \end{release} +\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} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib b/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib index a1e54b3c19..89b85578ed 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib @@ -80,18 +80,46 @@ @software {parmap, title = {The Parmap library}, author = {Di Cosmo, Roberto and Marco Danelutto}, - date = {2020}, - version = {1.1.1}, + date = {2012}, 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}, } +@softwareversion {parmap-1.1.1, + crossref = {parmap}, + date = {2020}, + version = {1.1.1}, + swhid = {swh:1:rel:373e2604d96de4ab1d505190b654c5c4045db773; + origin=https://github.com/rdicosmo/parmap; + visit=swh:1:snp:2a6c348c53eb77d458f24c9cbcecaf92e3c45615}, +} + @codefragment {simplemapper, subtitle = {Core mapping routine}, swhid = {swh:1:cnt:43a6b232768017b03da934ba22d9cc3f2726a6c5; - lines=192-228; - origin=https://github.com/rdicosmo/parmap}, - crossref = {parmap} + origin=https://github.com/rdicosmo/parmap; + visit=swh:1:snp:2a6c348c53eb77d458f24c9cbcecaf92e3c45615; + anchor=swh:1:rel:373e2604d96de4ab1d505190b654c5c4045db773; + path=/src/parmap.ml; + lines=192-228}, + crossref = {parmap-1.1.1} +} +@codefragment {simplemapper-condensed, + title = {The Parmap library}, + author = {Di Cosmo, Roberto and Marco Danelutto}, + date = {2020}, + 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}, + version = {1.1.1}, + subtitle = {Core mapping routine}, + swhid = {swh:1:cnt:43a6b232768017b03da934ba22d9cc3f2726a6c5; + origin=https://github.com/rdicosmo/parmap; + visit=swh:1:snp:2a6c348c53eb77d458f24c9cbcecaf92e3c45615; + anchor=swh:1:rel:373e2604d96de4ab1d505190b654c5c4045db773; + path=/src/parmap.ml; + lines=192-228} } diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex index 37f075302e..76f1661405 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex @@ -1,4 +1,5 @@ -\begin{release}{bltx-v1.2-3}{2021-01-09} \item Add support for backrefs. \end{release} +\begin{release}{bltx-v1.2-4}{2022-03-03} \item Add support for displaying short SWHID \end{release} +\begin{release}{bltx-v1.2-3}{2021-08-20} \item Support backrefs. \end{release} \begin{release}{bltx-v1.2-2}{2020-06-27} \item Fix handling of related field; use date instead of year/month in examples; add swMATH definition \end{release} \begin{release}{bltx-v1.2-1}{2020-06-01} \item Fix mishandling of SWHIDs and HALids when hyperref is not loaded. Fix wrong origins in some SWHIDs in the examples. Improve ASCL example. \end{release} \begin{release}{bltx-v1.2}{2020-05-29} \item Bump version to 1.2 with clean support of multiline SWHIDs \end{release} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-content.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-content.tex index b18f544631..dc014a7817 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-content.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-content.tex @@ -45,7 +45,7 @@ extended with the \texttt{software} module. \item softwareversion Scilab 1.1.1 : from the chain of crossrefs \cite{delebecque:hal-02090402v1}, and from the condensed bibtem \cite{delebecque:hal-02090402-condensed} (they should be identical) \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 codefragment entry simplemapper: from the chain of crossrefs \cite{simplemapper}, and from the condensed bibitem \cite{simplemapper-condensed} (they should be identical) \item software entry from the Astrophysics Source Code Library, using the eprint field \cite{2013ascl.soft05002P} \item software entry from the swMATH catalog, using the eprint field \cite{sw01091} \item documentation in a software entry \cite{scilabdoc} 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 index f89eedd265..b4edeebf1b 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf differ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf index 67adf9f35e..e032a40d8c 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf differ 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 4e0aad191c..bead6d683a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex @@ -11,10 +11,10 @@ \titlepage{% title={Bib\LaTeX\ style extension for Software}, subtitle={Citation and References macros for Bib\LaTeX}, - url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-software/}, + url={https://www.ctan.org/tex-archive/macros/latex/contrib/biblatex-contrib/biblatex-software}, author={Roberto Di Cosmo}, email={roberto@dicosmo.org}, - revision={1.2-3}, + revision={1.2-4}, date={\today}} \hypersetup{% @@ -114,6 +114,7 @@ existing Bib\LaTeX\ style by just doing the following: \ExecuteBibliographyOptions{ halid=true, swhid=true, + shortswhid=false, swlabels=true, vcs=true, license=true} @@ -190,7 +191,15 @@ metadata record for the software described in the entry. The default is |true|. \end{ltxcode} \noindent This option controls the inclusion of the identifier on the Software Heritage archive -of the source code of the software described in the entry. The default is |true|. +(SWHID) of the source code of the software described in the entry. The default is |true|. + +\begin{ltxcode} + shortswhid=true|false +\end{ltxcode} + +\noindent This option controls the way the SWHID is displayed. Setting it to true will include +only the core part of the SWHID in the printed version, and keep the full SWHID, with all contextual +information, in the hyperlink. The default is |false|. \begin{ltxcode} vcs=true|false diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx index c33e114347..f7d27f471b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx @@ -1,3 +1,4 @@ +\ProvidesFile{software.bbx}[2020/04/02 bibliography driver extension for software entries, Roberto Di Cosmo] % % Reference implementation of a BibLaTeX style for the software family of bibliographic entries % @@ -10,6 +11,7 @@ % \newtoggle{bbx:halid} \newtoggle{bbx:swhid} +\newtoggle{bbx:shortswhid} \newtoggle{bbx:vcs} \newtoggle{bbx:swlabels} \newtoggle{bbx:license} @@ -18,6 +20,8 @@ \settoggle{bbx:halid}{#1}} \DeclareBibliographyOption[boolean]{swhid}[true]{% \settoggle{bbx:swhid}{#1}} +\DeclareBibliographyOption[boolean]{shortswhid}[false]{% + \settoggle{bbx:shortswhid}{#1}} \DeclareBibliographyOption[boolean]{swlabels}[true]{% \settoggle{bbx:swlabels}{#1}} \DeclareBibliographyOption[boolean]{vcs}[true]{% @@ -25,7 +29,7 @@ \DeclareBibliographyOption[boolean]{license}[true]{% \settoggle{bbx:license}{#1}} -\ExecuteBibliographyOptions{halid,swhid,swlabels,vcs,license} +\ExecuteBibliographyOptions{halid,swhid,shortswhid,swlabels,vcs,license} % % Declare inheritance rules (valid only in LaTeX preamble!) @@ -58,13 +62,18 @@ \usebibmacro{urldate}}} % -% Support multiline SWHIDs +% Support multiline SWHIDs and create swhidcore field from swhid if missing % \DeclareStyleSourcemap{ \maps[datatype=bibtex,overwrite=true]{ \map{ \step[fieldsource=swhid, match=\regexp{\s}, replace={}] } + \map{ + \step[fieldsource=swhid] + \step[fieldset=swhidcore, origfieldval] + \step[fieldsource=swhidcore, match=\regexp{;.*}, replace={}] + } } } @@ -91,8 +100,12 @@ \iftoggle{bbx:swhid}% {\mkbibacro{SWHID}\addcolon\addspace% \ifhyperref% - {\href{http://archive.softwareheritage.org/#1}{\(\langle\)\nolinkurl{#1}\(\rangle\)}}% - {\(\langle\)\nolinkurl{#1}\(\rangle\)}% + {\href{http://archive.softwareheritage.org/#1}{\(\langle\)\nolinkurl{% + \iftoggle{bbx:shortswhid}{\thefield{swhidcore}}{#1}% + }\(\rangle\)}}% + {\(\langle\)\nolinkurl{% + \iftoggle{bbx:shortswhid}{\thefield{swhidcore}}{#1}% + }\(\rangle\)}% }% {}% } diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx index 4d45bc7fcc..f3861cfedf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx @@ -17,6 +17,7 @@ hal_id, hal_version, swhid, + swhidcore, } % diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex index e9437d3329..8679263162 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex @@ -229,19 +229,54 @@ we can do this as follows: @software {parmap, title = {The Parmap library}, author = {Di Cosmo, Roberto and Marco Danelutto}, - date = {2020}, - version = {1.1.1}, + date = {2012}, 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}, } +@softwareversion {parmap-1.1.1, + crossref = {parmap}, + date = {2020}, + version = {1.1.1}, + swhid = {swh:1:rel:373e2604d96de4ab1d505190b654c5c4045db773; + origin=https://github.com/rdicosmo/parmap; + visit=swh:1:snp:2a6c348c53eb77d458f24c9cbcecaf92e3c45615}, +} + @codefragment {simplemapper, subtitle = {Core mapping routine}, swhid = {swh:1:cnt:43a6b232768017b03da934ba22d9cc3f2726a6c5; - lines=192-228; - origin=https://github.com/rdicosmo/parmap}, - crossref = {parmap} + origin=https://github.com/rdicosmo/parmap; + visit=swh:1:snp:2a6c348c53eb77d458f24c9cbcecaf92e3c45615; + anchor=swh:1:rel:373e2604d96de4ab1d505190b654c5c4045db773; + path=/src/parmap.ml; + lines=192-228}, + crossref = {parmap-1.1.1} +} +\end{verbatim} + +Of course, it is always be possible to use only one entry to get an equivalent +result; here one would use just \texttt{@codefragment} with all the needed data +fields as follows: + +\begin{verbatim} +@codefragment {simplemapper-condensed, + title = {The Parmap library}, + author = {Di Cosmo, Roberto and Marco Danelutto}, + date = {2020}, + 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}, + version = {1.1.1}, + subtitle = {Core mapping routine}, + swhid = {swh:1:cnt:43a6b232768017b03da934ba22d9cc3f2726a6c5; + origin=https://github.com/rdicosmo/parmap; + visit=swh:1:snp:2a6c348c53eb77d458f24c9cbcecaf92e3c45615; + anchor=swh:1:rel:373e2604d96de4ab1d505190b654c5c4045db773; + path=/src/parmap.ml; + lines=192-228} } \end{verbatim} -- cgit v1.2.3