diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex/biblatex/examples')
109 files changed, 779 insertions, 283 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 f33b20fc517..a24060b48c9 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 18ffe824e2d..d7c6ad6b177 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 a2ee199823a..b66e6106e53 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 a3aa4ecf2cf..8aa01c35008 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 af9474c5c56..3d56b171906 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 70d1f5174f9..5281c6fab18 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 91df87addfa..76af595e3dc 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{losname}. +\keyitem{shorthands} The term <list of shorthands> or <list of abbreviations>, also available as \cmd{biblistname}. \end{keylist} \subsection*{Roles, Expressed as Functions} @@ -127,142 +127,145 @@ 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 \vrb{editor}. +\keyitem{editors} The plural form of \texttt{editor}. \keyitem{compiler} The term <compiler>, referring to an editor whose task is to compile a work. -\keyitem{compilers} The plural form of \vrb{compiler}. +\keyitem{compilers} The plural form of \texttt{compiler}. \keyitem{founder} The term <founder>, referring to a founding editor. -\keyitem{founders} The plural form of \vrb{founder}. +\keyitem{founders} The plural form of \texttt{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 \vrb{continuator}. +\keyitem{continuators} The plural form of \texttt{continuator}. \keyitem{redactor} The term <redactor>, referring to a secondary editor. -\keyitem{redactors} The plural form of \vrb{redactor}. +\keyitem{redactors} The plural form of \texttt{redactor}. \keyitem{reviser} The term <reviser>, referring to a secondary editor. -\keyitem{revisers} The plural form of \vrb{reviser}. +\keyitem{revisers} The plural form of \texttt{reviser}. \keyitem{collaborator} A term like <collaborator>, <collaboration>, <cooperator>, or <cooperation>, referring to a secondary editor. -\keyitem{collaborators} The plural form of \vrb{collaborator}. +\keyitem{collaborators} The plural form of \texttt{collaborator}. \keyitem{translator} The term <translator>. -\keyitem{translators} The plural form of \vrb{translator}. +\keyitem{translators} The plural form of \texttt{translator}. \keyitem{commentator} The term <commentator>, referring to the author of a commentary to a work. -\keyitem{commentators} The plural form of \vrb{commentators}. +\keyitem{commentators} The plural form of \texttt{commentators}. \keyitem{annotator} The term <annotator>, referring to the author of annotations to a work. -\keyitem{annotators} The plural form of \vrb{annotators}. +\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}. \end{keylist} \subsection*{Concatenated Editor Roles, Expressed as Functions} -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>. +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>. \begin{keylist} -\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}. +\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}. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{translator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{translator}\slash \prm{role} combinations: \begin{keylist} -\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}. +\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}. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{commentator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{commentator}\slash \prm{role} combinations: \begin{keylist} -\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}. +\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}. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{annotator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \prm{role} combinations: \begin{keylist} -\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}. +\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}. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations: \begin{keylist} -\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}. +\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}. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \prm{role} combinations: \begin{keylist} -\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}. +\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}. \end{keylist} \subsection*{Concatenated Translator Roles, Expressed as Functions} -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>. +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>. \begin{keylist} -\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}. +\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}. \end{keylist} % -Keys for \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations: +Keys for \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations: \begin{keylist} -\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}. +\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}. \end{keylist} % -Keys for \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations: +Keys for \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations: \begin{keylist} -\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}. +\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}. \end{keylist} \subsection*{Roles, Expressed as Actions} @@ -279,92 +282,93 @@ 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} \prm{name}>. +\keyitem{bytranslator} The expression <translated by \prm{name}> or <translated from \prm{language} by \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 \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>. +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>. \begin{keylist} -\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. +\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. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{translator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{translator}\slash \prm{role} combinations: \begin{keylist} -\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. +\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. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{commentator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{commentator}\slash \prm{role} combinations: \begin{keylist} -\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. +\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. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{annotator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \prm{role} combinations: \begin{keylist} -\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. +\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. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations: \begin{keylist} -\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. +\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. \end{keylist} % -Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations: +Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations: \begin{keylist} -\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. +\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. \end{keylist} \subsection*{Concatenated Translator Roles, Expressed as Actions} -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>. +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>. \begin{keylist} -\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. +\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. \end{keylist} % -Keys for \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations: +Keys for \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations: \begin{keylist} -\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. +\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. \end{keylist} % -Keys for \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations: +Keys for \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations: \begin{keylist} -\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. +\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. \end{keylist} \subsection*{Roles, Expressed as Objects} @@ -393,7 +397,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 \vrb{volume}. +\keyitem{volumes} The plural form of \texttt{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. @@ -437,17 +441,29 @@ 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 \vrb{page}. +\keyitem{pages} The plural form of \texttt{page}. \keyitem{column} The term <column>, referring to a column on a page. -\keyitem{columns} The plural form of \vrb{column}. +\keyitem{columns} The plural form of \texttt{column}. \keyitem{section} The term <section>, referring to a document division (usually abbreviated as \S). -\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{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{verse} The term <verse> as used when referring to a work which is cited by verse numbers. -\keyitem{verses} The plural form of \vrb{verse}. +\keyitem{verses} The plural form of \texttt{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 \vrb{line}. +\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}. \end{keylist} \subsection*{Types} @@ -486,7 +502,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 \vrb{andothers} but used to mark the truncation of a literal list. +\keyitem{andmore} Like \texttt{andothers} but used to mark the truncation of a literal list. \end{keylist} \subsection*{Labels} @@ -509,13 +525,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 \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{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{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>). @@ -532,10 +548,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 \vrb{backrefpage}, \eg\ <see pages \prm{pages}> or <cited on pages \prm{pages}>. +\keyitem{backrefpages} The plural form of \texttt{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, \vrb{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, \texttt{thiscite} p. 52.} \end{keylist} \subsection*{Month Names} @@ -560,25 +576,30 @@ 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}>: @@ -586,43 +607,48 @@ 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 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. +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. \begin{keylist} -\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}. +\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}. \end{keylist} \subsection*{Patents and Patent Requests} -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. +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. \begin{keylist} \keyitem{patent} The generic term <patent>. @@ -633,7 +659,7 @@ Strings related to patents are localized by using the term \vrb{patent} plus the \keyitem{patentus} The expression <U.S. patent>. \end{keylist} % -Patent requests are handled in a similar way, using the string \vrb{patreq} as the base name of the key: +Patent requests are handled in a similar way, using the string \texttt{patreq} as the base name of the key: \begin{keylist} \keyitem{patreq} The generic term <patent request>. @@ -644,5 +670,30 @@ Patent requests are handled in a similar way, using the string \vrb{patreq} as t \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 c34545ee458..567556f01b4 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 47bf568a175..65ed68d495a 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 b84a7f35d1b..f60de5da0ee 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 b2f9c18c6cb..aba875fad8e 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 712051a3947..58e08456c60 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 22c63c295ae..7a575e1fb9b 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 0b1eab0b116..a89227c442c 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 e949353d71d..b4509ef9a19 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 64c7490b50c..b7d080b2e9e 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 4e3892c9bb5..4d07934d4d7 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 859740ba103..1e6335fe010 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 0d21ef4ba8a..dd69e7a18f0 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 1cf20da235f..1abde4f8c67 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 c1682f3220f..ccc1ea2e8d3 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 5bbe10ae205..9157a730a2e 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 9970795004c..e8083f8abed 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 8b1916a5546..16d6eae2c7d 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 048bd097d1f..3beb20d96bb 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 1a8596fa7f9..e909a6b8cc5 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 2b542416787..4f477480363 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 cf775a28ed3..77d7d34fa4b 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 e6ef99dcda0..f9afb84a48b 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 755939de50b..5290b564ced 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 6b1c4052838..fec9b1ca679 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 c63e6c12cb6..96064cf4d05 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 8348e71851d..02eca830dd6 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 05355f6f488..c98d881c99e 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 333ae62f7d4..8b71f3b52ae 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 5b28d8097ea..c90678a8629 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 1f8138f6b1f..ef5099efbb1 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 5051790f6e9..c673ffb250a 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,6 +20,23 @@ 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} @@ -31,10 +48,8 @@ and to the \texttt{plain.bst} style of legacy BibTeX. \cite[see][59--63]{companion} \subsection*{\cmd{parencite} examples} - -% With the numeric style, the \parencite command is similar to \cite -% at first glance, but the placement of the prenote argument is -% different. +With the numeric style, \cmd{parencite} and \cmd{cite} +behave the exactly the same. This is just filler text \parencite{companion}. @@ -74,26 +89,6 @@ 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 ba1b5d9ba8e..15faf7de2fc 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 b29a5cd01f4..9d506479dfe 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 2faff053a2e..95ac00b5b16 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,6 +22,22 @@ 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 6f1c526b261..455ce302850 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 f791b452b47..fe7b4fe04c4 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 bee8deb900a..269b52f786e 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,6 +19,20 @@ 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 bc1738d3a21..19b4070c8f9 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 f05be12f4a9..b01fc96c87f 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 0da50ed6e73..9ce56a20def 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 306c33ca5f4..2f5f4f46cd8 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 37c6ff50aed..e7402b339a6 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 58d1ecec614..3d1cab0fff4 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 6100fda1830..c3ca5c77a73 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 645efd0f93f..9bb1835687e 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 c022f3ae743..678efc4fc2b 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,11 +39,13 @@ 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}) 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: +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. \begin{bibsample} \item Doe 2000 @@ -51,10 +53,12 @@ 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 -from the date label. The year will always be printed twice: +(following \texttt{date}) from the date label (following \texttt{labeldate}). +The year will always be printed twice: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000. @@ -64,12 +68,11 @@ from the date label. 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} 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: +\texttt{mergedate=minimum} omits the date whenever the full date +and the date label have exactly the same precision (date-time granularity). \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -79,11 +82,12 @@ specification will be omitted: (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 always omit the date specification if the date is a bare year -number: +It will also omit the date if it differs from the date label only by +\texttt{extradate}. \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -93,10 +97,13 @@ number: (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. It will still treat the \texttt{issue} field specially: +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: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -105,10 +112,13 @@ date labels. It will still treat the \texttt{issue} field 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. Even the -\texttt{issue} field is merged with the date label: +\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: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -116,6 +126,7 @@ date labels. It will still treat the \texttt{issue} field specially: \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 f66d4cddb6e..2dad4901830 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 2a6c22d9523..58d95db268f 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 c36503c1920..5d573bfe1be 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,11 +53,13 @@ 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}) 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: +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. \begin{bibsample} \item Doe 2000 @@ -65,10 +67,12 @@ 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 -from the date label. The year will always be printed twice: +(following \texttt{date}) from the date label (following \texttt{labeldate}). +The year will always be printed twice: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000. @@ -78,12 +82,11 @@ from the date label. 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} 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: +\texttt{mergedate=minimum} omits the date whenever the full date +and the date label have exactly the same precision (date-time granularity). \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -93,11 +96,12 @@ specification will be omitted: (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 always omit the date specification if the date is a bare year -number: +It will also omit the date if it differs from the date label only by +\texttt{extradate}. \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -107,10 +111,13 @@ number: (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. It will still treat the \texttt{issue} field specially: +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: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -119,10 +126,13 @@ date labels. It will still treat the \texttt{issue} field 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. Even the -\texttt{issue} field is merged with the date label: +\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: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -130,6 +140,7 @@ date labels. It will still treat the \texttt{issue} field specially: \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 89d7b2d1009..ff3d1116211 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 27bdcacea62..53d12135eaa 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 88c1dad39fa..c4f6b52c513 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,11 +43,13 @@ 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}) 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: +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. \begin{bibsample} \item Doe 2000 @@ -55,10 +57,12 @@ 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 -from the date label. The year will always be printed twice: +(following \texttt{date}) from the date label (following \texttt{labeldate}). +The year will always be printed twice: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000. @@ -68,12 +72,11 @@ from the date label. 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} 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: +\texttt{mergedate=minimum} omits the date whenever the full date +and the date label have exactly the same precision (date-time granularity). \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -83,11 +86,12 @@ specification will be omitted: (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 always omit the date specification if the date is a bare year -number: +It will also omit the date if it differs from the date label only by +\texttt{extradate}. \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -97,10 +101,13 @@ number: (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. It will still treat the \texttt{issue} field specially: +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: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -109,10 +116,13 @@ date labels. It will still treat the \texttt{issue} field 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. Even the -\texttt{issue} field is merged with the date label: +\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: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -120,6 +130,7 @@ date labels. It will still treat the \texttt{issue} field specially: \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 307366891af..5b80e62b595 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 d2ebc2c9008..e4ee00f4096 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 34826c6cabc..4499b8e4e42 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,11 +51,13 @@ 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}) 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: +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. \begin{bibsample} \item Doe 2000 @@ -63,10 +65,12 @@ 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 -from the date label. The year will always be printed twice: +(following \texttt{date}) from the date label (following \texttt{labeldate}). +The year will always be printed twice: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000. @@ -76,12 +80,11 @@ from the date label. 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} 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: +\texttt{mergedate=minimum} omits the date whenever the full date +and the date label have exactly the same precision (date-time granularity). \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -91,11 +94,12 @@ specification will be omitted: (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 always omit the date specification if the date is a bare year -number: +It will also omit the date if it differs from the date label only by +\texttt{extradate}. \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -105,10 +109,13 @@ number: (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. It will still treat the \texttt{issue} field specially: +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: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -117,10 +124,13 @@ date labels. It will still treat the \texttt{issue} field 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. Even the -\texttt{issue} field is merged with the date label: +\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: \begin{bibsample} \item Doe, John (2000). \emph{Book~1}. Location: Publisher. @@ -128,6 +138,7 @@ date labels. It will still treat the \texttt{issue} field specially: \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 a3f36503b21..3b3b19e7ce6 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 7bf6339b125..5f15ff6eacd 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 65a2594e2b9..c62070ad542 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 e0798845c94..2170ae0b7ca 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 6557ae9cfe1..7f94f785e57 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 901a062778e..451b88d0de6 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 a43efc0ee9d..b79ee4d0fdc 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 29aff0eb6f7..9f7c90a9790 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 989b280b2fc..53d408ef15b 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 aa5114d8f86..6c71c1e1320 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 ec637c9afc7..c0a83cb97e7 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 da1f489a2c6..7175e1e0ced 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 86ab456544c..274d8dcc424 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 b6200d81eca..8d4f6c05ded 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 bd5ca665bc1..4b2f20dc4af 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 4eade38f809..6695b328733 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 5143c24a127..e2309a41aae 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 b0fa7a526a2..bacca4c5d1f 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 d7c54c413b9..b5089769d71 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 c6d9a8a71f8..28f8ee1a008 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 d3304469720..04f844a1f9e 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 413cf5599eb..21d1e1c6b3c 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 4c61296d50c..543e2adc44e 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 22f24ec5d71..93e71e53b05 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 c28ef2b88b7..6d9a4ead25c 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 8880bf31016..23c8cca72c2 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 6ba0616a3e6..83e5e06ebc9 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 ea0a375cfae..bd75ca63e59 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 aaf8b5f40cb..9af20803ce5 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 f1b8cb20053..2c5c11ae0fa 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 c4f1194f7c1..d6e496abb50 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 adc323850fa..403a541d014 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 41965fbeded..8a6a9e26030 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 0f13851f73c..2d15a72e611 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 b45f00372bb..e955d209d39 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 207edf3b6c0..284d42d39a4 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 799b57f182e..251e27dcc27 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,6 +6,12 @@ \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 6e2ac6ea7ad..72b8c43231f 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 52661044fda..d43f2b192ae 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 -\DeclareSortingScheme{shorttitle}{ +\DeclareSortingTemplate{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 2fd7ea16e4f..6ea4cb55391 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 d94fec6e122..98bafea301b 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} +\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,patronymic,papponymic,cjk} 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 46b337c3dd1..b5e3d6fc7dc 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex @@ -1,49 +1,410 @@ \documentclass[a4paper]{article} \usepackage{fontspec} -\setmainfont{Cambria} -\setsansfont{Arial} -\setmonofont{Courier New} -\usepackage[russian]{babel} +\setmainfont{Linux Libertine O} +\setsansfont{Linux Biolinum O} +\usepackage[fallback]{xeCJK} +%\setCJKmainfont{Malgun Gothic} +\setCJKmainfont{PingFang TC}% OSX + +\usepackage[british]{babel} \usepackage{csquotes} \usepackage{filecontents} \begin{filecontents}{\jobname.bib} @book{tolstoy, - author = {given=Лев, patronymic=Николаевич, family=Толстой}, - title = {Война и мир}, - date = {1877} + 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}, } \end{filecontents} -\usepackage[style=authoryear,datamodel=93-nameparts,backend=biber]{biblatex} -\addbibresource[datatype=biblatexml]{biblatex-examples.bltxml} +\usepackage[style=authoryear,datamodel=93-nameparts,backend=biber, autolang=hyphen]{biblatex} +\addbibresource{biblatex-examples.bib} \addbibresource{\jobname.bib} -% 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{ + +% 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} + } \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 @@ -53,17 +414,26 @@ % 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 "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 +% 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 % 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 part. +% are aware of the new name parts. % -\noindent\textcite{tolstoy}\\ -\textcite{bulgakov} +\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} \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 d1c01285817..f437e48beef 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 097fa19b70e..ae391427800 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 20958c1c6c6..74d0ee9c6d8 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 -\DeclareSortingScheme{coauthor}{ +\DeclareSortingTemplate{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 bb1b005cc8e..9225227c647 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 58468b152ef..79ff773e49d 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-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 + 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 } @misc{date5, note = {Seasons}, |