diff options
| author | Karl Berry <karl@freefriends.org> | 2017-11-05 23:51:11 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-11-05 23:51:11 +0000 |
| commit | 24f27b13d3ff59a9fc025ce009af154a95fd9acf (patch) | |
| tree | ab567aa908a22d634c40bf2037cca0ae2f38be7f /Master/texmf-dist/doc/latex/biblatex/examples | |
| parent | 95108cf71ce35a8dc9cb0739da991e6c4b950f4a (diff) | |
revert to biblatex 3.7, since 3.8 (and companion biber) was apparently not ready
git-svn-id: svn://tug.org/texlive/trunk@45702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/biblatex/examples')
109 files changed, 283 insertions, 779 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-biber.pdf Binary files differindex a24060b48c9..f33b20fc517 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-bibtex.pdf Binary files differindex d7c6ad6b177..18ffe824e2d 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf Binary files differindex b66e6106e53..a2ee199823a 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-bibtex.pdf Binary files differindex 8aa01c35008..a3aa4ecf2cf 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf Binary files differindex 3d56b171906..af9474c5c56 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-bibtex.pdf Binary files differindex 5281c6fab18..70d1f5174f9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex index 76af595e3dc..91df87addfa 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex @@ -118,7 +118,7 @@ The following strings are special because they are intended for use in headings \begin{keylist} \keyitem{bibliography} The term <bibliography>, also available as \cmd{bibname}. \keyitem{references} The term <references>, also available as \cmd{refname}. -\keyitem{shorthands} The term <list of shorthands> or <list of abbreviations>, also available as \cmd{biblistname}. +\keyitem{shorthands} The term <list of shorthands> or <list of abbreviations>, also available as \cmd{losname}. \end{keylist} \subsection*{Roles, Expressed as Functions} @@ -127,145 +127,142 @@ The following keys refer to roles which are expressed as a function (<editor>, < \begin{keylist} \keyitem{editor} The term <editor>, referring to the main editor. This is the most generic editorial role. -\keyitem{editors} The plural form of \texttt{editor}. +\keyitem{editors} The plural form of \vrb{editor}. \keyitem{compiler} The term <compiler>, referring to an editor whose task is to compile a work. -\keyitem{compilers} The plural form of \texttt{compiler}. +\keyitem{compilers} The plural form of \vrb{compiler}. \keyitem{founder} The term <founder>, referring to a founding editor. -\keyitem{founders} The plural form of \texttt{founder}. +\keyitem{founders} The plural form of \vrb{founder}. \keyitem{continuator} An expression like <continuator>, <continuation>, or <continued>, referring to a past editor who continued the work of the founding editor but was subsequently replaced by the current editor. -\keyitem{continuators} The plural form of \texttt{continuator}. +\keyitem{continuators} The plural form of \vrb{continuator}. \keyitem{redactor} The term <redactor>, referring to a secondary editor. -\keyitem{redactors} The plural form of \texttt{redactor}. +\keyitem{redactors} The plural form of \vrb{redactor}. \keyitem{reviser} The term <reviser>, referring to a secondary editor. -\keyitem{revisers} The plural form of \texttt{reviser}. +\keyitem{revisers} The plural form of \vrb{reviser}. \keyitem{collaborator} A term like <collaborator>, <collaboration>, <cooperator>, or <cooperation>, referring to a secondary editor. -\keyitem{collaborators} The plural form of \texttt{collaborator}. +\keyitem{collaborators} The plural form of \vrb{collaborator}. \keyitem{translator} The term <translator>. -\keyitem{translators} The plural form of \texttt{translator}. +\keyitem{translators} The plural form of \vrb{translator}. \keyitem{commentator} The term <commentator>, referring to the author of a commentary to a work. -\keyitem{commentators} The plural form of \texttt{commentators}. +\keyitem{commentators} The plural form of \vrb{commentators}. \keyitem{annotator} The term <annotator>, referring to the author of annotations to a work. -\keyitem{annotators} The plural form of \texttt{annotators}. -\keyitem{organizer} The term <organizer>, referring to the organizer of an - event or work. -\keyitem{organizers} The plural form of \texttt{organizer}. +\keyitem{annotators} The plural form of \vrb{annotators}. \end{keylist} \subsection*{Concatenated Editor Roles, Expressed as Functions} -The following keys are similar in function to \texttt{editor}, \texttt{translator}, etc. They are used to indicate additional roles of the editor, \eg\ <editor and translator>, <editor and foreword>. +The following keys are similar in function to \vrb{editor}, \vrb{translator}, etc. They are used to indicate additional roles of the editor, e.g. <editor and translator>, <editor and foreword>. \begin{keylist} -\keyitem{editortr} Used if \bibfield{editor}\slash \bibfield{translator} are identical. -\keyitem{editorstr} The plural form of \texttt{editortr}. -\keyitem{editorco} Used if \bibfield{editor}\slash \bibfield{commentator} are identical. -\keyitem{editorsco} The plural form of \texttt{editorco}. -\keyitem{editoran} Used if \bibfield{editor}\slash \bibfield{annotator} are identical. -\keyitem{editorsan} The plural form of \texttt{editoran}. -\keyitem{editorin} Used if \bibfield{editor}\slash \bibfield{introduction} are identical. -\keyitem{editorsin} The plural form of \texttt{editorin}. -\keyitem{editorfo} Used if \bibfield{editor}\slash \bibfield{foreword} are identical. -\keyitem{editorsfo} The plural form of \texttt{editorfo}. -\keyitem{editoraf} Used if \bibfield{editor}\slash \bibfield{afterword} are identical. -\keyitem{editorsaf} The plural form of \texttt{editoraf}. +\keyitem{editortr} Used if \vrb{editor}\slash \vrb{translator} are identical. +\keyitem{editorstr} The plural form of \vrb{editortr}. +\keyitem{editorco} Used if \vrb{editor}\slash \vrb{commentator} are identical. +\keyitem{editorsco} The plural form of \vrb{editorco}. +\keyitem{editoran} Used if \vrb{editor}\slash \vrb{annotator} are identical. +\keyitem{editorsan} The plural form of \vrb{editoran}. +\keyitem{editorin} Used if \vrb{editor}\slash \vrb{introduction} are identical. +\keyitem{editorsin} The plural form of \vrb{editorin}. +\keyitem{editorfo} Used if \vrb{editor}\slash \vrb{foreword} are identical. +\keyitem{editorsfo} The plural form of \vrb{editorfo}. +\keyitem{editoraf} Used if \vrb{editor}\slash \vrb{afterword} are identical. +\keyitem{editorsaf} The plural form of \vrb{editoraf}. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{translator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{translator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{editortrco} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator} are identical. -\keyitem{editorstrco} The plural form of \texttt{editortrco}. -\keyitem{editortran} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{annotator} are identical. -\keyitem{editorstran} The plural form of \texttt{editortran}. -\keyitem{editortrin} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{introduction} are identical. -\keyitem{editorstrin} The plural form of \texttt{editortrin}. -\keyitem{editortrfo} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{foreword} are identical. -\keyitem{editorstrfo} The plural form of \texttt{editortrfo}. -\keyitem{editortraf} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{afterword} are identical. -\keyitem{editorstraf} The plural form of \texttt{editortraf}. +\keyitem{editortrco} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator} are identical. +\keyitem{editorstrco} The plural form of \vrb{editortrco}. +\keyitem{editortran} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator} are identical. +\keyitem{editorstran} The plural form of \vrb{editortran}. +\keyitem{editortrin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{introduction} are identical. +\keyitem{editorstrin} The plural form of \vrb{editortrin}. +\keyitem{editortrfo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{foreword} are identical. +\keyitem{editorstrfo} The plural form of \vrb{editortrfo}. +\keyitem{editortraf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{afterword} are identical. +\keyitem{editorstraf} The plural form of \vrb{editortraf}. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{commentator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{commentator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{editorcoin} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical. -\keyitem{editorscoin} The plural form of \texttt{editorcoin}. -\keyitem{editorcofo} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical. -\keyitem{editorscofo} The plural form of \texttt{editorcofo}. -\keyitem{editorcoaf} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical. -\keyitem{editorscoaf} The plural form of \texttt{editorcoaf}. +\keyitem{editorcoin} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{introduction} are identical. +\keyitem{editorscoin} The plural form of \vrb{editorcoin}. +\keyitem{editorcofo} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{foreword} are identical. +\keyitem{editorscofo} The plural form of \vrb{editorcofo}. +\keyitem{editorcoaf} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{afterword} are identical. +\keyitem{editorscoaf} The plural form of \vrb{editorcoaf}. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{annotator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{editoranin} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{introduction} are identical. -\keyitem{editorsanin} The plural form of \texttt{editoranin}. -\keyitem{editoranfo} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{foreword} are identical. -\keyitem{editorsanfo} The plural form of \texttt{editoranfo}. -\keyitem{editoranaf} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{afterword} are identical. -\keyitem{editorsanaf} The plural form of \texttt{editoranaf}. +\keyitem{editoranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{introduction} are identical. +\keyitem{editorsanin} The plural form of \vrb{editoranin}. +\keyitem{editoranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{foreword} are identical. +\keyitem{editorsanfo} The plural form of \vrb{editoranfo}. +\keyitem{editoranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{afterword} are identical. +\keyitem{editorsanaf} The plural form of \vrb{editoranaf}. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{editortrcoin} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical. -\keyitem{editorstrcoin} The plural form of \texttt{editortrcoin}. -\keyitem{editortrcofo} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical. -\keyitem{editorstrcofo} The plural form of \texttt{editortrcofo}. -\keyitem{editortrcoaf} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical. -\keyitem{editorstrcoaf} The plural form of \texttt{editortrcoaf}. +\keyitem{editortrcoin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical. +\keyitem{editorstrcoin} The plural form of \vrb{editortrcoin}. +\keyitem{editortrcofo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical. +\keyitem{editorstrcofo} The plural form of \vrb{editortrcofo}. +\keyitem{editortrcoaf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical. +\keyitem{editorstrcoaf} The plural form of \vrb{editortrcoaf}. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{editortranin} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical. -\keyitem{editorstranin} The plural form of \texttt{editortranin}. -\keyitem{editortranfo} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical. -\keyitem{editorstranfo} The plural form of \texttt{editortranfo}. -\keyitem{editortranaf} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical. -\keyitem{editorstranaf} The plural form of \texttt{editortranaf}. +\keyitem{editortranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{introduction} are identical. +\keyitem{editorstranin} The plural form of \vrb{editortranin}. +\keyitem{editortranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{foreword} are identical. +\keyitem{editorstranfo} The plural form of \vrb{editortranfo}. +\keyitem{editortranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{afterword} are identical. +\keyitem{editorstranaf} The plural form of \vrb{editortranaf}. \end{keylist} \subsection*{Concatenated Translator Roles, Expressed as Functions} -The following keys are similar in function to \texttt{translator}. They are used to indicate additional roles of the translator, e.g. <translator and commentator>, <translator and introduction>. +The following keys are similar in function to \vrb{translator}. They are used to indicate additional roles of the translator, e.g. <translator and commentator>, <translator and introduction>. \begin{keylist} -\keyitem{translatorco} Used if \bibfield{translator}\slash \bibfield{commentator} are identical. -\keyitem{translatorsco} The plural form of \texttt{translatorco}. -\keyitem{translatoran} Used if \bibfield{translator}\slash \bibfield{annotator} are identical. -\keyitem{translatorsan} The plural form of \texttt{translatoran}. -\keyitem{translatorin} Used if \bibfield{translator}\slash \bibfield{introduction} are identical. -\keyitem{translatorsin} The plural form of \texttt{translatorin}. -\keyitem{translatorfo} Used if \bibfield{translator}\slash \bibfield{foreword} are identical. -\keyitem{translatorsfo} The plural form of \texttt{translatorfo}. -\keyitem{translatoraf} Used if \bibfield{translator}\slash \bibfield{afterword} are identical. -\keyitem{translatorsaf} The plural form of \texttt{translatoraf}. +\keyitem{translatorco} Used if \vrb{translator}\slash \vrb{commentator} are identical. +\keyitem{translatorsco} The plural form of \vrb{translatorco}. +\keyitem{translatoran} Used if \vrb{translator}\slash \vrb{annotator} are identical. +\keyitem{translatorsan} The plural form of \vrb{translatoran}. +\keyitem{translatorin} Used if \vrb{translator}\slash \vrb{introduction} are identical. +\keyitem{translatorsin} The plural form of \vrb{translatorin}. +\keyitem{translatorfo} Used if \vrb{translator}\slash \vrb{foreword} are identical. +\keyitem{translatorsfo} The plural form of \vrb{translatorfo}. +\keyitem{translatoraf} Used if \vrb{translator}\slash \vrb{afterword} are identical. +\keyitem{translatorsaf} The plural form of \vrb{translatoraf}. \end{keylist} % -Keys for \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations: +Keys for \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{translatorcoin} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical. -\keyitem{translatorscoin} The plural form of \texttt{translatorcoin}. -\keyitem{translatorcofo} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical. -\keyitem{translatorscofo} The plural form of \texttt{translatorcofo}. -\keyitem{translatorcoaf} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical. -\keyitem{translatorscoaf} The plural form of \texttt{translatorcoaf}. +\keyitem{translatorcoin} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical. +\keyitem{translatorscoin} The plural form of \vrb{translatorcoin}. +\keyitem{translatorcofo} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical. +\keyitem{translatorscofo} The plural form of \vrb{translatorcofo}. +\keyitem{translatorcoaf} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical. +\keyitem{translatorscoaf} The plural form of \vrb{translatorcoaf}. \end{keylist} % -Keys for \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations: +Keys for \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{translatoranin} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{introduction} are identical. -\keyitem{translatorsanin} The plural form of \texttt{translatoranin}. -\keyitem{translatoranfo} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{foreword} are identical. -\keyitem{translatorsanfo} The plural form of \texttt{translatoranfo}. -\keyitem{translatoranaf} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{afterword} are identical. -\keyitem{translatorsanaf} The plural form of \texttt{translatoranaf}. +\keyitem{translatoranin} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{introduction} are identical. +\keyitem{translatorsanin} The plural form of \vrb{translatoranin}. +\keyitem{translatoranfo} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{foreword} are identical. +\keyitem{translatorsanfo} The plural form of \vrb{translatoranfo}. +\keyitem{translatoranaf} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{afterword} are identical. +\keyitem{translatorsanaf} The plural form of \vrb{translatoranaf}. \end{keylist} \subsection*{Roles, Expressed as Actions} @@ -282,93 +279,92 @@ The following keys refer to roles which are expressed as an action (<edited by>, \keyitem{byreviser} The expression <revised by \prm{name}>. \keyitem{byreviewer} The expression <reviewed by \prm{name}>. \keyitem{bycollaborator} An expression like <in collaboration with \prm{name}> or <in cooperation with \prm{name}>. -\keyitem{bytranslator} The expression <translated by \prm{name}> or <translated from \prm{language} by \prm{name}>. +\keyitem{bytranslator} The expression <translated by \prm{name}> or <translated from \prm{language} \prm{name}>. \keyitem{bycommentator} The expression <commented by \prm{name}>. \keyitem{byannotator} The expression <annotated by \prm{name}>. -\keyitem{byorganizer} The expression <[organized] by \prm{name}>. \end{keylist} \subsection*{Concatenated Editor Roles, Expressed as Actions} -The following keys are similar in function to \bibfield{byeditor}, \bibfield{bytranslator}, etc. They are used to indicate additional roles of the editor, e.g. <edited and translated by>, <edited and furnished with an introduction by>, <edited, with a foreword, by>. +The following keys are similar in function to \vrb{byeditor}, \vrb{bytranslator}, etc. They are used to indicate additional roles of the editor, e.g. <edited and translated by>, <edited and furnished with an introduction by>, <edited, with a foreword, by>. \begin{keylist} -\keyitem{byeditortr} Used if \bibfield{editor}\slash \bibfield{translator} are identical. -\keyitem{byeditorco} Used if \bibfield{editor}\slash \bibfield{commentator} are identical. -\keyitem{byeditoran} Used if \bibfield{editor}\slash \bibfield{annotator} are identical. -\keyitem{byeditorin} Used if \bibfield{editor}\slash \bibfield{introduction} are identical. -\keyitem{byeditorfo} Used if \bibfield{editor}\slash \bibfield{foreword} are identical. -\keyitem{byeditoraf} Used if \bibfield{editor}\slash \bibfield{afterword} are identical. +\keyitem{byeditortr} Used if \vrb{editor}\slash \vrb{translator} are identical. +\keyitem{byeditorco} Used if \vrb{editor}\slash \vrb{commentator} are identical. +\keyitem{byeditoran} Used if \vrb{editor}\slash \vrb{annotator} are identical. +\keyitem{byeditorin} Used if \vrb{editor}\slash \vrb{introduction} are identical. +\keyitem{byeditorfo} Used if \vrb{editor}\slash \vrb{foreword} are identical. +\keyitem{byeditoraf} Used if \vrb{editor}\slash \vrb{afterword} are identical. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{translator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{translator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{byeditortrco} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator} are identical. -\keyitem{byeditortran} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{annotator} are identical. -\keyitem{byeditortrin} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{introduction} are identical. -\keyitem{byeditortrfo} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{foreword} are identical. -\keyitem{byeditortraf} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{afterword} are identical. +\keyitem{byeditortrco} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator} are identical. +\keyitem{byeditortran} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator} are identical. +\keyitem{byeditortrin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{introduction} are identical. +\keyitem{byeditortrfo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{foreword} are identical. +\keyitem{byeditortraf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{afterword} are identical. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{commentator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{commentator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{byeditorcoin} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical. -\keyitem{byeditorcofo} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical. -\keyitem{byeditorcoaf} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical. +\keyitem{byeditorcoin} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{introduction} are identical. +\keyitem{byeditorcofo} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{foreword} are identical. +\keyitem{byeditorcoaf} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{afterword} are identical. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{annotator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{byeditoranin} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{introduction} are identical. -\keyitem{byeditoranfo} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{foreword} are identical. -\keyitem{byeditoranaf} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{afterword} are identical. +\keyitem{byeditoranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{introduction} are identical. +\keyitem{byeditoranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{foreword} are identical. +\keyitem{byeditoranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{afterword} are identical. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{byeditortrcoin} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical. -\keyitem{byeditortrcofo} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical. -\keyitem{byeditortrcoaf} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical. +\keyitem{byeditortrcoin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical. +\keyitem{byeditortrcofo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical. +\keyitem{byeditortrcoaf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical. \end{keylist} % -Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations: +Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{byeditortranin} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical. -\keyitem{byeditortranfo} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical. -\keyitem{byeditortranaf} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical. +\keyitem{byeditortranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{introduction} are identical. +\keyitem{byeditortranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{foreword} are identical. +\keyitem{byeditortranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{afterword} are identical. \end{keylist} \subsection*{Concatenated Translator Roles, Expressed as Actions} -The following keys are similar in function to \texttt{bytranslator}. They are used to indicate additional roles of the translator, e.g. <translated and commented by>, <translated and furnished with an introduction by>, <translated, with a foreword, by>. +The following keys are similar in function to \vrb{bytranslator}. They are used to indicate additional roles of the translator, e.g. <translated and commented by>, <translated and furnished with an introduction by>, <translated, with a foreword, by>. \begin{keylist} -\keyitem{bytranslatorco} Used if \bibfield{translator}\slash \bibfield{commentator} are identical. -\keyitem{bytranslatoran} Used if \bibfield{translator}\slash \bibfield{annotator} are identical. -\keyitem{bytranslatorin} Used if \bibfield{translator}\slash \bibfield{introduction} are identical. -\keyitem{bytranslatorfo} Used if \bibfield{translator}\slash \bibfield{foreword} are identical. -\keyitem{bytranslatoraf} Used if \bibfield{translator}\slash \bibfield{afterword} are identical. +\keyitem{bytranslatorco} Used if \vrb{translator}\slash \vrb{commentator} are identical. +\keyitem{bytranslatoran} Used if \vrb{translator}\slash \vrb{annotator} are identical. +\keyitem{bytranslatorin} Used if \vrb{translator}\slash \vrb{introduction} are identical. +\keyitem{bytranslatorfo} Used if \vrb{translator}\slash \vrb{foreword} are identical. +\keyitem{bytranslatoraf} Used if \vrb{translator}\slash \vrb{afterword} are identical. \end{keylist} % -Keys for \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations: +Keys for \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{bytranslatorcoin} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical. -\keyitem{bytranslatorcofo} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical. -\keyitem{bytranslatorcoaf} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical. +\keyitem{bytranslatorcoin} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical. +\keyitem{bytranslatorcofo} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical. +\keyitem{bytranslatorcoaf} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical. \end{keylist} % -Keys for \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations: +Keys for \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations: \begin{keylist} -\keyitem{bytranslatoranin} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{introduction} are identical. -\keyitem{bytranslatoranfo} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{foreword} are identical. -\keyitem{bytranslatoranaf} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{afterword} are identical. +\keyitem{bytranslatoranin} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{introduction} are identical. +\keyitem{bytranslatoranfo} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{foreword} are identical. +\keyitem{bytranslatoranaf} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{afterword} are identical. \end{keylist} \subsection*{Roles, Expressed as Objects} @@ -397,7 +393,7 @@ Roles which are related to supplementary material may also be expressed as objec \begin{keylist} \keyitem{volume} The term <volume>, referring to a book. -\keyitem{volumes} The plural form of \texttt{volume}. +\keyitem{volumes} The plural form of \vrb{volume}. \keyitem{involumes} The term <in>, as used in expressions like <in \prm{number of volumes} volumes>. \keyitem{jourvol} The term <volume>, referring to a journal. \keyitem{jourser} The term <series>, referring to a journal. @@ -441,29 +437,17 @@ Roles which are related to supplementary material may also be expressed as objec \begin{keylist} \keyitem{page} The term <page>. -\keyitem{pages} The plural form of \texttt{page}. +\keyitem{pages} The plural form of \vrb{page}. \keyitem{column} The term <column>, referring to a column on a page. -\keyitem{columns} The plural form of \texttt{column}. +\keyitem{columns} The plural form of \vrb{column}. \keyitem{section} The term <section>, referring to a document division (usually abbreviated as \S). -\keyitem{sections} The plural form of \texttt{section} (usually abbreviated as \S\S). -\keyitem{paragraph} The term <paragraph> (\ie a block of text, not to be confused with \texttt{section}). -\keyitem{paragraphs} The plural form of \texttt{paragraph}. +\keyitem{sections} The plural form of \vrb{section} (usually abbreviated as \S\S). +\keyitem{paragraph} The term <paragraph> (\ie a block of text, not to be confused with \vrb{section}). +\keyitem{paragraphs} The plural form of \vrb{paragraph}. \keyitem{verse} The term <verse> as used when referring to a work which is cited by verse numbers. -\keyitem{verses} The plural form of \texttt{verse}. +\keyitem{verses} The plural form of \vrb{verse}. \keyitem{line} The term <line> as used when referring to a work which is cited by line numbers. -\keyitem{lines} The plural form of \texttt{line}. -\keyitem{pagetotal} The term <page> as used in \cmd{mkpageprefix}. -\keyitem{pagetotals} The plural form of \texttt{pagetotal}. -\keyitem{columntotal} The term <column>, referring to a column on a page, as used in \cmd{mkpageprefix}. -\keyitem{columntotals} The plural form of \texttt{columntotal}. -\keyitem{sectiontotal} The term <section>, referring to a document division (usually abbreviated as \S), as used in \cmd{mkpageprefix}. -\keyitem{sectiontotals} The plural form of \texttt{sectiontotal} (usually abbreviated as \S\S). -\keyitem{paragraphtotal} The term <paragraph> (\ie a block of text, not to be confused with \texttt{section}) as used in \cmd{mkpageprefix}. -\keyitem{paragraphtotals} The plural form of \texttt{paragraphtotal}. -\keyitem{versetotal} The term <verse> as used when referring to a work which is cited by verse numbers when used in \cmd{mkpageprefix}. -\keyitem{versetotals} The plural form of \texttt{versetotal}. -\keyitem{linetotal} The term <line> as used when referring to a work which is cited by line numbers when used in \cmd{mkpageprefix}. -\keyitem{linetotals} The plural form of \texttt{linetotal}. +\keyitem{lines} The plural form of \vrb{line}. \end{keylist} \subsection*{Types} @@ -502,7 +486,7 @@ The following keys are typically used in the \bibfield{type} field of \bibtype{t \keyitem{nodate} The term to use in place of a date when there is no date for an entry \eg\ <n.d.> \keyitem{and} The term <and>, as used in a list of authors or editors, for example. \keyitem{andothers} The expression <and others> or <et alii>, used to mark the truncation of a name list. -\keyitem{andmore} Like \texttt{andothers} but used to mark the truncation of a literal list. +\keyitem{andmore} Like \vrb{andothers} but used to mark the truncation of a literal list. \end{keylist} \subsection*{Labels} @@ -525,13 +509,13 @@ Traditional scholarly expressions used in citations: \begin{keylist} \keyitem{idem} The term equivalent to the Latin <idem> (<the same [person]>). -\keyitem{idemsf} The feminine singular form of \texttt{idem}. -\keyitem{idemsm} The masculine singular form of \texttt{idem}. -\keyitem{idemsn} The neuter singular form of \texttt{idem}. -\keyitem{idempf} The feminine plural form of \texttt{idem}. -\keyitem{idempm} The masculine plural form of \texttt{idem}. -\keyitem{idempn} The neuter plural form of \texttt{idem}. -\keyitem{idempp} The plural form of \texttt{idem} suitable for a mixed gender list of names. +\keyitem{idemsf} The feminine singular form of \vrb{idem}. +\keyitem{idemsm} The masculine singular form of \vrb{idem}. +\keyitem{idemsn} The neuter singular form of \vrb{idem}. +\keyitem{idempf} The feminine plural form of \vrb{idem}. +\keyitem{idempm} The masculine plural form of \vrb{idem}. +\keyitem{idempn} The neuter plural form of \vrb{idem}. +\keyitem{idempp} The plural form of \vrb{idem} suitable for a mixed gender list of names. \keyitem{ibidem} The term equivalent to the Latin <ibidem> (<in the same place>). \keyitem{opcit} The term equivalent to the Latin term <opere citato> (<[in] the work [already] cited>). \keyitem{loccit} The term equivalent to the Latin term <loco citato> (<[at] the place [already] cited>). @@ -548,10 +532,10 @@ Other expressions frequently used in citations: \keyitem{seealso} The expression <see also>. \keyitem{seenote} An expression like <see note \prm{footnote}> or <as in \prm{footnote}>, used to refer to a previous footnote in a citation. \keyitem{backrefpage} An expression like <see page \prm{page}> or <cited on page \prm{page}>, used to introduce back references in the bibliography. -\keyitem{backrefpages} The plural form of \texttt{backrefpage}, \eg\ <see pages \prm{pages}> or <cited on pages \prm{pages}>. +\keyitem{backrefpages} The plural form of \vrb{backrefpage}, \eg\ <see pages \prm{pages}> or <cited on pages \prm{pages}>. \keyitem{quotedin} An expression like <quoted in \prm{citation}>, used when quoting a passage which was already a quotation in the cited work. \keyitem{citedas} An expression like <henceforth cited as \prm{shorthand}>, used to introduce a shorthand in a citation. -\keyitem{thiscite} The expression used in some verbose citation styles to differentiate between the page range of the cited item (typically an article in a journal, collection, or conference proceedings) and the page number the citation refers to. For example: \enquote{Author, Title, in: Book, pp. 45--61, \texttt{thiscite} p. 52.} +\keyitem{thiscite} The expression used in some verbose citation styles to differentiate between the page range of the cited item (typically an article in a journal, collection, or conference proceedings) and the page number the citation refers to. For example: \enquote{Author, Title, in: Book, pp. 45--61, \vrb{thiscite} p. 52.} \end{keylist} \subsection*{Month Names} @@ -576,30 +560,25 @@ Other expressions frequently used in citations: \begin{keylist} \keyitem{langamerican} The language <American> or <American English>. \keyitem{langbrazilian} The language <Brazilian> or <Brazilian Portuguese>. -\keyitem{langbulgarian} The language <Bulgarian>. \keyitem{langcatalan} The language <Catalan>. \keyitem{langcroatian} The language <Croatian>. \keyitem{langczech} The language <Czech>. \keyitem{langdanish} The language <Danish>. \keyitem{langdutch} The language <Dutch>. \keyitem{langenglish} The language <English>. -\keyitem{langestonian} The language <Estonian>. \keyitem{langfinnish} The language <Finnish>. \keyitem{langfrench} The language <French>. \keyitem{langgerman} The language <German>. \keyitem{langgreek} The language <Greek>. \keyitem{langitalian} The language <Italian>. -\keyitem{langjapanese} The language <Japanese>. \keyitem{langlatin} The language <Latin>. \keyitem{langnorwegian} The language <Norwegian>. \keyitem{langpolish} The language <Polish>. \keyitem{langportuguese} The language <Portuguese>. \keyitem{langrussian} The language <Russian>. -\keyitem{langslovak} The language <Slovak>. \keyitem{langslovene} The language <Slovene>. \keyitem{langspanish} The language <Spanish>. \keyitem{langswedish} The language <Swedish>. -\keyitem{langukrainian} The language <Ukrainian>. \end{keylist} % The following strings are intended for use in phrases like <translated from [the] English by \prm{translator}>: @@ -607,48 +586,43 @@ The following strings are intended for use in phrases like <translated from [the \begin{keylist} \keyitem{fromamerican} The expression <from [the] American> or <from [the] American English>. \keyitem{frombrazilian} The expression <from [the] Brazilian> or <from [the] Brazilian Portuguese>. -\keyitem{frombulgarian} The expression <from [the] Bulgarian>. \keyitem{fromcatalan} The expression <from [the] Catalan>. \keyitem{fromcroatian} The expression <from [the] Croatian>. \keyitem{fromczech} The expression <from [the] Czech>. \keyitem{fromdanish} The expression <from [the] Danish>. \keyitem{fromdutch} The expression <from [the] Dutch>. \keyitem{fromenglish} The expression <from [the] English>. -\keyitem{fromestonian} The expression <from [the] Estonian>. \keyitem{fromfinnish} The expression <from [the] Finnish>. \keyitem{fromfrench} The expression <from [the] French>. \keyitem{fromgerman} The expression <from [the] German>. \keyitem{fromgreek} The expression <from [the] Greek>. \keyitem{fromitalian} The expression <from [the] Italian>. -\keyitem{fromjapanese} The expression <from [the] Japanese>. \keyitem{fromlatin} The expression <from [the] Latin>. \keyitem{fromnorwegian} The expression <from [the] Norwegian>. \keyitem{frompolish} The expression <from [the] Polish>. \keyitem{fromportuguese} The expression <from [the] Portuguese>. \keyitem{fromrussian} The expression <from [the] Russian>. -\keyitem{fromslovak} The expression <from [the] Slovak>. \keyitem{fromslovene} The expression <from [the] Slovene>. \keyitem{fromspanish} The expression <from [the] Spanish>. \keyitem{fromswedish} The expression <from [the] Swedish>. -\keyitem{fromukrainian} The expression <from [the] Ukrainian>. \end{keylist} \subsection*{Country Names} -Country names are localised by using the string \texttt{country} plus the \acr{ISO}-3166 country code as the key. The short version of the translation should be the \acr{ISO}-3166 country code. Note that only a small number of country names is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{location} list of \bibtype{patent} entries but they may be useful for other purposes as well. +Country names are localized by using the string \vrb{country} plus the \acr{ISO}-3166 country code as the key. The short version of the translation should be the \acr{ISO}-3166 country code. Note that only a small number of country names is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{location} list of \bibtype{patent} entries but they may be useful for other purposes as well. \begin{keylist} -\keyitem{countryde} The name <Germany>, abbreviated as \texttt{DE}. -\keyitem{countryeu} The name <European Union>, abbreviated as \texttt{EU}. -\keyitem{countryep} Similar to \texttt{countryeu} but abbreviated as \texttt{EP}. This is intended for \bibfield{patent} entries. -\keyitem{countryfr} The name <France>, abbreviated as \texttt{FR}. -\keyitem{countryuk} The name <United Kingdom>, abbreviated (according to \acr{ISO}-3166) as \texttt{GB}. -\keyitem{countryus} The name <United States of America>, abbreviated as \texttt{US}. +\keyitem{countryde} The name <Germany>, abbreviated as \vrb{DE}. +\keyitem{countryeu} The name <European Union>, abbreviated as \vrb{EU}. +\keyitem{countryep} Similar to \vrb{countryeu} but abbreviated as \vrb{EP}. This is intended for \bibfield{patent} entries. +\keyitem{countryfr} The name <France>, abbreviated as \vrb{FR}. +\keyitem{countryuk} The name <United Kingdom>, abbreviated (according to \acr{ISO}-3166) as \vrb{GB}. +\keyitem{countryus} The name <United States of America>, abbreviated as \vrb{US}. \end{keylist} \subsection*{Patents and Patent Requests} -Strings related to patents are localised by using the term \texttt{patent} plus the \acr{ISO}-3166 country code as the key. Note that only a small number of patent keys is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{type} field of \bibtype{patent} entries. +Strings related to patents are localized by using the term \vrb{patent} plus the \acr{ISO}-3166 country code as the key. Note that only a small number of patent keys is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{type} field of \bibtype{patent} entries. \begin{keylist} \keyitem{patent} The generic term <patent>. @@ -659,7 +633,7 @@ Strings related to patents are localised by using the term \texttt{patent} plus \keyitem{patentus} The expression <U.S. patent>. \end{keylist} % -Patent requests are handled in a similar way, using the string \texttt{patreq} as the base name of the key: +Patent requests are handled in a similar way, using the string \vrb{patreq} as the base name of the key: \begin{keylist} \keyitem{patreq} The generic term <patent request>. @@ -670,30 +644,5 @@ Patent requests are handled in a similar way, using the string \texttt{patreq} a \keyitem{patrequs} The expression <U.S. patent request>. \end{keylist} -\subsection*{Dates and Times} - -\begin{keylist} -\keyitem{commonera} The era <CE> -\keyitem{beforecommonera} The era <BCE> -\keyitem{annodomini} The era <AD> -\keyitem{beforechrist} The era <BC> -\end{keylist} - -\begin{keylist} -\keyitem{circa} The string <circa> -\end{keylist} - -\begin{keylist} -\keyitem{spring} The string <spring> -\keyitem{summer} The string <summer> -\keyitem{autumn} The string <autumn> -\keyitem{winter} The string <winter> -\end{keylist} - -\begin{keylist} -\keyitem{am} The string <AM> -\keyitem{pm} The string <PM> -\end{keylist} - \printbibliography \end{document} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-biber.pdf Binary files differindex 567556f01b4..c34545ee458 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-bibtex.pdf Binary files differindex 65ed68d495a..47bf568a175 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-biber.pdf Binary files differindex f60de5da0ee..b84a7f35d1b 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-bibtex.pdf Binary files differindex aba875fad8e..b2f9c18c6cb 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-biber.pdf Binary files differindex 58e08456c60..712051a3947 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-bibtex.pdf Binary files differindex 7a575e1fb9b..22c63c295ae 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-biber.pdf Binary files differindex a89227c442c..0b1eab0b116 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-bibtex.pdf Binary files differindex b4509ef9a19..e949353d71d 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-biber.pdf Binary files differindex b7d080b2e9e..64c7490b50c 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-bibtex.pdf Binary files differindex 4d07934d4d7..4e3892c9bb5 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-biber.pdf Binary files differindex 1e6335fe010..859740ba103 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-bibtex.pdf Binary files differindex dd69e7a18f0..0d21ef4ba8a 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-biber.pdf Binary files differindex 1abde4f8c67..1cf20da235f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-bibtex.pdf Binary files differindex ccc1ea2e8d3..c1682f3220f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf Binary files differindex 9157a730a2e..5bbe10ae205 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-bibtex.pdf Binary files differindex e8083f8abed..9970795004c 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf Binary files differindex 16d6eae2c7d..8b1916a5546 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-bibtex.pdf Binary files differindex 3beb20d96bb..048bd097d1f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-biber.pdf Binary files differindex e909a6b8cc5..1a8596fa7f9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-bibtex.pdf Binary files differindex 4f477480363..2b542416787 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf Binary files differindex 77d7d34fa4b..cf775a28ed3 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-bibtex.pdf Binary files differindex f9afb84a48b..e6ef99dcda0 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf Binary files differindex 5290b564ced..755939de50b 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-bibtex.pdf Binary files differindex fec9b1ca679..6b1c4052838 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf Binary files differindex 96064cf4d05..c63e6c12cb6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-bibtex.pdf Binary files differindex 02eca830dd6..8348e71851d 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-biber.pdf Binary files differindex c98d881c99e..05355f6f488 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-bibtex.pdf Binary files differindex 8b71f3b52ae..333ae62f7d4 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-biber.pdf Binary files differindex c90678a8629..5b28d8097ea 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-bibtex.pdf Binary files differindex ef5099efbb1..1f8138f6b1f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex index c673ffb250a..5051790f6e9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex @@ -20,23 +20,6 @@ This style prints numeric citations in square brackets. It is similar to the standard bibliographic facilities provided by LaTeX and to the \texttt{plain.bst} style of legacy BibTeX. -\subsection*{Additional package options} - -\subsubsection*{The \texttt{subentry} option} - -The option \texttt{subentry} affects the handling of citations -referring to members of a reference set. If this option is enabled, -such citations get an extra letter which identifies the member -(it is also printed in the bibliography): -\cite{glashow,yoon,salam,aksin,companion}. - -This option is disabled by default, but it has been enabled -in this example. If disabled, citations referring to a set member -will point to the entire set, i.e., the above citations would -come out as -\cite{stdmodel,set,stdmodel,set,companion}. - - \subsection*{\cmd{cite} examples} \cite{companion} @@ -48,8 +31,10 @@ come out as \cite[see][59--63]{companion} \subsection*{\cmd{parencite} examples} -With the numeric style, \cmd{parencite} and \cmd{cite} -behave the exactly the same. + +% With the numeric style, the \parencite command is similar to \cite +% at first glance, but the placement of the prenote argument is +% different. This is just filler text \parencite{companion}. @@ -89,6 +74,26 @@ This is just filler text \autocite{companion}. \cite{companion,augustine,bertram,cotton,hammond,massa,murray} +\subsection*{Reference sets} + +% Reference sets are cited like any other item: + +\cite{set,hammond,stdmodel,massa,murray} + +% Note that this style provides a package option called 'subentry' +% which affects the handling of citations referring to members of +% a reference set. If this option is enabled, such citations get an +% extra letter which identifies the member (it is also printed in +% the bibliography): + +\cite{glashow,yoon,salam,aksin} + +% Note that this options is disabled by default but has been enabled +% in this example. If disabled, citations referring to a set member +% will point to the set, i.e., the above citations would be similar +% to this one: + +\cite{set,stdmodel} % The list of references diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-biber.pdf Binary files differindex 15faf7de2fc..ba1b5d9ba8e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf Binary files differindex 9d506479dfe..b29a5cd01f4 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex index 95ac00b5b16..2faff053a2e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex @@ -22,22 +22,6 @@ consecutive numbers is formatted as a range. This style will implicitly enable the \texttt{sortcites} package option at load time. -\subsection*{Additional package options} - -\subsubsection*{The \texttt{subentry} option} - -The option \texttt{subentry} affects the handling of citations -referring to members of a reference set. If this option is enabled, -such citations get an extra letter which identifies the member -(it is also printed in the bibliography): -\cite{glashow,yoon,salam,aksin,companion}. - -This option is disabled by default, but it has been enabled -in this example. If disabled, citations referring to a set member -will point to the entire set, i.e., the above citations would -come out as -\cite{stdmodel,set,stdmodel,set,companion}. - \subsection*{Multiple citations} \cite{bertram,augustine} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-biber.pdf Binary files differindex 455ce302850..6f1c526b261 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-bibtex.pdf Binary files differindex fe7b4fe04c4..f791b452b47 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex index 269b52f786e..bee8deb900a 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex @@ -19,20 +19,6 @@ This style is similar to \texttt{numeric} except that a list of multiple citations is printed in a slightly more verbose format. -\subsubsection*{The \texttt{subentry} option} - -The option \texttt{subentry} affects the handling of citations -referring to members of a reference set. If this option is enabled, -such citations get an extra letter which identifies the member -(it is also printed in the bibliography): -\cite{glashow,yoon,salam,aksin,companion}. - -This option is disabled by default, but it has been enabled -in this example. If disabled, citations referring to a set member -will point to the entire set, i.e., the above citations would -come out as -\cite{stdmodel,set,stdmodel,set,companion}. - \subsection*{Multiple citations} \cite{hammond,massa,augustine,cotton,set,murray,bertram,stdmodel} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-biber.pdf Binary files differindex 19b4070c8f9..bc1738d3a21 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-bibtex.pdf Binary files differindex b01fc96c87f..f05be12f4a9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-biber.pdf Binary files differindex 9ce56a20def..0da50ed6e73 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-bibtex.pdf Binary files differindex 2f5f4f46cd8..306c33ca5f4 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-biber.pdf Binary files differindex e7402b339a6..37c6ff50aed 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-bibtex.pdf Binary files differindex 3d1cab0fff4..58d1ecec614 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-biber.pdf Binary files differindex c3ca5c77a73..6100fda1830 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-bibtex.pdf Binary files differindex 9bb1835687e..645efd0f93f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex index 678efc4fc2b..c022f3ae743 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex @@ -39,13 +39,11 @@ preamble will disable this feature. The default setting is Since this style prints the date label after the author/editor in the bibliography, there are effectively two dates in the bibliography: the full date specification (e.g., \enquote{2001}, \enquote{June -2006}, \enquote{5th~Jan. 2008}, whose format is controlled by the -\texttt{date} option) and the date label (e.g., \enquote{2006a}, -whose format is controlled with the \texttt{labeldate} option), -as found in citations. The \texttt{mergedate} option controls whether -or not date specifications are merged with the date label. -This option is best explained by example. Note that -it only affects the bibliography. Citations use the date label only. +2006}, \enquote{5th~Jan. 2008}) and the date label (e.g., +\enquote{2006a}), as found in citations. The \texttt{mergedate} +option controls whether or not date specifications are merged with +the date label. This option is best explained by example. Note that +it only affects the bibliography. Citations use the date label only: \begin{bibsample} \item Doe 2000 @@ -53,12 +51,10 @@ it only affects the bibliography. Citations use the date label only. \item Doe 2003b \item Doe 2006a \item Doe 2006b -\item Doe 2017 \end{bibsample} \texttt{mergedate=false} strictly separates the date specification -(following \texttt{date}) from the date label (following \texttt{labeldate}). -The year will always be printed twice: +from the date label. The year will always be printed twice: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000. @@ -68,11 +64,12 @@ The year will always be printed twice: (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} -\texttt{mergedate=minimum} omits the date whenever the full date -and the date label have exactly the same precision (date-time granularity). +\texttt{mergedate=minimum} merges the dates whenever the full date +and the date label are exactly the same string. If the date is a bare +year number and there is no \texttt{extrayear} field, the date +specification will be omitted: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -82,12 +79,11 @@ and the date label have exactly the same precision (date-time granularity). (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} \texttt{mergedate=basic} is similar in concept but more economical. -It will also omit the date if it differs from the date label only by -\texttt{extradate}. +It will always omit the date specification if the date is a bare year +number: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -97,13 +93,10 @@ It will also omit the date if it differs from the date label only by (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} \texttt{mergedate=compact} merges all date specifications with the -date labels. The merged date is printed in \texttt{date} format, -not \texttt{labeldate}, even if it is printed in the position of -the date label. The \texttt{issue} field is still treated specially: +date labels. It will still treat the \texttt{issue} field specially: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -112,13 +105,10 @@ the date label. The \texttt{issue} field is still treated specially: \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall), pp.~5--25. -\item Doe, John (7th Aug. 2017).\emph{Webpage}. \end{bibsample} -\texttt{mergedate=maximum} strives for maximum compactness. -Like \texttt{mergedate=compact} this option merges the date -into the date label. -Even the \texttt{issue} field is merged with the date label: +\texttt{mergedate=maximum} strives for maximum compactness. Even the +\texttt{issue} field is merged with the date label: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -126,7 +116,6 @@ Even the \texttt{issue} field is merged with the date label: \item Doe, John (2003b). \emph{Book~3}. Location: Publisher. \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85. \item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25. -\item Doe, John (7th Aug. 2017).\emph{Webpage}. \end{bibsample} \texttt{mergedate=true} is an alias for \texttt{mergedate=compact}. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-biber.pdf Binary files differindex 2dad4901830..f66d4cddb6e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-bibtex.pdf Binary files differindex 58d95db268f..2a6c22d9523 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex index 5d573bfe1be..c36503c1920 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex @@ -53,13 +53,11 @@ preamble will disable this feature. The default setting is Since this style prints the date label after the author/editor in the bibliography, there are effectively two dates in the bibliography: the full date specification (e.g., \enquote{2001}, \enquote{June -2006}, \enquote{5th~Jan. 2008}, whose format is controlled by the -\texttt{date} option) and the date label (e.g., \enquote{2006a}, -whose format is controlled with the \texttt{labeldate} option), -as found in citations. The \texttt{mergedate} option controls whether -or not date specifications are merged with the date label. -This option is best explained by example. Note that -it only affects the bibliography. Citations use the date label only. +2006}, \enquote{5th~Jan. 2008}) and the date label (e.g., +\enquote{2006a}), as found in citations. The \texttt{mergedate} +option controls whether or not date specifications are merged with +the date label. This option is best explained by example. Note that +it only affects the bibliography. Citations use the date label only: \begin{bibsample} \item Doe 2000 @@ -67,12 +65,10 @@ it only affects the bibliography. Citations use the date label only. \item Doe 2003b \item Doe 2006a \item Doe 2006b -\item Doe 2017 \end{bibsample} \texttt{mergedate=false} strictly separates the date specification -(following \texttt{date}) from the date label (following \texttt{labeldate}). -The year will always be printed twice: +from the date label. The year will always be printed twice: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000. @@ -82,11 +78,12 @@ The year will always be printed twice: (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} -\texttt{mergedate=minimum} omits the date whenever the full date -and the date label have exactly the same precision (date-time granularity). +\texttt{mergedate=minimum} merges the dates whenever the full date +and the date label are exactly the same string. If the date is a bare +year number and there is no \texttt{extrayear} field, the date +specification will be omitted: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -96,12 +93,11 @@ and the date label have exactly the same precision (date-time granularity). (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} \texttt{mergedate=basic} is similar in concept but more economical. -It will also omit the date if it differs from the date label only by -\texttt{extradate}. +It will always omit the date specification if the date is a bare year +number: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -111,13 +107,10 @@ It will also omit the date if it differs from the date label only by (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} \texttt{mergedate=compact} merges all date specifications with the -date labels. The merged date is printed in \texttt{date} format, -not \texttt{labeldate}, even if it is printed in the position of -the date label. The \texttt{issue} field is still treated specially: +date labels. It will still treat the \texttt{issue} field specially: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -126,13 +119,10 @@ the date label. The \texttt{issue} field is still treated specially: \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall), pp.~5--25. -\item Doe, John (7th Aug. 2017).\emph{Webpage}. \end{bibsample} -\texttt{mergedate=maximum} strives for maximum compactness. -Like \texttt{mergedate=compact} this option merges the date -into the date label. -Even the \texttt{issue} field is merged with the date label: +\texttt{mergedate=maximum} strives for maximum compactness. Even the +\texttt{issue} field is merged with the date label: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -140,7 +130,6 @@ Even the \texttt{issue} field is merged with the date label: \item Doe, John (2003b). \emph{Book~3}. Location: Publisher. \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85. \item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25. -\item Doe, John (7th Aug. 2017).\emph{Webpage}. \end{bibsample} \texttt{mergedate=true} is an alias for \texttt{mergedate=compact}. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-biber.pdf Binary files differindex ff3d1116211..89d7b2d1009 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-bibtex.pdf Binary files differindex 53d12135eaa..27bdcacea62 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex index c4f6b52c513..88c1dad39fa 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex @@ -43,13 +43,11 @@ preamble will disable this feature. The default setting is Since this style prints the date label after the author/editor in the bibliography, there are effectively two dates in the bibliography: the full date specification (e.g., \enquote{2001}, \enquote{June -2006}, \enquote{5th~Jan. 2008}, whose format is controlled by the -\texttt{date} option) and the date label (e.g., \enquote{2006a}, -whose format is controlled with the \texttt{labeldate} option), -as found in citations. The \texttt{mergedate} option controls whether -or not date specifications are merged with the date label. -This option is best explained by example. Note that -it only affects the bibliography. Citations use the date label only. +2006}, \enquote{5th~Jan. 2008}) and the date label (e.g., +\enquote{2006a}), as found in citations. The \texttt{mergedate} +option controls whether or not date specifications are merged with +the date label. This option is best explained by example. Note that +it only affects the bibliography. Citations use the date label only: \begin{bibsample} \item Doe 2000 @@ -57,12 +55,10 @@ it only affects the bibliography. Citations use the date label only. \item Doe 2003b \item Doe 2006a \item Doe 2006b -\item Doe 2017 \end{bibsample} \texttt{mergedate=false} strictly separates the date specification -(following \texttt{date}) from the date label (following \texttt{labeldate}). -The year will always be printed twice: +from the date label. The year will always be printed twice: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000. @@ -72,11 +68,12 @@ The year will always be printed twice: (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} -\texttt{mergedate=minimum} omits the date whenever the full date -and the date label have exactly the same precision (date-time granularity). +\texttt{mergedate=minimum} merges the dates whenever the full date +and the date label are exactly the same string. If the date is a bare +year number and there is no \texttt{extrayear} field, the date +specification will be omitted: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -86,12 +83,11 @@ and the date label have exactly the same precision (date-time granularity). (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} \texttt{mergedate=basic} is similar in concept but more economical. -It will also omit the date if it differs from the date label only by -\texttt{extradate}. +It will always omit the date specification if the date is a bare year +number: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -101,13 +97,10 @@ It will also omit the date if it differs from the date label only by (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} \texttt{mergedate=compact} merges all date specifications with the -date labels. The merged date is printed in \texttt{date} format, -not \texttt{labeldate}, even if it is printed in the position of -the date label. The \texttt{issue} field is still treated specially: +date labels. It will still treat the \texttt{issue} field specially: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -116,13 +109,10 @@ the date label. The \texttt{issue} field is still treated specially: \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall), pp.~5--25. -\item Doe, John (7th Aug. 2017).\emph{Webpage}. \end{bibsample} -\texttt{mergedate=maximum} strives for maximum compactness. -Like \texttt{mergedate=compact} this option merges the date -into the date label. -Even the \texttt{issue} field is merged with the date label: +\texttt{mergedate=maximum} strives for maximum compactness. Even the +\texttt{issue} field is merged with the date label: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -130,7 +120,6 @@ Even the \texttt{issue} field is merged with the date label: \item Doe, John (2003b). \emph{Book~3}. Location: Publisher. \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85. \item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25. -\item Doe, John (7th Aug. 2017).\emph{Webpage}. \end{bibsample} \texttt{mergedate=true} is an alias for \texttt{mergedate=compact}. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-biber.pdf Binary files differindex 5b80e62b595..307366891af 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-bibtex.pdf Binary files differindex e4ee00f4096..d2ebc2c9008 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex index 4499b8e4e42..34826c6cabc 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex @@ -51,13 +51,11 @@ preamble will disable this feature. The default setting is Since this style prints the date label after the author/editor in the bibliography, there are effectively two dates in the bibliography: the full date specification (e.g., \enquote{2001}, \enquote{June -2006}, \enquote{5th~Jan. 2008}, whose format is controlled by the -\texttt{date} option) and the date label (e.g., \enquote{2006a}, -whose format is controlled with the \texttt{labeldate} option), -as found in citations. The \texttt{mergedate} option controls whether -or not date specifications are merged with the date label. -This option is best explained by example. Note that -it only affects the bibliography. Citations use the date label only. +2006}, \enquote{5th~Jan. 2008}) and the date label (e.g., +\enquote{2006a}), as found in citations. The \texttt{mergedate} +option controls whether or not date specifications are merged with +the date label. This option is best explained by example. Note that +it only affects the bibliography. Citations use the date label only: \begin{bibsample} \item Doe 2000 @@ -65,12 +63,10 @@ it only affects the bibliography. Citations use the date label only. \item Doe 2003b \item Doe 2006a \item Doe 2006b -\item Doe 2017 \end{bibsample} \texttt{mergedate=false} strictly separates the date specification -(following \texttt{date}) from the date label (following \texttt{labeldate}). -The year will always be printed twice: +from the date label. The year will always be printed twice: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000. @@ -80,11 +76,12 @@ The year will always be printed twice: (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} -\texttt{mergedate=minimum} omits the date whenever the full date -and the date label have exactly the same precision (date-time granularity). +\texttt{mergedate=minimum} merges the dates whenever the full date +and the date label are exactly the same string. If the date is a bare +year number and there is no \texttt{extrayear} field, the date +specification will be omitted: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -94,12 +91,11 @@ and the date label have exactly the same precision (date-time granularity). (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} \texttt{mergedate=basic} is similar in concept but more economical. -It will also omit the date if it differs from the date label only by -\texttt{extradate}. +It will always omit the date specification if the date is a bare year +number: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -109,13 +105,10 @@ It will also omit the date if it differs from the date label only by (June~2006), pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall~2006), pp.~5--25. -\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017. \end{bibsample} \texttt{mergedate=compact} merges all date specifications with the -date labels. The merged date is printed in \texttt{date} format, -not \texttt{labeldate}, even if it is printed in the position of -the date label. The \texttt{issue} field is still treated specially: +date labels. It will still treat the \texttt{issue} field specially: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -124,13 +117,10 @@ the date label. The \texttt{issue} field is still treated specially: \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85. \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3 (Fall), pp.~5--25. -\item Doe, John (7th Aug. 2017).\emph{Webpage}. \end{bibsample} -\texttt{mergedate=maximum} strives for maximum compactness. -Like \texttt{mergedate=compact} this option merges the date -into the date label. -Even the \texttt{issue} field is merged with the date label: +\texttt{mergedate=maximum} strives for maximum compactness. Even the +\texttt{issue} field is merged with the date label: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -138,7 +128,6 @@ Even the \texttt{issue} field is merged with the date label: \item Doe, John (2003b). \emph{Book~3}. Location: Publisher. \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85. \item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25. -\item Doe, John (7th Aug. 2017).\emph{Webpage}. \end{bibsample} \texttt{mergedate=true} is an alias for \texttt{mergedate=compact}. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf Binary files differindex 3b3b19e7ce6..a3f36503b21 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-bibtex.pdf Binary files differindex 5f15ff6eacd..7bf6339b125 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-biber.pdf Binary files differindex c62070ad542..65a2594e2b9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-bibtex.pdf Binary files differindex 2170ae0b7ca..e0798845c94 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-biber.pdf Binary files differindex 7f94f785e57..6557ae9cfe1 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-bibtex.pdf Binary files differindex 451b88d0de6..901a062778e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-biber.pdf Binary files differindex b79ee4d0fdc..a43efc0ee9d 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-bibtex.pdf Binary files differindex 9f7c90a9790..29aff0eb6f7 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-biber.pdf Binary files differindex 53d408ef15b..989b280b2fc 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-bibtex.pdf Binary files differindex 6c71c1e1320..aa5114d8f86 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-biber.pdf Binary files differindex c0a83cb97e7..ec637c9afc7 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-bibtex.pdf Binary files differindex 7175e1e0ced..da1f489a2c6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-biber.pdf Binary files differindex 274d8dcc424..86ab456544c 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-bibtex.pdf Binary files differindex 8d4f6c05ded..b6200d81eca 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-biber.pdf Binary files differindex 4b2f20dc4af..bd5ca665bc1 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-bibtex.pdf Binary files differindex 6695b328733..4eade38f809 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-biber.pdf Binary files differindex e2309a41aae..5143c24a127 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-bibtex.pdf Binary files differindex bacca4c5d1f..b0fa7a526a2 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-biber.pdf Binary files differindex b5089769d71..d7c54c413b9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-bibtex.pdf Binary files differindex 28f8ee1a008..c6d9a8a71f8 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-biber.pdf Binary files differindex 04f844a1f9e..d3304469720 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-bibtex.pdf Binary files differindex 21d1e1c6b3c..413cf5599eb 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-biber.pdf Binary files differindex 543e2adc44e..4c61296d50c 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-bibtex.pdf Binary files differindex 93e71e53b05..22f24ec5d71 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-biber.pdf Binary files differindex 6d9a4ead25c..c28ef2b88b7 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-bibtex.pdf Binary files differindex 23c8cca72c2..8880bf31016 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-biber.pdf Binary files differindex 83e5e06ebc9..6ba0616a3e6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-bibtex.pdf Binary files differindex bd75ca63e59..ea0a375cfae 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-biber.pdf Binary files differindex 9af20803ce5..aaf8b5f40cb 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-bibtex.pdf Binary files differindex 2c5c11ae0fa..f1b8cb20053 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-biber.pdf Binary files differindex d6e496abb50..c4f1194f7c1 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-bibtex.pdf Binary files differindex 403a541d014..adc323850fa 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf Binary files differindex 8a6a9e26030..41965fbeded 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-bibtex.pdf Binary files differindex 2d15a72e611..0f13851f73c 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-bibtex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-bibtex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries-biber.pdf Binary files differindex e955d209d39..b45f00372bb 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes-biber.pdf Binary files differindex 284d42d39a4..207edf3b6c0 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex index 251e27dcc27..799b57f182e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex @@ -6,12 +6,6 @@ \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \begin{document} -% This demonstrates that the sorting of citations can be difference to the -% bibliography. However, this is not always advisable in case of multiple -% citations in the same year for the same author list. This is because -% extradate (the "a", "b" etc. in "Smith 2010a" and "Smith 2010b" etc.) -% depends on the sorting order and if the sorting order is different -% between citations and bibliography, this can cause confusion. Filler text \parencite{wassenberg,cicero,companion,angenendt}. \newrefcontext[sorting=nyt] \printbibliography diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists-biber.pdf Binary files differindex 72b8c43231f..6e2ac6ea7ad 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex b/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex index d43f2b192ae..52661044fda 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex @@ -14,7 +14,7 @@ % This is optional. If no sorting scheme is specified to \printbiblist, a % sorting scheme with the same name as the biblist is used if found. % Otherwise as a last resort the global sorting scheme is used -\DeclareSortingTemplate{shorttitle}{ +\DeclareSortingScheme{shorttitle}{ \sort{ \field{shorttitle} } diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts-biber.pdf Binary files differindex 6ea4cb55391..2fd7ea16e4f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.dbx b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.dbx index 98bafea301b..d94fec6e122 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.dbx +++ b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.dbx @@ -1 +1 @@ -\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,patronymic,papponymic,cjk} +\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,patronymic} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex index b5e3d6fc7dc..46b337c3dd1 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex @@ -1,410 +1,49 @@ \documentclass[a4paper]{article} \usepackage{fontspec} -\setmainfont{Linux Libertine O} -\setsansfont{Linux Biolinum O} -\usepackage[fallback]{xeCJK} -%\setCJKmainfont{Malgun Gothic} -\setCJKmainfont{PingFang TC}% OSX - -\usepackage[british]{babel} +\setmainfont{Cambria} +\setsansfont{Arial} +\setmonofont{Courier New} +\usepackage[russian]{babel} \usepackage{csquotes} \usepackage{filecontents} \begin{filecontents}{\jobname.bib} @book{tolstoy, - author = {given=Лев, patronymic=Николаевич, family=Толстой, nametemplates=russian}, - title = {Война и мир}, - date = {1877}, - langid = {russian}, -} -@book{bulgakov, - author = {given=Михаил, patronymic=Афанасьевич, family=Булгаков, nametemplates=russian}, - title = {Мастер и Маргарита}, - date = {1966}, - langid = {russian}, -} -@book{bulgakov:val, - author = {given=Валентин, patronymic=Фёдорович, family=Булгаков, nametemplates=russian}, - title = {Л. Н. Толстой в последний год его жизни}, - date = {1911}, - langid = {russian}, -} - -@book{dosto:1, - author = {given=Александр , patronymic=Андреевич, family=Достоевский, nametemplates=russian}, - title = {О строении телец Грандри}, - date = {1885}, - langid = {russian}, -} -@book{dosto:2, - author = {given=Андрей , patronymic=Андреевич, family=Достоевский, nametemplates=russian}, - title = {П. П. Семенов-Тян-Шанский как исследователь, географ и статистик}, - date = {1914}, - langid = {russian}, -} - -@book{demeke, - author = {given=Kebede, patronymic=Daniel, papponymic=Demeke, nametemplates=ethiopian}, - title = {One}, - date = {1983} -} -@book{dameke, - author = {given=Kebede, patronymic=Daniel, papponymic=Dameke, nametemplates=ethiopian}, - title = {Two}, - date = {1983} -} -@book{james, - author = {given=Kebede, patronymic=James, papponymic=Demeke, nametemplates=ethiopian}, - title = {Three}, - date = {1983} -} -@book{jonathan, - author = {given=Kebede, patronymic=Jonathan, papponymic=Kebede, nametemplates=ethiopian}, - title = {Four}, - date = {1986} -} -@book{william, - author = {given=Kebede, patronymic=William, papponymic=Kebede, nametemplates=ethiopian}, - title = {Four}, - date = {1987} -} - -@book{zhangx1, - title = {Shuming}, - titleaddon = {書名}, - author = {family=Zhang, cjk=章學成, given=Xuecheng, nametemplates=cjk}, - location = {Beijing}, - publisher = {Zhonghua Shuju}, - date = {2017}, -} -@book{zhangx2, - title = {Shuming er}, - titleaddon = {書名二}, - author = {family=Zhang, cjk=張學成, given=Xuecheng, nametemplates=cjk}, - location = {Shanghai}, - publisher = {Shangwu Yinshuguan}, - date = {2016}, -} -@book{zhangh, - title = {Sŏmyŏng}, - titleaddon = {書名}, - author = {family=Zhang, cjk=장학성, given=Haksŏng, nametemplates=cjk}, - location = {Shanghai}, - publisher = {Shangwu Yinshuguan}, - date = {2016}, -} - -@book{bronte:c, - author = {Charlotte Brontë}, - date = {1847}, - title = {Jane Eyre}, -} -@book{bronte:e, - author = {Emily Brontë}, - date = {1847}, - title = {Wuthering Heights}, -} - -@book{austen:jane, - author = {Jane Austen}, - date = {1813}, - title = {Pride and Prejudice}, -} -@collection{austen:john, - editor = {John Austen}, - editortype = {compiler}, - date = {1924}, - title = {Rogues in Porcelain: A Miscellany of 18th Poems}, + author = {given=Лев, patronymic=Николаевич, family=Толстой}, + title = {Война и мир}, + date = {1877} } \end{filecontents} -\usepackage[style=authoryear,datamodel=93-nameparts,backend=biber, autolang=hyphen]{biblatex} -\addbibresource{biblatex-examples.bib} +\usepackage[style=authoryear,datamodel=93-nameparts,backend=biber]{biblatex} +\addbibresource[datatype=biblatexml]{biblatex-examples.bltxml} \addbibresource{\jobname.bib} - -% Use transliteration to sort Cyrillic among Latin script -\DeclareSortTranslit{ - \translit{russian}{bgn/pcgn-standard} -} - -\makeatletter -%% CJK names -% the idea is to sort family -> given -> cjk (full name) -% and disambiguate in the same manner using only full -% forms of the name, no initials -% the order should always be family -> given -> cjk -% names are not reversed -\DeclareSortingNamekeyTemplate[cjk]{ - \keypart{ - \namepart{family} - } - \keypart{ - \namepart{given} - } - \keypart{ - \namepart{cjk} - } -} - -\DeclareUniquenameTemplate[cjk]{ - \namepart[base=true]{family} - \namepart[disambiguation=full]{given} - \namepart[disambiguation=full]{cjk} -} - -\newbibmacro*{name:cjk}[3]{% - \usebibmacro{name:delim}{#2#3#1}% - \usebibmacro{name:hook}{#2#3#1}% - \mkbibnamefamily{#1}% - \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}}% - \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnamecjk{#3}}} - -%% Ethiopian names -% Ethiopian names are given -> patronymic -> papponymic -% the latter two are only needed for disambiguation -% names order is never reversed -\DeclareSortingNamekeyTemplate[ethiopian]{ - \keypart{ - \namepart{given} - } +% A format using the new name part +\DeclareNameFormat{author}{% + \usebibmacro{name:delim}{#1}% + \usebibmacro{name:hook}{#1}% + \mkbibnamefamily{\namepartfamily}% + \ifdefvoid\namepartgiven + {} + {\revsdnamepunct + \bibnamedelimd + \mkbibnamegiven{\namepartgiven}% + \space + \mkbibnamepatronymic{\namepartpatronymic}\isdot} + \usebibmacro{name:andothers}} + +% We want to sort names using these name parts in this order +\DeclareSortingNamekeyScheme{ \keypart{ \namepart{patronymic} } \keypart{ - \namepart{papponymic} - } -} - -\DeclareUniquenameTemplate[ethiopian]{ - \namepart[base=true]{given} - \namepart[disambiguation=full]{patronymic} - \namepart[disambiguation=full]{papponymic} -} - -\newbibmacro*{name:ethiopian}[3]{% - \usebibmacro{name:delim}{#1#2#3}% - \usebibmacro{name:hook}{#1#2#3}% - \mkbibethgiven{#1}% - \ifdefvoid{#2}{}{\bibnamedelimd\mkbibethpat{#2}\isdot}% - \ifdefvoid{#3}{}{\bibnamedelimd\mkbibethpap{#3}\isdot}} - -\let\mkbibethgiven\mkbibnamefamily -\let\mkbibethpat\mkbibnamegiven -\let\mkbibethpap\mkbibnamegiven - -%% Russian names -% family -> given -> patronymic -% we never show the given name alone, it is always accompanied -% by the patronymic -% (patronymic could just be treated as another given name) -% reversed name order is 'family, given patronymic' -\DeclareSortingNamekeyTemplate[russian]{ - \keypart{ \namepart{family} } \keypart{ \namepart{given} } - \keypart{ - \namepart{patronymic} - } -} - -\DeclareUniquenameTemplate[russian]{ - \namepart[base=true]{family} - \namepart{given} - \namepart{patronymic} } -\newbibmacro*{name:russian}[3]{% - \usebibmacro{name:delim}{#1#2#3}% - \usebibmacro{name:hook}{#1#2#3}% - \ifdefvoid{#2} - {} - {\mkbibnamegiven{#2}\isdot\bibnamedelimd - \ifdefvoid{#3} - {} - {\mkbibnamepatronymic{#3}\isdot\bibnamedelimd}}% - \mkbibnamefamily{#1}} - -\newbibmacro*{name:russian-rev}[3]{% - \usebibmacro{name:delim}{#1#2#3}% - \usebibmacro{name:hook}{#1#2#3}% - \mkbibnamefamily{#1}% - \ifdefvoid{#2} - {} - {\revsdnamepunct\bibnamedelimd - \mkbibnamegiven{#2}\isdot - \ifdefvoid{#3} - {} - {\bibnamedelimd\mkbibnamepatronymic{#3}\isdot}}} - -%% sortname -% helper to select the sorting template in \ifcase -\newcommand*{\abx@sortingnamekeytemplate}{0} -\newcommand*{\abx@getsortingnamekeytemplate}{% - \ifsortingnamekeytemplatename{cjk} - {\def\abx@sortingnamekeytemplate{1}} - {\ifsortingnamekeytemplatename{ethiopian} - {\def\abx@sortingnamekeytemplate{2}} - {\ifsortingnamekeytemplatename{russian} - {\def\abx@sortingnamekeytemplate{3}} - {}}}} - -% show fullest version of names, -% reverse Russian and western names for sorting -% all other names are always in the correct order for sorting -\DeclareNameFormat{sortname}{% - \abx@getsortingnamekeytemplate - \ifcase\abx@sortingnamekeytemplate\relax - \usebibmacro{name:family-given} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}% - \or - \usebibmacro{name:cjk} - {\namepartfamily} - {\namepartgiven} - {\namepartcjk}% - \or - \usebibmacro{name:ethiopian} - {\namepartgiven} - {\namepartpatronymic} - {\namepartpapponymic}% - \or - \usebibmacro{name:russian-rev} - {\namepartfamily} - {\namepartgiven} - {\namepartpatronymic}% - \fi - \usebibmacro{name:andothers}} - -%% labelname -% copy of the standard definition in biblatex.def -% uses the 'old way' of finding the disambiguating name part -\newbibmacro{labelname:western}{% - \ifcase\value{uniquename}% - \usebibmacro{name:family} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}% - \or - \ifuseprefix - {\usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefix} - {\namepartsuffixi}} - {\usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefixi} - {\namepartsuffixi}}% - \or - \usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}% - \fi - \usebibmacro{name:andothers}} - -% Uses \iffieldequalstr{uniquepart} to find the disambiguating -% name part. -% If neither base (i.e. family) nor given name are enough, -% go with the full name. -% Uses \empty for suppressed name parts, so we don't have to define -% dedicated macros for the shorter name forms. -\newbibmacro{labelname:cjk}{% - \iffieldequalstr{uniquepart}{base}% - {\usebibmacro{name:cjk} - {\namepartfamily} - {\empty} - {\empty}} - {\iffieldequalstr{uniquepart}{given}% - {\usebibmacro{name:cjk} - {\namepartfamily} - {\namepartgiven} - {\empty}} - {\usebibmacro{name:cjk} - {\namepartfamily} - {\namepartgiven} - {\namepartcjk}}}} - -% similar to the CJK format -\newbibmacro{labelname:ethiopian}{% - \iffieldequalstr{uniquepart}{base}% - {\usebibmacro{name:ethiopian} - {\namepartgiven} - {\empty} - {\empty}} - {\iffieldequalstr{uniquepart}{patronymic}% - {\usebibmacro{name:ethiopian} - {\namepartgiven} - {\namepartpatronymic} - {\empty}} - {\usebibmacro{name:ethiopian} - {\namepartgiven} - {\namepartpatronymic} - {\namepartpapponymic}}}} - -% Uses \iffieldequalstr{uniquepart} to get the disambiguating -% name part. -% We only choose between 'Given Patronymic Family' and -% 'G. P. Family', the decision whether or not to use -% initials is for the given name to decide. -% If the given initial is enough to disambiguate the name, -% the given name and patronymic become initials. -% Even if the initial of the patronymic would make the name -% unique we go with the full name instead. -% There is no 'Given P. Family' format. -% \namepart<>un=1 says initials are enough -% 2 means the full name is required -% 0 means not used -\newbibmacro{labelname:russian}{% - \iffieldequalstr{uniquepart}{base}% - {\usebibmacro{name:russian} - {\namepartfamily} - {\empty} - {\empty}} - {\ifnum\namepartgivenun=1\relax - \usebibmacro{name:russian} - {\namepartfamily} - {\namepartgiveni} - {\namepartpatronymici}% - \else - \usebibmacro{name:russian} - {\namepartfamily} - {\namepartgiven} - {\namepartpatronymic}% - \fi}} - -% helper to select the uniquename template in \ifcase -\newcommand*{\abx@uniquenametemplatename}{0} -\newcommand*{\abx@getuniquenametemplatename}{% - \ifuniquenametemplatename{cjk} - {\def\abx@uniquenametemplatename{1}} - {\ifuniquenametemplatename{ethiopian} - {\def\abx@uniquenametemplatename{2}} - {\ifuniquenametemplatename{russian} - {\def\abx@uniquenametemplatename{3}} - {}}}} - -\DeclareNameFormat{labelname}{% - \abx@getuniquenametemplatename - \ifcase\abx@uniquenametemplatename\relax - \usebibmacro{labelname:western}% - \or - \usebibmacro{labelname:cjk}% - \or - \usebibmacro{labelname:ethiopian}% - \or - \usebibmacro{labelname:russian}% - \fi - \usebibmacro{name:andothers}} -\makeatother - \begin{document} % Historically, name handling in latex bibliographies has been determined by % the name parsing rules of bibtex. In a modern context, this name handling @@ -414,26 +53,17 @@ % it is possible to define arbitrary name parts since the allowable name % parts are defined in the data model (see accompanying file 93-nameparts.dbx). -% Here we demonstrate the possibility of adding a new name parts to the -% datamodel and then using it in formatting, sorting etc. -% Notice that we can use the new name part types in the datasource +% Here we demonstrate the possibility of adding a new "patronymic" name part to the +% datamodel and then using it in formatting, sorting etc. It requires +% the biblatexml datasource format (see accompanying file biblatex-examples.bltxml) + +% Notice that we can use the <patronymic> name part type in the datasource % which is now allowable due to the enhanced datamodel constant definition. % We have also defined a new name format and method of sorting names which -% are aware of the new name parts. +% are aware of the new name part. % -\textcite{tolstoy,bulgakov,bulgakov:val} - -\textcite{dosto:1} - -\textcite{dosto:2} - -\textcite{demeke,dameke,james,jonathan,william} - -\textcite{sigfridsson,worman,geer,knuth:ct:a,cicero,companion,vangennep} - -\textcite{bronte:c,bronte:e,austen:jane,austen:john} - -\textcite{zhangx1,zhangx2,zhangh} +\noindent\textcite{tolstoy}\\ +\textcite{bulgakov} \printbibliography \end{document} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/94-labelprefix-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/94-labelprefix-biber.pdf Binary files differindex f437e48beef..d1c01285817 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/94-labelprefix-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/94-labelprefix-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists-biber.pdf Binary files differindex ae391427800..097fa19b70e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists.tex b/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists.tex index 74d0ee9c6d8..20958c1c6c6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists.tex @@ -53,7 +53,7 @@ } % Sort the biblist by coauthor name -\DeclareSortingTemplate{coauthor}{ +\DeclareSortingScheme{coauthor}{ \sort{ \field{coauthor} } diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/96-dates-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/96-dates-biber.pdf Binary files differindex 9225227c647..bb1b005cc8e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/96-dates-biber.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/examples/96-dates-biber.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/96-dates.tex b/Master/texmf-dist/doc/latex/biblatex/examples/96-dates.tex index 79ff773e49d..58468b152ef 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/96-dates.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/96-dates.tex @@ -35,10 +35,10 @@ @misc{date4, note = {Times}, author = {Author4}, - date = {2004-04-25T14:34:00/2004-04-25T14:37:06}, % Date with time, floating timezone - origdate = {2004-04-25T14:34:00Z/2004-04-25T14:34:05Z}, % Date with time, UTC timezone - eventdate = {2004-04-25T14:34:00+05:00/2004-04-25T15:34:00+05:00}, % Date with time, explicit timezone - urldate = {2004-04-25T14:34:00/2004-04-25T15:00:00}, % Datetime range + date = {2004-04-25T14:34:00/2004-04-05T14:37:06}, % Date with time, floating timezone + origdate = {2004-04-25T14:34:00Z/2004-04-05T14:34:05Z}, % Date with time, UTC timezone + eventdate = {2004-04-25T14:34:00+05:00/2004-04-05T15:34:00+05:00}, % Date with time, explicit timezone + urldate = {2004-04-25T14:34:00/2004-04-05T15:00:00}, % Datetime range } @misc{date5, note = {Seasons}, |