diff options
25 files changed, 2169 insertions, 783 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/README.md b/Master/texmf-dist/doc/latex/biblatex-iso690/README.md index b9d59710e07..cdf10a48922 100644 --- a/Master/texmf-dist/doc/latex/biblatex-iso690/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-iso690/README.md @@ -1,21 +1,31 @@ # Biblatex style for ISO 690 standard -Biblatex is a bibliography and citation tool for LaTeX. This project provides -support for citations in ISO 690 style. As the standard is a little bit ambiguous -in some details regarding formatting of records, we largely follow +`biblatex` is a bibliography and citation tool for LaTeX. This project provides +support for citations in ISO 690 style. As the standard is a little bit +ambiguous in some details regarding formatting of records, we largely follow requirements of Czech interpretation, as it is required form in many Czech universities. The style can be used in other languages as well, of course. -## Install +## Installation -Open the terminal and find location of your `TEXMFHOME` directory with this command: +The package is included in MikTeX and TeX Live distributions since 2016, so it +could be shipped with your TeX installation. + +It is also available on CTAN as `biblatex-iso690`: + +https://www.ctan.org/pkg/biblatex-iso690 + +### Install from GitHub + +Open the terminal and find location of your `TEXMFHOME` directory with this +command: kpsewhich -var-value TEXMFHOME -Open this directory and check that the directory `$TEXMFHOME/tex/latex` exists. -If it doesn't exist, you must create it. You can do this from the -command line or using a file manager. Open the `$TEXMFHOME/tex/latex` directory and either -run the command +Open this directory and check that the directory `$TEXMFHOME/tex/latex` +exists. If it doesn't exist, you must create it. You can do this from the +command line or using a file manager. Open the `$TEXMFHOME/tex/latex` +directory and either run the command git clone git@github.com:michal-h21/biblatex-iso690.git @@ -23,23 +33,22 @@ or unzip the file https://github.com/michal-h21/biblatex-iso690/archive/master.zip -here. You should be able to use **biblatex-iso690** now. +here. You should be able to use `biblatex-iso690` now. -## Usage: -``` -\usepackage[english,czech]{babel} % main language of the document must be last +## Usage + +```latex +\usepackage[english,czech]{babel} % the main document language is the last one \usepackage[ - backend=biber % if we want unicode - ,style=iso-authoryear % or iso-numeric for numeric citation method - ,autolang=other % to support multiple languages in bibliography - ,sortlocale=cs_CZ % locale of main language, for sorting - ,bibencoding=UTF8 % this is necessary only if bibliography file is in different encoding than main document + 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 ]{biblatex} ``` ### Custom options -Above and beyond the scope of package options provided by `biblatex` itself, here are also some more. Default values are in **bold**. +Above and beyond the scope of package options provided by `biblatex` itself, +here are also some more. Default values are in **bold**. * `spacecolon` add space before colon in publisher and title (and also title and subtitle): @@ -55,45 +64,115 @@ Above and beyond the scope of package options provided by `biblatex` itself, her * **[false]** ... 2011, vol. 32, no. 3, pp. 289–301 [visited on 2016-05-14] ... * `thesisinfoinnotes` print out thesis information in notes section - * **[true]** Available from: <...>. BP. MU, FI, Brno. Supervisor Petr SOJKA - * [false] BP. MU, FI, Brno. Supervisor Petr SOJKA. Available from: <...> + * **[true]** Available from: <...>. BP. MU, FI, Brno. Supervised by Petr SOJKA + * [false] BP. MU, FI, Brno. Supervised by Petr SOJKA. Available from: <...> +* `doi` + enable or disable printing of the DOI number + * **[true]** Available from DOI: [10.5300/2016-1-4/106](https://doi.org/10.5300/2016-1-4/106) + * [false] -- +* `isbn` + enable or disable printing of the ISBN, ISSN and other standard identifiers + * **[true]** ISBN 0-201-36299-6 + * [false] -- +* `eprint` + enable or disable printing of the eprint field + * **[true]** Available from arXiv: 1905.10545 + * [false] -- +* `url` + enable or disable printing of the URL (this option also affects the printing + of `[online]` medium designation for electronic resources other than + `@online` entry type) + * **[true]** Available from: <https://github.com/michal-h21/biblatex-iso690> + * [false] -- +* `articlepubinfo` + enable or disable printing publication information (`location` and + `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. ### Bibliographic fields -Some fields have a different meaning than in plain BibTeX. -1\. If the publication is written in a different language to the main document, it should have a filled `langid` field. +Some fields have a different meaning than in plain BibTeX, as compared to +`biblatex`. + +1\. If the publication is written in a different language to the main +document, it should have a filled `langid` field. + ``` -langid = {czech} +langid = {czech}, ``` -2\. Publications with online versions should have a `urldate` field. It is the date when you last checked the publication online. +2\. Publications with online versions should have a `urldate` field. It is the +date when you last checked the publication online. + ``` -urldate = {2011-01-12} +urldate = {2011-01-12}, ``` -3\. If the publication has more than one ISBN or ISSN number, use just one of them. +3\. If the publication has more than one ISBN or ISSN number, preferably use +just one of them. Otherwise you can separate multiple numbers with comma in +the respective field. 4\. Publisher and place: + ``` location = {Praha}, -publisher = {Academia} +publisher = {Academia}, +``` + +Some fields are added on top of the fields supported by `biblatex` and are +valid only for this package. + +5\. Supervisor of thesis / dissertation: + +``` +supervisor = {Petr Sojka}, ``` -For more details see the file [mybib.bib](https://github.com/michal-h21/biblatex-iso690/blob/master/mybib.bib). +6\. Date specificities, anything that doesn't fit into the `date` field: + +``` +dateaddon = {\mkbibbrackets{16th century}}, +``` + +For more details see the example bibliography file [mybib.bib](./mybib.bib). + +## Contributing + +### Translations + +This package comes with the extension of the localization files (`.lbx`) to +their standard versions shipped with `biblatex`. The naming convention for +these files is `<langid>-iso.lbx`, where `langid` is the name of the language +known by Babel. + +If the `<langid>.lbx` is already included in `biblatex`, adding a +`<langid>-iso.lbx` is as easy as adding this single file to the root directory +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 +`\NewBibliographyString` command at the beginning of the [iso.bbx](iso.bbx) +file. + +A quick translation guideline for the additional strings is available at the +wiki page [Translation +Guideline](https://github.com/michal-h21/biblatex-iso690/wiki/Translation-Guideline). + +You might want to see also some already existing translations, e.g. +[english-iso.lbx](english-iso.lbx) or [slovak-iso.lbx](slovak-iso.lbx). ## License -Copyright (C) 2011--2017 Michal Hoftich - 2015--2017 Moritz Wemheuer - 2016--2017 Dávid Lupták +Copyright (C) 2011--2020 Michal Hoftich + 2015--2020 Moritz Wemheuer + 2016--2020 Dávid Lupták This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in - - http://www.latex-project.org/lppl.txt - +http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. @@ -102,3 +181,8 @@ This work has the LPPL maintenance status `maintained`. The Current Maintainer of this work is Michal Hoftich. This work consists of all files listed in [manifest.txt](./manifest.txt). + +The package is available on CTAN https://www.ctan.org/pkg/biblatex-iso690 +and is included in MikTeX and TeX Live 2016 or later as `biblatex-iso690`. +The development version can be found on GitHub +https://github.com/michal-h21/biblatex-iso690. diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf Binary files differindex 99bf7c4a520..9a9386f5c73 100644 --- a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf 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 1ff35be97a1..92fa8bd246e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex +++ b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex @@ -1,11 +1,20 @@ \documentclass[a4paper,10pt]{ltxdockit} -\usepackage[czech,english]{babel} \usepackage[utf8]{inputenc} -%\usepackage{tgpagella} \usepackage[T1]{fontenc} +\usepackage[czech,vietnamese,english]{babel} +\usepackage{csquotes} +\usepackage[useregional]{datetime2} +%\usepackage{tgpagella} \usepackage{microtype} \usepackage{hanging} +\usepackage{doc}% Macro \BibTeX +% Set up the style (blue colors) +\addtokomafont{section}{\spotcolor} +\addtokomafont{subsection}{\spotcolor} +\addtokomafont{subsubsection}{\spotcolor} +\addtokomafont{paragraph}{\spotcolor} +\addtokomafont{descriptionlabel}{\spotcolor} \def\t|#1|{\texttt{#1}} \def\c#1{% @@ -14,34 +23,67 @@ \newcommand*{\biber}{\sty{biber}\xspace} \newcommand*{\biblatex}{\sty{biblatex}\xspace} +\newcommand*{\biblatexiso}{\sty{biblatex-iso690}\xspace} \usepackage[ - backend=biber - ,style=iso-authoryear - ,autolang=other - ,pagetotal=true - ,sortlocale=cs_CZ - ,bibencoding=UTF8 - ,spacecolon=false - % ,isbn=false - %,block=ragged + style=iso-authoryear, + sortlocale=cs_CZ,% We need this for proper sorting, + % because most of the bib examples are Czech ones, + % but the main document language is English + pagetotal=true, ]{biblatex} \addbibresource{mybib.bib} +% Support diacritics in Czech examples +% ref.: https://stackoverflow.com/a/16084246 +\lstset{ + literate= + {á}{{\'a}}1 + {č}{{\v{c}}}1 + {ď}{{\v{d}}}1 + {é}{{\'e}}1 + {ě}{{\v{e}}}1 + {í}{{\'i}}1 + {ň}{{\v{n}}}1 + {ó}{{\'o}}1 + {ř}{{\v{r}}}1 + {š}{{\v{s}}}1 + {ť}{{\v{t}}}1 + {ú}{{\'u}}1 + {ů}{{\r{u}}}1 + {ý}{{\'y}}1 + {ž}{{\v{z}}}1 + {Á}{{\'A}}1 + {Č}{{\v{C}}}1 + {Ď}{{\v{D}}}1 + {É}{{\'E}}1 + {Ě}{{\v{E}}}1 + {Í}{{\'I}}1 + {Ň}{{\v{N}}}1 + {Ó}{{\'O}}1 + {Ř}{{\v{R}}}1 + {Š}{{\v{S}}}1 + {Ť}{{\v{T}}}1 + {Ú}{{\'U}}1 + {Ů}{{\r{U}}}1 + {Ý}{{\'Y}}1 + {Ž}{{\v{Z}}}1 +} + \titlepage{% title={ISO~690 \biblatex style}, subtitle={}, url={https://github.com/michal-h21/biblatex-iso690}, author={Michal Hoftich}, email={michal.h21@gmail.com}, - revision={0.3.3}, - date={\today}} + revision={0.4.0}, + date={\DTMDate{2020-03-25}}} \hypersetup{% pdftitle={ISO~690 \biblatex style}, pdfsubject={Bibliography References and Citations by ISO~690}, - pdfauthor={Michal Hoftich with Johannes Böttcher, Moewew and Dávid Lupták}, + pdfauthor={Michal Hoftich with Johannes Böttcher, Moritz Wemheuer and Dávid Lupták}, pdfkeywords={tex, latex, bibtex, biblatex, bibliography, references, citation}} \begin{document} @@ -52,228 +94,351 @@ \section{Introduction} \subsection{About} +\label{sec:about} -\biblatex is a bibliography and citation tool for \LaTeX. This project provides -support for citations and references according to the ISO~690 international standard. -As the norm ISO~690 is a little bit ambiguous in some details regarding formatting of records, -we largely follow requirements of the Czech interpretation, as it is the required form -in many Czech universities. Of course, the style can be used in other languages as well. +\biblatex is a bibliography and citation tool for \LaTeX. This project +provides support for citations and references according to the ISO~690 +international standard. As the standard ISO~690 is a little bit ambiguous in +some details regarding the formatting of records, we largely follow the +requirements of the Czech interpretation, as it is the required form in many +Czech universities. Of course, the style can be used in other languages as +well. \subsection{Requirements} -Basically, \biblatex $\geq$ 3.4 with \biber $\geq$ 2.5 is all you need to use this package. -No special packages different from those required by the \biblatex package are used. For a complete -list of such packages, please refer to the \biblatex documentation. +Basically, \biblatex $\geq$ 3.14 with \biber $\geq$ 2.14 (both versions dated +2019-12-01) is all you need to use this package. No special packages different +from those required by the \biblatex package are used. For a complete list of +such packages, please refer to the \biblatex documentation. + +\subsection{Accessibility} +\label{sec:accessibility} + +This package is available on \textsc{ctan}% +\footnote{\url{https://www.ctan.org/pkg/biblatex-iso690}} and is included in +MiK\TeX{} and \TeX{}~Live 2016 or later as \biblatexiso. The development +version can be found on GitHub.% +\footnote{\url{https://github.com/michal-h21/biblatex-iso690}} \subsection{License} -This project is released under the LaTeX Project Public License\footnote{\url{http://www.latex-project.org/lppl.txt}}. +This project is released under the LaTeX Project Public License% +\footnote{\url{https://www.latex-project.org/lppl.txt}}. \subsection{Acknowledgments} Thanks to all contributors who have participated in the development of this style, -especially Johannes Böttcher, Moewew, Dávid Lupták and others. +especially Johannes Böttcher, Moritz Wemheuer, Dávid Lupták and others. \subsection{Feedback} +\label{sec:feedback} -The project lives on the GitHub page \url{https://github.com/michal-h21/biblatex-iso690} -so feel free to use the possibilites provided there for reporting issues and the like. +The project lives on the GitHub page \url{https://github.com/michal-h21/biblatex-iso690}, +so feel free to use the possibilities provided there for reporting issues and the like. -\section{Use} +\section{Usage} \subsection{General} +\label{sec:general:multilang} -\begin{verbatim} -.. -\usepackage[english,czech]{babel} % [other,main] -% or in case of using xelatex, use the 'polyglossia' package instead +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} + +\begin{document} +\cite{knuth1990virtual} +\printbibliography +\end{document} +\end{ltxexample} + +\noindent +A minimal working example for \t|polyglossia| package: +\begin{ltxexample} +\documentclass{article} +\usepackage[utf8]{inputenc} \usepackage{polyglossia} \setmainlanguage{czech} \setotherlanguage{english} -.. -\usepackage[ - backend=biber - ,style=iso-authoryear - ,sortlocale=cs_CZ - ,autolang=other - ,bibencoding=UTF8 -]{biblatex} -\addbibresource{filename.fileextension} -.. -\printbibliography +\usepackage{csquotes} + +\usepackage[style=iso-authoryear]{biblatex} +\addbibresource{mybib.bib} -\end{verbatim} +\begin{document} +\cite{knuth1990virtual} +\printbibliography +\end{document} +\end{ltxexample} -According to the ISO~690 norm, some of the elements of the bibliographic +According to the ISO~690 standard, some of the elements of the bibliographic resource should be printed in the main document language (language I~am -currently writing) while the others should be in the language of a resource. You can -specify the language of a resource into the field \t|langid| on a 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.\label{gen:multilang} +currently writing) while the others should be in the language of a resource. +You can specify the language of a resource into the field \t|langid| on a +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. Note that for correct support of localization functionality, the \t|babel| or \t|polyglossia| package should be used. The main document language -is the last one entered in a list of languages passed to the \t|babel| package, -respectively the directives \t|\textbackslash setmainlanguage| and -\t|\textbackslash setotherlanguage| in case the \t|polyglossia| package -is used. +is: + +\begin{description} + \item[babel] the last one entered in a list of languages passed to the + \t|babel| package options, or the one specified by \t|main| keyword + (see MWE above) + \item[polyglossia] the one specified in the directive + \cmd{setmainlanguage} (other languages could be specified using + \cmd{setotherlanguage}) (see MWE above) +\end{description} + +\subsection{Citation systems} +\label{sec:citation:systems} -\subsection{Citation methods} +The international standard ISO~690 introduces three methods +(\ref{sec:standard:methods}) of citation and referencing in its informative +annex. You can select a citation/referencing method in the \t|style| option: + +\begin{ltxexample} + \usepackage[style=<method>]{biblatex} +\end{ltxexample} -The international standard ISO 690 prescribes exactly 3 methods of -citation. However, based on the user input, this package contains -more of them. \subsubsection{Standardized methods} +\label{sec:standard:methods} + +The informative annex of the standard mentions name and date, numeric, and +running notes systems. This package does not support the last one. \begin{description} -\item[iso-authoryear] name and date system, so-called Harvard style -\item[iso-numeric] numeric system + \item[iso-authoryear] name and date system, so-called Harvard style + \item[iso-numeric] numeric system \end{description} -There is also one more system of running notes, which is not -implemented yet. - \subsubsection{Non-standardized methods} +\label{sec:nonstandard:methods} + +Based on the user input, this package also supports other citation/referencing +methods: \begin{description} -\item[iso-alphabetic] alphabetic system -\item[iso-authortitle] name and title system + \item[iso-alphabetic] alphabetic system + \item[iso-authortitle] name and title system \end{description} +\subsection{Citation commands} + +\biblatex provides a lot of citation commands out of the box. However, to +conform to the standard, it is necessary to know which command can be used +for which citation method. Here is an overview. + +\subsubsection{Numeric system} +\label{sec:numeric} + +For \t|iso-numeric| style, the usage of cite command is as simple as +\cmd{cite} (citation number in brackets), \cmd{parencite} (citation number in +parentheses), or \cmd{supercite} (citation number as a superscript). + +\noindent +Example (number 1 only serves as a random citation number): +\begin{itemize} + \item command \cmd{cite\{knuth1990virtual\}} outputs [1], + \item command \cmd{parencite\{knuth1990virtual\}} outputs (1), + \item command \cmd{supercite\{knuth1990virtual\}} outputs $^1$. +\end{itemize} + +\noindent +According to the standard, pick and stick to only one citation format in the +whole document (select either only \cmd{cite}, or \cmd{parencite}, or +\cmd{supercite}). + +\subsubsection{Author-date system} + +For \t|iso-authoryear| method (and possibly also for other methods +\t|iso-alphabetic| and \t|iso-authortitle|), you should distinguish two +situations: + +\begin{itemize} + \item The name of the creator appears naturally in the text, so only the year is + in parentheses; use \cmd{textcite}. + + \noindent + Example: command \cmd{textcite\{knuth1990virtual\}} outputs + \textcite{knuth1990virtual}. + + \item The name of the creator doesn't appear naturally in the text, so both name + and the year are in parentheses; use \cmd{parencite}. + + \noindent + Example: command \cmd{parencite\{knuth1990virtual\}} outputs + \parencite{knuth1990virtual}. +\end{itemize} + \subsection{Package options} \subsubsection{Provided by \biblatex by default} +\label{sec:pkg:opt} -Frequently used package options are +Frequently used package options are: -\begin{description} -\item[style] style to be used for bibliographic references and citations. -Four possibilities are available for the \t|biblatex-iso690| package, -\t|iso-authoryear| commonly known as “Harvard system”, \t|iso-numeric| as a -numeric system, \t|iso-alphabetic| and \t|iso-authortitle|. - -\item[backend] backend program for generating bibliographic entries. \biber -is the default one for the \biblatex package, providing a large variety -of features. Other options are \t|bibtex| and \t|bibtex8|, but they both -are far behind the possibilities of \biber. \biber is the recommended backend. - -\item[autolang] controls which language environment is used. The most -significant value is \t|other|, which supports printing localization -terms in the language of the resource or language specific hyphenation. -Default value for \biblatex package is \t|none|, which disables this feature. -Default value for \t|biblatex-iso690| package is \t|other|. - -\item[sortlocale] responsible for sorting the bibliography according to the -entered \t|locale| identifier. It should usually be set to one using the -main document language, e.g. \t|en\_IN| for English as used in India. - -\item[bibencoding] specifies the character encoding of the \t|bib| files. -\t|<encoding>| needs to be explicitly specified only if the encoding of the -\t|bib| file is different from the one of the \t|tex| file. Default value -is \t|auto|, i.e. the encoding of the \t|bib| file is identical to the -encoding of the \t|tex| file. -\end{description} +\begin{optionlist} -\subsubsection{Provided by \t|biblatex-iso690| in addition} +\optitem[]{style}{\opt{iso-authoryear}, \opt{iso-numeric}, + \opt{iso-alphabetic}, \opt{iso-authortitle}} -\begin{description} - \item[spacecolon] if \t|true|, a space is printed before the colon - used in subtitles and publication information. Printing the colon this way - is not recommended. Default value is \t|false|. - - \item[pagetotal] the number of total pages is no longer required if the - item is being cited as a whole. Setting this option to \t|true| will print - such optional information in the notes section at the end of the reference. - Default value is \t|false|.\label{pkg:opt:iso690:pp} - - \item[shortnumeration] the standard ISO~690 allows omission of term - \t|volume| and terms for smaller components of a serial publication. - If this option is \t|true|, such terms are distinguished typographically - (the volume number in bold type and the part number, if required, in - parentheses). If \t|false|, such terms are printed with preceding - literal terms. - - \item[thesisinfoinnotes] to print a thesis information - (thesis type, institution and supervisor) before the section - \textit{availability and access} is possible by setting the option - to \t|false|. Otherwise it will be printed in the \textit{notes} section. - Default value is \t|true|. - - \item[doi] enable or disable printing of the DOI number. Default value is - \t|true|. - - \item[isbn] enable or disable printing of the ISBN, ISSN and other standard - identifiers. Default value is \t|true|. - - \item[eprint] enable or disable printing of the eprint field. Default value - is \t|true|. - - \item[url] enable or disable printing of the URL. Default value is \t|true|. +Style to be used for bibliography references and citations. Four possibilities +are available for the \biblatexiso package, see~\ref{sec:citation:systems} for +details. -\end{description} +\optitem[biber]{backend}{\opt{biber}, \opt{bibtex}, \opt{bibtex8}} + +Backend program for generating bibliographic entries. \biber is the default +one for the \biblatex package, providing a large variety of features. Other +options are \t|bibtex| and \t|bibtex8|, but they both are far behind the +possibilities of \biber. \biber is the recommended backend. + +\optitem[other]{autolang}{\opt{other}, see \biblatex documentation for more + options} + +Controls which language environment is used. The default value for this +package is \t|other|, which encloses the \t|bib| entry in an \t|otherlanguage| +environment and prints localization terms in the language of the resource or +uses language-specific hyphenation. Use the \t|langid| field in \t|bib| entry +to specify its language. + +\optitem[auto]{sortlocale}{\opt{auto}, \prm{locale}} + +Responsible for sorting the bibliography according to the entered \prm{locale} +identifier. The default value is \t|auto|, meaning the \prm{locale} is set to +the main document language identifier (if \t|babel|/\t|polyglossia| is used). +A real use case example: this document is in English (main document language), +but uses Czech sorting (\t|sortlocale=cs\_CZ|). + +\end{optionlist} + +\subsubsection{Provided by \biblatexiso in addition} +\label{sec:pkg:opt:iso690} + +\begin{optionlist} + +\boolitem[false]{spacecolon} + +If \t|true|, a space is printed before the colon used in subtitles and +publication information. Printing the colon this way is not recommended. +The default value is \t|false|. + +\boolitem[false]{pagetotal} + +The number of total pages is no longer required if the item is being cited as +a whole. Setting this option to \t|true| will print such optional information +in the notes section at the end of the reference in brackets. The default +value is \t|false|. + +\boolitem[false]{shortnumeration} + +The standard ISO~690 allows omission of term \t|volume| and terms for smaller +components of a serial publication. If this option is \t|true|, such terms are +distinguished typographically (the volume number in bold type and the part +number, if required, in parentheses). If \t|false|, such terms are printed +with preceding literal terms. + +\boolitem[true]{thesisinfoinnotes} + +To print a thesis information (thesis type, institution and supervisor) before +the section \textit{availability and access} is possible by setting the option +to \t|false|. Otherwise it will be printed in the \textit{notes} section. +The default value is \t|true|. + +\boolitem[true]{doi} + +Enable or disable printing of the DOI number. + +\boolitem[true]{isbn} + +Enable or disable printing of the ISBN, ISSN, and other standard identifiers. + +\boolitem[true]{eprint} + +Enable or disable printing of the eprint field. + +\boolitem[true]{url} + +Enable or disable the printing of the URL. This option also affects the +printing of \t|[online]| medium designation for electronic resources other +than \t|@online| entry type (see \ref{sec:howpublished}). + +\boolitem[false]{articlepubinfo} + +Enable or disable printing publication information (\t|location| and +\t|publisher| fields) for an \t|@article| entry type. The default value is +\t|false| since it is very unusual behavior and rarely used by either other +citation styles or citation managers. + +\end{optionlist} \subsection{Database guide} +\label{sec:database} -\t|biblatex| supports more entry fields than legacy \t|bibtex|. Hence +\biblatex supports more entry fields than legacy \BibTeX. Hence some examples of bibliography entry types with respective fields follow. %\begin{description} \paragraph{Book} \hfill\\ -\c{t01} -\begin{verbatim} -@BOOK{t01, - author = {Borgman, Christine L.}, - year = {2003}, - title = {From Gutenberg to the global information infrastructure}, - subtitle = {access to information in the networked world}, - edition = {1}, % should not be stated - location = {Cambridge (Mass)}, - publisher = {The MIT Press}, - pagetotal = {xviii, 324}, - isbn = {0-262-52345-0}, - langid = {english} +\c{borgman2003from} +\begin{ltxexample} +@book{borgman2003from, + author = {Borgman, Christine L.}, + title = {From {Gutenberg} to the Global Information Infrastructure}, + subtitle = {Access to Information in the Networked World}, + location = {Cambridge (Mass.)}, + publisher = {The MIT Press}, + date = {2003}, + pagetotal = {xviii, 324}, + isbn = {0-262-52345-0}, + langid = {english}, } -\end{verbatim} - -The \t|edition| field is the edition of a printed publication. It is required -if the item is not a first edition. Use an integer or a literal string to fill -in this field. +\end{ltxexample} The \t|pagetotal| field is the total number of pages of the work. If multiple -kinds of numeration are used in the work, e.g. arabic as well as roman numerals, +kinds of numeration are used in the work, e.g. Arabic as well as Roman numerals, both can be provided, separated by a comma. The localization term \t|pages| is -only appended for arabic numerals, though. Note that the total number of pages -is no longer required by the norm itself, see also \ref{pkg:opt:iso690:pp}. +only appended for Arabic numerals, though. Note that the total number of pages +is no longer required by the standard itself, see also \ref{sec:pkg:opt:iso690}. The \t|langid| field is required for multilingual support of printing -references. This affects printing of localization terms used in the reference, -e.g. \t|edition| field. See also \ref{gen:multilang}. +references. This option affects the printing of localization terms used in the +reference, e.g. \t|edition| field. See also \ref{sec:general:multilang}. \paragraph{Contribution to a collection} \hfill\\ -\c{t02} -\begin{verbatim} -@INCOLLECTION{t02, - author = {Greenberg, David}, - year = {1998}, - title = {Camel drivers and gatecrashers}, - subtitle = {quality control in the digital research library}, - editor = {Hawkins, B.L and Battin, P}, - booktitle = {The mirage of continuity}, - booksubtitle = {reconfiguring academic information - resources for the 21st century}, - location = {Washington (D.C.)}, - publisher = {Council on Library and Information Resources; - Association of American Universities}, - pages = {105-116}, - langid = {english} +\c{greenberg1998camel} +\begin{ltxexample} +@incollection{greenberg1998camel, + author = {Greenberg, Douglas}, + title = {Camel Drivers and Gatecrashers}, + subtitle = {Quality Control in the Digital Research Library}, + editor = {Hawkins, Brian L. and Battin, Patricia}, + booktitle = {The Mirage of Continuity}, + booksubtitle = {Reconfiguring Academic Information + Resources for the 21st Century}, + date = {1998}, + location = {Washington (D.C.)}, + publisher = {Council on Library and Information Resources; + Association of American Universities}, + isbn = {1-887334-59-9}, + pages = {105--116}, + langid = {english}, } -\end{verbatim} +\end{ltxexample} The \t|title| field is the title of the contribution, the \t|booktitle| is the title of the collection. @@ -288,26 +453,26 @@ from a contribution entry (child entry) to a separate entry of a collection as the following example shows: \newline -\noindent\c{prispevek1} +\noindent\c{sbornik2007clanek} -\begin{verbatim} -@COLLECTION{sbornik, - title = {Mimořádně užitečný sborník}, - editor = {Geniální, Jiří}, - year = {2007}, - langid = {czech}, - location = {Praha}, - publisher = {Academia}, - isbn = {978-222-626-222-2} +\begin{ltxexample} +@collection{sbornik2007, + title = {Mimořádně užitečný sborník}, + editor = {Geniální, Jiří}, + location = {Praha}, + publisher = {Academia}, + date = {2007}, + isbn = {978-3-4947-0284-1}, + langid = {czech}, } -@INCOLLECTION{prispevek1, - crossref = {sbornik}, - title = {Velmi zajímavý článek}, - author = {Vlaštovka, Josef}, - pages = {22-45} +@incollection{sbornik2007clanek, + author = {Vlaštovka, Josef}, + title = {Velmi zajímavý článek}, + pages = {22--45}, + crossref = {sbornik2007}, } -\end{verbatim} +\end{ltxexample} Now, there is no need to fill in \t|booktitle| in the \t|sbornik| entry. The \t|biber| backend program performs the inheritance between parent and @@ -315,84 +480,127 @@ child entry automatically. Other backends may not support this feature. \paragraph{Article in a serial}\hfill\\ -\c{t03} -\begin{verbatim} -@ARTICLE{t03, - author = {LYNCH, C.}, - year = {2005}, - title = {Where do we go from here?}, - subtitle = {the next decade for digital libraries}, - journaltitle = {DLib Magazine}, - volume = {11}, - number = {7/8}, - urldate = {2005-08-15}, - url = {http://www.dlib.org/dlib/july05/lynch/07lynch.html}, - issn = {1082-9873}, - langid = {english} +\c{lynch2005where} +\begin{ltxexample} +@article{lynch2005where, + author = {Lynch, Clifford}, + title = {Where Do We Go From Here?}, + subtitle = {The Next Decade for Digital Libraries}, + journaltitle = {D-Lib Magazine}, + date = {2005}, + volume = {11}, + number = {7/8}, + issn = {1082-9873}, + doi = {10.1045/july2005-lynch}, + url = {http://www.dlib.org/dlib/july05/lynch/07lynch.html}, + urldate = {2005-08-15}, + langid = {english}, } -\end{verbatim} +\end{ltxexample} The example above is an article in an online magazine. If the magazine is available online only, i.e. it is not published in print, it should be cited as an electronic information resource. This can be -achieved by providing the \t|urldate| field. On the other hand +achieved by providing the \t|urldate| field (see \ref{sec:howpublished}). +On the other hand \newline -\c{knuth} -\begin{verbatim} -@PERIODICAL{tug, - journaltitle = {TUGBoat}, - publisher = {TUG}, - issn = {1222-3333}, - langid = {english}, - date = {1980/}, - url = {http://tugboat.tug.org/} +\c{knuth1990virtual} +\begin{ltxexample} +@periodical{tugboat1980, + journaltitle = {TUGBoat}, + publisher = {TUG}, + date = {1980/}, + issn = {0896-3207}, + url = {http://tugboat.tug.org/TUGboat}, + langid = {english}, + options = {skipbib=true}, } -@ARTICLE{knuth, - author = {Knuth, Donald}, - title = {Journeys of \TeX}, - volume = {17}, - number = {3}, - year = {2003}, - pages = {12-22}, - url = {http://tugboat.tug.org/kkk.pdf}, - crossref = {tug} +@article{knuth1990virtual, + author = {Knuth, Donald}, + title = {Virtual Fonts: More Fun for Grand Wizards}, + date = {1990-04}, + volume = {11}, + number = {1}, + pages = {13--23}, + url = {http://tugboat.tug.org/TUGboat/tb11-1/tb27knut.pdf}, + crossref = {tugboat1980}, } -\end{verbatim} +\end{ltxexample} \noindent the example shows an article in a printed magazine, which is \emph{also} available online. Similar to the contribution to a collection, -using cross-referencing feature can be beneficial. +using the cross-referencing feature can be beneficial. \subsubsection{Specific entry types} \paragraph{Thesis}\hfill\\ +\label{sec:thesis} The \t|thesis| entry type and its aliases \t|mastersthesis| and \t|phdthesis| are available by default for thesis works. Use the \t|type| field to specify the type of the thesis -- a localization term or literal string can be entered. For the list of supported localization terms, please refer to section 4.9.2.13 of the -\t|biblatex| documentation. Names of the supervisor and school -(institution) can be entered into the fields \t|supervisor| and -\t|institution|, respectively. +\biblatex documentation. Available terms are \t|bathesis|, +\t|mathesis|, \t|phdthesis|, and \t|candthesis|. Names of the +supervisor and school (institution) can be entered into the fields +\t|supervisor| and \t|institution|, respectively. +\newline + +\c{luptak2016thesis} +\begin{ltxexample} +@thesis{luptak2016thesis, + author = {Lupták, Dávid}, + title = {Typesetting of Bibliography According to ISO 690 Norm}, + date = {2016}, + type = {bathesis}, + institution = {Masaryk University, Faculty of Informatics}, + location = {Brno}, + supervisor = {Petr Sojka}, + url = {https://is.muni.cz/th/422640/fi_b/}, +} +\end{ltxexample} \paragraph{Patent}\hfill\\ +\label{sec:patent} + +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 -The field \t|classification| is available for the respective stuff. -For other details regarding \t|patent| type, please refer -to the \t|biblatex| documentation. +\c{groll2008method} +\begin{ltxexample} +@patent{groll2008method, + author = {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}, + publisher = {Google Patents}, + number = {EP 1 094 937 B1}, + type = {patenteu}, + date = {2008-07-30}, + url = {https://patents.google.com/patent/EP1094937B1}, +} +\end{ltxexample} \subsection{Hints and Caveats} -This section provides additional hints concerning the \t|biblatex| package +This section provides additional hints concerning the \biblatex package as well as the ISO~690 standard. For now, some of the things have to be dealt with at the level of the \t|bib| file, other ones are directly addressed in this style package. -Everything else relies on the \t|biblatex| package, so please also refer -to the \t|biblatex| documentation. +Everything else relies on the \biblatex package, so please also refer +to the \biblatex documentation. \subsubsection{Creators} @@ -404,39 +612,31 @@ specific ones (e.g. \t|translator|) can be used. Note also the field to specify the type of the editor. This is useful to distinguish the role of the creator and their relationship to the cited work. Some roles are supported by default, e.g. \t|editor|, \t|compiler|, \t|founder| -and \t|reviser|, in other cases the literal string can be entered. +and \t|reviser|, some are created additionally, i.e. \t|inventor|, +\t|director|; in other cases, use the literal string. Example: -When citing cinematographic works which are typically the output of many +When citing cinematographic works, which are typically the output of many individuals, the title should be used as the first element of the reference. However, it is appropriate to include some relevant roles, e.g. the director: -%\begin{ltxexample} -\begin{verbatim} - .. - editora = {Welles, Orson} - editoratype = {Directed by} - .. -\end{verbatim} -%\end{ltxexample} - -in English, or +\begin{ltxexample} + editora = {Welles, Orson}, + editoratype = {director}, +\end{ltxexample} -%\begin{ltxexample} -\begin{verbatim} - .. - editora = {Welles, Orson} - editoratype = {Réžia} - .. -\end{verbatim} -%\end{ltxexample} +The field \t|nameaddon| can be used to append additional information +to the creator's name, e.g. variant forms of a name, name additions, +or pseudonyms. This field is printed as is, in square brackets, after +the creator's name, see~\parencite{gorki1955artamonovs}. -in Slovak. +If possible, all names of multiple creators should be given in the reference +(the upper limit is set to 99 names). If you need to omit any names, you can +use the keyword \uv{\t|and others|} in the name list for your \t|bib| entry: -The field \t|nameaddon| can be used to append additional information -to the creator's name, e.g. variant forms of a name, name additions -or pseudonyms. This field is printed as is, in square brackets after -the creator's name. +\begin{ltxexample} + editor = {Humphrey Appleby and others}, +\end{ltxexample} For anonymous works cited by the author-year method, the term \textit{Anon} should be used in place of the creator's name. Please reflect this @@ -446,17 +646,29 @@ in the \t|bib| file, since there is no other support for this for now. Similar to the \t|nameaddon| field for names, \t|titleaddon| serves such purpose for titles. This field is appropriate for providing other or -alternative titles, elucidation of ambiguous or incorrect titles, -substitute for no titles, translation of titles, etc. +alternative titles, elucidation of ambiguous or incorrect titles, substitute +for no titles, translation of titles, etc., +see~\parencite{gorki1955artamonovs}. Note that also other \t|*titleaddon| fields are supported by default. \subsubsection{Medium type} +\label{sec:howpublished} + +The field \t|howpublished| is used for providing information about the medium +designation (e.g., Braille, film, and photograph) or type of medium for the +electronic resources (e.g., online, online database, and podcast). The default +output for electronic information resources (\t|@online| entry types or +entries including \t|urldate| field) is \t|[online]|, even without -The field \t|howpublished| is used for providing information about -the medium designation or type of medium. Default value for electronic -information resources is \t|online|. This field is printed as is, -in square brackets after title section, generally. +\begin{ltxexample} + howpublished = {online}, +\end{ltxexample} + +\noindent +listed in the \t|bib| file. The \t|howpublished| field is printed as is, +in square brackets, after the title section, generally. The field accepts +localization strings (e.g. \t|online| or \t|film|) or literal string values. \subsubsection{Edition} @@ -470,48 +682,80 @@ The \t|version| field is used for providing information about updated versions of an item, usually software. \subsubsection{Date} +\label{sec:date} + +If an exact date is not known, an approximate date should be supplied in +brackets preceded by a circa localization string (e.g. ca.). To achieve this +behavior, specify the date followed by a tilde, as in the example below: + +\begin{ltxexample} + date = {1490~}, % tilde meaning circa +\end{ltxexample} In case no date is given and also no approximation is possible, that should be stated. Please reflect this in the \t|bib| file by including -the following line in the respective entry. - -\begin{verbatim} - .. - date = {\mkbibbrackets{\bibsstring{nodate}}} - .. -\end{verbatim} - -Explanation of the above code: -\t|nodate| is a localization string which prints something like -\textit{n.d.}, \textit{b.r.}, etc. depending on the language, -\t|bibsstring| is a command to use such localization terms and -\t|mkbibbrackets| is a command used to wrap its argument into -square brackets. Finally, this statement is entered into -the date entry field to be available as a date in a reference. -So as a result we get e.g. \textit{[n.d.]}, which conforms to -the standard. +no date field in the respective entry. It automatically translates +to something like \textit{[n.d.]}, based on your language, meaning +\textit{no date}. + +The \biblatexiso package provides new field \t|dateaddon| that can be +used for date specificities. Description of some known use cases follows. + +If the date provided in the primary source of data is obviously incorrect +(e.g. 1959), the correction should be supplied in brackets (e.g. [i.e. 1995]): + +\begin{ltxexample} + date = {1959}, + dateaddon = {\mkbibbrackets{i.e. 1995}}, +\end{ltxexample} + +You can use \t|dateaddon| field also for missing dates and their rough +approximations (e.g. providing only centuries), or for different calendar +systems: + +\begin{ltxexample} + dateaddon = {\mkbibbrackets{16th century}}, + dateaddon = {Jewish calendar 5685 \mkbibbrackets{1925}}, +\end{ltxexample} + +And if you need to use a copyright date alongside the publication date, or +only a copyright date, you can use \t|dateaddon| field as well: + +\begin{ltxexample} + date = {2000}, + dateaddon = {\addcomma\space\textcopyright\addnbthinspace 2001}, +\end{ltxexample} + +If you have only a copyright date (e.g. \textcopyright\,2001), you can use +\t|sortyear| field to clarify the sorting, the entry will be sorted by the +year (2001) and not the literal value (\textcopyright\,2001): + +\begin{ltxexample} + dateaddon = {\textcopyright\addnbthinspace 2001}, + sortyear = {2001}, +\end{ltxexample} Please also note the syntax for dates -- ISO 8601 format -(YYYY-MM-DD) is accepted. Please use slash instead of +(\t|YYYY-MM-DD|) is accepted. Please use slash instead of any kind of dash for ranges of dates. If the range is open ended, enter just the first date followed by a slash. -And last, but not least, use the \t|date| field instead of -the \t|year| field in general. +And last but not least, use the \t|date| field instead of +the \t|year| field in general. Examples follow: -Examples follow: - -\begin{verbatim} - date = {2012-12-21} % exact date - date = {1998/2001} % date range - date = {2016/} % open ended date range -\end{verbatim} +\begin{ltxexample} + date = {2012-12-21}, % exact date + date = {1998/2001}, % date range + date = {2016/}, % open ended date range +\end{ltxexample} \subsubsection{Location} +\label{sec:library} If only a limited number of copies of the work exists or the location of a graphic work is essential to its identification, such location (e.g. library or repository) should be stated -in a reference. The field \t|library| serves for this purpose. +in a reference. The field \t|library| serves for this purpose, +see~\parencite{gosse1912garden}. \nocite{*} \printbibliography[title={Reference bibliography},heading={bibnumbered}] @@ -521,56 +765,97 @@ in a reference. The field \t|library| serves for this purpose. \begin{changelog} +\begin{release}{0.4.0}{2020-03-25} +\item Fixed deprecated name handling +\item Declared mapping suffix (\t|<lang>-iso.lbx|) for localization files +\item Updated and improved documentation, README, and \t|bib| examples +\item Delimiters defined by the new way +\item Refined \t|date| and \t|names| macros +\item Added date circa\see{sec:date} +\item Added \t|dateaddon| field\see{sec:date} +\item Commented source code to understand it for others better +\item Employed standard \cmd{mkbibacro} for DOI, ISBN, ISSN, ISAN, ISMN, ISRN, + ISWC (small caps instead of uppercase) +\item INCOMPATIBLE CHANGE: replaced \t|classification| with \t|number| field + for patent entries\see{sec:patent} +\item Added localization strings \t|director|, \t|bydirector|, \t|inventor|, + \t|byinventor|, \t|online|, \t|film| +\item Added Bulgarian and French localization +\item Increased maximum number of names to print to 99 (9 before) +\item Removed \biblatex{} backwards compatibility code +\item Fixed printing \t|url| and \t|urldate| for \t|@online| entries +\item Fixed multiple ISBNs / ISSNs +\item Allowed the package option \t|abbreviate=[true\textbar false]| to work + for all bibstrings\see{sec:pkg:opt} +\item Added \cmd{parencite} support for \t|iso-numeric| style\see{sec:numeric} +\item Added \t|articlepubinfo| package option\see{sec:pkg:opt:iso690} +\item Logging only to \t|.log| file (no terminal output) +\item Added support for \t|report| and \t|movie| entry types +\item Added support of localization strings in \t|howpublished| + field\see{sec:howpublished} +\item Fixed typos, code improvements +\end{release} + \begin{release}{0.3.3}{2019-10-30} -\item Doc better wording -\item Enable multilingual references by default -\item Added isbn, doi, url and eprint options for blocking corresponding fields +\item Documentation with better wording +\item Enable multilingual references by default\see{sec:pkg:opt} +\item Added \t|isbn|, \t|doi|, \t|url| and \t|eprint| package options for + blocking corresponding fields\see{sec:pkg:opt:iso690} \item Printing out (the same) editors also in the consecutive entries -- get rid of the dash as default (\t|iso-authoryear| style) \item Removed deprecated \biblatex\ options \item Changed URL address for DOI records \item Clean up of indentation and spacing in the source code \item Renamed \t|editor| macro to \t|incollection-editor| +\item Added Polish localization \end{release} \begin{release}{0.3.2}{2017-04-25} -\item Synchronized \t|iso-numeric| bibliography environment with original \t|numeric| style -\item Added support for alphabetic bibliographic style (\t|iso-alphabetic|) -\item Incompatible change: \t|thesisinfolast| package option changed to \t|thesisinfoinnotes| +\item Synchronized \t|iso-numeric| bibliography environment with original + \t|numeric| style +\item Added support for alphabetic bibliographic style + (\t|iso-alphabetic|)\see{sec:nonstandard:methods} +\item INCOMPATIBLE CHANGE: \t|thesisinfolast| package option changed to + \t|thesisinfoinnotes|\see{sec:pkg:opt:iso690} \item README copyediting and conversion to markdown -\item Various doc and README corrections and enhancements +\item Various documentation and README corrections and enhancements \item Added German localization \end{release} \begin{release}{0.3.1}{2016-05-13} -\item Added support for entry types \t|thesis| and \t|patent| -\item Added support for including location information (\t|library| field) +\item First public release on \textsc{ctan}\see{sec:accessibility} +\item Added support for \t|thesis| entry type\see{sec:thesis} +\item Added support for \t|patent| entry type\see{sec:patent} +\item Added support for including location information (\t|library| + field)\see{sec:library} \item Added Slovak localization \item Removed non-breaking space after standard identifier terms -\item Streamlined the author-title citation style -\item Minor doc corrections +\item Streamlined \t|iso-authortitle| citation style\see{sec:nonstandard:methods} +\item Minor documentation corrections \end{release} \begin{release}{0.3}{2016-05-04} -\item A~complete refactoring of the style to comply the latest version of the \t|biblatex| package as well as ISO~690 international standard -\item Added english version of the documentation/user guide (this document) +\item A~complete refactoring of the style to comply the latest version of the + \biblatex package as well as ISO~690 international standard\see{sec:about} +\item Added English version of the documentation/user guide (this document) \end{release} \begin{release}{0.2.1}{2016-03-13} \item Solved issues about punctuation marks and redundant spaces -\item Compatibility support for the latest version of the \t|biblatex| package -\item Reformatted the driver for \verb|inbook| entry type +\item Compatibility support for the latest version of the \biblatex package +\item Reformatted the driver for \t|inbook| entry type \end{release} \begin{release}{0.2}{2015-03-25} -\item Gathered changes during past four years -\item Solved issue about the spacing of strings in main document language +\item Gathered changes during the past four years +\item Solved issue about the spacing of strings in the main document language \end{release} \begin{release}{0.1}{2011-02-03} -\item First release +\item First public release\see{sec:feedback} \item Draft of the documentation (only in Czech) -\item Support for almost all of the entry types provided by the \t|biblatex| package +\item Support for almost all of the entry types provided by the \biblatex + package\see{sec:database} \end{release} \end{changelog} diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/mybib.bib b/Master/texmf-dist/doc/latex/biblatex-iso690/mybib.bib index f0115ff9b2c..f87684085f3 100644 --- a/Master/texmf-dist/doc/latex/biblatex-iso690/mybib.bib +++ b/Master/texmf-dist/doc/latex/biblatex-iso690/mybib.bib @@ -1,194 +1,415 @@ -% This file was created with JabRef 2.6. -% Encoding: UTF8 -@ONLINE{t00, - editor = {Bratková, Eva}, - editortype={compiler}, - title = {Metody citování literatury a strukturování bibliografických záznamů podle mezinárodních norem ISO 690 a ISO 690-2}, - subtitle = {metodický materiál pro autory vysokoškolských kvalifikačních prací}, edition = {Verze 2.0, aktualiz. a rozšíř.}, - location = {Praha}, - publisher = {Odborná komise pro otázky elektronického zpřístupňování vysokoškolských kvalifikačních prací, Asociace knihoven vysokých škol ČR}, - date = {2008-12-22}, - pagetotal = {60}, - url = {http://www.evskp.cz/SD/4c.pdf}, - urldate = {2011-02-02}, - langid={czech} -} - -@BOOK{t01, - author = {Borgman, Christine L.}, - year={2003}, - title = {From Gutenberg to the global information infrastructure}, - subtitle = {access to information in the networked world}, - edition= {1}, % should not be stated - location = {Cambridge (Mass)}, +% Encoding: UTF-8 + +@online{bratkova2008metody, + editor = {Bratková, Eva}, + editortype = {compiler}, + title = {Metody citování literatury a strukturování bibliografických záznamů podle mezinárodních norem ISO 690 a ISO 690-2}, + subtitle = {metodický materiál pro autory vysokoškolských kvalifikačních prací}, + edition = {Verze 2.0, aktualiz. a rozšíř.}, + location = {Praha}, + publisher = {Odborná komise pro otázky elektronického zpřístupňování vysokoškolských kvalifikačních prací, Asociace knihoven vysokých škol ČR}, + date = {2008-12-22}, + pagetotal = {60}, + url = {http://www.evskp.cz/SD/4c.pdf}, + urldate = {2011-02-02}, + langid = {czech}, +} + +@book{borgman2003from, + author = {Borgman, Christine L.}, + title = {From {Gutenberg} to the Global Information Infrastructure}, + subtitle = {Access to Information in the Networked World}, + location = {Cambridge (Mass.)}, publisher = {The MIT Press}, - pagetotal = {xviii, 324}, - isbn = {0-262-52345-0}, - langid={english} -} - -@INCOLLECTION{t02, - author = {Greenberg, David}, - year = {1998}, - title = {Camel drivers and gatecrashers}, - subtitle = {quality control in the digital research library}, - editor = {Hawkins, B.L and Battin, P}, - booktitle = {The mirage of continuity}, - booksubtitle = {reconfiguring academic information resources for the 21st century}, - location = {Washington (D.C.)}, - publisher = {Council on Library and Information Resources; Association of American Universities}, - pages = {105-116}, - langid = {english} -} - -@ARTICLE{t03, - author = {LYNCH, C.}, - year = {2005}, - title = {Where do we go from here?}, - subtitle = {the next decade for digital libraries}, - journaltitle = {DLib Magazine}, - volume = {11}, - number = {7/8}, - urldate ={2005-08-15}, - url = {http://www.dlib.org/dlib/july05/lynch/07lynch.html}, - issn = {1082-9873}, - langid = {english} -} - -@ARTICLE{cr, - author = {{Národní knihovna}}, - title = {A big paper}, + date = {2003}, + pagetotal = {xviii, 324}, + isbn = {0-262-52345-0}, + langid = {english}, +} + +@incollection{greenberg1998camel, + author = {Greenberg, Douglas}, + title = {Camel Drivers and Gatecrashers}, + subtitle = {Quality Control in the Digital Research Library}, + editor = {Hawkins, Brian L. and Battin, Patricia}, + booktitle = {The Mirage of Continuity}, + booksubtitle = {Reconfiguring Academic Information Resources for the 21st Century}, + date = {1998}, + location = {Washington (D.C.)}, + publisher = {Council on Library and Information Resources; Association of American Universities}, + isbn = {1-887334-59-9}, + pages = {105--116}, + langid = {english}, +} + +@article{lynch2005where, + author = {Lynch, Clifford}, + title = {Where Do We Go From Here?}, + subtitle = {The Next Decade for Digital Libraries}, + journaltitle = {D-Lib Magazine}, + date = {2005}, + volume = {11}, + number = {7/8}, + issn = {1082-9873}, + doi = {10.1045/july2005-lynch}, + url = {http://www.dlib.org/dlib/july05/lynch/07lynch.html}, + urldate = {2005-08-15}, + langid = {english}, +} + +% Made-up bib entry +@article{cr, + author = {{Národní knihovna}}, + title = {A big paper}, journaltitle = {The journal of big papers}, - year = {1991}, - volume = {12}, - number = {3}, - issn={2232-332X}, - langid={english} + date = {1991}, + volume = {12}, + number = {3}, + issn = {0000-0000}, + langid = {english}, } -@BOOK{kniha, - title = {A big paper}, - subtitle={Podtitul}, +% Made-up bib entry +@book{kniha, + author = {Děťa, Hugh and Rychlík, Tomáš}, + title = {A big paper}, + subtitle = {Podtitul}, + edition = {2}, + series = {Pokusná edice}, + location = {Praha}, publisher = {Academia}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš}, - edition = {2}, + date = {1991}, pagetotal = {550}, + isbn = {978-3-3670-4032-2},% made-up but valid isbn + url = {http://example.com}, + urldate = {2011-01-12}, + langid = {czech}, +} + +% Made-up bib entry +@book{kniha2, + author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, + title = {Úplně úžasná knížka}, + edition = {3}, location = {Praha}, - series={Pokusná edice}, - isbn={978-44-55-X}, - url={http://pokus.cz}, - comment={Dostupné také z WWW}, - urldate = {2011-01-12}, - langid={czech} -} - -@BOOK{kniha2, - title = {Úplně úžasná knížka}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, - edition = {3}, - address = {Praha}, - langid={czech} -} - -@BOOK{kniha3, - title = {Úplně úžasná knížka}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, - edition = {3}, - publisher={MIT Press}, - address = {Praha}, - pagetotal={332}, - langid={english} -} - -@ARTICLE{small, - author = {Freely, I.P.}, - title = {A small paper}, - subtitle = {Podtitulek}, + date = {1991}, + langid = {czech}, +} + +% Made-up bib entry +@book{kniha3, + author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, + title = {Úplně úžasná knížka}, + edition = {3}, + location = {Praha}, + publisher = {MIT Press}, + date = {1991}, + pagetotal = {332}, + langid = {english}, +} + +% Made-up bib entry +@article{small, + author = {Freely, I. P.}, + title = {A small paper}, + subtitle = {Podtitulek}, journaltitle = {The journal of small papers}, - year = {1997}, - volume = {1}, - note = {to appear}, - pages={2-5}, - number={3}, - langid={czech} + date = {1997}, + volume = {1}, + number = {3}, + pages = {2--5}, + note = {This is a note.}, + langid = {czech}, } -@ARTICLE{big, - author = {Jass, Hugh}, - title = {A big paper}, - journal = {The journal of big papers}, - year = {1991}, - volume = {23} +% Made-up bib entry +@article{big, + author = {Jass, Hugh}, + title = {A big paper}, + journaltitle = {The journal of big papers}, + date = {1991}, + volume = {23}, } -@ARTICLE{cs, +% Made-up bib entry +@article{cs, COMMENT_OUTauthor = {Černý, Hugh}, - title = {Titulek}, - journal = {The journal of big papers}, - year = {1991}, - volume = {12}, - pages = {22-44}, - doi = {10.112.22/jkn}, - number = {2}, -} - -@BOOK{koll, - author = {Kollmannová, Ludmila and Bubeníková, Libuše and Kopecká, Alena}, - title = {Angličtina pro samouky}, - edition = {5}, - location = {Praha}, - publisher = {Státní pedagogické nakladatelství}, - year = {1977}, + title = {Titulek}, + journaltitle = {The journal of big papers}, + date = {1991}, + volume = {12}, + number = {2}, + pages = {22--44}, + doi = {10.1000/182}, +} + +@book{kollmann1991anglictina, + author = {Kollmannová, Ludmila and Bubeníková, Libuše and Kopecká, Alena}, + title = {Angličtina pro samouky}, + edition = {5}, + location = {Praha}, + publisher = {Státní pedagogické nakladatelství}, + date = {1991}, pagetotal = {525}, - series = {Učebnice pro samouky}, - number = {4}, - isbn = {80-04-25663-5} + series = {Učebnice pro samouky}, + number = {4}, + isbn = {80-04-25663-5}, + langid = {czech}, } -@INBOOK{kap, - author = {Novotná, Pepina}, - title = {Podkapitola}, - pages = {22-29}, - chapter = {2.}, - crossref = {koll} +% Made-up bib entry +@inbook{novotna1991podkapitola, + author = {Novotná, Pepina}, + title = {Podkapitola}, + pages = {22--29}, + chapter = {2}, + crossref = {kollmann1991anglictina}, } -@PERIODICAL{tug, +@periodical{tugboat1980, journaltitle = {TUGBoat}, - publisher = {TUG}, - issn = {1222-3333}, - langid = {english}, - date = {1980/}, - options = {skipbib=true}, - url={http://tugboat.tug.org/} -} - -@ARTICLE{knuth, - author = {Knuth, Donald}, - title = {Journeys of \TeX}, - volume = {17}, - number = {3}, - year = {2003}, - pages = {12-22}, - url = {http://tugboat.tug.org/kkk.pdf}, - crossref={tug} -} - -@COLLECTION{sbornik, -title = {Mimořádně užitečný sborník}, -editor = {Geniální, Jiří}, -year = {2007}, -langid = {czech}, -location = {Praha}, -publisher = {Academia}, -isbn = {978-222-626-222-2} -} -@INCOLLECTION{prispevek1, -crossref = {sbornik}, -title = {Velmi zajímavý článek}, -author = {Vlaštovka, Josef}, -pages = {22-45} + publisher = {TUG}, + date = {1980/}, + issn = {0896-3207}, + url = {http://tugboat.tug.org/TUGboat}, + langid = {english}, + options = {skipbib=true}, +} + +@article{knuth1990virtual, + author = {Knuth, Donald}, + title = {Virtual Fonts: More Fun for Grand Wizards}, + date = {1990-04}, + volume = {11}, + number = {1}, + pages = {13--23}, + url = {http://tugboat.tug.org/TUGboat/tb11-1/tb27knut.pdf}, + crossref = {tugboat1980}, +} + +% Made-up bib entry +@collection{sbornik2007, + title = {Mimořádně užitečný sborník}, + editor = {Geniální, Jiří}, + location = {Praha}, + publisher = {Academia}, + date = {2007}, + isbn = {978-3-4947-0284-1},% made-up but valid isbn + langid = {czech}, +} + +% Made-up bib entry +@incollection{sbornik2007clanek, + author = {Vlaštovka, Josef}, + title = {Velmi zajímavý článek}, + pages = {22--45}, + crossref = {sbornik2007}, +} + +@thesis{luptak2016thesis, + author = {Lupták, Dávid}, + title = {Typesetting of Bibliography According to ISO 690 Norm}, + date = {2016}, + type = {bathesis}, + institution = {Masaryk University, Faculty of Informatics}, + location = {Brno}, + supervisor = {Petr Sojka}, + url = {https://is.muni.cz/th/422640/fi_b/}, +} + +% @phdthesis is an alias for @thesis with the default type = {phdthesis} +@phdthesis{hanthe2001micro, + author = {\foreignlanguage{vietnamese}{Hàn Thế}, \foreignlanguage{vietnamese}{Thành}}, + title = {Micro-typographic extensions to the \TeX{} typesetting system}, + date = {2001}, + institution = {Masaryk University, Faculty of Informatics}, + location = {Brno}, + url = {http://www.pragma-ade.nl/pdftex/thesis.pdf}, + langid = {english}, } + +@patent{groll2008method, + author = {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}, + publisher = {Google Patents}, + number = {EP 1 094 937 B1}, + type = {patenteu}, + date = {2008-07-30}, + url = {https://patents.google.com/patent/EP1094937B1}, +} + +% Made-up bib entry +% No date example +@book{applebyND, + author = {Humphrey Appleby}, + title = {On the Importance of the Civil Service}, + note = {A book with no date}, +} + +% Made-up bib entry +% Circa date example +@book{appleby1490circa, + author = {Humphrey Appleby}, + title = {On the Importance of the Higher Civil Service}, + date = {1490~}, + note = {A book with an approximate date}, +} + +% Made-up bib entry +% Open ended circa date range example +@periodical{appleby1452yet, + editor = {Humphrey Appleby and others}, + title = {Thinking and Writing}, + date = {1452~/}, + note = {A periodical with an open ended date range}, +} + +% Made-up bib entry +% Copyright date example +@book{appleby2000copyright, + author = {Humphrey Appleby}, + title = {What Is a Copyright?}, + date = {2000}, + dateaddon = {\addcomma\space\textcopyright\addnbthinspace 2001}, + % sortyear = {2001},% modify the date sorting if needed (no 'date' field) + note = {A book with a copyright date}, +} + +% Made-up bib entry +% Corrected date example +@book{appleby1959corrected, + author = {Humphrey Appleby}, + title = {How to supply a correct date}, + date = {1959}, + dateaddon = {\mkbibbrackets{i.e. 1995}}, + note = {A book with a corrected date}, +} + +% Multiple ISSNs example +@article{dewachter2006macro, + author = {Hans Dewachter and Marco Lyrio}, + title = {Macro Factors and the Term Structure of Interest Rates}, + journal = {Journal of Money, Credit and Banking}, + publisher = {Ohio State University Press}, + date = {2006}, + volume = {38}, + number = {1}, + pages = {119--140}, + issn = {0022-2879, 1538-4616},% ISSN (ISSN-L), e-ISSN + url = {http://www.jstor.org/stable/3839071}, + urldate = {2020-01-20}, +} + +% Report type example +@report{chapman1958approximate, + author = {Chapman, Dean R.}, + title = {An Approximate Analytical Method for Studying Entry into Planetary Atmospheres}, + date = {1958-05-01}, + type = {\autocap{t}echnical note}, + number = {NACA TN 4276}, + institution = {National Advisory Committee for Aeronautics}, + location = {Washington}, + pagetotal = {103}, + url = {http://hdl.handle.net/2060/19930085059}, +} + +% Movie type example #1 +% Movie is a co-operative work ==> title first (in place of creator) +@movie{macbeth1948welles, + title = {Macbeth}, + howpublished = {film}, + editor = {Welles, Orson}, + editortype = {director}, + date = {1948}, + location = {United States}, + publisher = {Republic Pictures}, + isan = {0000-0000-3B1A-0000-2-0000-0000-V}, + options = {useeditor=false},% title first +} + +% Movie type exaple #2 +% Someone has a dominant role (e.g. clearly responsible for the intellectual +% content) ==> given as the creator at the first place +@movie{vlacil1967marketa, + author = {Vláčil, František}, + authortype = {director}, + title = {Marketa Lazarová}, + howpublished = {film}, + date = {1967-11-24}, + location = {Praha}, + publisher = {Filmové studio Barrandov}, + isan = {0000-0000-82AA-0000-1-0000-0000-Y}, + langid = {czech}, +} + +% Music type example +@music{britten1980eight, + author = {Britten, Benjamin}, + title = {Eight folk song arrangements for high voice and harp}, + editor = {Ellis, Osian}, + date = {1980}, + location = {London}, + publisher = {Faber Music}, +} + +% Music type example +% More editor types +@music{pacini1832corsaro, + author = {Pacini, Giovanni}, + title = {Il corsaro}, + editor = {Ferretti, Jacopo}, + editortype = {\autocap{l}ibretto by}, + % editortype = {\autocap{l}ibrettist},% alternative + editora = {Byron, Lord}, + editoratype = {\autocap{b}ased on the novel by}, + % editoratype = {\autocap{n}ovelist},% alternative + date = {1832}, + location = {Milan}, + publisher = {G. Ricordi}, +} + +% Nameaddon example +% Titleaddon example +% Origlanguage example +@book{gorki1955artamonovs, + author = {Maxim Gorki}, + nameaddon = {Gorky}, + title = {The Artamonovs}, + titleaddon = {Delo Artamonovykh}, + translator = {Alec Brown}, + origlanguage = {russian}, + date = {1955}, + location = {London}, + publisher = {Folio Society}, + pagetotal = {281}, +} + +% Graphic work example +% Specific location (library field) example +% Howpublished literal string example +@misc{gosse1912garden, + author = {Gosse, Sylvia}, + title = {The Garden, Rowlandson House}, + howpublished = {etching and aquatint}, + date = {1912}, + library = {London\subtitlepunct British Museum, Department of Prints and Drawings}, + note = {Register number 1915-27-41}, +} + +% ArXiv preprint example +@online{maldacena1997large, + author = {Juan M. Maldacena}, + title = {The Large N Limit of Superconformal Field Theories and Supergravity}, + date = {1998-01-22}, + version = {3}, + eprint = {hep-th/9711200}, + eprinttype = {arXiv}, + urldate = {2020-03-25}, +} + +% Made-up ISBNs generated by https://generate.plus/en/number/isbn + +% biber --tool --validate-datamodel --tool-fieldcase=lower --output-align mybib.bib +% + sort fields in the meaningful order diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/bulgarian-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/bulgarian-iso.lbx new file mode 100644 index 00000000000..858f936995f --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/bulgarian-iso.lbx @@ -0,0 +1,30 @@ +\ProvidesFile{bulgarian-iso.lbx} + [2020/03/25 v0.4.0 ISO 690 extended biblatex localization] + +\InheritBibliographyExtras{bulgarian} +\InheritBibliographyStrings{bulgarian} + +\DeclareBibliographyStrings{% + at = {{в}% + {в}}, + bysupervisor = {{ръководен от}% + {ръков\adddotspace от}}, + url = {{достъпен на}% + {дост\adddotspace на}}, + urlalso = {{също достъпен на}% + {също дост\adddotspace на}}, + director = {{режисьор}% + {реж\adddot}}, + bydirector = {{режисиран от}% + {реж\adddotspace от}}, + inventor = {{изобретател}% + {изобр\adddot}}, + byinventor = {{изобретен от}% + {изобр\adddotspace от}}, + online = {{онлайн}% + {онлайн}}, + film = {{филм}% + {филм}}, +} + +\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 84546aa71d1..ff7967e00fa 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} -[2017/04/25 v0.3.2 biblatex localization] + [2020/03/25 v0.4.0 ISO 690 extended biblatex localization] \InheritBibliographyExtras{czech} \InheritBibliographyStrings{czech} @@ -13,6 +13,18 @@ {dostupn\'{e} z}}, urlalso = {{dostupn\'{e} tak\'{e} z}% {dostupn\'{e} tak\'{e} z}}, + director = {{re\v{z}is\'{e}r}% + {re\v{z}is\'{e}r}}, + bydirector = {{re\v{z}ie}% + {re\v{z}ie}}, + inventor = {{vyn\'{a}lezce}% + {vyn\'{a}lezce}}, + byinventor = {{vyn\'{a}lezce\addcolon}% + {vyn\'{a}lezce\addcolon}},% FIXME: unsure + online = {{online}% + {online}}, + film = {{film}% + {film}}, } \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 e1a5e01b6b1..916128b6b8a 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} -[2017/04/25 v0.3.2 biblatex localization] + [2020/03/25 v0.4.0 ISO 690 extended biblatex localization] \InheritBibliographyExtras{english} \InheritBibliographyStrings{english} @@ -11,6 +11,18 @@ {supervised by}}, urlalso = {{available also from}% {available also from}}, + director = {{director}% + {director}}, + bydirector = {{directed by}% + {directed by}}, + inventor = {{inventor}% + {inventor}}, + byinventor = {{invented by}% + {invented by}}, + online = {{online}% + {online}}, + film = {{film}% + {film}}, } \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 new file mode 100644 index 00000000000..e249655c719 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/french-iso.lbx @@ -0,0 +1,35 @@ +\ProvidesFile{french-iso.lbx} + [2020/03/25 v0.4.0 ISO 690 extended biblatex localization] + +\InheritBibliographyExtras{french} +\InheritBibliographyStrings{french} + +% `french.lbx` overrides the family name format to \textsc +% that is against the consistency rule since we use uppercase +% as default. +\DeclareBibliographyExtras{% + \restorecommand\mkbibnamefamily +} + +\DeclareBibliographyStrings{% + at = {{à}% + {à}}, + bysupervisor = {{supervisé par}% + {supervisé par}}, + urlalso = {{aussi disponible à l'adresse}% + {aussi disponible à l'adresse}}, + director = {{réalisateur}% + {réalisateur}}, + bydirector = {{réalisé par}% + {réalisé par}}, + inventor = {{inventeur}% + {inventeur}}, + byinventor = {{inventé par}% + {inventé par}}, + online = {{en ligne}% + {en ligne}}, + film = {{film}% + {film}}, +} + +\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 486a5d506dc..7146b27e7ca 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} -[2017/04/25 v0.3.2 biblatex localization] + [2020/03/25 v0.4.0 ISO 690 extended biblatex localization] \InheritBibliographyExtras{german} \InheritBibliographyStrings{german} @@ -11,6 +11,18 @@ {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 } \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 8e460f2cbba..beef88d4146 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{alphabetic.bbx} -[2017/04/25 v0.3.2 biblatex citation style] +\ProvidesFile{iso-alphabetic.bbx} + [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style] % This is a copy of alphabetic.bbx % It only uses iso as base style, instead of standard @@ -18,7 +18,7 @@ {\list {\printtext[labelalphawidth]{% \printfield{labelprefix}% - \printfield{labelalpha}% + \printfield{labelalpha}% \printfield{extraalpha}}} {\setlength{\labelwidth}{\labelalphawidth}% \setlength{\leftmargin}{\labelwidth}% 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 2a4bdcbfa0e..2d90c118d0a 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} -[2017/04/25 v0.3.2 biblatex citation style] + [2020/03/25 v0.4.0 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 new file mode 100644 index 00000000000..2248f37e35e --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.dbx @@ -0,0 +1,12 @@ +\ProvidesFile{iso-alphabetic.dbx} + [2020/03/25 v0.4.0 ISO 690 biblatex data model extension] + +\RequireBiber[3] + +% Declare new fields +\DeclareDatamodelFields[type=list, datatype=name]{supervisor} +\DeclareDatamodelFields[type=field, datatype=literal]{dateaddon} + +% Declare new fields for (specific / all) entry types +\DeclareDatamodelEntryfields[thesis]{supervisor} +\DeclareDatamodelEntryfields{dateaddon} 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 e558c54fda3..ab683014ce0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx @@ -1,8 +1,9 @@ -\ProvidesFile{iso-authortitle.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] +\ProvidesFile{iso-authortitle.bbx} + [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% - sorting=nty + sorting=nty, } \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 f6b9e0aa8d4..8226b9bc92f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx @@ -1,8 +1,9 @@ -\ProvidesFile{iso-authortitle.cbx}[2017/04/25 v0.3.2 biblatex citation style] +\ProvidesFile{iso-authortitle.cbx} + [2020/03/25 v0.4.0 ISO 690 biblatex citation style] \ExecuteBibliographyOptions{% - maxcitenames=1 - ,mincitenames=1 + maxcitenames=1, + mincitenames=1, } \RequireCitationStyle{authortitle} 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 fe51d184d24..f6d17afa406 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx @@ -1,6 +1,12 @@ -\ProvidesFile{iso-authortitle.dbx}[2017/04/25 v0.3.2 biblatex data model extension] +\ProvidesFile{iso-authortitle.dbx} + [2020/03/25 v0.4.0 ISO 690 biblatex data model extension] + \RequireBiber[3] -\DeclareDatamodelFields[type=list,datatype=name]{supervisor} -\DeclareDatamodelFields[type=field,datatype=literal]{classification} + +% Declare new fields +\DeclareDatamodelFields[type=list, datatype=name]{supervisor} +\DeclareDatamodelFields[type=field, datatype=literal]{dateaddon} + +% Declare new fields for (specific / all) entry types \DeclareDatamodelEntryfields[thesis]{supervisor} -\DeclareDatamodelEntryfields[patent]{classification} +\DeclareDatamodelEntryfields{dateaddon} 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 a7a84cb7bc2..6a8da0a12d4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx @@ -1,41 +1,101 @@ -\ProvidesFile{iso-authoryear.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] +\ProvidesFile{iso-authoryear.bbx} + [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% - sorting=nyt + sorting=nyt, } -\def\printextrayear{% - \ifentrytype{patent} - {} - {\printfield{year}\printfield{extradate}}% +% The separator between 'titles' and the numeration section. +% Overrides the command in 'iso.bbx'. +\renewcommand{\numerationpunct}{\newunitpunct} + +% Delimiter between creator name and year in bibliography +\DeclareDelimFormat[bib,biblist]{nameyeardelim}{\addcomma\space} +% Delimiter between substitution of creator name (if any) +% and year in bibliography +\DeclareDelimFormat[bib,biblist]{nonameyeardelim}{\addcomma\space} + +% a) +% The field extradate turns from integer type to a letter +% after year to distinguish more works of the author +% from the same year, e.g. 1994a, 1994b. +% We use 'labeldate' as it is also used in standard styles. +% b) +% Moreover we print additional date information (dateaddon). +\newbibmacro*{date+extradate}{% + \printlabeldateextra + \setunit{\dateaddonpunct}% + \iffieldequalstr{labeldatesource}{dateaddon} + {}% Do not print dateaddon twice + {\printfield{dateaddon}}% +} + +% Check if 'date' field holds only year or a more specific date. +% Inspired by \ifdatehasyearonlyprecision from 'biblatex.sty', +% but the test date==year is left out, because we use date=year +% in package options so it turned always true. +\newcommand{\ifdatehasyearonly}{% + \ifboolexpr{not test {\iffieldundef{year}} + and (test {\iffieldundef{month}} + and test {\iffieldundef{season}})} +} + +% If there is no more specific date available, we shouldn't repeat +% the year in publication info section. +% Overrides macro 'fulldate' in 'iso.bbx'. +\renewbibmacro*{fulldate}{% + \ifdatehasyearonly% + {}% Print nothing (only year is available) + {\mkdaterangeiso{}}% } -% remove second appearance of year in a reference +% Remove second appearance of year in a reference \renewbibmacro*{date}{}% -% overwrite names:primary to print year right after +% Overwrite names:primary to print year right after: % 1) author % 2) editor % 3) label/title -% need to handle not to print editor twice (primary -% and subsidiary names) +% 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}}% - {\usebibmacro{editor}}% - \setunit{\addspace}\printfield{nameaddon}% - \setunit{\addcomma\space}\printextrayear% + {\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}}}% + {% If no editor(s) is available, use label/title + \usebibmacro{labeltitle}% + \setunit{\printdelim{nonameyeardelim}}}}% + % And finally print date + \usebibmacro{date+extradate}% } -\InitializeBibliographyStyle{\global\undef\bbx@lasthash} +% Print label or title in place of names if they are not available +\newbibmacro*{labeltitle}{% + \iffieldundef{label} + {\iffieldundef{shorttitle} + {\usebibmacro{titles}{}{emph}% + \clearfield{title}% + \clearfield{subtitle}% + \clearfield{titleaddon}} + {\printfield[title]{shorttitle}}} + {\printfield{label}}} -\newbibmacro*{bbx:savehash}{% - \savefield{fullhash}{\bbx@lasthash}} \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 2d58ac71d98..abdd15db203 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx @@ -1,14 +1,19 @@ -\ProvidesFile{iso-authoryear.cbx}[2017/04/25 v0.3.2 biblatex citation style] +\ProvidesFile{iso-authoryear.cbx} + [2020/03/25 v0.4.0 ISO 690 biblatex citation style] +% Use only one name in citation to be consistent \ExecuteBibliographyOptions{% - maxcitenames=1 - ,mincitenames=1 + maxcitenames=1, + mincitenames=1, } \RequireCitationStyle{authoryear} \RequireCitationStyle{iso-fullcite} -\renewcommand*{\nameyeardelim}{\addcomma\addspace} -\renewcommand*{\nonameyeardelim}{\addcomma\addspace} +% Delimiter between creator name and year in citation +\DeclareDelimFormat{nameyeardelim}{\addcomma\space} +% Delimiter between substitution of creator name (if any) +% and year in citation +\DeclareDelimFormat{nonameyeardelim}{\addcomma\space} \endinput 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 c024de9d215..8b08856bba5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx @@ -1,6 +1,12 @@ -\ProvidesFile{iso-authoryear.dbx}[2017/04/25 v0.3.2 biblatex data model extension] +\ProvidesFile{iso-authoryear.dbx} + [2020/03/25 v0.4.0 ISO 690 biblatex data model extension] + \RequireBiber[3] -\DeclareDatamodelFields[type=list,datatype=name]{supervisor} -\DeclareDatamodelFields[type=field,datatype=literal]{classification} + +% Declare new fields +\DeclareDatamodelFields[type=list, datatype=name]{supervisor} +\DeclareDatamodelFields[type=field, datatype=literal]{dateaddon} + +% Declare new fields for (specific / all) entry types \DeclareDatamodelEntryfields[thesis]{supervisor} -\DeclareDatamodelEntryfields[patent]{classification} +\DeclareDatamodelEntryfields{dateaddon} 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 76d3ada239f..4e3af0c95a8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-fullcite.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-fullcite.cbx @@ -1,20 +1,27 @@ +\ProvidesFile{iso-fullcite.cbx} + [2020/03/25 v0.4.0 ISO 690 biblatex fullcite modifications] + % Fix for fullcite + +% Based on \fullcite standard command +% Adds only formatting directive of \mkbibnamefamily \DeclareCiteCommand{\fullcite} - {\usebibmacro{prenote}% - \renewcommand*\mkbibnamelast{\lastnameformat}% - \renewcommand*\mkbibnamefamily{\lastnameformat}} + {\usebibmacro{prenote}} {\usedriver - {\DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}% + \renewcommand*{\mkbibnamefamily}{\familynameformat}} {\thefield{entrytype}}} {\multicitedelim} {\usebibmacro{postnote}} + +% Based on \footfullcite standard command +% Adds only formatting directive of \mkbibnamefamily \DeclareCiteCommand{\footfullcite}[\mkbibfootnote] - {\usebibmacro{prenote}% - \renewcommand*\mkbibnamelast{\textsc}% - \renewcommand*\mkbibnamefamily{\textsc}} + {\usebibmacro{prenote}} {\usedriver - {\DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}% + \renewcommand*{\mkbibnamefamily}{\familynameformat}} {\thefield{entrytype}}} {\multicitedelim} {\usebibmacro{postnote}} 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 ba64c58a693..c4bb9b742b7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx @@ -1,36 +1,30 @@ -\ProvidesFile{iso-numeric.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] +\ProvidesFile{iso-numeric.bbx} + [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% - sorting=none, - labelnumber + sorting=none,% bib entries in the bibliography are in their citation order + labelnumber,% enable numbers for bib entries } +% The numbers of bib entries are printed with a dot after number +% in the bibliography. \DeclareFieldFormat{labelnumberwidth}{#1\adddot} -\@ifpackagelater{biblatex}{2016/03/27} - {\newcommand\MethodFormat{% - \printtext[labelnumberwidth]{% - \printfield{labelprefix}% - \printfield{labelnumber}}}}% - {\newcommand\MethodFormat{% - \printtext[labelnumberwidth]{% - \printfield{prefixnumber}% - \printfield{labelnumber}}}}% - % Copy-pasted from 'numeric.bbx' \defbibenvironment{bibliography} - {\list% - {\MethodFormat}% + {\list + {\printtext[labelnumberwidth]{% + \printfield{labelprefix}% + \printfield{labelnumber}}} {\setlength{\labelwidth}{\labelnumberwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% \addtolength{\leftmargin}{\labelsep}% \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}}% - \renewcommand*{\makelabel}[1]{\hss##1} - }% - {\endlist}% - {\item}% + \renewcommand*{\makelabel}[1]{\hss##1}} + {\endlist} + {\item} \endinput 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 dc54ba52279..a7dbe8e9701 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx @@ -1,6 +1,15 @@ -\ProvidesFile{iso-numeric.cbx}[2017/04/25 v0.3.2 biblatex citation style] +\ProvidesFile{iso-numeric.cbx} + [2020/03/25 v0.4.0 ISO 690 biblatex citation style] \RequireCitationStyle{numeric} \RequireCitationStyle{iso-fullcite} +% Format \parencite with parentheses instead of brackets +\DeclareCiteCommand{\parencite}[\mkbibparens]% <---- was \mkbibbrackets + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{postnote}} + \endinput 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 c2bded8f073..6cf14fe74e1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx @@ -1,6 +1,12 @@ -\ProvidesFile{iso-numeric.dbx}[2017/04/25 v0.3.2 biblatex data model extension] +\ProvidesFile{iso-numeric.dbx} + [2020/03/25 v0.4.0 ISO 690 biblatex data model extension] + \RequireBiber[3] -\DeclareDatamodelFields[type=list,datatype=name]{supervisor} -\DeclareDatamodelFields[type=field,datatype=literal]{classification} + +% Declare new fields +\DeclareDatamodelFields[type=list, datatype=name]{supervisor} +\DeclareDatamodelFields[type=field, datatype=literal]{dateaddon} + +% Declare new fields for (specific / all) entry types \DeclareDatamodelEntryfields[thesis]{supervisor} -\DeclareDatamodelEntryfields[patent]{classification} +\DeclareDatamodelEntryfields{dateaddon} diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx index c4d0f165316..ce2668f718b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx @@ -1,54 +1,76 @@ -\ProvidesFile{iso.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] +\ProvidesFile{iso.bbx} + [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style] -\DeclareLanguageMapping{czech}{czech-iso} -\DeclareLanguageMapping{english}{english-iso} -\DeclareLanguageMapping{slovak}{slovak-iso} -\DeclareLanguageMapping{german}{german-iso} -\DeclareLanguageMapping{polish}{polish-iso} -\NewBibliographyString{at,bysupervisor,urlalso} +% Currently available language mappings: +% Czech, English, Slovak, German, Polish, Bulgarian, +% French +\DeclareLanguageMappingSuffix{-iso} +% Currently needed the following additional language strings: +\NewBibliographyString{at,bysupervisor,urlalso, + director,bydirector,inventor,byinventor,online,film} -%options +% PACKAGE OPTIONS +% Define new package options +% These toggle names are internal \newtoggle{bbx:spcolon} +\newtoggle{bbx:totalpages} +\newtoggle{bbx:shortnum} +\newtoggle{bbx:thesisinfoinnotes} +\newtoggle{bbx:url} +\newtoggle{bbx:isbn} +\newtoggle{bbx:doi} +\newtoggle{bbx:eprint} +\newtoggle{bbx:articlepubinfo} + +% Print info about package options into .log file +\protected\def\isoblx@info@noline#1{% + \PackageInfo{biblatex-iso690}{#1\@gobble}} +\let\isoblx@info\isoblx@info@noline +\AtEndOfPackage{% + \protected\def\isoblx@info#1{% + \PackageInfo{biblatex-iso690}{#1}}} + +% Declare new package options +% Description of these options is in the doc file +% '\isoblx@info@noline' command prints to the .log file \DeclareBibliographyOption{spacecolon}[true]{% \settoggle{bbx:spcolon}{#1}% - \typeout{Space colon enabled: #1}} + \isoblx@info@noline{Space colon enabled: #1}} -\newtoggle{bbx:totalpages} \DeclareBibliographyOption{pagetotal}[true]{% \settoggle{bbx:totalpages}{#1}% - \typeout{Showing total pages enabled: #1}} + \isoblx@info@noline{Total pages enabled: #1}} -\newtoggle{bbx:shortnum} \DeclareBibliographyOption{shortnumeration}[true]{% \settoggle{bbx:shortnum}{#1}% - \typeout{Short numeration enabled: #1}} + \isoblx@info@noline{Short numeration enabled: #1}} -\newtoggle{bbx:thesisinfoinnotes} \DeclareBibliographyOption{thesisinfoinnotes}[true]{% \settoggle{bbx:thesisinfoinnotes}{#1}% - \typeout{Printing thesis info at the end enabled: #1}} + \isoblx@info@noline{Printing thesis info at the end enabled: #1}} -\newtoggle{bbx:url} \DeclareBibliographyOption{url}[true]{% \settoggle{bbx:url}{#1}% - \typeout{Showing URL field enabled: #1}} + \isoblx@info@noline{URL field enabled: #1}} -\newtoggle{bbx:isbn} \DeclareBibliographyOption{isbn}[true]{% \settoggle{bbx:isbn}{#1}% - \typeout{Showing ISBN field enabled: #1}} + \isoblx@info@noline{ISBN field enabled: #1}} -\newtoggle{bbx:doi} \DeclareBibliographyOption{doi}[true]{% \settoggle{bbx:doi}{#1}% - \typeout{Showing DOI field enabled: #1}} + \isoblx@info@noline{DOI field enabled: #1}} -\newtoggle{bbx:eprint} \DeclareBibliographyOption{eprint}[true]{% \settoggle{bbx:eprint}{#1}% - \typeout{Showing eprint field enabled: #1}} + \isoblx@info@noline{eprint field enabled: #1}} + +\DeclareBibliographyOption{articlepubinfo}[true]{% + \settoggle{bbx:articlepubinfo}{#1}% + \isoblx@info@noline{Article publication info enabled: #1}} +% Set default package options \ExecuteBibliographyOptions{% spacecolon=false, pagetotal=false, @@ -58,47 +80,67 @@ isbn=true, doi=true, eprint=true, - % sorting=nyt, - maxnames=9, - minnames=1, - citetracker=true, - autolang=other, - date=year, - urldate=iso, - seconds=true, + articlepubinfo=false, % Printing article publication info is unusual + maxnames=99,% If possible, all creators should be given in the reference + minnames=1,% If any names are omitted => first creator + and others (et al.) + citetracker=true,% Citation tracker in global mode + 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' + datecirca=true,% Use circa for approximate dates } +% Default definitions of beginning and closing macro +% in bibliography drivers \newbibmacro*{begentry}{} \newbibmacro*{finentry}{\finentry} -%commands +% COMMANDS -\newcommand\mainsstring[1]{\bibsstring[\mainlang]{#1}} -\newcommand\mainlstring[1]{\biblstring[\mainlang]{#1}} +% The separator between 'titles' and 'subtitles' +\renewcommand*{\subtitlepunct}{\addspacecolon\space} -\renewcommand*\subtitlepunct{\addspacecolon\addspace} -\renewcommand\multinamedelim{\addsemicolon\addspace} -\renewcommand\finalnamedelim{\multinamedelim} +% The separator between more standard identifiers, like ISBNs or ISSNs. +% Default separator is comma and space. You can use something like +% \renewcommand{\stdidentifierspunct}{\addsemicolon\space} +% in the preamble to change the separator +\newcommand{\stdidentifierspunct}{\addcomma\space} -\newcommand\addspacecolon{% +% The separator between date and dateaddon +\newcommand{\dateaddonpunct}{\addspace} + +% The separator between 'dates' and the numeration section +\newcommand{\numerationpunct}{\addcomma\space} + +% A colon preceded with or without space +\newcommand{\addspacecolon}{% \iftoggle{bbx:spcolon} - {\addnbspace\blx@addsppunct{colon}} - {\unspace\blx@addsppunct{colon}}% + {\addnbspace\addspcolon} + {\unspace\addspcolon}% } -% Thanks Moewew for sugesting this. Make uppercase names only in biblipgraphy. +% Context-sensitive delimiters + +% The delimiter between mutliple names +% A semicolon: legacy of older versions of standard / Czech interpretations +\DeclareDelimFormat{multinamedelim}{\addsemicolon\space} + +% The delimiter before the final name +% Use consistent name format for all creators +\DeclareDelimAlias{finalnamedelim}{multinamedelim} + +% Thanks Moewew for sugesting this. Make uppercase names only in bibliography. % Default name format is ALL-CAPS -% use something like -% \let\lastnameformat=\textsc +% use something like +% \let\familynameformat=\textsc % to change this - -\providecommand{\mkbibnamefamily}[1]{#1} -\newcommand\lastnameformat[1]{\MakeUppercase{#1}} +\newcommand{\familynameformat}[1]{\MakeUppercase{#1}} \AtBeginBibliography{% - \renewcommand\mkbibnamelast{\lastnameformat}% - \renewcommand\mkbibnamefamily{\lastnameformat}% + \renewcommand{\mkbibnamefamily}{\familynameformat}% } +% Default bibliography environment (layout) \defbibenvironment{bibliography} {\list% {}% @@ -106,94 +148,187 @@ \setlength{\itemindent}{-\leftmargin}% \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}}% - \renewcommand*{\makelabel}[1]{\hss##1} - %\raggedright} - }% + \renewcommand*{\makelabel}[1]{\hss##1}}% {\endlist}% {\item}% -% -%field formats +% FIELD FORMATS + +% Format title and subtitle as is \DeclareFieldFormat*{title}{#1} \DeclareFieldFormat*{subtitle}{#1} -\DeclareFieldFormat{volume}{\bibsstring{volume}\addnbspace#1}% volume of a book + +% Format volume field with localisation string +\DeclareFieldFormat{volume}{\bibstring{volume}\addnbspace#1}% volume of a book +% Differentiate volume in journal \DeclareFieldFormat[article,periodical]{volume}{% \iftoggle{bbx:shortnum} {\mkbibbold{#1}} - {\bibsstring{jourvol}\addnbspace#1}% volume of a journal + {\bibstring{jourvol}\addnbspace#1}% volume of a journal } + +% Edition field could be: +% a) numeral: use with localisation string +% b) literal: capitalize given string \DeclareFieldFormat*{edition}{% \ifnumeral{#1}% - {\mkbibordedition{#1}\addnbspace\bibsstring{edition}}% + {\mkbibordedition{#1}\addnbspace\bibstring{edition}}% {\MakeCapital{#1}}% }% + +% Format pagination for page range +% Always use main document language for this field \DeclareFieldFormat*{pages}{\mkmlpageprefix[bookpagination]{#1}} +% Differentiate page range in journal \DeclareFieldFormat[article,periodical]{pages}{% \iftoggle{bbx:shortnum} {#1} - {\mainsstring{pages}\addspace\printtext{#1}}% + {\mkmlpageprefix[bookpagination]{#1}}% } + +% Format pagination for total number of pages +% Always use main document language for this field \DeclareFieldFormat*{pagetotal}{\mkbibbrackets{\mkmlpagetotal[bookpagination]{#1}}} -\DeclareFieldFormat*{number}{\bibsstring{number}\addspace\printtext{#1}} + +% Format number field with localisation string +\DeclareFieldFormat*{number}{\bibstring{number}\addspace #1} +% Differentiate number in journal \DeclareFieldFormat[article,periodical]{number}{% \iftoggle{bbx:shortnum} {\mkbibparens{#1}} - {\bibsstring{number}\addspace\printtext{#1}}% + {\bibstring{number}\addspace #1}% } -\DeclareFieldFormat[patent]{number}{#1} +% Differentiate number for patent and report: format as is +\DeclareFieldFormat[patent,report]{number}{#1} + +% a) url AND no urldate: use localisation string 'available ALSO from', +% meaning: the work is not primarily published electronically +% b) url AND urldate: use localisation string 'available from' \DeclareFieldFormat*{url}{% \iffieldundef{urlyear} - {\mainlstring{urlalso}\addcolon\space\url{#1}} - {\mainlstring{urlfrom}\addcolon\space\url{#1}}% + {\mainlangbibstring{urlalso}} + {\mainlangbibstring{urlfrom}}% + \addcolon\space\url{#1}% } -\DeclareFieldFormat{doi}{% - \printtext{DOI}\addcolon\space - \ifhyperref - {\href{https://doi.org/#1}{\nolinkurl{#1}}} - {\nolinkurl{#1}}% -} -\DeclareFieldFormat{howpublished}{\mkbibbrackets{#1}} -\DeclareFieldFormat[online]{howpublished}{% - \iffieldundef{howpublished} - {\mkbibbrackets{online}} + +% Format medium type in square brackets +% If available, use the localisation string for the key +\DeclareFieldFormat{howpublished}{% + \ifbibstring{#1} + {\mainlangbibstring[\mkbibbrackets]{#1}} {\mkbibbrackets{#1}}% } +% Format type, e.g. type of thesis +% If available, use the localisation string for the key \DeclareFieldFormat{type}{% \ifbibstring{#1} - {\mainlstring{#1}} + {\mainlangbibstring{#1}} {#1}% } +% Format supervisor of thesis (precedes the name with a localisation string) \DeclareFieldFormat{supervisor}{% - \mainlstring{bysupervisor}\addspace#1} + \mainlangbibstring{bysupervisor}\addspace#1} + +% \mkbibacro typesets acronyms in small caps by default, +% if we want to override this, pass the value as is (uppercase) +% \renewcommand*{\mkbibacro}[1]{#1} +% Applies to DOI, ISBN, ISSN, ISAN, ISMN, ISRN, ISWC -%We must handle more than one isbn and issn +% If we really must handle more than one ISBN and ISSN. +% +% Typically there could be different ISBN / ISSN for printed and electronic +% media versions, but the standard says that the specific copy or instance of +% the document should be cited, so the author should choose the appropriate +% number in the bib file. Otherwise include comma-separated list of numbers in +% the bib field 'isbn' or 'issn'. + +% Separator value between more ISBNs / ISSNs is handled by '\stdidentifierspunct'. +% Default format is the name of identifier + space + number: +% e.g. 'ISBN 978-3-642-21665-7' \DeclareFieldFormat{isbn}{% - %\renewcommand*{\do}[1]{\printtext{ISBN}\addspace#1\adddot\addspace}% - \printtext{ISBN}\addspace#1}% + % Execute this rule for the first value of the csv field + \def\do##1{\mkbibacro{ISBN}\space##1% + % Execute this rule for the next value(s) of the csv field + \def\do####1{\stdidentifierspunct\mkbibacro{ISBN}\space####1}}% + % Process the csv field with \do command + \docsvfield{isbn}% +} +% The same formatting rules as for ISBN above \DeclareFieldFormat{issn}{% - \renewcommand*{\do}[1]{\printtext{ISSN}\addspace#1\adddot\addspace}% - \docsvfield{issn}}% + \def\do##1{\mkbibacro{ISSN}\space##1% + \def\do####1{\stdidentifierspunct\mkbibacro{ISSN}\space####1}}% + \docsvfield{issn}% +} + +% Format other standard identifiers +% Default format is the name of identifier + space + number +\DeclareFieldFormat{isan}{\mkbibacro{ISAN}\addspace#1} +\DeclareFieldFormat{ismn}{\mkbibacro{ISMN}\addspace#1} +\DeclareFieldFormat{isrn}{\mkbibacro{ISRN}\addspace#1} +\DeclareFieldFormat{iswc}{\mkbibacro{ISWC}\addspace#1} -\DeclareFieldFormat{isan}{\printtext{ISAN}\addspace#1} -\DeclareFieldFormat{ismn}{\printtext{ISMN}\addspace#1} -\DeclareFieldFormat{isrn}{\printtext{ISRN}\addspace#1} -\DeclareFieldFormat{iswc}{\printtext{ISWC}\addspace#1} +% Format url seen date with preceding localisation string in square brackets +\DeclareFieldFormat{urldate}{\mkbibbrackets{\mainlangbibstring{urlseen}\space#1}} -\DeclareFieldFormat{urldate}{\mkbibbrackets{\mainsstring{urlseen}\space#1}} +% Format additional date information as is (use bib file for modifications). +\DeclareFieldFormat{dateaddon}{#1} +% Format circa date with preceding localisation string in square brackets; +% default \datecircaprint is \bibstring{circa}\printdelim{datecircadelim}, +% e.g. [ca. 1940]. +\DeclareFieldFormat{date}{% + \ifdatecirca + {\mkbibbrackets{#1}}% + {#1}% +} + +% Format 'labeldate' the same as 'date' field. +% We use 'labeldate' in 'iso-authoryear' style. +% Format circa date and nodate. Dateaddon and date as is. +\DeclareFieldFormat{labeldate}{% + \ifdatecirca + {\mkbibbrackets{#1}}% + {% Check if there is 'nodate' from 'labeldate' + \iffieldequalstr{labeldatesource}{nodate} + % This is a \literal{nodate}, meaning that it uses the 'nodate' + % localisation string due to default \DeclareLabeldate setting + {\mkbibbrackets{#1}}% + {#1}}% This is the go-to format +} + +% 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{date} + \field{year} + \field{dateaddon}% <---- biblatex-iso690 data model extension + \field{eventdate} + \field{origdate} + \literal{nodate} +} + +% Format chapter of book with preceding localisation string \DeclareFieldFormat{chapter}{\bibstring{chapter}\addnbspace#1\isdot} + +% Version field could be: +% a) numeral: use with localisation string +% b) literal: capitalize given string \DeclareFieldFormat{version}{% \ifnumeral{#1}% - {\biblstring{version}\addnbspace#1}% + {\bibstring{version}\addnbspace#1}% {\MakeCapital{#1}}% } +% Format library field as is (location information) \DeclareFieldFormat{library}{#1} +% Format (sub)titles as they are \DeclareFieldFormat{journaltitle}{#1} \DeclareFieldFormat{booktitle}{#1} \DeclareFieldFormat{maintitle}{#1} @@ -203,55 +338,72 @@ \DeclareFieldFormat{mainsubtitle}{#1} \DeclareFieldFormat{issuesubtitle}{#1} +% Format other / alternative titles in square brackets \DeclareFieldFormat{titleaddon}{\mkbibbrackets{#1}} -\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{#1}} -\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{#1}} +\DeclareFieldAlias{booktitleaddon}{titleaddon} +\DeclareFieldAlias{maintitleaddon}{titleaddon} +% Format additional name information in square brackets \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1}} -%name alias +% NAME ALIAS -\DeclareNameAlias{default}{last-first} -\DeclareNameAlias{supervisor}{first-last} +% Default name list format is last (family) followed by given (first) name +\DeclareNameAlias{default}{family-given} +% For supervisor, use the reversed order format: +% given (first) name followed by last (family) name, +% so it may sound more naturally in this order +\DeclareNameAlias{supervisor}{given-family} -%bibliography macros +% BIBLIOGRAPHY MACROS -%names +% NAMES MACROS -% based on author/editor macro +% Based on author/editor macro +% Adds nameaddon field to author names \newbibmacro*{names:primary}{% \ifboolexpr{ test \ifuseauthor and not test {\ifnameundef{author}} } - {\usebibmacro{author}} + {\usebibmacro{author}% + \setunit{\addspace}% + \printfield{nameaddon}}% {\usebibmacro{editor}}% - \setunit{\addspace}\printfield{nameaddon}% } +% Macro for secondary authors with their role \newbibmacro*{names:subsidiary}{% \usebibmacro{byeditor}% \newunit \usebibmacro{bytranslator}% } +% Don't owerwrite default macros to change only delimiters / punctuation, +% declare their format instead. % https://github.com/michal-h21/biblatex-iso690/issues/68#issuecomment-435650072 -\DeclareFieldFormat{editortype}{\mkbibparens{#1}} +\DeclareFieldFormat{editortype}{\mkbibparens{#1}} \DeclareDelimFormat{editortypedelim}{\addspace} +\DeclareFieldFormat{authortype}{\mkbibparens{#1}} +\DeclareDelimFormat{authortypedelim}{\addspace} - +% Macro for printing supervisor field \newbibmacro*{thesissupervisor}{% \ifnameundef{supervisor} {} - {\printtext{\mainlstring{bysupervisor}}% - \addspace% + {\mainlangbibstring{bysupervisor}% + \setunit{\addspace}% \printnames{supervisor}}% } -%titles +% TITLES MACROS +% Macro for formatting <prefix>titles +% 1st argument: prefix / type of title (e.g. main, book, event), +% if empty, 'title' field is handled +% 2nd argument: formatting directive (e.g. emph) \newbibmacro{titles}[2]{% \ifboolexpr{ test {\iffieldundef{#1title}} @@ -262,19 +414,21 @@ \printfield{#1title}% \setunit{\subtitlepunct}% \printfield{#1subtitle}}% - \setunit{\addspace}}% + \setunit{\addspace}}% \printfield{#1titleaddon}% \newunit }% +% Macro for printing volumes (part of volumes) \newbibmacro{volume}{% \iffieldundef{volume} {} {\printfield{volume}% \printfield{part}% - \setunit{\addcomma\addspace}}% + \setunit{\addcomma\space}}% } +% Macro for formatting multiple titles \newbibmacro{multi:titles}{% \iffieldundef{maintitle} {\iffieldundef{booktitle} @@ -287,6 +441,8 @@ \usebibmacro{titles}{}{}}% } +% Macro for formatting multiple hierarchical titles +% (e.g. for inbook, incollection) \newbibmacro{host:titles}{% \iffieldundef{maintitle} {\iffieldundef{booktitle} @@ -295,6 +451,7 @@ {\usebibmacro{titles}{main}{emph}}% }% +% Macro for formatting multiple titles in periodicals \newbibmacro{periodical:titles}{% \usebibmacro{titles}{}{emph}% \newunit @@ -305,64 +462,117 @@ {\usebibmacro{titles}{issue}{}}% } -%medium type +% MEDIUM TYPE MACROS \newbibmacro*{medium-type}{% \iffieldundef{howpublished} - {\iffieldundef{urlyear} - {} - {\printtext{\mkbibbrackets{online}}}} - {\printfield{howpublished}}% + {% Automatic printing of '[online]' type of medium when + % a) 'urldate' is present AND + % b) url is enabled (pkg option url=true) OR + % entry type is '@online' + \ifboolexpr{ + not test {\iffieldundef{urlyear}} + and ( test {\iftoggle{bbx:url}} + or test {\ifentrytype{online}}) + } + % Use a localisation string 'online' in the main document language + {\mainlangbibstring[\mkbibbrackets]{online}}% + {}}% Don't print anything + {% The only situation when we don't want to print + % 'howpublished' field is when + % a) url is disabled (pkg option url=false) AND + % b) entry type is other than '@online' AND + % c) 'howpublished' field is 'online'. + % Please note that this field is not checked against + % any possible literal value (e.g. electronic, online article) + % that should be probably also hidden when a) AND b) hold. + \ifboolexpr{ + test {\iffieldequalstr{howpublished}{online}} + and not test {\iftoggle{bbx:url}} + and not test {\ifentrytype{online}} + } + {}% Don't print 'howpublished' field + {\printfield{howpublished}}}% } -%publication info +% PUBLICATION INFO MACROS + +% By default only year is used, but for some entries, +% we need full date (day or even time precision), +% (e.g. patents, TV shows, newspapers, online news) -\newbibmacro{fulldate}{% - \printtext{\csname mkbibrangeiso8601\endcsname{\thefield{date}}}% +% Macro for printing full date (full = YYYY-MM-DD) +\newbibmacro*{fulldate}{% + \mkdaterangeiso{}% } +% a) +% If there is no date field in the bib entry, +% we should state there is no date by printing +% a localisation string, e.g. [n.d.]. +% b) +% Order: <date> <dateaddon> \renewbibmacro*{date}{% - \iffieldequalstr{endyear}{}% - {\printdate\mbox{\addnbspace}}% - {\printdate}% + \iffieldundef{year} + {\iffieldundef{dateaddon} + {\bibstring[\mkbibbrackets]{nodate}}% + {\printfield{dateaddon}}}% + {\printdate% + \setunit{\dateaddonpunct}% + \printfield{dateaddon}}% } -\newbibmacro*{location+publisher+date}{% +% Based on publisher+location+date macro (defined in standard.bbx) +% Differs only in punctuation +% +% Wrapper for printing normal or full date. 1st argument: +% * empty: \usebibmacro{date} +% * 'full': \usebibmacro{fulldate} +\newbibmacro*{location+publisher+dateform}[1]{% \printlist{location}% \iflistundef{publisher} - {\setunit*{\addcomma\space}}% - {\setunit*{\subtitlepunct}}% + {\setunit*{\addcomma\space}} + {\setunit*{\subtitlepunct}}% <---- different punctuation \printlist{publisher}% \setunit*{\addcomma\space}% - \usebibmacro{date}% + \usebibmacro{#1date}% \newunit} -%numeration +\newbibmacro*{location+publisher+date}{% + \usebibmacro{location+publisher+dateform}{}} + +\newbibmacro*{location+publisher+fulldate}{% + \usebibmacro{location+publisher+dateform}{full}} + +% NUMERATION MACROS \newbibmacro*{serial:numeration}{% \printfield{volume}% \iftoggle{bbx:shortnum} {} - {\setunit*{\addcomma\addspace}}% + {\setunit*{\addcomma\space}}% \printfield{number}% } \newbibmacro*{book:numeration}{% \printfield{volume}% - \setunit*{\addcomma\addspace}% + \setunit*{\addcomma\space}% \printfield{chapter}% } -%series title and number +% SERIES TITLE AND NUMBER MACROS +% Based on series+number macro (defined in standard.bbx) +% Differs only in punctuation \newbibmacro*{series+number}{% \printfield{series}% \setunit*{\addcomma\space}% \printfield{number}% }% -%standard identifiers +% STANDARD IDENTIFIERS MACROS +% Bunch of standard identifiers \newbibmacro*{identifier}{% \iftoggle{bbx:isbn} {\printfield{isan}% @@ -380,32 +590,63 @@ {}% } -%availability and access +% AVAILABILITY AND ACCESS MACROS +% Precedes DOI field with urlfrom localisation string \newbibmacro*{from-doi}{% - \mainlstring{urlfrom}\addspace\printfield{doi}% + \mainlangbibstring{urlfrom}% + \setunit{\addspace}% + \printfield{doi}% } +% Precedes eprint field with urlfrom localisation string +% Use default eprint formatting macro \newbibmacro*{from-eprint}{% - \mainlstring{urlfrom}\addspace\usebibmacro{eprint}% + \mainlangbibstring{urlfrom} + \setunit{\addspace}% + \usebibmacro{eprint}% } +% Macro for availability and access information +% with order of importance: doi, eprint, url \newbibmacro*{availability+access}{% - \iffieldundef{doi} - {\iffieldundef{eprint} - {\iftoggle{bbx:url} - {\printfield{url}} - {}} - {\iftoggle{bbx:eprint} - {\usebibmacro{from-eprint}} - {}}} - {\iftoggle{bbx:doi} - {\usebibmacro{from-doi}} - {}}% + \ifboolexpr{ + test {\iftoggle{bbx:doi}} + and not test {\iffieldundef{doi}} + } + {\usebibmacro{from-doi}}% + {% + \ifboolexpr{ + test {\iftoggle{bbx:eprint}} + and not test {\iffieldundef{eprint}} + } + {\usebibmacro{from-eprint}}% + {\usebibmacro{url}}}% +} + +% The url field of @online entries is always printed +\renewbibmacro*{url}{% + \ifboolexpr{ + test {\iftoggle{bbx:url}} + or test {\ifentrytype{online}} + } + {\printfield{url}}% + {}% } -%location +% The url seen date of @online entries is always printed +\renewbibmacro*{urldate}{% + \ifboolexpr{ + test {\iftoggle{bbx:url}} + or test {\ifentrytype{online}} + } + {\printurldate}% + {}% +} + +% LOCATION MACROS +% Additional location information (e.g. library, repository) \newbibmacro*{location}{% \iffieldundef{library} {} @@ -413,37 +654,79 @@ \printfield{library}}% } -%other +% OTHER MACROS -% redeclare in: bibmacro to use the main document language. -% there was discussion whether literal "In:" should be used, +% Redeclare in: bibmacro to use the main document language. +% There was discussion whether literal "In:" should be used, % but that would look weird in non-latin languages. -% context: https://github.com/michal-h21/biblatex-iso690/pull/33 +% Context: https://github.com/michal-h21/biblatex-iso690/pull/33 +% Force to use the main document language for 'in' localisation string \renewbibmacro*{in:}{% - \printtext{\mainsstring{in}\intitlepunct}% + \mainlangbibstring{in}% + \printunit{\intitlepunct}% } +% Based on 'in:' macro for 'at' localisation string \newbibmacro*{at:}{% - \printtext{\mainsstring{at}\intitlepunct}% + \mainlangbibstring{at}% + \printunit{\intitlepunct}% } -%biblatex core +% BIBLATEX CORE ADJUSTMENTS + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Localisation strings in the main document language +% +% \mainlangbibstring in place of \bibstring +% \mainlangbiblstring in place of \biblstring +% \mainlangbibsstring in place of \bibsstring + +% [<wrapper>]{<string>} +\newrobustcmd*{\blx@imc@mainlangbibstring}[2][\@firstofone]{% + \blx@mainlangbibstring{#1}{\abx@str}{#2}} + +\newrobustcmd*{\blx@imc@mainlangbiblstring}[2][\@firstofone]{% + \blx@mainlangbibstring{#1}{abx@lstr}{#2}} + +\newrobustcmd*{\blx@imc@mainlangbibsstring}[2][\@firstofone]{% + \blx@mainlangbibstring{#1}{abx@sstr}{#2}} + +\protected\def\blx@mainlangbibstring#1#2#3{% + {\mainlang% <---- use main document language + \blx@begunit + \blx@hyphenreset + \blx@bibstringsimple + \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}}} + +\blx@regimcs{% + \mainlangbibstring \mainlangbiblstring \mainlangbibsstring +} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% overriding bookpagination to use document main language +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Overriding bookpagination to use document main language +% +% Use new name 'mkpagetotal' over 'mkmlpagetotal' +% Use 'mainlangbibsstring' over 'bibstring' \newrobustcmd*{\blx@imc@mkmlpagetotal}[1][bookpagination]{% \begingroup - \def\blx@tempa{\blx@mkmlpagetotal{page}}% + \def\blx@tempa{\blx@mkmlpagetotal{pagetotal}}% \iffieldundef{#1} {} {\iffieldequalstr{#1}{none} {\def\blx@tempa{\blx@mkmlpagetotal@i}} - {\iffieldbibstring{#1} - {\edef\blx@tempa{\blx@mkmlpagetotal{\thefield{#1}}}} + {\iffieldplusstringbibstring{#1}{total} + {\edef\blx@tempa{\blx@mkmlpagetotal{\thefield{#1}total}}} {\blx@warning@entry{% - Unknown pagination type '\strfield{#1}'}}}}% + Unknown pagination type '\strfield{#1}total'}}}}% \@ifnextchar[%] {\blx@tempa} {\blx@tempa[\@firstofone]}} @@ -457,10 +740,10 @@ \else \aftergroup\@secondoftwo \fi}% - {#2{#3}\ppspace\mainsstring{#1}} - {#2{#3}\ppspace\mainsstring{#1s}}} - {\def\pno{\mainsstring{#1}}% - \def\ppno{\mainsstring{#1s}}% + {#2{#3}\ppspace\mainlangbibsstring{#1}} + {#2{#3}\ppspace\mainlangbibsstring{#1s}}} + {\def\pno{\mainlangbibsstring{#1}}% + \def\ppno{\mainlangbibsstring{#1s}}% #2{#3}}% \endgroup} @@ -468,8 +751,11 @@ \blx@regimcs{\mkmlpagetotal} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% overriding pagination to use document main language +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Overriding pagination to use document main language +% +% Use new name 'mkmlpageprefix' over 'mkpageprefix' +% Use 'mainlangbibsstring' over 'bibstring' \newrobustcmd*{\blx@imc@mkmlpageprefix}[1][pagination]{% \begingroup @@ -488,23 +774,28 @@ \protected\long\def\blx@mkmlpageprefix#1[#2]#3{% \ifnumeral{#3} - {\mainsstring{#1}\ppspace} + {\mainlangbibsstring{#1}\ppspace} {\ifnumerals{#3} - {\mainsstring{#1s}\ppspace} - {\def\pno{\mainsstring{#1}}% - \def\ppno{\mainsstring{#1s}}}}% + {\mainlangbibsstring{#1s}\ppspace} + {\def\pno{\mainlangbibsstring{#1}}% + \def\ppno{\mainlangbibsstring{#1s}}}}% \blx@mkmlpageprefix@i[#2]{#3}} \long\def\blx@mkmlpageprefix@i[#1]#2{#1{#2}\endgroup} \blx@regimcs{\mkmlpageprefix} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% use space punctuation +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Use space punctuation, package option 'spacecolon', +% toggle 'bbx:spcolon', command '\addspcolon' / '\addspacecolon' -% see biblatex2.sty for these macros -\blx@regimcs{% let biblatex know the new macros - \addspcolon }% +% See 'biblatex.sty' for these macros +% +% Let biblatex know the new macro +\blx@regimcs{\addspcolon} +% Define the new macro +\protected\def\blx@imc@addspcolon{\blx@addsppunct{colon}} +% Implement the new macro \def\blx@addsppunct#1{% <---- new name for spaced punctuation %\unspace <----- commented out \ifnum\blx@spacefactor<\blx@sf@threshold@low @@ -520,13 +811,247 @@ \fi% \csuse{blx@pq@#1}}% -%bibliography drivers +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Adds non-breaking space after open date range, e.g. '1492-- ' +% + +\newcommand*{\mkopenendeddaterange}{\mbox{\bibdaterangesep\addnbspace}} + +% Used by '\printdate' +% +% {<short|long>}{<datetype>} +\renewrobustcmd*{\mkdaterangefull}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {\blx@nounit} + {\printtext[{#2date}]{% + \datecircaprint + % 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{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + % Optionally print the time after the date + \blx@printtime{#2}{}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateuncertainprint + \dateeraprint{#2year}% + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mkopenendeddaterange}% <---- added \addnbspace + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2endseason} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + % Optionally print the time after the date + \blx@printtime{#2}{end}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +% Used by '\printlabeldateextra' in 'iso-authoryear.bbx' +% +% {<short|long>}{<datetype>} +\renewrobustcmd*{\mkdaterangefullextra}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {\blx@nounit} + {\printtext[{#2date}]{% + \datecircaprint + % 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{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + % Optionally print the time after the date + \blx@printtime{#2}{}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateuncertainprint + \dateeraprint{#2year}% + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \printtext{\mkopenendeddaterange}}% <---- added \addnbspace + {\printtext{% + \bibdaterangesep + \enddatecircaprint + \iffieldundef{#2endseason} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + % Optionally print the time after the date + \blx@printtime{#2}{end}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +% Other date formats for completeness + +% Avoids error with older biblatex version +% WARNING: of course this means that in older versions the +% date printing macro will not be changed as expected +% this is not an issue for biblatex-iso690 since it only uses +% \mkdaterangefull and \mkdaterangefullextra anyway +\providecommand*{\mkdaterangetrunc@i}{} + +\renewrobustcmd*{\mkdaterangetrunc@i}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {\blx@nounit} + {\printtext[{#2date}]{% + \datecircaprint + % 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{#2season} + {\ifdateyearsequal{#2}{#2end} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\ifdateyearsequal{#2}{#2end} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mkopenendeddaterange} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2endseason} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +% Avoids error with older biblatex version +% WARNING: of course this means that in older versions the +% date printing macro will not be changed as expected +% this is not an issue for biblatex-iso690 since it only uses +% \mkdaterangefull and \mkdaterangefullextra anyway +\providecommand*{\mkdaterangetruncextra@i}{} + +\renewrobustcmd*{\mkdaterangetruncextra@i}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {\blx@nounit} + {\printtext[{#2date}]{% + \datecircaprint + % 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{#2season} + {\ifdateyearsequal{#2}{#2end} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\ifdateyearsequal{#2}{#2end} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \printtext{\mkopenendeddaterange}} + {\printtext{% + \bibdaterangesep + \enddatecircaprint + \iffieldundef{#2endseason} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + + +% {<datetype>} +\renewrobustcmd*{\mkdaterangeymd}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year} + {\blx@nounit} + {\printtext[{#1date}]{% + \datecircaprint + % 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}{}% + % Optionally print the time after the date + \blx@printtime{#1}{}} + {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + \dateuncertainprint + \dateeraprint{#1year}% + \iffieldundef{#1endyear} + {} + {\iffieldequalstr{#1endyear}{} + {\mkopenendeddaterange} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#1season} + {\blx@ymddate{#1}{end}% + % Optionally print the time after the date + \blx@printtime{#1}{end}} + {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}% + \enddateuncertainprint + \dateeraprint{#1endyear}}}}}% + \endgroup} + +% {<datetype>} +\renewrobustcmd*{\mkdaterangeymdextra}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year} + {\blx@nounit} + {\printtext[{#1date}]{% + \datecircaprint + % 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[extradate]{#1}{}% + % Optionally print the time after the date + \blx@printtime{#1}{}} + {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + \dateuncertainprint + \dateeraprint{#1year}% + \iffieldundef{#1endyear} + {} + {\iffieldequalstr{#1endyear}{} + {\mkopenendeddaterange} + {\printtext{% + \bibdaterangesep + \enddatecircaprint + \iffieldundef{#1season} + {\blx@ymddate{#1}{end}% + % Optionally print the time after the date + \blx@printtime{#1}{end}} + {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}% + \enddateuncertainprint + \dateeraprint{#1endyear}}}}}% + \endgroup} + +% BIBLIOGRAPHY DRIVERS \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{names:primary}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{multi:titles}% \setunit{\addspace}% \usebibmacro{medium-type}% @@ -562,9 +1087,9 @@ \DeclareBibliographyDriver{periodical}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - % names macro just because of author-year style + % Names macro just because of author-year style \usebibmacro{names:primary}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{periodical:titles}% \setunit{\addspace}% \usebibmacro{medium-type}% @@ -572,7 +1097,7 @@ \printfield{edition}% \newunit\newblock \usebibmacro{location+publisher+date}% - \setunit*{\addcomma\addspace}% + \setunit{\numerationpunct}% \usebibmacro{serial:numeration}% \setunit{\addspace}% \usebibmacro{urldate}% @@ -593,7 +1118,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{names:primary}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{titles}{}{}% \newunit\newblock \usebibmacro{titles}{journal}{emph}% @@ -602,8 +1127,10 @@ \newunit\newblock \printfield{edition}% \newunit\newblock - \usebibmacro{date} - \setunit*{\addcomma\addspace}% + \iftoggle{bbx:articlepubinfo} + {\usebibmacro{location+publisher+date}} + {\usebibmacro{date}}% + \setunit{\numerationpunct}% \usebibmacro{serial:numeration}% \setunit{\bibpagespunct}% \printfield{pages}% @@ -625,7 +1152,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{names:primary}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{titles}{}{}% \newunit\newblock \usebibmacro{in:}% @@ -640,7 +1167,7 @@ \usebibmacro{names:subsidiary}% \newunit\newblock \usebibmacro{location+publisher+date}% - \setunit*{\addcomma\addspace}% + \setunit{\addcomma\space}% \usebibmacro{book:numeration}% \setunit{\bibpagespunct}% \printfield{pages}% @@ -667,7 +1194,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{names:primary}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{titles}{}{}% \newunit\newblock \usebibmacro{in:}% @@ -682,9 +1209,9 @@ \usebibmacro{names:subsidiary}% \newunit\newblock \usebibmacro{location+publisher+date}% - % could number be even used in `incollection`? + % could number be even used in `incollection`? % It should be at some other place in this case - \setunit*{\addcomma\addspace}% + \setunit{\numerationpunct}% \usebibmacro{book:numeration}% \setunit{\bibpagespunct}% \printfield{pages}% @@ -711,7 +1238,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{names:primary}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{multi:titles}% \setunit{\addspace}% \usebibmacro{medium-type}% @@ -720,7 +1247,7 @@ \newunit\newblock \usebibmacro{names:subsidiary}% \newunit\newblock - \usebibmacro{location+publisher+date}% + \usebibmacro{location+publisher+fulldate}% \newunit \printfield{version}% \setunit{\addspace}% @@ -735,6 +1262,7 @@ \iftoggle{bbx:totalpages} {\printfield{pagetotal}} {}% + \newunit\newblock \printfield{note}% \newunit\newblock \setunit{\bibpagerefpunct}\newblock @@ -745,7 +1273,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{names:primary}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{titles}{}{emph}% \setunit{\addspace}% \usebibmacro{medium-type}% @@ -760,7 +1288,7 @@ \newunit\newblock \iftoggle{bbx:thesisinfoinnotes} {} - {\printfield{type} + {\printfield{type}% \newunit\newblock \printlist{institution}% \newunit\newblock @@ -786,17 +1314,52 @@ \usebibmacro{pageref}% \usebibmacro{finentry}}% +\DeclareBibliographyDriver{report}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{names:primary}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{titles}{}{emph}% + \setunit{\addspace}% + \usebibmacro{medium-type}% + \newunit\newblock + \usebibmacro{location+publisher+fulldate}% + \newunit + \printfield{version}% + \setunit{\addspace}% + \usebibmacro{urldate}% + \newunit\newblock + \iffieldundef{type} + {} + {\printfield{type}% + \setunit*{\addcomma\space}}% + \printfield{number}% + \newunit\newblock + \printlist{institution}% + \newunit\newblock + \usebibmacro{identifier}% + \newunit\newblock + \usebibmacro{availability+access}% + \setunit{\addspace}% + \iftoggle{bbx:totalpages} + {\printfield{pagetotal}} + {}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + \DeclareBibliographyDriver{patent}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{names:primary}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{titles}{}{emph}% \newunit\newblock \usebibmacro{names:subsidiary}% \newunit\newblock - \printfield{classification}% - \newunit\newblock \printlist{location}% \newunit\newblock \iffieldundef{type} @@ -809,15 +1372,15 @@ \setunit{\addspace}% \usebibmacro{urldate}% \newunit\newblock - \printfield{note}% - \newunit\newblock \usebibmacro{availability+access}% \newunit\newblock + \printfield{note}% + \newunit\newblock \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}% -%bibliography aliases +% BIBLIOGRAPHY ALIASES \DeclareBibliographyAlias{bookinbook}{inbook} \DeclareBibliographyAlias{suppbook}{inbook} @@ -831,8 +1394,9 @@ \DeclareBibliographyAlias{inproceedings}{incollection} \DeclareBibliographyAlias{reference}{collection} \DeclareBibliographyAlias{inreference}{incollection} -\DeclareBibliographyAlias{report}{thesis} \DeclareBibliographyAlias{unpublished}{book} +\DeclareBibliographyAlias{movie}{book} +\DeclareBibliographyAlias{music}{book} \DeclareBibliographyAlias{*}{misc} \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 9384b047aeb..b3b7f148daf 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} -[2016/05/13 v0.3.1 biblatex localization] + [2020/03/25 v0.4.0 ISO 690 extended biblatex localization] \InheritBibliographyExtras{polish} \InheritBibliographyStrings{polish} @@ -13,6 +13,18 @@ {dostępne z}}, urlalso = {{dostępne także z}% {dostępne także z}}, +% director = {{}% +% {}},% FIXME: missing +% bydirector = {{}% +% {}},% FIXME: missing +% inventor = {{}% +% {}},% FIXME: missing +% byinventor = {{}% +% {}},% FIXME: missing +% online = {{}% +% {}},% FIXME: missing +% film = {{}% +% {}},% 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 313a4245b6e..8bd4e4b096c 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} -[2017/04/25 v0.3.2 biblatex localization] + [2020/03/25 v0.4.0 ISO 690 extended biblatex localization] \InheritBibliographyExtras{slovak} \InheritBibliographyStrings{slovak} @@ -9,8 +9,20 @@ {v}}, bysupervisor = {{ved\'{u}ci pr\'{a}ce}% {ved\'{u}ci pr\'{a}ce}}, - urlalso = {{dostupn\'{e} tie\v{z} z}% - {dostupn\'{e} tie\v{z} z}}, + urlalso = {{dostupn\'{e} tie\v{z} z}% + {dostupn\'{e} tie\v{z} z}}, + director = {{re\v{z}is\'{e}r}% + {re\v{z}is\'{e}r}}, + bydirector = {{r\'{e}\v{z}ia}% + {r\'{e}\v{z}ia}}, + inventor = {{vyn\'{a}lezca}% + {vyn\'{a}lezca}}, + byinventor = {{vyn\'{a}lezca\addcolon}% + {vyn\'{a}lezca\addcolon}},% FIXME: unsure + online = {{online}% + {online}}, + film = {{film}% + {film}}, } \endinput |