12 files changed, 88 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/Changes b/Master/texmf-dist/doc/latex/biblatex-software/Changes
index 56c88eae67f..cd11c76365b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/Changes
+++ b/Master/texmf-dist/doc/latex/biblatex-software/Changes
@@ -1,3 +1,4 @@
+\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}
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/biblio.bib b/Master/texmf-dist/doc/latex/biblatex-software/biblio.bib
index 34dd4859433..a1e54b3c19e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/biblio.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-software/biblio.bib
@@ -3,8 +3,7 @@
   author = {Delebecque, Fran{\c c}ois and Gomez, Claude and Goursat, Maurice 
     and Nikoukhah, Ramine and Steer, Serge and Chancelier, Jean-Philippe},
   url = {https://www.scilab.org/},
-  year = {1994},
-  month = jan,
+  date = {1994-01},
   file = {https://hal.inria.fr/hal-02090402/file/scilab-1.1.tar.gz},
   institution = {Inria},
   license = {Scilab license},
@@ -21,7 +20,7 @@
   title = {Scilab},
   author = {Delebecque, Fran{\c c}ois and Gomez, Claude and Goursat, Maurice 
     and Nikoukhah, Ramine and Steer, Serge and Chancelier, Jean-Philippe},
-  year = {1994},
+  date = {1994},
   institution = {Inria},
   license = {Scilab license},
   hal_id = {hal-02090402},
@@ -33,8 +32,7 @@
 
 @softwareversion {delebecque:hal-02090402v1,
   version = {1.1},
-  year = {1994},
-  month = jan,
+  date = {1994-01},
   file = {https://hal.inria.fr/hal-02090402/file/scilab-1.1.tar.gz},
   swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
 	   origin=https://hal.archives-ouvertes.fr/hal-02090402},
@@ -45,7 +43,7 @@
   title = {The Computational Geometry Algorithms Library},
   author = {{The CGAL Project}},
   editor = {{CGAL Editorial Board}},
-  year = 1996,
+  date = {1996},
   url = {https://cgal.org/}
  }
 
@@ -53,7 +51,7 @@
   crossref = {cgal},
   version = {{5.0.2}},
   url = {https://docs.cgal.org/5.02},
-  year = 2020,
+  date = {2020},
   swhid = {swh:1:rel:636541bbf6c77863908eae744610a3d91fa58855;
            origin=https://github.com/CGAL/cgal/}
  }
@@ -74,7 +72,7 @@
   license = {GPL},
   version = {{5.0.2}},
   introducedin = {cgal:3-1},
-  year = 2020,
+  date = {2020},
   swhid = {swh:1:rel:636541bbf6c77863908eae744610a3d91fa58855;
            origin=https://github.com/CGAL/cgal/},
   url = {https://doc.cgal.org/5.0.2/Manual/packages.html#PkgVoronoiDiagram2},
@@ -82,7 +80,7 @@
 @software {parmap,
   title = {The Parmap library},
   author = {Di Cosmo, Roberto and Marco Danelutto},
-  year = {2020},
+  date = {2020},
   version = {1.1.1},
   institution = {{Inria} and {University of Paris} and {University of Pisa}},
   license = {LGPL-2.0},
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/history.tex b/Master/texmf-dist/doc/latex/biblatex-software/history.tex
index 56c88eae67f..cd11c76365b 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-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}
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/manual.bib b/Master/texmf-dist/doc/latex/biblatex-software/manual.bib
index c9bc76a4ec6..1252930a6c3 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/manual.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-software/manual.bib
@@ -89,3 +89,41 @@
   Journal	= {Computing in Science and Engineering}
 }
 
+@software{sw01091,
+  author = {Tristan Gally and Gerald Gamrath and Patrick Gemander and Ambros
+                  Gleixner and Robert Gottwald and Gregor Hendel and Christopher
+                  Hojny and Stephen J. Maher and Matthias Miltenberger and
+                  Benjamin Müller and Marc Pfetsch and Franziska Schlösser and
+                  Felipe Serrano and Stefan Vigerske and Dieter Weninger and
+                  Jakob Witzig},
+  title = {SCIP},
+  eprint = {01091},
+  eprinttype = "swmath",
+  note = {Provided by swMATH.org},
+}
+
+@article{ipol.2020.300,
+    title   = {{Local Contrast Enhancement based on Adaptive Logarithmic Mappings}},
+    author  = {Lisani, Jose-Luis},
+    journal = {{Image Processing On Line}},
+    volume  = {10},
+    pages   = {43--61},
+    year    = {2020},
+    doi     = {10.5201/ipol.2020.300},
+}
+% if your bibliography style doesn't support doi fields:
+    note    = {\url{https://doi.org/10.5201/ipol.2020.300}}
+	
+@softwareversion{sw-ipol.2020.300,
+    title   = {{Implementation of the LLCC method for image enhancement}},
+    author  = {Lisani, Jose-Luis},
+    date    = {2018-01-01},
+    license = {AGPL-3.0-or-later},
+    version = {2.0},
+    swhid   = {swh:1:dir:03d81d9e8d583aa52bfe5a696c875a406571684c;
+	origin=https://doi.org/10.5201/ipol.2020.300;
+	visit=swh:1:snp:e3c3904624230050561a3c5a615b3852fda6a22c;
+	anchor=swh:1:rev:2bda715d58c19bfc04bac7028a5c67780f177cd3},
+    related = {ipol.2020.300},
+    relatedstring = "Reference article: "
+}
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 05fdbdbe369..e1f9733b8c3 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 918eb4eec54..616351538c5 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
@@ -77,7 +77,9 @@ extended with the \texttt{software} module.
 \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
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/sample.tex b/Master/texmf-dist/doc/latex/biblatex-software/sample.tex
index bb4ba7fdfb8..89fedb0ffb4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-software/sample.tex
@@ -68,7 +68,10 @@ 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 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
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 12c03fedec8..cd71a236ec4 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 b2f1e6e8d29..d97d3bfbefe 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-1},
+  revision={1.2-2},
   date={\today}}
 
 \hypersetup{%
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/swentries.tex b/Master/texmf-dist/doc/latex/biblatex-software/swentries.tex
index 69dcbabb63b..e9437d3329c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/swentries.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-software/swentries.tex
@@ -118,8 +118,7 @@ This is an example description of a software release using a single \texttt{@sof
   author = {Delebecque, Fran{\c c}ois and Gomez, Claude and Goursat, Maurice 
     and Nikoukhah, Ramine and Steer, Serge and Chancelier, Jean-Philippe},
   url = {https://www.scilab.org/},
-  year = {1994},
-  month = jan,
+  date = {1994-01},
   file = {https://hal.inria.fr/hal-02090402/file/scilab-1.1.tar.gz},
   institution = {Inria},
   license = {Scilab license},
@@ -143,7 +142,7 @@ other versions only the changes need to be added in a new \texttt{@softwareversi
   title = {Scilab},
   author = {Delebecque, Fran{\c c}ois and Gomez, Claude and Goursat, Maurice 
     and Nikoukhah, Ramine and Steer, Serge and Chancelier, Jean-Philippe},
-  year = {1994},
+  date = {1994},
   institution = {Inria},
   license = {Scilab license},
   hal_id = {hal-02090402},
@@ -155,8 +154,7 @@ other versions only the changes need to be added in a new \texttt{@softwareversi
 
 @softwareversion {delebecque:hal-02090402v1,
   version = {1.1},
-  year = {1994},
-  month = jan,
+  date = {1994-01},
   file = {https://hal.inria.fr/hal-02090402/file/scilab-1.1.tar.gz},
   swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
 	   origin=https://hal.archives-ouvertes.fr/hal-02090402},
@@ -180,7 +178,7 @@ that currently refer to the user manual, to create the corresponding software en
  title = {The Computational Geometry Algorithms Library},
  author = {{The CGAL Project}},
  editor = {{CGAL Editorial Board}},
- year = 1996,
+ date = {1996},
  url = {https://cgal.org/}
 }
 
@@ -188,7 +186,7 @@ that currently refer to the user manual, to create the corresponding software en
  crossref = {cgal},
  version = {{5.0.2}},
  url = {https://docs.cgal.org/5.02},
- year = 2020,
+ date = {2020},
  swhid = {swh:1:rel:636541bbf6c77863908eae744610a3d91fa58855;
 	  origin=https://github.com/CGAL/cgal/}
 }
@@ -216,7 +214,7 @@ fields as follows:
  license = {GPL},
  version = {{5.0.2}},
  introducedin = {cgal:3-1},
- year = 2020,
+ date = {2020},
  swhid = {swh:1:rel:636541bbf6c77863908eae744610a3d91fa58855;
 	  origin=https://github.com/CGAL/cgal/},
  url = {https://doc.cgal.org/5.0.2/Manual/packages.html#PkgVoronoiDiagram2},
@@ -231,7 +229,7 @@ we can do this as follows:
 @software {parmap,
   title = {The Parmap library},
   author = {Di Cosmo, Roberto and Marco Danelutto},
-  year = {2020},
+  date = {2020},
   version = {1.1.1},
   institution = {{Inria} and {University of Paris} and {University of Pisa}},
   license = {LGPL-2.0},
diff --git a/Master/texmf-dist/source/latex/biblatex-software/Makefile b/Master/texmf-dist/source/latex/biblatex-software/Makefile
index 183640b0506..e8eef5a8fcc 100644
--- a/Master/texmf-dist/source/latex/biblatex-software/Makefile
+++ b/Master/texmf-dist/source/latex/biblatex-software/Makefile
@@ -43,7 +43,7 @@ endif
 distrib:
 	# remind maintainer to update version number in the documentation
 	echo -n "Did you update the version number in software-biblatex.tex? [y/N]"
-	read ans; if [ ".$ans" != ".y" ]; then echo "Please update it and run make distrib again"; exit 0; fi
+	read ans; if [ ".$$ans" != ".y" ]; then echo "Please update it and run make distrib again"; exit 1; fi
 	# update history
 	rm history.tex
 	make software-biblatex.pdf
diff --git a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
index 48f58eb736b..7ef6d84771a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
@@ -113,6 +113,10 @@
 %
 % Add here special eprint formats
 %
+
+%
+% ASCL
+%
 \DeclareFieldFormat{eprint:ascl}{%
  \mkbibacro{ASCL}\addcolon\addspace%
   \ifhyperref
@@ -128,6 +132,23 @@
 }
 
 %
+% swMATH
+%
+\DeclareFieldFormat{eprint:swmath}{%
+ \mkbibacro{SWMATH}\addcolon\addspace%
+  \ifhyperref
+    {\href{https://www.swmath.org/software/#1}{%
+         \(\langle\)swmath\addcolon\nolinkurl{#1}\(\rangle\)%
+       \iffieldundef{eprintclass}
+         {}
+         {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
+    {\(\langle\)swmath\addcolon\nolinkurl{#1}\(\rangle\)%
+     \iffieldundef{eprintclass}
+       {}
+       {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}
+}
+
+%
 % Macros to format output
 %
 \newbibmacro*{swtitleauthoreditoryear}{%
@@ -236,7 +257,12 @@
 \newbibmacro*{swrelated}{%
   \iffieldundef{related}%
                {}%
-               {\usebibmacro{related}}%
+               {\iftoggle{bbx:related}
+	         {\usebibmacro{related:init}%
+	         \usebibmacro{related}
+		 }
+	         {}%
+	       }%
 }               
 
 %