biblatex-sbl (24may18)

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

4 files changed, 112 insertions, 32 deletions

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 99c1fab599f..b7cfe74ca19 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
@@ -15,13 +15,33 @@
 % VERSION STRINGS
 % ------------------------------------------------------------------
 
-\def\sbl@abx@date{2018/05/20}
-\def\sbl@abx@version{0.9}
+\def\sbl@abx@date{2018/05/24}
+\def\sbl@abx@version{0.10}
 \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}
+\def\sbl@abx@lbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl localization (DCP)}
 \def\sbl@abx@defid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl definitions and macros (DCP)}
 
+\def\printsblversion{\sbl@abx@version\space
+                     \expandafter\xprintsbldateiso\sbl@abx@date\relax}
+\def\printsbldate{\expandafter\xprintsbldateau\sbl@abx@date\relax}
+\def\xprintsbldateiso#1/#2/#3\relax{%
+  #1-%
+  \ifblank{#2}
+    {\kern 1pt-}
+    {#2-#3}}
+\def\xprintsbldateau#1/#2/#3\relax{%
+  \ifblank{#2}
+    {}
+    {\ifblank{#3}
+       {}
+       {\ifcase#3 \or
+        1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or 9\else#3\fi\space}%
+     \ifcase#2 \or
+     January\or February\or March\or April\or May\or June\or July\or
+     August\or September\or October\or November\or December\fi\space}%
+  #1}
+
 \ProvidesFile{biblatex-sbl.def}[\sbl@abx@defid]
 
 % ------------------------------------------------------------------
@@ -284,6 +304,10 @@
     {\ExecuteBibliographyOptions{loccittracker=true}}
     {\ExecuteBibliographyOptions{loccittracker=false}}}
 
+\newtoggle{blx@dashed}
+\DeclareBibliographyOption{dashed}[true]{%
+  \settoggle{blx@dashed}{#1}}
+
 \ExecuteBibliographyOptions{%
   citetracker,
   punctfont,
@@ -310,6 +334,7 @@
   useseries,
   accessdate=false,
   shorthand=true,
+  dashed=true,
   language=american
 }
 
@@ -373,7 +398,7 @@
 \DeclareFieldFormat{doi}{%
   \printtext{doi}\addcolon
   \ifhyperref
-    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+    {\href{https://dx.doi.org/#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
 \DeclareFieldFormat{edition}{%
   \ifinteger{#1}
@@ -398,7 +423,7 @@
   \newunitpunct
   arXiv\addcolon\space
   \ifhyperref
-    {\href{http://arxiv.org/\abx@arxivpath/#1}{%
+    {\href{https://arxiv.org/\abx@arxivpath/#1}{%
        \nolinkurl{#1}%
        \iffieldundef{eprintclass}
          {}
@@ -699,8 +724,7 @@
     {\iffieldundef{shortseries}
        {}
        {\bibhypertarget{\strfield{shortseries}}{}%
-        \printfield{series}}
-       }
+        \printfield{series}}}
     {\bibhypertarget{\strfield{shorthand}}{}%
      \iffieldsequal{shorthand}{shorttitle}
        {\toggletrue{blx@abbrevcite}}
@@ -2398,7 +2422,13 @@
   \ifbool{usevolpostnotedelim}
     {\setunit{\volpostnotedelim}}
     {\setunit{\postnotedelim}}%
-  \usebibmacro{postnote}%
+  \ifboolexpr{
+    test {\ifciteseen}
+    or
+    test {\iffieldundef{pages}}
+  }
+    {\printfield{postnote}}
+    {\usebibmacro{pages}}%
   \global\booltrue{suppresspostnote}}
 
 \newbibmacro*{classic:translator+series}{%
@@ -2479,6 +2509,7 @@
        or
        test {\iffieldequalstr{entrysetcount}{1}}
     )
+    and togl {blx@dashed}
   }
     {#1}
     {#2}}
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 438ebf34e8d..65a1884b92b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
@@ -13,28 +13,11 @@
 %The Current Maintainer of this work is David Purton.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{sbl-paper}
-  [2018/05/20 Society of Bibilical Literature Paper Style (DCP)]
-
-
-% xetex/luatex engine test set up
-
-\RequirePackage{ifxetex}
-\RequirePackage{ifluatex}
-\newif\ifxetexorluatex
-\ifxetex
-  \xetexorluatextrue
-\else
-  \ifluatex
-    \xetexorluatextrue
-  \else
-    \xetexorluatexfalse
-  \fi
-\fi
+  [2018/05/24 Society of Bibilical Literature Paper Style (DCP)]
 
 
 % Load required packages
 
-\RequirePackage{csquotes}
 \RequirePackage[headheight=14.5pt,margin=1in]{geometry}
 \RequirePackage{textcase}
 \RequirePackage{setspace}
@@ -43,7 +26,7 @@
 \RequirePackage{fancyhdr}
 \RequirePackage[bottom]{footmisc}
 \RequirePackage{bibleref-parse}
-\RequirePackage[style=sbl,indexing=cite]{biblatex}
+\RequirePackage[style=sbl]{biblatex}
 \RequirePackage{imakeidx}
 \RequirePackage{hyperref}
 
@@ -383,6 +366,20 @@
 
 % Set up Bible references
 
+\newcommand{\Pbibleverse}[2][]{%
+  \begingroup
+  \csdef{br@Ps}{Psalm}%
+  \brfullname
+  \pbibleverse[#1]{#2}%
+  \endgroup}
+
+\newcommand{\Pibibleverse}[2][]{%
+  \begingroup
+  \brfullname
+  \csdef{br@Ps}{Psalm}%
+  \pibibleverse[#1]{#2}%
+  \endgroup}
+
 \braltabbrvname
 \renewcommand*{\BRperiod}{}
 \renewcommand*{\BRchsep}{;\space}
@@ -466,71 +463,122 @@
 \csdef{br@newtestament}{New Testament}
 
 \biblerefmap{Gen}{01@\br@oldtestament !01}
+\biblerefmap{Genesis}{01@\br@oldtestament !01}
 \biblerefmap{Exod}{01@\br@oldtestament !02}
+\biblerefmap{Exodus}{01@\br@oldtestament !02}
 \biblerefmap{Lev}{01@\br@oldtestament !03}
+\biblerefmap{Leviticus}{01@\br@oldtestament !03}
 \biblerefmap{Num}{01@\br@oldtestament !04}
+\biblerefmap{Numbers}{01@\br@oldtestament !04}
 \biblerefmap{Deut}{01@\br@oldtestament !05}
+\biblerefmap{Deuteronomy}{01@\br@oldtestament !05}
 \biblerefmap{Josh}{01@\br@oldtestament !06}
+\biblerefmap{Joshua}{01@\br@oldtestament !06}
 \biblerefmap{Judg}{01@\br@oldtestament !07}
+\biblerefmap{Judges}{01@\br@oldtestament !07}
 \biblerefmap{Ruth}{01@\br@oldtestament !08}
 \biblerefmap{Sam1}{01@\br@oldtestament !09}
+\biblerefmap{Samuel1}{01@\br@oldtestament !09}
 \biblerefmap{Sam2}{01@\br@oldtestament !10}
+\biblerefmap{Samuel2}{01@\br@oldtestament !10}
 \biblerefmap{Kgs1}{01@\br@oldtestament !11}
+\biblerefmap{Kings1}{01@\br@oldtestament !11}
 \biblerefmap{Kgs2}{01@\br@oldtestament !12}
+\biblerefmap{Kings2}{01@\br@oldtestament !12}
 \biblerefmap{Chr1}{01@\br@oldtestament !13}
+\biblerefmap{Chronicles1}{01@\br@oldtestament !13}
 \biblerefmap{Chr2}{01@\br@oldtestament !14}
+\biblerefmap{Chronicles2}{01@\br@oldtestament !14}
 \biblerefmap{Ezra}{01@\br@oldtestament !15}
 \biblerefmap{Neh}{01@\br@oldtestament !16}
+\biblerefmap{Nehemiah}{01@\br@oldtestament !16}
 \biblerefmap{Esth}{01@\br@oldtestament !17}
+\biblerefmap{Esther}{01@\br@oldtestament !17}
 \biblerefmap{Job}{01@\br@oldtestament !18}
 \biblerefmap{Ps}{01@\br@oldtestament !19}
+\biblerefmap{Psalm}{01@\br@oldtestament !19}
 \biblerefmap{Prov}{01@\br@oldtestament !20}
+\biblerefmap{Proverbs}{01@\br@oldtestament !20}
 \biblerefmap{Eccl}{01@\br@oldtestament !21}
+\biblerefmap{Ecclesiastes}{01@\br@oldtestament !21}
 \biblerefmap{Song}{01@\br@oldtestament !22}
+\biblerefmap{Song of Songs}{01@\br@oldtestament !22}
 \biblerefmap{Isa}{01@\br@oldtestament !23}
+\biblerefmap{Isaiah}{01@\br@oldtestament !23}
 \biblerefmap{Jer}{01@\br@oldtestament !24}
+\biblerefmap{Jermiah}{01@\br@oldtestament !24}
 \biblerefmap{Lam}{01@\br@oldtestament !25}
+\biblerefmap{Lamentations}{01@\br@oldtestament !25}
 \biblerefmap{Ezek}{01@\br@oldtestament !26}
+\biblerefmap{Ezekiel}{01@\br@oldtestament !26}
 \biblerefmap{Dan}{01@\br@oldtestament !27}
+\biblerefmap{Daniel}{01@\br@oldtestament !27}
 \biblerefmap{Hos}{01@\br@oldtestament !28}
+\biblerefmap{Hosea}{01@\br@oldtestament !28}
 \biblerefmap{Joel}{01@\br@oldtestament !29}
 \biblerefmap{Amos}{01@\br@oldtestament !30}
 \biblerefmap{Obad}{01@\br@oldtestament !31}
+\biblerefmap{Obadiah}{01@\br@oldtestament !31}
 \biblerefmap{Jonah}{01@\br@oldtestament !32}
 \biblerefmap{Mic}{01@\br@oldtestament !33}
+\biblerefmap{Micah}{01@\br@oldtestament !33}
 \biblerefmap{Nah}{01@\br@oldtestament !34}
+\biblerefmap{Nahum}{01@\br@oldtestament !34}
 \biblerefmap{Hab}{01@\br@oldtestament !35}
+\biblerefmap{Habakkuk}{01@\br@oldtestament !35}
 \biblerefmap{Zeph}{01@\br@oldtestament !36}
+\biblerefmap{Zephaniah}{01@\br@oldtestament !36}
 \biblerefmap{Hag}{01@\br@oldtestament !37}
+\biblerefmap{Haggai}{01@\br@oldtestament !37}
 \biblerefmap{Zech}{01@\br@oldtestament !38}
+\biblerefmap{Zechariah}{01@\br@oldtestament !38}
 \biblerefmap{Mal}{01@\br@oldtestament !39}
+\biblerefmap{Malachi}{01@\br@oldtestament !39}
 
 \biblerefmap{Matt}{02@\br@newtestament !01}
+\biblerefmap{Matthew}{02@\br@newtestament !01}
 \biblerefmap{Mark}{02@\br@newtestament !02}
 \biblerefmap{Luke}{02@\br@newtestament !03}
 \biblerefmap{John}{02@\br@newtestament !04}
 \biblerefmap{Acts}{02@\br@newtestament !05}
 \biblerefmap{Rom}{02@\br@newtestament !06}
+\biblerefmap{Romans}{02@\br@newtestament !06}
 \biblerefmap{Cor1}{02@\br@newtestament !07}
+\biblerefmap{Corinthians1}{02@\br@newtestament !07}
 \biblerefmap{Cor2}{02@\br@newtestament !08}
+\biblerefmap{Corinthians2}{02@\br@newtestament !08}
 \biblerefmap{Gal}{02@\br@newtestament !09}
+\biblerefmap{Galatians}{02@\br@newtestament !09}
 \biblerefmap{Eph}{02@\br@newtestament !10}
+\biblerefmap{Ephesians}{02@\br@newtestament !10}
 \biblerefmap{Phil}{02@\br@newtestament !11}
+\biblerefmap{Philippians}{02@\br@newtestament !11}
 \biblerefmap{Col}{02@\br@newtestament !12}
+\biblerefmap{Colossians}{02@\br@newtestament !12}
 \biblerefmap{Thess1}{02@\br@newtestament !13}
+\biblerefmap{Thessalonians1}{02@\br@newtestament !13}
 \biblerefmap{Thess2}{02@\br@newtestament !14}
+\biblerefmap{Thessalonians2}{02@\br@newtestament !14}
 \biblerefmap{Tim1}{02@\br@newtestament !15}
+\biblerefmap{Timothy1}{02@\br@newtestament !15}
 \biblerefmap{Tim2}{02@\br@newtestament !16}
+\biblerefmap{Timothy2}{02@\br@newtestament !16}
 \biblerefmap{Titus}{02@\br@newtestament !17}
 \biblerefmap{Phlm}{02@\br@newtestament !18}
+\biblerefmap{Phlemon}{02@\br@newtestament !18}
 \biblerefmap{Heb}{02@\br@newtestament !19}
+\biblerefmap{Hebrews}{02@\br@newtestament !19}
 \biblerefmap{Jas}{02@\br@newtestament !20}
+\biblerefmap{James}{02@\br@newtestament !20}
 \biblerefmap{Pet1}{02@\br@newtestament !21}
+\biblerefmap{Peter1}{02@\br@newtestament !21}
 \biblerefmap{Pet2}{02@\br@newtestament !22}
+\biblerefmap{Peter2}{02@\br@newtestament !22}
 \biblerefmap{John1}{02@\br@newtestament !23}
 \biblerefmap{John2}{02@\br@newtestament !24}
 \biblerefmap{John3}{02@\br@newtestament !25}
 \biblerefmap{Jude}{02@\br@newtestament !26}
 \biblerefmap{Rev}{02@\br@newtestament !27}
+\biblerefmap{Revelation}{02@\br@newtestament !27}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
index b2872b1ee1a..4c9ee7f50de 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
@@ -6,8 +6,8 @@
   \citereset
   \global\undef\bbx@lasthash
   \def\abx@str{abx@lstr}%
-  \renewcommand*{\relateddelim}{\addperiod\space}
-  \renewcommand*{\begrelateddelim}{\addperiod\space}
+  \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 e19185c6d28..9d15a05e876 100644
--- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx
@@ -98,8 +98,8 @@
   \DeclareNameAlias{editor}{sortname}%
   \DeclareNameAlias{translator}{sortname}%
   \renewcommand*{\newunitpunct}{\addperiod\space}%
-  \renewcommand*{\relateddelim}{\addperiod\space}
-  \renewcommand*{\begrelateddelim}{\addperiod\space}
+  \renewcommand*{\relateddelim}{\addperiod\space}%
+  \renewcommand*{\begrelateddelim}{\addperiod\space}%
   \sloppy
   \printtext{\usedriver{}{\thefield{entrytype}}}}
 
@@ -391,7 +391,8 @@
      \usebibmacro{related:init}%
      \usebibmacro{related}%
      \global\toggletrue{relatedseen}}
-    {\usebibmacro{volume+part+postnote}%
+    {\clearfield{pages}%
+     \usebibmacro{volume+part+postnote}%
      \usebibmacro{classic:translator+series}}%
   \usebibmacro{finentry}}