summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-21 20:32:01 +0000
committerKarl Berry <karl@freefriends.org>2022-03-21 20:32:01 +0000
commit4683b5f1c565f269340aeeb3abc9ca31bcef9c83 (patch)
treedaa0604616f5d5fc81fd58294443c8cf960e382e
parentce800a91f5f5a5ea75d2b97c7c4633dde84337ec (diff)
biblatex-iso690 (21mar22)
git-svn-id: svn://tug.org/texlive/trunk@62866 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-iso690/README.md26
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690-examples.bib (renamed from Master/texmf-dist/doc/latex/biblatex-iso690/mybib.bib)94
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdfbin258286 -> 277123 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex122
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/bulgarian-iso.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/french-iso.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx30
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx35
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx51
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-fullcite.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx259
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/ngerman-iso.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/spanish-iso.lbx35
27 files changed, 604 insertions, 120 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/README.md b/Master/texmf-dist/doc/latex/biblatex-iso690/README.md
index cdf10a48922..26f6e2ac1c2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-iso690/README.md
+++ b/Master/texmf-dist/doc/latex/biblatex-iso690/README.md
@@ -41,10 +41,21 @@ here. You should be able to use `biblatex-iso690` now.
\usepackage[english,czech]{babel} % the main document language is the last one
\usepackage[
backend=biber, % if we want unicode and many other features (biber is already by default)
- style=iso-authoryear, % or iso-numeric for numeric citation method
+ style=iso-authoryear, % or another iso-<style>
]{biblatex}
```
+### Citation and bibliography styles
+
+`biblatex-iso690` provides the following styles (both for citations
+and bibliographies). You can select one with `style` keyword in the
+package options of `biblatex`.
+
+* `iso-alphabetic`
+* `iso-authortitle`
+* `iso-authoryear`
+* `iso-numeric`
+
### Custom options
Above and beyond the scope of package options provided by `biblatex` itself,
@@ -89,6 +100,15 @@ here are also some more. Default values are in **bold**.
`publisher` fields) for an `@article` entry type
* [true] Journal of Money, Credit and Banking. Ohio State University Press, vol. 38, no. 1, pp. 119–140.
* **[false]** Journal of Money, Credit and Banking. Vol. 38, no. 1, pp. 119–140.
+* `currentlang`
+ print localization bibliography strings in the currently selected language
+ * [true] `context dependent`
+ * **[false]** `context dependent`
+* `noenddot`
+ enable or disable printing an end dot at the very end of
+ bibliography entries
+ * [true] ... ISSN 1082-9873. Available from DOI : 10.1045/july2005-lynch
+ * **[false]** ... ISSN 1082-9873. Available from DOI : 10.1045/july2005-lynch.
### Bibliographic fields
@@ -135,7 +155,7 @@ supervisor = {Petr Sojka},
dateaddon = {\mkbibbrackets{16th century}},
```
-For more details see the example bibliography file [mybib.bib](./mybib.bib).
+For more details see the example bibliography file [biblatex-iso690-examples.bib](./biblatex-iso690-examples.bib).
## Contributing
@@ -151,7 +171,7 @@ If the `<langid>.lbx` is already included in `biblatex`, adding a
of this package. Otherwise, please consider [a contribution to the `biblatex`
package](https://github.com/plk/biblatex/#translation) first.
-If you also aim to add new localisation strings, you have to define them via
+If you also aim to add new localization strings, you have to define them via
`\NewBibliographyString` command at the beginning of the [iso.bbx](iso.bbx)
file.
diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/mybib.bib b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690-examples.bib
index f87684085f3..0d123236e42 100644
--- a/Master/texmf-dist/doc/latex/biblatex-iso690/mybib.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690-examples.bib
@@ -187,6 +187,35 @@
crossref = {tugboat1980},
}
+% Book with volume field example
+@book{knuth1998sorting,
+ author = {Knuth, Donald E.},
+ maintitle = {The Art of Computer Programming},
+ title = {Sorting and Searching},
+ date = {1998},
+ volume = {3},
+ edition = {2},
+ publisher = {Addison–Wesley},
+ isbn = {978-0-201-89685-5},
+}
+
+% Multi-volume book example (volumes field)
+% Gratefully borrowed from biblatex-examples.bib
+@mvbook{knuth:ct,
+ author = {Knuth, Donald E.},
+ title = {Computers \& Typesetting},
+ date = {1984/1986},
+ volumes = 5,
+ publisher = {Addison-Wesley},
+ location = {Reading, Mass.},
+ langid = {english},
+ langidopts = {variant=american},
+ sorttitle = {Computers & Typesetting},
+ indexsorttitle = {Computers & Typesetting},
+ annotation = {A five-volume book cited as a whole. This is a \texttt{mvbook}
+ entry, note the \texttt{volumes} field},
+}
+
% Made-up bib entry
@collection{sbornik2007,
title = {Mimořádně užitečný sborník},
@@ -229,17 +258,31 @@
}
@patent{groll2008method,
- author = {Clad Metals LLC Canonsburg, PA 15317 (US)},
+ holder = {{Clad Metals LLC Canonsburg, PA 15317 (US)}},
title = {Method of making a copper core five-ply composite and cooking vessel},
- editora = {Groll, W. A.},
- editoratype = {inventor},
+ author = {Groll, W. A.},
publisher = {Google Patents},
number = {EP 1 094 937 B1},
type = {patenteu},
date = {2008-07-30},
+ origdate = {1999-05-04},
url = {https://patents.google.com/patent/EP1094937B1},
}
+@patent{winget1967detachable,
+ holder = {{Winget Ltd}},
+ title = {Detachable bulldozer attachment for dumper vehicles},
+ author = {Reginald John England},
+ number = {1060631},
+ type = {patentuk},
+ date = {1967-03-08},
+ origdate = {1963-06-10},
+ note = {Int\adddotspace CI\addcolon\addabbrvspace E02F 3/76\adddotspace
+ GB\addabbrvspace CI\addcolon\addabbrvspace E1F 12},
+ url = {https://patents.google.com/patent/GB1060631},
+ langid = {english},
+}
+
% Made-up bib entry
% No date example
@book{applebyND,
@@ -329,7 +372,7 @@
options = {useeditor=false},% title first
}
-% Movie type exaple #2
+% Movie type example #2
% Someone has a dominant role (e.g. clearly responsible for the intellectual
% content) ==> given as the creator at the first place
@movie{vlacil1967marketa,
@@ -409,7 +452,48 @@
urldate = {2020-03-25},
}
+% Organization (corporate name) as author example
+% Organization bib field example
+@manual{dialog1985enhancements,
+ author = {{Dialog Information Services}},
+ title = {Enhancements to the DIALOG Search System},
+ subtitle = {DIALOG version 2 (user manual update)},
+ date = {1985-11},
+ location = {Palo Alto (California)},
+ organization = {Dialog},
+ note = {Technical Memo 5},
+}
+
+% currentlang package option example 1
+@article{tex:zpravodajchlebikova91,
+ author = {Chlebíková, Jana},
+ title = {Ako rozděliť (slovo) Československo},
+ journal = {Zpravodaj CSTUG},
+ volume = 1,
+ number = 4,
+ year = 1991,
+ month = {04},
+ pages = {10-13},
+ doi = {10.5300/1991-4/10},
+ note = {No langid},
+}
+
+% currentlang package option example 2
+@article{tex:zpravodajchlebikova91cz,
+ author = {Chlebíková, Jana},
+ title = {Ako rozděliť (slovo) Československo},
+ journal = {Zpravodaj CSTUG},
+ volume = 1,
+ number = 4,
+ year = 1991,
+ month = {04},
+ pages = {10-13},
+ doi = {10.5300/1991-4/10},
+ langid = {czech},
+ note = {Czech langid},
+}
+
% Made-up ISBNs generated by https://generate.plus/en/number/isbn
-% biber --tool --validate-datamodel --tool-fieldcase=lower --output-align mybib.bib
+% biber --tool --validate-datamodel --tool-fieldcase=lower --output-align biblatex-iso690-examples.bib
% + sort fields in the meaningful order
diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf
index 9a9386f5c73..027d98e299b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex
index 92fa8bd246e..18a49018e4f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex
@@ -32,8 +32,9 @@
% but the main document language is English
pagetotal=true,
]{biblatex}
+\usepackage{expl3}
-\addbibresource{mybib.bib}
+\addbibresource{biblatex-iso690-examples.bib}
% Support diacritics in Czech examples
% ref.: https://stackoverflow.com/a/16084246
@@ -77,8 +78,8 @@
url={https://github.com/michal-h21/biblatex-iso690},
author={Michal Hoftich},
email={michal.h21@gmail.com},
- revision={0.4.0},
- date={\DTMDate{2020-03-25}}}
+ revision={0.4.1},
+ date={\DTMDate{2022-03-20}}}
\hypersetup{%
pdftitle={ISO~690 \biblatex style},
@@ -144,13 +145,11 @@ so feel free to use the possibilities provided there for reporting issues and th
A minimal working example for \t|babel| package:
\begin{ltxexample}
\documentclass{article}
-\usepackage[utf8]{inputenc}
\usepackage[english,czech]{babel}
-% \usepackage[main=czech,english]{babel}
\usepackage{csquotes}
\usepackage[style=iso-authoryear]{biblatex}
-\addbibresource{mybib.bib}
+\addbibresource{biblatex-iso690-examples.bib}
\begin{document}
\cite{knuth1990virtual}
@@ -162,14 +161,13 @@ A minimal working example for \t|babel| package:
A minimal working example for \t|polyglossia| package:
\begin{ltxexample}
\documentclass{article}
-\usepackage[utf8]{inputenc}
\usepackage{polyglossia}
\setmainlanguage{czech}
\setotherlanguage{english}
\usepackage{csquotes}
\usepackage[style=iso-authoryear]{biblatex}
-\addbibresource{mybib.bib}
+\addbibresource{biblatex-iso690-examples.bib}
\begin{document}
\cite{knuth1990virtual}
@@ -185,6 +183,15 @@ per-entry basis in a resource (\t|.bib|) file. In addition, all of the
languages specified in these fields have to be loaded by the \t|babel| or
\t|polyglossia| package respectively.
+The affected fields that should be printed as they appear in the
+original source (in the language of resource, using the \t|langid|
+field) are, e.g. numeration information (volume, number, edition,
+etc.), while availability and access information (\textit{available
+from}), medium designation (\t|howpubished| field), pages range, or
+the relations of subsidiary creators (\textit{translated by},
+\textit{revised by}, etc.) are examples of using the main document
+language.
+
Note that for correct support of localization functionality, the \t|babel|
or \t|polyglossia| package should be used. The main document language
is:
@@ -198,6 +205,50 @@ is:
\cmd{setotherlanguage}) (see MWE above)
\end{description}
+\subsubsection{Switching multiple languages}
+\label{sec:general:currentlang}
+
+Sometimes the main document language is selected in the document
+class, and the user can only switch the active language, not the main
+language. This is usually a case of journals/collections of articles
+that can be prepared (in their entirety) in one main language, but
+where individual articles might also be written in a different
+language (e.g., this is the case with \t|csbulletin| class). Then you
+can use \t|currentlang| option (see also~\ref{sec:pkg:opt:iso690}),
+which allows switching to the active surrounding language, and print
+\biblatex localization strings accordingly to this currently selected
+language, not the main language.
+
+The following MWE illustrates switching the active languages (English
+and German over the main Czech language) on two bibliography entries,
+one with the Czech \t|langid| field and the other without specified
+language.
+
+\begin{ltxexample}
+ \documentclass{article}
+ \usepackage[T1]{fontenc}
+ \usepackage[main=czech,english,ngerman]{babel}
+ \usepackage{csquotes}
+
+ \usepackage[style=iso-numeric,currentlang]{biblatex}
+ \addbibresource{biblatex-iso690-examples.bib}
+
+ \begin{document}
+
+ \nocite{tex:zpravodajchlebikova91}
+ \nocite{tex:zpravodajchlebikova91cz}
+ \printbibliography
+
+ \selectlanguage{english}
+ \printbibliography
+
+ \selectlanguage{ngerman}
+ \printbibliography
+
+ \end{document}
+\end{ltxexample}
+
+
\subsection{Citation systems}
\label{sec:citation:systems}
@@ -380,6 +431,19 @@ Enable or disable printing publication information (\t|location| and
\t|false| since it is very unusual behavior and rarely used by either other
citation styles or citation managers.
+\boolitem[false]{currentlang}
+
+By default, the main document language is used for printing of bibliography
+strings. Some classes load the \t|babel| package and user cannot select the main
+document language easily. With this option, the currently selected language
+will be used instead (see also~\ref{sec:general:currentlang}).
+
+\boolitem[false]{noenddot}
+
+Enable or disable printing an end dot at the very end of bibliography
+entries. The default value is \t|false|, meaning a dot is printed at
+the end.
+
\end{optionlist}
@@ -566,12 +630,12 @@ supervisor and school (institution) can be entered into the fields
\paragraph{Patent}\hfill\\
\label{sec:patent}
+The dominant role as an author has the holder of a patent (\t|holder|
+field). The subsidiary author is an inventor (if known) of the patent
+(\t|author| field). Application date fits in the \t|origdate| field,
+while date of publication in the \t|date| field.
The field \t|number| is available for the patent classification
or request number.
-If the inventor is also known, we can use \t|editora| and \t|editoratype|
-fields to specify that. Use an additionally created role \t|inventor| for the
-\t|editoratype| field; it is the key that translates based on the localization
-strings.
For the patent type, we can use localization strings as well, e.g.
\t|patenteu|.
\newline
@@ -579,15 +643,15 @@ For the patent type, we can use localization strings as well, e.g.
\c{groll2008method}
\begin{ltxexample}
@patent{groll2008method,
- author = {Clad Metals LLC Canonsburg, PA 15317 (US)},
+ holder = {{Clad Metals LLC Canonsburg, PA 15317 (US)}},
title = {Method of making a copper core five-ply composite
and cooking vessel},
- editora = {Groll, W. A.},
- editoratype = {inventor},
+ author = {Groll, W. A.},% <---------- inventor
publisher = {Google Patents},
number = {EP 1 094 937 B1},
type = {patenteu},
- date = {2008-07-30},
+ date = {2008-07-30},% <------------ publication date
+ origdate = {1999-05-04},% <------------ application date
url = {https://patents.google.com/patent/EP1094937B1},
}
\end{ltxexample}
@@ -605,7 +669,16 @@ to the \biblatex documentation.
\subsubsection{Creators}
The persons or organizations responsible for the cited work should be
-primarily given in the \t|author| field. If it is not appropriate,
+primarily given in the \t|author| field. Please note that organization
+names (so-called corporate authors) need to be protected with doubled
+curly braces to avoid being (mis)parsed into family/given names
+(resulting in wrong order and formatting).
+
+\begin{ltxexample}
+ author = {{Dialog Information Services}},
+\end{ltxexample}
+
+If the \t|author| is not appropriate,
other fields like \t|editor| and \t|editorX| family fields or some
specific ones (e.g. \t|translator|) can be used. Note also the field
\t|editortype| and \t|editortypeX| family fields which can be used
@@ -765,6 +838,21 @@ see~\parencite{gosse1912garden}.
\begin{changelog}
+\begin{release}{0.4.1}{2022-03-20}
+\item Added \t|currentlang| package option.\see{sec:pkg:opt:iso690}
+\item Added mapping from \t|ngerman| to \t|german| language.
+\item Added Spanish language support.
+\item Removed \t|inputenc| package from examples.
+\item Added \t|expl3| package in the documentation to fix compilation error.
+\item Prevent capitalisation of the \t|[online]| bibliography string.\see{sec:howpublished}
+\item Fix punctuation before \t|urldate| if publisher info is missing.
+\item Print \t|organization| field in publisher \t|location+publisher| list.
+\item Improved support for \t|@patent| entries.\see{sec:patent}
+\item Improved documentation.
+\item Fixed missing \t|volume| and \t|volumes| fields.
+\item Added \t|noenddot| package option.\see{sec:pkg:opt:iso690}
+\end{release}
+
\begin{release}{0.4.0}{2020-03-25}
\item Fixed deprecated name handling
\item Declared mapping suffix (\t|<lang>-iso.lbx|) for localization files
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/bulgarian-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/bulgarian-iso.lbx
index 858f936995f..3f596587e9d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/bulgarian-iso.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/bulgarian-iso.lbx
@@ -1,5 +1,5 @@
\ProvidesFile{bulgarian-iso.lbx}
- [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
\InheritBibliographyExtras{bulgarian}
\InheritBibliographyStrings{bulgarian}
@@ -25,6 +25,10 @@
{онлайн}},
film = {{филм}%
{филм}},
+% application = {{}%
+% {}},% FIXME: missing
+% publication = {{}%
+% {}},% FIXME: missing
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx
index ff7967e00fa..8e1dc21366d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx
@@ -1,5 +1,5 @@
\ProvidesFile{czech-iso.lbx}
- [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
\InheritBibliographyExtras{czech}
\InheritBibliographyStrings{czech}
@@ -25,6 +25,10 @@
{online}},
film = {{film}%
{film}},
+ application = {{p\v{r}ihl\'{a}\v{s}ka}%
+ {p\v{r}ihl\adddot}},
+ publication = {{publikov\'{a}no}%
+ {publ\adddot}},
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx
index 916128b6b8a..a627d0171ba 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx
@@ -1,5 +1,5 @@
\ProvidesFile{english-iso.lbx}
- [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
\InheritBibliographyExtras{english}
\InheritBibliographyStrings{english}
@@ -23,6 +23,10 @@
{online}},
film = {{film}%
{film}},
+ application = {{application}%
+ {appl\adddot}},
+ publication = {{publication}%
+ {publ\adddot}},
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/french-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/french-iso.lbx
index e249655c719..e5c880c076c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/french-iso.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/french-iso.lbx
@@ -1,5 +1,5 @@
\ProvidesFile{french-iso.lbx}
- [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
\InheritBibliographyExtras{french}
\InheritBibliographyStrings{french}
@@ -30,6 +30,10 @@
{en ligne}},
film = {{film}%
{film}},
+% application = {{}%
+% {}},% FIXME: missing
+% publication = {{}%
+% {}},% FIXME: missing
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx
index 7146b27e7ca..ccfebd27772 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx
@@ -1,5 +1,5 @@
\ProvidesFile{german-iso.lbx}
- [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
\InheritBibliographyExtras{german}
\InheritBibliographyStrings{german}
@@ -11,18 +11,22 @@
{betreut von}},
urlalso = {{auch verf\"{u}gbar unter}
{auch verf\"{u}gbar unter}},
-% director = {{}%
-% {}},% FIXME: missing
-% bydirector = {{}%
-% {}},% FIXME: missing
-% inventor = {{}%
-% {}},% FIXME: missing
-% byinventor = {{}%
-% {}},% FIXME: missing
-% online = {{}%
-% {}},% FIXME: missing
-% film = {{}%
-% {}},% FIXME: missing
+ director = {{Regisseur}
+ {Regisseur}},
+ bydirector = {{Regie}
+ {Regie}},
+ inventor = {{Erfinder}
+ {Erfinder}},
+ byinventor = {{erfunden von}
+ {erfunden von}},
+ online = {{online}
+ {online}},
+ film = {{Film}
+ {Film}},
+ application = {{Anmeldung}
+ {Anmeldung}},
+ publication = {{Veröffentlichungstag}
+ {Veröffentlichungstag}},
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx
index beef88d4146..1c6c71be3fb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-alphabetic.bbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
% This is a copy of alphabetic.bbx
% It only uses iso as base style, instead of standard
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx
index 2d90c118d0a..34ee9223d56 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-alphabetic.cbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex citation style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex citation style]
\RequireCitationStyle{alphabetic}
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.dbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.dbx
index 2248f37e35e..98dfa301952 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.dbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-alphabetic.dbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex data model extension]
+ [2022/03/20 v0.4.1 ISO 690 biblatex data model extension]
\RequireBiber[3]
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx
index ab683014ce0..298c5a04e7e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx
@@ -1,9 +1,42 @@
\ProvidesFile{iso-authortitle.bbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
\RequireBibliographyStyle{iso}
\ExecuteBibliographyOptions{%
sorting=nty,
}
+% Sorting based on the default definition, but adding
+% holder and origyear to work with patent entry types.
+\DeclareSortingTemplate{nty}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \field{sortname}
+ \field{holder}
+ \field{author}
+ \field{editor}
+ \field{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{origyear}
+ \field{year}
+ }
+ \sort{
+ \field{volume}
+ \literal{0}
+ }
+}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx
index 8226b9bc92f..a6df2b4dbbc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-authortitle.cbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex citation style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex citation style]
\ExecuteBibliographyOptions{%
maxcitenames=1,
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx
index f6d17afa406..60f65fdb6df 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-authortitle.dbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex data model extension]
+ [2022/03/20 v0.4.1 ISO 690 biblatex data model extension]
\RequireBiber[3]
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx
index 6a8da0a12d4..ae08a57a398 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-authoryear.bbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
\RequireBibliographyStyle{iso}
\ExecuteBibliographyOptions{%
@@ -54,33 +54,33 @@
\renewbibmacro*{date}{}%
% Overwrite names:primary to print year right after:
+% 0) holder (only for patents)
% 1) author
% 2) editor
% 3) label/title
% Need to handle not to print editor twice (primary
% and subsidiary names): editor macro includes \clearname{editor}
\renewbibmacro*{names:primary}{%
- % First check if we have author(s) available
- \ifboolexpr{
- test \ifuseauthor
- and
- not test {\ifnameundef{author}}
- }
- {\usebibmacro{author}%
- \setunit{\addspace}%
- \printfield{nameaddon}%
- \setunit{\printdelim{nameyeardelim}}}%
- {% If no author(s) is available, check for editor(s)
- \ifboolexpr{
- test \ifuseeditor
- and
- not test {\ifnameundef{editor}}
- }
+ % If we have a patent with holder field, we will use that.
+ \ifboolexpr{test \ifuseholder and test {\ifentrytype{patent}}
+ and not test {\ifnameundef{holder}}}
+ {\usebibmacro{byholder}%
+ \setunit{\addspace}%
+ \printfield{nameaddon}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {% Otherwise, first check if we have author(s) available
+ \ifboolexpr{test \ifuseauthor and not test {\ifnameundef{author}}}
+ {\usebibmacro{author}%
+ \setunit{\addspace}%
+ \printfield{nameaddon}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {% If no author(s) is available, check for editor(s)
+ \ifboolexpr{test \ifuseeditor and not test {\ifnameundef{editor}}}
{\usebibmacro{editor}%
- \setunit{\printdelim{nameyeardelim}}}%
+ \setunit{\printdelim{nameyeardelim}}}%
{% If no editor(s) is available, use label/title
- \usebibmacro{labeltitle}%
- \setunit{\printdelim{nonameyeardelim}}}}%
+ \usebibmacro{labeltitle}%
+ \setunit{\printdelim{nonameyeardelim}}}}}%
% And finally print date
\usebibmacro{date+extradate}%
}
@@ -96,6 +96,17 @@
{\printfield[title]{shorttitle}}}
{\printfield{label}}}
+\renewbibmacro*{urldate-space}{%
+ % if there is no publisher specified in the bib file, set unit to dot,
+ % so there is a separation between previous block
+ % this version doesn't check date, as it isn't printed in the publisher block
+ \ifboolexpr{%
+ test {\iflistundef{publisher}}%
+ and test {\iflistundef{location}}%
+ and test {\iffieldundef{version}}%
+ }{\setunit{\adddot\addspace}}%
+ {\setunit{\addspace}}%
+}
\newbool{bbx@inset}
\DeclareBibliographyDriver{set}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx
index abdd15db203..780cb53eea9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-authoryear.cbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex citation style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex citation style]
% Use only one name in citation to be consistent
\ExecuteBibliographyOptions{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx
index 8b08856bba5..9b0e106bf46 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-authoryear.dbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex data model extension]
+ [2022/03/20 v0.4.1 ISO 690 biblatex data model extension]
\RequireBiber[3]
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-fullcite.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-fullcite.cbx
index 4e3af0c95a8..82960e2cee1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-fullcite.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-fullcite.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-fullcite.cbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex fullcite modifications]
+ [2022/03/20 v0.4.1 ISO 690 biblatex fullcite modifications]
% Fix for fullcite
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx
index c4bb9b742b7..db50802ba5a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-numeric.bbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
\RequireBibliographyStyle{iso}
\ExecuteBibliographyOptions{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx
index a7dbe8e9701..73806fc3f71 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-numeric.cbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex citation style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex citation style]
\RequireCitationStyle{numeric}
\RequireCitationStyle{iso-fullcite}
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx
index 6cf14fe74e1..c6a41c48b54 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx
@@ -1,5 +1,5 @@
\ProvidesFile{iso-numeric.dbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex data model extension]
+ [2022/03/20 v0.4.1 ISO 690 biblatex data model extension]
\RequireBiber[3]
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
index ce2668f718b..a43c6a81e9b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
@@ -1,13 +1,15 @@
\ProvidesFile{iso.bbx}
- [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+ [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
% Currently available language mappings:
-% Czech, English, Slovak, German, Polish, Bulgarian,
-% French
+% Czech, English, German, Polish, Slovak, and more.
+% You can list them directly with `$ ls *lbx`.
+% Or you can check the translation matrix at the wiki page:
+% https://github.com/michal-h21/biblatex-iso690/wiki/Translation-Guideline#translation-matrix
\DeclareLanguageMappingSuffix{-iso}
% Currently needed the following additional language strings:
\NewBibliographyString{at,bysupervisor,urlalso,
- director,bydirector,inventor,byinventor,online,film}
+ director,bydirector,inventor,byinventor,online,film,application,publication}
% PACKAGE OPTIONS
@@ -22,6 +24,8 @@
\newtoggle{bbx:doi}
\newtoggle{bbx:eprint}
\newtoggle{bbx:articlepubinfo}
+\newtoggle{bbx:currentlang}
+\newtoggle{bbx:noenddot}
% Print info about package options into .log file
\protected\def\isoblx@info@noline#1{%
@@ -48,7 +52,7 @@
\DeclareBibliographyOption{thesisinfoinnotes}[true]{%
\settoggle{bbx:thesisinfoinnotes}{#1}%
- \isoblx@info@noline{Printing thesis info at the end enabled: #1}}
+ \isoblx@info@noline{Thesis info in the notes section enabled: #1}}
\DeclareBibliographyOption{url}[true]{%
\settoggle{bbx:url}{#1}%
@@ -70,6 +74,15 @@
\settoggle{bbx:articlepubinfo}{#1}%
\isoblx@info@noline{Article publication info enabled: #1}}
+\DeclareBibliographyOption{currentlang}[true]{
+ \settoggle{bbx:currentlang}{#1}%
+ \isoblx@info@noline{Use current language for the bibliography: #1}}
+
+\DeclareBibliographyOption{noenddot}[true]{
+ \settoggle{bbx:noenddot}{#1}%
+ \isoblx@info@noline{Use no end dot for the bibliography entries: #1}}
+
+
% Set default package options
\ExecuteBibliographyOptions{%
spacecolon=false,
@@ -87,8 +100,11 @@
autolang=other,% Use the 'langid' language for the entry
date=year,% Use only years
urldate=iso,% Use ISO8601 Extended Format (yyyy-mm-dd) for URL 'seen' dates
- seconds=true,% ISO8601 format requires 'seconds=true'
+ origdate=iso,% Use ISO8601 Extended Format (yyyy-mm-dd) for patent appl. dates
+ seconds=true,% iso (ISO8601) format requires 'seconds=true'
datecirca=true,% Use circa for approximate dates
+ currentlang=false,% Use main document language for printing of bibliography strings
+ noenddot=false,% Use an end dot for the bibliography entries
}
% Default definitions of beginning and closing macro
@@ -113,6 +129,13 @@
% The separator between 'dates' and the numeration section
\newcommand{\numerationpunct}{\addcomma\space}
+% No seperator or a dot at the very end of an entry
+\renewcommand{\finentrypunct}{%
+ \iftoggle{bbx:noenddot}
+ {}
+ {\addperiod}%
+}
+
% A colon preceded with or without space
\newcommand{\addspacecolon}{%
\iftoggle{bbx:spcolon}
@@ -227,6 +250,11 @@
{\mainlangbibstring{#1}}
{#1}%
}
+\DeclareFieldFormat[patent]{type}{%
+ \ifbibstring{#1}
+ {\mainlangbiblstring{#1}}
+ {#1}%
+}
% Format supervisor of thesis (precedes the name with a localisation string)
\DeclareFieldFormat{supervisor}{%
@@ -300,19 +328,64 @@
{#1}}% This is the go-to format
}
+% Define names to consider for 'labelname', based on
+% the default definition, but adding holder as the
+% very first choice for patents.
+\DeclareLabelname[patent]{%
+ \field{holder}
+ \field{shortauthor}
+ \field{author}
+ \field{shorteditor}
+ \field{editor}
+ \field{translator}
+}
+
% Define dates to consider for 'labeldate', based on
% the default definition, but without 'urldate' field,
% preventing printing url seen date in place of the year
% of a publication.
\DeclareLabeldate{%
+ \field{origdate}% <----- used by patents
\field{date}
\field{year}
\field{dateaddon}% <---- biblatex-iso690 data model extension
\field{eventdate}
- \field{origdate}
\literal{nodate}
}
+% Sorting based on the default definition, but adding
+% holder and origyear to work with patent entry types.
+\DeclareSortingTemplate{nyt}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \field{sortname}
+ \field{holder}
+ \field{author}
+ \field{editor}
+ \field{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{origyear}
+ \field{year}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{volume}
+ \literal{0}
+ }
+}
+
% Format chapter of book with preceding localisation string
\DeclareFieldFormat{chapter}{\bibstring{chapter}\addnbspace#1\isdot}
@@ -354,6 +427,26 @@
% given (first) name followed by last (family) name,
% so it may sound more naturally in this order
\DeclareNameAlias{supervisor}{given-family}
+% For patents, the author field is supposed to be the inventor
+% of the patent, which we want to have in reverse name order,
+% since it may sound more naturally in this order
+\DeclareNameAlias[patent]{author}{given-family}
+% However, if there is no holder field for a patent,
+% author field should be in the default order since it acts
+% as a primary creator of the patent at the beginning
+% of the bib reference (consistency rule)
+\DeclareStyleSourcemap{
+ \maps[datatype=bibtex]{
+ \map{
+ \pertype{patent}
+ \step[fieldsource=author]
+ \step[fieldset=holder, origfieldval]
+ }
+ }
+}
+
+
+
% BIBLIOGRAPHY MACROS
@@ -362,15 +455,16 @@
% Based on author/editor macro
% Adds nameaddon field to author names
\newbibmacro*{names:primary}{%
- \ifboolexpr{
- test \ifuseauthor
- and
- not test {\ifnameundef{author}}
- }
- {\usebibmacro{author}%
- \setunit{\addspace}%
- \printfield{nameaddon}}%
- {\usebibmacro{editor}}%
+ \ifboolexpr{test \ifuseholder and test {\ifentrytype{patent}}
+ and not test {\ifnameundef{holder}}}
+ {\usebibmacro{byholder}%
+ \setunit{\addspace}%
+ \printfield{nameaddon}}%
+ {\ifboolexpr{test \ifuseauthor and not test {\ifnameundef{author}}}
+ {\usebibmacro{author}%
+ \setunit{\addspace}%
+ \printfield{nameaddon}}%
+ {\usebibmacro{editor}}}%
}
% Macro for secondary authors with their role
@@ -398,6 +492,16 @@
\printnames{supervisor}}%
}
+% Macro for printing the inventor of a patent
+\newbibmacro*{patentinventor}{%
+ \ifnameundef{author}
+ {}
+ {\mainlangbibstring{inventor}%
+ \setunit{\addcolon\space}%
+ \usebibmacro{author}}%
+}
+
+
% TITLES MACROS
% Macro for formatting <prefix>titles
@@ -432,7 +536,8 @@
\newbibmacro{multi:titles}{%
\iffieldundef{maintitle}
{\iffieldundef{booktitle}
- {\usebibmacro{titles}{}{emph}}
+ {\usebibmacro{titles}{}{emph}%
+ \usebibmacro{volume}}
{\usebibmacro{titles}{book}{emph}%
\usebibmacro{volume}%
\usebibmacro{titles}{}{}}}%
@@ -462,6 +567,7 @@
{\usebibmacro{titles}{issue}{}}%
}
+
% MEDIUM TYPE MACROS
\newbibmacro*{medium-type}{%
@@ -476,7 +582,7 @@
or test {\ifentrytype{online}})
}
% Use a localisation string 'online' in the main document language
- {\mainlangbibstring[\mkbibbrackets]{online}}%
+ {\midsentence\mainlangbibstring[\mkbibbrackets]{online}}%
{}}% Don't print anything
{% The only situation when we don't want to print
% 'howpublished' field is when
@@ -495,6 +601,9 @@
{\printfield{howpublished}}}%
}
+
+
+
% PUBLICATION INFO MACROS
% By default only year is used, but for some entries,
@@ -523,18 +632,23 @@
}
% Based on publisher+location+date macro (defined in standard.bbx)
-% Differs only in punctuation
+% Differs only in punctuation, and printing the organization field
%
% Wrapper for printing normal or full date. 1st argument:
-% * empty: \usebibmacro{date}
-% * 'full': \usebibmacro{fulldate}
+% a) <empty>: \usebibmacro{date}
+% b) 'full' : \usebibmacro{fulldate}
\newbibmacro*{location+publisher+dateform}[1]{%
\printlist{location}%
- \iflistundef{publisher}
+ \ifboolexpr{
+ test {\iflistundef{publisher}}
+ and
+ test {\iflistundef{organization}}}
{\setunit*{\addcomma\space}}
{\setunit*{\subtitlepunct}}% <---- different punctuation
\printlist{publisher}%
\setunit*{\addcomma\space}%
+ \printlist{organization}%
+ \setunit*{\addcomma\space}%
\usebibmacro{#1date}%
\newunit}
@@ -544,6 +658,25 @@
\newbibmacro*{location+publisher+fulldate}{%
\usebibmacro{location+publisher+dateform}{full}}
+
+
+% ADDITIONAL DATE MACROS FOR PATENTS
+
+% Application date
+\newbibmacro{applicationdate}{%
+ \iffieldundef{origyear}
+ {}
+ {\mainlangbibstring{application}\addcolon\space\printorigdate}
+}
+
+% Publication date
+\newbibmacro{publicationdate}{%
+ \iffieldundef{year}
+ {}
+ {\mainlangbibstring{publication}\addcolon\space\usebibmacro{fulldate}}
+}
+
+
% NUMERATION MACROS
\newbibmacro*{serial:numeration}{%
@@ -560,6 +693,7 @@
\printfield{chapter}%
}
+
% SERIES TITLE AND NUMBER MACROS
% Based on series+number macro (defined in standard.bbx)
@@ -570,6 +704,7 @@
\printfield{number}%
}%
+
% STANDARD IDENTIFIERS MACROS
% Bunch of standard identifiers
@@ -590,6 +725,7 @@
{}%
}
+
% AVAILABILITY AND ACCESS MACROS
% Precedes DOI field with urlfrom localisation string
@@ -634,6 +770,18 @@
{}%
}
+\newbibmacro*{urldate-space}{%
+ % if there is no publisher specified in the bib file, set unit to dot,
+ % so there is a separation between previous block
+ \ifboolexpr{%
+ test {\iflistundef{publisher}}%
+ and test {\iflistundef{location}}%
+ and test {\iffieldundef{date}}%
+ and test {\iffieldundef{version}}%
+ }{\setunit{\adddot\addspace}}%
+ {\setunit{\addspace}}%
+}
+
% The url seen date of @online entries is always printed
\renewbibmacro*{urldate}{%
\ifboolexpr{
@@ -644,6 +792,7 @@
{}%
}
+
% LOCATION MACROS
% Additional location information (e.g. library, repository)
@@ -654,6 +803,7 @@
\printfield{library}}%
}
+
% OTHER MACROS
% Redeclare in: bibmacro to use the main document language.
@@ -673,6 +823,7 @@
\printunit{\intitlepunct}%
}
+
% BIBLATEX CORE ADJUSTMENTS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -692,19 +843,32 @@
\newrobustcmd*{\blx@imc@mainlangbibsstring}[2][\@firstofone]{%
\blx@mainlangbibstring{#1}{abx@sstr}{#2}}
+% We use Babel or Polyglossia main document language for some
+% bibliography strings. With currentlang option, the currently
+% selected language is used instead. It is useful in some classes
+% that don't support selection of the main language.
+% https://github.com/michal-h21/biblatex-iso690/issues/90
+\newcommand\blx@selectlangmacro{%
+ \ifboolexpr{%
+ test {\iftoggle{bbx:currentlang}}%
+ and test {\ifdef{\textouterlang}}%
+ }%
+ {\let\iso@mainlang\textouterlang}{\let\iso@mainlang\textmainlang}%
+}
+
\protected\def\blx@mainlangbibstring#1#2#3{%
- {\mainlang% <---- use main document language
- \blx@begunit
- \blx@hyphenreset
- \blx@bibstringsimple
+ \blx@begunit%
+ \blx@hyphenreset%
+ \blx@bibstringsimple%
+ \blx@selectlangmacro%
\lowercase{\edef\blx@tempa{#3}}%
- \ifcsundef{#2@\blx@tempa}
- {\blx@warn@nostring\blx@tempa
- \blx@endnounit}
- {\blx@imc@ifcapital
- {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}
- {#1{\csuse{#2@\blx@tempa}}}%
- \blx@endunit}}}
+ \ifcsundef{#2@\blx@tempa}%
+ {\blx@warn@nostring\blx@tempa%
+ \blx@endnounit}%
+ {\blx@imc@ifcapital%
+ {\iso@mainlang{#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}}%
+ {\iso@mainlang{#1{\csuse{#2@\blx@tempa}}}}%
+ \blx@endunit}}
\blx@regimcs{%
\mainlangbibstring \mainlangbiblstring \mainlangbibsstring
@@ -988,7 +1152,7 @@
{\blx@nounit}
{\printtext[{#1date}]{%
\datecircaprint
- % Such a season component can only come from an ISO8601 season which replaces
+ % Such a season component can only come from an ISO8601 season which replaces
% a normal month so if it exists, we know that a normal date print is ruled out
\iffieldundef{#1season}
{\blx@ymddate{#1}{}%
@@ -1061,13 +1225,15 @@
\usebibmacro{names:subsidiary}%
\newunit\newblock
\usebibmacro{location+publisher+date}%
- \newunit
+ \newunit%
\printfield{version}%
- \setunit{\addspace}%
+ \usebibmacro{urldate-space}%
\usebibmacro{urldate}%
\newunit\newblock
\usebibmacro{series+number}%
\newunit\newblock
+ \printfield{volumes}
+ \newunit\newblock
\usebibmacro{identifier}%
\newunit\newblock
\usebibmacro{availability+access}%
@@ -1250,7 +1416,7 @@
\usebibmacro{location+publisher+fulldate}%
\newunit
\printfield{version}%
- \setunit{\addspace}%
+ \usebibmacro{urldate-space}%
\usebibmacro{urldate}%
\newunit\newblock
\usebibmacro{series+number}%
@@ -1281,7 +1447,7 @@
\usebibmacro{location+publisher+date}%
\newunit
\printfield{version}%
- \setunit{\addspace}%
+ \usebibmacro{urldate-space}%
\usebibmacro{urldate}%
\newunit\newblock
\usebibmacro{identifier}%
@@ -1326,7 +1492,7 @@
\usebibmacro{location+publisher+fulldate}%
\newunit
\printfield{version}%
- \setunit{\addspace}%
+ \usebibmacro{urldate-space}%
\usebibmacro{urldate}%
\newunit\newblock
\iffieldundef{type}
@@ -1360,28 +1526,33 @@
\newunit\newblock
\usebibmacro{names:subsidiary}%
\newunit\newblock
+ \usebibmacro{patentinventor}%
+ \newunit
+ \usebibmacro{publicationdate}%
+ \newunit
+ \usebibmacro{applicationdate}%
+ \newunit
+ \printfield{note}%
+ \newunit\newblock
\printlist{location}%
\newunit\newblock
\iffieldundef{type}
{}
{\printfield{type}%
- \setunit*{\addcomma\space}}%
+ \setunit*{\addspace}}%
\printfield{number}%
\newunit\newblock
- \usebibmacro{fulldate}%
- \setunit{\addspace}%
\usebibmacro{urldate}%
\newunit\newblock
\usebibmacro{availability+access}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}%
% BIBLIOGRAPHY ALIASES
+\DeclareBibliographyAlias{mvbook}{book}
\DeclareBibliographyAlias{bookinbook}{inbook}
\DeclareBibliographyAlias{suppbook}{inbook}
\DeclareBibliographyAlias{booklet}{book}
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/ngerman-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/ngerman-iso.lbx
new file mode 100644
index 00000000000..fe95d8de6b3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/ngerman-iso.lbx
@@ -0,0 +1,14 @@
+\ProvidesFile{ngerman-iso.lbx}
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
+
+\InheritBibliographyExtras{ngerman}
+\InheritBibliographyStrings{ngerman}
+
+% 'ngerman.lbx' inherits from 'german.lbx',
+% so biblatex recursively loads also 'german-iso.lbx'.
+% In case some strings should differ between german
+% and ngerman, let's override them below.
+\DeclareBibliographyStrings{%
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx
index b3b7f148daf..6ede0c40bef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx
@@ -1,5 +1,5 @@
\ProvidesFile{polish-iso.lbx}
- [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
\InheritBibliographyExtras{polish}
\InheritBibliographyStrings{polish}
@@ -25,6 +25,10 @@
% {}},% FIXME: missing
% film = {{}%
% {}},% FIXME: missing
+% application = {{}%
+% {}},% FIXME: missing
+% publication = {{}%
+% {}},% FIXME: missing
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx
index 8bd4e4b096c..0fe12d68e26 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx
@@ -1,5 +1,5 @@
\ProvidesFile{slovak-iso.lbx}
- [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
\InheritBibliographyExtras{slovak}
\InheritBibliographyStrings{slovak}
@@ -23,6 +23,10 @@
{online}},
film = {{film}%
{film}},
+ application = {{prihl\'{a}\v{s}ka}%
+ {prihl\adddot}},
+ publication = {{publikovan\'{e}}%
+ {publ\adddot}},
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/spanish-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/spanish-iso.lbx
new file mode 100644
index 00000000000..dc837288365
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/spanish-iso.lbx
@@ -0,0 +1,35 @@
+\ProvidesFile{spanish-iso.lbx}
+ [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
+
+\InheritBibliographyExtras{spanish}
+\InheritBibliographyStrings{spanish}
+
+\DeclareBibliographyStrings{%
+ at = {{en}%
+ {en}},
+ bysupervisor = {{supervisado por}%
+ {supervisado por}},
+ urlalso = {{disponible también desde}%
+ {disponible también desde}},
+ director = {{director}%
+ {director}},
+ bydirector = {{dirigido por}%
+ {dirigido por}},
+ inventor = {{inventor}%
+ {inventor}},
+ byinventor = {{inventado por}%
+ {inventado por}},
+ online = {{online}%
+ {online}},
+ film = {{film}%
+ {film}},
+ andothers = {{et\addabbrvspace al\adddot}%
+ {et\addabbrvspace al\adddot}},
+ % if not, y col. will be used instead of et al.
+% application = {{}%
+% {}},% FIXME: missing
+% publication = {{}%
+% {}},% FIXME: missing
+}
+
+\endinput