texlive[56853] Master/texmf-dist: biblatex-sbl (4nov20)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 4 22:35:59 CET 2020
Revision: 56853
http://tug.org/svn/texlive?view=revision&revision=56853
Author: karl
Date: 2020-11-04 22:35:59 +0100 (Wed, 04 Nov 2020)
Log Message:
-----------
biblatex-sbl (4nov20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/README.md
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-examples.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-examples.tex
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.bib
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/american-sbl.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/english-sbl.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/german-sbl.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-sbl/spanish-sbl.lbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/README.md 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/README.md 2020-11-04 21:35:59 UTC (rev 56853)
@@ -50,7 +50,7 @@
## Licence
```
-Copyright 2015-2018 David Purton
+Copyright 2015-2020 David Purton
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-examples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-examples.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-examples.tex 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-examples.tex 2020-11-04 21:35:59 UTC (rev 56853)
@@ -11,7 +11,7 @@
\usepackage{listings}
\usepackage{imakeidx}
\makeindex[title=Author Index,intoc,options=-q]
-\usepackage[style=sbl,indexing=cite,idemtracker=false,ibidtracker=false]{biblatex}
+\usepackage[style=sbl,indexing=cite]{biblatex}
\usepackage{hyperref}
\addbibresource{biblatex-sbl.bib}
@@ -176,7 +176,7 @@
revdauthor,revdtitle,revdeditor,institution,type,shorthand,xref,%
note,eprintdate,volumes,shortmaintitle,options,eprintclass,relatedoptions,%
editortype,crossref,editora,editorb,editorc,editoratype,editorbtyle,%
- editorctype,entrysubtype,sortkey,titleaddon,witheditor,witheditortype,%
+ editorctype,entrysubtype,sorttitle,titleaddon,witheditor,witheditortype,%
withtranslator,withtranslatortype,eventtitle,venue,eventdate,shortauthor%
},
sensitive=false,
@@ -2117,7 +2117,6 @@
date = {1994},
shorthand = {ANF},
options = {useeditor=false,skipbiblist},
- sortkey = {Ante-Nicene Fathers},
xref = {ANF:abbreviation}
}
@@ -2155,7 +2154,6 @@
date = {1994},
shorthand = {NPNF\textsuperscript{1}},
options = {useeditor=false,skipbiblist},
- sortkey = {Nicene and Post-Nicene Fathers, Series 1},
xref = {NPNF1:abbreviation}
}
@@ -2193,7 +2191,7 @@
editor = {Migne, J.-P.},
volumes = {217},
location = {Paris},
- date = {1844/1864},
+ date = {1844/1855},
shorthand = {PL}
}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex 2020-11-04 21:35:59 UTC (rev 56853)
@@ -9,7 +9,7 @@
\usepackage{imakeidx}
\makeindex[title=Author Index,intoc,options=-q]
\usepackage{hyperref}
-\usepackage[style=sbl,indexing=cite]{biblatex}
+\usepackage[style=sbl,indexing=cite,ibidtracker=constrict,idemtracker=citation]{biblatex}
\addbibresource{biblatex-sbl.bib}
\setmonofont{DejaVu Sans Mono}[Scale=MatchLowercase]
@@ -147,16 +147,25 @@
\maketitle
This file tests the behaviour of the various options related to using
-\emph{ibidem} and \emph{idem} in Biblatex-SBL.
+\emph{ibidem} and \emph{idem} in Biblatex-SBL. By default neither
+\emph{ibidem} nor \emph{idem} are used.\footnote{See
+\url{https://sblhs2.com/2018/02/01/cms-update-ibid/}.} When referencing
+multiple works by the same author within a footnote, subsequent references use
+only the family name of the author.\footnote{See
+\url{https://sblhs2.com/2016/10/11/placement-citations-traditional/}.} This
+corresponds to the \verb|biblatex| option \verb|idemtracker=sbl|.
-\section*{Default \emph{ibidem} tracking}
+\section*{Using \emph{ibidem}}
By default ibid.\@ is not used across page breaks and \emph{ibidem} is taken
-to mean ‘same author + same title’. See \texttt{biblatex-sbl.pdf} for a
-description of the options \texttt{ibidtracker} can take.
+to mean ‘same author + same title + same page’.\footnote{See
+\url{https://sblhs2.com/2017/01/05/subsequent-bibliographic-references/}.} See
+\texttt{biblatex-sbl.pdf} for a description of the options
+\texttt{ibidtracker} can take. It is recommended to use
+\verb|ibidtracker=constrict| for SBL compliance.
\begin{biboutput}
- \samplemacro{\textbackslash usepackage[style=sbl]\{biblatex\}}
+ \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict]\{biblatex\}}
\samplecite{1}[127]{talbert:1992}
\samplecite{2}[22]{talbert:1992}
\samplecite{3}[22]{talbert:1992}
@@ -167,17 +176,15 @@
\samplecite{6}[22]{talbert:1992}
\end{biboutput}
-\section*{Not tracking \emph{ibidem} across pages}
+\section*{Using \emph{ibidem} across pages}
-\boolfalse{pagetracker}
-
-Set the \texttt{pagetracker} option to \texttt{false} to allow that the first
+Set the \texttt{pagetracker} option to \texttt{false} to allow the first
citation on a page to be ibid.
\boolfalse{pagetracker}
\begin{biboutput}
- \samplemacro{\textbackslash usepackage[style=sbl,pagetracker=false]\{biblatex\}}
+ \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,pagetracker=false]\{biblatex\}}
\samplecite{7}[53]{scott+etal:1993}
\samplecite{8}[42]{scott+etal:1993}
\samplemacro{\textbackslash clearpage}
@@ -185,33 +192,34 @@
\samplecite{9}[42]{scott+etal:1993}
\end{biboutput}
-\section*{\emph{Ibidem} meaning ‘same author + same title + same page’}
+\section*{\emph{Ibidem} meaning ‘same author + same title’}
-Turn on the \texttt{ibidpage} option to indicate that \emph{ibidem} should
-mean ‘same author + same title + same page’.
+Turn off the \texttt{ibidpage} option to indicate that \emph{ibidem} should
+mean ‘same author + same title’.
\makeatletter
-\let\blx at imc@ifloccit\blx at ifloccit@global
-\let\blx at loccittracker\blx at loccittracker@global
-\let\blx at loccitreset\blx at loccitreset@global
+\blx at opt@loccittracker at false
\makeatother
\begin{biboutput}
- \samplemacro{\textbackslash usepackage[style=sbl,ibidpage]\{biblatex\}}
+ \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,ibidpage=false]\{biblatex\}}
\samplecite{10}[28]{egger:1996}
\samplecite{11}[28]{egger:1996}
\samplecite{12}[291]{egger:1996}
\end{biboutput}
-\section*{Default \emph{idem} tracking}
+\section*{Using \emph{idem}}
-By default \emph{idem} is used. \emph{Idem} tracking is controlled using the
-\texttt{idemtracker} option. See \texttt{biblatex-sbl.pdf} for a description
-of the options \texttt{idemtracker} can take.
+By default \emph{idem} is not used. Rather only the family name of the author
+is given for subsequent references when works by the same author are cited
+within a single footnote. \emph{Idem} tracking is controlled using
+the \texttt{idemtracker} option. See \texttt{biblatex-sbl.pdf} for a
+description of the options \texttt{idemtracker} can take. To comply with SBL
+style, \verb|idemtracker=citation| should be used.\footnote{See
+\url{https://sblhs2.com/2017/01/10/idem/}.}
\begin{biboutput}
- \samplemacro{\textbackslash usepackage[style=sbl]\{biblatex\}}
- \makeatletter\blx at opt@idemtracker at constrict\makeatother
+ \samplemacro{\textbackslash usepackage[style=sbl,idemtracker=citation]\{biblatex\}}
\samplemacro{\textbackslash autocites[35]\{vanseters:1997\}\{vanseters:1995\}}
\color{biblatex-colour}
\hspace*{\bibindent}13.~\cites[35]{vanseters:1997}{vanseters:1995}.
@@ -218,10 +226,10 @@
\color{black}
\samplemacro{\textbackslash
autocites[35]\{vanseters:1997\}[222]\{vanseters:1995\}}
- \makeatletter\blx at idemreset\makeatother
\color{biblatex-colour}
\hspace*{\bibindent}14.~\cites[35]{vanseters:1997}[222]{vanseters:1995}.
\color{black}
+ \samplecite{15}[35]{vanseters:1997}
\end{biboutput}
\printbibliography
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.bib 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.bib 2020-11-04 21:35:59 UTC (rev 56853)
@@ -976,7 +976,6 @@
date = {1994},
shorthand = {ANF},
options = {useeditor=false,skipbiblist},
- sortkey = {Ante-Nicene Fathers},
xref = {ANF:abbreviation}
}
@@ -1004,7 +1003,6 @@
date = {1994},
shorthand = {NPNF\textsuperscript{1}},
options = {useeditor=false,skipbiblist},
- sortkey = {Nicene and Post-Nicene Fathers, Series 1},
xref = {NPNF1:abbreviation}
}
@@ -1032,7 +1030,7 @@
editor = {Migne, J.-P.},
volumes = {217},
location = {Paris},
- date = {1844/1864},
+ date = {1844/1855},
shorthand = {PL}
}
@@ -1330,9 +1328,14 @@
date = {2015-02},
url = {https://www.sbl-site.org/assets/pdfs/pubs/SBLHSsupp2015-02.pdf},
options = {useauthor=false,useeditor=false},
- sortkey = {Student Supplement for the SBL Handbook of Style, Second Edition}
}
+ at periodical{sblhs2.com,
+ title = {SBL Handbook of Style},
+ subtitle = {Explanations, Clarifications, and Expansions},
+ url = {https://sblhs2.com}
+}
+
@mvbook{sasson:2000,
editor = {Sasson, Jack M.},
title = {Civilizations of the Ancient Near East},
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex 2020-11-04 21:35:59 UTC (rev 56853)
@@ -11,7 +11,7 @@
\usepackage{framed}
\usepackage{enumitem}
-\usepackage[style=sbl,indexing=cite,idemtracker=false,ibidtracker=false]{biblatex}
+\usepackage[style=sbl,indexing=cite]{biblatex}
\addbibresource{biblatex-sbl.bib}
\hypersetup{colorlinks,citecolor=spot}
@@ -143,15 +143,16 @@
\biblatexsbl provides support to \biblatex and LaTeX for citations,
bibliography, and a list of abbreviations in the style recommended by the
Society of Biblical Literature (\citeshorthand{SBL}). The style conforms to
-the second edition of the \cite{SBLHS}.
+the second edition of the \cite{SBLHS} and includes updates from the
+\citetitle*{sblhs2.com} blog \autocite{sblhs2.com}.
-The style supports all examples given in the handbook (see
-\sty{biblatex-sbl-examples.pdf}). Shorthand citations and a list of
-abbreviations containing journals, series, and shorthands are handled
-automatically. Repeated authors in the bibliography are replaced by a
-horizontal line. \emph{Ibidem} and \emph{idem} is enabled by default. Indexing
-of names is supported, but not enabled by default. Only note style citations,
-not Author-Date citations are supported. Primary sources can be cited in
+The style supports all examples given in the handbook and any relevant updates
+given on the Blog (see \sty{biblatex-sbl-examples.pdf}). Shorthand citations
+and a list of abbreviations containing journals, series, and shorthands are
+handled automatically. Repeated authors in the bibliography are replaced by a
+horizontal line. \emph{Ibidem}, \emph{idem} and indexing of names are
+supported, but not enabled by default. Only note style citations,
+not Author-Date citations, are supported. Primary sources can be cited in
parentheses. \biblatexsbl is compatible with \biblatex's support for
\sty{hyperref}.
@@ -211,7 +212,7 @@
\begin{quote}
\begin{lstlisting}[style=latex]{}
-\usepackage[nil,bidi=default]{babel}
+\usepackage[nil,bidi=default]{babel}% consider bidi=basic for lualatex
\usepackage{csquotes}
\babelprovide[import=en-US,main]{american}
\babelprovide[import=he]{hebrew}
@@ -275,17 +276,35 @@
\sampleparencite[2.233-235]{josephus:ant}
\end{snugshade}
-\cmditem{journalcite}{key}
-\cmditem{seriescite}{key}
-\cmditem{shorthandcite}{key}
+\cmditem{citefullauthor}[prenote][postnote]{key}
+\cmditem{citefullauthor*}[prenote][postnote]{key}
+\cmditem{Citefullauthor}[prenote][postnote]{key}
+\cmditem{Citefullauthor*}[prenote][postnote]{key}
-\cmd{journalcite}, \cmd{seriescite}, and \cmd{shorthandcite} inserts the
+These commands print the full names of the authors. Strictly speaking, it
+prints the \bibfield{labelname} list in the format of a first citation, which
+may be the \bibfield{author}, the \bibfield{editor}, or the
+\bibfield{translator}. \cmd{Citefullauthor} is similar to \cmd{citefullauthor}
+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 \opt{maxcitenames} to 1 for just this
+command on so only print the first name in the \bibfield{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{citefullauthor} would generate a (naturally plural) list
+of names.
+
+\cmditem{citejournal}{key}
+\cmditem{citeseries}{key}
+\cmditem{citeshorthand}{key}
+
+\cmd{citejournal}, \cmd{citeseries}, and \cmd{citeshorthand} inserts the
respective abbreviation into the text and also adds it to the list of
abbreviations. The abbreviation is hyperlinked to the list of abbreviations if
the \sty{hyperref} package is loaded.
-These commands ignore the \bibfield{prenote} and \bibfield{postnote} fields,
-so can safely be used anywhere within a database entry.
+These commands do not take a \bibfield{prenote} or \bibfield{postnote} field,
+and can safely be used nested within a citation.
\cmditem{printbiblist}
@@ -316,8 +335,8 @@
\optitem[false]{accessdate}{\opt{true}, \opt{false}}
The \cite{SBLHS} discourages the use of access
-dates.\autocite[See][§6.1.6, 84]{SBLHS} If they are required this option can be
-passed to \biblatex.
+dates \autocite[See][§6.1.6, 84]{SBLHS}. If they are required this option can
+be passed to \biblatex.
\optitem[sbl]{citepages}{\opt{sbl}, \opt{permit}, \opt{omit}, \opt{separate}}
@@ -341,7 +360,7 @@
The one exception to this is the \bibtype{incommentary} entry type which
always sets \opt{citepages} to \opt{omit} (see below) when \bibfield{volume}
- is defined.\autocite[See][§1.3.3.2]{SBLHS:studentsupp}
+ is defined \autocite[See][§1.3.3.2]{SBLHS:studentsupp}.
\item[permit] The \bibfield{postnote} is printed in parentheses after the
\bibfield{pages} field. e.g.,
@@ -397,7 +416,7 @@
The \emph{Student Supplement for the} \cite{SBLHS} permits two styles for the
bibliography entry for Bible dictionaries, encyclopaedias, and multivolume
commentaries for the entire Bible by multiple
-authors.\autocite[4–5]{SBLHS:studentsupp}
+authors \autocite[4–5]{SBLHS:studentsupp}.
This option applies to \bibtype{inreference} and \bibtype{incommentary}
entry types.
@@ -419,7 +438,7 @@
\end{snugshade}
\end{valuelist}
-\optitem[constrict]{ibidtracker}{\opt{true}, \opt{false}, \opt{context},
+\optitem[false]{ibidtracker}{\opt{true}, \opt{false}, \opt{context},
\opt{strict}, \opt{constrict}}
This option controls the \emph{ibidem} tracker. The possible choices are:
@@ -444,17 +463,19 @@
the same footnote or in immediately consecutive footnotes.
\end{valuelist}
-\boolitem[false]{ibidpage}
+\boolitem[true]{ibidpage}
The scholarly abbreviation \emph{ibidem} is sometimes taken to mean both ‘same
author + same title’ and ‘same author + same title + same page’ in traditional
-citation schemes. By default, this is not the case with this style because it
-may lead to ambiguous citations. If you prefer the wider interpretation of
-\emph{ibidem}, set the package option \opt{ibidpage=true} or simply
-\opt{ibidpage} in the preamble. The default setting is \opt{ibidpage=false}.
+citation schemes. In line with SBL recommendations, this style uses the
+latter.\footnote{See
+\url{https://sblhs2.com/2017/01/05/subsequent-bibliographic-references/}.} If
+you prefer the narrower interpretation of \emph{ibidem}, set the package
+option \opt{ibidpage=false} in the preamble. The default setting is
+\opt{ibidpage=true}.
-\optitem[constrict]{idemtracker}{\opt{true}, \opt{false}, \opt{context},
-\opt{strict}, \opt{constrict}}
+\optitem[sbl]{idemtracker}{\opt{true}, \opt{false}, \opt{context},
+\opt{strict}, \opt{constrict}, \opt{citation}, \opt{sbl}}
This option controls the \emph{idem} tracker. The possible choices are:
@@ -470,7 +491,12 @@
\item[constrict] This mode is similar to \opt{context} with one additional
condition: a reference in a footnote will only be considered as unambiguous
if the current citation and the previous citation are given in the same
- footnote.
+ footnote or in immediately consecutive footnotes.
+\item[citation] This option only allows \emph{idem} within a citation or
+ footnote. This is the preferred option if you intend to use \emph{idem}.
+\item[sbl] This option is similar to \opt{citation}, but does not actually
+ use \emph{idem}. Rather, it uses the author family name in subsequent
+ citations. This is the default option to comply with SBL style.
\end{valuelist}
\optitem[true]{pagetracker}{\opt{true}, \opt{false}}
@@ -886,6 +912,10 @@
This field holds the year component of the \bibfield{eprintdate} field.
+\listitem{mainauthor}{name}
+
+The author(s) of the \bibfield{maintitle}.
+
\listitem{maineditor}{name}
The editor(s) of the \bibfield{maintitle}.
@@ -966,6 +996,14 @@
The \bibfield{title} in abridged form. This is printed instead of the full
title on subsequent citations.
+\fielditem{sorttitle}{literal}
+
+A field used to modify the sorting order of the bibliography. If present, this
+field is used instead of the title field when sorting the bibliography. This
+field is automatically populated if it doesn't exist and the \bibfield{title}
+field begins with `A', `An', or `The' so that these articles do not affect
+sorting.
+
\listitem{withauthor}{name}
The author(s) who assist the \bibfield{author}. See \bibfield{witheditortype},
@@ -1251,6 +1289,14 @@
\section{Important Changes}
+\subsection*{0.12\quad 2020-11-04}
+
+\begin{itemize}
+ \item Ibid.\@ and idem are no longer used by default.
+ \item Only the author family name is printed for subsequent citations of a
+ different work by the same author within a footnote or citation.
+\end{itemize}
+
\subsection*{0.11\quad 2018-12-13}
\begin{itemize}
@@ -1269,7 +1315,7 @@
\begin{itemize}[itemsep=0pt]
\item Support and require \biblatex 3.11.
- \item Use ibid and idem by default.
+ \item Use ibid.\@ and idem by default.
\item \sty{polyglossia} is no longer supported. You should use \sty{babel}
instead.
\end{itemize}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex 2020-11-04 21:35:59 UTC (rev 56853)
@@ -21,7 +21,11 @@
% Language and font set up
% Note: Polyglossia is *not* well supported
\ifxetexorluatex
- \usepackage[nil,bidi=default]{babel}
+ \ifluatex
+ \usepackage[nil,bidi=basic]{babel}
+ \else
+ \usepackage[nil,bidi=default]{babel}
+ \fi
\babelprovide[import=en-US,main]{american}
\babelprovide[import=he]{hebrew}
\babelprovide[import=el]{polutonikogreek}
@@ -42,6 +46,7 @@
% Load main style
% Pass indexing=cite to biblatex (if you want author indexing)
\PassOptionsToPackage{indexing=cite}{biblatex}
+% Pass jblstyle to sbl-paper if you want double spaced footnotes
\usepackage{sbl-paper}
% Add your bib resource here
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/american-sbl.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/american-sbl.lbx 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/american-sbl.lbx 2020-11-04 21:35:59 UTC (rev 56853)
@@ -25,4 +25,5 @@
\iffieldbibstring{#1}
{\bibstring{\thefield{#1}}}
{\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
+ \DeclarePunctuationPairs{comma}{*!?}%
}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def 2020-11-04 21:35:59 UTC (rev 56853)
@@ -15,8 +15,8 @@
% VERSION STRINGS
% ------------------------------------------------------------------
-\def\sbl at abx@date{2018/12/13}
-\def\sbl at abx@version{0.11}
+\def\sbl at abx@date{2020/11/04}
+\def\sbl at abx@version{0.12}
\def\sbl at abx@bbxid{\sbl at abx@date\space v\sbl at abx@version\space biblatex-sbl bibliography style (DCP)}
\def\sbl at abx@cbxid{\sbl at abx@date\space v\sbl at abx@version\space biblatex-sbl citation style (DCP)}
\def\sbl at abx@lbxid{\sbl at abx@date\space v\sbl at abx@version\space biblatex-sbl localization (DCP)}
@@ -52,7 +52,12 @@
\NumCheckSetup{\def\mkbibparens#1{#1}}
-\renewbibmacro*{postnote}{}
+\renewbibmacro*{postnote}{%
+ \iftoggle{blx at unit}
+ {}
+ {\newunit}%
+ \printfield{postnote}}
+
\newbibmacro*{pages}{}
\DeclareBibliographyOption[string]{citepages}[permit]{%
@@ -62,7 +67,6 @@
{Invalid option 'citepages=#1'}
{Valid values are 'sbl', 'permit', 'omit', 'separate'.}}}
-\providebibmacro*{postnote}{}
\providebibmacro*{pages}{}
\def\cbx at opt@citepages at sbl{%
@@ -82,17 +86,7 @@
{\iffieldpages{postnote}
{}
{\setunit{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}
- {\printfield{pages}}
- {\iffieldpages{postnote}
- {\printfield{postnote}}
- {\iffieldundef{pages}
- {\printfield{postnote}}
- {\printfield{pages}%
- \setunit{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}}}
+ \printtext[parens]{\printfield{postnote}}}}}}}
\def\cbx at opt@citepages at permit{%
\renewbibmacro*{pages}{%
@@ -109,18 +103,7 @@
}
{}
{\setunit{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}
- {\printfield{pages}}
- {\iffieldpages{postnote}
- {\printfield{postnote}}
- {\iffieldundef{pages}
- {\newunit
- \printfield{postnote}}
- {\printfield{pages}%
- \setunit*{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}}}
+ \printtext[parens]{\printfield{postnote}}}}}}
\def\cbx at opt@citepages at omit{%
\renewbibmacro*{pages}{%
@@ -139,23 +122,12 @@
{\printfield{postnote}}
{\printfield{pages}%
\setunit*{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}
- {\printfield{pages}}
- {\iffieldpages{postnote}
- {\printfield{postnote}}
- {\iffieldundef{pages}
- {\newunit
- \printfield{postnote}}
- {\printfield{pages}%
- \setunit*{\addspace}%
\printtext[parens]{\printfield{postnote}}}}}}}
\def\cbx at opt@citepages at separate{%
\renewbibmacro*{pages}{%
\iffieldundef{pages}
- {\ifool{bx at inset}
+ {\ifbool{bbx at inset}
{}
{\printfield{postnote}%
\global\booltrue{suppresspostnote}}}
@@ -172,27 +144,48 @@
{\bibstring{thiscite}%
\setunit{\addspace}}
{}%
- \printfield{postnote}}}}}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}
- {\printfield{pages}}
- {\iffieldpages{postnote}
- {\printfield{postnote}}
- {\iffieldundef{pages}
- {\printfield{postnote}}
- {\printfield{pages}%
- \setunit*{\addspace}%
- \printtext[parens]{%
- \iffieldpages{postnote}
- {\bibstring{thiscite}%
- \setunit{\addspace}}
- {}%
- \printfield{postnote}}}}}}}
+ \printfield{postnote}}}}}}
% ------------------------------------------------------------------
% IDEM MACROS
% ------------------------------------------------------------------
+\def\blx at opt@idemtracker at citation{%
+ \let\blx at imc@ifciteidem\blx at ifciteidem@citation
+ \let\blx at idemtracker\blx at idemtracker@constrict
+ \let\blx at idemreset\blx at idemreset@context
+ \booltrue{citetracker}}
+
+\def\blx at opt@idemtracker at sbl{%
+ \let\blx at imc@ifciteidem\blx at ifciteidem@sbl
+ \let\blx at idemtracker\blx at idemtracker@constrict
+ \let\blx at idemreset\blx at idemreset@context
+ \booltrue{citetracker}}
+
+\def\blx at ifciteidem@citation{%
+ \ifbool{citetracker}
+ {\iftoggle{blx at footnote}
+ {\blx at ifmpfncheckidem
+ {\blx at imc@iffieldequals{fullhash}\blx at lasthash@foot}
+ {\@secondoftwo}}
+ {\iffirstcitekey
+ {\@secondoftwo}
+ {\blx at imc@iffieldequals{fullhash}\blx at lasthash@text}}}
+ {\@secondoftwo}}
+
+\def\blx at ifciteidem@sbl{%
+ \blx at ifciteidem@citation}
+
+\def\blx at ifmpfncheckidem{%
+ \ifnum\numexpr\value\@mpfn-\blx at lastmpfn<\@ne
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+
+\def\ifciteidemsbl{%
+ \ifdefequal{\blx at imc@ifciteidem}{\blx at ifciteidem@sbl}}
+
\newbibmacro*{ifidemused}{%
\ifboolexpr{
test {\ifciteidem}
@@ -199,7 +192,9 @@
and
not test {\iffirstonpage}
}
- {\bibstring[\mkibid]{idem\thefield{gender}}%
+ {\ifciteidemsbl
+ {\printnames{labelname}}
+ {\bibstring[\mkibid]{idem\thefield{gender}}}%
\@firstoftwo}
{\@secondoftwo}}
@@ -310,7 +305,6 @@
\ExecuteBibliographyOptions{%
citetracker,
- punctfont,
alldates=comp,
eprintdate=comp,
dateabbrev=false,
@@ -320,9 +314,9 @@
minxrefs=1,
isbn=false,
pagetracker,
- idemtracker=constrict,
- ibidtracker=constrict,
- ibidpage=false,
+ idemtracker=sbl,
+ ibidtracker=false,
+ ibidpage=true,
maxbibnames=99,
maxcitenames=3,
citepages=sbl,
@@ -363,6 +357,7 @@
\NewBibliographyString{paperpresented}
\NewBibliographyString{patentfiled}
\NewBibliographyString{released}
+\NewBibliographyString{article}
\DeclareLanguageMappingSuffix{-sbl}
@@ -404,6 +399,7 @@
\ifinteger{#1}
{\mkbibordedition{#1}~\bibsstring{edition}}
{\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat{eid}{\bibsstring{article}~#1}
\DeclareFieldFormat{eprint:ebook}{#1 \biblstring{edition}}
\DeclareFieldFormat{eprint}{%
\iffieldundef{eprinttype}
@@ -453,7 +449,10 @@
\DeclareFieldFormat{volcitepages}{\mkcomprange{#1}}
\DeclareFieldFormat{part}{#1}
\DeclareFieldFormat{pt}{\bibstring{part}~#1}
-\DeclareFieldFormat{postnote}{\mkcomprange{#1}}
+\DeclareFieldFormat{postnote}{%
+ \iffieldundef{eid}
+ {\mkcomprange{#1}}
+ {\mkpageprefix[pagination][\mkcomprange]{#1}}}
\DeclareFieldFormat{multipostnote}{#1}
\DeclareFieldFormat{byauthor}{\bibstring{byauthor} #1}
\DeclareFieldFormat{revdtitle}{\biblstring{reviewof} \mkbibemph{#1}}
@@ -472,8 +471,8 @@
\DeclareFieldFormat{isrn}{ISRN\addcolon\space #1}
\DeclareFieldFormat{issn}{ISSN\addcolon\space #1}
\DeclareFieldFormat{pages}{\mkcomprange{#1}}
-\DeclareFieldFormat{pagepages}{\mkcomprange[\mkpageprefix]{#1}}
-\DeclareFieldFormat{pagesin}{\mkcomprange[\mkpageprefix]{#1} \usebibmacro{in}}
+\DeclareFieldFormat{pagepages}{\mkpageprefix[pagination][\mkcomprange]{#1}}
+\DeclareFieldFormat{pagesin}{\mkpageprefix[pagination][\mkcomprange]{#1} \usebibmacro{in}}
\DeclareFieldFormat{chapter}{\bibsstring{chapter}~#1}
\DeclareFieldFormat{chapterin}{\bibsstring{chapter}~#1 \usebibmacro{in}}
\DeclareFieldFormat{volume}{#1}
@@ -515,13 +514,15 @@
\DeclareFieldFormat[incommentary,inreference,inlexicon,online,review,seminarpaper,conferencepaper]{title}{\mkbibquote{#1}}
\DeclareFieldFormat[incommentary,inreference,inlexicon,online,review,seminarpaper,conferencepaper]{shorttitle}{\mkbibquote{#1}}
\DeclareFieldFormat[suppperiodical]{title}{\mkbibquote{#1}}
-\DeclareFieldFormat{issuetitle}{\mkbibquote{#1}}
-\DeclareFieldFormat{issuesubtitle}{\mkbibquote{#1}}
-\DeclareFieldFormat{shortissuetitle}{\mkbibquote{#1}}
+\DeclareFieldFormat{issuetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat{issuesubtitle}{\mkbibemph{#1}}
+\DeclareFieldFormat{shortissuetitle}{\mkbibemph{#1}}
\DeclareFieldFormat{howpublished}{\ifbibstring{#1}{\bibstring{#1}}{#1}}
\DeclareFieldFormat[patent]{title}{#1}
\DeclareFieldFormat[ancienttext]{title}{%
\ifboolexpr{
+ test {\iffieldequalstr{entrysubtype}{primarysource}}
+ or
test {\iffieldequalstr{entrysubtype}{inscription}}
or
test {\iffieldequalstr{entrysubtype}{chronicle}}
@@ -532,6 +533,8 @@
{\mkbibquote{#1}}}}
\DeclareFieldFormat[ancienttext]{shorttitle}{%
\ifboolexpr{
+ test {\iffieldequalstr{entrysubtype}{primarysource}}
+ or
test {\iffieldequalstr{entrysubtype}{inscription}}
or
test {\iffieldequalstr{entrysubtype}{chronicle}}
@@ -561,6 +564,18 @@
\iffieldundef{type}
{#1}
{\mkbibemph{#1}}}
+\DeclareFieldFormat[classictext]{title}{%
+ \ifnameundef{author}
+ {#1}
+ {\mkbibemph{#1}}}
+\DeclareFieldFormat[classictext]{subtitle}{%
+ \ifnameundef{author}
+ {#1}
+ {\mkbibemph{#1}}}
+\DeclareFieldFormat[classictext]{shorttitle}{%
+ \ifnameundef{author}
+ {#1}
+ {\mkbibemph{#1}}}
\DeclareBibliographyAlias{cite:mvbook}{cite:book}
\DeclareBibliographyAlias{cite:mvcollection}{cite:collection}
@@ -675,6 +690,13 @@
% LIST OF ABBREVIATIONS
% ------------------------------------------------------------------
+\DeclareFieldFormat{shorttitlewidth}{%
+ \ifentrytype{classictext}
+ {\iffieldequalstr{entrysubtype}{churchfather}
+ {}
+ {\mkbibemph{#1}}}
+ {}}
+
\newtoggle{blx at abbrevcite}
\newlength{\abbrevwidth}
@@ -686,16 +708,30 @@
}
\defbibenvironment{abbreviations}
- {\list
+ {\setlength{\abbrevwidth}{0pt}%
+ \list
{\printfield[shorthandwidth]{shortjournal}%
- \iffieldundef{shorthand}
- {\printfield[shorthandwidth]{shortseries}}
- {\iffieldsequal{shorthand}{shorttitle}
- {\printtext{\mkbibemph{\printfield[shorthandwidth]{shorthand}}}}
- {\printfield[shorthandwidth]{shorthand}}}}
+ \iffieldsequal{shorthand}{shorttitle}
+ {\printtext{\mkbibemph{\printfield[shorthandwidth]{shorthand}}}}
+ {\printfield[shorthandwidth]{shorthand}}%
+ \ifentrytype{classictext}
+ {\printfield{shorttitle}}
+ {}%
+ \ifboolexpr{
+ not test {\iffieldundef{shorthand}}
+ or
+ (
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ )
+ }
+ {}
+ {\printfield{shortseries}}}
{\setmaxlength{\abbrevwidth}{\shorthandwidth}%
\setmaxlength{\abbrevwidth}{\shortserieswidth}%
\setmaxlength{\abbrevwidth}{\shortjournalwidth}%
+ \setmaxlength{\abbrevwidth}{\shorttitlewidth}%
\addtolength{\abbrevwidth}{\biblabelsep}%
\setlength{\labelwidth}{\abbrevwidth}%
\setlength{\leftmargin}{\labelwidth}%
@@ -721,15 +757,38 @@
{\setunit{\subtitlepunct}%
\printfield{journalsubtitle}}}%
\iffieldundef{shorthand}
- {\iffieldundef{shortseries}
- {}
- {\bibhypertarget{\strfield{shortseries}}{}%
- \printfield{series}}}
+ {}
{\bibhypertarget{\strfield{shorthand}}{}%
\iffieldsequal{shorthand}{shorttitle}
{\toggletrue{blx at abbrevcite}}
{}%
\usebibmacro{bibentrycite}}%
+ \ifentrytype{classictext}
+ {\iffieldundef{shorttitle}
+ {}
+ {\bibhypertarget{\strfield{shorttitle}\strname{author}}{}%
+ \ifnameundef{author}
+ {}
+ {\usebibmacro{author}%
+ \newunit}%
+ \printfield{title}%
+ \setunit*{\subtitlepunct}%
+ \printfield{subtitle}}}
+ {}%
+ \ifboolexpr{
+ not test {\iffieldundef{shorthand}}
+ or
+ (
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ )
+ }
+ {}
+ {\iffieldundef{shortseries}
+ {}
+ {\bibhypertarget{\strfield{shortseries}}{}%
+ \printfield{series}}}%
\usebibmacro{finentry}}
\DeclareBiblistFilter{abbreviations}{
@@ -737,9 +796,29 @@
\filter[type=field,filter=shorthand]
\filter[type=field,filter=shortjournal]
\filter[type=field,filter=shortseries]
+ \filter[type=field,filter=shorttitle]
}
}
+\DeclareBiblistFilter{primary}{
+ \filteror{
+ \filter[type=subtype,filter=primarysource]
+ \filter[type=type,filter=classictext]
+ }
+ \filteror{
+ \filter[type=field,filter=shorthand]
+ \filter[type=field,filter=shorttitle]
+ }
+}
+
+\DeclareBiblistFilter{secondary}{
+ \filteror{
+ \filter[type=field,filter=shorthand]
+ \filter[type=field,filter=shortjournal]
+ \filter[type=field,filter=shortseries]
+ }
+}
+
\defbibcheck{abbreviations}{%
\blx at setoptions@entry
\iftoggle{blx at skipbiblist}{\skipentry}{}%
@@ -752,25 +831,65 @@
{}
{\iffieldundef{shortjournal}
{}
- {\ifcsdef{sbl\therefsection\strfield{shortjournal}=\strfield{journaltitle}}
+ {\ifcsdef{\therefsection-\strfield{shortjournal}=\strfield{journaltitle}}
{\skipentry}
- {\savefieldcs{journaltitle}{sbl\therefsection\strfield{shortjournal}=\strfield{journaltitle}}}}%
+ {\savefieldcs{journaltitle}{\therefsection-\strfield{shortjournal}=\strfield{journaltitle}}}}%
\iffieldundef{shorthand}
- {\iffieldundef{shortseries}
+ {}
+ {\ifcsdef{\therefsection-\strfield{shorthand}=\strfield{shorttitle}}
+ {\skipentry}
+ {\savefieldcs{shorthand}{\therefsection-\strfield{shorthand}=\strfield{shorttitle}}}}%
+ \ifentrytype{classictext}
+ {\iffieldundef{shorttitle}
{}
- {\ifcsdef{sbl\therefsection\strfield{shortseries}=\strfield{series}}
+ {\ifcsdef{\therefsection-\strfield{shorttitle}=\strname{author}\strfield{title}}
{\skipentry}
- {\savefieldcs{series}{sbl\therefsection\strfield{shortseries}=\strfield{series}}}}}
- {\ifcsdef{sbl\therefsection\strfield{shorthand}=\strfield{title}}
+ {\savefieldcs{shorttitle}{\therefsection-\strfield{shorttitle}=\strname{author}\strfield{title}}}}}
+ {}%
+ \ifboolexpr{
+ not test {\iffieldundef{shorthand}}
+ or
+ (
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ )
+ }
+ {}
+ {\ifcsdef{\therefsection-\strfield{shortseries}=\strfield{series}}
{\skipentry}
- {\savefieldcs{shorthand}{sbl\therefsection\strfield{shorthand}=\strfield{title}}}}}}
+ {\savefieldcs{series}{\therefsection-\strfield{shortseries}=\strfield{series}}}}%
+ \iffieldequalstr{entrysubtype}{churchfather}
+ {\skipentry}
+ {}%
+ \ifboolexpr{
+ not test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ and
+ test {\iffieldundef{shortjournal}}
+ and
+ test {\iffieldundef{shorthand}}
+ and
+ test {\iffieldundef{shortseries}}
+ }
+ {\skipentry}
+ {}}}
-\DeclareSortingTemplate{abbreviations}{%
- \sort{%
- \field{shorthand}%
- \field{shortjournal}%
- \field{shortseries}%
- }%
+\DeclareSortingTemplate{abbreviations}{
+ \sort{
+ \field{sortshorthand}
+ \field{shorthand}
+ \field{shortjournal}
+ \field{shortseries}
+ \field{shorttitle}
+ }
+ \sort{
+ \field{journaltitle}
+ \field{author}
+ \field{title}
+ \field{series}
+ }
}
% ------------------------------------------------------------------
@@ -787,13 +906,14 @@
\step[fieldset=shorttitle, fieldvalue={$1}]
}
\map{
- \step[fieldsource=journaltitle, match=\regexp{(.*?):}, final]
- \step[fieldset=shortjournal, fieldvalue={$1}]
- }
- \map{
\step[fieldsource=revdtitle, match=\regexp{(.*?):}, final]
\step[fieldset=revdshorttitle, fieldvalue={$1}]
}
+ \map[overwrite=true]{
+ \step[notfield=sorttitle, final]
+ \step[fieldsource=title, match=\regexp{^(A|An|The)\s+(.+)}, final]
+ \step[fieldset=sorttitle, fieldvalue={$2}]
+ }
\map{
\pertype{suppbook}
\pertype{suppcollection}
@@ -826,16 +946,6 @@
\step[fieldset=journalsubtitle, origfieldval]
}
\map{
- \pertype{periodical}
- \step[fieldsource=shorttitle, final]
- \step[fieldset=shortjournal, origfieldval]
- }
- \map{
- \step[fieldsource=journalsubtitle, final]
- \step[fieldsource=journaltitle, final]
- \step[fieldset=shortjournal, origfieldval]
- }
- \map{
\step[fieldsource=entrysubtype, match=\regexp{ANRW}, final]
\step[fieldset=options, fieldvalue={skipbib=false}]
}
@@ -857,10 +967,11 @@
\pertype{ancienttext}
\pertype{classictext}
\step[fieldsource=related, final]
- \step[fieldset=relatedtype, fieldvalue=ancienttext]
\step[fieldsource=relatedoptions, match=\regexp{(.*)}]
\step[fieldset=relatedoptions, fieldvalue={skipbib=false,skipbiblist=false,}]
\step[fieldset=relatedoptions, fieldvalue={$1}, append]
+ \step[notfield=relatedtype, final]
+ \step[fieldset=relatedtype, fieldvalue=ancienttext]
}
\map[overwrite]{
\step[fieldsource=shortseries, final]
@@ -867,7 +978,7 @@
\step[fieldsource=shorthand, final]
\step[fieldsource=entrykey, match=\regexp{(.*)}]
\step[fieldset=xref, fieldvalue=series-$1]
- \step[entrynew=series-$1, entrynewtype=misc]
+ \step[entrynew=series-$1, entrynewtype=series]
\step[fieldsource=shortseries]
\step[fieldset=shortseries, origfieldval, entrytarget=series-$1]
\step[fieldsource=series]
@@ -874,6 +985,20 @@
\step[fieldset=series, origfieldval, entrytarget=series-$1]
\step[fieldset=options, fieldvalue={skipbib}, entrytarget=series-$1]
}
+ \map[overwrite]{
+ \pertype{classictext}
+ \step[fieldsource=shortseries, final]
+ \step[fieldsource=shorttitle, final]
+ \step[fieldset=sortshorthand, origfieldval]
+ \step[fieldsource=entrykey, match=\regexp{(.*)}]
+ \step[fieldset=xref, fieldvalue=series-$1]
+ \step[entrynew=series-$1, entrynewtype=series]
+ \step[fieldsource=shortseries]
+ \step[fieldset=shortseries, origfieldval, entrytarget=series-$1]
+ \step[fieldsource=series]
+ \step[fieldset=series, origfieldval, entrytarget=series-$1]
+ \step[fieldset=options, fieldvalue={skipbib}, entrytarget=series-$1]
+ }
}
}
@@ -959,10 +1084,28 @@
{#2}}
\ExplSyntaxOn
-\cs_new_protected:Nn \sbl_ifinstringt:nnn {
- \tl_if_in:nnT {#2}{#1}{#3}}
-\cs_generate_variant:Nn \sbl_ifinstringt:nnn { non }
-\cs_new_eq:NN \IfInStringT \sbl_ifinstringt:non
+\cs_new_protected:Nn \sbl_ifinstringtf:nnnn {
+ \tl_if_in:nnTF {#2}{#1}{#3}{#4}}
+\cs_generate_variant:Nn \sbl_ifinstringtf:nnnn { nonn }
+\cs_new_eq:NN \IfInStringTF \sbl_ifinstringtf:nonn
+
+\DeclareExpandableDocumentCommand \iffirstcharsec { m m m }
+ {
+ \exp_args:Nnf \IfInStringTF { § } { \tl_use:N \tl_head:f { #1 } }
+ { #2 }
+ {
+ \exp_args:Nnf \IfInStringTF { \textsection } { \tl_use:N \tl_head:f { #1 } }
+ { #2 }
+ { #3 }
+ }
+ }
+
+\DeclareExpandableDocumentCommand \iffirstcharnum { m m m }
+ {
+ \exp_args:Nf \ifnumeral { \tl_use:N \tl_head:f { #1 } }
+ { #2 }
+ { #3 }
+ }
\ExplSyntaxOff
\newbibmacro*{setpostnotedelim}{%
@@ -971,38 +1114,52 @@
{}%
\iffieldundef{postnote}
{}
- {\IfInStringT{.}{\abx at field@postnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{:}{\abx at field@postnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{§}{\abx at field@postnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{\textsection}{\abx at field@postnote}
- {\renewcommand*{\postnotedelim}{\addspace}}}}
+ {\iffirstcharnum{\abx at field@postnote}
+ {\ifboolexpr{
+ test {\ifentrytype{ancienttext}}
+ and
+ test {\usebibmacro{ifuseshorthand}}
+ }
+ {\renewcommand*{\postnotedelim}{\addspace}}
+ {}%
+ \ifboolexpr{
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ }
+ {\renewcommand*{\postnotedelim}{\addspace}}
+ {}%
+ \IfInStringTF{.}{\abx at field@postnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}%
+ \IfInStringTF{:}{\abx at field@postnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}}
+ {\iffirstcharsec{\abx at field@postnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}
+ {}}}}
\newbibmacro*{setaltpostnotedelim}{%
\iffieldundef{altpostnote}
{}
- {\IfInStringT{.}{\abx at field@altpostnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{:}{\abx at field@altpostnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{§}{\abx at field@altpostnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{\textsection}{\abx at field@altpostnote}
- {\renewcommand*{\postnotedelim}{\addspace}}}}
+ {\IfInStringTF{.}{\abx at field@altpostnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}%
+ \IfInStringTF{:}{\abx at field@altpostnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}%
+ \IfInStringTF{§}{\abx at field@altpostnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}%
+ \IfInStringTF{\textsection}{\abx at field@altpostnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}}}
\newbibmacro*{setpagesdelim}{%
\iffieldundef{pages}
{}
- {\IfInStringT{.}{\abx at field@pages}
- {\setunit{\addspace}}%
- \IfInStringT{:}{\abx at field@pages}
- {\setunit{\addspace}}%
- \IfInStringT{§}{\abx at field@pages}
- {\setunit{\addspace}}%
- \IfInStringT{\textsection}{\abx at field@pages}
- {\setunit{\addspace}}}}
+ {\IfInStringTF{.}{\abx at field@pages}
+ {\setunit{\addspace}}{}%
+ \IfInStringTF{:}{\abx at field@pages}
+ {\setunit{\addspace}}{}%
+ \IfInStringTF{§}{\abx at field@pages}
+ {\setunit{\addspace}}{}%
+ \IfInStringTF{\textsection}{\abx at field@pages}
+ {\setunit{\addspace}}{}}}
% ------------------------------------------------------------------
% JOINING WORD MACROS
@@ -1123,6 +1280,24 @@
{\printtext[maintitle]{\printfield[titlecase]{shortmaintitle}}}%
\newunit}
+\newbibmacro*{classictexttitle}{%
+ \ifboolexpr{%
+ not togl {blx at useshorttitle}
+ or
+ test {\iffieldundef{shorttitle}}
+ }
+ {\iffieldundef{title}
+ {}
+ {\printtext[title]{%
+ \printfield[titlecase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}%
+ \newunit
+ \printfield{titleaddon}%
+ \usebibmacro{language}}}
+ {\printtext[shorttitle]{%
+ \bibhyperlink{\strfield{shorttitle}\strname{author}}{\thefield{shorttitle}}}}}
+
\renewbibmacro*{title}{%
\ifciteseen
{\usebibmacro{shorttitle}}
@@ -1226,7 +1401,10 @@
\newbibmacro*{shortjournal}{%
\iffieldundef{shortjournal}
- {\printfield{journaltitle}}
+ {\printtext[journaltitle]{%
+ \printfield[titlecase]{journaltitle}%
+ \setunit*{\subtitlepunct}%
+ \printfield[titlecase]{journalsubtitle}}}
{\printtext[shortjournal]{%
\bibhyperlink{\strfield{shortjournal}}{\thefield{shortjournal}}}}}
@@ -1233,7 +1411,7 @@
\newbibmacro*{shortjournal+issue}{%
\usebibmacro{shortjournal}%
\setunit{\addspace}%
- \usebibmacro{series+volume+number+eid}%
+ \usebibmacro{series+volume+number}%
\ifboolexpr{
not test {\ifnameundef{editor}}
or
@@ -1262,7 +1440,8 @@
test {\iffieldundef{date}}
}
{\usebibmacro{setpagesdelim}}
- {}}
+ {}%
+ \usebibmacro{eid}}
\renewbibmacro*{issue+date}{%
\ifboolexpr{
@@ -1296,7 +1475,7 @@
\usebibmacro{date}}}%
\setunit{\addcolon\space}}}}
-\newbibmacro*{series+volume+number+eid}{%
+\newbibmacro*{series+volume+number}{%
\iffieldundef{series}
{}
{\newunit
@@ -1304,9 +1483,7 @@
\newunit}%
\printfield{volume}%
\setunit*{\addperiod}%
- \printfield{number}%
- \setunit{\addcomma\space}%
- \printfield{eid}}
+ \printfield{number}}
\newbibmacro{inissuetitle}{%
\iffieldundef{issuetitle}
@@ -1325,7 +1502,7 @@
{\printtext[issuetitle]{\printfield[titlecase]{shortissuetitle}}}%
\newunit}
-\newbibmacro{issuetitle}{%
+\newbibmacro*{issuetitle}{%
\iffieldundef{issuetitle}
{}
{\ifciteseen
@@ -1335,6 +1512,10 @@
\setunit*{\subtitlepunct}%
\printfield[titlecase]{issuesubtitle}}}}}
+\newbibmacro*{eid}{%
+ \printfield{eid}%
+ \setunit*{\addcomma\space}}
+
% ------------------------------------------------------------------
% NAME MACROS
% ------------------------------------------------------------------
@@ -1699,15 +1880,13 @@
{}}
\newbibmacro*{byauthor/byeditor+others/bytranslator+others}{%
- \iffieldundef{title}
- {}
- {\usebibmacro{byauthor}%
+ \usebibmacro{byauthor}%
+ \newunit
+ \usebibmacro{ifbooktitleormaintitle}
+ {\usebibmacro{byeditor/bytranslator}}
+ {\usebibmacro{byeditor+others}%
\newunit
- \usebibmacro{ifbooktitleormaintitle}
- {\usebibmacro{byeditor/bytranslator}}
- {\usebibmacro{byeditor+others}%
- \newunit
- \usebibmacro{bytranslator+others}}}}
+ \usebibmacro{bytranslator+others}}}
\newbibmacro*{bybookeditor}{%
\ifnameundef{bookeditor}
@@ -2386,10 +2565,11 @@
\usedriver
{\renewbibmacro*{related:init}{}%
\ifbibliography
- {\renewbibmacro*{parens+publisher+location+date}{%
- \newunit
- \usebibmacro{publisher+location+date}}}
- {}}
+ {}
+ {\renewcommand*{\newunitpunct}{\addsemicolon\space}}%
+ \renewbibmacro*{parens+publisher+location+date}{%
+ \newunit
+ \usebibmacro{publisher+location+date}}}
{\ifbibliography
{\thefield{entrytype}}
{cite:\thefield{entrytype}}}}}
@@ -2421,23 +2601,27 @@
\newtoggle{blx at testpostnotedelim}
\newbibmacro*{volume+part+postnote}{%
- \usebibmacro{volume}%
- \iffieldundef{part}
- {}
- {\setunit{\addperiod}%
- \printfield{part}}%
- \iftoggle{blx at testpostnotedelim}{\usebibmacro{setpostnotedelim}}{}%
- \ifbool{usevolpostnotedelim}
- {\setunit{\volpostnotedelim}}
- {\setunit{\postnotedelim}}%
\ifboolexpr{
test {\ifciteseen}
- or
- test {\iffieldundef{pages}}
+ and
+ test {\iffieldundef{postnote}}
}
- {\printfield{postnote}}
- {\usebibmacro{pages}}%
- \global\booltrue{suppresspostnote}}
+ {}
+ {\usebibmacro{volume}%
+ \iffieldundef{part}
+ {}
+ {\setunit{\addperiod}%
+ \printfield{part}}%
+ \iftoggle{blx at testpostnotedelim}{\usebibmacro{setpostnotedelim}}{}%
+ \ifbool{usevolpostnotedelim}
+ {\setunit{\volpostnotedelim}}
+ {\setunit{\postnotedelim}}%
+ \ifciteseen
+ {\printfield{postnote}}
+ {\iffieldundef{pages}
+ {\printfield{postnote}}
+ {\usebibmacro{pages}}}%
+ \global\booltrue{suppresspostnote}}}
\newbibmacro*{classic:translator+series}{%
\ifnameundef{translator}
@@ -2448,7 +2632,10 @@
\iftoggle{blx at useseries}
{\newunit
\usebibmacro{shortseries}}
- {}}}}
+ {}%
+ \usebibmacro{setaltpostnotedelim}%
+ \setunit{\postnotedelim}%
+ \printfield{altpostnote}}}}
% ------------------------------------------------------------------
% ALTERNATE POSTNOTE MACROS
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/english-sbl.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/english-sbl.lbx 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/english-sbl.lbx 2020-11-04 21:35:59 UTC (rev 56853)
@@ -26,7 +26,8 @@
commonera = {{CE}{CE}},
beforecommonera = {{BCE}{BCE}},
annodomini = {{AD}{AD}},
- beforechrist = {{BC}{BC}}
+ beforechrist = {{BC}{BC}},
+ article = {{article}{art\adddot}},
}
\DeclareBibliographyExtras{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/german-sbl.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/german-sbl.lbx 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/german-sbl.lbx 2020-11-04 21:35:59 UTC (rev 56853)
@@ -25,4 +25,5 @@
beforecommonera = {{v\adddotspace u\adddotspace Z\adddot}{v\adddotspace u\adddotspace Z\adddot}},
annodomini = {{n\adddotspace Chr\adddot}{n\adddotspace Chr\adddot}},
beforechrist = {{v\adddotspace Chr\adddot}{v\adddotspace Chr\adddot}},
+ article = {{artikel}{art\adddot}},
}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty 2020-11-04 21:35:59 UTC (rev 56853)
@@ -1,4 +1,4 @@
-%Copyright 2015-2018 David Purton
+%Copyright 2015-2020 David Purton
%
%This work may be distributed and/or modified under the
%conditions of the LaTeX Project Public License, either version 1.3
@@ -13,7 +13,7 @@
%The Current Maintainer of this work is David Purton.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{sbl-paper}
- [2018/05/24 Society of Bibilical Literature Paper Style (DCP)]
+ [2020/11/04 Society of Bibilical Literature Paper Style (DCP)]
% Load required packages
@@ -565,7 +565,7 @@
\biblerefmap{Timothy2}{02@\br at newtestament !16}
\biblerefmap{Titus}{02@\br at newtestament !17}
\biblerefmap{Phlm}{02@\br at newtestament !18}
-\biblerefmap{Phlemon}{02@\br at newtestament !18}
+\biblerefmap{Philemon}{02@\br at newtestament !18}
\biblerefmap{Heb}{02@\br at newtestament !19}
\biblerefmap{Hebrews}{02@\br at newtestament !19}
\biblerefmap{Jas}{02@\br at newtestament !20}
@@ -581,4 +581,14 @@
\biblerefmap{Rev}{02@\br at newtestament !27}
\biblerefmap{Revelation}{02@\br at newtestament !27}
+
+% Style Options
+
+\DeclareOption{jblstyle}{%
+ \renewcommand\@makefntext[1]{%
+ \parindent\footnotemargin\normalsize\@thefnmark.\@\space\footnotelayout #1}
+ \renewcommand{\footnotelayout}{\raggedright\normalsize\doublespacing}}
+
+\ProcessOptions\relax
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx 2020-11-04 21:35:59 UTC (rev 56853)
@@ -65,7 +65,9 @@
\usebibmacro{bymaintranslator+others}}%
\usebibmacro{publisher+location+date}%
\newunit}
- {\DeclareFieldFormat[ancienttext]{title}{\mkbibemph{##1}}%
+ {\iffieldequalstr{entrysubtype}{primarysource}
+ {}
+ {\DeclareFieldFormat[ancienttext]{title}{\mkbibemph{##1}}}%
\clearfield{related}%
\usedriver{}{book}}%
\usebibmacro{finentry}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx 2020-11-04 21:35:59 UTC (rev 56853)
@@ -130,11 +130,23 @@
\sloppy
\hangindent 6em\rlap
{\printfield[shorthandwidth]{shortjournal}%
- \iffieldundef{shorthand}
- {\printfield[shorthandwidth]{shortseries}}
- {\iffieldsequal{shorthand}{shorttitle}
- {\printtext{\mkbibemph{\printfield[shorthandwidth]{shorthand}}}}
- {\printfield[shorthandwidth]{shorthand}}}}%
+ \iffieldsequal{shorthand}{shorttitle}
+ {\printtext{\mkbibemph{\printfield[shorthandwidth]{shorthand}}}}
+ {\printfield[shorthandwidth]{shorthand}}%
+ \ifentrytype{classictext}
+ {\printfield{shorttitle}}
+ {}%
+ \ifboolexpr{
+ not test {\iffieldundef{shorthand}}
+ or
+ (
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ )
+ }
+ {}
+ {\printfield{shortseries}}}%
\renewcommand*{\bibhypertarget}[2]{##2}%
\hskip 6em \setunit{}\usedriver{}{abbreviations}\par
}
@@ -294,23 +306,50 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\citeseries}
- {}
+\newrobustcmd*{\Citefullauthor}{%
+ \@ifstar{\bibsentence\citefullauthor*}{\bibsentence\citefullauthor}}
+
+\DeclareCiteCommand{\citefullauthor}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printnames[given-family]{labelname}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\citefullauthor}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printnames[given-family][1-1]{labelname}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+% Thanks to @moewe (https://tex.stackexchange.com/a/497548/87678)
+\newcommand*{\DeclareNestableCiteCommand}[2]{%
+ \newcommand*{#1}[1]{%
+ \blx at xsanitizeafter\blx at nocite@do{##1}%
+ \blx at ifdata{##1}
+ {\begingroup
+ \blx at blxinit
+ \entrydata{##1}{#2}%
+ \endgroup}
+ {\abx at missing@entry{##1}}}}
+
+\DeclareNestableCiteCommand{\citeseries}
{\usebibmacro{shortseries}}
- {}
- {}
-\DeclareCiteCommand{\citejournal}
- {}
+\DeclareNestableCiteCommand{\citejournal}
{\usebibmacro{shortjournal}}
- {}
- {}
-\DeclareCiteCommand{\citeshorthand}
- {}
+\DeclareNestableCiteCommand{\citeshorthand}
{\usebibmacro{shorthand}}
- {}
- {}
\newbibmacro*{textcite}{%
\ifnameundef{labelname}
@@ -457,9 +496,9 @@
{\let\ifciteseen\@firstoftwo}%
\usebibmacro{author}%
\newunit
- \usebibmacro{shorttitlenohyperlink}%
\iffieldequalstr{entrysubtype}{churchfather}
- {\setunit{\addspace}%
+ {\usebibmacro{shorttitlenohyperlink}%
+ \setunit{\addspace}%
\printfield{altpostnote}%
\DeclareFieldFormat{related}{\mkbibparens{##1}}%
\renewcommand*{\begrelateddelim}{\addspace}%
@@ -467,7 +506,8 @@
\usebibmacro{related:init}%
\usebibmacro{related}%
\global\toggletrue{relatedseen}}
- {\clearfield{pages}%
+ {\usebibmacro{classictexttitle}%
+ \clearfield{pages}%
\usebibmacro{volume+part+postnote}%
\usebibmacro{classic:translator+series}}%
\usebibmacro{finentry}}
@@ -663,11 +703,13 @@
{\usebibmacro{xrefshortmaintitle}%
\iffieldundef{volume}
{}
- {\setunit{\addspace}%
- \printfield{volume}%
- \setunit*{\addperiod}%
- \printfield{part}%
- \global\booltrue{usevolpostnotedelim}}}
+ {\iffieldpages{postnote}
+ {\setunit{\addspace}%
+ \printfield{volume}%
+ \setunit*{\addperiod}%
+ \printfield{part}%
+ \global\booltrue{usevolpostnotedelim}}
+ {}}}
{\printfield{note}%
\newunit
\usebibmacro{xrefshortmaintitle}%
@@ -743,11 +785,13 @@
{\usebibmacro{xrefshortmaintitle+xrefshortbooktitle}%
\iffieldundef{volume}
{}
- {\setunit{\addspace}%
- \printfield{volume}%
- \setunit*{\addperiod}%
- \printfield{part}%
- \global\booltrue{usevolpostnotedelim}}}
+ {\iffieldpages{postnote}
+ {\setunit{\addspace}%
+ \printfield{volume}%
+ \setunit*{\addperiod}%
+ \printfield{part}%
+ \global\booltrue{usevolpostnotedelim}}
+ {}}}
{\usebibmacro{title}%
\newunit
\printfield{note}%
@@ -773,11 +817,13 @@
{\newunit
\iffieldundef{volume}
{}
- {\newunit
- \global\booltrue{usevolpostnotedelim}%
- \printfield{volume}%
- \setunit*{\addperiod}%
- \printfield{part}}}
+ {\iffieldpages{postnote}
+ {\newunit
+ \global\booltrue{usevolpostnotedelim}%
+ \printfield{volume}%
+ \setunit*{\addperiod}%
+ \printfield{part}}
+ {}}}
{\newunit
\printfield{note}%
\newunit
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.dbx 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.dbx 2020-11-04 21:35:59 UTC (rev 56853)
@@ -2,8 +2,12 @@
\DeclareDatamodelEntrytypes{
ancienttext,
+ classictext,
conferencepaper,
+ mvcommentary,
incommentary,
+ lexicon,
+ mvlexicon,
inlexicon,
review,
seminarpaper}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/spanish-sbl.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/spanish-sbl.lbx 2020-11-04 21:35:39 UTC (rev 56852)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/spanish-sbl.lbx 2020-11-04 21:35:59 UTC (rev 56853)
@@ -25,5 +25,6 @@
commonera = {{e\adddotspace c\adddot}{e\adddotspace c\adddot}},
beforecommonera = {{a\adddotspace e\adddotspace c\adddot}{a\adddotspace e\adddotspace c\adddot}},
annodomini = {{d\adddotspace C\adddot}{d\adddotspace C\adddot}},
- beforechrist = {{a\adddotspace C\adddot}{a\adddotspace C\adddot}}
+ beforechrist = {{a\adddotspace C\adddot}{a\adddotspace C\adddot}},
+ article = {{art{\'i}culo}{art\adddot}},
}
More information about the tex-live-commits
mailing list.