diff options
Diffstat (limited to 'Master/texmf-dist')
22 files changed, 1448 insertions, 926 deletions
diff --git a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib index e2fb9051305..ca78376c7cc 100644 --- a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib +++ b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib @@ -1,20 +1,21 @@ -@string{ anch-ie = {Angew.~Chem. Int.~Ed.} } -@string{ cup = {Cambridge University Press} } -@string{ dtv = {Deutscher Taschenbuch-Verlag} } -@string{ hup = {Harvard University Press} } -@string{ jams = {J.~Amer. Math. Soc.} } -@string{ jchph = {J.~Chem. Phys.} } -@string{ jomch = {J.~Organomet. Chem.} } -@string{ pup = {Princeton University Press} } - -@InCollection{westfahl:space, +@string{anch-ie = {Angew.~Chem. Int.~Ed.}} +@string{cup = {Cambridge University Press}} +@string{dtv = {Deutscher Taschenbuch-Verlag}} +@string{hup = {Harvard University Press}} +@string{jams = {J.~Amer. Math. Soc.}} +@string{jchph = {J.~Chem. Phys.}} +@string{jomch = {J.~Organomet. Chem.}} +@string{pup = {Princeton University Press}} + +@incollection{westfahl:space, author = {Westfahl, Gary}, title = {The True Frontier}, subtitle = {Confronting and Avoiding the Realities of Space in American Science Fiction Films}, pages = {55-65}, crossref = {westfahl:frontier}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {True Frontier, The}, annotation = {A cross-referenced article from a \texttt{collection}. This is an \texttt{incollection} entry with a \texttt{crossref} @@ -24,16 +25,22 @@ @set{set, entryset = {herrmann,aksin,yoon}, - annotation = {A \texttt{set} with three members}, + annotation = {A \texttt{set} with three members. The \texttt{crossref} field + in the \texttt{@set} entry and the \texttt{entryset} field in + each set member entry is needed only when using BibTeX as the + backend}, } @set{stdmodel, entryset = {glashow,weinberg,salam}, annotation = {A \texttt{set} with three members discussing the standard - model of particle physics}, + model of particle physics. The \texttt{crossref} field + in the \texttt{@set} entry and the \texttt{entryset} field in + each set member entry is needed only when using BibTeX as the + backend}, } -@Article{aksin, +@article{aksin, author = {Aks{\i}n, {\"O}zge and T{\"u}rkmen, Hayati and Artok, Levent and {\k{C}}etinkaya, Bekir and Ni, Chaoying and B{\"u}y{\"u}kg{\"u}ng{\"o}r, Orhan and {\"O}zkal, Erhan}, @@ -48,15 +55,15 @@ indextitle = {Effect of immobilization on catalytic characteristics}, } -@Article{angenendt, +@article{angenendt, author = {Angenendt, Arnold}, - title = {In Honore Salvatoris~-- Vom Sinn und Unsinn der - Patrozinienkunde}, + title = {In Honore Salvatoris~-- "<Vom Sinn und Unsinn der + Patrozinienkunde">}, journaltitle = {Revue d'Histoire Eccl{\'e}siastique}, date = 2002, volume = 97, pages = {431--456, 791--823}, - hyphenation = {german}, + langid = {german}, indextitle = {In Honore Salvatoris}, shorttitle = {In Honore Salvatoris}, annotation = {A German article in a French journal. Apart from that, a @@ -64,7 +71,7 @@ field}, } -@Article{baez/article, +@article{baez/article, author = {Baez, John C. and Lauda, Aaron D.}, title = {Higher-Dimensional Algebra V: 2-Groups}, journaltitle = {Theory and Applications of Categories}, @@ -74,7 +81,8 @@ version = 3, eprint = {math/0307200v3}, eprinttype = {arxiv}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {An \texttt{article} with \texttt{eprint} and \texttt{eprinttype} fields. Note that the arXiv reference is transformed into a clickable link if \texttt{hyperref} support @@ -82,7 +90,7 @@ is the same item given as an \texttt{online} entry}, } -@Article{bertram, +@article{bertram, author = {Bertram, Aaron and Wentworth, Richard}, title = {Gromov invariants for holomorphic maps on Riemann surfaces}, journaltitle = jams, @@ -90,20 +98,22 @@ volume = 9, number = 2, pages = {529-571}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, shorttitle = {Gromov invariants}, annotation = {An \texttt{article} entry with a \texttt{volume} and a \texttt{number} field}, } -@Article{doody, +@article{doody, author = {Doody, Terrence}, title = {Hemingway's Style and Jake's Narration}, year = 1974, volume = 4, number = 3, pages = {212-225}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, related = {matuz:doody}, relatedstring= {\autocap{e}xcerpt in}, journal = {The Journal of Narrative Technique}, @@ -112,7 +122,7 @@ \texttt{related} and \texttt{relatedstring} fields}, } -@Collection{matuz:doody, +@collection{matuz:doody, editor = {Matuz, Roger}, title = {Contemporary Literary Criticism}, year = 1990, @@ -120,13 +130,14 @@ publisher = {Gale}, location = {Detroit}, pages = {204-208}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {A \texttt{collection} entry providing the excerpt information for the \texttt{doody} entry. Note the format of the \texttt{pages} field}, } -@Article{gillies, +@article{gillies, author = {Gillies, Alexander}, title = {Herder and the Preparation of Goethe's Idea of World Literature}, @@ -135,13 +146,14 @@ series = {newseries}, volume = 9, pages = {46-67}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {An \texttt{article} entry with a \texttt{series} and a \texttt{volume} field. Note that format of the \texttt{series} field in the database file}, } -@Article{glashow, +@article{glashow, author = {Glashow, Sheldon}, title = {Partial Symmetries of Weak Interactions}, journaltitle = {Nucl.~Phys.}, @@ -150,7 +162,7 @@ pages = {579-588}, } -@Article{herrmann, +@article{herrmann, author = {Herrmann, Wolfgang A. and {\"O}fele, Karl and Schneider, Sabine K. and Herdtweck, Eberhardt and Hoffmann, Stephan D.}, title = {A carbocyclic carbene as an efficient catalyst ligand for C--C @@ -163,7 +175,7 @@ indextitle = {Carbocyclic carbene as an efficient catalyst, A}, } -@Article{kastenholz, +@article{kastenholz, author = {Kastenholz, M. A. and H{\"u}nenberger, Philippe H.}, title = {Computation of methodology\hyphen independent ionic solvation free energies from molecular simulations}, @@ -173,7 +185,8 @@ volume = 124, eid = 124106, doi = {10.1063/1.2172593}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Computation of ionic solvation free energies}, annotation = {An \texttt{article} entry with an \texttt{eid} and a \texttt{doi} field. Note that the \textsc{doi} is transformed @@ -203,7 +216,7 @@ cavities within them).}, } -@Article{murray, +@article{murray, author = {Hostetler, Michael J. and Wingate, Julia E. and Zhong, Chuan-Jian and Harris, Jay E. and Vachet, Richard W. and Clark, Michael R. and Londono, J. David and Green, Stephen @@ -218,7 +231,8 @@ volume = 14, number = 1, pages = {17-30}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Alkanethiolate gold cluster molecules}, shorttitle = {Alkanethiolate gold cluster molecules}, annotation = {An \texttt{article} entry with \arabic{author} authors. By @@ -226,7 +240,7 @@ truncated. This is configurable}, } -@Article{reese, +@article{reese, author = {Reese, Trevor R.}, title = {Georgia in Anglo-Spanish Diplomacy, 1736-1739}, journaltitle = {William and Mary Quarterly}, @@ -234,7 +248,8 @@ series = 3, volume = 15, pages = {168-190}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {An \texttt{article} entry with a \texttt{series} and a \texttt{volume} field. Note the format of the series. If the value of the \texttt{series} field is an integer, this number @@ -242,7 +257,7 @@ appended automatically}, } -@Article{sarfraz, +@article{sarfraz, author = {M. Sarfraz and M. F. A. Razzak}, title = {Technical section: {An} algorithm for automatic capturing of the font outlines}, @@ -255,7 +270,7 @@ annotation = {An \texttt{article} entry with an \texttt{issn} field}, } -@Article{shore, +@article{shore, author = {Shore, Bradd}, title = {Twice-Born, Once Conceived}, journaltitle = {American Anthropologist}, @@ -270,7 +285,7 @@ of the \texttt{series} which is a localization key}, } -@Article{sigfridsson, +@article{sigfridsson, author = {Sigfridsson, Emma and Ryde, Ulf}, title = {Comparison of methods for deriving atomic charges from the electrostatic potential and moments}, @@ -280,7 +295,8 @@ number = 4, pages = {377-395}, doi = {10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Methods for deriving atomic charges}, annotation = {An \texttt{article} entry with \texttt{volume}, \texttt{number}, and \texttt{doi} fields. Note that the @@ -303,7 +319,7 @@ discussed.}, } -@Article{spiegelberg, +@article{spiegelberg, author = {Spiegelberg, Herbert}, title = {\mkbibquote{Intention} und \mkbibquote{Intentionalit{\"a}t} in der Scholastik, bei Brentano und Husserl}, @@ -311,7 +327,7 @@ date = 1969, volume = 29, pages = {189-216}, - hyphenation = {german}, + langid = {german}, sorttitle = {Intention und Intentionalitat in der Scholastik, bei Brentano und Husserl}, indexsorttitle= {Intention und Intentionalitat in der Scholastik, bei Brentano @@ -322,19 +338,20 @@ the database file}, } -@Article{springer, +@article{springer, author = {Springer, Otto}, title = {Mediaeval Pilgrim Routes from Scandinavia to Rome}, journaltitle = {Mediaeval Studies}, date = 1950, volume = 12, pages = {92-122}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, shorttitle = {Mediaeval Pilgrim Routes}, annotation = {A plain \texttt{article} entry}, } -@Article{weinberg, +@article{weinberg, author = {Weinberg, Steven}, title = {A Model of Leptons}, journaltitle = {Phys.~Rev.~Lett.}, @@ -343,7 +360,7 @@ pages = {1264-1266}, } -@Article{yoon, +@article{yoon, author = {Yoon, Myeong S. and Ryu, Dowook and Kim, Jeongryul and Ahn, Kyo Han}, title = {Palladium pincer complexes with reduced bond angle strain: @@ -356,7 +373,7 @@ indextitle = {Palladium pincer complexes}, } -@Book{aristotle:anima, +@book{aristotle:anima, author = {Aristotle}, title = {De Anima}, date = 1907, @@ -364,12 +381,13 @@ publisher = cup, location = {Cambridge}, keywords = {primary}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {A \texttt{book} entry with an \texttt{author} and an \texttt{editor}}, } -@Book{aristotle:physics, +@book{aristotle:physics, author = {Aristotle}, title = {Physics}, date = 1929, @@ -377,12 +395,13 @@ publisher = {G. P. Putnam}, location = {New York}, keywords = {primary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, shorttitle = {Physics}, annotation = {A \texttt{book} entry with a \texttt{translator} field}, } -@Book{aristotle:poetics, +@book{aristotle:poetics, author = {Aristotle}, title = {Poetics}, date = 1968, @@ -391,13 +410,14 @@ publisher = {Clarendon Press}, location = {Oxford}, keywords = {primary}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, shorttitle = {Poetics}, annotation = {A \texttt{book} entry with an \texttt{author} and an \texttt{editor} as well as a \texttt{series} field}, } -@Book{aristotle:rhetoric, +@book{aristotle:rhetoric, author = {Aristotle}, title = {The Rhetoric of Aristotle with a commentary by the late Edward Meredith Cope}, @@ -407,7 +427,8 @@ volumes = 3, publisher = cup, keywords = {primary}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, sorttitle = {Rhetoric of Aristotle}, indextitle = {Rhetoric of Aristotle, The}, shorttitle = {Rhetoric}, @@ -417,18 +438,19 @@ fields}, } -@Book{augustine, +@book{augustine, author = {Augustine, Robert L.}, title = {Heterogeneous catalysis for the synthetic chemist}, date = 1995, publisher = {Marcel Dekker}, location = {New York}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, shorttitle = {Heterogeneous catalysis}, annotation = {A plain \texttt{book} entry}, } -@Book{averroes/bland, +@book{averroes/bland, author = {Averroes}, title = {The Epistle on the Possibility of Conjunction with the Active Intellect by Ibn Rushd with the Commentary of Moses Narboni}, @@ -440,7 +462,8 @@ publisher = {Jewish Theological Seminary of America}, location = {New York}, keywords = {primary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Epistle on the Possibility of Conjunction, The}, shorttitle = {Possibility of Conjunction}, annotation = {A \texttt{book} entry with a \texttt{series} and a @@ -449,7 +472,7 @@ \texttt{indextitle} field}, } -@Book{averroes/hannes, +@book{averroes/hannes, author = {Averroes}, title = {Des Averro{\"e}s Abhandlung: \mkbibquote{{\"U}ber die M{\"o}glichkeit der Conjunktion} oder \mkbibquote{{\"U}ber den @@ -461,7 +484,7 @@ publisher = {C.~A. Kaemmerer}, location = {Halle an der Saale}, keywords = {primary}, - hyphenation = {german}, + langid = {german}, sorttitle = {Uber die Moglichkeit der Conjunktion}, indexsorttitle= {Uber die Moglichkeit der Conjunktion}, indextitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion}, @@ -473,7 +496,7 @@ \texttt{indexsorttitle} fields}, } -@Book{averroes/hercz, +@book{averroes/hercz, author = {Averroes}, title = {Drei Abhandlungen {\"u}ber die Conjunction des separaten Intellects mit dem Menschen}, @@ -483,7 +506,7 @@ publisher = {S.~Hermann}, location = {Berlin}, keywords = {primary}, - hyphenation = {german}, + langid = {german}, indexsorttitle= {Drei Abhandlungen uber die Conjunction}, indextitle = {Drei Abhandlungen {\"u}ber die Conjunction}, subtitle = {Von Averroes (Vater und Sohn), aus dem Arabischen @@ -494,7 +517,7 @@ \texttt{indextitle} and \texttt{indexsorttitle} fields}, } -@Book{cicero, +@book{cicero, author = {Cicero, Marcus Tullius}, title = {De natura deorum. {\"U}ber das Wesen der G{\"o}tter}, date = 1995, @@ -504,7 +527,7 @@ language = {langlatin and langgerman}, publisher = {Reclam}, location = {Stuttgart}, - hyphenation = {german}, + langid = {german}, indextitle = {De natura deorum}, shorttitle = {De natura deorum}, annotation = {A bilingual edition of Cicero's \emph{De natura deorum}, with @@ -514,7 +537,7 @@ \texttt{afterword} field}, } -@Book{coleridge, +@book{coleridge, author = {Coleridge, Samuel Taylor}, title = {Biographia literaria, or Biographical sketches of my literary life and opinions}, @@ -527,7 +550,8 @@ number = 75, publisher = {Routledge and Kegan Paul}, location = {London}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, indextitle = {Biographia literaria}, shorttitle = {Biographia literaria}, annotation = {One (partial) volume of a multivolume book. This is a @@ -537,7 +561,7 @@ and \texttt{number} fields}, } -@Book{companion, +@book{companion, author = {Goossens, Michel and Mittelbach, Frank and Samarin, Alexander}, title = {The LaTeX Companion}, date = 1994, @@ -545,7 +569,8 @@ publisher = {Addison-Wesley}, location = {Reading, Mass.}, pagetotal = 528, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {LaTeX Companion}, indextitle = {LaTeX Companion, The}, shorttitle = {LaTeX Companion}, @@ -554,7 +579,7 @@ bibliography}, } -@Book{cotton, +@book{cotton, author = {Cotton, Frank Albert and Wilkinson, Geoffrey and Murillio, Carlos A. and Bochmann, Manfred}, title = {Advanced inorganic chemistry}, @@ -562,20 +587,22 @@ edition = 6, publisher = {Wiley}, location = {Chichester}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {A \texttt{book} entry with \arabic{author} authors and an \texttt{edition} field. By default, long \texttt{author} and \texttt{editor} lists are automatically truncated. This is configurable}, } -@Book{gerhardt, +@book{gerhardt, author = {Gerhardt, Michael J.}, title = {The Federal Appointments Process}, date = 2000, publisher = {Duke University Press}, location = {Durham and London}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Federal Appointments Process}, indextitle = {Federal Appointments Process, The}, subtitle = {A Constitutional and Historical Analysis}, @@ -585,14 +612,15 @@ \texttt{indextitle} fields}, } -@Book{gonzalez, +@book{gonzalez, author = {Gonzalez, Ray}, title = {The Ghost of John Wayne and Other Stories}, date = 2001, publisher = {The University of Arizona Press}, location = {Tucson}, isbn = {0-816-52066-6}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Ghost of John Wayne and Other Stories}, indextitle = {Ghost of John Wayne and Other Stories, The}, shorttitle = {Ghost of John Wayne}, @@ -601,14 +629,15 @@ the database file. There's also an \texttt{isbn} field}, } -@Book{hammond, +@book{hammond, author = {Hammond, Christopher}, title = {The basics of crystallography and diffraction}, date = 1997, publisher = {International Union of Crystallography and Oxford University Press}, location = {Oxford}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, sorttitle = {Basics of crystallography and diffraction}, indextitle = {Basics of crystallography and diffraction, The}, shorttitle = {Crystallography and diffraction}, @@ -617,7 +646,7 @@ \texttt{publisher} field}, } -@Book{iliad, +@book{iliad, author = {Homer}, title = {Die Ilias}, date = 2004, @@ -626,7 +655,7 @@ edition = 3, publisher = {Artemis \& Winkler}, location = {D{\"u}sseldorf and Z{\"u}rich}, - hyphenation = {german}, + langid = {german}, sorttitle = {Ilias}, indextitle = {Ilias, Die}, shorttitle = {Ilias}, @@ -637,14 +666,15 @@ fields}, } -@Book{knuth:ct, +@book{knuth:ct, author = {Knuth, Donald E.}, title = {Computers \& Typesetting}, date = {1984/1986}, volumes = 5, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1984-0}, sorttitle = {Computers & Typesetting}, indexsorttitle= {Computers & Typesetting}, @@ -652,7 +682,7 @@ entry, note the \texttt{volumes} field}, } -@Book{knuth:ct:a, +@book{knuth:ct:a, author = {Knuth, Donald E.}, title = {The \TeX book}, date = 1984, @@ -660,7 +690,8 @@ volume = {A}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1984-1}, sorttitle = {Computers & Typesetting A}, indexsorttitle= {The TeXbook}, @@ -675,7 +706,7 @@ to be protected from expansion}, } -@Book{knuth:ct:b, +@book{knuth:ct:b, author = {Knuth, Donald E.}, title = {\TeX: The Program}, date = 1986, @@ -683,7 +714,8 @@ volume = {B}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1986-1}, sorttitle = {Computers & Typesetting B}, indexsorttitle= {TeX: The Program}, @@ -693,7 +725,7 @@ \texttt{indexsorttitle} field}, } -@Book{knuth:ct:c, +@book{knuth:ct:c, author = {Knuth, Donald E.}, title = {The METAFONTbook}, date = 1986, @@ -701,7 +733,8 @@ volume = {C}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1986-2}, sorttitle = {Computers & Typesetting C}, indextitle = {METAFONTbook, The}, @@ -711,7 +744,7 @@ \texttt{indextitle} field}, } -@Book{knuth:ct:d, +@book{knuth:ct:d, author = {Knuth, Donald E.}, title = {METAFONT: The Program}, date = 1986, @@ -719,7 +752,8 @@ volume = {D}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1986-3}, sorttitle = {Computers & Typesetting D}, shorttitle = {METAFONT}, @@ -727,7 +761,7 @@ \texttt{sorttitle} and \texttt{sortyear} fields}, } -@Book{knuth:ct:e, +@book{knuth:ct:e, author = {Knuth, Donald E.}, title = {Computer Modern Typefaces}, date = 1986, @@ -735,21 +769,23 @@ volume = {E}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1986-4}, sorttitle = {Computers & Typesetting E}, annotation = {The fifth volume of a five-volume book. Note the \texttt{sorttitle} and \texttt{sortyear} fields}, } -@Book{knuth:ct:related, +@book{knuth:ct:related, author = {Knuth, Donald E.}, title = {Computers \& Typesetting}, date = {1984/1986}, volumes = 5, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1984-0}, sorttitle = {Computers & Typesetting}, indexsorttitle= {Computers & Typesetting}, @@ -760,16 +796,17 @@ \texttt{relatedtype} fields}, } -@Book{kullback, +@book{kullback, author = {Kullback, Solomon}, title = {Information Theory and Statistics}, year = 1959, publisher = {John Wiley \& Sons}, location = {New York}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, } -@Book{kullback:reprint, +@book{kullback:reprint, author = {Kullback, Solomon}, title = {Information Theory and Statistics}, year = 1997, @@ -777,33 +814,36 @@ location = {New York}, origyear = 1959, origpublisher= {John Wiley \& Sons}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {A reprint of the \texttt{kullback} entry. Note the format of \texttt{origyear} and \texttt{origpublisher}. These fields are not used by the standard bibliography styles}, } -@Book{kullback:related, +@book{kullback:related, author = {Kullback, Solomon}, title = {Information Theory and Statistics}, year = 1997, publisher = {Dover Publications}, location = {New York}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, related = {kullback}, relatedtype = {origpubin}, annotation = {A reprint of the \texttt{kullback} entry. Note the format of the \texttt{related} and \texttt{relatedtype} fields}, } -@Book{malinowski, +@book{malinowski, author = {Malinowski, Bronis{\l}aw}, title = {Argonauts of the Western Pacific}, date = 1972, edition = 8, publisher = {Routledge and Kegan Paul}, location = {London}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, subtitle = {An account of native enterprise and adventure in the Archipelagoes of Melanesian New Guinea}, shorttitle = {Argonauts}, @@ -812,7 +852,7 @@ \texttt{subtitle} field}, } -@Book{maron, +@book{maron, author = {Maron, Monika}, title = {Animal Triste}, date = 2000, @@ -820,7 +860,8 @@ origlanguage = {german}, publisher = {University of Nebraska Press}, location = {Lincoln}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, shorttitle = {Animal Triste}, annotation = {An English translation of a German novel with a French title. In other words: a \texttt{book} entry with a @@ -828,18 +869,19 @@ field which is concatenated with the \texttt{translator}}, } -@Book{massa, +@book{massa, author = {Werner Massa}, title = {Crystal structure determination}, date = 2004, edition = 2, publisher = {Spinger}, location = {Berlin}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {A \texttt{book} entry with an \texttt{edition} field}, } -@Article{moore, +@article{moore, author = {Moore, Gordon E.}, title = {Cramming more components onto integrated circuits}, journaltitle = {Electronics}, @@ -847,10 +889,11 @@ volume = 38, number = 8, pages = {114-117}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, } -@Article{moore:related, +@article{moore:related, author = {Moore, Gordon E.}, title = {Cramming more components onto integrated circuits}, journaltitle = {Proceedings of the {IEEE}}, @@ -858,14 +901,15 @@ volume = 86, number = 1, pages = {82-85}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, related = {moore}, relatedtype = {reprintfrom}, annotation = {A reprint of Moore's law. Note the \texttt{related} and \texttt{relatedtype} fields}, } -@Book{nietzsche:ksa, +@book{nietzsche:ksa, author = {Nietzsche, Friedrich}, title = {S{\"a}mtliche Werke}, date = 1988, @@ -874,7 +918,7 @@ volumes = 15, publisher = dtv # { and Walter de Gruyter}, location = {M{\"u}nchen and Berlin and New York}, - hyphenation = {german}, + langid = {german}, sortyear = {1988-0}, sorttitle = {Werke-00-000}, indexsorttitle= {Samtliche Werke}, @@ -889,7 +933,7 @@ first in the bibliography}, } -@Book{nietzsche:ksa1, +@book{nietzsche:ksa1, author = {Nietzsche, Friedrich}, title = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e Betrachtungen I--IV. Nachgelassene Schriften 1870--1973}, @@ -901,7 +945,7 @@ edition = 2, publisher = dtv # { and Walter de Gruyter}, location = {M{\"u}nchen and Berlin and New York}, - hyphenation = {german}, + langid = {german}, sortyear = {1988-1}, sorttitle = {Werke-01-000}, indexsorttitle= {Samtliche Werke I}, @@ -916,14 +960,15 @@ referring to the entire edition}, } -@Book{nussbaum, +@book{nussbaum, author = {Nussbaum, Martha}, title = {Aristotle's \mkbibquote{De Motu Animalium}}, date = 1978, publisher = pup, location = {Princeton}, keywords = {secondary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Aristotle's De Motu Animalium}, indexsorttitle= {Aristotle's De Motu Animalium}, annotation = {A \texttt{book} entry. Note the \texttt{sorttitle} and @@ -931,27 +976,28 @@ the database file}, } -@Book{piccato, +@book{piccato, author = {Piccato, Pablo}, title = {City of Suspects}, date = 2001, publisher = {Duke University Press}, location = {Durham and London}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, subtitle = {Crime in Mexico City, 1900--1931}, shorttitle = {City of Suspects}, annotation = {This is a \texttt{book} entry. Note the format of the \texttt{location} field in the database file}, } -@Book{vangennep, +@book{vangennep, author = {van Gennep, Arnold}, title = {Les rites de passage}, date = 1909, publisher = {Nourry}, location = {Paris}, options = {useprefix}, - hyphenation = {french}, + langid = {french}, sorttitle = {Rites de passage}, indextitle = {Rites de passage, Les}, shorttitle = {Rites de passage}, @@ -960,7 +1006,7 @@ field as well as \texttt{brandt} and \texttt{geer}}, } -@Book{vangennep:trans, +@book{vangennep:trans, author = {van Gennep, Arnold}, title = {The Rites of Passage}, year = 1960, @@ -972,20 +1018,21 @@ indextitle = {Rites of Passage, The}, sorttitle = {Rites of Passage}, shorttitle = {Rites of Passage}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {A translation of the \texttt{vangennep} entry. Note the \texttt{translator} and \texttt{origlanguage} fields. Compare with the \texttt{vangennep:related} entry.}, } -@Book{vangennep:related, +@book{vangennep:related, author = {van Gennep, Arnold}, title = {Les rites de passage}, date = 1909, publisher = {Nourry}, location = {Paris}, options = {useprefix}, - hyphenation = {french}, + langid = {french}, related = {vizedom:related}, relatedtype = {bytranslator}, sorttitle = {Rites de passage}, @@ -996,13 +1043,14 @@ \texttt{relatedtype} fields}, } -@Book{vizedom:related, +@book{vizedom:related, title = {The Rites of Passage}, year = 1960, translator = {Vizedom, Monika B. and Caffee, Gabrielle L.}, language = {english}, publisher = {University of Chicago Press}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, options = {usetranslator}, related = {vangennep}, relatedtype = {translationof}, @@ -1013,7 +1061,7 @@ the \texttt{related} and \texttt{relatedtype} fields}, } -@Book{vazques-de-parga, +@book{vazques-de-parga, author = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a and Ur{\'i}a R{\'i}u, Juan}, title = {Las Peregrinaciones a Santiago de Compostela}, @@ -1022,7 +1070,7 @@ note = {Ed. facs. de la realizada en 1948--49}, publisher = {Iberdrola}, location = {Pamplona}, - hyphenation = {spanish}, + langid = {spanish}, sorttitle = {Peregrinaciones a Santiago de Compostela}, indextitle = {Peregrinaciones a Santiago de Compostela, Las}, shorttitle = {Peregrinaciones}, @@ -1031,7 +1079,7 @@ \texttt{sorttitle}, and \texttt{indextitle} fields}, } -@Book{wilde, +@book{wilde, author = {Wilde, Oscar}, title = {The Importance of Being Earnest: A Trivial Comedy for Serious People}, @@ -1044,13 +1092,14 @@ fields.}, } -@Book{worman, +@book{worman, author = {Worman, Nancy}, title = {The Cast of Character}, date = 2002, publisher = {University of Texas Press}, location = {Austin}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Cast of Character}, indextitle = {Cast of Character, The}, subtitle = {Style in Greek Literature}, @@ -1059,7 +1108,7 @@ \texttt{indextitle} fields}, } -@Collection{britannica, +@collection{britannica, editor = {Preece, Warren E.}, title = {The New Encyclop{\ae}dia Britannica}, date = 2003, @@ -1069,7 +1118,8 @@ location = {Chicago, Ill.}, options = {useeditor=false}, label = {EB}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, sorttitle = {Encyclop{\ae}dia Britannica}, indextitle = {Encyclop{\ae}dia Britannica, The New}, shorttitle = {Encyclop{\ae}dia Britannica}, @@ -1083,14 +1133,15 @@ author-year citation styles}, } -@Collection{gaonkar, +@collection{gaonkar, editor = {Gaonkar, Dilip Parameshwar}, title = {Alternative Modernities}, date = 2001, publisher = {Duke University Press}, location = {Durham and London}, isbn = {0-822-32714-7}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {This is a \texttt{collection} entry. Note the format of the \texttt{location} field in the database file as well as the \texttt{isbn} field}, @@ -1108,7 +1159,7 @@ pages = {1-23}, } -@Collection{jaffe, +@collection{jaffe, editor = {Jaff{\'e}, Philipp}, title = {Regesta Pontificum Romanorum ab condita ecclesia ad annum post Christum natum \textsc{mcxcviii}}, @@ -1126,14 +1177,15 @@ \texttt{editoratype} fields}, } -@Collection{westfahl:frontier, +@collection{westfahl:frontier, editor = {Westfahl, Gary}, title = {Space and Beyond}, date = 2000, subtitle = {The Frontier Theme in Science Fiction}, publisher = {Greenwood}, location = {Westport, Conn. and London}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, booktitle = {Space and Beyond}, booksubtitle = {The Frontier Theme in Science Fiction}, annotation = {This is a \texttt{collection} entry. Note the format of the @@ -1141,7 +1193,7 @@ \texttt{booksubtitle} fields}, } -@InBook{kant:kpv, +@inbook{kant:kpv, title = {Kritik der praktischen Vernunft}, date = 1968, author = {Kant, Immanuel}, @@ -1153,7 +1205,7 @@ location = {Berlin}, pages = {1-163}, shorthand = {KpV}, - hyphenation = {german}, + langid = {german}, shorttitle = {Kritik der praktischen Vernunft}, annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is an \texttt{inbook} entry which explicitly refers to the @@ -1164,7 +1216,7 @@ \texttt{author} and \texttt{bookauthor} fields are identical}, } -@InBook{kant:ku, +@inbook{kant:ku, title = {Kritik der Urtheilskraft}, date = 1968, author = {Kant, Immanuel}, @@ -1176,14 +1228,14 @@ location = {Berlin}, pages = {165-485}, shorthand = {KU}, - hyphenation = {german}, + langid = {german}, annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is an \texttt{inbook} entry which explicitly refers to the \emph{Critique of Judgment} only, not to the entire fifth volume}, } -@InBook{nietzsche:historie, +@inbook{nietzsche:historie, title = {Unzeitgem{\"a}sse Betrachtungen. Zweites St{\"u}ck}, date = 1988, author = {Nietzsche, Friedrich}, @@ -1198,7 +1250,7 @@ publisher = dtv # { and Walter de Gruyter}, location = {M{\"u}nchen and Berlin and New York}, pages = {243-334}, - hyphenation = {german}, + langid = {german}, sortyear = {1988-2}, sorttitle = {Werke-01-243}, indexsorttitle= {Vom Nutzen und Nachtheil der Historie fur das Leben}, @@ -1213,7 +1265,7 @@ entire first volume}, } -@InCollection{brandt, +@incollection{brandt, author = {von Brandt, Ahasver and Erich Hoffmann}, editor = {Ferdinand Seibt}, title = {Die nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts @@ -1226,7 +1278,7 @@ location = {Stuttgart}, pages = {884-917}, options = {useprefix=false}, - hyphenation = {german}, + langid = {german}, indexsorttitle= {Nordischen Lander von der Mitte des 11. Jahrhunderts bis 1448}, indextitle = {Nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis @@ -1239,7 +1291,7 @@ \texttt{indextitle, and \texttt{indexsorttitle} fields}}, } -@InCollection{hyman, +@incollection{hyman, author = {Arthur Hyman}, editor = {O'Meara, Dominic J.}, title = {Aristotle's Theory of the Intellect and its Interpretation by @@ -1252,14 +1304,15 @@ location = {Washington, D.C.}, pages = {161-191}, keywords = {secondary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Aristotle's Theory of the Intellect}, shorttitle = {Aristotle's Theory of the Intellect}, annotation = {An \texttt{incollection} entry with a \texttt{series} and \texttt{number} field}, } -@InCollection{pines, +@incollection{pines, author = {Pines, Shlomo}, editor = {Twersky, Isadore}, title = {The Limitations of Human Knowledge According to Al-Farabi, ibn @@ -1270,7 +1323,8 @@ location = {Cambridge, Mass.}, pages = {82-109}, keywords = {secondary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Limitations of Human Knowledge According to Al-Farabi, ibn Bajja, and Maimonides, The}, shorttitle = {Limitations of Human Knowledge}, @@ -1278,7 +1332,7 @@ \texttt{indextitle} field}, } -@InProceedings{moraux, +@inproceedings{moraux, author = {Moraux, Paul}, editor = {Lloyd, G. E. R. and Owen, G. E. L.}, title = {Le \emph{De Anima} dans la tradition gr{\`e}cque}, @@ -1292,7 +1346,7 @@ location = {Cambridge}, pages = {281-324}, keywords = {secondary}, - hyphenation = {french}, + langid = {french}, indexsorttitle= {De Anima dans la tradition grecque}, indextitle = {\emph{De Anima} dans la tradition gr{\`e}cque, Le}, shorttitle = {\emph{De Anima} dans la tradition gr{\`e}cque}, @@ -1302,7 +1356,7 @@ note the \texttt{eventdate} field.}, } -@InProceedings{salam, +@inproceedings{salam, author = {Salam, Abdus}, editor = {Svartholm, Nils}, title = {Weak and Electromagnetic Interactions}, @@ -1317,7 +1371,7 @@ pages = {367-377}, } -@Manual{cms, +@manual{cms, title = {The Chicago Manual of Style}, date = 2003, subtitle = {The Essential Guide for Writers, Editors, and Publishers}, @@ -1326,7 +1380,8 @@ location = {Chicago, Ill.}, isbn = {0-226-10403-6}, label = {CMS}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Chicago Manual of Style}, indextitle = {Chicago Manual of Style, The}, shorttitle = {Chicago Manual of Style}, @@ -1340,12 +1395,13 @@ \enquote*{T}. There's also an \texttt{isbn} field}, } -@Online{baez/online, +@online{baez/online, author = {Baez, John C. and Lauda, Aaron D.}, title = {Higher-Dimensional Algebra V: 2-Groups}, date = {2004-10-27}, version = 3, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, eprinttype = {arxiv}, eprint = {math/0307200v3}, annotation = {An \texttt{online} reference from arXiv. Note the @@ -1354,14 +1410,15 @@ \texttt{article} entry with eprint information}, } -@Online{ctan, +@online{ctan, title = {CTAN}, date = 2006, url = {http://www.ctan.org}, subtitle = {The Comprehensive TeX Archive Network}, urldate = {2006-10-01}, label = {CTAN}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {This is an \texttt{online} entry. The \textsc{url}, which is given in the \texttt{url} field, is transformed into a clickable link if \texttt{hyperref} support has been @@ -1372,12 +1429,13 @@ \texttt{year}}, } -@Online{itzhaki, +@online{itzhaki, author = {Itzhaki, Nissan}, title = {Some remarks on 't Hooft's S-matrix for black holes}, date = {1996-03-11}, version = 1, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, eprinttype = {arxiv}, eprint = {hep-th/9603067}, annotation = {An \texttt{online} reference from arXiv. Note the @@ -1392,28 +1450,29 @@ crucial even for large transverse distances.}, } -@Online{markey, +@online{markey, author = {Markey, Nicolas}, title = {Tame the BeaST}, date = {2005-10-16}, - url = - {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf}, + url = {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf}, subtitle = {The B to X of BibTeX}, version = {1.3}, urldate = {2006-10-01}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Tame the Beast}, annotation = {An \texttt{online} entry for a tutorial. Note the format of the \texttt{date} field (\texttt{yyyy-mm-dd}) in the database file.}, } -@Online{wassenberg, +@online{wassenberg, author = {Wassenberg, Jan and Sanders, Peter}, title = {Faster Radix Sort via Virtual Memory and Write-Combining}, date = {2010-08-17}, version = 1, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, eprinttype = {arxiv}, eprintclass = {cs.DS}, eprint = {1008.2849v1}, @@ -1431,14 +1490,14 @@ variant of counting sort}, } -@Patent{almendro, +@patent{almendro, author = {Almendro, Jos{\'e} L. and Mart{\'i}n, Jacinto and S{\'a}nchez, Alberto and Nozal, Fernando}, title = {Elektromagnetisches Signalhorn}, number = {EU-29702195U}, date = 1998, location = {countryfr and countryuk and countryde}, - hyphenation = {german}, + langid = {german}, annotation = {This is a \texttt{patent} entry with a \texttt{location} field. The number is given in the \texttt{number} field. Note the format of the \texttt{location} field in the database @@ -1446,14 +1505,14 @@ \texttt{kowalik}}, } -@Patent{kowalik, +@patent{kowalik, author = {Kowalik, F. and Isard, M.}, title = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur en quadrature et {\'e}tage de modulation l'utilisant}, number = 9500261, date = {1995-01-11}, type = {patreqfr}, - hyphenation = {french}, + langid = {french}, indextitle = {Estimateur d'un d{\'e}faut de fonctionnement}, annotation = {This is a \texttt{patent} entry for a French patent request with a full date. The number is given in the \texttt{number} @@ -1462,7 +1521,7 @@ \texttt{laufenberg}, and \texttt{sorace}}, } -@Patent{laufenberg, +@patent{laufenberg, author = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann, Miriam and Myrzik, Christian and Schmid, Manfred and Nietfeld, @@ -1474,7 +1533,7 @@ holder = {{Robert Bosch GmbH} and {Daimler Chrysler AG} and {Bayerische Motoren Werke AG}}, type = {patenteu}, - hyphenation = {german}, + langid = {german}, annotation = {This is a \texttt{patent} entry with a \texttt{holder} field. Note the format of the \texttt{type} and \texttt{location} fields in the database file. Compare \texttt{almendro}, @@ -1489,7 +1548,7 @@ file = {http://v3.espacenet.com/textdoc?IDX=EP1700367}, } -@Patent{sorace, +@patent{sorace, author = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven A.}, title = {High-Speed Digital-to-RF Converter}, @@ -1497,14 +1556,15 @@ date = {1997-09-16}, holder = {{Hughes Aircraft Company}}, type = {patentus}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {This is a \texttt{patent} entry with a \texttt{holder} field. Note the format of the \texttt{type} and \texttt{date} fields in the database file. Compare \texttt{almendro}, \texttt{laufenberg}, and \texttt{kowalik}}, } -@Periodical{jcg, +@periodical{jcg, title = {Computers and Graphics}, year = 2011, issuetitle = {Semantic {3D} Media and Content}, @@ -1515,7 +1575,7 @@ field.}, } -@Report{chiu, +@report{chiu, author = {Chiu, Willy W. and Chow, We Min}, title = {A Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS) Operating System}, @@ -1523,7 +1583,8 @@ institution = {IBM}, date = 1978, number = {RC-6947}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS) Operating System}, indextitle = {Hybrid Hierarchical Model, A}, @@ -1534,7 +1595,7 @@ \texttt{sorttitle} and \texttt{indextitle} fields}, } -@Report{padhye, +@report{padhye, author = {Padhye, Jitendra and Firoiu, Victor and Towsley, Don}, title = {A Stochastic Model of TCP Reno Congestion Avoidance and Control}, @@ -1543,7 +1604,8 @@ date = 1999, number = {99-02}, location = {Amherst, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {A Stochastic Model of TCP Reno Congestion Avoidance and Control}, indextitle = {Stochastic Model of TCP Reno Congestion Avoidance and Control, @@ -1577,7 +1639,7 @@ file = {ftp://gaia.cs.umass.edu/pub/Padhey99-markov.ps}, } -@Thesis{geer, +@thesis{geer, author = {de Geer, Ingrid}, title = {Earl, Saint, Bishop, Skald~-- and Music}, type = {phdthesis}, @@ -1587,7 +1649,8 @@ Study}, location = {Uppsala}, options = {useprefix=false}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {This is a typical \texttt{thesis} entry for a PhD thesis. Note the \texttt{type} field in the database file which uses a localization key. Also note the format of the printed name and @@ -1595,14 +1658,15 @@ field as well as \texttt{vangennep}}, } -@Thesis{loh, +@thesis{loh, author = {Loh, Nin C.}, title = {High-Resolution Micromachined Interferometric Accelerometer}, type = {mathesis}, institution = {Massachusetts Institute of Technology}, date = 1992, location = {Cambridge, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {This is a typical \texttt{thesis} entry for an MA thesis. Note the \texttt{type} field in the database file which uses a localization key}, diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst index 27191e0e553..7c9e7405f50 100644 --- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst +++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst @@ -24,6 +24,7 @@ ENTRY { hyphenation keywords label + langid options presort shorthand @@ -174,7 +175,7 @@ STRINGS { ctrl.alphaothers templist tempstrga tempstrgb resvstrga last.name last.hash last.year last.extra } FUNCTION {initialize} { - "$Revision: 2.7 $" + "$Revision: 2.8 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ "Biblatex version: " swap$ * top$ @@ -1388,7 +1389,6 @@ FUNCTION {output:fields.1} { "eventtitle" eventtitle output:write:field "eventtitleaddon" eventtitleaddon output:write:field "howpublished" howpublished output:write:field - "hyphenation" hyphenation output:write:field "indexsorttitle" indexsorttitle output:write:field "indextitle" indextitle output:write:field "isan" isan output:write:field @@ -1538,6 +1538,16 @@ FUNCTION {output:warning} { } FUNCTION {output:compat.1} { + "langid" langid + duplicate$ empty$ + { pop$ hyphenation } + { hyphenation empty$ + 'skip$ + { "hyphenation" "langid" warning:duplicate } + if$ + } + if$ + output:write:field "location" location duplicate$ empty$ { pop$ address } @@ -1763,7 +1773,7 @@ FUNCTION {input:control:options} { % This version corresponds to the .bbl version, *not* the biblatex version! FUNCTION {input:control:version} { input:control:parse - "$Revision: 2.2 $" + "$Revision: 2.3 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ 'tempstrga := @@ -2587,7 +2597,7 @@ SORT % This version corresponds to the .bbl version, *not* the biblatex version! FUNCTION {output:main:begin} { "% $ biblatex auxiliary file $" write$ newline$ - "% $ biblatex version " "$Revision: 2.2 $" + "% $ biblatex version " "$Revision: 2.3 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" * write$ newline$ "% Do not modify the above lines!" write$ newline$ "%" write$ newline$ diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE index 1d8582a70e7..230918b03b6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE @@ -1,3 +1,22 @@ +RELEASE NOTES FOR VERSION 2.8 + +* Biber version 1.8 is required for biblatex 2.8 +* Polyglossia is now better supported +* The HYPHENATION field is now called LANGID. The old name still works for backwards compat. This + field does a lot more than just selecting hyphenation patterns and was misleading. +* New field LANGIDOPTS for Polyglossia users allows specification of + language-specific options (like variants such as "american" english and + babelshorthands etc.). See the biblatex-examples.bib file which has been + converted to use the new field names and fields. +* "babel" option renamed to "autolang". Old name generates a warning but + still works. Since Polyglossia support now basically works, this name is now + too package specific. There is a new value "langname" for this option + which is Polyglossia only and allows the use of the main polyglossia language + switching environment which can use the options given in the LANGIDOPTS field. +* New value "year" for "datelabel" option +* New internal field "datelabelsource" for package authors specifies which + date field the datelabel was generated from. + RELEASE NOTES FOR VERSION 2.7a * Bugfix release for 2.7 diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf Binary files differindex eaac3bf9540..e2bf5956337 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex index 16c150253fb..114b7d8003d 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex @@ -52,8 +52,8 @@ url={\biblatexhome}, author={Philipp Lehman \\(with Philip Kime, Audrey Boruvka and Joseph Wright)}, email={}, - revision={2.7a}, - date={14/07/2013}} + revision={2.8}, + date={21/10/2013}} \hypersetup{% pdftitle={The \biblatex Package}, @@ -167,7 +167,7 @@ Sebastià Vila-Marta (Catalan); Ivo Pletikosić (Croatian); Michal Hoftich (Czech); Johannes Wilm (Danish\slash Norwegian); -Alexander van Loon, Pieter Belmans (Dutch); +Alexander van Loon, Pieter Belmans, Hendrik Maryns (Dutch); Hannu Väisänen, Janne Kujanpää (Finnish); Denis Bitouzé (French); Apostolos Syropoulos, Prokopis (Greek); @@ -221,8 +221,8 @@ The packages listed in this section are not required for \sty{biblatex} to funct \begin{marglist} -\item[babel] -The \sty{babel} package provides the core architecture for multilingual typesetting. If you are writing in a language other than American English, using this package is strongly recommended. If loaded, \sty{biblatex} package will detect \sty{babel} automatically. +\item[babel/polyglossia] +The \sty{babel} and \sty{polyglossia} packages provides the core architecture for multilingual typesetting. If you are writing in a language other than American English, using one of these packages is strongly recommended. If loaded, \sty{biblatex} package will detect \sty{babel} or \sty{polyglossia} automatically. \item[csquotes] If this package is available, \sty{biblatex} will use its language sensitive quotation facilities to enclose certain titles in quotation marks. If not, \sty{biblatex} uses quotes suitable for American English as a fallback. When writing in any other language, loading \sty{csquotes} is strongly recommended.\fnurl{http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/} @@ -271,7 +271,7 @@ The packages listed in this section are not compatible with \sty{biblatex}. Sinc % bibtopicprefix \item[babelbib] -The \sty{babelbib} package provides support for multilingual bibliographies. This is a standard feature of \sty{biblatex}. Use the \bibfield{hyphenation} field and the package option \opt{babel} for similar functionality. Note that \sty{biblatex} automatically adjusts to the main document language if \sty{babel} is loaded. You only need the above mentioned features if you want to switch languages on a per"=entry basis within the bibliography. See \secref{bib:fld:spc, use:opt:pre:gen} for details. Also see \secref{use:lng}. +The \sty{babelbib} package provides support for multilingual bibliographies. This is a standard feature of \sty{biblatex}. Use the \bibfield{langid} field and the package option \opt{autolang} for similar functionality. Note that \sty{biblatex} automatically adjusts to the main document language if \sty{babel} or \sty{polyglossia} is loaded. You only need the above mentioned features if you want to switch languages on a per"=entry basis within the bibliography. See \secref{bib:fld:spc, use:opt:pre:gen} for details. Also see \secref{use:lng}. \item[backref] The \sty{backref} package creates back references in the bibliography. See the package options \opt{hyperref} and \opt{backref} in \secref{use:opt:pre:gen} for comparable functionality. @@ -336,6 +336,7 @@ compatibility matrix for the recent versions. \sffamily\bfseries\spotcolor Biber version & \sffamily\bfseries\spotcolor \biblatex\ version\\ \midrule +1.8 & 2.8\\ 1.7 & 2.7\\ 1.6 & 2.6\\ 1.5 & 2.5\\ @@ -923,7 +924,7 @@ A designation to be used by the citation style as a substitute for the regular l \listitem{language}{key} -The language(s) of the work. Languages may be specified literally or as localization keys. If localization keys are used, the prefix \texttt{lang} is omissible. See also \bibfield{origlanguage} and compare \bibfield{hyphenation} in \secref{bib:fld:spc}. +The language(s) of the work. Languages may be specified literally or as localization keys. If localization keys are used, the prefix \texttt{lang} is omissible. See also \bibfield{origlanguage} and compare \bibfield{langid} in \secref{bib:fld:spc}. \fielditem{library}{literal} @@ -1157,9 +1158,27 @@ Swedish & Sweden & \opt{swedish} \\ \label{bib:fld:tab1} \end{table} -\fielditem{hyphenation}{identifier} +\fielditem{langid}{identifier} -The language of the bibliography entry. The identifier must be a language name known to the \sty{babel} package. This information may be used to switch hyphenation patterns and localize strings in the bibliography. Note that the language names are case sensitive. The languages currently supported by this package are given in \tabref{bib:fld:tab1}. Note that \sty{babel} treats the identifier \opt{english} as an alias for \opt{british} or \opt{american}, depending on the babel version. The \sty{biblatex} package always treats it as an alias for \opt{american}. It is preferable to use the language identifiers \opt{american} and \opt{british} to avoid any possible confusion. Compare \bibfield{language} in \secref{bib:fld:dat}. +The language id of the bibliography entry. The alias \bibfield{hyphenation} is provided for backwards compatibility. The identifier must be a language name known to the \sty{babel}/\sty{polyglossia} packages. This information may be used to switch hyphenation patterns and localize strings in the bibliography. Note that the language names are case sensitive. The languages currently supported by this package are given in \tabref{bib:fld:tab1}. Note that \sty{babel} treats the identifier \opt{english} as an alias for \opt{british} or \opt{american}, depending on the \sty{babel} version. The \sty{biblatex} package always treats it as an alias for \opt{american}. It is preferable to use the language identifiers \opt{american} and \opt{british} (\sty{babel}) or a language specific option to specify a language variant (\sty{polyglossia}, using the \bibfield{langidopts} field) to avoid any possible confusion. Compare \bibfield{language} in \secref{bib:fld:dat}. + +\fielditem{langidopts}{comma"=separated \keyval options} + +For \sty{polyglossia} users, allows per-entry language specific options. These are passed to \sty{polyglossia}'s language switching facility when using the package option \opt{autolang=langname}. For example, the fields: + +\begin{lstlisting}[style=bibtex]{} +langid = {english}, +langidopts = {variant=british}, +\end{lstlisting} +% +would wrap the bibliography entry in: + +\begin{lstlisting}[style=latex]{} +\english[variant=british] +... +\endenglish +\end{lstlisting} +% \fielditem{ids}{comma"=separated list of entrykeys\BiberOnlyMark} @@ -2090,15 +2109,15 @@ This option controls whether the citation commands scan ahead for punctuation ma \optitem[auto]{language}{\opt{auto}, \prm{language}} -This option controls multilingual support. When set to \opt{auto}, \sty{biblatex} will try to get the main document language from the \sty{babel} package (and fall back to English if \sty{babel} is not available). This is the default behavior. It is also possible to select the document language manually. In this case, the \opt{babel} option below will have no effect. Please refer to \tabref{bib:fld:tab1} for a list of supported languages and the corresponding identifiers. +This option controls multilingual support. When set to \opt{auto}, \sty{biblatex} will try to get the main document language from the \sty{babel}/\sty{polyglossia} package (and fall back to English if \sty{babel}/\sty{polyglossia} is not available). This is the default behavior. It is also possible to select the document language manually. In this case, the \opt{autolang} option below will have no effect. Please refer to \tabref{bib:fld:tab1} for a list of supported languages and the corresponding identifiers. \boolitem[true]{clearlang} -If this option is enabled, \sty{biblatex} will automatically clear the \bibfield{language} field of all entries whose language matches the \sty{babel} language of the document (or the language specified explicitly with the \opt{language} option) in order to omit redundant language specifications. The language mappings required by this feature are provided by the \cmd{DeclareRedundantLanguages} command from \secref{aut:lng:cmd}. +If this option is enabled, \sty{biblatex} will automatically clear the \bibfield{language} field of all entries whose language matches the \sty{babel}/\sty{polyglossia} language of the document (or the language specified explicitly with the \opt{language} option) in order to omit redundant language specifications. The language mappings required by this feature are provided by the \cmd{DeclareRedundantLanguages} command from \secref{aut:lng:cmd}. -\optitem[none]{babel}{\opt{none}, \opt{hyphen}, \opt{other}, \opt{other*}} +\optitem[none]{autolang}{\opt{none}, \opt{hyphen}, \opt{other}, \opt{other*}, \opt{langname}} -This option controls which language environment is used if the \sty{babel} package is loaded and a bibliography entry includes a \bibfield{hyphenation} field (see \secref{bib:fld:spc}). Note that \sty{biblatex} automatically adjusts to the main document language if \sty{babel} is loaded. In multilingual documents, it will also continually adjust to the current language as far as citations and the default language of the bibliography is concerned. This option is for switching languages on a per"=entry basis within the bibliography. The possible choices are: +This option controls which \sty{babel} language environment\footnote{\sty{polyglossia} understands the \sty{babel} language environments too and so this option controls both the \sty{babel} and \sty{polyglossia} language environments.} is used if the \sty{babel}/\sty{polyglossia} package is loaded and a bibliography entry includes a \bibfield{langid} field (see \secref{bib:fld:spc}). Note that \sty{biblatex} automatically adjusts to the main document language if \sty{babel}/\sty{polyglossia} is loaded. In multilingual documents, it will also continually adjust to the current language as far as citations and the default language of the bibliography is concerned. This option is for switching languages on a per"=entry basis within the bibliography. The possible choices are: \begin{valuelist} @@ -2109,11 +2128,14 @@ Disable this feature, \ie do not use any language environment at all. Enclose the entry in a \env{hyphenrules} environment. This will load hyphenation patterns for the language specified in the \env{hyphenation} field of the entry, if available. \item[other] -Enclose the entry in an \env{otherlanguage} environment. This will load hyphenation patterns for the specified language, enable all extra definitions which \sty{babel} and \sty{biblatex} provide for the respective language, and translate key terms such as <editor> and <volume>. The extra definitions include localizations of the date format, of ordinals, and similar things. +Enclose the entry in an \env{otherlanguage} environment. This will load hyphenation patterns for the specified language, enable all extra definitions which \sty{babel}/\sty{polyglossia} and \sty{biblatex} provide for the respective language, and translate key terms such as <editor> and <volume>. The extra definitions include localizations of the date format, of ordinals, and similar things. \item[other*] Enclose the entry in an \env{otherlanguage*} environment. Please note that \sty{biblatex} treats \env{otherlanguage*} like \env{otherlanguage} but other packages may make a distinction in this case. +\item[langname] +\sty{polyglossia} only. Enclose the entry in a \env{<languagename>} environment. The benefit of this option value for \sty{polyglossia} users is that it takes note of the \bibfield{langidopts} field so that you can add per-language options to an entry (like selecting a language variant). When using \sty{babel}, this option does the same as the \opt{other} option value. + \end{valuelist} \optitem[none]{block}{\opt{none}, \opt{space}, \opt{par}, \opt{nbpar}, \opt{ragged}} @@ -2249,11 +2271,14 @@ The starred versions if these commands will not trigger a reset. Whether or not to use long or abbreviated strings in citations and in the bibliography. This option affects the localization modules. If this option is enabled, key terms such as <editor> are abbreviated. If not, they are written out. -\optitem[comp]{date}{\opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} +\optitem[comp]{date}{\opt{year}, \opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} This option controls the basic format of printed date specifications. The following choices are available: \begin{valuelist} +\item[year] Use only years, for example:\par +2010\par +2010--2012\par \item[short] Use the short format with verbose ranges, for example:\par 01/01/2010\par 21/01/2010--30/01/2010\par @@ -2275,23 +2300,23 @@ January 21--30, 2010\par % As seen in the above examples, the actual date format is language specific. Note that the month name in all long formats is responsive to the \opt{abbreviate} package option. The leading zeros in all short formats may be controlled separately with the \opt{datezeros} package option. -\optitem[comp]{datelabel}{\opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} +\optitem[year]{datelabel}{\opt{year}, \opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} Similar to the \opt{date} option but controls the format of the date field selected with \cmd{DeclareLabeldate}. -\optitem[comp]{origdate}{\opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} +\optitem[comp]{origdate}{\opt{year}, \opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} Similar to the \opt{date} option but controls the format of the \bibfield{origdate}. -\optitem[comp]{eventdate}{\opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} +\optitem[comp]{eventdate}{\opt{year}, \opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} Similar to the \opt{date} option but controls the format of the \bibfield{eventdate}. -\optitem[short]{urldate}{\opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} +\optitem[short]{urldate}{\opt{year}, \opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} Similar to the \opt{date} option but controls the format of the \bibfield{urldate}. -\optitem{alldates}{\opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} +\optitem{alldates}{\opt{year}, \opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}} Sets all of the above date options to the same value. @@ -3840,7 +3865,7 @@ The \sty{biblatex} package provides translations for key terms such as <edition> \cmditem{DefineBibliographyStrings}{language}{definitions} -This command is used to define localization strings. The \prm{language} must be a language name known to the \sty{babel} package, \ie one of the identifiers listed in \tabref{bib:fld:tab1} on page \pageref{bib:fld:tab1}. The \prm{definitions} are \keyval pairs which assign an expression to an identifier: +This command is used to define localization strings. The \prm{language} must be a language name known to the \sty{babel}/\sty{polyglossia} packages, \ie one of the identifiers listed in \tabref{bib:fld:tab1} on page \pageref{bib:fld:tab1}. The \prm{definitions} are \keyval pairs which assign an expression to an identifier: \begin{lstlisting}[style=latex]{} \DefineBibliographyStrings{american}{% @@ -3855,7 +3880,7 @@ A complete list of all keys supported by default is given is \secref{aut:lng:key \cmditem{DefineBibliographyExtras}{language}{code} -This command is used to adapt language specific features such as the date format and ordinals. The \prm{language} must be a language name known to the \sty{babel} package. The \prm{code}, which may be arbitrary \latex code, will usually consist of redefinitions of the formatting commands from \secref{use:fmt:lng}. +This command is used to adapt language specific features such as the date format and ordinals. The \prm{language} must be a language name known to the \sty{babel}/\sty{polyglossia} packages. The \prm{code}, which may be arbitrary \latex code, will usually consist of redefinitions of the formatting commands from \secref{use:fmt:lng}. \cmditem{UndefineBibliographyExtras}{language}{code} @@ -3864,7 +3889,7 @@ This command is used to restore the original definition of any commands modified \cmditem{DefineHyphenationExceptions}{language}{text} This is a \latex frontend to \tex's \cmd{hyphenation} command which defines hyphenation exceptions. -The \prm{language} must be a language name known to the \sty{babel} package. The \prm{text} is a whitespace"=separated list of words. Hyphenation points are marked with a dash: +The \prm{language} must be a language name known to the \sty{babel}/\sty{polyglossia} packages. The \prm{text} is a whitespace"=separated list of words. Hyphenation points are marked with a dash: \begin{lstlisting}[style=latex]{} \DefineHyphenationExceptions{american}{% @@ -4096,7 +4121,7 @@ Vol. E: Computer Modern Typefaces. 1986. \subsubsection{Language-specific Commands} \label{use:fmt:lng} -The commands in this section are language specific. When redefining them, you need to wrap the new definition in a \cmd{DeclareBibliographyExtras} command, see \secref{use:lng} for details. Note that all commands starting with \cmd{mk\dots} take one or more arguments. +The commands in this section are language specific. When redefining them, you need to wrap the new definition in a \cmd{DeclareBibliographyExtras} command (in an \file{.lbx} file) or a \cmd{DefineBibliographyExtras} command (user documents), see \secref{use:lng} for details. Note that all commands starting with \cmd{mk\dots} take one or more arguments. \begin{ltxsyntax} @@ -4224,19 +4249,19 @@ An ellipsis symbol with brackets: <[\dots\unkern]>. \csitem{noligature} -Disables ligatures at this position and adds some space. Use this command to break up standard ligatures like <fi> and <fl>. It is similar to the \verb+"|+ shorthand provided by some language modules of the \sty{babel} package. +Disables ligatures at this position and adds some space. Use this command to break up standard ligatures like <fi> and <fl>. It is similar to the \verb+"|+ shorthand provided by some language modules of the \sty{babel}/\sty{polyglossia} packages. \csitem{hyphenate} -A conditional hyphen. In contrast to the standard \cmd{-} command, this one allows hyphenation in the rest of the word. It is similar to the \verb|"-| shorthand provided by some language modules of the \sty{babel} package. +A conditional hyphen. In contrast to the standard \cmd{-} command, this one allows hyphenation in the rest of the word. It is similar to the \verb|"-| shorthand provided by some language modules of the \sty{babel}/\sty{polyglossia} packages. \csitem{hyphen} -An explicit, breakable hyphen intended for compound words. In contrast to a literal <\texttt{-}>, this command allows hyphenation in the rest of the word. It is similar to the \verb|"=| shorthand provided by some language modules of the \sty{babel} package. +An explicit, breakable hyphen intended for compound words. In contrast to a literal <\texttt{-}>, this command allows hyphenation in the rest of the word. It is similar to the \verb|"=| shorthand provided by some language modules of the \sty{babel}/\sty{polyglossia} packages. \csitem{nbhyphen} -An explicit, non-breakable hyphen intended for compound words. In contrast to a literal <\texttt{-}>, this command does not permit line breaks at the hyphen but still allows hyphenation in the rest of the word. It is similar to the \verb|"~| shorthand provided by some language modules of the \sty{babel} package. +An explicit, non-breakable hyphen intended for compound words. In contrast to a literal <\texttt{-}>, this command does not permit line breaks at the hyphen but still allows hyphenation in the rest of the word. It is similar to the \verb|"~| shorthand provided by some language modules of the \sty{babel}/\sty{polyglossia} packages. \csitem{nohyphenation} @@ -4296,7 +4321,7 @@ The American localization module uses \cmd{uspunctuation} from \secref{aut:pct:c % By default, the <American punctuation> feature is enabled by the \texttt{american} localization module only. The above code is only required if you want American localization without American punctuation. Since standard punctuation is the package default, it would be redundant with any other language. -It is highly advisable to always specify \texttt{american}, \texttt{british}, \texttt{australian}, etc. rather than \texttt{english} when loading the \sty{babel} package to avoid any possible confusion. Older versions of the \sty{babel} package used to treat \opt{english} as an alias for \opt{british}; more recent ones treat it as an alias for \opt{american}. The biblatex package essentially treats \texttt{english} as an alias for \opt{american}, except for the above feature which is only enabled if \texttt{american} is requested explicitly. +It is highly advisable to always specify \texttt{american}, \texttt{british}, \texttt{australian}, etc. rather than \texttt{english} when loading the \sty{babel}/\sty{polyglossia} packages to avoid any possible confusion. Older versions of the \sty{babel} package used to treat \opt{english} as an alias for \opt{british}; more recent ones treat it as an alias for \opt{american}. The biblatex package essentially treats \texttt{english} as an alias for \opt{american}, except for the above feature which is only enabled if \texttt{american} is requested explicitly. \subsubsection{Spanish} \label{use:loc:esp} @@ -4997,7 +5022,7 @@ The citation labels generated by this package are assigned to the full list of r \subsubsection{Active Characters in Bibliography Headings} \label{use:cav:act} -Packages using active characters, such as \sty{babel}, \sty{csquotes}, or \sty{underscore}, usually do not make them active until the beginning of the document body to avoid interference with other packages. A typical example of such an active character is the Ascii quote |"|, which is used by various language modules of the \sty{babel} package. If shorthands such as |"<| and |"a| are used in the argument to \cmd{defbibheading} and the headings are defined in the document preamble, the non-active form of the characters is saved in the heading definition. When the heading is typeset, they do not function as a command but are simply printed literally. The most straightforward solution consists in moving \cmd{defbibheading} after |\begin{document}|. Alternatively, you may use \sty{babel}'s \cmd{shorthandon} and \cmd{shorthandoff} commands to temporarily make the shorthands active in the preamble. The above also applies to bibliography notes and the \cmd{defbibnote} command. +Packages using active characters, such as \sty{babel}, \sty{polyglossia}, \sty{csquotes}, or \sty{underscore}, usually do not make them active until the beginning of the document body to avoid interference with other packages. A typical example of such an active character is the Ascii quote |"|, which is used by various language modules of the \sty{babel}/\sty{polyglossia} packages. If shorthands such as |"<| and |"a| are used in the argument to \cmd{defbibheading} and the headings are defined in the document preamble, the non-active form of the characters is saved in the heading definition. When the heading is typeset, they do not function as a command but are simply printed literally. The most straightforward solution consists in moving \cmd{defbibheading} after |\begin{document}|. Alternatively, you may use \sty{babel}'s \cmd{shorthandon} and \cmd{shorthandoff} commands to temporarily make the shorthands active in the preamble. The above also applies to bibliography notes and the \cmd{defbibnote} command. \subsubsection{Grouping in Reference Sections and Segments} \label{use:cav:grp} @@ -5347,6 +5372,26 @@ The entry key of an item in the \file{bib} file. This is the string used by \sty When citing a subentry of an entry set, \sty{biblatex} provides the data of the parent \bibtype{set} entry to citation commands. This implies that the \bibfield{entrykey} field holds the entry key of the parent. The entry key of the child entry being cited is provided in the \bibfield{childentrykey} field. This field is only available when citing a subentry of an entry set. +\fielditem{datelabelsource}{literal\BiberOnlyMark} + +Holds the prefix coming before <date> of the date field name chosen by \cmd{DeclareLabeldate}. For example, if the label date field is \bibfield{eventdate}, then \bibfield{datelabelsource} will be <event>. In case \cmd{DeclareLabeldate} selects the \bibfield{date} field, then \bibfield{datelabelsource} will be defined but will be an empty string as the prefix coming before <date> in the date label name is empty. This is so that the contents of \bibfield{datelabelsource} can be used in constructing references to the field which \cmd{DeclareLabeldate} chooses. Since \cmd{DeclareLabeldate} can also select literal strings for fallbacks, if \bibfield{datelabelsource} is undefined, then either the \opt{labeldate} package option is set to false or \cmd{DeclareLabeldate} chose a literal string instead of a date field. Bear in mind that \cmd{DeclareLabeldate} can also be used to select non-date fields as a fallback and so \bibfield{datelabelsource} might contain a field name. So, in summary, the rules are + +\begin{lstlisting}[style=latex]{} +\iffieldundef{datalabelsource} + { + % labeldate package option is not set or \DeclareLabeldate resolved to a literal string + } + { + \iffieldundef{\thefield{datelabelsource}} + { + % datelabelsource contains a date field name prefix like "", "event", "url" or "orig" + } + { + % datelabelsource contains a non-date field + } + } +\end{lstlisting} + \fielditem{entrytype}{string} The entry type (\bibtype{book}, \bibtype{inbook}, etc.), given in lowercase letters. @@ -5432,12 +5477,12 @@ The publication year, as specified in the \bibfield{date} or the \bibfield{year} \fielditem{labelmonth}{datepart} The publication month, as specified in the \bibfield{date} or the \bibfield{month} field, for use in author-year labels. Note that the \bibfield{labelmonth} field needs to be requested with the package option \opt{labeldate}, see \secref{use:opt:pre:int} for details. -\BiberOnlyMark With \biber, this source date field for this may be customized. See \secref{aut:ctm:fld} for details. +\BiberOnlyMark With \biber, the source date field for this may be customized. See \secref{aut:ctm:fld} for details. \fielditem{labelday}{datepart} The publication day, as specified in the \bibfield{date}, for use in author-year labels. Note that the \bibfield{labelday} field needs to be requested with the package option \opt{labeldate}, see \secref{use:opt:pre:int} for details. -\BiberOnlyMark With \biber, this source date field for this may be customized. See \secref{aut:ctm:fld} for details. +\BiberOnlyMark With \biber, the source date field for this may be customized. See \secref{aut:ctm:fld} for details. \fielditem{extrayear}{integer} @@ -5769,11 +5814,11 @@ This command prints the date of the entry, as specified in the fields \bibfield{ Similar to \cmd{printdate} but incorporates the \bibfield{extrayear} field in the date specification. This is useful for bibliography styles designed for author-year citations. -\csitem{printdatelabel}|\BiberOnlyMark| +\csitem{printdatelabel} -Similar to \cmd{printdate} but prints the date field determined by \cmd{DeclareLabeldate}. The date format is controlled by the package option \opt{datelabel} from \secref{use:opt:pre:gen}. Additional formatting may be applied by adjusting the field format \texttt{urldate} (\secref{aut:fmt:ich}). +Similar to \cmd{printdate} but prints the date field determined by \cmd{DeclareLabeldate}. The date format is controlled by the package option \opt{datelabel} from \secref{use:opt:pre:gen}. Additional formatting may be applied by adjusting the field format \texttt{datelabel} (\secref{aut:fmt:ich}). -\csitem{printdateextralabel}|\BiberOnlyMark| +\csitem{printdateextralabel} Similar to \cmd{printdatelabel} but incorporates the \bibfield{extrayear} field in the date specification. This is useful for bibliography styles designed for author-year citations. @@ -5804,7 +5849,7 @@ This command is similar to \cmd{printnames} except that the items in the list ar \cmditem{entrydata}{key}{code} \cmditem*{entrydata*}{key}{code} -Data commands like \cmd{printfield} normally use the data of the entry currently being processed. You may use \cmd{entrydata} to switch contexts locally. The \prm{key} is the entry key of the entry to use locally. The \prm{code} is arbitrary code to be executed in this context. This code will be executed in a group. See \secref{aut:cav:mif} for an example. Note that this command will automatically switch languages if the \opt{babel} package option is enabled. The starred version \cmd{entrydata*} will clone all fields of the enclosing entry, using field, counter, and other resource names prefixed with the string <\texttt{saved}>. This is useful when comparing two data sets. For example, inside the \prm{code} argument, the \bibfield{author} field holds the author of entry \prm{key} and the author of the enclosing entry is available as \bibfield{savedauthor}. The \cnt{author} counter holds the number of names in the \bibfield{author} field of \prm{key}; the \bibfield{savedauthor} counter refers to the author count of the enclosing entry. +Data commands like \cmd{printfield} normally use the data of the entry currently being processed. You may use \cmd{entrydata} to switch contexts locally. The \prm{key} is the entry key of the entry to use locally. The \prm{code} is arbitrary code to be executed in this context. This code will be executed in a group. See \secref{aut:cav:mif} for an example. Note that this command will automatically switch languages if the \opt{autolang} package option is enabled. The starred version \cmd{entrydata*} will clone all fields of the enclosing entry, using field, counter, and other resource names prefixed with the string <\texttt{saved}>. This is useful when comparing two data sets. For example, inside the \prm{code} argument, the \bibfield{author} field holds the author of entry \prm{key} and the author of the enclosing entry is available as \bibfield{savedauthor}. The \cnt{author} counter holds the number of names in the \bibfield{author} field of \prm{key}; the \bibfield{savedauthor} counter refers to the author count of the enclosing entry. \cmditem{entryset}{precode}{postcode} @@ -5972,7 +6017,7 @@ Contains an ordered set of \cmd{map} elements each of which is a logically relat \begin{optionlist*} -\choitem{datatype}{bibtex, biblatexml, ris, zoterordfxml, endnotexml} +\choitem[bibtex]{datatype}{bibtex, biblatexml, ris, zoterordfxml, endnotexml} Data source type to which the contained \cmd{map} directives apply (\secref{use:bib:res}). @@ -6074,7 +6119,7 @@ be changed (used as \texttt{fieldset}, \texttt{fieldtarget} or changed using \te \cmditem{DeclareStyleSourcemap}{specification}|\BiberOnlyMark| -This command sets the source mappings used by a style. Such mappings are conceptually separate from user mappings defined with \cmd{DeclareSourcemap} and are applied directly after user maps. The syntax is identical to \cmd{DeclareSourcemap}. This command is provided for style authors so that any maps defined for the style no not interfere with user maps or the default driver maps defined with \cmd{DeclareDriverSourcemap}. +This command sets the source mappings used by a style. Such mappings are conceptually separate from user mappings defined with \cmd{DeclareSourcemap} and are applied directly after user maps. The syntax is identical to \cmd{DeclareSourcemap}. This command is provided for style authors so that any maps defined for the style do not interfere with user maps or the default driver maps defined with \cmd{DeclareDriverSourcemap}. \end{ltxsyntax} @@ -6669,7 +6714,7 @@ Specifies the script variant of a field, if the datasource you are using support \choitem[none]{lang}{<language specifier>} -Specifies the \sty{babel} language variant of a field if the datasource you are using supports this. The default, if no \prm{lang} option is set, this means to use the field variant in the datasource which has no explicit language defined. +Specifies the \sty{babel}/\sty{polyglossia} language variant of a field if the datasource you are using supports this. The default, if no \prm{lang} option is set, this means to use the field variant in the datasource which has no explicit language defined. \end{optionlist*} @@ -7787,7 +7832,7 @@ otherwise. \cmditem{usedriver}{code}{entrytype} -Executes the bibliography driver for an \prm{entrytype}. Calling this command in the \prm{loopcode} of a citation command defined with \cmd{DeclareCiteCommand} is a simple way to print full citations similar to a bibliography entry. Commands such as \cmd{newblock}, which are not applicable in a citation, are disabled automatically. Additional initialization commands may be passed as the \prm{code} argument. This argument is executed inside the group in which \cmd{usedriver} runs the respective driver. Note that it is mandatory in terms of the syntax but may be left empty. Also note that this command will automatically switch languages if the \opt{babel} package option is enabled. +Executes the bibliography driver for an \prm{entrytype}. Calling this command in the \prm{loopcode} of a citation command defined with \cmd{DeclareCiteCommand} is a simple way to print full citations similar to a bibliography entry. Commands such as \cmd{newblock}, which are not applicable in a citation, are disabled automatically. Additional initialization commands may be passed as the \prm{code} argument. This argument is executed inside the group in which \cmd{usedriver} runs the respective driver. Note that it is mandatory in terms of the syntax but may be left empty. Also note that this command will automatically switch languages if the \opt{autolang} package option is enabled. \cmditem{bibhypertarget}{name}{text} @@ -7820,7 +7865,7 @@ Similar to \cmd{MakeUppercase} but only coverts the first printable character in \cmditem{MakeSentenceCase}{text} \cmditem*{MakeSentenceCase*}{text} -Converts its \prm{text} argument to sentence case, \ie the first word is capitalized and the remainder of the string is converted to lowercase. This command is robust. The starred variant differs from the regular version in that it considers the language of the entry, as specified in the \bibfield{hyphenation} field. It only converts the \prm{text} to sentence case if the \bibfield{hyphenation} field is undefined or if it holds a language declared with \cmd{DeclareCaseLangs} (see below).\footnote{By default, converting to sentence case is enabled for the following language identifiers: \texttt{american}, \texttt{british}, \texttt{canadian}, \texttt{english}, \texttt{australian}, \texttt{newzealand} as well as the aliases \texttt{USenglish} and \texttt{UKenglish}. Use \cmd{DeclareCaseLangs} to extend or change this list.} Otherwise, the \prm{text} is not altered in any way. It is recommended to use \cmd{MakeSentenceCase*} rather than the regular variant in formatting directives. Both variants support the traditional \bibtex convention for \file{bib} files that anything wrapped in a pair of curly braces is not modified when changing the case. For example: +Converts its \prm{text} argument to sentence case, \ie the first word is capitalized and the remainder of the string is converted to lowercase. This command is robust. The starred variant differs from the regular version in that it considers the language of the entry, as specified in the \bibfield{langid} field. It only converts the \prm{text} to sentence case if the \bibfield{langid} field is undefined or if it holds a language declared with \cmd{DeclareCaseLangs} (see below).\footnote{By default, converting to sentence case is enabled for the following language identifiers: \texttt{american}, \texttt{british}, \texttt{canadian}, \texttt{english}, \texttt{australian}, \texttt{newzealand} as well as the aliases \texttt{USenglish} and \texttt{UKenglish}. Use \cmd{DeclareCaseLangs} to extend or change this list.} Otherwise, the \prm{text} is not altered in any way. It is recommended to use \cmd{MakeSentenceCase*} rather than the regular variant in formatting directives. Both variants support the traditional \bibtex convention for \file{bib} files that anything wrapped in a pair of curly braces is not modified when changing the case. For example: \begin{lstlisting}[style=latex]{} \MakeSentenceCase{an Introduction to LaTeX} @@ -7976,7 +8021,7 @@ This command configures the \cmd{ifnumerals} and \cmd{ifpages} tests from \secre \DeclareRangeChars{~,;-+/} \end{lstlisting} % -This means that strings like <3--5>, <35+>, <8/9> and so on will be considered as a range by \cmd{ifnumerals} and \cmd{ifpages}. See also \secref{bib:use:pag, use:cav:pag} for further details. +This means that strings like <3--5>, <35+>, <8/9> and so on will be considered as a range by \cmd{ifnumerals} and \cmd{ifpages}. Non-range characters in such strings are recognized as numbers. So strings like <3a--5a> and <35b+> are not deemed to be ranges by default. See also \secref{bib:use:pag, use:cav:pag} for further details. \cmditem{DeclareRangeCommands}{commands} \cmditem*{DeclareRangeCommands*}{commands} @@ -8005,7 +8050,7 @@ Use this command to temporarily redefine any commands which interfere with the t \cmditem{DeclareCaseLangs}{languages} \cmditem*{DeclareCaseLangs*}{languages} -Defines the list of languages which are considered by the \cmd{MakeSentenceCase*} command as it converts a string to sentence case. The \prm{languages} argument is a comma"=separated list of \sty{babel} languages identifiers. The regular version of this command replaces the current setting, the starred version appends its argument to the current list. The default setting is: +Defines the list of languages which are considered by the \cmd{MakeSentenceCase*} command as it converts a string to sentence case. The \prm{languages} argument is a comma"=separated list of \sty{babel}/\sty{polyglossia} languages identifiers. The regular version of this command replaces the current setting, the starred version appends its argument to the current list. The default setting is: \begin{lstlisting}[style=latex]{} \DeclareCaseLangs{% @@ -8013,7 +8058,7 @@ Defines the list of languages which are considered by the \cmd{MakeSentenceCase* USenglish,UKenglish} \end{lstlisting} % -See the \sty{babel} manual and \tabref{bib:fld:tab1} for a list of languages identifiers. +See the \sty{babel}/\sty{polyglossia} manuals and \tabref{bib:fld:tab1} for a list of languages identifiers. \cmditem{BibliographyWarning}{message} @@ -8377,7 +8422,7 @@ Switches from the current language to the main document language. This can be us \subsection{Localization Modules} \label{aut:lng} -A localization module provides translations for key terms such as <edition> or <volume> as well as definitions for language specific features such as the date format and ordinals. These definitions are provided in files with the suffix \file{lbx}. The base name of the file must be a language name known to the \sty{babel} package. The \file{lbx} files may also be used to map \sty{babel}'s language names to the backend modules of the \sty{biblatex} package. All localization modules are loaded on demand in the document body. Note that the contents of the file are processed in a group and that the category code of the character \texttt{@} is temporarily set to <letter>. +A localization module provides translations for key terms such as <edition> or <volume> as well as definitions for language specific features such as the date format and ordinals. These definitions are provided in files with the suffix \file{lbx}. The base name of the file must be a language name known to the \sty{babel}/\sty{polyglossia} packages. The \file{lbx} files may also be used to map \sty{babel}/\sty{polyglossia} language names to the backend modules of the \sty{biblatex} package. All localization modules are loaded on demand in the document body. Note that the contents of the file are processed in a group and that the category code of the character \texttt{@} is temporarily set to <letter>. \subsubsection{Localization Commands} \label{aut:lng:cmd} @@ -8441,10 +8486,10 @@ This command is only available in \file{lbx} files. It copies the bibliography e This command corresponds to \cmd{DefineHyphenationExceptions} from \secref{use:lng}. The difference is that it is only available in \file{lbx} files and that the \prm{language} argument is omitted. The hyphenation exceptions will affect the language of the \file{lbx} file currently being processed. -\cmditem{DeclareRedundantLanguages}{language, language, ...}{babel, babel, ...} +\cmditem{DeclareRedundantLanguages}{language, language, ...}{langid, langid, ...} This command provides the language mappings required by the \opt{clearlang} option from \secref{use:opt:pre:gen}. -The \prm{language} is the string given in the \bibfield{language} field (without the optional \texttt{lang} prefix); \prm{babel} is \sty{babel}'s language identifier, as given in the optional argument of \cmd{usepackage} when loading \sty{babel}. This command may be used in \file{lbx} files or in the document preamble. Here are some examples: +The \prm{language} is the string given in the \bibfield{language} field (without the optional \texttt{lang} prefix); \prm{langid} is \sty{babel}/\sty{polyglossia}'s language identifier, as given in the optional argument of \cmd{usepackage} when loading \sty{babel} or the argument of \cmd{setdefaultlanguage} or \cmd{setotherlanguages} when using \sty{polyglossia}. This command may be used in \file{lbx} files or in the document preamble. Here are some examples: \begin{lstlisting}[style=latex]{} \DeclareRedundantLanguages{french}{french} @@ -8453,11 +8498,11 @@ The \prm{language} is the string given in the \bibfield{language} field (without canadian,australian,newzealand,USenglish,UKenglish} \end{lstlisting} % -Note that this feature needs to be enabled globally with the \opt{clearlang} option from \secref{use:opt:pre:gen}. If it is disabled, all mappings will be ignored. If the \prm{babel} parameter is blank, \sty{biblatex} will clear the mappings for the corresponding \prm{language}, \ie the feature will be disabled for this \prm{language} only. +Note that this feature needs to be enabled globally with the \opt{clearlang} option from \secref{use:opt:pre:gen}. If it is disabled, all mappings will be ignored. If the \prm{langid} parameter is blank, \sty{biblatex} will clear the mappings for the corresponding \prm{language}, \ie the feature will be disabled for this \prm{language} only. \cmditem{DeclareLanguageMapping}{language}{file} -This command maps a \sty{babel} language identifier to an \file{lbx} file. The \prm{language} must be a language name known to the \sty{babel} package, \ie one of the identifiers listed in \tabref{bib:fld:tab1}. The \prm{file} argument is the name of an alternative \file{lbx} file without the \texttt{.lbx} suffix. Declaring the same mapping more than once is possible. Subsequent declarations will simply overwrite any previous ones. This command may only be used in the preamble. See \secref{aut:cav:lng} for further details. +This command maps a \sty{babel}/\sty{polyglossia} language identifier to an \file{lbx} file. The \prm{language} must be a language name known to the \sty{babel}/\sty{polyglossia} package, \ie one of the identifiers listed in \tabref{bib:fld:tab1}. The \prm{file} argument is the name of an alternative \file{lbx} file without the \texttt{.lbx} suffix. Declaring the same mapping more than once is possible. Subsequent declarations will simply overwrite any previous ones. This command may only be used in the preamble. See \secref{aut:cav:lng} for further details. \cmditem{NewBibliographyString}{key} @@ -10187,7 +10232,7 @@ Since the punctuation after the location is special if there is no publisher, we \subsubsection{Custom Localization Modules} \label{aut:cav:lng} -Style guides may include provisions as to how strings like <edition> should be abbreviated or they may mandate certain fixed expressions. For example, the \acr{mla} style guide requires authors to use the term <Works~Cited> rather than <Bibliography> or <References> in the heading of the bibliography. Localization commands such as \cmd{DefineBibliographyStrings} from \secref{use:lng} may indeed be used in \file{cbx} and \file{bbx} files to handle such cases. However, overloading style files with translations is rather inconvenient. This is where \cmd{DeclareLanguageMapping} from \secref{aut:lng:cmd} comes into play. This command maps an \file{lbx} file with alternative translations to a \sty{babel} language. For example, you could create a file named \path{french-humanities.lbx} which provides French translations adapted for use in the humanities and map it to the \sty{babel} language \texttt{french} in the preamble or in the configuration file: +Style guides may include provisions as to how strings like <edition> should be abbreviated or they may mandate certain fixed expressions. For example, the \acr{mla} style guide requires authors to use the term <Works~Cited> rather than <Bibliography> or <References> in the heading of the bibliography. Localization commands such as \cmd{DefineBibliographyStrings} from \secref{use:lng} may indeed be used in \file{cbx} and \file{bbx} files to handle such cases. However, overloading style files with translations is rather inconvenient. This is where \cmd{DeclareLanguageMapping} from \secref{aut:lng:cmd} comes into play. This command maps an \file{lbx} file with alternative translations to a \sty{babel}/\sty{polyglossia} language. For example, you could create a file named \path{french-humanities.lbx} which provides French translations adapted for use in the humanities and map it to the \sty{babel}/\sty{polyglossia} language \texttt{french} in the preamble or in the configuration file: \begin{lstlisting}[style=latex]{} \DeclareLanguageMapping{french}{french-humanities} @@ -10214,7 +10259,7 @@ Since the alternative \file{lbx} file can inherit strings from the standard \pat % Alternative \file{lbx} files must ensure that the localization module is complete. They will typically do so by inheriting data from the corresponding standard module. If the language \texttt{american} is mapped to \path{american-mla.lbx}, \sty{biblatex} will not load \path{american.lbx} unless this module is requested explicitly. In the above example, inheriting <strings> and <extras> will cause \sty{biblatex} to load \path{american.lbx} before applying the modifications in \path{american-mla.lbx}. -Note that \cmd{DeclareLanguageMapping} is not intended to handle language variants (\eg American English vs. British English) or \sty{babel} language aliases (\eg \texttt{USenglish} vs. \texttt{american}). For example, \sty{babel} offers the \texttt{USenglish} option which is similar to \texttt{american}. Therefore, \sty{biblatex} ships with an \path{USenglish.lbx} file which simply inherits all data from \path{american.lbx} (which in turn gets the <strings> from \path{english.lbx}). In other words, the mapping of language variants and \sty{babel} language aliases happens on the file level, the point being that \sty{biblatex}'s language support can be extended simply by adding additional \file{lbx} files. There is no need for centralized mapping. If you need support for, say, Portuguese (babel: \file{portuges}), you create a file named \path{portuges.lbx}. If \sty{babel} offered an alias named \texttt{brasil}, you would create \path{brasil.lbx} and inherit the data from \path{portuges.lbx}. In contrast to that, the point of \cmd{DeclareLanguageMapping} is handling \emph{stylistic} variants like <humanities vs. natural sciences> or <\acr{mla} vs. \acr{apa}> etc. which will typically be built on top of existing \file{lbx} files. +Note that \cmd{DeclareLanguageMapping} is not intended to handle language variants (\eg American English vs. British English) or \sty{babel}/\sty{polyglossia} language aliases (\eg \texttt{USenglish} vs. \texttt{american}). For example, \sty{babel}/\sty{polyglossia} offers the \texttt{USenglish} option which is similar to \texttt{american}. Therefore, \sty{biblatex} ships with an \path{USenglish.lbx} file which simply inherits all data from \path{american.lbx} (which in turn gets the <strings> from \path{english.lbx}). In other words, the mapping of language variants and \sty{babel}/\sty{polyglossia} language aliases happens on the file level, the point being that \sty{biblatex}'s language support can be extended simply by adding additional \file{lbx} files. There is no need for centralized mapping. If you need support for, say, Portuguese (babel/polyglossia: \file{portuges}), you create a file named \path{portuges.lbx}. If \sty{babel}/\sty{polyglossia} offered an alias named \texttt{brasil}, you would create \path{brasil.lbx} and inherit the data from \path{portuges.lbx}. In contrast to that, the point of \cmd{DeclareLanguageMapping} is handling \emph{stylistic} variants like <humanities vs. natural sciences> or <\acr{mla} vs. \acr{apa}> etc. which will typically be built on top of existing \file{lbx} files. \subsubsection{Grouping} \label{aut:cav:grp} @@ -10849,7 +10894,7 @@ alldates &\+&\+&\_&\_\\ arxiv &\+&\+&\_&\_\\ autocite &\+&\+&\_&\_\\ autopunct &\+&\+&\_&\_\\ -babel &\+&\+&\_&\_\\ +autolang &\+&\+&\_&\_\\ backend &\+&\_&\_&\_\\ backref &\+&\+&\_&\_\\ backrefsetstyle &\+&\+&\_&\_\\ @@ -10948,6 +10993,16 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{2.8}{2013-10-21} +\item New \bibfield{langidopts}\see{bib:fld:spc} +\item \bibfield{hyphenation} field renamed to \bibfield{langid}\see{bib:fld:spc} +\item \sty{polyglossia} support +\item Renamed \opt{babel} option to \opt{autolang}\see{use:opt:pre:gen} +\item Corrected Dutch localisation +\item Added \opt{datelabel=year} option\see{use:opt:pre:gen} +\item Added \bibfield{datelabelsource} field\see{aut:bbx:fld:gen} +\end{release} + \begin{release}{2.7a}{2013-07-14} \item Bugfix - respect maxnames and uniquelist in \cmd{finalandsemicolon} \item Corrected French localisation diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.tex b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.tex index fef863a4516..482e4608cef 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple.tex @@ -24,7 +24,7 @@ % % We set the 'indexing' package option and use the 'authortitle' % style in this example. -\usepackage[indexing,style=authortitle,babel=hyphen,backend=biber]{biblatex} +\usepackage[indexing,style=authortitle,autolang=hyphen,backend=biber]{biblatex} \addbibresource{biblatex-examples.bib} % % We want three indexes: a general index, an index of names, and an diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.tex b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.tex index ff4f8fb32ec..1fc83fde2f8 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry.tex @@ -26,7 +26,7 @@ % We set the 'indexing' package option and use the 'authortitle' % style in this example. % -\usepackage[indexing=cite,style=authortitle,babel=hyphen,backend=biber]{biblatex} +\usepackage[indexing=cite,style=authortitle,autolang=hyphen,backend=biber]{biblatex} \addbibresource{biblatex-examples.bib} % % We want two indexes: an index of names with title subentries, an index of diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib index e2fb9051305..ca78376c7cc 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib +++ b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib @@ -1,20 +1,21 @@ -@string{ anch-ie = {Angew.~Chem. Int.~Ed.} } -@string{ cup = {Cambridge University Press} } -@string{ dtv = {Deutscher Taschenbuch-Verlag} } -@string{ hup = {Harvard University Press} } -@string{ jams = {J.~Amer. Math. Soc.} } -@string{ jchph = {J.~Chem. Phys.} } -@string{ jomch = {J.~Organomet. Chem.} } -@string{ pup = {Princeton University Press} } - -@InCollection{westfahl:space, +@string{anch-ie = {Angew.~Chem. Int.~Ed.}} +@string{cup = {Cambridge University Press}} +@string{dtv = {Deutscher Taschenbuch-Verlag}} +@string{hup = {Harvard University Press}} +@string{jams = {J.~Amer. Math. Soc.}} +@string{jchph = {J.~Chem. Phys.}} +@string{jomch = {J.~Organomet. Chem.}} +@string{pup = {Princeton University Press}} + +@incollection{westfahl:space, author = {Westfahl, Gary}, title = {The True Frontier}, subtitle = {Confronting and Avoiding the Realities of Space in American Science Fiction Films}, pages = {55-65}, crossref = {westfahl:frontier}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {True Frontier, The}, annotation = {A cross-referenced article from a \texttt{collection}. This is an \texttt{incollection} entry with a \texttt{crossref} @@ -24,16 +25,22 @@ @set{set, entryset = {herrmann,aksin,yoon}, - annotation = {A \texttt{set} with three members}, + annotation = {A \texttt{set} with three members. The \texttt{crossref} field + in the \texttt{@set} entry and the \texttt{entryset} field in + each set member entry is needed only when using BibTeX as the + backend}, } @set{stdmodel, entryset = {glashow,weinberg,salam}, annotation = {A \texttt{set} with three members discussing the standard - model of particle physics}, + model of particle physics. The \texttt{crossref} field + in the \texttt{@set} entry and the \texttt{entryset} field in + each set member entry is needed only when using BibTeX as the + backend}, } -@Article{aksin, +@article{aksin, author = {Aks{\i}n, {\"O}zge and T{\"u}rkmen, Hayati and Artok, Levent and {\k{C}}etinkaya, Bekir and Ni, Chaoying and B{\"u}y{\"u}kg{\"u}ng{\"o}r, Orhan and {\"O}zkal, Erhan}, @@ -48,15 +55,15 @@ indextitle = {Effect of immobilization on catalytic characteristics}, } -@Article{angenendt, +@article{angenendt, author = {Angenendt, Arnold}, - title = {In Honore Salvatoris~-- Vom Sinn und Unsinn der - Patrozinienkunde}, + title = {In Honore Salvatoris~-- "<Vom Sinn und Unsinn der + Patrozinienkunde">}, journaltitle = {Revue d'Histoire Eccl{\'e}siastique}, date = 2002, volume = 97, pages = {431--456, 791--823}, - hyphenation = {german}, + langid = {german}, indextitle = {In Honore Salvatoris}, shorttitle = {In Honore Salvatoris}, annotation = {A German article in a French journal. Apart from that, a @@ -64,7 +71,7 @@ field}, } -@Article{baez/article, +@article{baez/article, author = {Baez, John C. and Lauda, Aaron D.}, title = {Higher-Dimensional Algebra V: 2-Groups}, journaltitle = {Theory and Applications of Categories}, @@ -74,7 +81,8 @@ version = 3, eprint = {math/0307200v3}, eprinttype = {arxiv}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {An \texttt{article} with \texttt{eprint} and \texttt{eprinttype} fields. Note that the arXiv reference is transformed into a clickable link if \texttt{hyperref} support @@ -82,7 +90,7 @@ is the same item given as an \texttt{online} entry}, } -@Article{bertram, +@article{bertram, author = {Bertram, Aaron and Wentworth, Richard}, title = {Gromov invariants for holomorphic maps on Riemann surfaces}, journaltitle = jams, @@ -90,20 +98,22 @@ volume = 9, number = 2, pages = {529-571}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, shorttitle = {Gromov invariants}, annotation = {An \texttt{article} entry with a \texttt{volume} and a \texttt{number} field}, } -@Article{doody, +@article{doody, author = {Doody, Terrence}, title = {Hemingway's Style and Jake's Narration}, year = 1974, volume = 4, number = 3, pages = {212-225}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, related = {matuz:doody}, relatedstring= {\autocap{e}xcerpt in}, journal = {The Journal of Narrative Technique}, @@ -112,7 +122,7 @@ \texttt{related} and \texttt{relatedstring} fields}, } -@Collection{matuz:doody, +@collection{matuz:doody, editor = {Matuz, Roger}, title = {Contemporary Literary Criticism}, year = 1990, @@ -120,13 +130,14 @@ publisher = {Gale}, location = {Detroit}, pages = {204-208}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {A \texttt{collection} entry providing the excerpt information for the \texttt{doody} entry. Note the format of the \texttt{pages} field}, } -@Article{gillies, +@article{gillies, author = {Gillies, Alexander}, title = {Herder and the Preparation of Goethe's Idea of World Literature}, @@ -135,13 +146,14 @@ series = {newseries}, volume = 9, pages = {46-67}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {An \texttt{article} entry with a \texttt{series} and a \texttt{volume} field. Note that format of the \texttt{series} field in the database file}, } -@Article{glashow, +@article{glashow, author = {Glashow, Sheldon}, title = {Partial Symmetries of Weak Interactions}, journaltitle = {Nucl.~Phys.}, @@ -150,7 +162,7 @@ pages = {579-588}, } -@Article{herrmann, +@article{herrmann, author = {Herrmann, Wolfgang A. and {\"O}fele, Karl and Schneider, Sabine K. and Herdtweck, Eberhardt and Hoffmann, Stephan D.}, title = {A carbocyclic carbene as an efficient catalyst ligand for C--C @@ -163,7 +175,7 @@ indextitle = {Carbocyclic carbene as an efficient catalyst, A}, } -@Article{kastenholz, +@article{kastenholz, author = {Kastenholz, M. A. and H{\"u}nenberger, Philippe H.}, title = {Computation of methodology\hyphen independent ionic solvation free energies from molecular simulations}, @@ -173,7 +185,8 @@ volume = 124, eid = 124106, doi = {10.1063/1.2172593}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Computation of ionic solvation free energies}, annotation = {An \texttt{article} entry with an \texttt{eid} and a \texttt{doi} field. Note that the \textsc{doi} is transformed @@ -203,7 +216,7 @@ cavities within them).}, } -@Article{murray, +@article{murray, author = {Hostetler, Michael J. and Wingate, Julia E. and Zhong, Chuan-Jian and Harris, Jay E. and Vachet, Richard W. and Clark, Michael R. and Londono, J. David and Green, Stephen @@ -218,7 +231,8 @@ volume = 14, number = 1, pages = {17-30}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Alkanethiolate gold cluster molecules}, shorttitle = {Alkanethiolate gold cluster molecules}, annotation = {An \texttt{article} entry with \arabic{author} authors. By @@ -226,7 +240,7 @@ truncated. This is configurable}, } -@Article{reese, +@article{reese, author = {Reese, Trevor R.}, title = {Georgia in Anglo-Spanish Diplomacy, 1736-1739}, journaltitle = {William and Mary Quarterly}, @@ -234,7 +248,8 @@ series = 3, volume = 15, pages = {168-190}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {An \texttt{article} entry with a \texttt{series} and a \texttt{volume} field. Note the format of the series. If the value of the \texttt{series} field is an integer, this number @@ -242,7 +257,7 @@ appended automatically}, } -@Article{sarfraz, +@article{sarfraz, author = {M. Sarfraz and M. F. A. Razzak}, title = {Technical section: {An} algorithm for automatic capturing of the font outlines}, @@ -255,7 +270,7 @@ annotation = {An \texttt{article} entry with an \texttt{issn} field}, } -@Article{shore, +@article{shore, author = {Shore, Bradd}, title = {Twice-Born, Once Conceived}, journaltitle = {American Anthropologist}, @@ -270,7 +285,7 @@ of the \texttt{series} which is a localization key}, } -@Article{sigfridsson, +@article{sigfridsson, author = {Sigfridsson, Emma and Ryde, Ulf}, title = {Comparison of methods for deriving atomic charges from the electrostatic potential and moments}, @@ -280,7 +295,8 @@ number = 4, pages = {377-395}, doi = {10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Methods for deriving atomic charges}, annotation = {An \texttt{article} entry with \texttt{volume}, \texttt{number}, and \texttt{doi} fields. Note that the @@ -303,7 +319,7 @@ discussed.}, } -@Article{spiegelberg, +@article{spiegelberg, author = {Spiegelberg, Herbert}, title = {\mkbibquote{Intention} und \mkbibquote{Intentionalit{\"a}t} in der Scholastik, bei Brentano und Husserl}, @@ -311,7 +327,7 @@ date = 1969, volume = 29, pages = {189-216}, - hyphenation = {german}, + langid = {german}, sorttitle = {Intention und Intentionalitat in der Scholastik, bei Brentano und Husserl}, indexsorttitle= {Intention und Intentionalitat in der Scholastik, bei Brentano @@ -322,19 +338,20 @@ the database file}, } -@Article{springer, +@article{springer, author = {Springer, Otto}, title = {Mediaeval Pilgrim Routes from Scandinavia to Rome}, journaltitle = {Mediaeval Studies}, date = 1950, volume = 12, pages = {92-122}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, shorttitle = {Mediaeval Pilgrim Routes}, annotation = {A plain \texttt{article} entry}, } -@Article{weinberg, +@article{weinberg, author = {Weinberg, Steven}, title = {A Model of Leptons}, journaltitle = {Phys.~Rev.~Lett.}, @@ -343,7 +360,7 @@ pages = {1264-1266}, } -@Article{yoon, +@article{yoon, author = {Yoon, Myeong S. and Ryu, Dowook and Kim, Jeongryul and Ahn, Kyo Han}, title = {Palladium pincer complexes with reduced bond angle strain: @@ -356,7 +373,7 @@ indextitle = {Palladium pincer complexes}, } -@Book{aristotle:anima, +@book{aristotle:anima, author = {Aristotle}, title = {De Anima}, date = 1907, @@ -364,12 +381,13 @@ publisher = cup, location = {Cambridge}, keywords = {primary}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {A \texttt{book} entry with an \texttt{author} and an \texttt{editor}}, } -@Book{aristotle:physics, +@book{aristotle:physics, author = {Aristotle}, title = {Physics}, date = 1929, @@ -377,12 +395,13 @@ publisher = {G. P. Putnam}, location = {New York}, keywords = {primary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, shorttitle = {Physics}, annotation = {A \texttt{book} entry with a \texttt{translator} field}, } -@Book{aristotle:poetics, +@book{aristotle:poetics, author = {Aristotle}, title = {Poetics}, date = 1968, @@ -391,13 +410,14 @@ publisher = {Clarendon Press}, location = {Oxford}, keywords = {primary}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, shorttitle = {Poetics}, annotation = {A \texttt{book} entry with an \texttt{author} and an \texttt{editor} as well as a \texttt{series} field}, } -@Book{aristotle:rhetoric, +@book{aristotle:rhetoric, author = {Aristotle}, title = {The Rhetoric of Aristotle with a commentary by the late Edward Meredith Cope}, @@ -407,7 +427,8 @@ volumes = 3, publisher = cup, keywords = {primary}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, sorttitle = {Rhetoric of Aristotle}, indextitle = {Rhetoric of Aristotle, The}, shorttitle = {Rhetoric}, @@ -417,18 +438,19 @@ fields}, } -@Book{augustine, +@book{augustine, author = {Augustine, Robert L.}, title = {Heterogeneous catalysis for the synthetic chemist}, date = 1995, publisher = {Marcel Dekker}, location = {New York}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, shorttitle = {Heterogeneous catalysis}, annotation = {A plain \texttt{book} entry}, } -@Book{averroes/bland, +@book{averroes/bland, author = {Averroes}, title = {The Epistle on the Possibility of Conjunction with the Active Intellect by Ibn Rushd with the Commentary of Moses Narboni}, @@ -440,7 +462,8 @@ publisher = {Jewish Theological Seminary of America}, location = {New York}, keywords = {primary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Epistle on the Possibility of Conjunction, The}, shorttitle = {Possibility of Conjunction}, annotation = {A \texttt{book} entry with a \texttt{series} and a @@ -449,7 +472,7 @@ \texttt{indextitle} field}, } -@Book{averroes/hannes, +@book{averroes/hannes, author = {Averroes}, title = {Des Averro{\"e}s Abhandlung: \mkbibquote{{\"U}ber die M{\"o}glichkeit der Conjunktion} oder \mkbibquote{{\"U}ber den @@ -461,7 +484,7 @@ publisher = {C.~A. Kaemmerer}, location = {Halle an der Saale}, keywords = {primary}, - hyphenation = {german}, + langid = {german}, sorttitle = {Uber die Moglichkeit der Conjunktion}, indexsorttitle= {Uber die Moglichkeit der Conjunktion}, indextitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion}, @@ -473,7 +496,7 @@ \texttt{indexsorttitle} fields}, } -@Book{averroes/hercz, +@book{averroes/hercz, author = {Averroes}, title = {Drei Abhandlungen {\"u}ber die Conjunction des separaten Intellects mit dem Menschen}, @@ -483,7 +506,7 @@ publisher = {S.~Hermann}, location = {Berlin}, keywords = {primary}, - hyphenation = {german}, + langid = {german}, indexsorttitle= {Drei Abhandlungen uber die Conjunction}, indextitle = {Drei Abhandlungen {\"u}ber die Conjunction}, subtitle = {Von Averroes (Vater und Sohn), aus dem Arabischen @@ -494,7 +517,7 @@ \texttt{indextitle} and \texttt{indexsorttitle} fields}, } -@Book{cicero, +@book{cicero, author = {Cicero, Marcus Tullius}, title = {De natura deorum. {\"U}ber das Wesen der G{\"o}tter}, date = 1995, @@ -504,7 +527,7 @@ language = {langlatin and langgerman}, publisher = {Reclam}, location = {Stuttgart}, - hyphenation = {german}, + langid = {german}, indextitle = {De natura deorum}, shorttitle = {De natura deorum}, annotation = {A bilingual edition of Cicero's \emph{De natura deorum}, with @@ -514,7 +537,7 @@ \texttt{afterword} field}, } -@Book{coleridge, +@book{coleridge, author = {Coleridge, Samuel Taylor}, title = {Biographia literaria, or Biographical sketches of my literary life and opinions}, @@ -527,7 +550,8 @@ number = 75, publisher = {Routledge and Kegan Paul}, location = {London}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, indextitle = {Biographia literaria}, shorttitle = {Biographia literaria}, annotation = {One (partial) volume of a multivolume book. This is a @@ -537,7 +561,7 @@ and \texttt{number} fields}, } -@Book{companion, +@book{companion, author = {Goossens, Michel and Mittelbach, Frank and Samarin, Alexander}, title = {The LaTeX Companion}, date = 1994, @@ -545,7 +569,8 @@ publisher = {Addison-Wesley}, location = {Reading, Mass.}, pagetotal = 528, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {LaTeX Companion}, indextitle = {LaTeX Companion, The}, shorttitle = {LaTeX Companion}, @@ -554,7 +579,7 @@ bibliography}, } -@Book{cotton, +@book{cotton, author = {Cotton, Frank Albert and Wilkinson, Geoffrey and Murillio, Carlos A. and Bochmann, Manfred}, title = {Advanced inorganic chemistry}, @@ -562,20 +587,22 @@ edition = 6, publisher = {Wiley}, location = {Chichester}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {A \texttt{book} entry with \arabic{author} authors and an \texttt{edition} field. By default, long \texttt{author} and \texttt{editor} lists are automatically truncated. This is configurable}, } -@Book{gerhardt, +@book{gerhardt, author = {Gerhardt, Michael J.}, title = {The Federal Appointments Process}, date = 2000, publisher = {Duke University Press}, location = {Durham and London}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Federal Appointments Process}, indextitle = {Federal Appointments Process, The}, subtitle = {A Constitutional and Historical Analysis}, @@ -585,14 +612,15 @@ \texttt{indextitle} fields}, } -@Book{gonzalez, +@book{gonzalez, author = {Gonzalez, Ray}, title = {The Ghost of John Wayne and Other Stories}, date = 2001, publisher = {The University of Arizona Press}, location = {Tucson}, isbn = {0-816-52066-6}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Ghost of John Wayne and Other Stories}, indextitle = {Ghost of John Wayne and Other Stories, The}, shorttitle = {Ghost of John Wayne}, @@ -601,14 +629,15 @@ the database file. There's also an \texttt{isbn} field}, } -@Book{hammond, +@book{hammond, author = {Hammond, Christopher}, title = {The basics of crystallography and diffraction}, date = 1997, publisher = {International Union of Crystallography and Oxford University Press}, location = {Oxford}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, sorttitle = {Basics of crystallography and diffraction}, indextitle = {Basics of crystallography and diffraction, The}, shorttitle = {Crystallography and diffraction}, @@ -617,7 +646,7 @@ \texttt{publisher} field}, } -@Book{iliad, +@book{iliad, author = {Homer}, title = {Die Ilias}, date = 2004, @@ -626,7 +655,7 @@ edition = 3, publisher = {Artemis \& Winkler}, location = {D{\"u}sseldorf and Z{\"u}rich}, - hyphenation = {german}, + langid = {german}, sorttitle = {Ilias}, indextitle = {Ilias, Die}, shorttitle = {Ilias}, @@ -637,14 +666,15 @@ fields}, } -@Book{knuth:ct, +@book{knuth:ct, author = {Knuth, Donald E.}, title = {Computers \& Typesetting}, date = {1984/1986}, volumes = 5, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1984-0}, sorttitle = {Computers & Typesetting}, indexsorttitle= {Computers & Typesetting}, @@ -652,7 +682,7 @@ entry, note the \texttt{volumes} field}, } -@Book{knuth:ct:a, +@book{knuth:ct:a, author = {Knuth, Donald E.}, title = {The \TeX book}, date = 1984, @@ -660,7 +690,8 @@ volume = {A}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1984-1}, sorttitle = {Computers & Typesetting A}, indexsorttitle= {The TeXbook}, @@ -675,7 +706,7 @@ to be protected from expansion}, } -@Book{knuth:ct:b, +@book{knuth:ct:b, author = {Knuth, Donald E.}, title = {\TeX: The Program}, date = 1986, @@ -683,7 +714,8 @@ volume = {B}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1986-1}, sorttitle = {Computers & Typesetting B}, indexsorttitle= {TeX: The Program}, @@ -693,7 +725,7 @@ \texttt{indexsorttitle} field}, } -@Book{knuth:ct:c, +@book{knuth:ct:c, author = {Knuth, Donald E.}, title = {The METAFONTbook}, date = 1986, @@ -701,7 +733,8 @@ volume = {C}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1986-2}, sorttitle = {Computers & Typesetting C}, indextitle = {METAFONTbook, The}, @@ -711,7 +744,7 @@ \texttt{indextitle} field}, } -@Book{knuth:ct:d, +@book{knuth:ct:d, author = {Knuth, Donald E.}, title = {METAFONT: The Program}, date = 1986, @@ -719,7 +752,8 @@ volume = {D}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1986-3}, sorttitle = {Computers & Typesetting D}, shorttitle = {METAFONT}, @@ -727,7 +761,7 @@ \texttt{sorttitle} and \texttt{sortyear} fields}, } -@Book{knuth:ct:e, +@book{knuth:ct:e, author = {Knuth, Donald E.}, title = {Computer Modern Typefaces}, date = 1986, @@ -735,21 +769,23 @@ volume = {E}, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1986-4}, sorttitle = {Computers & Typesetting E}, annotation = {The fifth volume of a five-volume book. Note the \texttt{sorttitle} and \texttt{sortyear} fields}, } -@Book{knuth:ct:related, +@book{knuth:ct:related, author = {Knuth, Donald E.}, title = {Computers \& Typesetting}, date = {1984/1986}, volumes = 5, publisher = {Addison-Wesley}, location = {Reading, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sortyear = {1984-0}, sorttitle = {Computers & Typesetting}, indexsorttitle= {Computers & Typesetting}, @@ -760,16 +796,17 @@ \texttt{relatedtype} fields}, } -@Book{kullback, +@book{kullback, author = {Kullback, Solomon}, title = {Information Theory and Statistics}, year = 1959, publisher = {John Wiley \& Sons}, location = {New York}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, } -@Book{kullback:reprint, +@book{kullback:reprint, author = {Kullback, Solomon}, title = {Information Theory and Statistics}, year = 1997, @@ -777,33 +814,36 @@ location = {New York}, origyear = 1959, origpublisher= {John Wiley \& Sons}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {A reprint of the \texttt{kullback} entry. Note the format of \texttt{origyear} and \texttt{origpublisher}. These fields are not used by the standard bibliography styles}, } -@Book{kullback:related, +@book{kullback:related, author = {Kullback, Solomon}, title = {Information Theory and Statistics}, year = 1997, publisher = {Dover Publications}, location = {New York}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, related = {kullback}, relatedtype = {origpubin}, annotation = {A reprint of the \texttt{kullback} entry. Note the format of the \texttt{related} and \texttt{relatedtype} fields}, } -@Book{malinowski, +@book{malinowski, author = {Malinowski, Bronis{\l}aw}, title = {Argonauts of the Western Pacific}, date = 1972, edition = 8, publisher = {Routledge and Kegan Paul}, location = {London}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, subtitle = {An account of native enterprise and adventure in the Archipelagoes of Melanesian New Guinea}, shorttitle = {Argonauts}, @@ -812,7 +852,7 @@ \texttt{subtitle} field}, } -@Book{maron, +@book{maron, author = {Maron, Monika}, title = {Animal Triste}, date = 2000, @@ -820,7 +860,8 @@ origlanguage = {german}, publisher = {University of Nebraska Press}, location = {Lincoln}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, shorttitle = {Animal Triste}, annotation = {An English translation of a German novel with a French title. In other words: a \texttt{book} entry with a @@ -828,18 +869,19 @@ field which is concatenated with the \texttt{translator}}, } -@Book{massa, +@book{massa, author = {Werner Massa}, title = {Crystal structure determination}, date = 2004, edition = 2, publisher = {Spinger}, location = {Berlin}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {A \texttt{book} entry with an \texttt{edition} field}, } -@Article{moore, +@article{moore, author = {Moore, Gordon E.}, title = {Cramming more components onto integrated circuits}, journaltitle = {Electronics}, @@ -847,10 +889,11 @@ volume = 38, number = 8, pages = {114-117}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, } -@Article{moore:related, +@article{moore:related, author = {Moore, Gordon E.}, title = {Cramming more components onto integrated circuits}, journaltitle = {Proceedings of the {IEEE}}, @@ -858,14 +901,15 @@ volume = 86, number = 1, pages = {82-85}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, related = {moore}, relatedtype = {reprintfrom}, annotation = {A reprint of Moore's law. Note the \texttt{related} and \texttt{relatedtype} fields}, } -@Book{nietzsche:ksa, +@book{nietzsche:ksa, author = {Nietzsche, Friedrich}, title = {S{\"a}mtliche Werke}, date = 1988, @@ -874,7 +918,7 @@ volumes = 15, publisher = dtv # { and Walter de Gruyter}, location = {M{\"u}nchen and Berlin and New York}, - hyphenation = {german}, + langid = {german}, sortyear = {1988-0}, sorttitle = {Werke-00-000}, indexsorttitle= {Samtliche Werke}, @@ -889,7 +933,7 @@ first in the bibliography}, } -@Book{nietzsche:ksa1, +@book{nietzsche:ksa1, author = {Nietzsche, Friedrich}, title = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e Betrachtungen I--IV. Nachgelassene Schriften 1870--1973}, @@ -901,7 +945,7 @@ edition = 2, publisher = dtv # { and Walter de Gruyter}, location = {M{\"u}nchen and Berlin and New York}, - hyphenation = {german}, + langid = {german}, sortyear = {1988-1}, sorttitle = {Werke-01-000}, indexsorttitle= {Samtliche Werke I}, @@ -916,14 +960,15 @@ referring to the entire edition}, } -@Book{nussbaum, +@book{nussbaum, author = {Nussbaum, Martha}, title = {Aristotle's \mkbibquote{De Motu Animalium}}, date = 1978, publisher = pup, location = {Princeton}, keywords = {secondary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Aristotle's De Motu Animalium}, indexsorttitle= {Aristotle's De Motu Animalium}, annotation = {A \texttt{book} entry. Note the \texttt{sorttitle} and @@ -931,27 +976,28 @@ the database file}, } -@Book{piccato, +@book{piccato, author = {Piccato, Pablo}, title = {City of Suspects}, date = 2001, publisher = {Duke University Press}, location = {Durham and London}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, subtitle = {Crime in Mexico City, 1900--1931}, shorttitle = {City of Suspects}, annotation = {This is a \texttt{book} entry. Note the format of the \texttt{location} field in the database file}, } -@Book{vangennep, +@book{vangennep, author = {van Gennep, Arnold}, title = {Les rites de passage}, date = 1909, publisher = {Nourry}, location = {Paris}, options = {useprefix}, - hyphenation = {french}, + langid = {french}, sorttitle = {Rites de passage}, indextitle = {Rites de passage, Les}, shorttitle = {Rites de passage}, @@ -960,7 +1006,7 @@ field as well as \texttt{brandt} and \texttt{geer}}, } -@Book{vangennep:trans, +@book{vangennep:trans, author = {van Gennep, Arnold}, title = {The Rites of Passage}, year = 1960, @@ -972,20 +1018,21 @@ indextitle = {Rites of Passage, The}, sorttitle = {Rites of Passage}, shorttitle = {Rites of Passage}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {A translation of the \texttt{vangennep} entry. Note the \texttt{translator} and \texttt{origlanguage} fields. Compare with the \texttt{vangennep:related} entry.}, } -@Book{vangennep:related, +@book{vangennep:related, author = {van Gennep, Arnold}, title = {Les rites de passage}, date = 1909, publisher = {Nourry}, location = {Paris}, options = {useprefix}, - hyphenation = {french}, + langid = {french}, related = {vizedom:related}, relatedtype = {bytranslator}, sorttitle = {Rites de passage}, @@ -996,13 +1043,14 @@ \texttt{relatedtype} fields}, } -@Book{vizedom:related, +@book{vizedom:related, title = {The Rites of Passage}, year = 1960, translator = {Vizedom, Monika B. and Caffee, Gabrielle L.}, language = {english}, publisher = {University of Chicago Press}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, options = {usetranslator}, related = {vangennep}, relatedtype = {translationof}, @@ -1013,7 +1061,7 @@ the \texttt{related} and \texttt{relatedtype} fields}, } -@Book{vazques-de-parga, +@book{vazques-de-parga, author = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a and Ur{\'i}a R{\'i}u, Juan}, title = {Las Peregrinaciones a Santiago de Compostela}, @@ -1022,7 +1070,7 @@ note = {Ed. facs. de la realizada en 1948--49}, publisher = {Iberdrola}, location = {Pamplona}, - hyphenation = {spanish}, + langid = {spanish}, sorttitle = {Peregrinaciones a Santiago de Compostela}, indextitle = {Peregrinaciones a Santiago de Compostela, Las}, shorttitle = {Peregrinaciones}, @@ -1031,7 +1079,7 @@ \texttt{sorttitle}, and \texttt{indextitle} fields}, } -@Book{wilde, +@book{wilde, author = {Wilde, Oscar}, title = {The Importance of Being Earnest: A Trivial Comedy for Serious People}, @@ -1044,13 +1092,14 @@ fields.}, } -@Book{worman, +@book{worman, author = {Worman, Nancy}, title = {The Cast of Character}, date = 2002, publisher = {University of Texas Press}, location = {Austin}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Cast of Character}, indextitle = {Cast of Character, The}, subtitle = {Style in Greek Literature}, @@ -1059,7 +1108,7 @@ \texttt{indextitle} fields}, } -@Collection{britannica, +@collection{britannica, editor = {Preece, Warren E.}, title = {The New Encyclop{\ae}dia Britannica}, date = 2003, @@ -1069,7 +1118,8 @@ location = {Chicago, Ill.}, options = {useeditor=false}, label = {EB}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, sorttitle = {Encyclop{\ae}dia Britannica}, indextitle = {Encyclop{\ae}dia Britannica, The New}, shorttitle = {Encyclop{\ae}dia Britannica}, @@ -1083,14 +1133,15 @@ author-year citation styles}, } -@Collection{gaonkar, +@collection{gaonkar, editor = {Gaonkar, Dilip Parameshwar}, title = {Alternative Modernities}, date = 2001, publisher = {Duke University Press}, location = {Durham and London}, isbn = {0-822-32714-7}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {This is a \texttt{collection} entry. Note the format of the \texttt{location} field in the database file as well as the \texttt{isbn} field}, @@ -1108,7 +1159,7 @@ pages = {1-23}, } -@Collection{jaffe, +@collection{jaffe, editor = {Jaff{\'e}, Philipp}, title = {Regesta Pontificum Romanorum ab condita ecclesia ad annum post Christum natum \textsc{mcxcviii}}, @@ -1126,14 +1177,15 @@ \texttt{editoratype} fields}, } -@Collection{westfahl:frontier, +@collection{westfahl:frontier, editor = {Westfahl, Gary}, title = {Space and Beyond}, date = 2000, subtitle = {The Frontier Theme in Science Fiction}, publisher = {Greenwood}, location = {Westport, Conn. and London}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, booktitle = {Space and Beyond}, booksubtitle = {The Frontier Theme in Science Fiction}, annotation = {This is a \texttt{collection} entry. Note the format of the @@ -1141,7 +1193,7 @@ \texttt{booksubtitle} fields}, } -@InBook{kant:kpv, +@inbook{kant:kpv, title = {Kritik der praktischen Vernunft}, date = 1968, author = {Kant, Immanuel}, @@ -1153,7 +1205,7 @@ location = {Berlin}, pages = {1-163}, shorthand = {KpV}, - hyphenation = {german}, + langid = {german}, shorttitle = {Kritik der praktischen Vernunft}, annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is an \texttt{inbook} entry which explicitly refers to the @@ -1164,7 +1216,7 @@ \texttt{author} and \texttt{bookauthor} fields are identical}, } -@InBook{kant:ku, +@inbook{kant:ku, title = {Kritik der Urtheilskraft}, date = 1968, author = {Kant, Immanuel}, @@ -1176,14 +1228,14 @@ location = {Berlin}, pages = {165-485}, shorthand = {KU}, - hyphenation = {german}, + langid = {german}, annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is an \texttt{inbook} entry which explicitly refers to the \emph{Critique of Judgment} only, not to the entire fifth volume}, } -@InBook{nietzsche:historie, +@inbook{nietzsche:historie, title = {Unzeitgem{\"a}sse Betrachtungen. Zweites St{\"u}ck}, date = 1988, author = {Nietzsche, Friedrich}, @@ -1198,7 +1250,7 @@ publisher = dtv # { and Walter de Gruyter}, location = {M{\"u}nchen and Berlin and New York}, pages = {243-334}, - hyphenation = {german}, + langid = {german}, sortyear = {1988-2}, sorttitle = {Werke-01-243}, indexsorttitle= {Vom Nutzen und Nachtheil der Historie fur das Leben}, @@ -1213,7 +1265,7 @@ entire first volume}, } -@InCollection{brandt, +@incollection{brandt, author = {von Brandt, Ahasver and Erich Hoffmann}, editor = {Ferdinand Seibt}, title = {Die nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts @@ -1226,7 +1278,7 @@ location = {Stuttgart}, pages = {884-917}, options = {useprefix=false}, - hyphenation = {german}, + langid = {german}, indexsorttitle= {Nordischen Lander von der Mitte des 11. Jahrhunderts bis 1448}, indextitle = {Nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis @@ -1239,7 +1291,7 @@ \texttt{indextitle, and \texttt{indexsorttitle} fields}}, } -@InCollection{hyman, +@incollection{hyman, author = {Arthur Hyman}, editor = {O'Meara, Dominic J.}, title = {Aristotle's Theory of the Intellect and its Interpretation by @@ -1252,14 +1304,15 @@ location = {Washington, D.C.}, pages = {161-191}, keywords = {secondary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Aristotle's Theory of the Intellect}, shorttitle = {Aristotle's Theory of the Intellect}, annotation = {An \texttt{incollection} entry with a \texttt{series} and \texttt{number} field}, } -@InCollection{pines, +@incollection{pines, author = {Pines, Shlomo}, editor = {Twersky, Isadore}, title = {The Limitations of Human Knowledge According to Al-Farabi, ibn @@ -1270,7 +1323,8 @@ location = {Cambridge, Mass.}, pages = {82-109}, keywords = {secondary}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, indextitle = {Limitations of Human Knowledge According to Al-Farabi, ibn Bajja, and Maimonides, The}, shorttitle = {Limitations of Human Knowledge}, @@ -1278,7 +1332,7 @@ \texttt{indextitle} field}, } -@InProceedings{moraux, +@inproceedings{moraux, author = {Moraux, Paul}, editor = {Lloyd, G. E. R. and Owen, G. E. L.}, title = {Le \emph{De Anima} dans la tradition gr{\`e}cque}, @@ -1292,7 +1346,7 @@ location = {Cambridge}, pages = {281-324}, keywords = {secondary}, - hyphenation = {french}, + langid = {french}, indexsorttitle= {De Anima dans la tradition grecque}, indextitle = {\emph{De Anima} dans la tradition gr{\`e}cque, Le}, shorttitle = {\emph{De Anima} dans la tradition gr{\`e}cque}, @@ -1302,7 +1356,7 @@ note the \texttt{eventdate} field.}, } -@InProceedings{salam, +@inproceedings{salam, author = {Salam, Abdus}, editor = {Svartholm, Nils}, title = {Weak and Electromagnetic Interactions}, @@ -1317,7 +1371,7 @@ pages = {367-377}, } -@Manual{cms, +@manual{cms, title = {The Chicago Manual of Style}, date = 2003, subtitle = {The Essential Guide for Writers, Editors, and Publishers}, @@ -1326,7 +1380,8 @@ location = {Chicago, Ill.}, isbn = {0-226-10403-6}, label = {CMS}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Chicago Manual of Style}, indextitle = {Chicago Manual of Style, The}, shorttitle = {Chicago Manual of Style}, @@ -1340,12 +1395,13 @@ \enquote*{T}. There's also an \texttt{isbn} field}, } -@Online{baez/online, +@online{baez/online, author = {Baez, John C. and Lauda, Aaron D.}, title = {Higher-Dimensional Algebra V: 2-Groups}, date = {2004-10-27}, version = 3, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, eprinttype = {arxiv}, eprint = {math/0307200v3}, annotation = {An \texttt{online} reference from arXiv. Note the @@ -1354,14 +1410,15 @@ \texttt{article} entry with eprint information}, } -@Online{ctan, +@online{ctan, title = {CTAN}, date = 2006, url = {http://www.ctan.org}, subtitle = {The Comprehensive TeX Archive Network}, urldate = {2006-10-01}, label = {CTAN}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {This is an \texttt{online} entry. The \textsc{url}, which is given in the \texttt{url} field, is transformed into a clickable link if \texttt{hyperref} support has been @@ -1372,12 +1429,13 @@ \texttt{year}}, } -@Online{itzhaki, +@online{itzhaki, author = {Itzhaki, Nissan}, title = {Some remarks on 't Hooft's S-matrix for black holes}, date = {1996-03-11}, version = 1, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, eprinttype = {arxiv}, eprint = {hep-th/9603067}, annotation = {An \texttt{online} reference from arXiv. Note the @@ -1392,28 +1450,29 @@ crucial even for large transverse distances.}, } -@Online{markey, +@online{markey, author = {Markey, Nicolas}, title = {Tame the BeaST}, date = {2005-10-16}, - url = - {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf}, + url = {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf}, subtitle = {The B to X of BibTeX}, version = {1.3}, urldate = {2006-10-01}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Tame the Beast}, annotation = {An \texttt{online} entry for a tutorial. Note the format of the \texttt{date} field (\texttt{yyyy-mm-dd}) in the database file.}, } -@Online{wassenberg, +@online{wassenberg, author = {Wassenberg, Jan and Sanders, Peter}, title = {Faster Radix Sort via Virtual Memory and Write-Combining}, date = {2010-08-17}, version = 1, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, eprinttype = {arxiv}, eprintclass = {cs.DS}, eprint = {1008.2849v1}, @@ -1431,14 +1490,14 @@ variant of counting sort}, } -@Patent{almendro, +@patent{almendro, author = {Almendro, Jos{\'e} L. and Mart{\'i}n, Jacinto and S{\'a}nchez, Alberto and Nozal, Fernando}, title = {Elektromagnetisches Signalhorn}, number = {EU-29702195U}, date = 1998, location = {countryfr and countryuk and countryde}, - hyphenation = {german}, + langid = {german}, annotation = {This is a \texttt{patent} entry with a \texttt{location} field. The number is given in the \texttt{number} field. Note the format of the \texttt{location} field in the database @@ -1446,14 +1505,14 @@ \texttt{kowalik}}, } -@Patent{kowalik, +@patent{kowalik, author = {Kowalik, F. and Isard, M.}, title = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur en quadrature et {\'e}tage de modulation l'utilisant}, number = 9500261, date = {1995-01-11}, type = {patreqfr}, - hyphenation = {french}, + langid = {french}, indextitle = {Estimateur d'un d{\'e}faut de fonctionnement}, annotation = {This is a \texttt{patent} entry for a French patent request with a full date. The number is given in the \texttt{number} @@ -1462,7 +1521,7 @@ \texttt{laufenberg}, and \texttt{sorace}}, } -@Patent{laufenberg, +@patent{laufenberg, author = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann, Miriam and Myrzik, Christian and Schmid, Manfred and Nietfeld, @@ -1474,7 +1533,7 @@ holder = {{Robert Bosch GmbH} and {Daimler Chrysler AG} and {Bayerische Motoren Werke AG}}, type = {patenteu}, - hyphenation = {german}, + langid = {german}, annotation = {This is a \texttt{patent} entry with a \texttt{holder} field. Note the format of the \texttt{type} and \texttt{location} fields in the database file. Compare \texttt{almendro}, @@ -1489,7 +1548,7 @@ file = {http://v3.espacenet.com/textdoc?IDX=EP1700367}, } -@Patent{sorace, +@patent{sorace, author = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven A.}, title = {High-Speed Digital-to-RF Converter}, @@ -1497,14 +1556,15 @@ date = {1997-09-16}, holder = {{Hughes Aircraft Company}}, type = {patentus}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {This is a \texttt{patent} entry with a \texttt{holder} field. Note the format of the \texttt{type} and \texttt{date} fields in the database file. Compare \texttt{almendro}, \texttt{laufenberg}, and \texttt{kowalik}}, } -@Periodical{jcg, +@periodical{jcg, title = {Computers and Graphics}, year = 2011, issuetitle = {Semantic {3D} Media and Content}, @@ -1515,7 +1575,7 @@ field.}, } -@Report{chiu, +@report{chiu, author = {Chiu, Willy W. and Chow, We Min}, title = {A Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS) Operating System}, @@ -1523,7 +1583,8 @@ institution = {IBM}, date = 1978, number = {RC-6947}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS) Operating System}, indextitle = {Hybrid Hierarchical Model, A}, @@ -1534,7 +1595,7 @@ \texttt{sorttitle} and \texttt{indextitle} fields}, } -@Report{padhye, +@report{padhye, author = {Padhye, Jitendra and Firoiu, Victor and Towsley, Don}, title = {A Stochastic Model of TCP Reno Congestion Avoidance and Control}, @@ -1543,7 +1604,8 @@ date = 1999, number = {99-02}, location = {Amherst, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, sorttitle = {A Stochastic Model of TCP Reno Congestion Avoidance and Control}, indextitle = {Stochastic Model of TCP Reno Congestion Avoidance and Control, @@ -1577,7 +1639,7 @@ file = {ftp://gaia.cs.umass.edu/pub/Padhey99-markov.ps}, } -@Thesis{geer, +@thesis{geer, author = {de Geer, Ingrid}, title = {Earl, Saint, Bishop, Skald~-- and Music}, type = {phdthesis}, @@ -1587,7 +1649,8 @@ Study}, location = {Uppsala}, options = {useprefix=false}, - hyphenation = {british}, + langid = {english}, + langidopts = {variant=british}, annotation = {This is a typical \texttt{thesis} entry for a PhD thesis. Note the \texttt{type} field in the database file which uses a localization key. Also note the format of the printed name and @@ -1595,14 +1658,15 @@ field as well as \texttt{vangennep}}, } -@Thesis{loh, +@thesis{loh, author = {Loh, Nin C.}, title = {High-Resolution Micromachined Interferometric Accelerometer}, type = {mathesis}, institution = {Massachusetts Institute of Technology}, date = 1992, location = {Cambridge, Mass.}, - hyphenation = {american}, + langid = {english}, + langidopts = {variant=american}, annotation = {This is a typical \texttt{thesis} entry for an MA thesis. Note the \texttt{type} field in the database file which uses a localization key}, diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx index 6f67296b03f..135a70083ff 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx @@ -54,6 +54,12 @@ \usebibmacro{setpageref}% \finentry} +\renewbibmacro*{begrelated}{% + \booltrue{bbx@inset}} + +\renewbibmacro*{endrelated}{% + \usebibmacro*{bbx:savehash}} + \renewbibmacro*{author}{% \ifboolexpr{ test \ifuseauthor diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx index 11184cb886e..5dc44a07b22 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx @@ -1,16 +1,6 @@ \ProvidesFile{authoryear.bbx} [\abx@bbxid] -% authoryear styles are special in the following way: - -% The citation labels are "labelname (labelyear)" and since citation -% labels are the keys into the references section, the fact that the -% citation uses labelyear means that the references must also. This -% means we use a special \printdate[extra]label macro to generate the -% references section main date for an entry. Otherwise, if labeldate selects -% anything other than DATE (or equivalently, YEAR/MONTH), then the -% citation won't match the reference. - \RequireBibliographyStyle{standard} \DeclareBibliographyOption{dashed}[true]{% @@ -31,38 +21,46 @@ \def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact} +% merge date/issue with date label \def\bbx@opt@mergedate@maximum{% \renewbibmacro*{date+extrayear}{% - \iffieldundef{labelyear} + \iffieldundef{\thefield{datelabelsource}year} {} {\printtext[parens]{% \printfield{issue}% - \setunit*{\addspace}% - \printdateextralabel}}}% + \setunit*{\addspace}% + \iffieldsequal{year}{\thefield{datelabelsource}year} + {\printdateextralabel}% + {\printfield{labelyear}% + \printfield{extrayear}}}}}% \renewbibmacro*{date}{}% - \renewbibmacro*{issue+date}{}% -} + \renewbibmacro*{issue+date}{}} +% merge date with date label \def\bbx@opt@mergedate@compact{% \renewbibmacro*{date+extrayear}{% - \iffieldundef{labelyear} + \iffieldundef{\thefield{datelabelsource}year} {} - {\printtext[parens]{\printdateextralabel}}}% + {\printtext[parens]{% + \iffieldsequal{year}{\thefield{datelabelsource}year} + {\printdateextralabel}% + {\printfield{labelyear}% + \printfield{extrayear}}}}}% \renewbibmacro*{date}{}% \renewbibmacro*{issue+date}{% \iffieldundef{issue} {} {\printtext[parens]{\printfield{issue}}}% - \newunit}% -} + \newunit}} +% merge year-only date with date label \def\bbx@opt@mergedate@basic{% \renewbibmacro*{date+extrayear}{% - \iffieldundef{labelyear} + \iffieldundef{\thefield{datelabelsource}year} {} {\printtext[parens]{% - \printfield{labelyear}% - \printfield{extrayear}}}}% + \printfield{\thefield{datelabelsource}year}% + \printfield{extrayear}}}}% \renewbibmacro*{date}{% \iffieldundef{month} {} @@ -75,19 +73,19 @@ } {} {\printtext[parens]{% - \printfield{issue}% - \setunit*{\addspace}% - \printdate}}% - \newunit}% -} + \printfield{issue}% + \setunit*{\addspace}% + \printdate}}% + \newunit}} +% merge year-only date with year-only date label \def\bbx@opt@mergedate@minimum{% \renewbibmacro*{date+extrayear}{% - \iffieldundef{labelyear} + \iffieldundef{\thefield{datelabelsource}year} {} {\printtext[parens]{% - \printfield{labelyear}% - \printfield{extrayear}}}}% + \printfield{\thefield{datelabelsource}year}% + \printfield{extrayear}}}}% \renewbibmacro*{date}{% \ifboolexpr{ test {\iffieldundef{month}} @@ -106,28 +104,28 @@ } {} {\printtext[parens]{% - \printfield{issue}% - \setunit*{\addspace}% - \printdate}}% - \newunit}% -} + \printfield{issue}% + \setunit*{\addspace}% + \printdate}}% + \newunit}} +% don't merge date/issue with date label \def\bbx@opt@mergedate@false{% \renewbibmacro*{date+extrayear}{% - \iffieldundef{labelyear} + \iffieldundef{\thefield{datelabelsource}year} {} {\printtext[parens]{% - \printfield{labelyear}% - \printfield{extrayear}}}}% + \printfield{\thefield{datelabelsource}year}% + \printfield{extrayear}}}}% \renewbibmacro*{date}{\printdate}% \renewbibmacro*{issue+date}{% \printtext[parens]{% \printfield{issue}% \setunit*{\addspace}% \printdate}% - \newunit}% -} + \newunit}} +% n.b. the default datelabel=year overrides merging of months and days \ExecuteBibliographyOptions{labeldate,sorting=nyt,pagetracker,mergedate} \DeclareFieldFormat{shorthandwidth}{#1} @@ -160,8 +158,7 @@ {\endlist} {\item} -\InitializeBibliographyStyle{% - \global\undef\bbx@lasthash} +\InitializeBibliographyStyle{\global\undef\bbx@lasthash} \newbibmacro*{bbx:savehash}{% \savefield{fullhash}{\bbx@lasthash}} @@ -174,6 +171,12 @@ \usebibmacro{setpageref}% \finentry} +\renewbibmacro*{begrelated}{% + \booltrue{bbx@inset}} + +\renewbibmacro*{endrelated}{% + \usebibmacro*{bbx:savehash}} + \renewbibmacro*{author}{% \ifboolexpr{ test \ifuseauthor @@ -184,13 +187,13 @@ {\bibnamedash} {\usebibmacro{bbx:savehash}% \printnames{author}% - \iffieldundef{authortype} - {\setunit{\addspace}} - {\setunit{\addcomma\space}}}% + \iffieldundef{authortype} + {\setunit{\addspace}} + {\setunit{\addcomma\space}}}% \iffieldundef{authortype} {} {\usebibmacro{authorstrg}% - \setunit{\addspace}}}% + \setunit{\addspace}}}% {\global\undef\bbx@lasthash \usebibmacro{labeltitle}% \setunit*{\addspace}}% @@ -209,8 +212,8 @@ {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{editor}% - \setunit{\addcomma\space}% - \usebibmacro{bbx:savehash}}% + \setunit{\addcomma\space}% + \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}% \setunit{\addspace}}% @@ -232,8 +235,8 @@ {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{translator}% - \setunit{\addcomma\space}% - \usebibmacro{bbx:savehash}}% + \setunit{\addcomma\space}% + \usebibmacro{bbx:savehash}}% \usebibmacro{translator+othersstrg}% \clearname{translator}% \setunit{\addspace}}% diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index 2751b61e6c1..80891b02f39 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx @@ -888,6 +888,8 @@ \newbibmacro*{begrelated}{} \newbibmacro*{endrelated}{} +\newbibmacro*{begrelatedloop}{} +\newbibmacro*{endrelatedloop}{} \def\ifrelatedloop{% \ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}} @@ -896,7 +898,8 @@ \newbibmacro*{related}{% \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} } {} - {\def\bbx@tempa{}% + {\usebibmacro{begrelated}% + \def\bbx@tempa{}% \setcounter{bbx:relatedtotal}{0}% \def\do##1{% \entrydata{##1}{% @@ -927,7 +930,7 @@ {\def\bbx@tempb{relatedstring:default}} {\def\bbx@tempb{relatedstring:\strfield{relatedtype}}}% \printtext[\bbx@tempa]{% - \usebibmacro{begrelated}% + \usebibmacro{begrelatedloop}% \iffieldundef{relatedstring} {\ifboolexpr{ test {\ifnumgreater{\value{bbx:relatedtotal}}{1}} @@ -945,7 +948,8 @@ \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}} {\printfield[\bbx@tempb]{relatedstring}}}% \docsvfield{related}% - \usebibmacro{endrelated}}}% - {}}} + \usebibmacro{endrelatedloop}}}% + {}% + \usebibmacro{endrelated}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 6b466241f2e..9566dd7b057 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -443,7 +443,8 @@ \DeclareFieldFormat{related:multivolume}{\par\nobreak#1} \DeclareFieldFormat{related:origpubin}{\mkbibparens{#1}} \DeclareFieldFormat{related:origpubas}{\mkbibparens{#1}} -\DeclareFieldFormat{relatedstring:default}{#1\relatedpunct} +\DeclareFieldFormat{relatedstring:default}{#1\printunit{\relatedpunct}} +\DeclareFieldFormat{relatedstring:reprintfrom}{#1\addspace} % Generic formats for \printtext and \printfield @@ -1013,6 +1014,7 @@ \step[fieldset=type, fieldvalue=techreport] } \map{ + \step[fieldsource=hyphenation, fieldtarget=langid] \step[fieldsource=address, fieldtarget=location] \step[fieldsource=school, fieldtarget=institution] \step[fieldsource=annote, fieldtarget=annotation] @@ -2833,8 +2835,9 @@ \newbibmacro*{related:multivolume}[1]{% \entrydata*{#1}{% - \printfield{volume}% - \printfield{part}% + \printtext{% + \printfield{volume}% + \printfield{part}}% \setunit*{\addcolon\space}% \usebibmacro{title}% \ifboolexpr{ diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 8bbfd065998..f0299e8fd27 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -3,8 +3,8 @@ %% % Set up the version strings here, so they are the same for both branches -\def\abx@date{2013/07/15} -\def\abx@version{2.7a} +\def\abx@date{2013/10/26} +\def\abx@version{2.8} \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)} \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)} \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)} @@ -16,7 +16,7 @@ % This is not updated by build script as the bbl version % does not necessarily change with the package version. % This is used when checking the .bbl -\def\blx@bblversion{2.2} +\def\blx@bblversion{2.3} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{biblatex} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty index 1a33fa547ed..5777027e0ab 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty @@ -69,19 +69,20 @@ amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib, cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus, mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}% - \ifboolexpr{ - test {\@ifpackageloaded{babel}} - and - not test {\@ifpackageloaded{polyglossia}} - } + \@ifpackageloaded{polyglossia} {\iftoggle{blx@autolang} - {\blx@mkbabel} - {\blx@mknobabel}} - {\blx@mknobabel}% + {\blx@mkautolangpoly} + {\blx@mknoautolang}} + {\@ifpackageloaded{babel} + {\iftoggle{blx@autolang} + {\blx@mkautolangbabel} + {\blx@mknoautolang}} + {{\blx@mknoautolang}}}% \csuse{abx@extras@\blx@languagename}% \csuse{abx@strings@\blx@languagename}% - \undef\blx@mkbabel - \undef\blx@mknobabel + \undef\blx@mkautolangbabel + \undef\blx@mkautolangpoly + \undef\blx@mknoautolang \ifnum\blx@hyperref=\z@ \blx@mknohyperref \else @@ -232,7 +233,7 @@ {\newcommand*{\@quotereset}{}\newcount\@quotereset}} {\@ifpackageloaded{babel} {\blx@warning@noline{% - 'babel' detected but 'csquotes' missing.\MessageBreak + 'babel/polyglossia' detected but 'csquotes' missing.\MessageBreak Loading 'csquotes' recommended}} {}% \newcommand*{\@quotelevel}{}% @@ -2378,15 +2379,19 @@ % {<true>}{<false>} \protected\def\blx@ifciteseen@global{% - \ifdef\abx@field@entrykey - {\expandafter\blx@ifseen@global - \expandafter{\abx@field@entrykey}} + \ifbool{citetracker} + {\ifdef\abx@field@entrykey + {\expandafter\blx@ifseen@global + \expandafter{\abx@field@entrykey}} + {\@secondoftwo}} {\@secondoftwo}} \protected\def\blx@ifciteseen@context{% - \ifdef\abx@field@entrykey - {\expandafter\blx@ifseen@context - \expandafter{\abx@field@entrykey}} + \ifbool{citetracker} + {\ifdef\abx@field@entrykey + {\expandafter\blx@ifseen@context + \expandafter{\abx@field@entrykey}} + {\@secondoftwo}} {\@secondoftwo}} % {<entrykey>}{<true>}{<false>} @@ -2398,108 +2403,142 @@ \blx@xsanitizeafter\blx@ifseen@context} \def\blx@ifseen@global#1{% - \ifinlistcs{#1}{blx@bsee@\the\c@refsection}} + \ifbool{citetracker} + {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}} + {\@secondoftwo}} \def\blx@ifseen@context#1{% - \iftoggle{blx@footnote} - {\ifinlistcs{#1}{blx@fsee@\the\c@refsection}} - {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\ifinlistcs{#1}{blx@fsee@\the\c@refsection}} + {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}} + {\@secondoftwo}} % {<true>}{<false>} \def\blx@ifciteibid@global{% - \blx@imc@iffieldequals{entrykey}\blx@lastkey@text} + \ifbool{citetracker} + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text} + {\@secondoftwo}} \def\blx@ifciteibid@context{% - \iftoggle{blx@footnote} - {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot} - {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot} + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}} + {\@secondoftwo}} \def\blx@ifciteibid@strict{% - \blx@ifcitesingle - {\blx@ifciteibid@global} - {\@secondoftwo}}% + \ifbool{citetracker} + {\blx@ifcitesingle + {\blx@ifciteibid@global} + {\@secondoftwo}} + {\@secondoftwo}} \def\blx@ifciteibid@constrict{% - \blx@ifcitesingle - {\iftoggle{blx@footnote} - {\blx@ifmpfncheck - {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot} - {\@secondoftwo}} - {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}} - {\@secondoftwo}}% + \ifbool{citetracker} + {\blx@ifcitesingle + {\iftoggle{blx@footnote} + {\blx@ifmpfncheck + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot} + {\@secondoftwo}} + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}} + {\@secondoftwo}} + {\@secondoftwo}} % {<true>}{<false>} \def\blx@ifciteidem@global{% - \blx@imc@iffieldequals{fullhash}\blx@lasthash@text} + \ifbool{citetracker} + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text} + {\@secondoftwo}} \def\blx@ifciteidem@context{% - \iftoggle{blx@footnote} - {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot} - {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot} + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}} + {\@secondoftwo}} \let\blx@ifciteidem@strict\blx@ifciteidem@global \def\blx@ifciteidem@constrict{% - \iftoggle{blx@footnote} - {\blx@ifmpfncheck - {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot} - {\@secondoftwo}} - {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\blx@ifmpfncheck + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot} + {\@secondoftwo}} + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}} + {\@secondoftwo}} % {<true>}{<false>} \def\blx@ifopcit@global{% - \blx@imc@iffieldundef{namehash} - {\@secondoftwo} - {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}} + \ifbool{citetracker} + {\blx@imc@iffieldundef{namehash} + {\@secondoftwo} + {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}} + {\@secondoftwo}} \def\blx@ifopcit@context{% - \blx@imc@iffieldundef{namehash} - {\@secondoftwo} - {\iftoggle{blx@footnote} - {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}} - {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}} - -\def\blx@ifopcit@strict{% - \blx@ifcitesingle - {\blx@ifopcit@global} - {\@secondoftwo}}% - -\def\blx@ifopcit@constrict{% - \blx@ifcitesingle + \ifbool{citetracker} {\blx@imc@iffieldundef{namehash} {\@secondoftwo} {\iftoggle{blx@footnote} - {\blx@ifmpfncheck - {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}} - {\@secondoftwo}} + {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}} {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}} - {\@secondoftwo}}% + {\@secondoftwo}} + +\def\blx@ifopcit@strict{% + \ifbool{citetracker} + {\blx@ifcitesingle + {\blx@ifopcit@global} + {\@secondoftwo}} + {\@secondoftwo}} + +\def\blx@ifopcit@constrict{% + \ifbool{citetracker} + {\blx@ifcitesingle + {\blx@imc@iffieldundef{namehash} + {\@secondoftwo} + {\iftoggle{blx@footnote} + {\blx@ifmpfncheck + {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}} + {\@secondoftwo}} + {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}} + {\@secondoftwo}} + {\@secondoftwo}} % {<true>}{<false>} \def\blx@ifloccit@global{% - \blx@loccit@check{text}} + \ifbool{citetracker} + {\blx@loccit@check{text}} + {\@secondoftwo}} \def\blx@ifloccit@context{% - \iftoggle{blx@footnote} - {\blx@loccit@check{foot}} - {\blx@loccit@check{text}}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\blx@loccit@check{foot}} + {\blx@loccit@check{text}}} + {\@secondoftwo}} \def\blx@ifloccit@strict{% - \blx@ifcitesingle - {\blx@loccit@numcheck{text}} - {\@secondoftwo}}% + \ifbool{citetracker} + {\blx@ifcitesingle + {\blx@loccit@numcheck{text}} + {\@secondoftwo}} + {\@secondoftwo}} \def\blx@ifloccit@constrict{% - \blx@ifcitesingle - {\iftoggle{blx@footnote} - {\blx@ifmpfncheck - {\blx@loccit@numcheck{foot}} - {\@secondoftwo}} - {\blx@loccit@numcheck{text}}} + \ifbool{citetracker} + {\blx@ifcitesingle + {\iftoggle{blx@footnote} + {\blx@ifmpfncheck + {\blx@loccit@numcheck{foot}} + {\@secondoftwo}} + {\blx@loccit@numcheck{text}}} + {\@secondoftwo}} {\@secondoftwo}} \def\blx@loccit@check#1{% @@ -2535,9 +2574,11 @@ % {<true>}{<false>} \def\blx@imc@iffirstonpage{% - \iftoggle{blx@footnote} - {\blx@iffirstonpage{fnpage}} - {\blx@iffirstonpage{page}}} + \ifbool{pagetracker} + {\iftoggle{blx@footnote} + {\blx@iffirstonpage{fnpage}} + {\blx@iffirstonpage{page}}} + {\@secondoftwo}} \def\blx@iffirstonpage#1{% \ifcsundef{blx@#1@\number\c@instcount} @@ -2565,11 +2606,13 @@ % {<count1>}{<count2>}{<true>}{<false>} \def\blx@imc@ifsamepage#1#2{% - \ifcsundef{blx@page@\number\numexpr#1} - {\ifcsundef{blx@fnpage@\number\numexpr#1} - {\@secondoftwo} - {\blx@ifsamepage{#1}{#2}{fnpage}}} - {\blx@ifsamepage{#1}{#2}{page}}} + \ifbool{pagetracker} + {\ifcsundef{blx@page@\number\numexpr#1} + {\ifcsundef{blx@fnpage@\number\numexpr#1} + {\@secondoftwo} + {\blx@ifsamepage{#1}{#2}{fnpage}}} + {\blx@ifsamepage{#1}{#2}{page}}} + {\@secondoftwo}} \def\blx@ifsamepage#1#2#3{% \ifcsundef{blx@page@\number\numexpr#2} @@ -3376,8 +3419,8 @@ \@ifstar\blx@mksc@i\blx@mksc@ii} \def\blx@mksc@i{% - \ifdef\abx@field@hyphenation - {\xifinlist\abx@field@hyphenation\blx@cmksc@lang + \ifdef\abx@field@langid + {\xifinlist\abx@field@langid\blx@cmksc@lang {\blx@mksc@ii} {\@firstofone}} {\blx@mksc@ii}} @@ -4855,6 +4898,26 @@ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% \printfield{extrayear}}}}}}} +\newrobustcmd*{\mkbibrangeyear}[1]{% + \blx@imc@clearfield{#1month}% + \blx@imc@clearfield{#1day}% + \blx@imc@clearfield{#1endmonth}% + \blx@imc@clearfield{#1endday}% + \iffieldsequal{#1year}{#1endyear} + {\blx@imc@clearfield{#1endyear}} + {}% + \mkbibrangefull{short}{#1}} + +\newrobustcmd*{\mkbibrangeyearextra}[1]{% + \blx@imc@clearfield{#1month}% + \blx@imc@clearfield{#1day}% + \blx@imc@clearfield{#1endmonth}% + \blx@imc@clearfield{#1endday}% + \iffieldsequal{#1year}{#1endyear} + {\blx@imc@clearfield{#1endyear}} + {}% + \mkbibrangefullextra{short}{#1}} + \expandafter\newrobustcmd \expandafter*\csname mkbibrangeiso8601\endcsname[1]{% \iffieldundef{#1year} @@ -4911,6 +4974,8 @@ \protected\def\blx@imc@printdate{} \protected\def\blx@imc@printdateextra{} +\protected\def\blx@imc@printdatelabel{} +\protected\def\blx@imc@printdateextralabel{} \protected\def\blx@imc@printurldate{} \protected\def\blx@imc@printeventdate{} \protected\def\blx@imc@printorigdate{} @@ -4947,8 +5012,7 @@ \noexpand\blx@resetpunct \expandafter\noexpand\csname abx@noextras@#2\endcsname}} -%% Babel interface - +%% babel/polyglossia interface \def\blx@beglang{\blx@clearlang\begingroup} \def\blx@endlang{\endgroup} \let\blx@hook@endlang\@empty @@ -4968,31 +5032,60 @@ \begingroup \@makeother\# -\gdef\blx@mkbabel{% +\gdef\blx@mkautolangbabel{% \pretocmd\select@language{\blx@langsetup{#1}} {\ifdef\blx@thelangenv {\def\blx@beglang{% \blx@clearlang \begingroup - \blx@imc@iffieldundef{hyphenation} + \blx@imc@iffieldundef{langid} {} - {\ifcsundef{l@\abx@field@hyphenation} - {\blx@warn@nohyph{\abx@field@hyphenation}} + {\ifcsundef{l@\abx@field@langid} + {\blx@warn@nohyph{\abx@field@langid}} {\blx@hook@initlang \def\blx@endlang{% \blx@hook@endlang \csname end\blx@thelangenv\endcsname \endgroup}% \csname\blx@thelangenv\expandafter\endcsname - \expandafter{\abx@field@hyphenation}}}}} + \expandafter{\abx@field@langid}}}}} {}% \def\blx@imc@mainlang{\select@language{\bbl@main@language}}% \blx@langsetup\bbl@main@language} {\blx@err@patch{'babel' package}% - \blx@mknobabel}} + \blx@mknoautolang}} + +\gdef\blx@mkautolangpoly{% + \catcode`\_=11% polyglossia uses "_" as a letter + \pretocmd\select@language{\blx@langsetup{#1}} + {\ifdef\blx@thelangenv + {\def\blx@beglang{% + \blx@clearlang + \begingroup + \blx@imc@iffieldundef{langid} + {} + {\ifcsundef{l@\abx@field@langid} + {\blx@warn@nohyph{\abx@field@langid}} + {\blx@hook@initlang + \def\blx@endlang{% + \blx@hook@endlang + \csname end\blx@thelangenv\endcsname + \endgroup}% + \csname\blx@thelangenv\expandafter\endcsname + \expandafter{\abx@field@langid}% + % These lines are equal to \blx@maplang + \blx@resetpunct + \csuse{abx@extras@\abx@field@langid}% + \csuse{abx@strings@\abx@field@langid}}}}} + {}% + \def\blx@imc@mainlang{\select@language{\bbl@main@language}}% + \blx@langsetup\bbl@main@language} + {\blx@err@patch{'polyglossia' package}% + \blx@mknoautolang}% + \catcode`\_=8} \endgroup -\def\blx@mknobabel{% +\def\blx@mknoautolang{% \blx@lbxinput{\blx@languagename} {} {\blx@err@nolang{\blx@languagename}}} @@ -5137,7 +5230,6 @@ \do{related}% \do{relatedtype}% \do{relatedstring}% - \do{hyphenation}% \do{keywords}% \do{authortype}% \do{editortype}% @@ -5176,6 +5268,7 @@ \do{journalsubtitle}% \do{label}% \do{labelalpha}% + \do{langid}% \do{extraalpha}% \do{labelnumber}% \do{labeltitle}% @@ -7678,7 +7771,7 @@ % ibidem tracker -\def\blx@ibidtracker@gobal{% +\def\blx@ibidtracker@global{% \ifbool{citetracker} {\global\let\blx@lastkey@text\abx@field@entrykey} {}} @@ -7692,8 +7785,8 @@ \def\blx@ibidtracker@strict{% \blx@ifcitesingle - {\blx@ibidtracker@gobal} - {\blx@ibidreset@gobal}}% + {\blx@ibidtracker@global} + {\blx@ibidreset@global}}% \def\blx@ibidtracker@constrict{% \blx@ifcitesingle @@ -7706,7 +7799,7 @@ \global\undef\blx@lastkey@foot \blx@mpfnreset} -\def\blx@ibidreset@gobal{% +\def\blx@ibidreset@global{% \global\undef\blx@lastkey@text} \def\blx@ibidreset@context{% @@ -7729,7 +7822,7 @@ % idem tracker -\def\blx@idemtracker@gobal{% +\def\blx@idemtracker@global{% \ifbool{citetracker} {\global\let\blx@lasthash@text\abx@field@fullhash} {}} @@ -7741,7 +7834,7 @@ {\global\let\blx@lasthash@text\abx@field@fullhash}} {}} -\let\blx@idemtracker@strict\blx@idemtracker@gobal +\let\blx@idemtracker@strict\blx@idemtracker@global \def\blx@idemtracker@constrict{% \blx@mpfnsave @@ -7752,7 +7845,7 @@ \global\undef\blx@lasthash@foot \blx@mpfnreset} -\def\blx@idemreset@gobal{% +\def\blx@idemreset@global{% \global\undef\blx@lasthash@text} \def\blx@idemreset@context{% @@ -7775,7 +7868,7 @@ % opcit tracker -\def\blx@opcittracker@gobal{% +\def\blx@opcittracker@global{% \ifbool{citetracker} {\blx@opcit@tracker{text}} {}} @@ -7789,8 +7882,8 @@ \def\blx@opcittracker@strict{% \blx@ifcitesingle - {\blx@opcittracker@gobal} - {\blx@opcitreset@gobal}}% + {\blx@opcittracker@global} + {\blx@opcitreset@global}}% \def\blx@opcittracker@constrict{% \blx@ifcitesingle @@ -7818,7 +7911,7 @@ \blx@opcit@reset{foot}% \blx@mpfnreset} -\def\blx@opcitreset@gobal{% +\def\blx@opcitreset@global{% \blx@opcit@reset{text}} \def\blx@opcitreset@context{% @@ -7864,7 +7957,7 @@ % loccit tracker -\def\blx@loccittracker@gobal{% +\def\blx@loccittracker@global{% \ifbool{citetracker} {\blx@loccit@tracker{text}} {}} @@ -7924,7 +8017,7 @@ \blx@loccit@reset{foot}% \blx@mpfnreset} -\def\blx@loccitreset@gobal{% +\def\blx@loccitreset@global{% \blx@loccit@reset{text}} \def\blx@loccitreset@context{% @@ -9834,22 +9927,31 @@ \settoggle{blx@clearlang}{#1}} \DeclareBibliographyOption{babel}{% - \ifcsdef{blx@opt@babel@#1} - {\csuse{blx@opt@babel@#1}} - {\blx@err@invopt{babel=#1}{}}} -\def\blx@opt@babel@none{% + \blx@warning@noline{% + 'babel' option is deprecated, use 'autolang' instead}% + \blx@autolang@i{#1}} + +\DeclareBibliographyOption{autolang}{% + \blx@autolang@i{#1}} + +\def\blx@autolang@i#1{% + \ifcsdef{blx@opt@autolang@#1} + {\csuse{blx@opt@autolang@#1}} + {\blx@err@invopt{autolang=#1}{}}} + +\def\blx@opt@autolang@none{% \undef\blx@thelangenv \let\blx@hook@initlang\@empty \let\blx@hook@endlang\@empty} -\def\blx@opt@babel@hyphen{% +\def\blx@opt@autolang@hyphen{% \def\blx@thelangenv{hyphenrules}% \let\blx@hook@initlang\@empty \let\blx@hook@endlang\@empty} -\csdef{blx@opt@babel@other*}{% +\csdef{blx@opt@autolang@other*}{% \def\blx@thelangenv{otherlanguage*}% \def\blx@hook@initlang{\@quotereset\@ne}% \def\blx@hook@endlang{\blx@postpunct}} -\def\blx@opt@babel@other{% +\def\blx@opt@autolang@other{% \def\blx@thelangenv{otherlanguage}% \def\blx@hook@initlang{\@quotereset\@ne}% \def\blx@hook@endlang{\blx@postpunct}} @@ -10043,8 +10145,8 @@ {\blx@err@invopt{ibidtracker=#1}{}}} \def\blx@opt@ibidtracker@true{% \let\blx@imc@ifciteibid\blx@ifciteibid@global - \let\blx@ibidtracker\blx@ibidtracker@gobal - \let\blx@ibidreset\blx@ibidreset@gobal + \let\blx@ibidtracker\blx@ibidtracker@global + \let\blx@ibidreset\blx@ibidreset@global \booltrue{citetracker}} \def\blx@opt@ibidtracker@false{% \let\blx@imc@ifciteibid\@secondoftwo @@ -10058,7 +10160,7 @@ \def\blx@opt@ibidtracker@strict{% \let\blx@imc@ifciteibid\blx@ifciteibid@strict \let\blx@ibidtracker\blx@ibidtracker@strict - \let\blx@ibidreset\blx@ibidreset@gobal + \let\blx@ibidreset\blx@ibidreset@global \booltrue{citetracker}} \def\blx@opt@ibidtracker@constrict{% \let\blx@imc@ifciteibid\blx@ifciteibid@constrict @@ -10072,8 +10174,8 @@ {\blx@err@invopt{idemtracker=#1}{}}} \def\blx@opt@idemtracker@true{% \let\blx@imc@ifciteidem\blx@ifciteidem@global - \let\blx@idemtracker\blx@idemtracker@gobal - \let\blx@idemreset\blx@idemreset@gobal + \let\blx@idemtracker\blx@idemtracker@global + \let\blx@idemreset\blx@idemreset@global \booltrue{citetracker}} \def\blx@opt@idemtracker@false{% \let\blx@imc@ifciteidem\@secondoftwo @@ -10087,7 +10189,7 @@ \def\blx@opt@idemtracker@strict{% \let\blx@imc@ifciteidem\blx@ifciteidem@strict \let\blx@idemtracker\blx@idemtracker@strict - \let\blx@idemreset\blx@idemreset@gobal + \let\blx@idemreset\blx@idemreset@global \booltrue{citetracker}} \def\blx@opt@idemtracker@constrict{% \let\blx@imc@ifciteidem\blx@ifciteidem@constrict @@ -10101,8 +10203,8 @@ {\blx@err@invopt{opcittracker=#1}{}}} \def\blx@opt@opcittracker@true{% \let\blx@imc@ifopcit\blx@ifopcit@global - \let\blx@opcittracker\blx@opcittracker@gobal - \let\blx@opcitreset\blx@opcitreset@gobal + \let\blx@opcittracker\blx@opcittracker@global + \let\blx@opcitreset\blx@opcitreset@global \booltrue{citetracker}} \def\blx@opt@opcittracker@false{% \let\blx@imc@ifopcit\@secondoftwo @@ -10116,7 +10218,7 @@ \def\blx@opt@opcittracker@strict{% \let\blx@imc@ifopcit\blx@ifopcit@strict \let\blx@opcittracker\blx@opcittracker@strict - \let\blx@opcitreset\blx@opcitreset@gobal + \let\blx@opcitreset\blx@opcitreset@global \booltrue{citetracker}} \def\blx@opt@opcittracker@constrict{% \let\blx@imc@ifopcit\blx@ifopcit@constrict @@ -10130,8 +10232,8 @@ {\blx@err@invopt{loccittracker=#1}{}}} \def\blx@opt@loccittracker@true{% \let\blx@imc@ifloccit\blx@ifloccit@global - \let\blx@loccittracker\blx@loccittracker@gobal - \let\blx@loccitreset\blx@loccitreset@gobal + \let\blx@loccittracker\blx@loccittracker@global + \let\blx@loccitreset\blx@loccitreset@global \booltrue{citetracker}} \def\blx@opt@loccittracker@false{% \let\blx@imc@ifloccit\@secondoftwo @@ -10145,7 +10247,7 @@ \def\blx@opt@loccittracker@strict{% \let\blx@imc@ifloccit\blx@ifloccit@strict \let\blx@loccittracker\blx@loccittracker@strict - \let\blx@loccitreset\blx@loccitreset@gobal + \let\blx@loccitreset\blx@loccitreset@global \booltrue{citetracker}} \def\blx@opt@loccittracker@constrict{% \let\blx@imc@ifloccit\blx@ifloccit@constrict @@ -10172,11 +10274,21 @@ \DeclareBibliographyOption{date}{% \ifcsdef{mkbibrange#1} {\protected\def\blx@imc@printdate{\csuse{mkbibrange#1}{}}% - \protected\def\blx@imc@printdatelabel{\csuse{mkbibrange#1}{}}% - \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}% - \protected\def\blx@imc@printdateextralabel{\csuse{mkbibrange#1extra}{}}} + \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}} {\blx@err@invopt{date=#1}{}}} +\DeclareBibliographyOption{datelabel}{% + \ifcsdef{mkbibrange#1} + {\protected\def\blx@imc@printdatelabel{% + \blx@imc@iffieldundef{year} + {\csuse{mkbibrange#1}{label}} + {\csuse{mkbibrange#1}{}}}% + \protected\def\blx@imc@printdateextralabel{% + \blx@imc@iffieldundef{year} + {\csuse{mkbibrange#1extra}{label}} + {\csuse{mkbibrange#1extra}{}}}} + {\blx@err@invopt{datelabel=#1}{}}} + \DeclareBibliographyOption{urldate}{% \ifcsdef{mkbibrange#1} {\protected\def\blx@imc@printurldate{\csuse{mkbibrange#1}{url}}} @@ -10466,11 +10578,11 @@ usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true, backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false, idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false, - citecounter=false,block=none,language=auto,clearlang=true,babel=none, - date=comp,origdate=comp,eventdate=comp,urldate=short,autopunct=true, - punctfont=false,defernumbers=false,refsection=none,refsegment=none, - citereset=none,hyperref=auto,parentracker,maxparens=3,maxline=79, - bibencoding=auto,bibwarn} + citecounter=false,block=none,language=auto,clearlang=true,autolang=none, + date=comp,datelabel=year,origdate=comp,eventdate=comp,urldate=short, + autopunct=true,punctfont=false,defernumbers=false, + refsection=none,refsegment=none,citereset=none,hyperref=auto, + parentracker,maxparens=3,maxline=79,bibencoding=auto,bibwarn} % Load compatibility code diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty index fd4576f2653..9a7bef604b1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty @@ -65,19 +65,20 @@ amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib, cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus, mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}% - \ifboolexpr{ - test {\@ifpackageloaded{babel}} - and - not test {\@ifpackageloaded{polyglossia}} - } + \@ifpackageloaded{polyglossia} {\iftoggle{blx@autolang} - {\blx@mkbabel} - {\blx@mknobabel}} - {\blx@mknobabel}% + {\blx@mkautolangpoly} + {\blx@mknoautolang}} + {\@ifpackageloaded{babel} + {\iftoggle{blx@autolang} + {\blx@mkautolangbabel} + {\blx@mknoautolang}} + {\blx@mknoautolang}}% \csuse{abx@extras@\blx@languagename}% \csuse{abx@strings@\blx@languagename}% - \undef\blx@mkbabel - \undef\blx@mknobabel + \undef\blx@mkautolangbabel + \undef\blx@mkautolangpoly + \undef\blx@mknoautolang \ifnum\blx@hyperref=\z@ \blx@mknohyperref \else @@ -228,7 +229,7 @@ {\newcommand*{\@quotereset}{}\newcount\@quotereset}} {\@ifpackageloaded{babel} {\blx@warning@noline{% - 'babel' detected but 'csquotes' missing.\MessageBreak + 'babel/polyglossia' detected but 'csquotes' missing.\MessageBreak Loading 'csquotes' recommended}} {}% \newcommand*{\@quotelevel}{}% @@ -2207,21 +2208,27 @@ % {<true>}{<false>} \protected\def\blx@ifciteseen@global{% - \ifdef\abx@field@entrykey - {\expandafter\blx@ifseen@global - \expandafter{\abx@field@entrykey}} + \ifbool{citetracker} + {\ifdef\abx@field@entrykey + {\expandafter\blx@ifseen@global + \expandafter{\abx@field@entrykey}} + {\@secondoftwo}} {\@secondoftwo}} \protected\def\blx@ifciteseen@context{% - \ifdef\abx@field@entrykey - {\expandafter\blx@ifseen@context - \expandafter{\abx@field@entrykey}} + \ifbool{citetracker} + {\ifdef\abx@field@entrykey + {\expandafter\blx@ifseen@context + \expandafter{\abx@field@entrykey}} + {\@secondoftwo}} {\@secondoftwo}} \protected\def\blx@ifciteseen@context{% - \ifdef\abx@field@entrykey - {\expandafter\blx@ifseen@context - \expandafter{\abx@field@entrykey}} + \ifbool{citetracker} + {\ifdef\abx@field@entrykey + {\expandafter\blx@ifseen@context + \expandafter{\abx@field@entrykey}} + {\@secondoftwo}} {\@secondoftwo}} % {<entrykey>}{<true>}{<false>} @@ -2233,108 +2240,142 @@ \blx@xsanitizeafter\blx@ifseen@context} \def\blx@ifseen@global#1{% - \ifinlistcs{#1}{blx@bsee@\the\c@refsection}} + \ifbool{citetracker} + {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}} + {\@secondoftwo}} \def\blx@ifseen@context#1{% - \iftoggle{blx@footnote} - {\ifinlistcs{#1}{blx@fsee@\the\c@refsection}} - {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\ifinlistcs{#1}{blx@fsee@\the\c@refsection}} + {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}} + {\@secondoftwo}} % {<true>}{<false>} \def\blx@ifciteibid@global{% - \blx@imc@iffieldequals{entrykey}\blx@lastkey@text} + \ifbool{citetracker} + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text} + {\@secondoftwo}} \def\blx@ifciteibid@context{% - \iftoggle{blx@footnote} - {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot} - {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot} + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}} + {\@secondoftwo}} \def\blx@ifciteibid@strict{% - \blx@ifcitesingle - {\blx@ifciteibid@global} - {\@secondoftwo}}% + \ifbool{citetracker} + {\blx@ifcitesingle + {\blx@ifciteibid@global} + {\@secondoftwo}} + {\@secondoftwo}} \def\blx@ifciteibid@constrict{% - \blx@ifcitesingle - {\iftoggle{blx@footnote} - {\blx@ifmpfncheck - {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot} - {\@secondoftwo}} - {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}} - {\@secondoftwo}}% + \ifbool{citetracker} + {\blx@ifcitesingle + {\iftoggle{blx@footnote} + {\blx@ifmpfncheck + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot} + {\@secondoftwo}} + {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}} + {\@secondoftwo}} + {\@secondoftwo}} % {<true>}{<false>} \def\blx@ifciteidem@global{% - \blx@imc@iffieldequals{fullhash}\blx@lasthash@text} + \ifbool{citetracker} + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text} + {\@secondoftwo}} \def\blx@ifciteidem@context{% - \iftoggle{blx@footnote} - {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot} - {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot} + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}} + {\@secondoftwo}} \let\blx@ifciteidem@strict\blx@ifciteidem@global \def\blx@ifciteidem@constrict{% - \iftoggle{blx@footnote} - {\blx@ifmpfncheck - {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot} - {\@secondoftwo}} - {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\blx@ifmpfncheck + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot} + {\@secondoftwo}} + {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}} + {\@secondoftwo}} % {<true>}{<false>} \def\blx@ifopcit@global{% - \blx@imc@iffieldundef{namehash} - {\@secondoftwo} - {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}} + \ifbool{citetracker} + {\blx@imc@iffieldundef{namehash} + {\@secondoftwo} + {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}} + {\@secondoftwo}} \def\blx@ifopcit@context{% - \blx@imc@iffieldundef{namehash} - {\@secondoftwo} - {\iftoggle{blx@footnote} - {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}} - {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}} - -\def\blx@ifopcit@strict{% - \blx@ifcitesingle - {\blx@ifopcit@global} - {\@secondoftwo}}% - -\def\blx@ifopcit@constrict{% - \blx@ifcitesingle + \ifbool{citetracker} {\blx@imc@iffieldundef{namehash} {\@secondoftwo} {\iftoggle{blx@footnote} - {\blx@ifmpfncheck - {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}} - {\@secondoftwo}} + {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}} {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}} - {\@secondoftwo}}% + {\@secondoftwo}} + +\def\blx@ifopcit@strict{% + \ifbool{citetracker} + {\blx@ifcitesingle + {\blx@ifopcit@global} + {\@secondoftwo}} + {\@secondoftwo}} + +\def\blx@ifopcit@constrict{% + \ifbool{citetracker} + {\blx@ifcitesingle + {\blx@imc@iffieldundef{namehash} + {\@secondoftwo} + {\iftoggle{blx@footnote} + {\blx@ifmpfncheck + {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}} + {\@secondoftwo}} + {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}} + {\@secondoftwo}} + {\@secondoftwo}} % {<true>}{<false>} \def\blx@ifloccit@global{% - \blx@loccit@check{text}} + \ifbool{citetracker} + {\blx@loccit@check{text}} + {\@secondoftwo}} \def\blx@ifloccit@context{% - \iftoggle{blx@footnote} - {\blx@loccit@check{foot}} - {\blx@loccit@check{text}}} + \ifbool{citetracker} + {\iftoggle{blx@footnote} + {\blx@loccit@check{foot}} + {\blx@loccit@check{text}}} + {\@secondoftwo}} \def\blx@ifloccit@strict{% - \blx@ifcitesingle - {\blx@loccit@numcheck{text}} - {\@secondoftwo}}% + \ifbool{citetracker} + {\blx@ifcitesingle + {\blx@loccit@numcheck{text}} + {\@secondoftwo}} + {\@secondoftwo}} \def\blx@ifloccit@constrict{% - \blx@ifcitesingle - {\iftoggle{blx@footnote} - {\blx@ifmpfncheck - {\blx@loccit@numcheck{foot}} - {\@secondoftwo}} - {\blx@loccit@numcheck{text}}} + \ifbool{citetracker} + {\blx@ifcitesingle + {\iftoggle{blx@footnote} + {\blx@ifmpfncheck + {\blx@loccit@numcheck{foot}} + {\@secondoftwo}} + {\blx@loccit@numcheck{text}}} + {\@secondoftwo}} {\@secondoftwo}} \def\blx@loccit@check#1{% @@ -2370,9 +2411,11 @@ % {<true>}{<false>} \def\blx@imc@iffirstonpage{% - \iftoggle{blx@footnote} - {\blx@iffirstonpage{fnpage}} - {\blx@iffirstonpage{page}}} + \ifbool{pagetracker} + {\iftoggle{blx@footnote} + {\blx@iffirstonpage{fnpage}} + {\blx@iffirstonpage{page}}} + {\@secondoftwo}} \def\blx@iffirstonpage#1{% \ifcsundef{blx@#1@\number\c@instcount} @@ -2400,11 +2443,13 @@ % {<count1>}{<count2>}{<true>}{<false>} \def\blx@imc@ifsamepage#1#2{% - \ifcsundef{blx@page@\number\numexpr#1} - {\ifcsundef{blx@fnpage@\number\numexpr#1} - {\@secondoftwo} - {\blx@ifsamepage{#1}{#2}{fnpage}}} - {\blx@ifsamepage{#1}{#2}{page}}} + \ifbool{pagetracker} + {\ifcsundef{blx@page@\number\numexpr#1} + {\ifcsundef{blx@fnpage@\number\numexpr#1} + {\@secondoftwo} + {\blx@ifsamepage{#1}{#2}{fnpage}}} + {\blx@ifsamepage{#1}{#2}{page}}} + {\@secondoftwo}} \def\blx@ifsamepage#1#2#3{% \ifcsundef{blx@page@\number\numexpr#2} @@ -3203,8 +3248,8 @@ \@ifstar\blx@mksc@i\blx@mksc@ii} \def\blx@mksc@i{% - \ifdef\abx@field@hyphenation - {\xifinlist\abx@field@hyphenation\blx@cmksc@lang + \ifdef\abx@field@langid + {\xifinlist\abx@field@langid\blx@cmksc@lang {\blx@mksc@ii} {\@firstofone}} {\blx@mksc@ii}} @@ -4679,6 +4724,26 @@ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% \printfield{extrayear}}}}}}} +\newrobustcmd*{\mkbibrangeyear}[1]{% + \blx@imc@clearfield{#1month}% + \blx@imc@clearfield{#1day}% + \blx@imc@clearfield{#1endmonth}% + \blx@imc@clearfield{#1endday}% + \iffieldsequal{#1year}{#1endyear} + {\blx@imc@clearfield{#1endyear}} + {}% + \mkbibrangefull{short}{#1}} + +\newrobustcmd*{\mkbibrangeyearextra}[1]{% + \blx@imc@clearfield{#1month}% + \blx@imc@clearfield{#1day}% + \blx@imc@clearfield{#1endmonth}% + \blx@imc@clearfield{#1endday}% + \iffieldsequal{#1year}{#1endyear} + {\blx@imc@clearfield{#1endyear}} + {}% + \mkbibrangefullextra{short}{#1}} + \expandafter\newrobustcmd \expandafter*\csname mkbibrangeiso8601\endcsname[1]{% \iffieldundef{#1year} @@ -4774,8 +4839,7 @@ \noexpand\blx@resetpunct \expandafter\noexpand\csname abx@noextras@#2\endcsname}} -%% Babel interface - +%% babel/polyglossia interface \def\blx@beglang{\blx@clearlang\begingroup} \def\blx@endlang{\endgroup} \let\blx@hook@endlang\@empty @@ -4795,31 +4859,72 @@ \begingroup \@makeother\# -\gdef\blx@mkbabel{% +\gdef\blx@mkautolangbabel{% \pretocmd\select@language{\blx@langsetup{#1}} {\ifdef\blx@thelangenv {\def\blx@beglang{% \blx@clearlang \begingroup - \blx@imc@iffieldundef{hyphenation} - {} - {\ifcsundef{l@\abx@field@hyphenation} - {\blx@warn@nohyph{\abx@field@hyphenation}} + \ifdef\abx@field@langid + {\ifcsundef{l@\abx@field@langid} + {\blx@warn@nohyph{\abx@field@langid}} {\blx@hook@initlang \def\blx@endlang{% \blx@hook@endlang \csname end\blx@thelangenv\endcsname \endgroup}% \csname\blx@thelangenv\expandafter\endcsname - \expandafter{\abx@field@hyphenation}}}}} + \expandafter{\abx@field@langid}}} + {}}} {}% \def\blx@imc@mainlang{\select@language{\bbl@main@language}}% \blx@langsetup\bbl@main@language} {\blx@err@patch{'babel' package}% - \blx@mknobabel}} + \blx@mknoautolang}} + +\gdef\blx@mkautolangpoly{% + \catcode`\_=11% polyglossia uses "_" as a letter + \pretocmd\select@language{\blx@langsetup{#1}} + {\ifdef\blx@thelangenv + {\def\blx@beglang{% + \blx@clearlang + \begingroup + \ifdef\abx@field@langid + {\ifcsundef{l@\abx@field@langid} + {\blx@warn@nohyph{\abx@field@langid}} + {\blx@hook@initlang + \def\blx@endlang{% + \blx@hook@endlang + % Polyglossia language envs are \<lang>[] + \expandafter\ifstrequal\expandafter{\blx@thelangenv}{langname} + {\csname end\abx@field@langid\endcsname} + {\csname end\blx@thelangenv\endcsname}% + \endgroup}% + \expandafter\ifstrequal\expandafter{\blx@thelangenv}{langname} + {\ifdef\abx@field@langidopts + {\csname\abx@field@langid\expandafter\endcsname\expandafter[\abx@field@langidopts]} + {\csname\abx@field@langid\endcsname}} + {\csname\blx@thelangenv\expandafter\endcsname + \expandafter{\abx@field@langid}}% + % These lines are equal to \blx@maplang + \blx@resetpunct + \csuse{abx@extras@\abx@field@langid}% + \csuse{abx@strings@\abx@field@langid}}} + {}}} + {}% + \def\blx@imc@mainlang{% + \select@language{\bbl@main@language}% + % These lines are equal to \blx@maplang + \blx@resetpunct + \csuse{abx@extras@\bbl@main@language}% + \csuse{abx@strings@\bbl@main@language}}% + \blx@langsetup\bbl@main@language} + {\blx@err@patch{'polyglossia' package}% + \blx@mknoautolang}% + \catcode`\_=8} \endgroup -\def\blx@mknobabel{% +\def\blx@mknoautolang{% \blx@lbxinput{\blx@languagename} {} {\blx@err@nolang{\blx@languagename}}} @@ -4933,6 +5038,7 @@ \def\abx@dointernalfields{% \do{childentrykey}% \do{clonesourcekey}% + \do{datelabelsource}% \do{entrykey}% \do{entryset}% \do{entrysetcount}% @@ -4974,6 +5080,7 @@ \dolistcsloop{blx@biber@datamodel@lists}\do{pageref}% \let\do\blx@imc@clearfield \dolistcsloop{blx@biber@datamodel@fields}\do{options}% + \do{labeltitle}\do{labelyear}\do{labelmonth}\do{labelday}\do{datelabelsource}% \abx@dointernalfields \def\do##1{\togglefalse{abx@bool@##1}}% \abx@dobooleans @@ -4995,6 +5102,7 @@ \dolistcsloop{blx@biber@datamodel@lists}\do{pageref}% \let\do\blx@savefield \dolistcsloop{blx@biber@datamodel@fields}\do{options}% + \do{labeltitle}\do{labelyear}\do{labelmonth}\do{labelday}\do{datelabelsource}% \abx@dointernalfields \let\do\blx@savebool \abx@dobooleans @@ -5616,7 +5724,6 @@ \listgadd{\blx@lastsortschemeslos}{#1}} % {<instcount>}{<entrykey>}{<refsection>}{<labelnumber>} - \protected\def\blx@aux@number#1#2#3#4{% \blx@bbl@addentryfield{\detokenize{#2}}{#3}{localnumber}{#4}% \global\toggletrue{blx@localnumber}% @@ -7445,7 +7552,7 @@ % ibidem tracker -\def\blx@ibidtracker@gobal{% +\def\blx@ibidtracker@global{% \ifbool{citetracker} {\global\let\blx@lastkey@text\abx@field@entrykey} {}} @@ -7459,8 +7566,8 @@ \def\blx@ibidtracker@strict{% \blx@ifcitesingle - {\blx@ibidtracker@gobal} - {\blx@ibidreset@gobal}}% + {\blx@ibidtracker@global} + {\blx@ibidreset@global}}% \def\blx@ibidtracker@constrict{% \blx@ifcitesingle @@ -7473,7 +7580,7 @@ \global\undef\blx@lastkey@foot \blx@mpfnreset} -\def\blx@ibidreset@gobal{% +\def\blx@ibidreset@global{% \global\undef\blx@lastkey@text} \def\blx@ibidreset@context{% @@ -7496,7 +7603,7 @@ % idem tracker -\def\blx@idemtracker@gobal{% +\def\blx@idemtracker@global{% \ifbool{citetracker} {\global\let\blx@lasthash@text\abx@field@fullhash} {}} @@ -7508,7 +7615,7 @@ {\global\let\blx@lasthash@text\abx@field@fullhash}} {}} -\let\blx@idemtracker@strict\blx@idemtracker@gobal +\let\blx@idemtracker@strict\blx@idemtracker@global \def\blx@idemtracker@constrict{% \blx@mpfnsave @@ -7519,7 +7626,7 @@ \global\undef\blx@lasthash@foot \blx@mpfnreset} -\def\blx@idemreset@gobal{% +\def\blx@idemreset@global{% \global\undef\blx@lasthash@text} \def\blx@idemreset@context{% @@ -7542,7 +7649,7 @@ % opcit tracker -\def\blx@opcittracker@gobal{% +\def\blx@opcittracker@global{% \ifbool{citetracker} {\blx@opcit@tracker{text}} {}} @@ -7556,8 +7663,8 @@ \def\blx@opcittracker@strict{% \blx@ifcitesingle - {\blx@opcittracker@gobal} - {\blx@opcitreset@gobal}}% + {\blx@opcittracker@global} + {\blx@opcitreset@global}}% \def\blx@opcittracker@constrict{% \blx@ifcitesingle @@ -7585,7 +7692,7 @@ \blx@opcit@reset{foot}% \blx@mpfnreset} -\def\blx@opcitreset@gobal{% +\def\blx@opcitreset@global{% \blx@opcit@reset{text}} \def\blx@opcitreset@context{% @@ -7631,7 +7738,7 @@ % loccit tracker -\def\blx@loccittracker@gobal{% +\def\blx@loccittracker@global{% \ifbool{citetracker} {\blx@loccit@tracker{text}} {}} @@ -7691,7 +7798,7 @@ \blx@loccit@reset{foot}% \blx@mpfnreset} -\def\blx@loccitreset@gobal{% +\def\blx@loccitreset@global{% \blx@loccit@reset{text}} \def\blx@loccitreset@context{% @@ -9230,7 +9337,7 @@ \let\blx@tempc\@empty \let\map\blx@sourcemap@map \ifblank{#1} - {\setkeys{blx@sourcemap@maps}{level=user}} + {\setkeys{blx@sourcemap@maps}{datatype=bibtex, level=user}} {\setkeys{blx@sourcemap@maps}{#1, level=user}}% #2% \eappto\blx@tempa{% @@ -9241,7 +9348,7 @@ \let\blx@tempc\@empty \let\map\blx@sourcemap@map \ifblank{#1} - {\setkeys{blx@sourcemap@maps}{level=style}} + {\setkeys{blx@sourcemap@maps}{datatype=bibtex, level=style}} {\setkeys{blx@sourcemap@maps}{#1, level=style}}% #2% \eappto\blx@tempa{% @@ -9718,7 +9825,7 @@ {\def\do##1{% \blx@addtypeopt{##1}% \csxappto{blx@bcf@\blx@tempb @##1}{% - \noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}% + \noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="field"\blx@tempc}{#2}}}% \expandafter\docsvlist\expandafter{\blx@tempa}}} \newcommand*{\blx@orderedld@literal}[1]{% @@ -10034,25 +10141,40 @@ \settoggle{blx@clearlang}{#1}} \DeclareBibliographyOption{babel}{% - \ifcsdef{blx@opt@babel@#1} - {\csuse{blx@opt@babel@#1}} - {\blx@err@invopt{babel=#1}{}}} -\def\blx@opt@babel@none{% + \blx@warning@noline{% + 'babel' option is deprecated, use 'autolang' instead}% + \blx@autolang@i{#1}} + +\DeclareBibliographyOption{autolang}{% + \blx@autolang@i{#1}} + +\def\blx@autolang@i#1{% + \ifcsdef{blx@opt@autolang@#1} + {\csuse{blx@opt@autolang@#1}} + {\blx@err@invopt{autolang=#1}{}}} + +\def\blx@opt@autolang@none{% \undef\blx@thelangenv \let\blx@hook@initlang\@empty \let\blx@hook@endlang\@empty} -\def\blx@opt@babel@hyphen{% +\def\blx@opt@autolang@hyphen{% \def\blx@thelangenv{hyphenrules}% \let\blx@hook@initlang\@empty \let\blx@hook@endlang\@empty} -\csdef{blx@opt@babel@other*}{% +\csdef{blx@opt@autolang@other*}{% \def\blx@thelangenv{otherlanguage*}% \def\blx@hook@initlang{\@quotereset\@ne}% \def\blx@hook@endlang{\blx@postpunct}} -\def\blx@opt@babel@other{% +\def\blx@opt@autolang@other{% \def\blx@thelangenv{otherlanguage}% \def\blx@hook@initlang{\@quotereset\@ne}% \def\blx@hook@endlang{\blx@postpunct}} +\def\blx@opt@autolang@langname{% + \@ifpackageloaded{polyglossia} + {\def\blx@thelangenv{langname}} + {\def\blx@thelangenv{otherlanguage}}% + \def\blx@hook@initlang{\@quotereset\@ne}% + \def\blx@hook@endlang{\blx@postpunct}} \DeclareBibliographyOption{indexing}[true]{% \blx@opt@index{#1}} @@ -10243,8 +10365,8 @@ {\blx@err@invopt{ibidtracker=#1}{}}} \def\blx@opt@ibidtracker@true{% \let\blx@imc@ifciteibid\blx@ifciteibid@global - \let\blx@ibidtracker\blx@ibidtracker@gobal - \let\blx@ibidreset\blx@ibidreset@gobal + \let\blx@ibidtracker\blx@ibidtracker@global + \let\blx@ibidreset\blx@ibidreset@global \booltrue{citetracker}} \def\blx@opt@ibidtracker@false{% \let\blx@imc@ifciteibid\@secondoftwo @@ -10258,7 +10380,7 @@ \def\blx@opt@ibidtracker@strict{% \let\blx@imc@ifciteibid\blx@ifciteibid@strict \let\blx@ibidtracker\blx@ibidtracker@strict - \let\blx@ibidreset\blx@ibidreset@gobal + \let\blx@ibidreset\blx@ibidreset@global \booltrue{citetracker}} \def\blx@opt@ibidtracker@constrict{% \let\blx@imc@ifciteibid\blx@ifciteibid@constrict @@ -10272,8 +10394,8 @@ {\blx@err@invopt{idemtracker=#1}{}}} \def\blx@opt@idemtracker@true{% \let\blx@imc@ifciteidem\blx@ifciteidem@global - \let\blx@idemtracker\blx@idemtracker@gobal - \let\blx@idemreset\blx@idemreset@gobal + \let\blx@idemtracker\blx@idemtracker@global + \let\blx@idemreset\blx@idemreset@global \booltrue{citetracker}} \def\blx@opt@idemtracker@false{% \let\blx@imc@ifciteidem\@secondoftwo @@ -10287,7 +10409,7 @@ \def\blx@opt@idemtracker@strict{% \let\blx@imc@ifciteidem\blx@ifciteidem@strict \let\blx@idemtracker\blx@idemtracker@strict - \let\blx@idemreset\blx@idemreset@gobal + \let\blx@idemreset\blx@idemreset@global \booltrue{citetracker}} \def\blx@opt@idemtracker@constrict{% \let\blx@imc@ifciteidem\blx@ifciteidem@constrict @@ -10301,8 +10423,8 @@ {\blx@err@invopt{opcittracker=#1}{}}} \def\blx@opt@opcittracker@true{% \let\blx@imc@ifopcit\blx@ifopcit@global - \let\blx@opcittracker\blx@opcittracker@gobal - \let\blx@opcitreset\blx@opcitreset@gobal + \let\blx@opcittracker\blx@opcittracker@global + \let\blx@opcitreset\blx@opcitreset@global \booltrue{citetracker}} \def\blx@opt@opcittracker@false{% \let\blx@imc@ifopcit\@secondoftwo @@ -10316,7 +10438,7 @@ \def\blx@opt@opcittracker@strict{% \let\blx@imc@ifopcit\blx@ifopcit@strict \let\blx@opcittracker\blx@opcittracker@strict - \let\blx@opcitreset\blx@opcitreset@gobal + \let\blx@opcitreset\blx@opcitreset@global \booltrue{citetracker}} \def\blx@opt@opcittracker@constrict{% \let\blx@imc@ifopcit\blx@ifopcit@constrict @@ -10330,8 +10452,8 @@ {\blx@err@invopt{loccittracker=#1}{}}} \def\blx@opt@loccittracker@true{% \let\blx@imc@ifloccit\blx@ifloccit@global - \let\blx@loccittracker\blx@loccittracker@gobal - \let\blx@loccitreset\blx@loccitreset@gobal + \let\blx@loccittracker\blx@loccittracker@global + \let\blx@loccitreset\blx@loccitreset@global \booltrue{citetracker}} \def\blx@opt@loccittracker@false{% \let\blx@imc@ifloccit\@secondoftwo @@ -10345,7 +10467,7 @@ \def\blx@opt@loccittracker@strict{% \let\blx@imc@ifloccit\blx@ifloccit@strict \let\blx@loccittracker\blx@loccittracker@strict - \let\blx@loccitreset\blx@loccitreset@gobal + \let\blx@loccitreset\blx@loccitreset@global \booltrue{citetracker}} \def\blx@opt@loccittracker@constrict{% \let\blx@imc@ifloccit\blx@ifloccit@constrict @@ -10377,8 +10499,14 @@ \DeclareBibliographyOption{datelabel}{% \ifcsdef{mkbibrange#1} - {\protected\def\blx@imc@printdatelabel{\csuse{mkbibrange#1}{label}}% - \protected\def\blx@imc@printdateextralabel{\csuse{mkbibrange#1extra}{label}}} + {\protected\def\blx@imc@printdatelabel{% + \blx@imc@iffieldundef{year} + {\csuse{mkbibrange#1}{label}} + {\csuse{mkbibrange#1}{}}}% + \protected\def\blx@imc@printdateextralabel{% + \blx@imc@iffieldundef{year} + {\csuse{mkbibrange#1extra}{label}} + {\csuse{mkbibrange#1extra}{}}}} {\blx@err@invopt{datelabel=#1}{}}} \DeclareBibliographyOption{urldate}{% @@ -10397,7 +10525,8 @@ {\blx@err@invopt{origdate=#1}{}}} \DeclareBibliographyOption{alldates}{% - \ExecuteBibliographyOptions{date=#1,datelabel=#1,urldate=#1,eventdate=#1,origdate=#1}} + \ExecuteBibliographyOptions{% + date=#1,datelabel=#1,urldate=#1,eventdate=#1,origdate=#1}} \DeclareBibliographyOption{datezeros}[true]{% \ifstrequal{#1}{true} @@ -10680,11 +10809,11 @@ usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true, backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false, idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false, - citecounter=false,block=none,language=auto,clearlang=true,babel=none, - date=comp,datelabel=comp,origdate=comp,eventdate=comp,urldate=short,autopunct=true, - punctfont=false,defernumbers=false,refsection=none,refsegment=none, - citereset=none,hyperref=auto,parentracker,maxparens=3, - bibencoding=auto,bibwarn} + citecounter=false,block=none,language=auto,clearlang=true,autolang=none, + date=comp,datelabel=year,origdate=comp,eventdate=comp,urldate=short, + autopunct=true,punctfont=false,defernumbers=false, + refsection=none,refsegment=none,citereset=none,hyperref=auto, + parentracker,maxparens=3,bibencoding=auto,bibwarn} % Load compatibility code diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def index b9c5258a532..c275d1e57ff 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def @@ -359,7 +359,6 @@ eventtitleaddon, gender, howpublished, - hyphenation, indexsorttitle, indextitle, isan, @@ -374,6 +373,8 @@ journalsubtitle, journaltitle, label, + langid, + langidopts, library, mainsubtitle, maintitle, @@ -514,7 +515,6 @@ execute, file, gender, - hyphenation, ids, indextitle, indexsorttitle, @@ -523,6 +523,8 @@ iswc, keywords, label, + langid, + langidopts, library, lista, listb, @@ -716,8 +718,10 @@ note, number, origlanguage, + pagetotal, publisher, pubstate, + series, subtitle, titleaddon, translator, diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def index 7057a4185ad..b4a8976e50f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def @@ -48,11 +48,11 @@ \ifx\blx@mclike@tempb\@empty \else \ifx\blx@mclike@tempc\@empty - \nocite{\blx@mclike@tempb}% preserve citation order for sorting=none \else \defbibentryset{\blx@mclike@tempb}{\blx@mclike@tempc}% \let\blx@mclike@tempc\@empty \fi + \nocite{\blx@mclike@tempb}% preserve citation order for sorting=none \let\blx@mclike@tempb\@empty \fi} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx index 085b2ea85f5..911441d9e22 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx @@ -331,13 +331,13 @@ oldseries = {{s\`erie antiga}{s\`er\adddotspace ant\adddot}}, edition = {{edici\'o}{ed\adddot}}, reprint = {{reimpressi\'o}{reimpr\adddot}}, - reprintof = {{reimpressi\'o \smartof}{reimpr\adddotspace\smartof}}, + reprintof = {{reimpressi\'o del}{reimpr\adddotspace del}}, reprintas = {{reimpr\`es com}{reimpr\adddotspace com}}, reprintfrom = {{reimpr\`es \smartof}{reimpr\adddotspace\smartof}}, - reviewof = {{revisi\'o \smartof}{rev\adddotspace\smartof}}, - translationof = {{traducci\'o \smartof}{trad\adddotspace\smartof}}, + reviewof = {{revisi\'o del}{rev\adddotspace del}}, + translationof = {{traducci\'o del}{trad\adddotspace del}}, translationas = {{tradu{\"\i}t com}{trad\adddotspace com}}, - translationfrom = {{tradu{\"\i}t del}{trad\adddotspace del}},% FIXME: smartdel + translationfrom = {{tradu{\"\i}t del}{trad\adddotspace del}}, origpubas = {{publicat originalment com}{pub\adddotspace orig\adddotspace com}}, origpubin = {{publicat originalment el}{pub\adddotspace orig\adddotspace el}}, astitle = {{com}{com}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index 46594e2374a..c9f5d9bb0d8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -104,135 +104,135 @@ editorsaf = {{redacteuren en nawoord}% {red\adddotspace en naw\adddot}}, editortrco = {{redacteur, vertaler en commentator}% - {red.,\addabbrvspace vert\adddot\ en comm\adddot}}, + {red.,\addabbrvspace vert\adddotspace en comm\adddot}}, editorstrco = {{redacteuren, vertalers en commentatoren}% - {red.,\addabbrvspace vert\adddot\ en comm\adddot}}, + {red.,\addabbrvspace vert\adddotspace en comm\adddot}}, editortran = {{redacteur, vertaler en annotator}% - {red.,\addabbrvspace vert\adddot\ en annot\adddot}}, + {red.,\addabbrvspace vert\adddotspace en annot\adddot}}, editorstran = {{redacteur, vertalers en annotatoren}% - {red.,\addabbrvspace vert\adddot\ en annot\adddot}}, + {red.,\addabbrvspace vert\adddotspace en annot\adddot}}, editortrin = {{redacteur, vertaler en inleiding}% - {red.,\addabbrvspace vert\adddot\ en inl\adddot}}, + {red.,\addabbrvspace vert\adddotspace en inl\adddot}}, editorstrin = {{redacteuren, vertalers en inleiding}% - {red.,\addabbrvspace vert\adddot\ en inl\adddot}}, + {red.,\addabbrvspace vert\adddotspace en inl\adddot}}, editortrfo = {{redacteur, vertaler en voorwoord}% - {red.,\addabbrvspace vert\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace vert\adddotspace en voorw\adddot}}, editorstrfo = {{redacteuren, vertalers en voorwoord}% - {red.,\addabbrvspace vert\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace vert\adddotspace en voorw\adddot}}, editortraf = {{redacteur, vertaler en nawoord}% - {red.,\addabbrvspace vert\adddot\ en naw\adddot}}, + {red.,\addabbrvspace vert\adddotspace en naw\adddot}}, editorstraf = {{redacteuren, vertalers en nawoord}% - {red.,\addabbrvspace vert\adddot\ en naw\adddot}}, + {red.,\addabbrvspace vert\adddotspace en naw\adddot}}, editorcoin = {{redacteur, commentator en inleiding}% - {red.,\addabbrvspace comm\adddot\ en inl\adddot}}, + {red.,\addabbrvspace comm\adddotspace en inl\adddot}}, editorscoin = {{redacteuren, commentatoren en inleiding}% - {red.,\addabbrvspace comm\adddot\ en inl\adddot}}, + {red.,\addabbrvspace comm\adddotspace en inl\adddot}}, editorcofo = {{redacteur, commentator en voorwoord}% - {red.,\addabbrvspace comm\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace comm\adddotspace en voorw\adddot}}, editorscofo = {{redacteuren, commentatoren en voorwoord}% - {red.,\addabbrvspace comm\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace comm\adddotspace en voorw\adddot}}, editorcoaf = {{redacteur, commentator en nawoord}% - {red.,\addabbrvspace comm\adddot\ en naw\adddot}}, + {red.,\addabbrvspace comm\adddotspace en naw\adddot}}, editorscoaf = {{redacteuren, commentatoren en nawoord}% - {red.,\addabbrvspace comm\adddot\ en naw\adddot}}, + {red.,\addabbrvspace comm\adddotspace en naw\adddot}}, editoranin = {{redacteur, annotator en inleiding}% - {red.,\addabbrvspace annot\adddot\ en inl\adddot}}, + {red.,\addabbrvspace annot\adddotspace en inl\adddot}}, editorsanin = {{redacteuren, annotatoren en inleiding}% - {red.,\addabbrvspace annot\adddot\ en inl\adddot}}, + {red.,\addabbrvspace annot\adddotspace en inl\adddot}}, editoranfo = {{redacteur, annotator en voorwoord}% - {red.,\addabbrvspace annot\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace annot\adddotspace en voorw\adddot}}, editorsanfo = {{redacteuren, annotatoren en voorwoord}% - {red.,\addabbrvspace annot\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace annot\adddotspace en voorw\adddot}}, editoranaf = {{redacteur, annotator en nawoord}% - {red.,\addabbrvspace annot\adddot\ en nawoord\adddot}}, + {red.,\addabbrvspace annot\adddotspace en nawoord\adddot}}, editorsanaf = {{redacteuren, annotatoren en nawoord}% - {red.,\addabbrvspace annot\adddot\ en naw\adddot}}, + {red.,\addabbrvspace annot\adddotspace en naw\adddot}}, editortrcoin = {{redacteur, vertaler, commentator en inleiding}% - {red.,\addabbrvspace vert., comm\adddot\ en inl\adddot}}, + {red.,\addabbrvspace vert., comm\adddotspace en inl\adddot}}, editorstrcoin = {{redacteuren, vertalers, commentatoren en inleiding}% - {red.,\addabbrvspace vert., comm\adddot\ en inl\adddot}}, + {red.,\addabbrvspace vert., comm\adddotspace en inl\adddot}}, editortrcofo = {{redacteur, vertaling, commentator en voorwoord}% - {red.,\addabbrvspace vert., comm\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace vert., comm\adddotspace en voorw\adddot}}, editorstrcofo = {{redacteuren, vertalers, commentatoren en voorwoord}% - {red.,\addabbrvspace vert., comm\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace vert., comm\adddotspace en voorw\adddot}}, editortrcoaf = {{redacteur, vertaler, commentator en nawoord}% - {red.,\addabbrvspace vert., comm\adddot\ en naw\adddot}}, + {red.,\addabbrvspace vert., comm\adddotspace en naw\adddot}}, editorstrcoaf = {{redacteuren, vertalers, commentators en nawoord}% - {red.,\addabbrvspace vert., comm\adddot\ en naw\adddot}}, + {red.,\addabbrvspace vert., comm\adddotspace en naw\adddot}}, editortranin = {{redacteur, vertaler, annotator en inleiding}% - {red.,\addabbrvspace vert., annot\adddot\ en inl\adddot}}, + {red.,\addabbrvspace vert., annot\adddotspace en inl\adddot}}, editorstranin = {{redacteuren, vertalers, annotatoren en inleiding}% - {red.,\addabbrvspace vert., annot\adddot\ en inl\adddot}}, + {red.,\addabbrvspace vert., annot\adddotspace en inl\adddot}}, editortranfo = {{redacteur, vertaler, annotator en voorwoord}% - {red.,\addabbrvspace vert., annot\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace vert., annot\adddotspace en voorw\adddot}}, editorstranfo = {{redacteuren, vertalers, annotatoren en voorwoord}% - {red.,\addabbrvspace vert., annot\adddot\ en voorw\adddot}}, + {red.,\addabbrvspace vert., annot\adddotspace en voorw\adddot}}, editortranaf = {{redacteur, vertaler, annotator en nawoord}% - {red.,\addabbrvspace vert., annot\adddot\ en naw\adddot}}, + {red.,\addabbrvspace vert., annot\adddotspace en naw\adddot}}, editorstranaf = {{redacteuren, vertalers, annotatoren en nawoord}% - {red.,\addabbrvspace vert., annot\adddot\ en naw\adddot}}, + {red.,\addabbrvspace vert., annot\adddotspace en naw\adddot}}, translatorco = {{vertaler en commentator}% - {vert\adddot\ en comm\adddot}}, + {vert\adddotspace en comm\adddot}}, translatorsco = {{vertalers en commentatoren}% - {vert\adddot\ en comm\adddot}}, + {vert\adddotspace en comm\adddot}}, translatoran = {{vertaler en annotator}% - {vert\adddot\ en annot\adddot}}, + {vert\adddotspace en annot\adddot}}, translatorsan = {{vertalers en annotatoren}% - {vert\adddot\ en annot\adddot}}, + {vert\adddotspace en annot\adddot}}, translatorin = {{vertaling en inleiding}% - {vert\adddot\ en inl\adddot}}, + {vert\adddotspace en inl\adddot}}, translatorsin = {{vertaling en inleiding}% - {vert\adddot\ en inl\adddot}}, + {vert\adddotspace en inl\adddot}}, translatorfo = {{vertaling en voorwoord}% - {vert\adddot\ en voorw\adddot}}, + {vert\adddotspace en voorw\adddot}}, translatorsfo = {{vertaling en voorwoord}% - {vert\adddot\ en voorw\adddot}}, + {vert\adddotspace en voorw\adddot}}, translatoraf = {{vertaling en nawoord}% - {vert\adddot\ en naw\adddot}}, + {vert\adddotspace en naw\adddot}}, translatorsaf = {{vertaling en nawoord}% - {vert\adddot\ en naw\adddot}}, + {vert\adddotspace en naw\adddot}}, translatorcoin = {{vertaling, commentaar en inleiding}% - {vert., comm\adddot\ en inl\adddot}}, + {vert., comm\adddotspace en inl\adddot}}, translatorscoin = {{vertaling, commentaar en inleiding}% - {vert., comm\adddot\ en inl\adddot}}, + {vert., comm\adddotspace en inl\adddot}}, translatorcofo = {{vertaling, commentaar en voorwoord}% - {vert., comm\adddot\ en voorwoord\adddot}}, + {vert., comm\adddotspace en voorwoord\adddot}}, translatorscofo = {{vertaling, commentaar en voorwoord}% - {vert., comm\adddot\ en voorw\adddot}}, + {vert., comm\adddotspace en voorw\adddot}}, translatorcoaf = {{vertaling, commentaar en nawoord}% - {vert., comm\adddot\ en naw\adddot}}, + {vert., comm\adddotspace en naw\adddot}}, translatorscoaf = {{vertaling, commentaar en nawoord}% - {vert., comm\adddot\ en naw\adddot}}, + {vert., comm\adddotspace en naw\adddot}}, translatoranin = {{vertaling, annotaties en inleiding}% - {vert., annot\adddot\ en inl\adddot}}, + {vert., annot\adddotspace en inl\adddot}}, translatorsanin = {{vertaling, annotaties en inleiding}% - {vert., annot\adddot\ en inl\adddot}}, + {vert., annot\adddotspace en inl\adddot}}, translatoranfo = {{vertaling, annotaties en voorwoord}% - {vert., annot\adddot\ en voorw\adddot}}, + {vert., annot\adddotspace en voorw\adddot}}, translatorsanfo = {{vertaling, annotaties en voorwoord}% - {vert., annot\adddot\ en voorw\adddot}}, + {vert., annot\adddotspace en voorw\adddot}}, translatoranaf = {{vertaling, annotaties en nawoord}% - {vert., annot\adddot\ en naw\adddot}}, + {vert., annot\adddotspace en naw\adddot}}, translatorsanaf = {{vertaling, annotaties en nawoord}% - {vert., annot\adddot\ en naw\adddot}}, + {vert., annot\adddotspace en naw\adddot}}, byauthor = {{door}{door}}, byeditor = {{geredigeerd door}{red\adddot\addabbrvspace door}}, bycompiler = {{samengesteld door}{sam\adddot\addabbrvspace door}}, byfounder = {{opgericht door}{opger\adddot\addabbrvspace door}}, bycontinuator = {{opgevolgd door}{opgev\adddot\addabbrvspace door}}, - byredactor = {{geredigeerd door}{red\adddot\ door}}, - byreviser = {{nagekeken door}{nagek\adddot\addabbrvspace door}}, -% byreviewer = {{}{}},% FIXME: missing + byredactor = {{geredigeerd door}{red\adddotspace door}}, + byreviser = {{gereviseerd door}{gerevis\adddot\addabbrvspace door}}, + byreviewer = {{nagekeken door}{nagek\adddot\addabbrvspace door}}, bycollaborator = {{met medewerking van}{m\adddot m\adddot v}}, - bytranslator = {{vertaald \lbx@lfromlang\ door}{vert\adddot\ \lbx@lfromlang\ door}}, - bycommentator = {{becommentarieerd door}{comm\adddot\ door}}, - byannotator = {{geannoteerd door}{annot\adddot\ door}}, + bytranslator = {{vertaald \lbx@lfromlang\ door}{vert\adddotspace \lbx@lfromlang\ door}}, + bycommentator = {{becommentarieerd door}{comm\adddotspace door}}, + byannotator = {{geannoteerd door}{annot\adddotspace door}}, byeditortr = {{geredigeerd en vertaald \lbx@lfromlang\ door}% - {red\adddotspace en vert\adddot\ \lbx@sfromlang\ door}}, + {red\adddotspace en vert\adddotspace \lbx@sfromlang\ door}}, byeditorco = {{geredigeerd en becommentarieerd door}% - {red\adddotspace en comm\adddot\ door}}, + {red\adddotspace en comm\adddotspace door}}, byeditoran = {{geredigeerd en geannoteerd door}% - {red\adddotspace en annot\adddot\ door}}, + {red\adddotspace en annot\adddotspace door}}, byeditorin = {{geredigeerd, met een inleiding, van}% {red., met een inl., van}}, byeditorfo = {{geredigeerd, met een voorwoord, van}% @@ -240,9 +240,9 @@ byeditoraf = {{geredigeerd, met een nawoord, van}% {red., met een naw., van}}, byeditortrco = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd door}% - {red., vert\adddot\ \lbx@sfromlang\ en comm\adddot\ door}}, + {red., vert\adddotspace \lbx@sfromlang\ en comm\adddotspace door}}, byeditortran = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd door}% - {red., vert\adddot\ \lbx@sfromlang\ en annot\adddot\ door}}, + {red., vert\adddotspace \lbx@sfromlang\ en annot\adddotspace door}}, byeditortrin = {{geredigeerd en vertaald \lbx@lfromlang, met een inleiding, door}% {red\adddotspace en vert. \lbx@sfromlang, met een inl., door}}, byeditortrfo = {{geredigeerd en vertaald \lbx@lfromlang, met een voorwoord, door}% @@ -262,44 +262,44 @@ byeditoranaf = {{geredigeerd en geannoteerd, met een nawoord, door}% {red\adddotspace en annot., met een naw., door}}, byeditortrcoin = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding, door}% - {red., vert\adddot\ \lbx@sfromlang\ en comm., met een inl., door}}, + {red., vert\adddotspace \lbx@sfromlang\ en comm., met een inl., door}}, byeditortrcofo = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een voorwoord, door}% - {red., vert\adddot\ \lbx@sfromlang\ en comm., met een voorw., door}}, + {red., vert\adddotspace \lbx@sfromlang\ en comm., met een voorw., door}}, byeditortrcoaf = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een nawoord, door}% - {red., vert\adddot\ \lbx@sfromlang\ en comm., met een naw., door}}, + {red., vert\adddotspace \lbx@sfromlang\ en comm., met een naw., door}}, byeditortranin = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een inleiding, door}% - {red., vert\adddot\ \lbx@sfromlang\ en annot., met een inl., door}}, + {red., vert\adddotspace \lbx@sfromlang\ en annot., met een inl., door}}, byeditortranfo = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een voorwoord, door}% - {red., vert\adddot\ \lbx@sfromlang\ en annot., met een voorw., door}}, + {red., vert\adddotspace \lbx@sfromlang\ en annot., met een voorw., door}}, byeditortranaf = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een nawoord, door}% - {red., vert\adddot\ \lbx@sfromlang\ en annot., met een naw., door}}, + {red., vert\adddotspace \lbx@sfromlang\ en annot., met een naw., door}}, bytranslatorco = {{vertaald \lbx@lfromlang\ en becommentarieerd door}% - {vert\adddot\ \lbx@sfromlang\ en comm\adddot\ door}}, + {vert\adddotspace \lbx@sfromlang\ en comm\adddotspace door}}, bytranslatoran = {{vertaald \lbx@lfromlang\ en geannoteerd door}% - {vert\adddot\ \lbx@sfromlang\ en annot.\adddot\ door}}, + {vert\adddotspace \lbx@sfromlang\ en annot.\adddotspace door}}, bytranslatorin = {{vertaald \lbx@lfromlang, met een inleiding, door}% {vert. \lbx@sfromlang, met een inl., door}}, bytranslatorfo = {{vertaald \lbx@lfromlang, met een voorwoord, door}% {vert. \lbx@sfromlang, met een voorw., door}}, bytranslatoraf = {{vertaald \lbx@lfromlang, met een nawoord, door}% {vert. \lbx@sfromlang, met een naw., door}}, - bytranslatorcoin = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding., door}% - {vert\adddot\ \lbx@sfromlang\ en comm., met een inl., door}}, + bytranslatorcoin = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding, door}% + {vert\adddotspace \lbx@sfromlang\ en comm., met een inl., door}}, bytranslatorcofo = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een voorwoord, door}% - {vert\adddot\ \lbx@sfromlang\ en comm., met een voorw., door}}, + {vert\adddotspace \lbx@sfromlang\ en comm., met een voorw., door}}, bytranslatorcoaf = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een nawoord, door}% - {vert\adddot\ \lbx@sfromlang\ en comm., met een naw., door}}, - bytranslatoranin = {{vertaald \lbx@lfromlang\ en geannoteerd, met een inleiding., door}% - {vert\adddot\ \lbx@sfromlang\ en annot., met een inl., door}}, + {vert\adddotspace \lbx@sfromlang\ en comm., met een naw., door}}, + bytranslatoranin = {{vertaald \lbx@lfromlang\ en geannoteerd, met een inleiding, door}% + {vert\adddotspace \lbx@sfromlang\ en annot., met een inl., door}}, bytranslatoranfo = {{vertaald \lbx@lfromlang\ en geannoteerd, met een voorwoord, door}% - {vert\adddot\ \lbx@sfromlang\ en annot., met een voorw., door}}, + {vert\adddotspace \lbx@sfromlang\ en annot., met een voorw., door}}, bytranslatoranaf = {{vertaald \lbx@lfromlang\ en geannoteerd, met een nawoord, door}% - {vert\adddot\ \lbx@sfromlang\ en annot., met een naw., door}}, - withcommentator = {{met een commentaar van}{met een comm\adddot\ van}}, - withannotator = {{met annotaties door}{met annot\adddot\ door}}, - withintroduction = {{met een inleiding van}{met een inl\adddot\ van}}, - withforeword = {{met een voorwoord van}{met een voorw\adddot\ van}}, - withafterword = {{met een nawoord van}{met een naw\adddot\ van}}, + {vert\adddotspace \lbx@sfromlang\ en annot., met een naw., door}}, + withcommentator = {{met een commentaar van}{met een comm\adddotspace van}}, + withannotator = {{met annotaties door}{met annot\adddotspace door}}, + withintroduction = {{met een inleiding van}{met een inl\adddotspace van}}, + withforeword = {{met een voorwoord van}{met een voorw\adddotspace van}}, + withafterword = {{met een nawoord van}{met een naw\adddotspace van}}, commentary = {{commentaar}{comm\adddot}}, annotations = {{annotaties}{annot\adddot}}, introduction = {{inleiding}{inl\adddot}}, @@ -309,9 +309,9 @@ volumes = {{delen}{delen}}, jourvol = {{jaargang}{jrg\adddot}}, jourser = {{reeks}{reeks}}, -% book = {{}{}},% FIXME: missing -% part = {{}{}},% FIXME: missing -% issue = {{}{}},% FIXME: missing + book = {{boek}{boek}}, + part = {{deel}{deel}}, + issue = {{nummer}{nr\adddot}}, newseries = {{nieuwe reeks}{nieuwe reeks}}, oldseries = {{oude reeks}{oude reeks}}, edition = {{editie}{ed\adddot}}, @@ -324,20 +324,20 @@ reprint = {{herdruk}{herdr\adddot}}, reprintof = {{herdruk van}{herdr\adddotspace van}}, reprintas = {{herdrukt als}{herdr\adddotspace als}}, - reprintfrom = {{herdrukt uit}{herdr\adddotspace uit}},% FIXME: check - translationof = {{translation of}{trans\adddotspace of}},% FIXME: check - translationas = {{translated as}{trans\adddotspace as}},% FIXME: check - translationfrom = {{vertaald van}{vert\adddotspace van}},% FIXME: check -% reviewof = {{}{}},% FIXME: missing -% origpubas = {{}{}},% FIXME: missing -% origpubin = {{}{}},% FIXME: missing + reprintfrom = {{herdrukt uit}{herdr\adddotspace uit}}, + translationof = {{vertaling van}{vert\adddotspace van}}, + translationas = {{vertaald als}{vert\adddotspace als}}, + translationfrom = {{vertaald van}{vert\adddotspace van}}, + reviewof = {{bespreking van}{bespr\addotspace van}}, + origpubas = {{oorspronkelijk gepubliceerd als}{oorspr\addotspace gep\addotspace als}}, + origpubin = {{oorspronkelijk gepubliceerd in}{oorspr\addotspace gep\addotspace in}}, astitle = {{als}{als}},% FIXME: check bypublisher = {{door}{door}},% FIXME: check inpreparation = {{in voorbereiding}{in voorbereiding}}, submitted = {{ingediend}{ingedied}}, -% forthcoming = {{}{}},% FIXME: missing +% forthcoming = {{onderweg}{onderweg}},% FIXME: check inpress = {{in druk}{in druk}}, -% prepublished = {{}{}},% FIXME: missing + prepublished = {{voorpublicatie}{voorpublicatie}}, page = {{pagina}{p\adddot}}, pages = {{pagina's}{p\adddot}}, column = {{kolom}{kol\adddot}}, @@ -350,7 +350,7 @@ verses = {{verzen}{v\adddot}}, line = {{regel}{r\adddot}}, lines = {{regels}{r\adddot}}, - nodate = {{geen\space datum}{{}n\adddot d\adddot}}, + nodate = {{geen\space datum}{{}g\adddot d\adddot}}, mathesis = {{masterscriptie}{masterscriptie}}, phdthesis = {{proefschrift}{proefschrift}}, resreport = {{onderzoeksrapport}{onderzoeksrap\adddot}}, @@ -362,7 +362,7 @@ andothers = {{en andere}{e\adddot a\adddot}}, andmore = {{en andere}{e\adddot a\adddot}}, url = {{addres}{addres}}, -% urlfrom = {{}{}},% FIXME: missing + urlfrom = {{beschikbaar op}{beschikbaar op}}, urlseen = {{bezocht op}{bezocht op}}, file = {{bestand}{bestand}}, library = {{bibliotheek}{bibliotheek}}, @@ -405,42 +405,42 @@ december = {{december}{dec}}, langamerican = {{Amerikaans Engels}{Amerikaans Engels}}, langbrazilian = {{Braziliaans Portugeens}{Braziliaans Portugees}}, -% langcatalan = {{}{}},% FIXME: missing -% langcroatian = {{}{}},% FIXME: missing -% langczech = {{}{}},% FIXME: missing + langcatalan = {{Catalaans}{Catalaans}}, + langcroatian = {{Kroatisch}{Kroatisch}}, + langczech = {{Tsjechisch}{Tsjechisch}}, langdanish = {{Deens}{Deens}}, langdutch = {{Nederlands}{Nederlands}}, langenglish = {{Engels}{Engels}}, -% langfinnish = {{}{}},% FIXME: missing + langfinnish = {{Fins}{Fins}}, langfrench = {{Frans}{Frans}}, langgerman = {{Duits}{Duits}}, langgreek = {{Grieks}{Grieks}}, langitalian = {{Italiaans}{Italiaans}}, langlatin = {{Latijn}{Latijn}}, langnorwegian = {{Noors}{Noors}}, -% langpolish = {{}{}},% FIXME: missing + langpolish = {{Pools}{Pools}}, langportuguese = {{Portugees}{Portugees}}, -% langrussian = {{}{}},% FIXME: missing + langrussian = {{Russisch}{Russisch}}, langspanish = {{Spaans}{Spaans}}, langswedish = {{Zweeds}{Zweeds}}, fromamerican = {{uit het Amerikaans Engels}{uit het Amerikaans Engels}}, frombrazilian = {{uit het Braziliaans Portugees}{uit het Braziliaans Portugees}}, -% fromcatalan = {{}{}},% FIXME: missing -% fromcroatian = {{}{}},% FIXME: missing -% fromczech = {{}{}},% FIXME: missing + fromcatalan = {{uit het Catalaans}{uit het Catalaans}}, + fromcroatian = {{uit het Kroatisch}{uit het Kroatisch}}, + fromczech = {{uit het Tsjechisch}{uit het Tsjechisch}}, fromdanish = {{uit het Deens}{uit het Deens}}, fromdutch = {{uit het Nederlands}{uit het Nederlands}}, fromenglish = {{uit het Engels}{uit het Engels}}, -% fromfinnish = {{}{}},% FIXME: missing + fromfinnish = {{uit het Fins}{uit het Fins}}, fromfrench = {{uit het Frans}{uit het Frans}}, fromgerman = {{uit het Duits}{uit het Duits}}, fromgreek = {{uit het Grieks}{uit het Grieks}}, fromitalian = {{uit het Italiaans}{uit het Italiaans}}, fromlatin = {{uit het Latijn}{uit het Latijn}}, fromnorwegian = {{uit het Noors}{uit het Noors}}, -% frompolish = {{}{}},% FIXME: missing + frompolish = {{uit het Pools}{uit het Pools}}, fromportuguese = {{uit het Portugees}{uit het Portugees}}, -% fromrussian = {{}{}},% FIXME: missing + fromrussian = {{uit het Russisch}{uit het Russisch}}, fromspanish = {{uit het Spaans}{uit het Spaans}}, fromswedish = {{uit het Zweeds}{uit het Zweeds}}, countryde = {{Duitsland}{DE}}, @@ -451,16 +451,16 @@ countryus = {{Verenigde Staten van Amerika}{VS}}, patent = {{patent}{pat\adddot}}, patentde = {{Duits patent}{Duits pat\adddot}}, - patenteu = {{Europees patent}{Europees pat\adddot}}, + patenteu = {{Europees patent}{Eur\adddot pat\adddot}}, patentfr = {{Frans patent}{Frans pat\adddot}}, patentuk = {{Brits patent}{Brits pat\adddot}}, - patentus = {{Amerikaans patent}{Amerikaans pat\adddot}}, + patentus = {{Amerikaans patent}{Amer\adddot pat\adddot}}, patreq = {{patentaanvraag}{patentaanvr\adddot}}, patreqde = {{Duitse patentaanvraag}{Duitse patentaanvr\adddot}}, - patreqeu = {{Europese patentaanvraag}{Europese patentaanvr\adddot}}, + patreqeu = {{Europese patentaanvraag}{Eur\adddot patentaanvr\adddot}}, patreqfr = {{Franse patentaanvraag}{Franse patentaanvr\adddot}}, patrequk = {{Britse patentaanvraag}{Britse patentaanvr\adddot}}, - patrequs = {{Amerikaanse patentaanvraag}{Amerikaanse patentaanvr\adddot}}, + patrequs = {{Amerikaanse patentaanvraag}{Amer\adddot patentaanvr\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index 41eb5ad9ed3..f0d1f867413 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -9,6 +9,21 @@ \DeclareRedundantLanguages{finnish}{finnish} +\NewBibliographyString{% + basicjanuary, + basicfebruary, + basicmarch, + basicapril, + basicmay, + basicjune, + basicjuly, + basicaugust, + basicseptember, + basicoctober, + basicnovember, + basicdecember% +} + \DeclareBibliographyExtras{% % dashes: may be either \textendash or \textemdash \protected\def\bibrangedash{% @@ -27,8 +42,11 @@ \iffieldundef{#2}{}{\nobreakspace}}% \iffieldundef{#2} {} - {\mkbibmonth{\thefield{#2}}% - \iffieldundef{#1}{}{\space}}% + {\iffieldundef{#3} + {\lbx@fi@mkbibmonthbasic{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}% + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}}% \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} @@ -411,6 +429,18 @@ october = {{lokakuuta}{lokakuuta}}, november = {{marraskuuta}{marraskuuta}}, december = {{joulukuuta}{joulukuuta}}, + basicjanuary = {{tammikuu}{tammikuu}}, + basicfebruary = {{helmikuu}{helmikuu}}, + basicmarch = {{maaliskuu}{maaliskuu}}, + basicapril = {{huhtikuu}{huhtikuu}}, + basicmay = {{toukokuu}{toukokuu}}, + basicjune = {{kes\"akuu}{kes\"akuu}}, + basicjuly = {{hein\"akuu}{hein\"akuu}}, + basicaugust = {{elokuu}{elokuu}}, + basicseptember = {{syyskuu}{syyskuu}}, + basicoctober = {{lokakuu}{lokakuu}}, + basicnovember = {{marraskuu}{marraskuu}}, + basicdecember = {{joulukuu}{joulukuu}}, langamerican = {{amerikanenglanti}{amerikanenglanti}}, langbrazilian = {{brasilianportugali}{brasilianportugali}}, % langcatalan = {{}{}},% FIXME: missing @@ -475,4 +505,23 @@ annotation = {{selitykset}{selitykset}},% FIXME: unsure } +\protected\gdef\lbx@fi@mkbibmonthbasic#1{% + \ifcase0#1\relax + #1\BibliographyWarning{Month out of range}% + \or\abx@bibmonth{basicjanuary}% + \or\abx@bibmonth{basicfebruary}% + \or\abx@bibmonth{basicmarch}% + \or\abx@bibmonth{basicapril}% + \or\abx@bibmonth{basicmay}% + \or\abx@bibmonth{basicjune}% + \or\abx@bibmonth{basicjuly}% + \or\abx@bibmonth{basicaugust}% + \or\abx@bibmonth{basicseptember}% + \or\abx@bibmonth{basicoctober}% + \or\abx@bibmonth{basicnovember}% + \or\abx@bibmonth{basicdecember}% + \else + #1\BibliographyWarning{Month out of range}% + \fi}% + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 97f63819a11..f85c12ad3c2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -337,13 +337,13 @@ oldseries = {{ancienne s\'erie}{anc\adddotspace s\'er\adddot}}, edition = {{\'edition}{\'ed\adddot}}, reprint = {{r\'eimpression}{r\'eimpr\adddot}}, - reprintof = {{r\'eimpression \smartof}{r\'eimpr\adddotspace\smartof}}, + reprintof = {{r\'eimpression de}{r\'eimpr\adddotspace de}}, reprintas = {{r\'eimpression sous le titre}{r\'eimpr\adddotspace sous le titre}}, reprintfrom = {{r\'eimpression \`a partir \smartof}{r\'eimpr\adddotspace \`a part\adddotspace\smartof}}, - translationof = {{traduction \smartof}{trad\adddotspace\smartof}}, + translationof = {{traduction de}{trad\adddotspace de}}, translationas = {{traduit sous le titre}{trad\adddotspace sous le titre}}, - translationfrom = {{traduit \smartof}{trad\adddotspace\smartof}}, - reviewof = {{critique \smartof}{crit.\adddotspace\smartof}}, + translationfrom = {{traduit de}{trad\adddotspace de}}, + reviewof = {{critique de}{crit.\adddotspace de}}, origpubas = {{publi\'e \`a l'origine sous le titre}{pub\adddotspace \`a l'orig\adddotspace sous le titre}}, origpubin = {{publi\'e \`a l'origine en}{pub\adddotspace \`a l'orig\adddotspace en}}, astitle = {{sous le titre}{sous le titre}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index d0fc59a56b8..6a0bbed3519 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -109,8 +109,8 @@ introduction = {{inledning}{inl\adddot}}, foreword = {{f\"orord}{f\"orord}}, afterword = {{efterord}{efterord}}, -% editortr = {{}{}},% FIXME: missing -% editorstr = {{}{}},% FIXME: missing + editortr = {{utgivare och \"overs\"attare}{utg\adddot\ och \"overs\adddot}}, + editorstr = {{utgivare och \"overs\"attare}{utg\adddot\ och \"overs\adddot}}, % editorco = {{}{}},% FIXME: missing % editorsco = {{}{}},% FIXME: missing % editoran = {{}{}},% FIXME: missing @@ -181,7 +181,7 @@ byeditor = {{utgiven av}{utg\adddotspace av}}, bycompiler = {{sammanst\"alld av}{sammanst\adddotspace av}}, byredactor = {{bearbetad av}{bearb\adddotspace av}}, -% byreviser = {{}{}},% FIXME: missing + byreviser = {{reviderad av}{rev\adddotspace av}}, % byreviewer = {{}{}},% FIXME: missing % byfounder = {{}{}},% FIXME: missing % bycontinuator = {{}{}},% FIXME: missing @@ -268,11 +268,11 @@ andmore = {{m.\,fl\adddot}{m.\,fl\adddot}}, volume = {{volym}{vol\adddot}}, volumes = {{volymer}{vol\adddot}}, - involumes = {{i}{i}},% FIXME: unsure + involumes = {{i}{i}}, jourvol = {{\aa rg\aa ng}{\aa rg\adddot}}, jourser = {{serie}{ser\adddot}}, -% book = {{}{}},% FIXME: missing -% part = {{}{}},% FIXME: missing + book = {{bok}{bok}}, + part = {{del}{del}}, % issue = {{}{}},% FIXME: missing % Both "ny serie (N.S.)" and "ny f\"oljd (N.F.)" are common newseries = {{ny f\"oljd}{N.\,F\adddot}}, @@ -286,21 +286,21 @@ reprintof = {{nytryck av}{nytr\adddotspace av}}, reprintas = {{nytryckt som}{nytr\adddotspace som}}, reprintfrom = {{nytryckt fr\aa n}{nytryckt fr\aa n}},% FIXME: check -% translationof = {{}{}},% FIXME: missing -% translationas = {{}{}},% FIXME: missing -% translationfrom = {{}{}},% FIXME: missing -% reviewof = {{}{}},% FIXME: missing -% origpubas = {{}{}},% FIXME: missing -% origpubin = {{}{}},% FIXME: missing -% astitle = {{}{}},% FIXME: missing - bypublisher = {{av}{av}},% FIXME: check + translationof = {{\"overs\"attning av}{\"overs\adddot\ av}}, + translationas = {{\"overs\"attning som}{\"overs\adddot\ som}}, + translationfrom = {{\"overs\"attning fr\aa n}{\"overs\adddotspace fr\aa n}}, + reviewof = {{recension av}{recension av}}, + origpubas = {{ursprungligen publicerad som}{ursprunglingen publ\adddot\ som}}, + origpubin = {{ursprungligen publicerad}{ursprungligen publ\adddot}}, + astitle = {{som}{som}}, + bypublisher = {{av}{av}}, page = {{sidan}{s\adddot}}, pages = {{sidorna}{s\adddot}}, column = {{spalt}{sp\adddot}}, columns = {{spalterna}{sp\adddot}}, line = {{rad}{r\adddot}}, lines = {{raderna}{r\adddot}}, - nodate = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME + nodate = {{u\adddot d\adddot}{n\adddot d\adddot}},%FIXME verse = {{vers}{v\adddot}}, verses = {{verserna}{v\adddot}}, section = {{paragraf}{\S}}, @@ -326,7 +326,7 @@ audiocd = {{ljud-cd}{ljud-cd}}, version = {{version}{version}}, url = {{webbadress}{URL}}, -% urlfrom = {{}{}},% FIXME: missing + urlfrom = {{tillg\"anglig fr\aa n}{tillg\"anglig fr\aa n}}, urlseen = {{senast h\"amtad}{h\"amtad}}, % inpreparation = {{}{}},% FIXME: missing % submitted = {{}{}},% FIXME: missing @@ -370,42 +370,42 @@ december = {{december}{dec\adddot}}, langamerican = {{amerikanska}{amerikanska}}, % langbrazilian = {{}{}},% FIXME: missing -% langcatalan = {{}{}},% FIXME: missing -% langcroatian = {{}{}},% FIXME: missing -% langczech = {{}{}},% FIXME: missing + langcatalan = {{katalanska}{katalanska}}, + langcroatian = {{kroatiska}{kroatiska}}, + langczech = {{tjeckiska}{tjeckiska}}, langdanish = {{danska}{danska}}, -% langdutch = {{}{}},% FIXME: missing + langdutch = {{nederl\"andska}{nederl\"andska}}, langenglish = {{engelska}{engelska}}, -% langfinnish = {{}{}},% FIXME: missing + langfinnish = {{finska}{finska}}, langfrench = {{franska}{franska}}, langgerman = {{tyska}{tyska}}, langgreek = {{grekiska}{grekiska}}, langitalian = {{italienska}{italienska}}, langlatin = {{latin}{latin}}, langnorwegian = {{norska}{norska}}, -% langpolish = {{}{}},% FIXME: missing -% langportuguese = {{}{}},% FIXME: missing -% langrussian = {{}{}},% FIXME: missing + langpolish = {{polska}{polska}}, + langportuguese = {{portugisiska}{portugisiska}}, + langrussian = {{ryska}{ryska}}, langspanish = {{spanska}{spanska}}, langswedish = {{svenska}{svenska}}, fromamerican = {{fr\aa n amerikanska}{fr\aa n amerikanska}}, % frombrazilian = {{}{}},% FIXME: missing -% fromcatalan = {{}{}},% FIXME: missing -% fromcroatian = {{}{}},% FIXME: missing -% fromczech = {{}{}},% FIXME: missing + fromcatalan = {{fr\aan katalanska}{fr\aan katalanska}}, + fromcroatian = {{fr\aa n kroatiska}{fr\aa n kroatiska}}, + fromczech = {{fr\aa n tjeckiska}{fr\aa n tjeckiska}}, fromdanish = {{fr\aa n danska}{fr\aa n danska}}, -% fromdutch = {{}{}},% FIXME: missing + fromdutch = {{fr\aa n nederl\"andska}{fr\aa n nederl\"andska}}, fromenglish = {{fr\aa n engelska}{fr\aa n engelska}}, -% fromfinnish = {{}{}},% FIXME: missing + fromfinnish = {{fr\aa n finska}{fr\aa n finska}}, fromfrench = {{fr\aa n franska}{fr\aa n franska}}, fromgerman = {{fr\aa n tyska}{fr\aa n tyska}}, fromgreek = {{fr\aa n grekiska}{fr\aa n grekiska}}, fromitalian = {{fr\aa n italienska}{fr\aa n italienska}}, fromlatin = {{fr\aa n latin}{fr\aa n latin}}, fromnorwegian = {{fr\aa n norska}{fr\aa n norska}}, -% frompolish = {{}{}},% FIXME: missing -% fromportuguese = {{}{}},% FIXME: missing -% fromrussian = {{}{}},% FIXME: missing + frompolish = {{fr\aa n polska}{fr\aa n polska}}, + fromportuguese = {{fr\aa n portugisiska}{fr\aa n portugisiska}}, + fromrussian = {{fr\aa n ryska}{fr\aa n ryska}}, fromspanish = {{fr\aa n spanska}{fr\aa n spanska}}, fromswedish = {{fr\aa n svenska}{fr\aa n svenska}}, countryde = {{Tyskland}{DE}}, |