diff --git a/doc/latex/biblatex/CHANGES.md b/doc/latex/biblatex/CHANGES.md index 3bcc0e66..0fd0a14a 100644 --- a/doc/latex/biblatex/CHANGES.md +++ b/doc/latex/biblatex/CHANGES.md @@ -352,7 +352,7 @@ be defined with `\DeclareEntryOption` in order for biber to recognise them and pass them out in the `.bbl`. This should not adversely affect any code using the documented - `\Decalare...Option` interface, so should be uncritical for most users. + `\Declare...Option` interface, so should be uncritical for most users. - Added `\DeclareBiblatexOption` as a convenient interface to declare the same option in different scopes. This should help avoid code duplication. For example @@ -664,7 +664,7 @@ - Fix `\mkpagetotal` - Fix issue with refcontexts not appearing in some circumstances - **DEPRECATION NOTICE** The coming update to the ISO8601 standard - supercedes the draft EDTF (Extended Date Time Format) extensions. + supersedes the draft EDTF (Extended Date Time Format) extensions. When the new ISO8601 standard is public, biblatex will therefore support the ISO8601-2 Clause 4, Level 1 Extended Format which is equivalent to the draft EDTF standard but with different syntax. This diff --git a/doc/latex/biblatex/biblatex-quickstart.tex b/doc/latex/biblatex/biblatex-quickstart.tex index 977241f8..364e2ec3 100644 --- a/doc/latex/biblatex/biblatex-quickstart.tex +++ b/doc/latex/biblatex/biblatex-quickstart.tex @@ -435,7 +435,7 @@ \section{History} \begin{itemize} \item Full Unicode support, which is lacking in all \bibtex (the program) variants to some degree \item Better, more flexible sorting algorithm -\item Customisable interface file format to allow far more options than are possible with \bibtex (the progam) +\item Customisable interface file format to allow far more options than are possible with \bibtex (the program) \end{itemize} % \biber now fulfills these goals along with a large additional feature set. \biblatex with \biber still supports (and always will) the \bibtex file format (\file{.bib}) as this is the most widely used format in the \latex world. However, it is not limited to this and supports other data formats with a modular internal design to allow relatively easy addition of other data formats. diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex index 75e205c6..f4345007 100644 --- a/doc/latex/biblatex/biblatex.tex +++ b/doc/latex/biblatex/biblatex.tex @@ -3715,7 +3715,7 @@ \subsubsection{Resources} \cmditem{addbibresource}[options]{resource} -Adds a \prm{resource}, such as a \file{.bib} file, to the default resource list. This command is only available in the preamble. It replaces the \cmd{bibliography} legacy command. Note that files must be specified with their full name, including the extension. With \biber, the resource name can be a BSD-style glob pattern. This only makes sense when resources refer to files with an absolute or relative path and does not work when looking for data resources in \biber s input/output directories or with resources located by \prm{kpsewhich} etc. When running on Windows, \biber will switch to a Windows compatible globbing mode where backslashes are also useable as path separators and case does not matter. If the resources contain duplicate entries (that is, duplicate \bibfield{entrykey}s), it is backend dependent what then happens. For example, by default \biber will ignore further occurrence of \bibfield{entrykey}s unless its \opt{--noskipduplicates} options is used. Invoke \cmd{addbibresource} multiple times to add more resources, for example: +Adds a \prm{resource}, such as a \file{.bib} file, to the default resource list. This command is only available in the preamble. It replaces the \cmd{bibliography} legacy command. Note that files must be specified with their full name, including the extension. With \biber, the resource name can be a BSD-style glob pattern. This only makes sense when resources refer to files with an absolute or relative path and does not work when looking for data resources in \biber s input/output directories or with resources located by \prm{kpsewhich} etc. When running on Windows, \biber will switch to a Windows compatible globbing mode where backslashes are also usable as path separators and case does not matter. If the resources contain duplicate entries (that is, duplicate \bibfield{entrykey}s), it is backend dependent what then happens. For example, by default \biber will ignore further occurrence of \bibfield{entrykey}s unless its \opt{--noskipduplicates} options is used. Invoke \cmd{addbibresource} multiple times to add more resources, for example: \begin{ltxexample} \addbibresource{bibfile1.bib} @@ -3943,7 +3943,7 @@ \subsubsection{Bibliography Lists} \cmditem{printbiblist}[key=value, \dots]{biblistname} -This command prints a bibliography list. It takes an optional argument, which is a list of options given in \keyval notation. Valid options are all options supported by \cmd{printbibliography} (\secref{use:bib:bib}) except \opt{resetnumbers} and \opt{omitnumbers}. Additionaly, the two options \opt{driver} and \opt{biblistfilter} are available. If there are any \env{refsection} environments in the document, the bibliography list will be local to these environments; see \secref{use:bib:sec} for details. By default, this command uses the heading \texttt{biblist}. See \secref{use:bib:hdg} for details. +This command prints a bibliography list. It takes an optional argument, which is a list of options given in \keyval notation. Valid options are all options supported by \cmd{printbibliography} (\secref{use:bib:bib}) except \opt{resetnumbers} and \opt{omitnumbers}. Additionally, the two options \opt{driver} and \opt{biblistfilter} are available. If there are any \env{refsection} environments in the document, the bibliography list will be local to these environments; see \secref{use:bib:sec} for details. By default, this command uses the heading \texttt{biblist}. See \secref{use:bib:hdg} for details. The \prm{biblistname} is a mandatory argument which names the bibliography list. This name is used to identify: @@ -4347,7 +4347,7 @@ \subsubsection{Reference Contexts} \item The citation of entry \bibfield{misc} would draw its data from the reference context with \opt{sorting=ydnt} \end{itemize} % -In cases where the user has entries which occur in multiple bibliographies in different forms or with potentially different labels (in a numeric scheme with different \bibfield{labelprefix} values for example), it may be necessary to tell \biblatex from which reference context you wish to draw the citation information. As shown above this can be done by explicitly putting citations inside reference contexts. This can be onerous in a large document and so there is specific functionality for assigning citations to reference contexts programatically, see the \cmd{assignrefcontext*} macros below. +In cases where the user has entries which occur in multiple bibliographies in different forms or with potentially different labels (in a numeric scheme with different \bibfield{labelprefix} values for example), it may be necessary to tell \biblatex from which reference context you wish to draw the citation information. As shown above this can be done by explicitly putting citations inside reference contexts. This can be onerous in a large document and so there is specific functionality for assigning citations to reference contexts programmatically, see the \cmd{assignrefcontext*} macros below. \begin{ltxsyntax} @@ -4700,7 +4700,7 @@ \subsubsection{Text Commands} \cmditem*{Citeauthor*}[prenote][postnote]{key} These commands print the authors. Strictly speaking, it prints the \bibfield{labelname} list, which may be the -\bibfield{author}, the \bibfield{editor}, or the \bibfield{translator}. \cmd{Citeauthor} is similar to \cmd{citeauthor} but capitalizes the name prefix of the first name in the citation if the \opt{useprefix} option is enabled, provided that there is a name prefix. The starred variants effectively force maxcitenames to 1 for just this command on so only print the first name in the labelname list (potentially followed by the «et al» string if there are more names). This allows more natural textual flow when refering to a paper in the singular when otherwise \cmd{citeauthor} would generate a (naturally plural) list of names. +\bibfield{author}, the \bibfield{editor}, or the \bibfield{translator}. \cmd{Citeauthor} is similar to \cmd{citeauthor} but capitalizes the name prefix of the first name in the citation if the \opt{useprefix} option is enabled, provided that there is a name prefix. The starred variants effectively force maxcitenames to 1 for just this command on so only print the first name in the labelname list (potentially followed by the «et al» string if there are more names). This allows more natural textual flow when referring to a paper in the singular when otherwise \cmd{citeauthor} would generate a (naturally plural) list of names. \cmditem{citetitle}[prenote][postnote]{key} \cmditem*{citetitle*}[prenote][postnote]{key} @@ -5404,7 +5404,7 @@ \subsubsection{Context-sensitive Delimiters} \cmditem{DeclareDelimAlias}[alias context, \dots]{alias}[delim context]{delim} -Declares \prm{alias} to be an alias for the delimiter \prm{delim}. If the optional \prm{alias context, \dots} nor \prm{delim context} are given, the assigment is performed for all existing contexts of the target \prm{delim} separately, so that \prm{alias} becomes an exact copy of \prm{delim} in all contexts. If only the second optional argument \prm{delim context} is given, all existing contexts of \prm{alias} will be cleared and the global/empty context becomes an alias of \prm{delim} in the context \prm{delim context}. The first optional argument \prm{alias context, \dots} may hold a list of contexts for which the alias is assigned. In that case the second optional argument \prm{delim context} specifies the context of the target delimiter. This argument may not be a list, it can only hold one context. If it is missing, the \prm{alias context} is assumed (if \prm{alias context} is a list, the assignment is performed separately for each list item), if it is empty the global context is used. +Declares \prm{alias} to be an alias for the delimiter \prm{delim}. If the optional \prm{alias context, \dots} nor \prm{delim context} are given, the assignment is performed for all existing contexts of the target \prm{delim} separately, so that \prm{alias} becomes an exact copy of \prm{delim} in all contexts. If only the second optional argument \prm{delim context} is given, all existing contexts of \prm{alias} will be cleared and the global/empty context becomes an alias of \prm{delim} in the context \prm{delim context}. The first optional argument \prm{alias context, \dots} may hold a list of contexts for which the alias is assigned. In that case the second optional argument \prm{delim context} specifies the context of the target delimiter. This argument may not be a list, it can only hold one context. If it is missing, the \prm{alias context} is assumed (if \prm{alias context} is a list, the assignment is performed separately for each list item), if it is empty the global context is used. \begin{ltxexample}[style=latex] @@ -6206,7 +6206,7 @@ \subsubsection{Entry Sets} \item (Optional) A valid 1-based index into a list/name field in the source \bibtype {xdata} entry \end{enumerate} % -There are \opt{--output-*} variants of the above options for \biber tool mode output so that these separators and markers can be programatically changed. Taking the example above, this \bibtype{book} would resolve to: +There are \opt{--output-*} variants of the above options for \biber tool mode output so that these separators and markers can be programmatically changed. Taking the example above, this \bibtype{book} would resolve to: \begin{lstlisting}[style=bibtex]{} @Book{..., @@ -7930,7 +7930,7 @@ \subsubsection{Data Commands} \DeclareFieldInputHandler{volumes}{\def\NewValue{}} \end{ltxexample} % -Generally, you would want to use \cmd{DeclareSourcemap} (see \secref{aut:ctm:map}) to remove and modify fields but this alternative method may be useful in some circumstances when the emphasis is on appearance rather than data since the \prm{code} can be arbitraty \tex. +Generally, you would want to use \cmd{DeclareSourcemap} (see \secref{aut:ctm:map}) to remove and modify fields but this alternative method may be useful in some circumstances when the emphasis is on appearance rather than data since the \prm{code} can be arbitrary \tex. In general, \cmd{DeclareFieldInputHandler} should not be used to apply formatting to a field, since that should happen with \cmd{DeclareFieldFormat}, so the following is just a toy example that shows how \cmd{DeclareFieldInputHandler} works. @@ -8713,7 +8713,7 @@ \subsubsection{Dynamic Modification of Data} } \end{ltxexample} % -Here, a clone of an entry from the specified data source will be created. The entry key of the clone will be the same as the original but prefixed by the value of the \texttt{entryclone} parameter. The cloned entry would still need to be cited in the document using its new entry key. This type of mapping step should be used with care as it may produce labelling problems in authoryear styles which use, for example, \opt{extradate}. One use case is for numeric styles which contain multiple bibliographies containing the same entry. In this case, you may need different bibliography number labeld for the same entry and this is very tricky when there is only one entry which needs different labels. Creating clones with different entry keys solves this problem. +Here, a clone of an entry from the specified data source will be created. The entry key of the clone will be the same as the original but prefixed by the value of the \texttt{entryclone} parameter. The cloned entry would still need to be cited in the document using its new entry key. This type of mapping step should be used with care as it may produce labelling problems in authoryear styles which use, for example, \opt{extradate}. One use case is for numeric styles which contain multiple bibliographies containing the same entry. In this case, you may need different bibliography number labels for the same entry and this is very tricky when there is only one entry which needs different labels. Creating clones with different entry keys solves this problem. \begin{ltxexample} \DeclareSourcemap{ @@ -10652,11 +10652,11 @@ \subsubsection{Stand-alone Tests} \cmditem{ifcrossrefsource}{true}{false} -Expands to \prm{true} if the entry was inclued in the \file{.bbl} due to being referenced more than \opt{mincrossrefs} times and false otherwise. See \secref{use:opt:pre:gen}. Also expands to false if the entry was directly cited. +Expands to \prm{true} if the entry was included in the \file{.bbl} due to being referenced more than \opt{mincrossrefs} times and false otherwise. See \secref{use:opt:pre:gen}. Also expands to false if the entry was directly cited. \cmditem{ifxrefsource}{true}{false} -Expands to \prm{true} if the entry was inclued in the \file{.bbl} due to being referenced more than \opt{minxrefs} times and false otherwise. See \secref{use:opt:pre:gen}. Also expands to false if the entry was directly cited. +Expands to \prm{true} if the entry was included in the \file{.bbl} due to being referenced more than \opt{minxrefs} times and false otherwise. See \secref{use:opt:pre:gen}. Also expands to false if the entry was directly cited. \cmditem{ifsingletitle}{true}{false} @@ -10971,7 +10971,7 @@ \subsubsection{Miscellaneous Commands} \cmditem{letbibmacro}{alias}{name} \cmditem*{letbibmacro*}{alias}{name} -This command defines the macro \prm{alias} to be an alias of the macro \prm{name}. The definition is perfomed by \cmd{csletcs}. +This command defines the macro \prm{alias} to be an alias of the macro \prm{name}. The definition is performed by \cmd{csletcs}. An error is issued if \prm{name} is undefined. The regular variant of this command sanitizes \prm{name} while the starred variant does not. @@ -13498,11 +13498,11 @@ \subsubsection{File hooks} \begin{ltxsyntax} \cmditem{blx@filehook@preload@$<$filename with extension$>$} -If \file{$<$filename with extension$>$} is found, this hook is exected before it is loaded. +If \file{$<$filename with extension$>$} is found, this hook is executed before it is loaded. \cmditem{blx@filehook@postload@$<$filename with extension$>$} -If \file{$<$filename with extension$>$} is found, this hook is exected after it is loaded. +If \file{$<$filename with extension$>$} is found, this hook is executed after it is loaded. \cmditem{blx@filehook@failure@$<$filename with extension$>$} @@ -13521,11 +13521,11 @@ \subsubsection{File hooks} \begin{ltxsyntax} \cmditem{blx@lbxfilehook@once@preload@$<$filename with extension$>$} -If \file{$<$filename with extension$>$} is found, this hook is exected before it is loaded in a situation where the \file{.lbx} files are loaded only once. +If \file{$<$filename with extension$>$} is found, this hook is executed before it is loaded in a situation where the \file{.lbx} files are loaded only once. \cmditem{blx@lbxfilehook@once@postload@$<$filename with extension$>$} -If \file{$<$filename with extension$>$} is found, this hook is exected after it is loaded in a situation where the \file{.lbx} files are loaded only once. +If \file{$<$filename with extension$>$} is found, this hook is executed after it is loaded in a situation where the \file{.lbx} files are loaded only once. \cmditem{blx@lbxfilehook@once@failure@$<$filename with extension$>$} @@ -13533,11 +13533,11 @@ \subsubsection{File hooks} \cmditem{blx@lbxfilehook@simple@preload@$<$filename with extension$>$} -If \file{$<$filename with extension$>$} is found, this hook is exected before it is loaded in a situation where the \file{.lbx} files may be loaded multiple times. +If \file{$<$filename with extension$>$} is found, this hook is executed before it is loaded in a situation where the \file{.lbx} files may be loaded multiple times. \cmditem{blx@lbxfilehook@simple@postload@$<$filename with extension$>$} -If \file{$<$filename with extension$>$} is found, this hook is exected after it is loaded in a situation where the \file{.lbx} files may be loaded multiple times. +If \file{$<$filename with extension$>$} is found, this hook is executed after it is loaded in a situation where the \file{.lbx} files may be loaded multiple times. \cmditem{blx@lbxfilehook@simple@failure@$<$filename with extension$>$} @@ -16463,8 +16463,8 @@ \section{Revision History} %\item Added \cmd{Citeauthor}\see{use:cit:txt} %\item Added \cmd{nameyeardelim}\see{use:fmt:fmt} %\item Added \cmd{multilistdelim}\see{use:fmt:fmt} -%\item Completed documenation\see{use:fmt:fmt} -%\item Completed documenation\see{aut:fmt:fmt} +%\item Completed documentation\see{use:fmt:fmt} +%\item Completed documentation\see{aut:fmt:fmt} %\item Added \cmd{usecitecmd}\see{aut:cbx:cbx} %\item Added \cmd{hyphenate}\see{use:fmt:aux} %\item Added \cmd{hyphen}\see{use:fmt:aux} diff --git a/doc/latex/biblatex/examples/04-delimiters.tex b/doc/latex/biblatex/examples/04-delimiters.tex index 29b1450f..af8dcae4 100644 --- a/doc/latex/biblatex/examples/04-delimiters.tex +++ b/doc/latex/biblatex/examples/04-delimiters.tex @@ -16,7 +16,7 @@ \DeclareDelimFormat{testc}{D} \DeclareDelimFormat[testccontext]{testc}{E} \makeatletter -% Some of these tests generate definition warnins which we don't want in tests +% Some of these tests generate definition warnings which we don't want in tests \def\blx@warn@delimdeclare#1#2{\relax} \makeatother \begin{document} diff --git a/doc/latex/biblatex/examples/50-style-authoryear.tex b/doc/latex/biblatex/examples/50-style-authoryear.tex index 678efc4f..b6658030 100644 --- a/doc/latex/biblatex/examples/50-style-authoryear.tex +++ b/doc/latex/biblatex/examples/50-style-authoryear.tex @@ -160,7 +160,7 @@ \subsection*{\cmd{parencite*} examples} \subsection*{\cmd{footcite} examples} % Even though the author-year scheme is usually employed in -% conjuntion with in-text citations, it works just fine in +% conjunction with in-text citations, it works just fine in % footnotes, too. This is just filler text.\footcite{companion} diff --git a/doc/latex/biblatex/examples/97-annotations.tex b/doc/latex/biblatex/examples/97-annotations.tex index a756b7ce..f5da902b 100644 --- a/doc/latex/biblatex/examples/97-annotations.tex +++ b/doc/latex/biblatex/examples/97-annotations.tex @@ -33,7 +33,7 @@ \hasfieldannotation[][german]{\mkbibparens{\getfieldannotation[][german]}}{}} \begin{document} -The annotation feature allows the user to attache metadata, either in the +The annotation feature allows the user to attach metadata, either in the form of strings to be tested for in formatting commands, or in the form of strings to be printed as-is. This example demonstrates all aspects of the annotation feature: diff --git a/tex/latex/biblatex/biblatex.def b/tex/latex/biblatex/biblatex.def index 210fb6a1..ced40a14 100644 --- a/tex/latex/biblatex/biblatex.def +++ b/tex/latex/biblatex/biblatex.def @@ -1260,7 +1260,7 @@ % We also use \ifuseprefix to ensure that the name prefix is handled % properly. \actualoperator is the so-called actual operator, as % defined by the 'actual' specifier in the .ist file. The makeindex -% program will use the part preceeding the \actualoperator +% program will use the part preceding the \actualoperator % delimiter for sorting. The part after the delimiter is used as the % index is printed. Note that this is not specific to biblatex, see % the makeindex documentation for details. diff --git a/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty index 602d7d70..e31f45eb 100644 --- a/tex/latex/biblatex/biblatex.sty +++ b/tex/latex/biblatex/biblatex.sty @@ -789,7 +789,7 @@ % {}{}{} % will contain the bit of -% before the last occurence of +% before the last occurrence of \protected\def\blx@stripfromendinto#1#2#3{% \begingroup \edef\blx@tempa{\endgroup @@ -800,7 +800,7 @@ %% Allocation -% Counter to track nested tabularx environemnts so we don't +% Counter to track nested tabularx environments so we don't % try to patch the commands more than once below as this undefs some % macros and an error is thrown \newcounter{tabx@nest} @@ -1700,7 +1700,7 @@ % 1007/3001 exclamation mark % 1008/3002 question mark % 1009 suppress punctuation -% 1010 new paragaph +% 1010 new paragraph \mathchardef\blx@sf@prefixchar=1001% e.g. apostrophe or equivalent for prefix handling \mathchardef\blx@sf@dot=1002 @@ -3917,7 +3917,7 @@ {\blx@declaredelimalias@omom[{#1}]{#2}} {\blx@declaredelimalias@omm[{#1}]{#2}}} -% hrmpf ... remember that \docsvlist doesn't do anthing for empty +% hrmpf ... remember that \docsvlist doesn't do anything for empty % lists/list items \def\blx@declaredelimalias@omom[#1]#2[#3]#4{% \ifstrequal{#1}{*} @@ -4279,7 +4279,7 @@ % Then, \blx@defformat@d is defined by calling % \def\blx@defformat@d#1{format body} -% []{}{} +% []{}{} \newrobustcmd*{\DeclareNameFormat}{% \@ifstar {\blx@defformat\blx@defnameformat{nfd}*} @@ -6640,11 +6640,11 @@ \stripzeros \forcezerosy \forcezerosmdt \mkyearzeros \mkmonthzeros \mkdayzeros \mktimezeros} -% User macro for retrieving currrent language +% User macro for retrieving current language \def\currentlang{\blx@languagename} % We need to be able to prefix \providetoggle with \global, -% plus we don't need the testing from \providetoggle anway. +% plus we don't need the testing from \providetoggle anyway. % This uses internal implementation details of etoolbox's % toggles, so is a bit meh, but it's better than rolling our own % version of toggles just for that. @@ -7210,7 +7210,7 @@ \listxadd\blx@datetypes{\blx@datetype}} \abx@dodates % main date field has an empty prefix (''date) which can't be added to a list -% and so do it explicity +% and so do it explicitly % This is one of the few (only?) hard-coded datamodel assumptions but it is % very unlikely that anyone would *remove* the main date field in a custom application ... \def\abx@dodatetypes{\do{}\dolistloop\blx@datetypes} @@ -8328,7 +8328,7 @@ \def\blx@adjustyears{% % All dates by default are output from biber in astronomical era with a year 0 - % So, if we are ouputting BCE/BC era, we need to adjust the years by +1 + % So, if we are outputting BCE/BC era, we need to adjust the years by +1 \def\do##1{% \ifdefstring\blx@dateera{astronomical} {}