biblatex-sbl (20may18)

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

9 files changed, 92 insertions, 125 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-american.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/american-sbl.lbx
index 4add7d40525..95f47d3d09a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/american-sbl.lbx
@@ -1,10 +1,10 @@
-\ProvidesFile{sbl-american.lbx}[\sbl@abx@lbxid]
+\ProvidesFile{american-sbl.lbx}[\sbl@abx@lbxid]
 
-\InheritBibliographyStrings{sbl-english}
+\InheritBibliographyStrings{american}
+
+\InheritBibliographyExtras{american}
 
 \DeclareBibliographyExtras{%
-  \DeclarePunctuationPairs{colon}{*}%
-  \uspunctuation
   \protected\def\mkdaterangecomp{%
     \mkdaterangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def b/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
index 7a287246d8b..99c1fab599f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
@@ -1,11 +1,11 @@
 \RequireBibliographyStyle{standard}
 \RequireBiber[3]
 
-% BibLaTeX version 2017/11/05 v3.8a or greater required
-\@ifpackagelater{biblatex}{2017/11/05}
+% BibLaTeX version 2018/03/04 v3.11 or greater required
+\@ifpackagelater{biblatex}{2018/03/04}
   {}
   {\PackageError{biblatex-sbl}
-     {BibLaTeX v3.8a or greater is required}
+     {BibLaTeX v3.11 or greater is required}
      {You need to update your TeX distribution to use biblatex-sbl.}}
 
 % Require xparse
@@ -15,8 +15,8 @@
 % VERSION STRINGS
 % ------------------------------------------------------------------
 
-\def\sbl@abx@date{2017/11/16}
-\def\sbl@abx@version{0.8.2}
+\def\sbl@abx@date{2018/05/20}
+\def\sbl@abx@version{0.9}
 \def\sbl@abx@bbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl bibliography style (DCP)}
 \def\sbl@abx@cbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl citation style (DCP)}
 \def\sbl@abx@lbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl localization}
@@ -173,20 +173,12 @@
 % IDEM MACROS
 % ------------------------------------------------------------------
 
-% only use idem within footnote
-\let\cbx@ifmpfncheck\blx@ifmpfncheck
-\patchcmd{\cbx@ifmpfncheck}{\tw@}{\@ne}{}{}
-\let\cbx@ifciteidem@constrict\blx@ifciteidem@constrict
-\patchcmd{\cbx@ifciteidem@constrict}{\blx@ifmpfncheck}{\cbx@ifmpfncheck}{}{}
-
-\def\blx@opt@idemtracker@constrict{%
-  \let\blx@imc@ifciteidem\cbx@ifciteidem@constrict
-  \let\blx@idemtracker\blx@idemtracker@constrict
-  \let\blx@idemreset\blx@idemreset@context
-  \booltrue{citetracker}}
-
 \newbibmacro*{ifidemused}{%
-  \ifciteidem
+  \ifboolexpr{
+    test {\ifciteidem}
+    and
+    not test {\iffirstonpage}
+  }
     {\bibstring[\mkibid]{idem\thefield{gender}}%
      \@firstoftwo}
     {\@secondoftwo}}
@@ -303,7 +295,9 @@
   related,
   minxrefs=1,
   isbn=false,
-  ibidtracker=false,
+  pagetracker,
+  idemtracker=constrict,
+  ibidtracker=constrict,
   ibidpage=false,
   maxbibnames=99,
   maxcitenames=3,
@@ -315,7 +309,8 @@
   usevolume,
   useseries,
   accessdate=false,
-  shorthand=true
+  shorthand=true,
+  language=american
 }
 
 \ExecuteBibliographyOptions[classictext,ancienttext]{%
@@ -344,16 +339,34 @@
 \NewBibliographyString{patentfiled}
 \NewBibliographyString{released}
 
-\DeclareLanguageMapping{english}{sbl-american}
-\DeclareLanguageMapping{american}{sbl-american}
-\DeclareLanguageMapping{british}{sbl-british}
-\DeclareLanguageMapping{german}{sbl-german}
-\DeclareLanguageMapping{spanish}{sbl-spanish}
+\DeclareLanguageMappingSuffix{-sbl}
+
+% Ensure right colon punctuation when reset
+\protected\def\blx@resetpunct{%
+  \DeclareCapitalPunctuation{.!?}%
+  \DeclarePunctuationPairs{dot}{}%
+  \DeclarePunctuationPairs{comma}{*!?}%
+  \DeclarePunctuationPairs{semicolon}{*!?}%
+  \DeclarePunctuationPairs{colon}{*}%
+  \DeclarePunctuationPairs{period}{}%
+  \DeclarePunctuationPairs{exclam}{*}%
+  \DeclarePunctuationPairs{question}{*}%
+  \DeclareQuotePunctuation{}%
+  \def\abx@dot{\ifdim\lastkern>\z@\unkern\fi.\spacefactor\blx@sf@dot}%
+  \def\abx@comma{\ifdim\lastkern>\z@\unkern\fi\abx@puncthook{,}}%
+  \def\abx@semicolon{\abx@puncthook{;}}%
+  \def\abx@colon{\abx@puncthook{:}}%
+  \def\abx@period{\ifdim\lastkern>\z@\unkern\fi\abx@puncthook{.}}%
+  \def\abx@exclam{\abx@puncthook{!}}%
+  \def\abx@question{\abx@puncthook{?}}%
+  \global\let\abx@puncthook\@firstofone
+  \global\let\blx@postpunct\@empty}
 
 \renewcommand*{\subtitlepunct}{\addcolon\space}
 \newcommand*{\namedashpunct}{\adddot\space}
 \newcommand*{\lexiconfinalnamedelim}{\addcomma\space}
 \renewcommand*{\relateddelim}{\addsemicolon\space}
+\renewcommand*{\begrelateddelim}{\addsemicolon\space}
 
 \setcounter{mincompwidth}{10}
 
@@ -743,7 +756,7 @@
 %   - copy titles to shorttitles if they are empty
 % ------------------------------------------------------------------
 
-\DeclareSourcemap{
+\DeclareStyleSourcemap{
   \maps{
     \map{
       \step[fieldsource=title, match=\regexp{(.*?):}, final]
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-english.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/english-sbl.lbx
index 4a239ee8da2..e56c07368a1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/english-sbl.lbx
@@ -1,4 +1,6 @@
-\ProvidesFile{sbl-english.lbx}[\sbl@abx@lbxid]
+\ProvidesFile{english-sbl.lbx}[\sbl@abx@lbxid]
+
+\InheritBibliographyExtras{english}
 
 \DeclareBibliographyStrings{%
   inherit          = {english},
@@ -26,3 +28,7 @@
   annodomini       = {{AD}{AD}},
   beforechrist     = {{BC}{BC}}
 }
+
+\DeclareBibliographyExtras{%
+  \DeclarePunctuationPairs{colon}{*}%
+}
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-german.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/german-sbl.lbx
index 055b51f15ad..cb98da01851 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/german-sbl.lbx
@@ -1,4 +1,6 @@
-\ProvidesFile{sbl-german.lbx}[\sbl@abx@lbxid]
+\ProvidesFile{german-sbl.lbx}[\sbl@abx@lbxid]
+
+\InheritBibliographyExtras{german}
 
 \DeclareBibliographyStrings{%
   inherit          = {german},
@@ -24,9 +26,3 @@
   annodomini       = {{n\adddotspace Chr\adddot}{n\adddotspace Chr\adddot}},
   beforechrist     = {{v\adddotspace Chr\adddot}{v\adddotspace Chr\adddot}},
 }
-
-\InheritBibliographyExtras{german}
-
-\DeclareBibliographyExtras{%
-  \DeclarePunctuationPairs{colon}{*}%
-}
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-british.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-british.lbx
deleted file mode 100644
index 73f8b0f6287..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-british.lbx
+++ /dev/null
@@ -1,9 +0,0 @@
-\ProvidesFile{sbl-british.lbx}[\sbl@abx@lbxid]
-
-\InheritBibliographyStrings{sbl-english}
-
-\InheritBibliographyExtras{british}
-
-\DeclareBibliographyExtras{%
-  \DeclarePunctuationPairs{colon}{*}%
-}
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
index 77dcb8705ab..438ebf34e8d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
@@ -1,4 +1,4 @@
-%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
@@ -13,7 +13,7 @@
 %The Current Maintainer of this work is David Purton.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{sbl-paper}
-  [2017/11/16 Society of Bibilical Literature Paper Style (DCP)]
+  [2018/05/20 Society of Bibilical Literature Paper Style (DCP)]
 
 
 % xetex/luatex engine test set up
@@ -34,43 +34,22 @@
 
 % Load required packages
 
-\ifxetexorluatex
-  \RequirePackage{fontspec}
-  \RequirePackage{polyglossia}
-\else
-  \RequirePackage[T1]{fontenc}
-  \RequirePackage[utf8]{inputenc}
-  \RequirePackage[base]{babel}
-\fi
-
 \RequirePackage{csquotes}
-\RequirePackage{ragged2e}
 \RequirePackage[headheight=14.5pt,margin=1in]{geometry}
 \RequirePackage{textcase}
 \RequirePackage{setspace}
 \RequirePackage{titlesec}
 \RequirePackage{titletoc}
-\RequirePackage{quoting}
 \RequirePackage{fancyhdr}
 \RequirePackage[bottom]{footmisc}
 \RequirePackage{bibleref-parse}
-\RequirePackage[style=sbl,indexing=cite,backend=biber]{biblatex}
+\RequirePackage[style=sbl,indexing=cite]{biblatex}
 \RequirePackage{imakeidx}
 \RequirePackage{hyperref}
 
 
-% work around bidi redefining theindex
-\ifxetex
-  \let\imakeidxtheindex\theindex
-  \let\imakeidxendtheindex\endtheindex
-  \AtBeginDocument{%
-    \let\theindex\imakeidxtheindex
-    \let\endtheindex\imakeidxendtheindex
-  }
-\fi
-
-
 % patch index commands so contents is in all caps
+
 \patchcmd{\imki@putindexsplit}
 {\addcontentsline{toc}{\imki@toclevel}{\imki@title}}
 {\addcontentsline{toc}{\imki@toclevel}{\MakeTextUppercase{\imki@title}}}
@@ -86,32 +65,6 @@
 \fi
 
 
-% Set up languages
-
-\ifxetexorluatex
-  \setdefaultlanguage[variant=american]{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
-\fi
-
-
 % Set up document spacing
 
 \doublespacing
@@ -136,8 +89,18 @@
 
 % set up quotations
 
-\quotingsetup{leftmargin=0.5in,rightmargin=0in,vskip=0pt}
-\renewcommand*{\quotingfont}{\singlespacing\vspace*{-5pt}}
+\renewenvironment{quote}%
+                 {\list{}{\leftmargin    0.5in
+                          \rightmargin   \z@
+                          \topsep        \z@
+                          \partopsep     \z@
+                          \itemsep       \z@
+                          \parsep        \z@
+                          \itemindent    \z@
+                          \listparindent 0.5in
+                          }%
+                        \item[]\singlespacing\vspace*{-5pt}}%
+                 {\endlist}
 
 
 % Set up Bibliography
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
index e496901a84c..b2872b1ee1a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
@@ -7,6 +7,7 @@
   \global\undef\bbx@lasthash
   \def\abx@str{abx@lstr}%
   \renewcommand*{\relateddelim}{\addperiod\space}
+  \renewcommand*{\begrelateddelim}{\addperiod\space}
   \renewcommand*{\revsdnamedelim}{\addcomma}%
   \DeclareNameAlias{author}{sortname}%
   \DeclareNameAlias{editor}{sortname}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx
index 786d77030bd..e19185c6d28 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx
@@ -76,11 +76,11 @@
     {\usebibmacro{setaltpostnotedelim}%
      \setunit{\postnotedelim}%
      \printfield{altpostnote}%
-     \setunit{\addspace}%
-     \printtext[parens]{%
-       \usebibmacro{related:init}%
-       \usebibmacro{related}%
-       \usebibmacro{volume+part+postnote}}} 
+     \DeclareFieldFormat{related}{\mkbibparens{##1}}%
+     \renewcommand*{\begrelateddelim}{\addspace}%
+     \renewbibmacro*{endrelatedloop}{\usebibmacro{volume+part+postnote}}%
+     \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {\ifciteseen
        {}
        {\newunit
@@ -98,6 +98,8 @@
   \DeclareNameAlias{editor}{sortname}%
   \DeclareNameAlias{translator}{sortname}%
   \renewcommand*{\newunitpunct}{\addperiod\space}%
+  \renewcommand*{\relateddelim}{\addperiod\space}
+  \renewcommand*{\begrelateddelim}{\addperiod\space}
   \sloppy
   \printtext{\usedriver{}{\thefield{entrytype}}}}
 
@@ -155,8 +157,7 @@
     test {\iffieldundef{related}}
   }
     {}
-    {\setunit{\addsemicolon\space}%
-     \usebibmacro{related:init}%
+    {\usebibmacro{related:init}%
      \usebibmacro{related}}}
 
 \DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
@@ -359,15 +360,15 @@
             test {\iffieldequalstr{entrysubtype}{COS}}
          }}
   }
-    {\newunit
+    {\renewcommand*{\begrelateddelim}{\newunitpunct}%
      \usebibmacro{related:init}%
      \usebibmacro{related}%
      \usebibmacro{volume+part+postnote}}
-    {\setunit{\addspace}%
-     \printtext[parens]{%
-       \usebibmacro{related:init}%
-       \usebibmacro{related}%
-       \usebibmacro{volume+part+postnote}}}%
+    {\DeclareFieldFormat{related}{\mkbibparens{##1}}%
+     \renewcommand*{\begrelateddelim}{\addspace}%
+     \renewbibmacro*{endrelatedloop}{\usebibmacro{volume+part+postnote}}%
+     \usebibmacro{related:init}%
+     \usebibmacro{related}}%
   \global\toggletrue{relatedseen}
   \usebibmacro{finentry}}
 
@@ -384,11 +385,11 @@
   \iffieldequalstr{entrysubtype}{churchfather}
     {\setunit{\addspace}%
      \printfield{altpostnote}%
-     \setunit{\addspace}%
-     \printtext[parens]{%
-       \usebibmacro{related:init}%
-       \usebibmacro{related}%
-       \usebibmacro{volume+part+postnote}}%
+     \DeclareFieldFormat{related}{\mkbibparens{##1}}%
+     \renewcommand*{\begrelateddelim}{\addspace}%
+     \renewbibmacro*{endrelatedloop}{\usebibmacro{volume+part+postnote}}%
+     \usebibmacro{related:init}%
+     \usebibmacro{related}%
      \global\toggletrue{relatedseen}}
     {\usebibmacro{volume+part+postnote}%
      \usebibmacro{classic:translator+series}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-spanish.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/spanish-sbl.lbx
index 7b2a13dd310..e6a8345dfa4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/spanish-sbl.lbx
@@ -1,4 +1,6 @@
-\ProvidesFile{sbl-spanish.lbx}[\sbl@abx@lbxid]
+\ProvidesFile{spanish-sbl.lbx}[\sbl@abx@lbxid]
+
+\InheritBibliographyExtras{spanish}
 
 \DeclareBibliographyStrings{%
   inherit          = {spanish},
@@ -25,9 +27,3 @@
   annodomini       = {{d\adddotspace C\adddot}{d\adddotspace C\adddot}},
   beforechrist     = {{a\adddotspace C\adddot}{a\adddotspace C\adddot}}
 }
-
-\InheritBibliographyExtras{spanish}
-
-\DeclareBibliographyExtras{%
-  \DeclarePunctuationPairs{colon}{*}%
-}