biblatex-sbl (20may18)

git-svn-id: svn://tug.org/texlive/trunk@47780 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 115 insertions, 121 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/README.md b/Master/texmf-dist/doc/latex/biblatex-sbl/README.md
index 0f90d445003..847ea66e785 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/README.md
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/README.md
@@ -30,13 +30,13 @@ kpsewhich -var-value=TEXMFHOME
 
 The following packages are required:
 
-* `biblatex` (version 3.8a or higher) with the `biber` backend
+* `biblatex` (version 3.11 or higher) with the `biber` backend
 * `xparse`
 
 ## Licence
 
 ```
-Copyright 2015-2017 David Purton
+Copyright 2015-2018 David Purton
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf
index 0fc56b8293f..a14db4d42ba 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex
index d9d507d7695..c4bab6ab13a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex
@@ -9,7 +9,7 @@
 \usepackage{imakeidx}
 \makeindex[title=Author Index,intoc]
 \usepackage{hyperref}
-\usepackage[style=sbl,indexing=cite,ibidtracker=constrict,pagetracker,backend=biber]{biblatex}
+\usepackage[style=sbl,indexing=cite]{biblatex}
 \addbibresource{biblatex-sbl.bib}
 
 \setmonofont{DejaVu Sans Mono}[Scale=MatchLowercase]
@@ -147,17 +147,14 @@
 This file tests the behaviour of the various options related to using
 \emph{ibidem} and \emph{idem} in Biblatex-SBL.
 
-\section*{Basic \emph{ibidem} tracking}
+\section*{Default \emph{ibidem} tracking}
 
-Turn on \emph{ibidem} using the \texttt{ibidtracker} option. By default
-ibid.\@ is used across page breaks and \emph{ibidem} is taking to mean ‘same
-author + same title’. See \texttt{biblatex-sbl.pdf} for a description of the
-options \texttt{ibidtracker} can take.
-
-\boolfalse{pagetracker}
+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.
 
 \begin{biboutput}
-  \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,backend=biber]\{biblatex\}}
+  \samplemacro{\textbackslash usepackage[style=sbl]\{biblatex\}}
   \samplecite{1}[127]{talbert:1992}
   \samplecite{2}[22]{talbert:1992}
   \samplecite{3}[22]{talbert:1992}
@@ -168,15 +165,17 @@ options \texttt{ibidtracker} can take.
   \samplecite{6}[22]{talbert:1992}
 \end{biboutput}
 
-\section*{Tracking \emph{ibidem} across pages}
+\section*{Not tracking \emph{ibidem} across pages}
+
+\boolfalse{pagetracker}
 
-Set the \texttt{pagetracker} option to \texttt{true} to ensure that the first
-citation on a page is never ibid. 
+Set the \texttt{pagetracker} option to \texttt{false} to allow that the first
+citation on a page to be ibid. 
 
-\booltrue{pagetracker}
+\boolfalse{pagetracker}
 
 \begin{biboutput}
-  \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,pagetracker,backend=biber]\{biblatex\}}
+  \samplemacro{\textbackslash usepackage[style=sbl,pagetracker=false]\{biblatex\}}
   \samplecite{7}[53]{scott+etal:1993}
   \samplecite{8}[42]{scott+etal:1993}
   \samplemacro{\textbackslash clearpage}
@@ -186,7 +185,7 @@ citation on a page is never ibid.
 
 \section*{\emph{Ibidem} meaning ‘same author + same title + same page’}
 
-Turn on the \texttt{ibidpage} option to indicate that \emph{ibidmen} should
+Turn on the \texttt{ibidpage} option to indicate that \emph{ibidem} should
 mean ‘same author + same title + same page’.
 
 \makeatletter
@@ -196,20 +195,20 @@ mean ‘same author + same title + same page’.
 \makeatother
 
 \begin{biboutput}
-  \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,ibidpage,backend=biber]\{biblatex\}}
+  \samplemacro{\textbackslash usepackage[style=sbl,ibidpage]\{biblatex\}}
   \samplecite{10}[28]{egger:1996}
   \samplecite{11}[28]{egger:1996}
   \samplecite{12}[291]{egger:1996}
 \end{biboutput}
 
-\section*{\emph{Idem} tracking}
+\section*{Default \emph{idem} tracking}
 
-Turn on \emph{idem} 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 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.
 
 \begin{biboutput}
-  \samplemacro{\textbackslash usepackage[style=sbl,idemtracker=constrict,backend=biber]\{biblatex\}}
+  \samplemacro{\textbackslash usepackage[style=sbl]\{biblatex\}}
   \makeatletter\blx@opt@idemtracker@constrict\makeatother
   \samplemacro{\textbackslash autocites[35]\{vanseters:1997\}\{vanseters:1995\}}
   \color{biblatex-colour}
@@ -223,7 +222,6 @@ Turn on \emph{idem} using the \texttt{idemtracker} option. See
   \color{black}
 \end{biboutput}
 
-
 \printbibliography
 
 \printindex
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf
index e9fc07da5b0..55407121e12 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex
index 0859cc766c9..f15e6db51b9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex
@@ -11,7 +11,7 @@
 \usepackage{listings}
 \usepackage{imakeidx}
 \makeindex[title=Author Index,intoc]
-\usepackage[style=sbl,indexing=cite,backend=biber]{biblatex}
+\usepackage[style=sbl,indexing=cite,idemtracker=false,ibidtracker=false]{biblatex}
 \usepackage{hyperref}
 \addbibresource{biblatex-sbl.bib}
 
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf
index 4f54f53d0e4..0397dead963 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex
index 957491682d3..bd587669e74 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex
@@ -9,8 +9,9 @@
 \usepackage{realscripts}
 \usepackage{xparse}
 \usepackage{framed}
+\usepackage{enumitem}
 
-\usepackage[style=sbl,indexing=cite]{biblatex}
+\usepackage[style=sbl,indexing=cite,idemtracker=false,ibidtracker=false]{biblatex}
 \addbibresource{biblatex-sbl.bib}
 
 \hypersetup{colorlinks,citecolor=spot}
@@ -148,10 +149,11 @@ The style supports all examples given in the handbook (see
 \sty{biblatex-sbl-test.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} is supported, but not enabled by default, as is indexing of
-names. 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}.
+\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
+parentheses. \biblatexsbl is compatible with \biblatex's support for
+\sty{hyperref}.
 
 For anything not covered in this manual, please see the \biblatex
 documentation. Bugs and feature requests can be submitted at
@@ -162,9 +164,9 @@ output carefully checked when you use it.
 
 \section{Requirements}
 
-\biblatexsbl requires at least version 3.5 of \biblatex and the \sty{xparse}
+\biblatexsbl requires at least version 3.11 of \biblatex and the \sty{xparse}
 package. \sty{biber} must be used. \sty{bibtex} is not supported. For
-localization \sty{babel}\slash\sty{polyglossia} and \sty{csquotes} are
+localization \sty{babel} (not \sty{polyglossia}) and \sty{csquotes} are
 recommended.
 
 \section{Usage}
@@ -175,7 +177,7 @@ defaults of the \cite{SBLHS}.
 \begin{quote}
 \begin{lstlisting}[style=latex]{}
 \documentclass{article}
-\usepackage[style=sbl,backend=biber]{biblatex}
+\usepackage[style=sbl]{biblatex}
 \addbibresource{<bibfile.bib>}
 \begin{document}
 \printbiblist{abbreviations}
@@ -188,57 +190,35 @@ defaults of the \cite{SBLHS}.
 
 By default \biblatexsbl uses American style punctuation and quotation marks.
 You can choose a different style by including the
-\sty{babel}\slash\sty{polyglossia} and \sty{csquotes} packages in your
-document preamble. e.g.,
+\sty{babel} and \sty{csquotes} packages in your
+document preamble. \sty{polyglossia} is not well supported by \biblatex and
+its use is discouraged.
 
 \begin{quote}
 \begin{lstlisting}[style=latex]{}
-\usepackage[german]{babel}
+\usepackage[ngerman]{babel}
 \usepackage{csquotes}
-\usepackage[style=sbl,backend=biber]{biblatex}
+\usepackage[style=sbl]{biblatex}
 \end{lstlisting}
 \end{quote}
 
 Currently \opt{english} (including variants such as \opt{british},
 \opt{australian}, etc.), \opt{spanish}, and \opt{german} are supported.
 
-For Greek and especially Hebrew, you are probably better off with
-\sty{polyglossia} and \sty{xelatex} or \sty{lualatex}. e.g.,
+For Greek and especially Hebrew, the set up is more complicated and you should
+use \sty{xelatex} or \sty{lualatex}. See \sty{sbl-paper.pdf} for example Greek
+and Hebrew usage with \sty{babel}.
 
 \begin{quote}
 \begin{lstlisting}[style=latex]{}
-\usepackage{fontspec}
-\usepackage{polyglossia}
-\usepackage[style=australian]{csquotes}
-\setdefaultlanguage[variant=australian]{english}
-\setotherlanguage[variant=ancient]{greek}
-\setotherlanguage{hebrew}
-\ifxetex
-  \renewenvironment{hebrew}[1][]{%
-    \par
-    \raggedleft % add to right align paragraphs
-    \begin{otherlanguage}[#1]{hebrew}}%
-    {\end{otherlanguage}\par}
-\else % luatex
-  \let\luatexpardir\pardir % luabidi needs this
-  \let\luatextextdir\textdir % luabidi needs this
-  % text direction gets stuffed up without these workarounds
-  \let\luatextextgreek\textgreek
-  \let\luatextextenglish\textenglish
-  \AtBeginDocument{%
-    \renewcommand{\textgreek}[1]{%
-      \bgroup\luatextextgreek{#1}\egroup}
-    \renewcommand{\textenglish}[1]{%
-      \bgroup\setLTR\luatextextenglish{#1}\egroup}}
-\fi
-% set up fonts
-\newfontfamily\greekfont{SBL BibLit}%
-  [Script=Greek,Contextuals=Alternate]
-\newfontfamily\hebrewfont{SBL BibLit}%
-  [Script=Hebrew,Contextuals=Alternate,Scale=1.2]
-\usepackage[style=sbl,backend=biber]{biblatex}
-% update language mapping (biblatex can't do it using polyglossia)
-\DeclareLanguageMapping{english}{sbl-english}
+\usepackage[nil,bidi=default]{babel}
+\usepackage{csquotes}
+\babelprovide[import=en-US,main]{american}
+\babelprovide[import=he]{hebrew}
+\babelprovide[import=el]{polutonikogreek}
+\babelfont[american]{rm}[Ligatures=TeX]{Linux Libertine O}
+\babelfont[hebrew]{rm}[Ligatures=TeX,Contextuals=Alternate,Scale=1.2]{SBL BibLit}
+\babelfont[polutonikogreek]{rm}[Ligatures=TeX,Contextuals=Alternate]{SBL BibLit}
 \end{lstlisting}
 \end{quote}
 
@@ -440,7 +420,7 @@ entry types.
   \end{snugshade}
 \end{valuelist}
 
-\optitem[false]{ibidtracker}{\opt{true}, \opt{false}, \opt{context},
+\optitem[constrict]{ibidtracker}{\opt{true}, \opt{false}, \opt{context},
 \opt{strict}, \opt{constrict}}
 
 This option controls the \emph{ibidem} tracker. The possible choices are:
@@ -474,7 +454,7 @@ 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}.
 
-\optitem[false]{idemtracker}{\opt{true}, \opt{false}, \opt{context},
+\optitem[constrict]{idemtracker}{\opt{true}, \opt{false}, \opt{context},
 \opt{strict}, \opt{constrict}}
 
 This option controls the \emph{idem} tracker. The possible choices are:
@@ -494,7 +474,7 @@ This option controls the \emph{idem} tracker. The possible choices are:
   footnote.
 \end{valuelist}
 
-\optitem[false]{pagetracker}{\opt{true}, \opt{false}}
+\optitem[true]{pagetracker}{\opt{true}, \opt{false}}
 
 This option controls whether \emph{ibidem} and \emph{idem} are used across
 page breaks or not.
@@ -1269,6 +1249,23 @@ e.g.,
 \end{snugshade}
 \end{quote}
 
+\section{Important Changes}
+
+\subsection*{0.9\quad 2018-05-20}
+
+\begin{itemize}[itemsep=0pt]
+  \item Support and require \biblatex 3.11.
+  \item Use ibid and idem by default.
+  \item \sty{polyglossia} is no longer supported. You should use \sty{babel}
+    instead.
+\end{itemize}
+
+\subsection*{0.8.2\quad 2017-11-16}
+
+\begin{itemize}[itemsep=0pt]
+  \item Support and require \biblatex 3.8a
+\end{itemize}
+
 \printbiblist[heading=biblistintoc]{abbreviations}
 
 \printbibliography[heading=bibintoc]
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf b/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf
index 3424a9aac6b..2af7e3491f3 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex b/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex
index da8e292bb54..81a9ee6c1f3 100644
--- a/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex
@@ -1,13 +1,27 @@
 \documentclass[letterpaper,12pt,oneside,openany]{book}
 
-%% Pass ibid and idem options to biblatex
-%\PassOptionsToPackage{pagetracker,ibidtracker=context,ibidpage,idemtracker=constrict}{biblatex}
-
 \usepackage{sbl-paper}
 
 %% Add your bib resource here
 \addbibresource{biblatex-sbl.bib}
 
+
+%% Language and font set up
+%% Note: Polyglossia is *not* well supported
+\ifxetexorluatex
+  \usepackage[nil,bidi=default]{babel}
+  \babelprovide[import=en-US,main]{american}
+  \babelprovide[import=he]{hebrew}
+  \babelprovide[import=el]{polutonikogreek}
+  \babelfont[american]{rm}[Ligatures=TeX]{Linux Libertine O}
+  \babelfont[hebrew]{rm}[Ligatures=TeX,Contextuals=Alternate,Scale=1.2]{SBL BibLit}
+  \babelfont[polutonikogreek]{rm}[Ligatures=TeX,Contextuals=Alternate]{SBL BibLit}
+\else
+  \usepackage[polutonikogreek,american]{babel}
+  \usepackage{libertineRoman}
+\fi
+
+
 %% Index set up (optional)
 %% Include separate indices for subjects, authors, and Scripture references
 \makeindex[title=Subject Index,intoc]
@@ -25,30 +39,6 @@
     {\namepartprefix}
     {\namepartsuffix}}
 
-%% Set default language to German (or similarly to an other language)
-%\ifxetexorluatex
-% \setdefaultlanguage{german}
-%\else
-%  \usepackage[german]{babel}
-%\fi
-
-%% Set quotation style to British English
-%\setquotestyle[british]{english}
-
-%% Set default fonts
-\ifxetexorluatex
-  \setromanfont{Linux Libertine O}
-%  \newfontfamily\greekfont{Linux Libertine O}[Script=Greek]
-%  \newfontfamily\hebrewfont{Linux Libertine O}[Script=Hebrew,Scale=1.2]
-
-%%  Use SBL BibLit font for Greek and Hebrew
-  \newfontfamily\greekfont{SBL BibLit}%
-    [Script=Greek,Contextuals=Alternate,Ligatures=Required]
-  \newfontfamily\hebrewfont{SBL BibLit}%
-    [Script=Hebrew,Contextuals=Alternate,Ligatures=Required,Scale=1.2]
-\else
-  \usepackage{libertineRoman}
-\fi
 
 %% Disable hyperlinks
 %\hypersetup{draft=true}
@@ -111,7 +101,7 @@ The page numbers for the noninitial pages of the paper (or chapter) are
 located at the top right corner. The text of the body of the paper is
 double-spaced except for blocked
 quotations.
-\begin{quoting}
+\begin{quote}
   \index{quotations!block}%
   This is a blocked quotation. It should consist of five or more lines of text
   and be indented one-half inch. Block quotations should be single-spaced. No
@@ -121,7 +111,7 @@ quotations.
   regular spacing resumes after the end of the quotation.\footnote{The first
   line of a footnote is indented one-half inch. A 10-point font is acceptable.
   Footnotes, unlike the main text of the paper, should be single-spaced.}
-\end{quoting}
+\end{quote}
 After a block quotation, return to double-spaced text justified to the left
 margin until you finish the paragraph.
 
@@ -142,28 +132,37 @@ citations in parentheses. For example, here is a dictionary with a shorthand:
 the same article referenced in two different
 publications.\autocites{freedman:1977,freedman:1980}
 
-%% Use xelatex or lualatex if you need Greek or Hebrew
+%% Use xelatex or lualatex if you need Hebrew
+\section{Greek
+  \ifxetexorluatex
+    and Hebrew%
+  \fi}
+
+\index{Greek!paragraph}Paragraph Greek:
+\begin{quote}
+  \selectlanguage{polutonikogreek}
+  Ἐν ἀρχῇ ἦν ὁ λόγος, καὶ ὁ λόγος ἦν πρὸς τὸν θεόν, καὶ θεὸς ἦν ὁ λόγος.
+  \foreignlanguage{american}{(\pibibleverse{John 1:1})}
+\end{quote}
 \ifxetexorluatex
-  \section{Greek and Hebrew}
-
-  \index{Greek!paragraph}Paragraph Greek:
-  \begin{quoting}
-    \begin{greek}
-      Ἐν ἀρχῇ ἦν ὁ λόγος, καὶ ὁ λόγος ἦν πρὸς τὸν θεόν, καὶ θεὸς ἦν ὁ λόγος.
-      \textenglish{(\pibibleverse{John 1:1})}
-    \end{greek}
-  \end{quoting}
   \index{Hebrew!paragraph}Paragraph Hebrew:
-  \begin{quoting}
-    \begin{hebrew}
-      בְּרֵאשִׁית בָּרָא אֱלֹהִים אֵת הַשָּׁמַיִם וְאֵת הָאָרֶץ.
-      \textenglish{(\pibibleverse{Genesis 1:1})}
-    \end{hebrew}
-  \end{quoting}
-  \index{Greek!inline}Inline Greek (\textgreek{Ἐν ἀρχῇ}),
+  \begin{quote}
+    \selectlanguage{hebrew}
+    \ifxetex
+      \raggedleft
+    \fi
+    בְּרֵאשִׁית בָּרָא אֱלֹהִים אֵת הַשָּׁמַיִם וְאֵת הָאָרֶץ.
+    \foreignlanguage{american}{(\pibibleverse{Genesis 1:1})}
+  \end{quote}
+\fi
+\ifxetexorluatex
+  \index{Greek!inline}Inline Greek (\foreignlanguage{greek}{Ἐν ἀρχῇ}),
   \index{Greek!transliterated}transliterated Greek (\emph{En archē}),
-  \index{Hebrew!inline}Hebrew (\texthebrew{בראשית}), and
+  \index{Hebrew!inline}Hebrew (\foreignlanguage{hebrew}{בראשית}), and
   \index{Hebrew!transliterated}transliterated Hebrew (\emph{bərēʾšı̂t}).
+\else
+  \index{Greek!inline}Inline Greek (\foreignlanguage{greek}{Ἐν ἀρχῇ}) and
+  \index{Greek!transliterated}transliterated Greek (\emph{En archē}).
 \fi
 
 \appendix