biblatex-software (1jun20)

git-svn-id: svn://tug.org/texlive/trunk@55376 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 47 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-software/Changes b/Master/texmf-dist/doc/latex/biblatex-software/Changes
new file mode 100644
index 00000000000..56c88eae67f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-software/Changes
@@ -0,0 +1,13 @@
+\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/biblio.bib b/Master/texmf-dist/doc/latex/biblatex-software/biblio.bib
index 72f0793ada8..34dd4859433 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/biblio.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-software/biblio.bib
@@ -11,7 +11,7 @@
   hal_id = {hal-02090402},
   hal_version = {v1},
   swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
-           origin=https://hal.inria.fr/hal-02090402},
+	   origin=https://hal.archives-ouvertes.fr/hal-02090402},
   version = {1.1},
   note = {First Scilab version. It was distributed by anonymous ftp.},
   repository= {https://github.com/scilab/scilab},
@@ -37,7 +37,7 @@
   month = jan,
   file = {https://hal.inria.fr/hal-02090402/file/scilab-1.1.tar.gz},
   swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
-           origin=https://hal.inria.fr/hal-02090402},
+	   origin=https://hal.archives-ouvertes.fr/hal-02090402},
   note = {First Scilab version. It was distributed by anonymous ftp.},
   crossref = {delebecque:hal-02090402}
 }
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/history.tex b/Master/texmf-dist/doc/latex/biblatex-software/history.tex
index d0ead656fd0..56c88eae67f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/history.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-software/history.tex
@@ -1,3 +1,5 @@
+\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}
@@ -9,4 +11,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.2}{2020-05-27} \item Add swhid stylemap to support multiline SWHIDs \end{release}
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 c8d65110ec9..05fdbdbe369 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/software-biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.pdf
index 63503343baa..12c03fedec8 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 72de0c520e4..b2f1e6e8d29 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},
+  revision={1.2-1},
   date={\today}}
 
 \hypersetup{%
@@ -203,29 +203,32 @@ platform where the software described in the enttry is developed. The default is
 
 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.\\
+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:
+via the following declaration in the \verb|software.bbx| file:
 
 \begin{verbatim}
 \DeclareFieldFormat{eprint:ascl}{%
-  ascl\addcolon\space
+ \mkbibacro{ASCL}\addcolon\addspace%
   \ifhyperref
     {\href{https://ascl.net/#1}{%
-       \nolinkurl{#1}%
+         \(\langle\)ascl\addcolon\nolinkurl{#1}\(\rangle\)%
        \iffieldundef{eprintclass}
          {}
          {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
-    {\nolinkurl{#1}%
+    {\(\langle\)ascl\addcolon\nolinkurl{#1}\(\rangle\)%
      \iffieldundef{eprintclass}
        {}
-       {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
+       {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}
+}
 \end{verbatim}
 
+If you want to adapt this very example to an identifier |foo| with resolver prefix |https://myfoo.org/|, just replace in the \LaTeX{} code above |https://ascl.net/| with |https://myfoo.org/|, |ascl| with |foo| and |ASCL| with |FOO|.
+
 \section{Details}
 
 The detailed information for this style is contained in the example document and
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/swentries.tex b/Master/texmf-dist/doc/latex/biblatex-software/swentries.tex
index 7cc89052fb9..69dcbabb63b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/swentries.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-software/swentries.tex
@@ -126,7 +126,7 @@ This is an example description of a software release using a single \texttt{@sof
   hal_id = {hal-02090402},
   hal_version = {v1},
   swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
-	   origin=https://hal.inria.fr/hal-02090402},
+	   origin=https://hal.archives-ouvertes.fr/hal-02090402},
   version = {1.1},
   note = {First Scilab version. It was distributed by anonymous ftp.},
   repository= {https://github.com/scilab/scilab},
@@ -159,7 +159,7 @@ other versions only the changes need to be added in a new \texttt{@softwareversi
   month = jan,
   file = {https://hal.inria.fr/hal-02090402/file/scilab-1.1.tar.gz},
   swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
-	   origin=https://hal.inria.fr/hal-02090402},
+	   origin=https://hal.archives-ouvertes.fr/hal-02090402},
   note = {First Scilab version. It was distributed by anonymous ftp.},
   crossref = {delebecque:hal-02090402}
 }
diff --git a/Master/texmf-dist/source/latex/biblatex-software/Makefile b/Master/texmf-dist/source/latex/biblatex-software/Makefile
index 2abba8d41a4..183640b0506 100644
--- a/Master/texmf-dist/source/latex/biblatex-software/Makefile
+++ b/Master/texmf-dist/source/latex/biblatex-software/Makefile
@@ -1,7 +1,10 @@
 TEXS = $(wildcard *.tex)
 MAIN = sample-use-sty
 
-all: $(MAIN).pdf 
+.SILENT: distrib all
+
+
+all: $(MAIN).pdf software-biblatex.pdf
 
 biblatex-styles: stublist mkbiblatexstubs.sh
 	bash mkbiblatexstubs.sh < stublist
@@ -36,7 +39,11 @@ else
 	rubber -m pdftex $<
 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
 	# 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 2358ec10321..48f58eb736b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
@@ -44,11 +44,14 @@
 % Macros
 %
 
+%
+% Notice the use of \edef to force expansion of the macro parameters before calling \nolinkurl
+%
 \newbibmacro*{swurl+urldate}{%
   \mkbibacro{URL}\addcolon\addspace%
      \ifhyperref%
         {\href{\strfield{url}}{\nolinkurl{\strfield{url}}}}%
-        {\nolinkurl{\strfield{url}}}%
+        {\edef\temp{\noexpand\nolinkurl{\strfield{url}}}\temp}%
   \iffieldundef{urlyear}%
     {}%
     {\setunit*{\addspace}%
@@ -80,7 +83,7 @@
            {\mkbibacro{HAL}\addcolon\addspace%
              \ifhyperref%
                  {\href{https://hal.archives-ouvertes.fr/#1\thefield{hal_version}}{\(\langle\)\nolinkurl{#1\thefield{hal_version}}\(\rangle\)}}%
-                 {\(\langle\)\nolinkurl{#1\thefield{hal_version}}\(\rangle\)}%
+                 {\(\langle\)\nolinkurl{#1}\thefield{hal_version}\(\rangle\)}%
            }%
            {}%
 }
@@ -111,17 +114,18 @@
 % Add here special eprint formats
 %
 \DeclareFieldFormat{eprint:ascl}{%
-  ascl\addcolon\space
+ \mkbibacro{ASCL}\addcolon\addspace%
   \ifhyperref
     {\href{https://ascl.net/#1}{%
-       \nolinkurl{#1}%
+         \(\langle\)ascl\addcolon\nolinkurl{#1}\(\rangle\)%
        \iffieldundef{eprintclass}
          {}
          {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
-    {\nolinkurl{#1}%
+    {\(\langle\)ascl\addcolon\nolinkurl{#1}\(\rangle\)%
      \iffieldundef{eprintclass}
        {}
-       {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
+       {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}
+}
 
 %
 % Macros to format output