summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-software/Changes1
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-software/history.tex16
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.pdfbin129373 -> 128987 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.pdfbin172786 -> 172433 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.tex2
-rw-r--r--Master/texmf-dist/source/latex/biblatex-software/Makefile59
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-software/english-software.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-software/french-software.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-software/software.bbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-software/software.dbx2
10 files changed, 57 insertions, 39 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/Changes b/Master/texmf-dist/doc/latex/biblatex-software/Changes
index 76f1661405c..ab3b8a524d9 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-5}{2022-08-02} \item Fix mishandling of SWHID short toggle when hyperref is not loaded. \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}
diff --git a/Master/texmf-dist/doc/latex/biblatex-software/history.tex b/Master/texmf-dist/doc/latex/biblatex-software/history.tex
deleted file mode 100644
index 76f1661405c..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-software/history.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\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/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.pdf b/Master/texmf-dist/doc/latex/biblatex-software/sample-use-sty.pdf
index b4edeebf1b8..7f46d76a9c1 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
Binary files differ
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 e032a40d8c7..1cb63e32167 100644
--- a/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-software/software-biblatex.pdf
Binary files differ
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 bead6d683ab..5b76ac11edd 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={https://www.ctan.org/tex-archive/macros/latex/contrib/biblatex-contrib/biblatex-software},
author={Roberto Di Cosmo},
email={roberto@dicosmo.org},
- revision={1.2-4},
+ revision={1.2-5},
date={\today}}
\hypersetup{%
diff --git a/Master/texmf-dist/source/latex/biblatex-software/Makefile b/Master/texmf-dist/source/latex/biblatex-software/Makefile
index 1b75b6374df..5d80961ef20 100644
--- a/Master/texmf-dist/source/latex/biblatex-software/Makefile
+++ b/Master/texmf-dist/source/latex/biblatex-software/Makefile
@@ -17,18 +17,24 @@ swentries.tex: ../swentry.org
../bin/extract-entries.pl < ../swentry.tex > $@
software-biblatex.pdf: software-biblatex.tex swentries.tex history.tex biblio.bib manual.bib
- pdflatex software-biblatex.tex
+ pdflatex software-biblatex.tex > /dev/null
bibtex software-biblatex
- pdflatex software-biblatex.tex
- pdflatex software-biblatex.tex
+ pdflatex software-biblatex.tex > /dev/null
+ pdflatex software-biblatex.tex > /dev/null
-sample-use-sty.pdf: biblio.bib sample-content.tex
+sample-use-sty.pdf: biblio.bib sample-content.tex sample-use-sty.tex
-sample-use-sty.backref.pdf: biblio.bib biblio.bib sample-content.tex
+sample-use-sty.nohyperref.tex: sample-use-sty.tex
+ grep -v hyperref $< > $@
+
+sample-use-sty.nohyperref.pdf: biblio.bib sample-content.tex sample-use-sty.nohyperref.tex
+
+sample-use-sty.backref.pdf: 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}"
+ pdflatex -jobname sample-use-sty.backref "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.tex}" > /dev/null
+ biber sample-use-sty.backref > /dev/null
+ pdflatex -jobname sample-use-sty.backref "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.tex}" > /dev/null
+ pdflatex -jobname sample-use-sty.backref "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.tex}" > /dev/null
history.tex:
git for-each-ref --format="\begin{release}{%(refname:short)}{%(taggerdate:short)} \item %(subject) \end{release}" refs/tags | grep bltx | tac > history.tex
@@ -38,25 +44,48 @@ sample.tex : biblio.bib biblatex-styles
%.pdf: %.tex
ifeq (, $(shell PATH=$(PATH) which rubber))
echo "No rubber in $(PATH), falling back to basic pdflatex calls"
- pdflatex $<
- biber $*
- pdflatex $<
+ pdflatex $< > /dev/null
+ biber $* > /dev/null
+ pdflatex $< > /dev/null
+ pdflatex $< > /dev/null
else
rubber -m pdftex $<
endif
+%.txt: %.pdf
+ pdftotext $<
+
+test: sample-use-sty.txt sample-use-sty.nohyperref.txt sample-use-sty.backref.txt
+ # check that we get the same results with and without hyperref
+ echo -n "Testing hyperref vs nohyperref: "
+ (diff sample-use-sty.txt sample-use-sty.nohyperref.txt > /dev/null; if [ $$? -ne 0 ]; then echo "FAIL"; else echo "SUCCESS"; fi)
+ # check that backrefs work
+ echo -n "Testing presence of backrefs: "
+ (grep "cited on page" sample-use-sty.backref.txt > /dev/null; if [ $$? -ne 0 ]; then echo "FAIL"; else echo "SUCCESS"; fi)
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 1; fi
+ echo -n "Updated version number in software-biblatex.tex, date strings in software.* ? [y/N]"
+ read ans; if [ ".$$ans" != ".y" ]; then echo "Please update this information and run make distrib again"; exit 1; fi
# update history
rm history.tex
make software-biblatex.pdf
tar --transform 's,^\(.\),biblatex-software/\1,' -czhvf biblatex-software.tar.gz `git ls-files`
-clean: $(patsubst %,%/clean,$(TEXS))
- rm -f *+sw.bbx *+sw.dbx *+sw.cbx *+sw.lbx *~
+.PHONY: preserve restore clean distclean
+
+clean:
+ # preserve PDF files under version control
+ mkdir -p .save
+ mv `git ls-files | grep pdf` .save
+ # clean up the rest
+ make cleaninner
+ # restore PDF files under version control
+ mv .save/*.pdf .
+ rmdir .save
+
+cleaninner: $(patsubst %,%/clean,$(TEXS))
+ rm -f *+sw.bbx *+sw.dbx *+sw.cbx *+sw.lbx *~ *.txt sample-use-sty.backref.* sample-use-sty.nohyperref.*
%/clean:
if [ -f $* ]; then rubber -m pdftex --clean $* ; fi
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 d18b35ed599..a256d3ef641 100644
--- a/Master/texmf-dist/tex/latex/biblatex-software/english-software.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-software/english-software.lbx
@@ -1,4 +1,4 @@
- \ProvidesFile{english-software.lbx}[2020/04/02 english with additions for software]
+ \ProvidesFile{english-software.lbx}[2022/08/01 english with additions for software]
\InheritBibliographyExtras{english}
\InheritBibliographyStrings{english}
\NewBibliographyString{software,edited,swmodule,swpartof,swversion,swexcerpt,swexc,refart,manual}
diff --git a/Master/texmf-dist/tex/latex/biblatex-software/french-software.lbx b/Master/texmf-dist/tex/latex/biblatex-software/french-software.lbx
index 5a77fd3deef..9a70c7c6561 100644
--- a/Master/texmf-dist/tex/latex/biblatex-software/french-software.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-software/french-software.lbx
@@ -1,4 +1,4 @@
- \ProvidesFile{french-software.lbx}[2020/04/02 french with additions for software]
+ \ProvidesFile{french-software.lbx}[2022/08/01 french with additions for software]
\InheritBibliographyExtras{french}
\InheritBibliographyStrings{french}
\NewBibliographyString{software,edited,swmodule,swpartof,swversion,swexcerpt,swexc,refart,manual}
diff --git a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
index f7d27f471b8..ad9edc60537 100644
--- a/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-software/software.bbx
@@ -1,8 +1,8 @@
-\ProvidesFile{software.bbx}[2020/04/02 bibliography driver extension for software entries, Roberto Di Cosmo]
+\ProvidesFile{software.bbx}[2022/08/01 bibliography driver extension for software entries, Roberto Di Cosmo]
%
% Reference implementation of a BibLaTeX style for the software family of bibliographic entries
%
-% 2020/04/02 Roberto Di Cosmo <roberto@dicosmo.org>
+% 2020 - 2022 Roberto Di Cosmo <roberto@dicosmo.org>
%
\RequireBiber[3]
\RequirePackage{xurl}
@@ -96,6 +96,10 @@
}%
{}%
}
+
+%
+% Notice the use of \edef to force expansion of the macro parameters before calling \nolinkurl
+%
\DeclareFieldFormat[software,softwareversion,softwaremodule,codefragment]{swhid}{%
\iftoggle{bbx:swhid}%
{\mkbibacro{SWHID}\addcolon\addspace%
@@ -103,9 +107,9 @@
{\href{http://archive.softwareheritage.org/#1}{\(\langle\)\nolinkurl{%
\iftoggle{bbx:shortswhid}{\thefield{swhidcore}}{#1}%
}\(\rangle\)}}%
- {\(\langle\)\nolinkurl{%
+ {\(\langle\){\edef\temp{\noexpand\nolinkurl{%
\iftoggle{bbx:shortswhid}{\thefield{swhidcore}}{#1}%
- }\(\rangle\)}%
+ }}\temp}\(\rangle\)}%
}%
{}%
}
diff --git a/Master/texmf-dist/tex/latex/biblatex-software/software.dbx b/Master/texmf-dist/tex/latex/biblatex-software/software.dbx
index f3861cfedf4..477122a513a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-software/software.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-software/software.dbx
@@ -1,4 +1,4 @@
-\ProvidesFile{software.dbx}[2020/04/02 datamodel extension for software entries, Roberto Di Cosmo]
+\ProvidesFile{software.dbx}[2022/08/01 datamodel extension for software entries, Roberto Di Cosmo]
\RequireBiber[3]
%
% the software entry type family, with their fields