13 files changed, 91 insertions, 136 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/Changes b/Master/texmf-dist/doc/latex/biblatex-software/Changes
deleted file mode 100644
index cd11c76365b..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-software/Changes
+++ /dev/null
@@ -1,14 +0,0 @@
-\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/Master/texmf-dist/doc/latex/biblatex-software/README.md b/Master/texmf-dist/doc/latex/biblatex-software/README.md
index 766e85a1259..cfd7f303a04 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/README.md
+++ b/Master/texmf-dist/doc/latex/biblatex-software/README.md
@@ -29,7 +29,7 @@ The simplest way to use this style is to follow the example given
 in the file `sample-use-sty.tex` that shows how one can *extend* any
 existing `biblatex` style by simply doing the following:
 
- - pass the `model=software` option to the `biblatex` package
+ - pass the `datamodel=software` option to the `biblatex` package
  - load the software biblatex style with `\usepackage{software-biblatex}`
  - set software specific bibliography options using the macro `\ExecuteBibliographyOptions`;
    the options with their default values are as in
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/history.tex b/Master/texmf-dist/doc/latex/biblatex-software/history.tex
index cd11c76365b..37f075302e1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/history.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-software/history.tex
@@ -1,3 +1,4 @@
+\begin{release}{bltx-v1.2-3}{2021-01-09} \item Add support for 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/Master/texmf-dist/doc/latex/biblatex-software/sample-content.tex b/Master/texmf-dist/doc/latex/biblatex-software/sample-content.tex
new file mode 100644
index 00000000000..b18f5446315
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-software/sample-content.tex
@@ -0,0 +1,64 @@
+%
+% Make title an hyperlink to the DOI or URL to make the result leaner (suggested by N. Rougier 4/4/2020)
+%
+
+\newcommand{\doiorurl}{%
+  \iffieldundef{doi}
+    {\iffieldundef{url}
+       {}
+       {\strfield{url}}}
+    {http://dx.doi.org/\strfield{doi}}%
+}
+\newcommand{\myhref}[1]{%
+ \ifboolexpr{%
+   test {\ifhyperref}
+   and
+   not test {\iftoggle{bbx:url}}
+   and
+   not test {\iftoggle{bbx:doi}}
+  }
+  {\href{\doiorurl}{#1}}
+  {#1}%
+}
+\DeclareFieldFormat{title}{\myhref{\mkbibemph{#1}}}
+\DeclareFieldFormat
+  [article,inbook,incollection,inproceedings,patent,thesis,unpublished]
+  {title}{\myhref{\mkbibquote{#1\isdot}}}
+
+
+\addbibresource{biblio.bib}
+\addbibresource{manual.bib}
+\author{Inria Software Citation Working Group}
+\date{\today}
+\title{Test document for software entries}
+\begin{document}
+
+\maketitle
+
+This is a test document that showcases the possibilities for rendering the
+various software-releated bibliographic entries with the standard BibLaTeX style
+extended with the \texttt{software} module.
+
+\begin{itemize}
+\item software entry CGAL \cite{cgal} and Scilab \cite{delebecque:hal-02090402}
+\item softwareversion entry CGAL 5.0.2 \cite{cgal:5-0-2}
+\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 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}
+\item software entry \cite{sw-ipol.2020.300} and related article \cite{ipol.2020.300} from the IPOL journal
+\end{itemize}
+
+\ifbacktracker
+\printbibheading[title=References \emph{(with backref enabled)}]
+\else
+\printbibheading[title=References \emph{(default style)}]
+\fi
+\printbibliography[heading=subbibliography,type=software,title={Software Projects}]
+\printbibliography[heading=subbibliography,nottype=software,title={Software versions, modules, excerpts and manuals}]
+
+
+
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.pdf b/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.pdf
index e1f9733b8c3..f89eedd2658 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.tex b/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.tex
index 616351538c5..725c31e8ab1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.tex
@@ -29,61 +29,7 @@
   swlabels=true,
   vcs=true,
   license=false}
-%
-% Make title an hyperlink to the DOI or URL to make the result leaner (suggested by N. Rougier 4/4/2020)
-%
-
-\newcommand{\doiorurl}{%
-  \iffieldundef{doi}
-    {\iffieldundef{url}
-       {}
-       {\strfield{url}}}
-    {http://dx.doi.org/\strfield{doi}}%
-}
-\newcommand{\myhref}[1]{%
- \ifboolexpr{%
-   test {\ifhyperref}
-   and
-   not test {\iftoggle{bbx:url}}
-   and
-   not test {\iftoggle{bbx:doi}}
-  }
-  {\href{\doiorurl}{#1}}
-  {#1}%
-}
-\DeclareFieldFormat{title}{\myhref{\mkbibemph{#1}}}
-\DeclareFieldFormat
-  [article,inbook,incollection,inproceedings,patent,thesis,unpublished]
-  {title}{\myhref{\mkbibquote{#1\isdot}}}
-
-
-\addbibresource{biblio.bib}
-\addbibresource{manual.bib}
-\author{Inria Software Citation Working Group}
-\date{\today}
-\title{Test document for software entries}
-\begin{document}
-
-\maketitle
-
-This is how the proposed entries are rendered with the standard BibLaTeX style
-extended with the \texttt{software} module.
-
-\begin{itemize}
-\item software entry CGAL \cite{cgal} and Scilab \cite{delebecque:hal-02090402}
-\item softwareversion entry CGAL 5.0.2 \cite{cgal:5-0-2}
-\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 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}
-\item software entry \cite{sw-ipol.2020.300} and related article \cite{ipol.2020.300} from the IPOL journal
-\end{itemize}
 
-\printbibheading
-\printbibliography[heading=subbibliography,type=software,title={Software Projects}]
-\printbibliography[heading=subbibliography,nottype=software,title={Software versions, modules, excerpts and manuals}]
+\input{sample-content}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/sample.tex b/Master/texmf-dist/doc/latex/biblatex-software/sample.tex
index 89fedb0ffb4..1113190fdd8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-software/sample.tex
@@ -21,61 +21,6 @@
   defernumbers=true,
   maxbibnames=100]{biblatex}
 
-%
-% Make title an hyperlink to the DOI or URL to make the result leaner (suggested by N. Rougier 4/4/2020)
-%
-
-\newcommand{\doiorurl}{%
-  \iffieldundef{doi}
-    {\iffieldundef{url}
-       {}
-       {\strfield{url}}}
-    {http://dx.doi.org/\strfield{doi}}%
-}
-\newcommand{\myhref}[1]{%
- \ifboolexpr{%
-   test {\ifhyperref}
-   and
-   not test {\iftoggle{bbx:url}}
-   and
-   not test {\iftoggle{bbx:doi}}
-  }
-  {\href{\doiorurl}{#1}}
-  {#1}%
-}
-\DeclareFieldFormat{title}{\myhref{\mkbibemph{#1}}}
-\DeclareFieldFormat
-  [article,inbook,incollection,inproceedings,patent,thesis,unpublished]
-  {title}{\myhref{\mkbibquote{#1\isdot}}}
-
-
-\addbibresource{biblio.bib}
-\addbibresource{manual.bib}
-\author{Inria Software Citation Working Group}
-\date{\today}
-\title{Test document for software entries}
-\begin{document}
-
-\maketitle
-
-This is how the proposed entries are rendered with the standard BibLaTeX style
-extended with the \texttt{software} module.
-
-\begin{itemize}
-\item software entry CGAL \cite{cgal} and Scilab \cite{delebecque:hal-02090402}
-\item softwareversion entry CGAL 5.0.2 \cite{cgal:5-0-2}
-\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 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}
-\item software entry \cite{sw-ipol.2020.300} and related article \cite{ipol.2020.300} from the IPOL journal
-\end{itemize}
-
-\printbibheading
-\printbibliography[heading=subbibliography,type=software,title={Software Projects}]
-\printbibliography[heading=subbibliography,nottype=software,title={Software versions, modules, excerpts and manuals}]
+\input{sample-content}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.pdf
index cd71a236ec4..67adf9f35e5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.tex b/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.tex
index d97d3bfbefe..4e0aad191cc 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.tex
+++ b/Master/texmf-dist/doc/latex/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.2-2},
+  revision={1.2-3},
   date={\today}}
 
 \hypersetup{%
diff --git a/Master/texmf-dist/source/latex/biblatex-software/Makefile b/Master/texmf-dist/source/latex/biblatex-software/Makefile
index e8eef5a8fcc..1b75b6374df 100644
--- a/Master/texmf-dist/source/latex/biblatex-software/Makefile
+++ b/Master/texmf-dist/source/latex/biblatex-software/Makefile
@@ -22,7 +22,13 @@ software-biblatex.pdf: software-biblatex.tex swentries.tex history.tex biblio.bi
 	pdflatex software-biblatex.tex
 	pdflatex software-biblatex.tex
 
-sample-use-sty.pdf: biblio.bib
+sample-use-sty.pdf: biblio.bib sample-content.tex
+
+sample-use-sty.backref.pdf: biblio.bib biblio.bib sample-content.tex
+	# test that backrefs work
+	pdflatex "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.backref.tex}"
+	biber sample-use-sty.backref
+	pdflatex "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.backref.tex}"
 
 history.tex:
 	git for-each-ref --format="\begin{release}{%(refname:short)}{%(taggerdate:short)} \item %(subject) \end{release}" refs/tags | grep bltx | tac > history.tex
diff --git a/Master/texmf-dist/tex/latex/biblatex-software/english-software.lbx b/Master/texmf-dist/tex/latex/biblatex-software/english-software.lbx
index 3d3220e3524..d18b35ed599 100644
--- a/Master/texmf-dist/tex/latex/biblatex-software/english-software.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-software/english-software.lbx
@@ -3,11 +3,11 @@
   \InheritBibliographyStrings{english}
   \NewBibliographyString{software,edited,swmodule,swpartof,swversion,swexcerpt,swexc,refart,manual}
   \DeclareBibliographyStrings{%
-    software  = {{\sc [Software]}{\sc [SW]}},
-    swmodule  = {{\sc [Software Module]}{\sc [SW Mod\adddot]}},
+    software  = {{\textsc [Software]}{\textsc [SW]}},
+    swmodule  = {{\textsc [Software Module]}{\textsc [SW Mod\adddot]}},
     swpartof  = {{part of}}{{part of}},
-    swversion = {{\sc [Software Release]}{\sc [SW Rel\adddot]}},
-    swexcerpt = {{\sc [Software excerpt]}{\sc [SW exc\adddot]}},
+    swversion = {{\textsc [Software Release]}{\textsc [SW Rel\adddot]}},
+    swexcerpt = {{\textsc [Software excerpt]}{\textsc [SW exc\adddot]}},
     swexc     = {{from}}{{from}},
     edited    = {{Coordinated by}{Coord\adddot by}},
     refart    = {{Described in}{Descr\adddot in}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
index 7ef6d84771a..c33e1143470 100644
--- a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
@@ -161,8 +161,7 @@
     {\printtext[parens]{%
         \bibstring{edited}\addspace%
         \printnames{editor}}}%
-    \addcomma%
-    \addspace%
+    \setunit*{\addcomma\addspace}%
     \printdate%
 }
 
@@ -182,8 +181,7 @@
     {\printtext[parens]{%
         \bibstring{edited}\addspace%
         \printnames{editor}}}%
-    \addcomma%
-    \addspace%
+    \setunit*{\addcomma\addspace}%
     \printdate%
 }
 
@@ -284,6 +282,8 @@
   \usebibmacro{swids}%
   \newunit\newblock%
   \usebibmacro{swrelated}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{softwareversion}{%
@@ -301,6 +301,8 @@
   \usebibmacro{swids}%
   \newunit\newblock%
   \usebibmacro{swrelated}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{softwaremodule}{%
@@ -318,6 +320,8 @@
   \usebibmacro{swids}%
   \newunit\newblock%
   \usebibmacro{swrelated}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{codefragment}{%
@@ -335,4 +339,6 @@
   \usebibmacro{swids}%
   \newunit\newblock%
   \usebibmacro{swrelated}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
   \usebibmacro{finentry}}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index aefbe422912..706c13d2881 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1539,6 +1539,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'bib2gls'		=> '&POSTbib2gls',
  'biber'                => '&POSTbiber',
  'biblatex'             => '&POSTbiblatex',
+ 'biblatex-software'    => '&POST_rmsymlink',
  'bibtex'               => '&POSTbibtex',
  'bibtexperllibs'       => '&POSTbibtexperllibs',
  'cfr-lm'               => '&POSTcfr_lm',