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