texlive[42972] Master/texmf-dist: biblatex-sbl (15jan17)

commits+karl at tug.org commits+karl at tug.org
Tue Jan 17 00:12:25 CET 2017


Revision: 42972
          http://tug.org/svn/texlive?view=revision&revision=42972
Author:   karl
Date:     2017-01-17 00:12:25 +0100 (Tue, 17 Jan 2017)
Log Message:
-----------
biblatex-sbl (15jan17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/biblatex-sbl/README.md
    trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.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.tex
    trunk/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
    trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-american.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-english.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-german.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
    trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-spanish.lbx
    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

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/README.md	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/README.md	2017-01-16 23:12:25 UTC (rev 42972)
@@ -11,16 +11,14 @@
 * `biblatex-sbl-test.pdf`: Example usage for all example citations in the handbook.
 * `biblatex-sbl-ibid.pdf`: Example usage of *ibidem* and *idem* settings.
 * `sbl-paper.sty`: A style file for papers matching the Student Supplement to the SBLHS.
-* `sbl-paper-bibleref.ist`: An index style file for printing a Scripture Reference Index (used with `sbl-paper.sty`).
 * `sbl-paper.tex`: An example paper using `sbl-paper.sty`.
+* `sbl-paper-bibleref.ist`: An index style file for printing a Scripture Reference Index (used with `sbl-paper.tex`).
 
 ## Manual Installation
 
-* Copy `biblatex-sbl.def`, `sbl.cbx`, `sbl.bbx`, `sbl.dbx`, and `*.lbx` into `$TEXMFHOME/tex/latex/biblatex-sbl/`
-* Copy `*.pdf` and `sbl-paper.tex` into `$TEXMFHOME/doc/latex/biblatex-sbl/`
-* Copy `sbl-paper.sty` into `$TEXMFHOME/tex/latex/sbl-paper/`
-* Copy `sbl-paper-bibleref.ist` into `$TEXMFHOME/makeindex/sbl-paper/`
-* Copy `biblatex-sbl.bib` into `$TEXMFHOME/bibtex/bib/biblatex-sbl/`
+* Copy `sbl-paper.sty`, `biblatex-sbl.def`, `sbl.cbx`, `sbl.bbx`, `sbl.dbx`, and `*.lbx` into `$TEXMFHOME/tex/latex/biblatex-sbl/`
+* Copy `*.pdf`, `biblatex-sbl.bib`, and `sbl-paper.tex` into `$TEXMFHOME/doc/latex/biblatex-sbl/`
+* Copy `sbl-paper-bibleref.ist` into `$TEXMFHOME/makeindex/biblatex-sbl/`
 
 You can find `$TEXMFHOME` by running:
 
@@ -38,7 +36,7 @@
 ## Licence
 
 ```
-Copyright 2015-2016 David Purton
+Copyright 2015-2017 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-ibid.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex	2017-01-16 23:12:25 UTC (rev 42972)
@@ -56,7 +56,8 @@
 \patchcmd{\lst at Init}{\par\penalty -50\relax}{\relax}
 \makeatother
 
-\hyphenation{nash-ville}
+\hyphenation{nash-ville deu-te-ro-ca-no-ni-cal}
+\renewcommand{\slash}{/\penalty\exhyphenpenalty\hspace{0pt}}
 
 \definecolor{biblatex-colour}{rgb}{0.25,0.25,0.65}
 \definecolor{reference-colour}{rgb}{0,0.6,0.15}
@@ -110,11 +111,12 @@
       {
         \sblrefsamplecite{autocite}{cite}{#2.~}[#3][#4]{#5}.\par
       }
-      \color{black}
+    \color{black}
   }
 \NewDocumentCommand \sampleparencite { s o o m }
   {
     \rmfamily
+    {\setlength{\bibindent}{0pt}%
     \IfBooleanTF { #1 }
       {
         \sblrefsamplecite*{parencite}{parencite}{}[#2][#3]{#4}\par
@@ -122,7 +124,8 @@
       {
         \sblrefsamplecite{parencite}{parencite}{}[#2][#3]{#4}\par
       }
-      \color{black}
+    }
+    \color{black}
   }
 \NewDocumentCommand \samplebib { s m }
   {
@@ -168,7 +171,7 @@
     @thesis, at mvreference, at inreference, at mvlexicon, at inlexicon, at unpublished,%
     @commentary, at inbook, at incommentary, at mvcommentary, at seminarpaper, at lexicon,%
     @reference, at mvcollection, at bookinbook, at ancienttext, at classictext, at online,%
-    @manual, at conferencepaper%
+    @manual, at conferencepaper, at series%
   },
   emph={%
     author,title,location,publisher,date,shorttitle,translator,edition,preface,%
@@ -177,7 +180,7 @@
     origpublisher,origdate,pubstate,origlanguage,maintitle,maineditor,part,%
     bookeditor,seriesseries,maintranslator,eprint,eprinttype,doi,url,%
     revdauthor,revdtitle,revdeditor,institution,type,shorthand,xref,%
-    note,releasedate,volumes,shortmaintitle,options,eprintclass,relatedoptions,%
+    note,eprintdate,volumes,shortmaintitle,options,eprintclass,relatedoptions,%
     editortype,crossref,editora,editorb,editorc,editoratype,editorbtyle,%
     editorctype,entrysubtype,sortkey,titleaddon,witheditor,witheditortype,%
     withtranslator,withtranslatortype,eventtitle,venue,eventdate,shortauthor%
@@ -689,7 +692,7 @@
   booktitle = {“Wer ist wie du, Herr, unter den Göttern?”: Studien zur Theologie und Religionsgeschichte Israels für Otto Kaiser zum~70. Geburtstag},
   editor = {Kottsieper, Ingo and others},
   location = {Göttingen},
-  publisher = {Vandenhoaeck \& Ruprecht},
+  publisher = {Vandenhoeck \& Ruprecht},
   date = {1995}
 }
 \end{lstlisting}  
@@ -1013,7 +1016,7 @@
   maintitle = {Hebrew Bible\slash Old Testament: The History of Its Interpretation},
   editor = {Sæbø, Magne},
   location = {Göttingen},
-  publisher = {Vandenhoaeck \& Ruprecht},
+  publisher = {Vandenhoeck \& Ruprecht},
   date = {1996}
 }
 \end{lstlisting}
@@ -1050,7 +1053,7 @@
   bookeditor = {Winter, Bruce W. and Clarke, Andrew D.},
   volume = {1},
   maintitle = {The Book of Acts in Its First Century Setting},
-  maineditor = {Winter, Bruce W.},
+  editor = {Winter, Bruce W.},
   location = {Grand Rapids},
   publisher = {Eerdmans},
   date = {1993}
@@ -1168,8 +1171,12 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplecite{14}[ch.~1.3]{reventlow:2009}
-  \samplecite{18}[ch.~1.3]{reventlow:2009}
+  \samplemacro{\textbackslash autocite[ch.\textasciitilde
+  1.3]\{reventlow:2009\}}
+  \samplecite*{14}[ch.~1.3]{reventlow:2009}
+  \samplemacro{\textbackslash autocite[ch.\textasciitilde
+  1.3]\{reventlow:2009\}}
+  \samplecite*{18}[ch.~1.3]{reventlow:2009}
   \samplebib{reventlow:2009}
 \end{biboutput}
 
@@ -1690,7 +1697,7 @@
 
   \refbiblist{\emph{NIDNTT}}{\emph{New International Dictionary of New
   Testament Theology.} Edited by Colin Brown. 4 vols. Grand Rapids: Zondervan,
-  1975-1985}
+  1975–1985}
 \end{refimp}
 
 \medskip
@@ -1994,7 +2001,7 @@
 \begin{lstlisting}
 @article{springer:2014,
   author = {Springer, Carl P. E.},
-  title = {Of Roosers and \mkbibemph{Repetitio}: Ambrose's \mkbibemph{Aeterne rerum conditor}},
+  title = {Of Roosters and \mkbibemph{Repetitio}: Ambrose's \mkbibemph{Aeterne rerum conditor}},
   journaltitle = {Vigiliae Christianae},
   shortjournal = {VC},
   volume = {68},
@@ -2347,7 +2354,9 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplecite{12}[§3 (A I 11--17)|26]{disappearanceofsungod}
+  \samplemacro{\textbackslash autocite[(§3 \textbackslash{}mkbibparens\{A I
+  11--17\})26]\{disappearanceofsungod\}}
+  \samplecite*{12}[(§3 \mkbibparens{A I 11--17})26]{disappearanceofsungod}
   \samplebib{hoffner:1990}
   \samplebiblist{hoffner:1990}
 \end{biboutput}
@@ -2370,7 +2379,7 @@
 @mvbook{RIMA,
   entrysubtype = {RIMA},
   author = {Grayson, Albert Kirk},
-  title = {Assyrian Rulers of the Early First Millennium BC \mkibparens{1114--859 BC}},
+  title = {Assyrian Rulers of the Early First Millennium BC \mkbibparens{1114--859 BC}},
   series = {The Royal Inscriptions of Mesopotamia, Assyrian Periods},
   shortseries = {RIMA},
   number = {2},
@@ -2391,12 +2400,12 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplemacro{\textbackslash autocite[obv.\textbackslash{} lines
-  10--17|]\{ashurinscription\}}
-  \samplecite*{32}[obv.\ lines 10--17|]{ashurinscription}
-  \samplemacro{\textbackslash autocite[obv.\textbackslash{} lines
-  10--17|]\{ashurinscription\}}
-  \samplecite*{34}[obv.\ lines 10--17|]{ashurinscription}
+  \samplemacro{(\textbackslash autocite[obv.\textbackslash{} lines
+  10--17)]\{ashurinscription\}}
+  \samplecite*{32}[(obv.\ lines 10--17)]{ashurinscription}
+  \samplemacro{(\textbackslash autocite[obv.\textbackslash{} lines
+  10--17)]\{ashurinscription\}}
+  \samplecite*{34}[(obv.\ lines 10--17)]{ashurinscription}
   \samplebib{RIMA}
   \samplebiblist{series-RIMA}
 \end{biboutput}
@@ -2441,8 +2450,8 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplecite{33}[lines 3--4|125]{esarhaddonchronicle}
-  \samplecite{34}[lines 3--4|125]{esarhaddonchronicle}
+  \samplecite{33}[(lines 3--4)125]{esarhaddonchronicle}
+  \samplecite{34}[(lines 3--4)125]{esarhaddonchronicle}
   \samplebib{ABC}
   \samplebiblist{ABC}
   \samplebiblist*{series-ABC}
@@ -2535,7 +2544,7 @@
 \begin{lstlisting}
 @mvbook{josephus,
   title = {Josephus},
-  translator = {Thackery, Henry St.\@ J. and others},
+  translator = {Thackeray, Henry St.\@ J. and others},
   volumes = {10},
   series = {Loeb Classical Library},
   shortseries = {LCL},
@@ -2547,8 +2556,7 @@
 @classictext{josephus:ant,
   author = {Josephus},
   title = {Ant\adddot},
-  xref = {josephus},
-  options = {skipbib}
+  xref = {josephus}
 }
 \end{lstlisting}
 
@@ -2600,7 +2608,7 @@
 \end{biboutput}
 
 \begin{refimp}
-  \hspace*{\bibindent}4. Tacitus, \emph{Ann.}\ 15.18–19
+  \hspace*{\bibindent}4. Tacitus, \emph{Ann.}\ 15.18–19.
 
   \hangindent\bibindent Tacitus. \emph{The Histories and The Annals.}
   Translated by Clifford H. Moore and John Jackson. 4 vols. LCL. Cambridge:
@@ -2614,7 +2622,7 @@
 \begin{lstlisting}
 @mvbook{josephus,
   title = {Josephus},
-  translator = {Thackery, Henry St.\@ J. and others},
+  translator = {Thackeray, Henry St.\@ J. and others},
   volumes = {10},
   series = {Loeb Classical Library},
   shortseries = {LCL},
@@ -2626,7 +2634,7 @@
 @classictext{josephus:ant:thackery,
   author = {Josephus},
   title = {Ant\adddot},
-  translator = {Thackery},
+  translator = {Thackeray},
   series = {Loeb Classical Library},
   shortseries = {LCL},
   xref = {josephus}
@@ -2698,7 +2706,7 @@
 \begin{lstlisting}
 @mvbook{josephus,
   title = {Josephus},
-  translator = {Thackery, Henry St.\@ J. and others},
+  translator = {Thackeray, Henry St.\@ J. and others},
   volumes = {10},
   series = {Loeb Classical Library},
   shortseries = {LCL},
@@ -2712,7 +2720,7 @@
   shortauthor = {Josephus},
   title = {The Jewish Antiquities, Books 1--19},
   shorttitle = {Ant\adddot},
-  translator =  {Thackery, Henry St.\@ J. and others},
+  translator =  {Thackeray, Henry St.\@ J. and others},
   series = {Loeb Classical Library},
   shortseries = {LCL},
   location = {Cambridge},
@@ -2791,8 +2799,8 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplecite{22}[59003|1:96]{p.cair.zen.:hunt+edgar}
-  \samplecite{22}[59003|§31]{p.cair.zen.:hunt+edgar}
+  \samplecite{22}[(59003)1:96]{p.cair.zen.:hunt+edgar}
+  \samplecite{22}[(59003)§31]{p.cair.zen.:hunt+edgar}
   \samplebib{hunt+edgar:1932}
   \samplebiblist{hunt+edgar:1932}
   \samplebiblist*{p.cair.zen.:hunt+edgar}
@@ -2869,7 +2877,7 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplecite{22}[III. 1-164|]{PGM:betz}
+  \samplecite{22}[(III. 1-164)]{PGM:betz}
   \samplebib{betz:1996}
   \samplebiblist{PGM:betz}
 \end{biboutput}
@@ -2918,7 +2926,7 @@
   date = {1977}
 }
 
- at bookinbook{heraclitus:epistle1:worley:1977,
+ at classictext{heraclitus:epistle1:worley,
   author = {Heraclitus},
   title = {Epistle 1},
   translator = {Worley, David},
@@ -2925,21 +2933,14 @@
   pages = {187},
   crossref = {malherbe:1977}
 }
-
- at classictext{heraclitus:epistle1:worley,
-  author = {Heraclitus},
-  title = {Epistle 1},
-  translator = {Worley},
-  xref = {heraclitus:epistle1:worley:1977}
-}
 \end{lstlisting}
 
 \begin{biboutput}
   \samplecite{36}[10]{heraclitus:epistle1:worley}
-  \samplebib{heraclitus:epistle1:worley:1977}
-  If \texttt{malherbe:1977} is referenced more than \texttt{microssrefs} times
+  \samplebib{heraclitus:epistle1:worley}
+  If \texttt{malherbe:1977} is referenced \texttt{microssrefs} times or more
   then:\par
-  \samplebib{heraclitus:epistle1:worley:1977}
+  \samplebib{heraclitus:epistle1:worley}
   \samplebib*{malherbe:1977}
   \samplebiblist{malherbe:1977}
 \end{biboutput}
@@ -2990,7 +2991,7 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplecite{14}[1.3|8:223]{clementinehomilies}
+  \samplecite{14}[(1.3)8:223]{clementinehomilies}
   \samplebib{ANF}
   \samplebiblist{ANF:abbreviation}
 \end{biboutput}
@@ -3045,7 +3046,7 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplecite{44}[28.3.5|252]{augustine:letters}
+  \samplecite{44}[(28.3.5)252]{augustine:letters}
   \samplebib{augustine:letters}
   \samplebiblist{NPNF1:abbreviation}
 \end{biboutput}
@@ -3066,26 +3067,22 @@
 \subsubsection{J.-P. Migne's Patrologia Latina and Patrologia Graeca}
 
 \begin{lstlisting}
- at mvcollection{PL,
-  title = {\mkbibemph{Patrologia Latina}},
+ at series{PL,
+  title = {Patrologia Latina},
   editor = {Migne, J.-P.},
   volumes = {217},
   location = {Paris},
   date = {1844/1864},
-  shorthand = {PL},
-  options = {useeditor=false},
-  sortkey = {Patrologia Latina}
+  shorthand = {PL}
 }
 
- at mvcollection{PG,
-  title = {\mkbibemph{Patrologia Graeca}},
+ at series{PG,
+  title = {Patrologia Graeca},
   editor = {Migne, J.-P.},
   volumes = {162},
   location = {Paris},
   date = {1857/1886},
-  shorthand = {PG},
-  options = {useeditor=false},
-  sortkey = {Patrologia Graeca}
+  shorthand = {PG}
 }
 
 @classictext{gregory:orationestheologicae,
@@ -3099,9 +3096,9 @@
 \end{lstlisting}
 
 \begin{biboutput}
-  \samplecite{6}[4|12c]{gregory:orationestheologicae}
-  \samplebib{PL}
-  \samplebib*{PG}
+  \samplecite{6}[(4)12c]{gregory:orationestheologicae}
+  \samplebib{PG}
+  \samplebib*{PL}
   \samplebiblist{PG}
   \samplebiblist*{PL}
 \end{biboutput}
@@ -3110,12 +3107,12 @@
   \hspace*{\bibindent}6. Gregory of Nazianzus, \emph{Orationes theologicae} 4
   (PG 36:12c).
 
+  \hangindent\bibindent Patrologia Graeca. Edited by J.-P. Migne. 162 vols.
+  Paris, 1857–1886.
+
   \hangindent\bibindent Patrologia Latina. Edited by J.-P. Migne. 217 vols.
   Paris, 1844–1864.
 
-  \hangindent\bibindent Patrologia Graeca. Edited by J.-P. Migne. 162 vols.
-  Paris, 1857–1886.
-
   \refbiblist{PG}{Patrologia Graeca. Edited by Jacques-Paul Migne. 162 vols.
   Paris, 1857–1886}
 
@@ -3139,7 +3136,7 @@
 
 \begin{biboutput}
   \samplemacro{\textbackslash autocite[See the discussion of \textbackslash
-  gr\{ἐκρατοῦντο\} in][2:271]\{Str-B\}}
+  textgreek\{ἐκρατοῦντο\} in][2:271]\{Str-B\}}
   \samplecite*{3}[See the discussion of \textgreek{ἐκρατοῦντο} in][2:271]{Str-B}
   \samplebib{Str-B}
   \samplebiblist{Str-B}
@@ -3175,7 +3172,7 @@
 @ancienttext{anderson:pepaideumenos,
   entrysubtype = {ANRW},
   author = {Anderson, Graham},
-  title = {The \mkbibemph{Pepaideumenos} in Action: Sophists and Their Outlook in the Early Empire},
+  title = {The \mkbibemph{pepaideumenos} in Action: Sophists and Their Outlook in the Early Empire},
   shorttitle = {\mkbibemph{Pepaideumenos}},
   volume = {33},
   part = {1},
@@ -3259,8 +3256,7 @@
   author = {Petersen, David L.},
   title = {Ezekiel},
   pages = {1096-1167},
-  booktitle = {The HarperCollins Study Bible Fully Revised and Updated: New
-  Revised Standard Version, with the Apocryphal/Deuterocanonical Books},
+  booktitle = {The HarperCollins Study Bible Fully Revised and Updated: New Revised Standard Version, with the Apocryphal\slash Deuterocanonical Books},
   editor = {Attridge, Harold W. and others},
   location = {San Francisco},
   publisher = {HarperSanFrancisco},
@@ -3286,8 +3282,8 @@
   \hangindent\bibindent Petersen, David L. “Ezekiel.” Pages
   1096–1167\footnote{Should be “1096–167”} in \emph{The HarperCollins Study
   Bible Fully Revised and Updated, New Revised Standard Version, with the
-  Apocryphal/Deuterocanonical Books.} Edited by Harold W. Attridge et al. San
-  Francisco: HarperSanFrancisco, 2006.
+  Apocryphal\slash Deuterocanonical Books.} Edited by Harold W. Attridge et
+  al. San Francisco: HarperSanFrancisco, 2006.
 \end{refimp}
 
 \paragraph{Single-Volume Commentaries on the Entire Bible}
@@ -3527,7 +3523,7 @@
   editor = {Wilhelm, Gernot},
   title = {Der Vertrag Šuppiluliumas I. von Ḫatti mit Šattiwazza von Mitrani \mkbibparens{CTH 51.I}},
   shorttitle = {Der Vertrag Šuppiluliumas I},
-  releasedate = {2013-02-24},
+  eprintdate = {2013-02-24},
   eprint = {CTH 51.I},
   eprintclass = {INTR 2013-02-24},
   eprinttype = {hethiter}
@@ -3580,6 +3576,38 @@
   \nolinkurl{http://www.cobb.msstate.edu/dignew/Maresha/index.html}.
 \end{refimp}
 
+\begin{lstlisting}
+ at online{caraher:2013,
+  editor = {Caraher, William R.},
+  title = {Pyla-Koutsopetria Archaeological Project: \mkbibparens{Overview}},
+  eprint = {http://opencontext.org/projects/3F6DCD13-A476-488E-ED10-47D25513FCB2},
+  eprinttype = {Open Context},
+  doi = {10.6078/M7B56GNS},
+  eprintdate = {2013-11-05}
+}
+\end{lstlisting}
+
+\begin{biboutput}
+  \samplecite{15}{caraher:2013}
+  \samplecite{17}{caraher:2013}
+  \samplebib{caraher:2013}
+\end{biboutput}
+
+\begin{refimp}
+  \hspace*{\bibindent}15. William R. Caraher, ed., “Pyla-Koutsopetria
+  Archaeological Project: (Overview),” Open Context, released 5 November 2013,
+  \nolinkurl{http://opencontext.org/projects/3F6DCD13-A476-488E-ED10-47D25513FCB2},
+  \nolinkurl{doi:10.6078/M7B56GNS}.
+
+  \hspace*{\bibindent}17. Caraher, “Pyla-Koutsopetria Archaeological Project.”
+
+  \hangindent\bibindent William R. Caraher, ed.\footnote{Should be “Caraher,
+  William R., ed.?”} “Pyla-Koutsopetria Archaeological Project: (Overview).”
+  Open Context. Released 5 November 2013.
+  \nolinkurl{http://opencontext.org/projects/3F6DCD13-A476-488E-ED10-47D25513FCB2}.
+  \nolinkurl{doi:10.6078/M7B56GNS}.\sloppy
+\end{refimp}
+
 \subsubsection{Websites and Blogs}
 
 \begin{lstlisting}
@@ -3605,6 +3633,26 @@
   \nolinkurl{http://cdli.ox.ac.uk/wiki/doku.php?id=the_one_hundred_most_important_cuneiform_objects}.
 \end{refimp}
 
+\begin{lstlisting}
+ at online{goodacre:2014,
+  author = {Goodacre, Mark},
+  title = {Jesus' Wife Fragment: Another Round-Up},
+  journaltitle = {NT Blog},
+  date = {2014-05-09},
+  url = {http://ntweblog.blogspot.com}
+}
+\end{lstlisting}
+
+\begin{biboutput}
+  \samplecite{3}{goodacre:2014}
+\end{biboutput}
+
+\begin{refimp}
+  \hspace*{\bibindent}3. Mark Goodacre, “Jesus’ Wife Fragment: Another
+  Round-Up,” \emph{NT Blog,} 9 May 2014,
+  \nolinkurl{http://ntweblog.blogspot.com}.
+\end{refimp}
+
 \section{Other Examples}
 
 \subsection{BDAG, BDB, BDF}
@@ -3748,7 +3796,7 @@
 \begin{refimp}
   \refbiblist{\emph{TLOT}}{\emph{Theological Lexicon of the Old Testament.}
     Edited by Ernst Jenni, with assistance from Claus Westermann. Translated
-  by Mark E. Biddle. 3 vols. Peabody, MA: Hendrickson, 1997}
+  by Mark E. Biddle. 3~vols. Peabody, MA: Hendrickson, 1997}
 \end{refimp}
 
 \subsection{\emph{SBLHS}}
@@ -3788,6 +3836,7 @@
 
 \clearpage
 
+\rmfamily
 \printindex
 
 \end{document}

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.bib	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.bib	2017-01-16 23:12:25 UTC (rev 42972)
@@ -144,7 +144,7 @@
   booktitle = {“Wer ist wie du, Herr, unter den Göttern?”: Studien zur Theologie und Religionsgeschichte Israels für Otto Kaiser zum 70. Geburtstag},
   editor = {Kottsieper, Ingo and others},
   location = {Göttingen},
-  publisher = {Vandenhoaeck \& Ruprecht},
+  publisher = {Vandenhoeck \& Ruprecht},
   date = {1995}
 }
 
@@ -249,10 +249,10 @@
   pages = {217-235},
   volume = {1},
   part = {1},
-  maintitle = {Hebrew Bible/Old Testament: The History of Its Interpretation},
+  maintitle = {Hebrew Bible\slash Old Testament: The History of Its Interpretation},
   editor = {Sæbø, Magne},
   location = {Göttingen},
-  publisher = {Vandenhoaeck \& Ruprecht},
+  publisher = {Vandenhoeck \& Ruprecht},
   date = {1996}
 }
 
@@ -265,7 +265,7 @@
   bookeditor = {Winter, Bruce W. and Clarke, Andrew D.},
   volume = {1},
   maintitle = {The Book of Acts in Its First Century Setting},
-  maineditor = {Winter, Bruce W.},
+  editor = {Winter, Bruce W.},
   location = {Grand Rapids},
   publisher = {Eerdmans},
   date = {1993}
@@ -575,7 +575,7 @@
 
 @article{springer:2014,
   author = {Springer, Carl P. E.},
-  title = {Of Roosers and \mkbibemph{Repetitio}: Ambrose's \mkbibemph{Aeterne rerum conditor}},
+  title = {Of Roosters and \mkbibemph{Repetitio}: Ambrose's \mkbibemph{Aeterne rerum conditor}},
   journaltitle = {Vigiliae Christianae},
   shortjournal = {VC},
   volume = {68},
@@ -813,7 +813,7 @@
 
 @mvbook{josephus,
   title = {Josephus},
-  translator = {Thackery, Henry St.\@ J. and others},
+  translator = {Thackeray, Henry St.\@ J. and others},
   volumes = {10},
   series = {Loeb Classical Library},
   shortseries = {LCL},
@@ -825,8 +825,7 @@
 @classictext{josephus:ant,
   author = {Josephus},
   title = {Ant\adddot},
-  xref = {josephus},
-  options = {skipbib}
+  xref = {josephus}
 }
 
 @mvbook{tacitus,
@@ -850,7 +849,7 @@
 @classictext{josephus:ant:thackery,
   author = {Josephus},
   title = {Ant\adddot},
-  translator = {Thackery},
+  translator = {Thackeray},
   series = {Loeb Classical Library},
   shortseries = {LCL},
   xref = {josephus}
@@ -870,7 +869,7 @@
   shortauthor = {Josephus},
   title = {The Jewish Antiquities, Books 1--19},
   shorttitle = {Ant\adddot},
-  translator =  {Thackery, Henry St.\@ J. and others},
+  translator =  {Thackeray, Henry St.\@ J. and others},
   series = {Loeb Classical Library},
   shortseries = {LCL},
   location = {Cambridge},
@@ -958,21 +957,15 @@
   date = {1977}
 }
 
- at bookinbook{heraclitus:epistle1:worley:1977,
+ at classictext{heraclitus:epistle1:worley,
   author = {Heraclitus},
   title = {Epistle 1},
   translator = {Worley, David},
   pages = {187},
-  crossref = {malherbe:1977}
+  crossref = {malherbe:1977},
+  options = {skipbib=false,useseries=false}
 }
 
- at classictext{heraclitus:epistle1:worley,
-  author = {Heraclitus},
-  title = {Epistle 1},
-  translator = {Worley},
-  xref = {heraclitus:epistle1:worley:1977}
-}
-
 @mvcollection{ANF,
   crossref = {ANF:abbreviation},
   editor = {Roberts, Alexander and Donaldson, James},
@@ -1034,26 +1027,22 @@
   options = {skipbib=false}
 }
 
- at mvcollection{PL,
-  title = {\mkbibemph{Patrologia Latina}},
+ at series{PL,
+  title = {Patrologia Latina},
   editor = {Migne, J.-P.},
   volumes = {217},
   location = {Paris},
   date = {1844/1864},
-  shorthand = {PL},
-  options = {useeditor=false},
-  sortkey = {Patrologia Latina}
+  shorthand = {PL}
 }
 
- at mvcollection{PG,
-  title = {\mkbibemph{Patrologia Graeca}},
+ at series{PG,
+  title = {Patrologia Graeca},
   editor = {Migne, J.-P.},
   volumes = {162},
   location = {Paris},
   date = {1857/1886},
-  shorthand = {PG},
-  options = {useeditor=false},
-  sortkey = {Patrologia Graeca}
+  shorthand = {PG}
 }
 
 @classictext{gregory:orationestheologicae,
@@ -1089,7 +1078,7 @@
 @ancienttext{anderson:pepaideumenos,
   entrysubtype = {ANRW},
   author = {Anderson, Graham},
-  title = {The \mkbibemph{Pepaideumenos} in Action: Sophists and Their Outlook in the Early Empire},
+  title = {The \mkbibemph{pepaideumenos} in Action: Sophists and Their Outlook in the Early Empire},
   shorttitle = {\mkbibemph{Pepaideumenos}},
   volume = {33},
   part = {1},
@@ -1117,7 +1106,7 @@
   author = {Petersen, David L.},
   title = {Ezekiel},
   pages = {1096-1167},
-  booktitle = {The HarperCollins Study Bible Fully Revised and Updated: New Revised Standard Version, with the Apocryphal/Deuterocanonical Books},
+  booktitle = {The HarperCollins Study Bible Fully Revised and Updated: New Revised Standard Version, with the Apocryphal\slash Deuterocanonical Books},
   editor = {Attridge, Harold W. and others},
   location = {San Francisco},
   publisher = {HarperSanFrancisco},
@@ -1214,7 +1203,7 @@
   editor = {Wilhelm, Gernot},
   title = {Der Vertrag Šuppiluliumas I. von Ḫatti mit Šattiwazza von Mitrani \mkbibparens{CTH 51.I}},
   shorttitle = {Der Vertrag Šuppiluliumas I},
-  releasedate = {2013-02-24},
+  eprintdate = {2013-02-24},
   eprint = {CTH 51.I},
   eprintclass = {INTR 2013-02-24},
   eprinttype = {hethiter}
@@ -1228,6 +1217,15 @@
   options = {indexing=false}
 }
 
+ at online{caraher:2013,
+  editor = {Caraher, William R.},
+  title = {Pyla-Koutsopetria Archaeological Project: \mkbibparens{Overview}},
+  eprint = {http://opencontext.org/projects/3F6DCD13-A476-488E-ED10-47D25513FCB2},
+  eprinttype = {Open Context},
+  doi = {10.6078/M7B56GNS},
+  eprintdate = {2013-11-05}
+}
+
 @online{100cuneiform,
   title = {The One Hundred Most Important Cuneiform Objects},
   eprint = {http://cdli.ox.ac.uk/wiki/doku.php?id=the_one_hundred_most_important_cuneiform_objects},
@@ -1234,6 +1232,14 @@
   eprinttype = {cdli:wiki}
 }
 
+ at online{goodacre:2014,
+  author = {Goodacre, Mark},
+  title = {Jesus' Wife Fragment: Another Round-Up},
+  journaltitle = {NT Blog},
+  date = {2014-05-09},
+  url = {http://ntweblog.blogspot.com}
+}
+
 @lexicon{BDAG,
   author = {Danker, Frederick W. and Bauer, Walter and Arndt, William F. and Gingrich, F. Wilbur},
   title = {Greek-English Lexicon of the New Testament and Other Early Christian Literature.},

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	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex	2017-01-16 23:12:25 UTC (rev 42972)
@@ -1,7 +1,8 @@
-\documentclass{ltxdockit}[2011/03/25] 
+% imakeidx needs to be loaded before hyperref
+\RequirePackage{scrlfile}\AfterPackage{textcomp}{\RequirePackage{imakeidx}}
+\documentclass{ltxdockit}[2011/03/25]
 \usepackage{microtype}
 \usepackage{xcolor}
-\usepackage{imakeidx}
 \makeindex[title=Author Index,intoc]
 \usepackage{btxdockit}
 \usepackage{fontspec}
@@ -9,7 +10,7 @@
 \usepackage{xparse}
 \usepackage{framed}
 
-\usepackage[style=sbl,indexing=cite,backend=biber]{biblatex}
+\usepackage[style=sbl,indexing=cite]{biblatex}
 \addbibresource{biblatex-sbl.bib}
 
 \hypersetup{colorlinks,citecolor=spot}
@@ -109,8 +110,7 @@
 }
 
 \makeatletter
-\def\ltd at printarg@iv(#1|#2){[\prm{#1}|\prm{#2}]\ltd at parseargs}
-\def\ltd at printarg@v<#1|>{[\prm{#1}|]\ltd at parseargs}
+\def\ltd at printarg@v<(#1)#2>{[(\prm{#1})\prm{#2}]\ltd at parseargs}
 
 \titlepage{%
   title={\biblatexsbl},
@@ -157,6 +157,9 @@
 documentation. Bugs and feature requests can be submitted at
 \url{\biblatexsblhome}.
 
+\textbf{Note:} This package should be considered as beta software and its
+output carefully checked when you use it.
+
 \section{Requirements}
 
 \biblatexsbl requires at least version 3.5 of \biblatex and the \sty{xparse}
@@ -199,6 +202,46 @@
 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.,
+
+\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}
+\end{lstlisting}
+\end{quote}
+
 \subsection{Commands}
 
 The standard commands for \biblatexsbl generally follow those defined by
@@ -207,32 +250,31 @@
 
 \begin{ltxsyntax}
 
-\cmditem{autocite}[prenote](altpostnote|postnote){key}
+\cmditem{autocite}[prenote]<(altpostnote)postnote>{key}
 
 \cmd{autocite} inserts a citation as a footnote. If used in a footnote, the
 citation is placed in parentheses. It works as in the standard \biblatex
 styles, except that that \bibfield{postnote} argument can be divided into two
-using the pipe (\sty{|}) character. This creates an \bibfield{altpostnote}
-field which is used in some of the examples from §6.4 of the \cite{SBLHS}.
-e.g.,
+using parentheses. This creates an \bibfield{altpostnote} field which is used
+in some of the examples from §6.4 of the \cite{SBLHS}. e.g.,
 
 \begin{snugshade}
-  \samplecite{1}[See][1.3|8:223]{clementinehomilies}
+  \samplecite{1}[See][(1.3)8:223]{clementinehomilies}
 \end{snugshade}
 
-To use only \bibfield{altpostnote} you must still include the pipe character.
+To use only \bibfield{altpostnote} surround the whole argument in parentheses.
 e.g.,
 
 \begin{snugshade}
-  \samplecite{1}[III. 1-164|]{PGM:betz}
+  \samplecite{1}[(III. 1-164)]{PGM:betz}
 \end{snugshade}
 
-\cmditem{cite}[prenote](altpostnote|postnote){key}
+\cmditem{cite}[prenote]<(altpostnote)postnote>{key}
 
 \cmd{cite} works in the same way as \cmd{autocite} except that the citation is
 placed directly into the text instead of in a footnote.
 
-\cmditem{parencite}[prenote](altpostnote|postnote){key}
+\cmditem{parencite}[prenote]<(altpostnote)postnote>{key}
 
 \cmd{parencite} works in the same way as \cmd{autocite} except that the
 citation is placed inside parentheses instead of in a footnote. This is most
@@ -246,7 +288,7 @@
 \cmditem{seriescite}{key}
 \cmditem{shorthandcite}{key}
 
-\cmd{journalcite}, \cmd{seriescite},and \cmd{shorthandcite} inserts the
+\cmd{journalcite}, \cmd{seriescite}, and \cmd{shorthandcite} 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.
@@ -280,6 +322,12 @@
 
 \begin{optionlist}
 
+\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.
+
 \optitem[sbl]{citepages}{\opt{sbl}, \opt{permit}, \opt{omit}, \opt{separate}}
 
 Use this option to fine-tune the formatting of the \bibfield{pages} field
@@ -303,6 +351,10 @@
     \samplecite{2}[a note]{irvine:2014}
   \end{snugshade}
 
+  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}
+
 \item[permit] The \bibfield{postnote} is printed in parentheses after the
   \bibfield{pages} field. e.g.,
 
@@ -355,14 +407,20 @@
 
 \end{valuelist}
 
+\optitem[comp]{eprintdate}{\opt{year}, \opt{short}, \opt{long}, \opt{terse,
+\opt{comp}, \opt{iso8601}}}
+
+Similar to the \opt{date} option (for details see the \biblatex manual) but
+controls the format of the \bibfield{eprintdate}.
+
 \boolitem[false]{fullbibrefs}
 
 The \emph{Student Supplement for the} \cite{SBLHS} permits two styles for the
-bibliography entry for Bible dictionaries and encyclopaedias, and multivolume
+bibliography entry for Bible dictionaries, encyclopaedias, and multivolume
 commentaries for the entire Bible by multiple
 authors.\autocite[4–5]{SBLHS:studentsupp}
 
-This option applies to \bibfield{@inreference} and \bibfield{@incommentary}
+This option applies to \bibtype{inreference} and \bibtype{incommentary}
 entry types.
 
 \begin{valuelist}
@@ -451,12 +509,6 @@
   on a per-spread (double page) basis.
 \end{valuelist}
 
-\optitem[comp]{releasedate}{\opt{year}, \opt{short}, \opt{long}, \opt{terse,
-\opt{comp}, \opt{iso8601}}}
-
-Similar to the \opt{date} option (for details see the \biblatex manual) but
-controls the format of the \bibfield{releasedate}.
-
 \boolitem[true]{sblfootnotes}
 
 This option controls the style of footnotes. This option is compatible with
@@ -478,6 +530,24 @@
   \end{snugshade}
 \end{valuelist}
 
+\optitem[true]{shorthand}{\opt{true}, \opt{false}, \opt{short}, \opt{intro}}
+
+This option controls when and whether the \bibfield{shorthand} field is used
+as a citation. This can also be used as a type option or entry option.
+\bibtype{ancienttext} and \bibtype{classictext} entry types ignore this
+option.
+
+\begin{valuelist}
+\item[true] Always use the \bibfield{shorthand} when citing the entry.
+\item[false] Never use the \bibfield{shorthand} when citing the entry.
+\item[short] Print the full citation the first time the entry is cited. Use
+  the \bibfield{shorthand} on subsequent citations.
+\item[intro] Print the full citation the first time the entry is cited
+  followed by (henceforth cited as \bibfield{shorthand}). Use the
+  \bibfield{shorthand} on subsequent citations.
+\end{valuelist}
+
+
 \end{optionlist}
 
 \section{Database Guide}
@@ -484,9 +554,9 @@
 
 \subsection{Entry Types}
 
-This section gives an overview of the entry types supported by \biblatexsbl.
-Many work in the same way as \biblatex. Some standard entry types have custom
-usage, and some are unique to \biblatexsbl. These are documented more fully.
+All standard entry types of \biblatex{} are supported by \biblatexsbl. This
+section gives an overview of entry types that are most relevant, unique to, or
+treated in a custom way by \biblatexsbl{}.
 
 \begin{typelist}
 
@@ -495,7 +565,7 @@
 This is a custom type for \biblatexsbl. It is used for the special examples in
 \cite[§6.4.1, §6.4.3 and §6.4.8]{SBLHS}.
 
-Unless \opt{options = \{skipbib=false\}} is set explicitly, an
+Unless \bibfield{options = \{skipbib=false\}} is set explicitly, an
 \bibtype{ancienttext} entry will not appear in the bibliography. (Although,
 see \opt{ANRW} \bibfield{entrysubtype} below for an exception.) The
 \bibfield{related} field is used to refer to the entry which should appear in
@@ -513,9 +583,9 @@
   \samplebib{ANET}
 \end{snugshade}
 
-If the entry contains \opt{options = \{skipbib=false\}}, then the bibliography
-entry will be like \bibtype{book}. Any shorthand is also printed in the same
-way as a \bibtype{book} shorthand.
+If the entry contains \bibfield{options = \{skipbib=false\}}, then the
+bibliography entry will be like \bibtype{book}. Any shorthand is also
+printed in the same way as a \bibtype{book} shorthand.
 
 The following values for the \bibfield{entrysubtype} field are supported:
 
@@ -534,7 +604,7 @@
 marks. e.g.,
 
 \begin{snugshade}
-  \samplecite{1}[lines 3--4|125]{esarhaddonchronicle}
+  \samplecite{1}[(lines 3--4)125]{esarhaddonchronicle}
 \end{snugshade}
 
 \item[COS]
@@ -549,8 +619,8 @@
 
 \item[inscription]
 
-  Similarly to \opt{chronicle}, this formats the \bibfield{title} using an
-  upright shape font without quotation marks.
+  Similarly to \bibfield{entrysubtype = \{chronicle\}}, this formats the
+  \bibfield{title} using an upright shape font without quotation marks.
 
 \end{valuelist}
 
@@ -562,12 +632,22 @@
 
 \typeitem{book}
 
-A single-volume book with one or more authors.
+A single-volume book with one or more authors where the authors share credit
+for the work as a whole.
 
+\typeitem{inbook}
+
+A part of a book which forms a self-contained unit with its own title.
+
+\typeitem{bookinbook}
+
+This type is similar to \bibtype{inbook} but intended for works originally
+published as a stand-alone book. The main difference is that the title is
+printed in italics instead of in quotation marks.
+
 \typeitem{mvbook}
 
-A multivolume \bibtype{book}. \biblatexsbl treats this as an alias for
-\bibtype{book}.
+A multivolume \bibtype{book}.
 
 There is one \bibfield{entrysubtype} supported:
 
@@ -581,31 +661,24 @@
 
 \end{valuelist}
 
-\typeitem{inbook}
-
-A part of a book which forms a self-contained unit with its own title.
-\biblatexsbl treats this as an alias for \bibtype{incollection}.
-
-\typeitem{bookinbook}
-
-This type is similar to \bibtype{inbook} but intended for works originally
-published as a stand-alone book. The main difference is that the title is
-printed in italics instead of in quotation marks. See §6.4.4 in
-\sty{biblatex-sbl-test.pdf} for an example.
-
 \typeitem{suppbook}
 
 Supplemental material in a \bibtype{book}. Use this for an introduction,
 preface or foreword written by someone other than the author
 \parencite[§6.2.14]{SBLHS}. The \bibfield{type} field is used to specify the
-type of supplementary material. See §6.2.14 of \sty{biblatex-sbl-test.pdf}.
+type of supplementary material. See §6.2.14 of \sty{biblatex-sbl-test.pdf}. If
+no \bibfield{type} is given, then this behaves like an \bibtype{inbook}.
 
+\typeitem{booklet}
+
+A book-like work without a formal publisher or sponsoring institution.
+
 \typeitem{classictext}
 
 This type is a custom type for \biblatexsbl. It is used for the special
 examples in \cite[§6.4.2 and §§6.4.4–6]{SBLHS}.
 
-Unless \opt{options = \{skipbib=false\}} is set explicitly, a
+Unless \bibfield{options = \{skipbib=false\}} is set explicitly, a
 \bibtype{classictext} entry will not appear in the bibliography. The
 \bibfield{xref} field is used to refer to the entry which should appear in the
 bibliography instead of the \bibtype{classictext} entry.
@@ -617,11 +690,14 @@
   \samplecite{1}[15.18-19]{tacitus:ann:jackson}
   \samplebib{tacitus}
 \end{snugshade}
-    
-If the entry contains \opt{options = \{skipbib=false\}}, then the bibliography
-entry will be like \bibtype{incollection} except that the \bibfield{title} is
-set in italics instead of within quotation marks.
 
+The \bibfield{series} can be suppressed by setting \bibfield{options =
+\{useseries=false\}}.
+
+If the entry contains \bibfield{options = \{skipbib=false\}}, then the
+bibliography entry will be like \bibtype{incollection} except that the
+\bibfield{title} is set in italics instead of within quotation marks.
+
 The following values for the \bibfield{entrysubtype} field are supported:
 
 \begin{valuelist}
@@ -636,7 +712,7 @@
 always separated from the title by a space.
 
 \begin{snugshade}
-  \samplecite{1}[28.3.5|252]{augustine:letters}
+  \samplecite{1}[(28.3.5)252]{augustine:letters}
   \samplebib{augustine:letters}
 \end{snugshade}
 
@@ -646,13 +722,11 @@
 
 A single-volume collection with multiple, self-contained contributions by
 distinct authors which have their own title. The work as a whole has no
-overall author but it will usually have an editor. \biblatexsbl treats this as
-an alias for \bibtype{book}.
+overall author but it will usually have an editor.
 
 \typeitem{mvcollection}
 
-A multi-volume \bibtype{collection}. \biblatexsbl treats this as an alias for
-\bibtype{mvbook}.
+A multi-volume \bibtype{collection}.
 
 \typeitem{incollection}
 
@@ -669,8 +743,8 @@
 \typeitem{mvcommentary}
 
 A multi-volume commentary on a single book of the Bible by one or more authors
-or a multi-volume commentary on the whole Bible by multiple authors.
-\biblatexsbl treats this as an alias to \bibtype{mvbook}.
+or a multi-volume commentary on the whole Bible by multiple authors. Unlike
+\bibtype{commentary}, this behaves exactly the same as a \bibtype{mvbook}.
 
 \typeitem{incommentary}
 
@@ -680,24 +754,24 @@
 
 If an entry contains an \bibfield{xref} field, then the bibliography entry is
 printed in either short or long form as described above under
-\opt{fullbibrefs}. Otherwise this entry is treated as an alias for
-\bibtype{incollection}.
+\opt{fullbibrefs}.
 
 \typeitem{conferencepaper}
 
 An unpublished paper presented at a professional society. Use the
-\bibfield{eventtitle}, \bibfield{venue}, and \bibfield{eventdate} fields to
-specify relevant detail for the conference.
+\bibfield{eventtitle}, \bibfield{venue}, and \bibfield{date} fields to
+specify detail for the conference. See §6.3.8 of \sty{biblatex-sbl-test.pdf}
+for and example.
 
 \typeitem{lexicon}
 
-A single-volume lexicon or theological dictionary. \biblatexsbl treats this as
-an alias for \bibtype{book}.
+A single-volume lexicon or theological dictionary. This is similar to a
+\bibtype{book}.
 
 \typeitem{mvlexicon}
 
-A multi-volume lexicon or theological dictionary. \biblatex treats this as an
-alias for \bibtype{mvbook}.
+A multi-volume lexicon or theological dictionary. This is similar to a
+\bibtype{mvbook}.
 
 \typeitem{inlexicon}
 
@@ -707,8 +781,8 @@
 does not appear in the bibliography. Instead the lexicon pointed to by
 \bibfield{xref} appears in the bibliography.
 
-Subsequent citations do not include the article title, only the name of the
-lexicon. e.g.,
+Subsequent citations do not include the \bibfield{title}, only the name of the
+lexicon (specified by the \bibfield{xref} entry). e.g.,
 
 \begin{snugshade}
   \samplecite{1}[511]{dahn+liefeld:see+vision+eye}
@@ -716,11 +790,6 @@
   \samplebib{NIDNTT}
 \end{snugshade}
 
-\typeitem{manual}
-
-Technical or other documentation, not necessarily in printed form. \biblatexsbl
-treats this as an alias for \bibtype{book}.
-
 \typeitem{misc}
 
 A fallback type for entries which do not fit into any other category. Use the
@@ -727,41 +796,30 @@
 \bibfield{howpublished} field to supply publishing information in free format,
 if applicable.
 
-This type is also set up to be able to insert an item into the list of
-abbreviations. So it is permissible to include just \bibfield{journaltitle}
-and \bibfield{shortjournal} or \bibfield{series} and \bibfield{shortseries},
-or \bibfield{shorthand} and relevant fields. In this case ensure that
-\bibfield{options = \{skipbib\}} is set.
-
 \typeitem{online}
 
-An online resource without a print counterpart. \biblatexsbl treats this as an
-alias for \bibtype{article}.
+An online resource without a print counterpart. This is similar to an
+\bibtype{article}.
 
-\typeitem{proceedings}
+\typeitem{periodical}
 
-A single-volume conference proceedings. In \biblatexsbl this as an alias for
-\bibtype{collection}.
+A complete issue of a periodical, such as a special issue of a journal. The
+title of the periodical is given in the \bibfield{title} field. If the issue
+has its own title in addition to the main title of the periodical, it goes in
+the \bibfield{issuetitle} field.
 
-\typeitem{mvproceedings}
+This type could also be used to insert a journal into the list of
+abbreviations. In this case, just use \bibfield{title}, \bibfield{shorttitle},
+and set \bibfield{options = \{skipbib\}}.
 
-A multi-volume \bibtype{proceedings} entry. In \biblatexsbl this as an alias
-for \bibtype{mvcollection}.
-
-\typeitem{inproceedings}
-
-An article in a conference proceedings. In \biblatexsbl this as an alias for
-\bibtype{incollection}.
-
 \typeitem{reference}
 
-A single-volume encyclopaedia or dictionary. \biblatexsbl treats this as an
-alias for \bibtype{book}.
+A single-volume encyclopaedia or dictionary. This is similar to a
+\bibtype{book}.
 
 \typeitem{mvreference}
 
-A multi-volume \bibtype{reference}. \biblatexsbl treats this as an alias for
-\bibtype{mvbook}.
+A multi-volume \bibtype{reference}. This is similar to a \bibtype{mvbook}.
 
 \typeitem{inreference}
 
@@ -774,10 +832,10 @@
 
 \typeitem{review}
 
-A book review in a journal. This is similar to the \bibtype{article} entry
-type. Use the \bibfield{revdauthor}\slash\bibfield{revdeditor} and
-\bibfield{revdtitle} fields to specify the author\slash editor and title of
-the book being reviewed.
+A book review in a journal. This is similar to an \bibtype{article}. Use the
+\bibfield{revdauthor}\slash\bibfield{revdeditor} and \bibfield{revdtitle}
+fields to specify the author\slash editor and title of the book being
+reviewed.
 
 Note that review articles are treated like articles and should use the
 \bibtype{article} entry type.
@@ -784,35 +842,30 @@
 
 \typeitem{seminarpaper}
 
-An \citeshorthand{SBL} seminar paper. This is a custom entry type for
-\biblatexsbl. See §6.4.11 of \sty{biblatex-sbl-test} for an example.
+An \citeshorthand{SBL} seminar paper. This is similar to an
+\bibtype{incollection} except that \emph{in} is suppressed byfore the
+\bibfield{booktitle}\slash\bibfield{maintitle}. See §6.4.11 of
+\sty{biblatex-sbl-test} for an example.
 
-\typeitem{set}
+\typeitem{series}
 
-An entry set. This entry type is special. See the \biblatex manual for
-details.
+A multi-volume series. This is similar to a \bibtype{mvbook} except that an
+upright shaped font is used for the \bibfield{title} field and the
+\bibfield{option} field is set to \bibfield{\{useauthor=false,}
+\bibfield{useditor=false\}} by default.
 
-\typeitem{thesis}
+This type could also be used to place a series in the list of abbreviations.
+In this case, just use \bibfield{series}, \bibfield{shortseries}, and set
+\bibfield{options = \{skipbib\}}.
 
-A unpublishes thesis written for an educational institution to satisfy the
-requirements for a degree. Use the \bibfield{type} field to specify the type of
-thesis and the \bibfield{institution} to specify the educational institution.
-
-\typeitem{unpublished}
-
-A work with an author and a title which has not been formally published, such
-as a manuscript or the script of a talk. Use the fields howpublished and note
-to supply additional information in free format, if applicable.
-
-See §6.3.8 of \sty{biblatex-sbl-test} for an example.
-
 \end{typelist}
 
 \subsection{Entry Fields}
 
-\biblatexsbl supports many of the entry fields outlined in the \biblatex
-manual. There are also a number of custom entry fields supported by
-\biblatexsbl. These are documented below.
+\biblatexsbl supports all entry fields from the \biblatex manual except for
+\bibfield{pagetotal}. There are also a number of custom entry fields and
+specially handled fields supported by \biblatexsbl. These are documented
+below.
 
 \begin{fieldlist}
 
@@ -820,35 +873,47 @@
 
 The editor(s) of the \bibfield{booktitle}.
 
+The behaviour of \bibfield{editor}, \bibfield{bookeditor}, and
+\bibfield{maineditor} is as follows (when \bibfield{editor} is not used as
+the overall editor): \bibfield{editor} applies to \bibfield{maintitle} (if
+set) unless \bibfield{maineditor} is set. In this case, \bibfield{editor}
+applies to \bibfield{booktitle} (if set) unless \bibfield{bookeditor} is
+set. In this case, \bibfield{editor} applies to \bibfield{title}.
+
 \listitem{booktranslator}{name}
 
 The translator(s) of the \bibfield{booktitle}.
 
-\listitem{maineditor}{name}
+The behaviour of \bibfield{translator}, \bibfield{booktranslator}, and
+\bibfield{maintranslator} is the same as for \bibfield{editor},
+\bibfield{bookeditor}, and \bibfield{maineditor}.
 
-The editor(s) of the \bibfield{maintitle}.
+\fielditem{eprintdate}{date}
 
-\listitem{maintranslator}{name}
+The date a text edition published online with no print counterpart or an
+article in an online database is released. See §6.4.1 and §6.4.13 of
+\sty{biblatex-sbl-test.pdf}.
 
-The translator(s) of the \bibfield{maintitle}.
+\fielditem{eprintday}{datepart}
 
-\fielditem{releasedate}{date}
+This field holds the day component of the \bibfield{eprintdate} field.
 
-The date a text edition published online with no print counterpart is
-released. See §6.4.13 of \sty{biblatex-sbl-test.pdf}.
+\fielditem{eprintmonth}{datepart}
 
-\fielditem{releaseday}{datepart}
+This field holds the month component of the \bibfield{eprintdate} field.
 
-This field holds the day component of the \bibfield{releasedate} field.
+\fielditem{eprintyear}{datepart}
 
-\fielditem{releasemonth}{datepart}
+This field holds the year component of the \bibfield{eprintdate} field.
 
-This field holds the month component of the \bibfield{releasedate} field.
+\listitem{maineditor}{name}
 
-\fielditem{releaseyear}{datepart}
+The editor(s) of the \bibfield{maintitle}.
 
-This field holds the year component of the \bibfield{releasedate} field.
+\listitem{maintranslator}{name}
 
+The translator(s) of the \bibfield{maintitle}.
+
 \listitem{revdauthor}{name}
 
 The author(s) of the \bibfield{revdtitle}.
@@ -874,10 +939,6 @@
 
 An annex to the \bibfield{revdtitle}, to be printed in a different font.
 
-\listitem{revdtranslator}{name}
-
-The translator(s) of the \bibfield{revdtitle}.
-
 \fielditem{seriesseries}{literal}
 
 This field is used when a \bibfield{series} is begun anew to distinguish
@@ -887,10 +948,44 @@
 
 The \bibfield{booktitle} in abridged form.
 
+\fielditem{shorthand}{literal}
+
+A special short form printed instead of the usual citation. Sometimes the
+\bibfield{shorthand} is short for the authors and should be printed in an
+upright font shape. Other times it is short for the \bibfield{title} and
+should be printed in italics. This behaviour is controlled using the
+\bibfield{shorttitle} field. If the \bibfield{shorttitle} is the same as the
+\bibfield{shorthand} then the \bibfield{shorthand} is assumed to be short for
+the \bibfield{title} and printed in italics, otherwise it is printed in an
+upright font. The \bibfield{shorthand} is automatically inserted into the list
+of abbreviations.
+
+The separator between the \bibfield{shorthand} and \bibfield{postnote} depends
+on the content of the \bibfield{postnote}. If the \bibfield{postnote} contains
+a ‘.’, ‘:’, or ‘§’, then the separator is a space, otherwise it is a comma.
+
+\fielditem{shortjournal}{literal}
+
+The \bibfield{journaltitle} in abridged form. This is always printed instead
+of the \bibfield{journaltitle}. The \bibfield{shortjournal} and
+\bibfield{journaltitle} is then automatically inserted into the list of
+abbreviations.
+
 \fielditem{shortmaintitle}{literal}
 
 The \bibfield{maintitle} in abridged form.
 
+\fielditem{shortseries}{literal}
+
+The \bibfield{series} in abridged form. This is always printed instead of the
+\bibfield{series}. The \bibfield{shortseries} and \bibfield{series} is then
+automatically inserted into the list of abbreviations.
+
+\fielditem{shorttitle}{literal}
+
+The \bibfield{title} in abridged form. This is printed instead of the full
+title on subsequent citations.
+
 \listitem{withauthor}{name}
 
 The author(s) who assist the \bibfield{author}. See \bibfield{witheditortype},
@@ -984,7 +1079,7 @@
 
 \end{fieldlist}
 
-\subsection{Entry Options}
+\subsection{Type and Entry Options}
 
 \biblatexsbl supports many of the entry options outlined in the \biblatex
 manual. There are also a number of custom entry options supported by
@@ -1018,25 +1113,32 @@
 \item[false] Include the \bibfield{shortseries} in the list of abbreviations.
 \end{valuelist}
 
-\optitem[true]{shorthand}{\opt{true}, \opt{false}, \opt{short}}
+\optitem[true]{usefullcite}{\opt{true}, \opt{false}}
 
-This option controls when and whether the \bibfield{shorthand} field is used
-as a citation.
+This options controls the format of first citations. The possible choices are:
 
 \begin{valuelist}
-\item[true] Always use the \bibfield{shorthand} when citing the entry.
-\item[false] Never use the \bibfield{shorthand} when citing the entry.
-\item[short] Print the full citation the first time the entry is cited. Use
-  the \bibfield{shorthand} on subsequent citations.
+\item[true] Use a full citation the first time the entry is cited.
+\item[false] Use the short citation form the first time the entry is cited.
 \end{valuelist}
 
-\optitem[true]{usefullcite}{\opt{true}, \opt{false}}
+\optitem[true]{useseries}{\opt{true}, \opt{false}}
 
-This options controls the format of first citations. The possible choices are:
+This option controls whether the \bibfield{series} is printed in parentheses
+following a \bibtype{classictext} citation. This does not affect other entry
+types.
 
 \begin{valuelist}
-\item[true] Use a full citation the first time the entry is cited.
-\item[false] Use the short citation form the first time the entry is cited.
+\item[true] Print the \bibfield{series}.
+  \begin{snugshade}
+    \samplecite{1}[2.233-235]{josephus:ant:thackery}
+    \samplebib{josephus}
+  \end{snugshade}
+\item[false] Suppress printing the \bibfield{series}.
+  \begin{snugshade}
+    \samplecite{2}[10]{heraclitus:epistle1:worley}
+    \samplebib{heraclitus:epistle1:worley}
+  \end{snugshade}
 \end{valuelist}
 
 \optitem[true]{useshorttitle}{\opt{true}, \opt{false}}

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex	2017-01-16 23:12:25 UTC (rev 42972)
@@ -8,7 +8,7 @@
 %% Add your bib resource here
 \addbibresource{biblatex-sbl.bib}
 
-%% Index setup
+%% Index set up (optional)
 %% Include separate indices for subjects, authors, and Scripture references
 \makeindex[title=Subject Index,intoc]
 \makeindex[name=\jobname-scr,title=Scripture Reference Index,intoc,options=-s sbl-paper-bibleref.ist]
@@ -25,15 +25,31 @@
     {\namepartprefix}
     {\namepartsuffix}}
 
-%% Set default language to German
-%\setdefaultlanguage{german}
+%% 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 font
-\setromanfont{Linux Libertine O}
+%% 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}
 
@@ -126,26 +142,29 @@
 the same article referenced in two different
 publications.\autocites{freedman:1977,freedman:1980}
 
-\section{Greek and Hebrew}
+%% Use xelatex or lualatex if you need Greek or Hebrew
+\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{Ἐν ἀρχῇ}),
-\index{Greek!transliterated}transliterated Greek (\emph{En archē}),
-\index{Hebrew!inline}Hebrew (\texthebrew{בראשית}), and
-\index{Hebrew!transliterated}transliterated Hebrew (\emph{bərēʾšı̂t}).
+  \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{Ἐν ἀρχῇ}),
+  \index{Greek!transliterated}transliterated Greek (\emph{En archē}),
+  \index{Hebrew!inline}Hebrew (\texthebrew{בראשית}), and
+  \index{Hebrew!transliterated}transliterated Hebrew (\emph{bərēʾšı̂t}).
+\fi
 
 \appendix
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def	2017-01-16 23:12:25 UTC (rev 42972)
@@ -15,8 +15,8 @@
 % VERSION STRINGS
 % ------------------------------------------------------------------
 
-\def\sbl at abx@date{2016/10/11}
-\def\sbl at abx@version{0.7}
+\def\sbl at abx@date{2017/01/15}
+\def\sbl at abx@version{0.8.1}
 \def\sbl at abx@bbxid{\sbl at abx@date\space v\sbl at abx@version\space biblatex-sbl bibliography style}
 \def\sbl at abx@cbxid{\sbl at abx@date\space v\sbl at abx@version\space biblatex-sbl citation style}
 \def\sbl at abx@lbxid{\sbl at abx@date\space v\sbl at abx@version\space biblatex-sbl localization}
@@ -48,7 +48,10 @@
 \def\cbx at opt@citepages at sbl{%
   \renewbibmacro*{pages}{%
     \iffieldundef{pages}
-      {}
+      {\ifbool{bbx at inset}
+         {}
+         {\printfield{postnote}%
+          \global\booltrue{suppresspostnote}}}
       {\printfield{pages}%
        \ifboolexpr{
          test {\iffieldundef{postnote}}
@@ -74,7 +77,10 @@
 \def\cbx at opt@citepages at permit{%
   \renewbibmacro*{pages}{%
     \iffieldundef{pages}
-      {}
+      {\ifbool{bbx at inset}
+         {}
+         {\printfield{postnote}%
+          \global\booltrue{suppresspostnote}}}
       {\printfield{pages}%
        \ifboolexpr{
          test {\iffieldundef{postnote}}
@@ -99,7 +105,10 @@
 \def\cbx at opt@citepages at omit{%
   \renewbibmacro*{pages}{%
     \iffieldundef{pages}
-      {}
+      {\ifbool{bbx at inset}
+         {}
+         {\printfield{postnote}%
+          \global\booltrue{suppresspostnote}}}
       {\ifboolexpr{
          test {\iffieldundef{postnote}}
          or
@@ -126,7 +135,10 @@
 \def\cbx at opt@citepages at separate{%
   \renewbibmacro*{pages}{%
     \iffieldundef{pages}
-      {}
+      {\ifool{bx at inset}
+         {}
+         {\printfield{postnote}%
+          \global\booltrue{suppresspostnote}}}
       {\printfield{pages}%
        \ifboolexpr{
          test {\iffieldundef{postnote}}
@@ -157,7 +169,6 @@
                  {}%
                \printfield{postnote}}}}}}}
 
-
 % ------------------------------------------------------------------
 % IDEM MACROS
 % ------------------------------------------------------------------
@@ -180,7 +191,6 @@
      \@firstoftwo}
     {\@secondoftwo}}
 
-
 % ------------------------------------------------------------------
 % COMMENTARY OPTIONS
 % ------------------------------------------------------------------
@@ -192,7 +202,6 @@
     {\toggletrue{fullbibrefs}}
     {\togglefalse{fullbibrefs}}}
 
-
 % ------------------------------------------------------------------
 % ENTRY OPTIONS
 % ------------------------------------------------------------------
@@ -201,7 +210,10 @@
 \newtoggle{blx at skipbiblistshorthand}
 \newtoggle{blx at usefullcite}
 \newtoggle{blx at usevolume}
+\newtoggle{blx at useseries}
 \newtoggle{blx at useshorttitle}
+\newtoggle{blx at accessdate}
+\def\blx at shorthand{}
 
 \DeclareTypeOption{skipbiblistseries}[true]{%
   \settoggle{blx at skipbiblistseries}{#1}}
@@ -234,11 +246,27 @@
 \DeclareEntryOption{usevolume}[true]{%
   \settoggle{blx at usevolume}{#1}}
 
-\def\blx at shorthand{}
+\DeclareBibliographyOption{useseries}[true]{%
+  \settoggle{blx at useseries}{#1}}
+\DeclareTypeOption{useseries}[true]{%
+  \settoggle{blx at useseries}{#1}}
+\DeclareEntryOption{useseries}[true]{%
+  \settoggle{blx at useseries}{#1}}
+
+\DeclareBibliographyOption{accessdate}[true]{%
+  \settoggle{blx at accessdate}{#1}}
+\DeclareTypeOption{accessdate}[true]{%
+  \settoggle{blx at accessdate}{#1}}
+\DeclareEntryOption{accessdate}[true]{%
+  \settoggle{blx at accessdate}{#1}}
+
+\DeclareBibliographyOption[string]{shorthand}[true]{%
+  \def\blx at shorthand{#1}}
+\DeclareTypeOption[string]{shorthand}[true]{%
+  \def\blx at shorthand{#1}}
 \DeclareEntryOption[string]{shorthand}[true]{%
   \def\blx at shorthand{#1}}
 
-
 % ------------------------------------------------------------------
 % STYLE OPTIONS
 % ------------------------------------------------------------------
@@ -268,7 +296,7 @@
   citetracker,
   punctfont,
   alldates=comp,
-  releasedate=comp,
+  eprintdate=comp,
   dateabbrev=false,
   autocite=footnote,
   url,
@@ -284,7 +312,10 @@
   sblfootnotes,
   usefullcite,
   useshorttitle,
-  usevolume
+  usevolume,
+  useseries,
+  accessdate=false,
+  shorthand=true
 }
 
 \ExecuteBibliographyOptions[classictext,ancienttext]{%
@@ -303,6 +334,7 @@
   \do\ {\Url at space}\do\%{\Url at percent}\do\^^M{\Url at space}%
   \Url at force@Tilde}% package option may force faked text-ascii-tilde
 
+\NewBibliographyString{by}
 \NewBibliographyString{to}
 \NewBibliographyString{of}
 \NewBibliographyString{with}
@@ -309,6 +341,7 @@
 \NewBibliographyString{withassistance}
 \NewBibliographyString{withpreface}
 \NewBibliographyString{paperpresented}
+\NewBibliographyString{patentfiled}
 \NewBibliographyString{released}
 
 \DeclareLanguageMapping{english}{sbl-american}
@@ -339,6 +372,8 @@
     {eprint}
     {\thefield{eprinttype}}%
   \newunitpunct
+  \usebibmacro{eprintdate}%
+  \newunitpunct
   \ifhyperref
     {\url{#1}}
     {\nolinkurl{#1}}%
@@ -346,6 +381,8 @@
     {}
     {\addspace\mkbibparens{\thefield{eprintclass}}}}
 \DeclareFieldFormat{eprint:arxiv}{%
+  \usebibmacro{eprintdate}%
+  \newunitpunct
   arXiv\addcolon\space
   \ifhyperref
     {\href{http://arxiv.org/\abx@arxivpath/#1}{%
@@ -358,6 +395,8 @@
        {}
        {\addspace\mkbibbrackets{\thefield{eprintclass}}}}}
 \DeclareFieldFormat{eprint:hethiter}{%
+  \usebibmacro{eprintdate}%
+  \newunitpunct
   \printtext{doi}\addcolon
   \ifhyperref
     {\href{http://hethiter.net/:\%20#1}{%
@@ -385,10 +424,20 @@
 \DeclareFieldFormat{shortbooktitle}{\mkbibemph{#1}}
 \DeclareFieldFormat{shortmaintitle}{\mkbibemph{#1}}
 \DeclareFieldFormat{shortjournal}{\mkbibemph{#1}}
+\DeclareFieldFormat{journalsubtitle}{\mkbibemph{#1}}
 \DeclareFieldFormat{seriesseries}{#1}
-
+\DeclareFieldFormat[article,periodical,review]{series}{% series of a journal
+  \ifinteger{#1}
+    {\mkbibordseries{#1}~\bibstring{jourser}}
+    {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
+\DeclareFieldFormat{isbn}{ISBN\addcolon\space #1}
+\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{chapter}{\bibsstring{chapter}~#1}
+\DeclareFieldFormat{chapterin}{\bibsstring{chapter}~#1 \usebibmacro{in}}
 \DeclareFieldFormat{volume}{#1}
 \DeclareFieldFormat{vol}{\bibsstring{volume}~#1}
 \DeclareFieldFormat{volumeof}{\bibsstring{volume}~#1 \bibstring{of}}
@@ -396,8 +445,8 @@
 \DeclareFieldFormat{partof}{\bibstring{part}~#1 \bibstring{of}}
 \DeclareFieldFormat{no}{\bibsstring{number}~#1}
 \DeclareFieldFormat{url}{\url{#1}}
-\DeclareFieldFormat{urldate}{}
-\DeclareFieldFormat{releasedate}{\bibstring{released}\space#1}
+\DeclareFieldFormat{urldate}{\bibstring{urlseen}\space#1}
+\DeclareFieldFormat{eprintdate}{\bibstring{released}\space#1}
 
 \DeclareFieldFormat{editortype}{\ifcapital{\MakeCapital{#1}}{#1}}
 \DeclareFieldFormat{withauthortype}{#1}
@@ -427,7 +476,12 @@
 
 \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{howpublished}{\ifbibstring{#1}{\bibstring{#1}}{#1}}
+\DeclareFieldFormat[patent]{title}{#1}
 \DeclareFieldFormat[ancienttext]{title}{%
   \ifboolexpr{
     test {\iffieldequalstr{entrysubtype}{inscription}}
@@ -438,6 +492,37 @@
     {\iffieldequalstr{entrysubtype}{churchfather}
        {\mkbibemph{#1}}
        {\mkbibquote{#1}}}}
+\DeclareFieldFormat[ancienttext]{shorttitle}{%
+  \ifboolexpr{
+    test {\iffieldequalstr{entrysubtype}{inscription}}
+    or
+    test {\iffieldequalstr{entrysubtype}{chronicle}}
+  }
+    {#1}
+    {\iffieldequalstr{entrysubtype}{churchfather}
+       {\mkbibemph{#1}}
+       {\mkbibquote{#1}}}}
+\DeclareFieldFormat[series]{title}{#1}
+\DeclareFieldFormat[series]{shorttitle}{#1}
+\DeclareFieldFormat[suppbook,suppcollection]
+{type}{%
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifcapital%
+    {\MakeCapital{#1\isdot}}%
+    {#1\isdot}}}
+\DeclareFieldFormat[suppbook,suppcollection]{title}{%
+  \iffieldundef{type}
+    {#1}
+    {\mkbibemph{#1}}}
+\DeclareFieldFormat[suppbook,suppcollection]{subtitle}{%
+  \iffieldundef{type}
+    {#1}
+    {\mkbibemph{#1}}}
+\DeclareFieldFormat[suppbook,suppcollection]{shorttitle}{%
+  \iffieldundef{type}
+    {#1}
+    {\mkbibemph{#1}}}
 
 \DeclareBibliographyAlias{cite:mvbook}{cite:book}
 \DeclareBibliographyAlias{cite:mvcollection}{cite:collection}
@@ -457,6 +542,8 @@
 \DeclareBibliographyAlias{commentary}{book}
 \DeclareBibliographyAlias{mvcommentary}{book}
 \DeclareBibliographyAlias{cite:mvcommentary}{cite:mvbook}
+\DeclareBibliographyAlias{seminarpaper}{incollection}
+\DeclareBibliographyAlias{cite:seminarpaper}{cite:incollection}
 \DeclareBibliographyAlias{cite:online}{cite:article}
 \DeclareBibliographyAlias{online}{article}
 \DeclareBibliographyAlias{cite:manual}{cite:book}
@@ -469,9 +556,21 @@
 \DeclareBibliographyAlias{cite:proceedings}{cite:collection}
 \DeclareBibliographyAlias{cite:mvproceedings}{cite:mvcollection}
 \DeclareBibliographyAlias{cite:inproceedings}{cite:incollection}
+\DeclareBibliographyAlias{bookinbook}{incollection}
+\DeclareBibliographyAlias{cite:bookinbook}{cite:incollection}
+\DeclareBibliographyAlias{series}{mvcollection}
+\DeclareBibliographyAlias{cite:series}{cite:mvcollection}
+\DeclareBibliographyAlias{cite:booklet}{cite:book}
+\DeclareBibliographyAlias{booklet}{book}
+\DeclareBibliographyAlias{cite:suppcollection}{cite:suppbook}
+\DeclareBibliographyAlias{suppcollection}{suppbook}
+\DeclareBibliographyAlias{cite:report}{cite:book}
+\DeclareBibliographyAlias{report}{book}
+\DeclareBibliographyAlias{cite:suppperiodical}{cite:article}
+\DeclareBibliographyAlias{suppperiodical}{article}
 
 \DeclareLabeldate{%
-  \field{releasedate}
+  \field{eprintdate}
 }
 
 \renewcommand*{\newunitpunct}{\addcomma\space}
@@ -504,7 +603,6 @@
      \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
      \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}
 
-
 % ------------------------------------------------------------------
 % BIBLIOGRAPHY
 % ------------------------------------------------------------------
@@ -535,7 +633,6 @@
       {}}%
   \expandafter\g at addto@macro\expandafter\blx at includeentries\expandafter{\X}}
 
-
 % ------------------------------------------------------------------
 % LIST OF ABBREVIATIONS
 % ------------------------------------------------------------------
@@ -580,7 +677,11 @@
   \iffieldundef{shortjournal}
     {}
     {\bibhypertarget{\strfield{shortjournal}}{}%
-     \printfield{journaltitle}}%
+     \printfield{journaltitle}%
+     \iffieldundef{journalsubtitle}
+       {}
+       {\setunit{\subtitlepunct}%
+        \printfield{journalsubtitle}}}%
   \iffieldundef{shorthand}
     {\iffieldundef{shortseries}
        {}
@@ -649,14 +750,65 @@
       \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{
+      \pertype{suppbook}
+      \pertype{suppcollection}
+      \step[fieldsource=type, final]
+      \step[fieldsource=title, final]
+      \step[fieldset=booktitle, origfieldval]
+    }
+    \map{
+      \pertype{suppbook}
+      \pertype{suppcollection}
+      \step[fieldsource=type, final]
+      \step[fieldsource=subtitle, final]
+      \step[fieldset=subbooktitle, origfieldval]
+    }
+    \map{
+      \pertype{suppbook}
+      \pertype{suppcollection}
+      \step[fieldsource=type, final]
+      \step[fieldsource=titleaddon, final]
+      \step[fieldset=booktitleaddon, origfieldval]
+    }
+    \map{
+      \pertype{periodical}
+      \step[fieldsource=title, final]
+      \step[fieldset=journaltitle, origfieldval]
+    }
+    \map{
+      \pertype{periodical}
+      \step[fieldsource=subtitle, final]
+      \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}]
     }
     \map[overwrite]{
+      \pertype{series}
+      \step[fieldsource=options, match=\regexp{(.*)}]
+      \step[fieldset=options, fieldvalue={useauthor=false,useeditor=false,}]
+      \step[fieldset=options, fieldvalue={$1}, append]
+    }
+    \map[overwrite]{
       \pertype{ancienttext}
       \pertype{classictext}
       \step[fieldsource=related, final]
@@ -684,9 +836,11 @@
 % DATA INHERITANCE
 % ------------------------------------------------------------------
 
-\DeclareDataInheritance{mvbook,mvcollection,mvreference,mvlexicon,mvcommentary}
-    {book,inbook,collection,incollection,reference,inreference,bookinbook,
-     lexicon,commentary,inlexicon,incommentary,classictext}{%
+\DeclareDataInheritance{mvbook,mvcollection,mvreference,mvlexicon,mvcommentary,
+                        mvproceedings,series}
+    {book,inbook,bookinbook,suppbook,collection,incollection,suppcollection,
+     reference,inreference,lexicon,inlexicon,commentary,incommentary,proceedings,
+     inproceedings,classictext}{%
   \inherit{title}{maintitle}
   \inherit{subtitle}{mainsubtitle}
   \inherit{titleaddon}{maintitleaddon}
@@ -693,6 +847,12 @@
   \inherit{shorttitle}{shortmaintitle}
   \inherit{editor}{maineditor}
   \inherit{translator}{maintranslator}
+  \inherit{withauthor}{withmainauthor}
+  \inherit{witheditor}{withmaineditor}
+  \inherit{withtranslator}{withmaintranslator}
+  \inherit{withauthortype}{withmainauthortype}
+  \inherit{witheditortype}{withmaineditortype}
+  \inherit{withtranslatortype}{withmaintranslatortype}
   \noinherit{sorttitle}
   \noinherit{indextitle}
   \noinherit{indexsorttitle}
@@ -699,9 +859,9 @@
   \noinherit{endyear}
 }
 
-\DeclareDataInheritance{book,collection,reference,lexicon,commentary}
-    {inbook,incollection,inreference, inlexicon,incommentary,
-     bookinbook,classictext}{%
+\DeclareDataInheritance{book,collection,reference,lexicon,commentary,proceedings}
+    {inbook,bookinbook,suppbook,incollection,suppcollection,inreference,inlexicon,
+     incommentary,inproceedings,classictext}{%
   \inherit{title}{booktitle}
   \inherit{subtitle}{booksubtitle}
   \inherit{titleaddon}{booktitleaddon}
@@ -709,6 +869,12 @@
   \inherit{author}{bookauthor}
   \inherit{editor}{bookeditor}
   \inherit{translator}{booktranslator}
+  \inherit{withauthor}{withbookauthor}
+  \inherit{witheditor}{withbookeditor}
+  \inherit{withtranslator}{withbooktranslator}
+  \inherit{withauthortype}{withbookauthortype}
+  \inherit{witheditortype}{withbookeditortype}
+  \inherit{withtranslatortype}{withbooktranslatortype}
   \noinherit{sorttitle}
   \noinherit{indextitle}
   \noinherit{indexsorttitle}
@@ -715,6 +881,9 @@
   \noinherit{endyear}
 }
 
+\DeclareDataInheritance{periodical}{article,suppperiodical}{%
+  \inherit{shorttitle}{shortjournal}
+}
 
 % ------------------------------------------------------------------
 % LANGUAGE
@@ -732,14 +901,34 @@
 \renewcommand*{\lbx at sfromlang}{%
   \iffieldundef{origlanguage}
     {\unspace}
-    {\ifbibstring{from\thefield{origlanguage}}
+    {\ifbibxstring{from\abx at field@origlanguage}
        {\bibsstring{from\thefield{origlanguage}}}
        {from \printfield{origlanguage}}}}
 
+\newbibmacro*{language}{%
+  \iflistundef{language}
+    {}
+    {\setunit{\addspace}%
+     \printtext[brackets]{%
+       \usebibmacro{in}%
+       \printlist{language}}}}
+
 % ------------------------------------------------------------------
 % SET UP DELIMITER MACROS
 % ------------------------------------------------------------------
 
+\newbibmacro*{ifneedsetpostnotedelim}[2]{%
+  \ifboolexpr{
+    test {\ifentrytype{ancienttext}}
+    or
+    test {\ifentrytype{classictext}}
+  }
+    {\def\blx at shorthand{true}}
+    {}%
+  \usebibmacro{ifuseshorthand} 
+    {#1}
+    {#2}}
+
 \ExplSyntaxOn
 \cs_new_protected:Nn \sbl_ifinstringt:nnn {
    \tl_if_in:nnT {#2}{#1}{#3}}
@@ -748,6 +937,9 @@
 \ExplSyntaxOff
 
 \newbibmacro*{setpostnotedelim}{%
+  \iftoggle{cbx:involcite}
+    {\renewcommand*{\postnotedelim}{\addspace}}
+    {}%
   \iffieldundef{postnote}
     {}
     {\IfInStringT{.}{\abx at field@postnote}
@@ -800,6 +992,62 @@
   \setunit{\addspace}}
 
 % ------------------------------------------------------------------
+% SHORTHAND MACROS
+% ------------------------------------------------------------------
+
+\newbibmacro*{ifuseshorthand}[2]{%
+  \ifboolexpr{
+    not test {\iffieldundef{shorthand}}
+    and
+    (
+      test {\ifcsstring{blx at shorthand}{true}}
+      or
+      (
+        test {\ifcsstring{blx at shorthand}{short}}
+        and
+        test {\ifciteseen}
+      )
+      or
+      (
+        test {\ifcsstring{blx at shorthand}{intro}}
+        and
+        test {\ifciteseen}
+      )
+    )
+  }
+    {#1}
+    {#2}}
+
+\newbibmacro*{ifciteuseshorthand}[2]{%
+  \ifboolexpr{
+    test {\ifentrytype{ancienttext}}
+    or
+    test {\ifentrytype{classictext}}
+  }
+    {\def\blx at shorthand{true}}
+    {}%
+  \usebibmacro{ifuseshorthand}
+    {#1}
+    {#2}}
+  
+\newbibmacro*{shorthand}{%
+  \iffieldsequal{shorthand}{shorttitle}
+    {\printtext{\mkbibemph{\printtext{%
+       \bibhyperlink{\strfield{shorthand}}{\thefield{shorthand}}}}}}
+    {\printtext{\bibhyperlink{\strfield{shorthand}}{\thefield{shorthand}}}}}
+
+\renewbibmacro*{shorthandintro}{%
+  \iffieldundef{shorthandintro}
+    {\iffieldundef{shorthand}
+       {}
+       {\setunit{\addspace}%
+        \printtext[parens]{%
+          \bibstring{citedas}\space
+          \usebibmacro{shorthand}}}}
+    {\setunit{\addspace}%
+     \printtext[parens]{\printfield{shorthandintro}}}}
+
+% ------------------------------------------------------------------
 % TITLE MACROS
 % ------------------------------------------------------------------
 
@@ -808,10 +1056,16 @@
     {\iffieldundef{shorttitle}
        {\iffieldundef{title}
           {}
+          {\ifbool{bbx at inset}
+             {\printtext{\bibhyperlink{\strfield{setkey}}
+                {\printtext[title]{\printfield[titlecase]{title}}}}}
+             {\printtext[bibhyperlink]{%
+                \printtext[title]{\printfield[titlecase]{title}}}}}}
+       {\ifbool{bbx at inset}
+          {\printtext{\bibhyperlink{\strfield{setkey}}
+             {\printtext[title]{\printfield[titlecase]{shorttitle}}}}}
           {\printtext[bibhyperlink]{%
-             \printtext[title]{\printfield[titlecase]{title}}}}}
-       {\printtext[bibhyperlink]{%
-          \printtext[title]{\printfield[titlecase]{shorttitle}}}}%
+             \printtext[title]{\printfield[titlecase]{shorttitle}}}}}%
      \newunit}
     {}}
 
@@ -821,8 +1075,7 @@
        {\iffieldundef{title}
           {}
           {\printtext[title]{\printfield[titlecase]{title}}}}
-       {\printtext[title]{\printfield[titlecase]{shorttitle}}}%
-     \newunit}
+       {\printtext[title]{\printfield[titlecase]{shorttitle}}}}
     {}}
 
 \newbibmacro*{shortbooktitle}{%
@@ -843,57 +1096,40 @@
 
 \renewbibmacro*{title}{%
   \ifciteseen
-    {\ifboolexpr{
-       test {\ifnameundef{author}}
-       and
-       not test {\ifnameundef{editor}}
-     }
+    {\usebibmacro{shorttitle}}
+    {\iffieldundef{title}
        {}
-       {\usebibmacro{shorttitle}}}
-    {\ifboolexpr{
-       test {\iffieldundef{title}}
-       and
-       test {\iffieldundef{subtitle}}
-     }
-       {}
        {\printtext[title]{%
           \printfield[titlecase]{title}%
           \setunit{\subtitlepunct}%
           \printfield[titlecase]{subtitle}}%
-        \newunit}%
-     \printfield{titleaddon}}}
+        \newunit
+        \printfield{titleaddon}%
+        \usebibmacro{language}}}}
 
 \renewbibmacro*{booktitle}{%
   \ifciteseen
     {\usebibmacro{shortbooktitle}}
-    {\ifboolexpr{
-       test {\iffieldundef{booktitle}}
-       and
-       test {\iffieldundef{booksubtitle}}
-     }
+    {\iffieldundef{booktitle}
        {}
        {\printtext[booktitle]{%
           \printfield[titlecase]{booktitle}%
           \setunit{\subtitlepunct}%
           \printfield[titlecase]{booksubtitle}}%
-        \newunit}%
-     \printfield{booktitleaddon}}}
+        \newunit
+        \printfield{booktitleaddon}}}}
 
 \renewbibmacro*{maintitle}{%
   \ifciteseen
     {\usebibmacro{shortmaintitle}}
-    {\ifboolexpr{
-       test {\iffieldundef{maintitle}}
-       and
-       test {\iffieldundef{mainsubtitle}}
-     }
+    {\iffieldundef{maintitle}
        {}
        {\printtext[maintitle]{%
           \printfield[titlecase]{maintitle}%
           \setunit{\subtitlepunct}%
           \printfield[titlecase]{mainsubtitle}}%
-        \newunit}%
-     \printfield{maintitleaddon}}}
+        \newunit
+        \printfield{maintitleaddon}}}}
 
 \newbibmacro*{booktitle+maintitle}{%
   \iffieldundef{booktitle}
@@ -910,13 +1146,13 @@
      \clearfield{bootitleaddon}%
      \newunit}}
 
-\newbibmacro*{shortbooktitle+shortmaintitle}{%
-  \iffieldundef{booktitle}
-    {\iffieldundef{maintitle}
+\newbibmacro*{shortmaintitle+shortbooktitle}{%
+  \iffieldundef{maintitle}
+    {\iffieldundef{booktitle}
       {}
-      {\usebibmacro{shortmaintitle}
+      {\usebibmacro{shortbooktitle}
        \newunit}}
-    {\usebibmacro{shortbooktitle}%
+    {\usebibmacro{shortmaintitle}%
      \newunit}}
 
 \newbibmacro*{revdshorttitle}{%
@@ -932,11 +1168,7 @@
 \newbibmacro*{revdtitle}{%
   \ifciteseen
     {\usebibmacro{revdshorttitle}}
-    {\ifboolexpr{
-       test {\iffieldundef{revdtitle}}
-       and
-       test {\iffieldundef{revdsubtitle}}
-     }
+    {\iffieldundef{revdtitle}
        {}
        {\printtext[revdtitle]{%
           \printfield[titlecase]{revdtitle}%
@@ -945,9 +1177,9 @@
         \newunit}%
      \printfield{revdtitleaddon}}}
 
-\newbibmacro*{xrefshortbooktitle+xrefshortmaintitle}{%
+\newbibmacro*{xrefshortmaintitle+xrefshortbooktitle}{%
   \iffieldundef{xref}
-    {\usebibmacro{shortbooktitle+shortmaintitle}}
+    {\usebibmacro{shortmaintitle+shortbooktitle}}
     {\entrydata{\thefield{xref}}{%
        \iffieldundef{shorttitle}
          {\usebibmacro{shorttitle}}
@@ -969,13 +1201,25 @@
     {\printtext[shortjournal]{%
        \bibhyperlink{\strfield{shortjournal}}{\thefield{shortjournal}}}}}
 
-\newbibmacro*{shortjournal+issuetitle}{%
+\newbibmacro*{shortjournal+issue}{%
   \usebibmacro{shortjournal}%
-  \iffieldundef{series}
-    {}
+  \setunit{\addspace}%
+  \usebibmacro{series+volume+number+eid}%
+  \ifboolexpr{
+    not test {\ifnameundef{editor}}
+    or
+    not test {\ifnameundef{editora}}
+    or
+    not test {\ifnameundef{editorb}}
+    or
+    not test {\ifnameundef{editorc}}
+    or
+    not test {\iffieldundef{series}}
+  }
     {\newunit
-     \printfield{series}}%
-  \usebibmacro{volume+number+eid}%
+     \usebibmacro{byeditor+others}%
+     \newunit}
+    {\setunit{\addspace}}%
   \usebibmacro{issue+date}%
   \ifboolexpr{
     test {
@@ -1005,7 +1249,9 @@
   }
     {}
     {\iffieldundef{volume}
-      {\setunit{\addcomma\space}%
+       {\iffieldundef{journaltitle}
+          {\newunit}
+          {\setunit{\addcomma\space}}%
         \iffieldundef{issue}
           {\usebibmacro{date}}
           {\printfield{issue}%
@@ -1021,8 +1267,12 @@
              \usebibmacro{date}}}%
         \setunit{\addcolon\space}}}}
 
-\renewbibmacro*{volume+number+eid}{%
-  \setunit*{\addspace}%
+\newbibmacro*{series+volume+number+eid}{%
+  \iffieldundef{series}
+    {}
+    {\newunit
+     \printfield{series}%
+     \newunit}%
   \printfield{volume}%
   \setunit*{\addperiod}%
   \printfield{number}%
@@ -1029,32 +1279,33 @@
   \setunit{\addcomma\space}%
   \printfield{eid}}
 
-\newbibmacro*{volume+part}{%
-  \iffieldundef{volume}
+\newbibmacro{inissuetitle}{%
+  \iffieldundef{issuetitle}
     {}
-    {\iffieldundef{part}
-       {\usebibmacro{volumeof}}
-       {\printfield[vol]{volume}%
-        \setunit{\addcomma\addspace}%
-        \iffieldundef{maintitle}
-          {\printfield[pt]{part}%
-           \newunit}
-          {\printfield[partof]{part}
-           \setunit{\addspace}}}}}
+    {\usebibmacro{in}%
+     \printtext[issuetitle]{%
+       \printfield[titlecase]{issuetitle}%
+         \setunit*{\subtitlepunct}%
+         \printfield[titlecase]{issuesubtitle}}}}
 
-\newbibmacro*{involume+part}{%
-  \ifboolexpr{
-    test {\iffieldundef{booktitle}}
-    and
-    not test {\iffieldundef{volume}}
-    and
-    test {\iffieldundef{pages}}
-  }
-    {\bibstring{in}%
-     \setunit{\space}}
-    {}%
-  \usebibmacro{volume+part}}
+\newbibmacro*{shortissuetitle}{%
+  \iffieldundef{shortissuetitle}
+    {\iffieldundef{issuetitle}
+       {}
+       {\printtext[issuetitle]{\printfield[titlecase]{issuetitle}}}}
+    {\printtext[issuetitle]{\printfield[titlecase]{shortissuetitle}}}%
+  \newunit}
 
+\newbibmacro{issuetitle}{%
+  \iffieldundef{issuetitle}
+    {}
+    {\ifciteseen
+       {\usebibmacro{shortissuetitle}}
+       {\printtext[issuetitle]{%
+        \printfield[titlecase]{issuetitle}%
+          \setunit*{\subtitlepunct}%
+          \printfield[titlecase]{issuesubtitle}}}}}
+
 % ------------------------------------------------------------------
 % NAME MACROS
 % ------------------------------------------------------------------
@@ -1070,7 +1321,7 @@
           {\ifbibxstring{\thefield{with#1type}}
              {\bibstring{\thefield{with#1type}}}
              {\printtext[with#1type]{\thefield{with#1type}}}}}%
-     \setunit{\space}%
+     \setunit{\addspace}%
      \printnames{with#1}%
      \clearname{with#1}}}
 
@@ -1191,10 +1442,16 @@
        \usebibmacro{ifidemused}
          {}
          {\printnames[labelname]{author}}%
-     }{%
+     }{\renewcommand*{\namedashpunct}{\adddot\space}%
        \iffieldundef{authortype}
-         {\renewcommand*{\namedashpunct}{\adddot\space}}
+         {}
          {\renewcommand*{\namedashpunct}{\addcomma\space}}%
+       \ifnameundef{withauthor}
+         {}
+         {\renewcommand*{\namedashpunct}{\addcomma\space}}%
+       \ifnameundef{holder}
+         {}
+         {\renewcommand*{\namedashpunct}{\addspace}}%
        \usebibmacro{dashcheck}
          {\bibnamedash}
          {\usebibmacro{ifidemused}
@@ -1208,19 +1465,15 @@
        \usebibmacro{withname}{author}}}
     {\global\undef\bbx at lasthash}}
 
-\renewbibmacro*{bybookauthor}{%
-  \ifboolexpr{
-    test {\ifnameundef{bookauthor}}
-    or
-    test {\ifnamesequal{author}{bookauthor}}
-  }
+\newbibmacro*{author+holder}{%
+  \usebibmacro{author}%
+  \ifciteseen
     {}
-    {\usebibmacro{bytypestrg}{author}{author}%
-     \setunit{\addspace}%
-     \printnames[byauthor]{bookauthor}%
-     \usebibmacro{withname}{author}}%
-}
-     
+    {\ifnameundef{holder}
+       {}
+       {\setunit{\addspace}%
+        \printtext[parens]{\printnames{holder}}}}}
+
 \renewbibmacro*{editor+others}{%
   \ifboolexpr{
     test \ifuseeditor
@@ -1231,8 +1484,7 @@
        \usebibmacro{ifidemused}
          {}
          {\printnames[labelname]{editor}}%
-     }{%
-       \renewcommand*{\namedashpunct}{\addcomma\space}%
+     }{\renewcommand*{\namedashpunct}{\addcomma\space}%
        \usebibmacro{dashcheck}
          {\bibnamedash}
          {\usebibmacro{ifidemused}
@@ -1271,6 +1523,55 @@
      \clearname{translator}}
     {}}
 
+\renewbibmacro*{byauthor}{%
+  \ifboolexpr{
+    test {\ifuseauthor}
+    or
+    test {\iffieldundef{title}}
+    or
+    test {\ifnameundef{author}}
+  }
+    {}
+    {\setunit{\addcomma\space}%
+     \usebibmacro{bytypestrg}{author}{author}%
+     \setunit{\addspace}%
+     \printnames[byauthor]{author}%
+     \usebibmacro{withname}{author}}}%
+
+\renewbibmacro*{bybookauthor}{%
+  \ifboolexpr{
+    test {\iffieldundef{booktitle}}
+    or
+    test {\ifnameundef{bookauthor}}
+    or
+    test {\ifnamesequal{author}{bookauthor}}
+  }
+    {}
+    {\setunit{\addcomma\space}%
+     \usebibmacro{bytypestrg}{author}{author}%
+     \setunit{\addspace}%
+     \printnames[byauthor]{bookauthor}%
+     \usebibmacro{withname}{bookauthor}}%
+}
+
+\newbibmacro*{bymainauthor}{%
+  \ifboolexpr{
+    test {\iffieldundef{maintitle}}
+    or
+    test {\ifnameundef{mainauthor}}
+    or
+    test {\ifnamesequal{author}{mainauthor}}
+    or
+    test {\ifnamesequal{bookauthor}{mainauthor}}
+  }
+    {}
+    {\setunit{\addcomma\space}%
+     \usebibmacro{bytypestrg}{author}{author}%
+     \setunit{\addspace}%
+     \printnames[byauthor]{mainauthor}%
+     \usebibmacro{withname}{mainauthor}}%
+}
+     
 \renewbibmacro*{byeditor}{%
   \ifnameundef{editor}
     {}
@@ -1277,9 +1578,9 @@
     {\usebibmacro{bytypestrg}{editor}{editor}%
      \setunit{\addspace}%
      \printnames[byeditor]{editor}%
+     \clearname{editor}%
      \usebibmacro{withname}{editor}%
-     \newunit}%
-  \usebibmacro{byeditorx}}
+     \newunit}}
   
 \renewbibmacro*{byeditor+others}{%
   \ifnameundef{editor}
@@ -1290,9 +1591,31 @@
      \clearname{editor}%
      \usebibmacro{withname}{editor}%
      \newunit}%
-  \usebibmacro{byeditorx}%
-  \usebibmacro{bytranslator+others}}
+  \usebibmacro{byeditorx}}
 
+\renewbibmacro*{byeditorx}{%
+  \ifnameundef{editora}
+    {}
+    {\usebibmacro{bytypestrg}{editora}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditora]{editora}%
+     \clearname{editora}%
+     \newunit}%
+  \ifnameundef{editorb}
+    {}
+    {\usebibmacro{bytypestrg}{editorb}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorb]{editorb}%
+     \clearname{editorb}%
+     \newunit}%
+  \ifnameundef{editorc}
+    {}
+    {\usebibmacro{bytypestrg}{editorc}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorc]{editorc}%
+     \clearname{editorc}%
+     \newunit}}
+
 \renewbibmacro*{bytranslator}{%
   \ifnameundef{translator}
     {}
@@ -1299,6 +1622,7 @@
     {\bibstring{bytranslator}%
      \setunit{\addspace}%
      \printnames[bytranslator]{translator}%
+     \clearname{translator}%
      \usebibmacro{withname}{translator}}}
 
 \renewbibmacro*{bytranslator+others}{%
@@ -1312,15 +1636,51 @@
      \newunit}%
   \usebibmacro{withothers}}
 
-\newbibmacro*{bybookeditor+others}{%
-  \ifnameundef{editor}
+\newbibmacro*{byeditor/bytranslator}{%
+  \ifboolexpr{
+    (
+      not test {\ifnameundef{bookeditor}}
+      and
+      not test {\ifnameundef{maineditor}}
+    )
+    or
+    (
+      not test {\ifnameundef{maineditor}}
+      and
+      test {\iffieldundef{booktitle}}
+    )
+  }
+    {\usebibmacro{byeditor}}
     {}
-    {\usebibmacro{byeditor+othersstrg}%
-     \setunit{\addspace}%
-     \printnames[byeditor]{editor}%
-     \clearname{editor}%
-     \usebibmacro{withname}{editor}%
-     \newunit}%
+  \newunit
+  \ifboolexpr{
+    (
+      not test {\ifnameundef{booktranslator}}
+      and
+      not test {\ifnameundef{maintranslator}}
+    )
+    or
+    (
+      not test {\ifnameundef{maintranslator}}
+      and
+      test {\iffieldundef{booktitle}}
+    )
+  }
+    {\usebibmacro{bytranslator}}
+    {}}
+
+\newbibmacro*{byauthor/byeditor+others/bytranslator+others}{%
+  \iffieldundef{title}
+    {}
+    {\usebibmacro{byauthor}%
+     \newunit
+     \usebibmacro{ifbooktitleormaintitle}
+       {\usebibmacro{byeditor/bytranslator}}
+       {\usebibmacro{byeditor+others}%
+        \newunit
+        \usebibmacro{bytranslator+others}}}}
+
+\newbibmacro*{bybookeditor}{%
   \ifnameundef{bookeditor}
     {}
     {\usebibmacro{byeditor+othersstrg}%
@@ -1327,40 +1687,28 @@
      \setunit{\addspace}%
      \printnames[byeditor]{bookeditor}%
      \clearname{bookeditor}%
-     \usebibmacro{withname}{bookeditor}%
-     \newunit}%
-  \usebibmacro{byeditorx}%
-  \usebibmacro{bybooktranslator+others}}
+     \usebibmacro{withname}{bookeditor}}}
 
-\newbibmacro*{bymaineditor+others}{%
-  \ifnameundef{editor}
-    {}
-    {\usebibmacro{byeditor+othersstrg}%
-     \setunit{\addspace}%
-     \printnames[byeditor]{editor}%
-     \clearname{editor}%
-     \usebibmacro{withname}{editor}%
-     \newunit}%
-  \ifnameundef{maineditor}
-    {}
-    {\usebibmacro{byeditor+othersstrg}%
-     \setunit{\addspace}%
-     \printnames[byeditor]{maineditor}%
-     \clearname{maineditor}%
-     \usebibmacro{withname}{maineditor}%
-     \newunit}%
-  \usebibmacro{byeditorx}%
-  \usebibmacro{bymaintranslator+others}}
+\newbibmacro*{bybookeditor+others}{%
+  \ifboolexpr{
+    (
+      not test {\ifnameundef{maineditor}}
+      and
+      test {\ifnameundef{bookeditor}}
+    )
+    or
+    (
+      test {\iffieldundef{maintitle}}
+      and
+      test {\ifnameundef{bookeditor}}
+    )
+  }
+    {\usebibmacro{byeditor}}
+    {\usebibmacro{bybookeditor}}%
+  \newunit
+  \usebibmacro{byeditorx}}
 
-\newbibmacro*{bybooktranslator+others}{%
-  \ifnameundef{translator}
-    {}
-    {\usebibmacro{bytranslator+othersstrg}%
-     \setunit{\addspace}%
-     \printnames[bytranslator]{translator}%
-     \clearname{translator}%
-     \usebibmacro{withname}{translator}%
-     \newunit}%
+\newbibmacro*{bybooktranslator}{%
   \ifnameundef{booktranslator}
     {}
     {\usebibmacro{bytranslator+othersstrg}%
@@ -1367,73 +1715,125 @@
      \setunit{\addspace}%
      \printnames[bytranslator]{booktranslator}%
      \clearname{booktranslator}%
-     \usebibmacro{withname}{booktranslator}%
-     \newunit}%
+     \usebibmacro{withname}{booktranslator}}}
+
+\newbibmacro*{bybooktranslator+others}{%
+  \ifboolexpr{
+    (
+      not test {\ifnameundef{maintranslator}}
+      and
+      test {\ifnameundef{booktranslator}}
+    )
+    or
+    (
+      test {\iffieldundef{maintitle}}
+      and
+      test {\ifnameundef{booktranslator}}
+    )
+  }
+    {\usebibmacro{bytranslator}}
+    {\usebibmacro{bybooktranslator}}%
+  \newunit
   \usebibmacro{withothers}}
 
-\newbibmacro*{bymaintranslator+others}{%
-  \ifnameundef{translator}
+\newbibmacro*{bybookeditor/bybooktranslator}{%
+  \ifboolexpr{
+    (
+      not test {\ifnameundef{maineditor}}
+      and
+      test {\ifnameundef{bookeditor}}
+    )
+    or
+    (
+      test {\iffieldundef{maintitle}}
+      and
+      test {\ifnameundef{bookeditor}}
+    )
+  }
+    {\usebibmacro{byeditor}}
+    {\usebibmacro{bybookeditor}}%
+  \newunit
+  \ifboolexpr{
+    (
+      not test {\ifnameundef{maintranslator}}
+      and
+      test {\ifnameundef{booktranslator}}
+    )
+    or
+    (
+      test {\iffieldundef{maintitle}}
+      and
+      test {\ifnameundef{booktranslator}}
+    )
+  }
+    {\usebibmacro{bytranslator}}
+    {\usebibmacro{bybooktranslator}}}
+
+\newbibmacro*{bybookauthor/bybookeditor+others/bybooktranslator+others}{%
+  \iffieldundef{booktitle}
     {}
-    {\usebibmacro{bytranslator+othersstrg}%
+    {\usebibmacro{bybookauthor}%
+     \newunit
+     \iffieldundef{maintitle}
+       {\usebibmacro{bybookeditor+others}%
+        \newunit
+        \usebibmacro{bybooktranslator+others}}
+       {\usebibmacro{bybookeditor/bybooktranslator}}}}
+
+\newbibmacro*{bymaineditor+others}{%
+  \ifnameundef{maineditor}
+    {\usebibmacro{byeditor+others}}
+    {\usebibmacro{byeditor+othersstrg}%
      \setunit{\addspace}%
-     \printnames[bytranslator]{translator}%
-     \clearname{translator}%
-     \usebibmacro{withname}{translator}%
-     \newunit}%
+     \printnames[byeditor]{maineditor}%
+     \clearname{maineditor}%
+     \usebibmacro{withname}{maineditor}%
+     \newunit
+     \usebibmacro{byeditorx}}}
+
+\newbibmacro*{bymaintranslator+others}{%
   \ifnameundef{maintranslator}
-    {}
+    {\usebibmacro{bytranslator+others}}
     {\usebibmacro{bytranslator+othersstrg}%
      \setunit{\addspace}%
      \printnames[bytranslator]{maintranslator}%
      \clearname{maintranslator}%
      \usebibmacro{withname}{maintranslator}%
-     \newunit}%
-  \usebibmacro{withothers}}
+     \newunit
+     \usebibmacro{withothers}}}
 
+\newbibmacro*{bymainauthor/bymaineditor+others/bymaintranslator+others}{%
+  \iffieldundef{maintitle}
+    {}
+    {\usebibmacro{bymainauthor}%
+     \newunit
+     \usebibmacro{bymaineditor+others}%
+     \newunit
+     \usebibmacro{bymaintranslator+others}}}
+
 \newbibmacro*{revdauthor}{%
-  \ifboolexpr{
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{revdauthor}}
-  }
+  \ifnameundef{revdauthor}
+    {}
     {\bibstring{byauthor}%
      \setunit{\addspace}%
-     \ifciteseen{%
-       \printnames[labelname]{revdauthor}%
-     }{%
-       \printnames{revdauthor}%
-       \iffieldundef{authortype}
-         {}
-         {\setunit{\addcomma\space}%
-          \usebibmacro{authorstrg}}}}
-    {}}
+     \ifciteseen
+       {\printnames[labelname]{revdauthor}}
+       {\printnames{revdauthor}}}}
 
 \newbibmacro*{revdeditor}{%
-  \ifboolexpr{
-    test \ifuseeditor
-    and
-    not test {\ifnameundef{revdeditor}}
-  }
+  \ifnameundef{revdeditor}
+    {}
     {\bibsstring{byeditor}%
      \setunit{\addspace}%
-     \ifciteseen{%
-       \printnames[labelname]{revdeditor}%
-     }{%
-       \printnames{revdeditor}%
-     }%
-     \clearname{revdeditor}}
-    {}}
+     \ifciteseen
+       {\printnames[labelname]{revdeditor}}
+       {\printnames{revdeditor}}}}
 
 \newbibmacro*{revdauthor/revdeditor}{%
-  \ifboolexpr{
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{revdauthor}}
-  }
-    {\usebibmacro{revdauthor}}
-    {\usebibmacro{revdeditor}}}
+  \usebibmacro{revdauthor}%
+  \setunit{\addcomma\space}%
+  \usebibmacro{revdeditor}}
 
-
 \newbibmacro*{revdauthor/revdeditor+revdtitle}{%
   \biblstring{reviewof}%
   \setunit{\addspace}%
@@ -1443,6 +1843,10 @@
     {\setunit{\addcomma\space}%
      \usebibmacro{revdtitle}}}
 
+% ------------------------------------------------------------------
+% SERIES MACROS
+% ------------------------------------------------------------------
+
 \newbibmacro*{shortseries}{%
   \iffieldundef{shortseries}
     {\printfield{series}}
@@ -1460,6 +1864,32 @@
   \printfield{number}%
   \newunit}
 
+% ------------------------------------------------------------------
+% EVENT MACROS
+% ------------------------------------------------------------------
+
+\renewbibmacro*{event+venue+date}{%
+  \iffieldundef{eventtitle}
+    {}
+    {\printfield{eventtitle}%
+     \newunit
+     \printfield{eventtitleaddon}}%
+  \ifboolexpr{
+    test {\iffieldundef{venue}}
+    and
+    test {\iffieldundef{eventyear}}
+  }
+    {}
+    {\setunit{\addspace}%
+     \printtext[parens]{%
+       \printfield{venue}%
+       \setunit*{\addcomma\space}%
+       \printeventdate}}%
+  \newunit
+  \clearfield{eventtitle}%
+  \clearfield{venue}%
+  \clearfield{eventyear}}
+
 \newbibmacro*{eventtitle}{%
   \iffieldundef{eventtitle}
     {}
@@ -1468,7 +1898,9 @@
        {\midsentence}%
      \bibstring{paperpresented}%
      \setunit{\addspace}%
-     \printfield{eventtitle}}}
+     \printfield{eventtitle}%
+     \newunit
+     \printfield{eventtitleaddon}}}
 
 \newbibmacro*{venue+eventdate}{%
   \iffieldundef{venue}
@@ -1479,22 +1911,40 @@
     {\printdate}
     {\printeventdate}}
 
+% ------------------------------------------------------------------
+% PUBLISHER MACROS
+% ------------------------------------------------------------------
+
 \newbibmacro*{parens+publisher+location+date}{%
-  \setunit{\space}%
-  \printtext[parens]{%
-    \usebibmacro{publisher+location+date}%
-    \iffieldequalstr{relatedtype}{reprint}
-      {\renewcommand*{\newunitpunct}{\addsemicolon\space}%
-       \newunit
-       \usebibmacro{related:init}%
-       \usebibmacro{related}%
-       \global\toggletrue{relatedseen}}
-      {}}}
+  \ifboolexpr{
+    test {\iflistundef{publisher}}
+    and
+    test {\iflistundef{location}}
+    and
+    test {\iffieldundef{howpublished}}
+    and
+    test {\iffieldundef{year}}
+  }
+    {}
+    {\setunit{\addspace}%
+     \printtext[parens]{%
+       \usebibmacro{publisher+location+date}%
+       \iffieldequalstr{relatedtype}{reprint}
+         {\renewcommand*{\newunitpunct}{\addsemicolon\space}%
+          \newunit
+          \usebibmacro{related:init}%
+          \usebibmacro{related}%
+          \global\toggletrue{relatedseen}}
+         {}}}}
 
 \newcounter{currentpublisher}
 \newcounter{currentlocation}
+\newcounter{currentorganization}
+\newcounter{currentinstitution}
 \newcounter{publishertotal}
 \newcounter{locationtotal}
+\newcounter{organizationtotal}
+\newcounter{institutiontotal}
 
 \DeclareListFormat{publisher}{%
   \setcounter{publishertotal}{\value{listtotal}}%
@@ -1504,6 +1954,22 @@
     {\setcounter{currentpublisher}{0}}
     {\addtocounter{currentpublisher}{1}}}
 
+\DeclareListFormat{organization}{%
+  \setcounter{organizationtotal}{\value{listtotal}}%
+  \usebibmacro{list:delim}{#1}%
+  #1\isdot
+  \ifnumequal{\value{currentorganization}}{\value{listtotal}}
+    {\setcounter{currentorganization}{0}}
+    {\addtocounter{currentorganization}{1}}}
+
+\DeclareListFormat{institution}{%
+  \setcounter{institutiontotal}{\value{listtotal}}%
+  \usebibmacro{list:delim}{#1}%
+  #1\isdot
+  \ifnumequal{\value{currentinstitution}}{\value{listtotal}}
+    {\setcounter{currentinstitution}{0}}
+    {\addtocounter{currentinstitution}{1}}}
+
 \DeclareListFormat{location}{%
   \setcounter{locationtotal}{\value{listtotal}}%
   \usebibmacro{list:delim}{#1}%
@@ -1517,6 +1983,14 @@
     {}
     {\printlist[][\value{currentlocation}-\value{currentlocation}]{location}%
      \setunit*{\addcolon\space}}%
+  \ifnumequal{\value{currentorganization}}{0}
+    {}
+    {\printlist[][\value{currentorganization}-\value{currentorganization}]{organization}%
+     \setunit*{\addcomma\space}}%
+  \ifnumequal{\value{currentinstitution}}{0}
+    {}
+    {\printlist[][\value{currentinstitution}-\value{currentinstitution}]{institution}%
+     \setunit*{\addcomma\space}}%
   \ifnumequal{\value{currentpublisher}}{0}
     {}
     {\printlist[][\value{currentpublisher}-\value{currentpublisher}]{publisher}}%
@@ -1524,11 +1998,19 @@
   \ifboolexpr{
     test {\ifnumgreater{\value{locationtotal}}{1}}
     and
+    test {\ifnumgreater{\value{currentlocation}}{\value{organizationtotal}}}
+    and
+    test {\ifnumgreater{\value{currentlocation}}{\value{institutiontotal}}}
+    and
     test {\ifnumgreater{\value{currentlocation}}{\value{publishertotal}}}
   }
     {\setcounter{currentlocation}{0}}
     {}%
   \ifboolexpr{
+    test {\ifnumgreater{\value{currentorganization}}{0}}
+    or
+    test {\ifnumgreater{\value{currentinstitution}}{0}}
+    or
     test {\ifnumgreater{\value{currentpublisher}}{0}}
     or
     test {\ifnumgreater{\value{currentlocation}}{0}}
@@ -1537,9 +2019,19 @@
     {}}
 
 \newbibmacro*{init:location+publisher}{%
+  \setcounter{locationtotal}{0}%
+  \setcounter{organizationtotal}{0}%
+  \setcounter{institutiontotal}{0}%
+  \setcounter{publishertotal}{0}%
   \iflistundef{location}
     {\setcounter{currentlocation}{0}}
     {\setcounter{currentlocation}{1}}%
+  \iflistundef{organization}
+    {\setcounter{currentorganization}{0}}
+    {\setcounter{currentorganization}{1}}%
+  \iflistundef{institution}
+    {\setcounter{currentinstitution}{0}}
+    {\setcounter{currentinstitution}{1}}%
   \iflistundef{publisher}
     {\setcounter{currentpublisher}{0}}
     {\setcounter{currentpublisher}{1}}}
@@ -1548,7 +2040,19 @@
   \usebibmacro{reprint}%
   \usebibmacro{init:location+publisher}%
   \usebibmacro{loop:location+publisher}%
-  \setunit{\addcomma\space}%
+  \iffieldundef{howpublished}
+    {}
+    {\ifboolexpr{
+       test {\iflistundef{organization}}
+       and
+       test {\iflistundef{institution}}
+       and
+       test {\iflistundef{publisher}}
+     }
+       {\setunit*{\addcolon\space}}
+       {\setunit*{\addcomma\space}}%
+     \printfield{howpublished}}%
+  \setunit*{\addcomma\space}%
   \usebibmacro{date}%
   \newunit}
 
@@ -1562,6 +2066,10 @@
   \usebibmacro{origdate}%
   \newunit}
 
+% ------------------------------------------------------------------
+% CHAPTER, PAGES, VOLUME, PART MACROS
+% ------------------------------------------------------------------
+
 \newbibmacro*{volume}{%
   \iffieldundef{volume}
     {}
@@ -1570,22 +2078,118 @@
      \printfield{volume}%
      \newunit}}
 
-\newbibmacro*{volumeof}{%
-  \iffieldundef{volume}
-    {}
+\newbibmacro*{ifbooktitleormaintitle}[2]{%
+  \ifboolexpr{
+    not test {\iffieldundef{booktitle}}
+    or
+    not test {\iffieldundef{maintitle}}
+  }
+    {#1}
+    {#2}}
+
+\newbibmacro*{ifneedstitlein}[2]{%
+  \usebibmacro{ifbooktitleormaintitle}
+    {\ifboolexpr{
+       togl {inentrytype}
+       or
+       not test {\usebibmacro{ifusevolumeandpart}}
+    }
+      {#1}
+      {#2}}
+    {#2}}
+
+\newbibmacro{pagesin}{%
+  \usebibmacro{ifbooktitleormaintitle}
+    {\iffieldundef{pages}
+       {}
+       {\printfield[pagesin]{pages}%
+        \setunit*{\addspace}}}
+    {\printfield[pagepages]{pages}%
+     \newunit}}
+
+\newbibmacro*{chapterin}{%
+  \ifboolexpr{
+    test {\usebibmacro{ifbooktitleormaintitle}}
+    or
+    not test {\iffieldundef{volume}}
+    or
+    not test {\iffieldundef{part}}
+  }
+    {\iffieldundef{chapter}
+       {\usebibmacro{ifneedstitlein}
+          {\usebibmacro{in}}
+          {}}%
+       {\printfield[chapterin]{chapter}%
+        \setunit*{\addspace}}}
+    {\printfield{chapter}%
+     \setunit*{\addcomma\space}}}
+
+\newbibmacro*{chapter+pagesin}{%
+  \iffieldundef{pages}
+    {\usebibmacro{chapterin}}
+    {\ifbibliography
+       {\printfield{chapter}%
+        \setunit*{\addcomma\space}%
+        \ifboolexpr{
+          test {\usebibmacro{ifbooktitleormaintitle}}
+          or
+          not test {\iffieldundef{volume}}
+          or
+          not test {\iffieldundef{part}}
+        }
+          {\printfield[pagesin]{pages}%
+           \setunit*{\addspace}}
+          {\printfield[pagepages]{pages}%
+           \newunit}}
+       {\usebibmacro{chapterin}}}}
+
+\newbibmacro*{ifusevolumeandpart}[2]{%
+  \ifboolexpr{
+    test {\ifbibliography}% always if in bibliography
+    or
+    not test {\iffieldundef{chapter}}% always if chapter is defined
+    or
+    (% always if volume defined, part not defined, and usevolume=true
+      not test {\iffieldundef{volume}}
+      and
+      test {\iffieldundef{part}}
+      and
+      togl {blx at usevolume}% 
+    )
+    or
+    (% always if part defined and volume not defined
+      not test {\iffieldundef{part}}
+      and
+      test {\iffieldundef{volume}}
+    )
+    or
+    (% always if neither volume nor part are defined
+      test {\iffieldundef{volume}}
+      and
+      test {\iffieldundef{part}}
+    )
+  }
+    {#1}
+    {#2}}
+
+\newbibmacro*{volume+partof}{%
+  \usebibmacro{ifusevolumeandpart}
     {\iffieldundef{part}
-      {\iffieldundef{maintitle}
-        {\ifboolexpr{
-           test {\iftoggle{blx at usevolume}}
-           or
-           test {\ifbibliography}
-         }
-           {\printfield[vol]{volume}%
-            \newunit}
-           {}}
-        {\printfield[volumeof]{volume}%
-         \setunit{\addspace}}}
-      {}}}%
+       {\iffieldundef{maintitle}
+          {\printfield[vol]{volume}%
+           \newunit}
+          {\iffieldundef{volume}
+             {}
+             {\printfield[volumeof]{volume}%
+              \setunit*{\addspace}}}}
+       {\printfield[vol]{volume}%
+        \setunit*{\addcomma\space}%
+        \iffieldundef{maintitle}
+          {\printfield[pt]{part}%
+           \newunit}
+          {\printfield[partof]{part}
+           \setunit*{\addspace}}}}
+    {}}
 
 \newbibmacro*{volume+pages}{%
   \iffieldundef{volume}
@@ -1592,23 +2196,23 @@
     {}
     {\setunit{\addspace}%
      \printfield{volume}%
-     \setunit{\volpostnotedelim}}
+     \setunit*{\addperiod}%
+     \printfield{part}%
+     \setunit{\volpostnotedelim}%
+     \global\booltrue{usevolpostnotedelim}}
   \usebibmacro{pages}}
 
 \newbibmacro*{volume+part+pages}{%
-  \ifboolexpr{
-    test {\iffieldundef{volume}}
-    or
-    test {\iffieldundef{part}}
-  }
+  \usebibmacro{ifusevolumeandpart}
     {}
     {\printfield{volume}%
-     \setunit{\addperiod}%
+     \setunit*{\addperiod}%
      \printfield{part}%
-     \setunit{\volpostnotedelim}}
+     \setunit{\volpostnotedelim}%
+     \global\booltrue{usevolpostnotedelim}}%
   \usebibmacro{pages}}
 
-\newbibmacro*{volume+part+nomaintitle}{%
+\newbibmacro*{volume+part}{%
   \iffieldundef{volume}
     {}
     {\iftoggle{blx at usevolume}
@@ -1618,18 +2222,13 @@
         \printfield{part}%
         \global\booltrue{usevolpostnotedelim}}}}
 
-\renewbibmacro*{url+urldate}{%
-  \iffieldundef{urlyear}
-    {}
-    {\printurldate}%
-  \newunit
-  \printfield{url}}
+\renewbibmacro*{urldate}{%
+  \iftoggle{blx at accessdate}
+    {\iffieldundef{urlyear}
+       {}
+       {\printurldate}}
+    {}}
 
-\newbibmacro*{ebookedition}{%
-  \iffieldundef{ebookedition}
-    {}
-    {\printfield{ebookedition}}}
-
 \newbibmacro*{reprint}{%
   \ifboolexpr{
     not test {\iffieldundef{origpublisher}}
@@ -1646,6 +2245,10 @@
      \setunit{\addcomma\addspace}}
     {}}
 
+% ------------------------------------------------------------------
+% DATE MACROS
+% ------------------------------------------------------------------
+
 \renewbibmacro*{date}{%
   \printdate
   \setunit{\addcomma\addspace}%
@@ -1653,9 +2256,55 @@
 
 \newbibmacro*{origdate}{\printorigdate}
 
-\newbibmacro*{releasedate}{\printreleasedate}
+\newbibmacro*{eprintdate}{\printeprintdate}
 
+\newbibmacro*{patentdate}{%
+  \iffieldundef{year}
+    {}
+    {\bibstring{patentfiled}%
+     \setunit{\addspace}%
+     \printdate
+     \setunit{\addcomma\addspace}}%
+  \printfield{pubstate}}
 
+\renewbibmacro*{doi+eprint+url}{%
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{urldate}%
+  \newunit
+  \iftoggle{bbx:doi}
+    {\printfield{doi}}
+    {}%
+  \newunit
+  \iftoggle{bbx:url}
+    {\printfield{url}}
+    {}}
+
+\newbibmacro*{ebook}{%
+  \iftoggle{bbx:eprint}
+    {\iffieldequalstr{eprinttype}{ebook}
+       {\usebibmacro{eprint}%
+        \clearfield{eprint}}
+       {}}
+    {}}
+
+\newbibmacro*{isbn}{%
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}}
+
+\newbibmacro*{isrn}{%
+  \iftoggle{bbx:isbn}
+    {\printfield{isrn}}
+    {}}
+
+\newbibmacro*{issn}{%
+  \iftoggle{bbx:isbn}
+    {\printfield{issn}}
+    {}}
+
 % ------------------------------------------------------------------
 % RELATED MACROS
 % ------------------------------------------------------------------
@@ -1665,7 +2314,7 @@
 \csundef{abx at ffd@*@related:origpubas}
 \csundef{abx at ffd@*@relatedstring:reprintfrom}
 \csundef{abx at macro@related:multivolume}
-\csundef{abx at macro@related:bytranslator}
+%\csundef{abx at macro@related:bytranslator}
 \csundef{abx at macro@related:origpubas}
 \csundef{abx at macro@related:origpubin}
 \csundef{abx at macro@related:reprintfrom}
@@ -1736,18 +2385,6 @@
          {\global\toggletrue{blx at testpostnotedelim}}
          {}}}}
 
-\newbibmacro*{ifuseshorthand}{%
-  \iffieldundef{shorthand}
-    {\@secondoftwo}
-    {\ifcsstring{blx at shorthand}{false}
-       {\@secondoftwo}
-       {\ifciteseen
-          {\@firstoftwo}
-          {\ifcsstring{blx at shorthand}{short}
-             {\@secondoftwo}
-             {\@firstoftwo}}}}}
-
-
 % ------------------------------------------------------------------
 % ANCIENT AND CLASSIC TEXT MACROS
 % ------------------------------------------------------------------
@@ -1768,48 +2405,55 @@
   \global\booltrue{suppresspostnote}}
 
 \newbibmacro*{classic:translator+series}{%
-  \ifboolexpr{
-    not test {\ifnameundef{translator}}
-    or
-    not test {\iffieldundef{series}}
-  }
+  \ifnameundef{translator}
+    {}
     {\setunit{\addspace}%
      \printtext[parens]{%
        \printnames[labelname]{translator}%
-       \newunit
-       \usebibmacro{shortseries+number}}}
-    {}}
+       \iftoggle{blx at useseries}
+         {\newunit
+          \usebibmacro{shortseries}}
+         {}}}}
 
-
 % ------------------------------------------------------------------
 % ALTERNATE POSTNOTE MACROS
 % ------------------------------------------------------------------
 
 \ExplSyntaxOn
-\cs_generate_variant:Nn \__xparse_split_argument:nnn { nno }
-\cs_new_eq:NN \eSplitArgument  \__xparse_split_argument:nno
-\DeclareDocumentCommand \splitpostnote
-{ > { \eSplitArgument { 1 } { | } } m }
-{ \savepostnotes #1 }
-\DeclareDocumentCommand{\savepostnotes}{mm}{%
-  \IfNoValueTF{#2}
-    {\gdef\postnotelast{#1}}
-    {\tl_if_empty:nF {#1}
-       {\gdef\postnotefirst{#1}}%
-     \tl_if_empty:nF {#2}
-       {\gdef\postnotelast{#2}}}}
+\DeclareDocumentCommand{\savepostnotes}{d() u{++}}{
+  \IfValueT {#1} { \gdef\postnotefirst{#1} }
+  \tl_if_empty:nF {#2} { \gdef\postnotelast{#2} }
+}
+\cs_new:Npn \_biblatexsbl_splitpostnote:n #1 { \savepostnotes #1++ }
+\cs_generate_variant:Nn \_biblatexsbl_splitpostnote:n { o }
+\cs_new_eq:NN \splitpostnote  \_biblatexsbl_splitpostnote:o
 \ExplSyntaxOff
 
+\newrobustcmd*{\volsplitpostnote}[2]{%
+  \gdef\volvol{#1}%
+  \gdef\abx at field@volpostnote{#2}%
+  \iffieldundef{volpostnote}
+    {}
+    {\splitpostnote{\abx at field@volpostnote}}}
+
 \def\setuppostnotes{%
   \global\undef\postnotefirst
   \global\undef\postnotelast
-  \splitpostnote{\abx at field@postnote}}
+  \iftoggle{cbx:involcite}
+    {\expandafter\volsplitpostnote\abx at field@postnote}%
+    {\splitpostnote{\abx at field@postnote}}}
 
 \renewbibmacro*{prenote}{%
   \iffieldundef{postnote}
     {}
     {\setuppostnotes
-     \restorefield{postnote}{\postnotelast}%
+     \iftoggle{cbx:involcite}
+       {\ifdefined\postnotelast
+          \def\abx at field@postnote{{\volvol}{\postnotelast}}%
+        \else
+          \def\abx at field@postnote{{\volvol}{}}%
+        \fi}
+       {\restorefield{postnote}{\postnotelast}}%
      \restorefield{altpostnote}{\postnotefirst}}%
   \iffieldundef{prenote}
     {}
@@ -1853,7 +2497,7 @@
 % ENTRY SET MACROS
 % ------------------------------------------------------------------
 
-\def\cbx at entryset#1{%
+\def\blx at entryset#1{%
   \blx at ifdata{#1}
     {\begingroup
      \blx at imc@clearlist{pageref}%
@@ -1861,13 +2505,15 @@
      \blx at setoptions@type\abx at field@entrytype
      \def\abx at field@entrysetcount{1}%
      \blx at entryset@precode
-     \blx at driver{cite:\blx at imc@thefield{entrytype}}%
+     \ifbibliography
+       {\blx at driver{\blx at imc@thefield{entrytype}}}
+       {\blx at driver{cite:\blx at imc@thefield{entrytype}}}%
      \blx at entryset@postcode
      \endgroup}
     {}%
-  \let\do\cbx at entryset@i}
+  \let\do\blx at entryset@i}
 
-\def\cbx at entryset@i#1{%
+\def\blx at entryset@i#1{%
   \blx at ifdata{#1}
     {\begingroup
      \blx at resetdata
@@ -1880,7 +2526,9 @@
      \blx at beglangbib
      \blx at begunit
      \blx at entryset@precode
-     \blx at driver{cite:\blx at imc@thefield{entrytype}}
+     \ifbibliography
+       {\blx at driver{\blx at imc@thefield{entrytype}}}
+       {\blx at driver{cite:\blx at imc@thefield{entrytype}}}%
      \blx at entryset@postcode
      \blx at endunit
      \blx at endlangbib
@@ -1887,44 +2535,6 @@
      \endgroup}
     {\blx at nounit}}
 
-\def\bbx at entryset#1{%
-  \blx at ifdata{#1}
-    {\begingroup
-     \blx at imc@clearlist{pageref}%
-     \blx at getdata{#1}%
-     \blx at setoptions@type\abx at field@entrytype
-     \def\abx at field@entrysetcount{1}%
-     \blx at entryset@precode
-     \blx at driver{\blx at imc@thefield{entrytype}}%
-     \blx at entryset@postcode
-     \endgroup}
-    {}%
-  \let\do\bbx at entryset@i}
-
-\def\bbx at entryset@i#1{%
-  \blx at ifdata{#1}
-    {\begingroup
-     \blx at resetdata
-     \blx at getdata{#1}%
-     \blx at entrysetcount
-     \blx at setoptions@type\abx at field@entrytype
-     \blx at setoptions@entry
-     \addtocounter{instcount}\@ne
-     \blx at execute
-     \blx at beglangbib
-     \blx at begunit
-     \blx at entryset@precode
-     \blx at driver{\blx at imc@thefield{entrytype}}
-     \blx at entryset@postcode
-     \blx at endunit
-     \blx at endlangbib
-     \endgroup}
-    {\blx at nounit}}
-
-
-\def\blx at entryset#1{\cbx at entryset{#1}}
-\def\blx at entryset@i#1{\cbx at entryset@i{#1}}
-
 % ------------------------------------------------------------------
 % INDEXING MACROS
 % ------------------------------------------------------------------

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-american.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-american.lbx	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-american.lbx	2017-01-16 23:12:25 UTC (rev 42972)
@@ -2,19 +2,27 @@
 
 \InheritBibliographyStrings{sbl-english}
 
-\InheritBibliographyExtras{american}
-
 \DeclareBibliographyExtras{%
   \DeclarePunctuationPairs{colon}{*}%
   \uspunctuation
+  \protected\def\mkdaterangecomp{%
+    \mkdaterangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \mkdaterangetrunc{short}}%
+  \protected\def\mkdaterangecompextra{%
+    \mkdaterangetruncextra{long}}%
+  \protected\def\mkdaterangeterseextra{%
+    \mkdaterangetruncextra{short}}%
   \protected\def\mkbibdatelong#1#2#3{%
     \iffieldundef{#3}
       {}
-      {\stripzeros{\thefield{#3}}%
+      {\thefield{#3}%
        \iffieldundef{#2}{}{\nobreakspace}}%
     \iffieldundef{#2}
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
 }

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-english.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-english.lbx	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-english.lbx	2017-01-16 23:12:25 UTC (rev 42972)
@@ -2,6 +2,7 @@
 
 \DeclareBibliographyStrings{%
   inherit          = {english},
+  by               = {{by}{by}},
   to               = {{to}{to}},
   of               = {{of}{of}},
   with             = {{with}{with}},
@@ -10,15 +11,18 @@
   withpreface      = {{with preface by}{with preface by}},
   introduction     = {{introduction}{introduction}},
   foreword         = {{foreword}{foreword}},
+  mathesis         = {{master's thesis}{master's thesis}},
   reprint          = {{repr\adddot}{repr\adddot}},
   paperpresented   = {{paper presented at}{paper presented at}},
+  patentfiled      = {{filed}{filed}},
   phdthesis        = {{PhD diss\adddot}{PhD diss\adddot}},
   released         = {{released}{released}},
   withassistance   = {{with assistance from}{with assistance from}},
   byeditortr       = {{translated \lbx at lfromlang\isdot\space and edited by}%
                       {trans\adddotspace \lbx at sfromlang\isdot\space and ed\adddot}},
-  byeditorco       = {{commented and edited by}%
-                      {comm\adddotspace and ed\adddot}},
-  byeditoran       = {{annotated and edited by}%
-                      {annot\adddotspace and ed\adddot}}
+  urlseen          = {{accessed}{accessed}},
+  commonera        = {{CE}{CE}},
+  beforecommonera  = {{BCE}{BCE}},
+  annodomini       = {{AD}{AD}},
+  beforechrist     = {{BC}{BC}}
 }

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-german.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-german.lbx	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-german.lbx	2017-01-16 23:12:25 UTC (rev 42972)
@@ -2,25 +2,27 @@
 
 \DeclareBibliographyStrings{%
   inherit          = {german},
+  by               = {{von}{von}},
   to               = {{zu}{zu}},
   of               = {{von}{von}},
   with             = {{mit}{mit}},
-  byeditor         = {{herausgegeben von}{hg.\addotspace v\adddot}},
-  bytranslator     = {{übersetzt \lbx at lfromlang\ by}{übers\adddot}},
+  byeditor         = {{herausgegeben von}{hg.\adddotspace v\adddot}},
+  bytranslator     = {{\"ubersetzt \lbx at lfromlang\isdot\space von}{\"ubers\adddot}},
   withpreface      = {{mit einem Geleitwort von}{mit einem Geleitwort von}},
   introduction     = {{Einleitung}{Einleitung}},
   foreword         = {{Vorwort}{Vorwort}},
   reprint          = {{Ndr\adddot}{Ndr\adddot}},
   paperpresented   = {{paper presented at}{paper presented at}},
+  patentfiled      = {{eingereicht}{eingereicht}},
   phdthesis        = {{Diss\adddot}{Diss\adddot}},
-  released         = {{veröffentlicht}{veröffentlicht}},
-  withassistance   = {{mit Unterstützung von}{mit Unterstützung von}},
-  byeditortr       = {{übersetzt \lbx at lfromlang\isdot\space und herausgegeben von}%
-                      {übers\adddotspace \lbx at sfromlang\isdot\space und hg\adddotspace v\adddot}},
-  byeditorco       = {{kommentiert und herausgegeben von}%
-                      {komm\adddotspace und hg\adddotspace v\adddot}},
-  byeditoran       = {{kommentiert und herausgegeben von}%
-                      {komm\adddotspace und hg\adddotspace v\adddot}}
+  released         = {{ver\"offentlicht}{ver\"offentlicht}},
+  withassistance   = {{mit Unterst\"utzung von}{mit Unterst\"utzung von}},
+  byeditortr       = {{\"bersetzt \lbx at lfromlang\isdot\space und herausgegeben von}%
+                      {\"bers\adddotspace \lbx at sfromlang\isdot\space und hg\adddotspace v\adddot}},
+  commonera        = {{u\adddotspace Z\adddot}{u\adddotspace Z\adddot}},
+  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}},
 }
 
 \InheritBibliographyExtras{german}

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty	2017-01-16 23:12:25 UTC (rev 42972)
@@ -13,17 +13,40 @@
 %The Current Maintainer of this work is David Purton.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{sbl-paper}
-  [2016/10/11 Society of Bibilical Literature Paper Style]
+  [2017/01/15 Society of Bibilical Literature Paper Style]
 
 
+% xetex/luatex engine test set up
+
+\RequirePackage{ifxetex}
+\RequirePackage{ifluatex}
+\newif\ifxetexorluatex
+\ifxetex
+  \xetexorluatextrue
+\else
+  \ifluatex
+    \xetexorluatextrue
+  \else
+    \xetexorluatexfalse
+  \fi
+\fi
+
+
 % Load required packages
 
-\RequirePackage{textcase}
-\RequirePackage{fontspec}
+\ifxetexorluatex
+  \RequirePackage{fontspec}
+  \RequirePackage{polyglossia}
+\else
+  \RequirePackage[T1]{fontenc}
+  \RequirePackage[utf8]{inputenc}
+  \RequirePackage[base]{babel}
+\fi
+
+\RequirePackage{csquotes}
 \RequirePackage{ragged2e}
-\RequirePackage{polyglossia}
-\RequirePackage{csquotes}
 \RequirePackage[headheight=14.5pt,margin=1in]{geometry}
+\RequirePackage{textcase}
 \RequirePackage{setspace}
 \RequirePackage{titlesec}
 \RequirePackage{titletoc}
@@ -37,13 +60,16 @@
 
 
 % work around bidi redefining theindex
-\let\imakeidxtheindex\theindex
-\let\imakeidxendtheindex\endtheindex
-\AtBeginDocument{%
-  \let\theindex\imakeidxtheindex
-  \let\endtheindex\imakeidxendtheindex
-}
+\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 at putindexsplit}
 {\addcontentsline{toc}{\imki at toclevel}{\imki at title}}
@@ -60,31 +86,32 @@
 \fi
 
 
-% Set up Languages
+% Set up languages
 
-\setdefaultlanguage[variant=american]{english}
-\setotherlanguage[variant=ancient]{greek}
-\setotherlanguage{hebrew}
+\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
 
-\renewenvironment{hebrew}[1][]{%
-  \par
-  \raggedleft
-  \begin{otherlanguage}[#1]{hebrew}}%
-  {\end{otherlanguage}\par}
 
-\@Latintrue % work around for bidi bug; see http://tex.stackexchange.com/questions/312874/polyglossia-or-bidi-bug-d-gets-inverted-to-d
-
-
-% Set up fonts
-
-\newfontfamily\greekfont
-  [Script=Greek,Contextuals=Alternate,Ligatures=Required]
-  {SBL BibLit}
-\newfontfamily\hebrewfont
-  [Script=Hebrew,Contextuals=Alternate,Ligatures=Required,Scale=1.2]
-  {SBL BibLit}
-
-
 % Set up document spacing
 
 \doublespacing

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-spanish.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-spanish.lbx	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-spanish.lbx	2017-01-16 23:12:25 UTC (rev 42972)
@@ -2,25 +2,28 @@
 
 \DeclareBibliographyStrings{%
   inherit          = {spanish},
+  by               = {{por}{por}},
   to               = {{a}{a}},
   of               = {{de}{de}},
   with             = {{con}{con}},
   byeditor         = {{editado por}{ed\adddotspace por}},
-  bytranslator     = {{traducido \lbx at lfromlang\ por}{trad\adddot}},
+  bytranslator     = {{traducido \lbx at lfromlang\isdot\space por}%
+                      {trad\adddotspace}},
   withpreface      = {{con un prefacio por}{con un prefacio por}},
   introduction     = {{Introducci{\'o}n}{Introducci{\'o}n}},
   foreword         = {{Presentaci{\'o}n}{Presentaci{\'o}n}},
   reprint          = {{reimp\adddot}{reimp\adddot}},
   paperpresented   = {{documento presentado a}{documento presentado a}},
+  patentfiled      = {{filed}{filed}}, % FIXME: missing
   phdthesis        = {{Tesis}{Tesis}},
   released         = {{publicado}{publicado}},
   withassistance   = {{con la asistencia de}{con la asistencia de}},
   byeditortr       = {{Traducido \lbx at lfromlang\isdot\space y editado por}%
                       {trad\adddotspace \lbx at sfromlang\isdot\space y ed\adddotspace por}},
-  byeditorco       = {{comentario y editado por}%
-                      {com\adddotspace y ed\adddotspace por}},
-  byeditoran       = {{anotado y editado por}%
-                      {anot\adddotspace y ed\adddotspace por}}
+  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}}
 }
 
 \InheritBibliographyExtras{spanish}

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx	2017-01-16 23:12:25 UTC (rev 42972)
@@ -6,8 +6,6 @@
   \citereset
   \global\undef\bbx at lasthash
   \def\abx at str{abx at lstr}%
-  \def\blx at entryset#1{\bbx at entryset{#1}}
-  \def\blx at entryset@i#1{\bbx at entryset@i{#1}}
   \renewcommand*{\relateddelim}{\addperiod\space}
   \renewcommand*{\revsdnamedelim}{\addcomma}%
   \DeclareNameAlias{author}{sortname}%
@@ -20,8 +18,14 @@
 }
 
 \AtEveryBibitem{%
-  \global\togglefalse{relatedseen}}%
+  \global\togglefalse{relatedseen}%
+  \global\togglefalse{inentrytype}}%
 
+\DeclareBibliographyDriver{set}{%
+  \booltrue{bbx at inset}%
+  \entryset{}{}%
+  \finentry}
+
 \DeclareBibliographyDriver{classictext}{%
   \usebibmacro{begentry}%
   \DeclareFieldFormat[classictext]{title}{\mkbibemph{##1}}%
@@ -42,14 +46,22 @@
        \printtext[title]{%
          \bibhyperlink{\strfield{shorthand}}{\thefield{shorthand}}}}%
      \setunit{\addspace}%
-     \usebibmacro{volume+part+pages}%
+     \printfield{volume}%
+     \setunit*{\addperiod}%
+     \printfield{part}%
+     \setunit{\volpostnotedelim}%
+     \usebibmacro{pages}%
      \newunit
      \entrydata{\thefield{related}}{\printfield{titleaddon}}%
-     \clearfield{pages}%
      \setunit{\addcomma\addspace}%
-     \usebibmacro{volume+part+pages}%
+     \printfield{volume}%
+     \setunit*{\addperiod}%
+     \printfield{part}%
      \newunit
-     \entrydata{\thefield{related}}{\usebibmacro{bymaineditor+others}}%
+     \entrydata{\thefield{related}}
+       {\usebibmacro{bymaineditor+others}%
+        \newunit
+        \usebibmacro{bymaintranslator+others}}%
      \usebibmacro{publisher+location+date}%
      \newunit}
     {\DeclareFieldFormat[ancienttext]{title}{\mkbibemph{##1}}%
@@ -65,14 +77,30 @@
   \newunit
   \usebibmacro{title}%
   \newunit
-  \usebibmacro{shortjournal+issuetitle}%
-  \printfield[plainpages]{pages}%
+  \usebibmacro{bytranslator+others}%
   \newunit
-  \usebibmacro{releasedate}%
+  \usebibmacro{inissuetitle}%
   \newunit
+  \printfield{version}%
+  \newunit
+  \printlist{organization}%
+  \newunit
+  \printfield{note}%
+  \newunit
+  \usebibmacro{shortjournal+issue}%
+  \usebibmacro{pages}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
+  \usebibmacro{issn}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -80,6 +108,7 @@
 }
 
 \DeclareBibliographyDriver{book}{%
+  \clearfield{booktitle}%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \iftoggle{blx at abbrevcite}
@@ -88,26 +117,52 @@
      \printnames[default]{author}}
     {\usebibmacro{author/editor+others/translator+others}%
      \newunit
-     \usebibmacro{title}%
-     \newunit
-     \usebibmacro{byauthor}}%
+     \usebibmacro{title}}%
   \newunit
-  \usebibmacro{volume+part}%
+  \usebibmacro{byauthor/byeditor+others/bytranslator+others}%
+  \newunit
+  \usebibmacro{chapter+pagesin}%
+  \usebibmacro{volume+partof}%
   \usebibmacro{maintitle}%
   \newunit
-  \usebibmacro{bymaineditor+others}%
+  \usebibmacro{event+venue+date}%
   \newunit
+  \usebibmacro{bymainauthor/bymaineditor+others/bymaintranslator+others}%
+  \newunit
   \printfield{edition}%
   \newunit
   \printfield{volumes}%
   \newunit
-  \usebibmacro{shortseries+number}%
+  \ifentrytype{report}
+    {\printfield{type}%
+     \clearfield{type}%
+     \setunit*{\addspace}%
+     \printfield{number}}
+    {\usebibmacro{shortseries+number}}%
   \newunit
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit
   \usebibmacro{publisher+location+date}%
   \newunit
+  \usebibmacro{ebook}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
+  \usebibmacro{isbn}%
+  \newunit
+  \usebibmacro{isrn}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -119,25 +174,47 @@
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others/translator+others}%
   \newunit
-  \printfield{type}%
-  \setunit{\addspace}%
-  \usebibmacro{to}%
-  \usebibmacro{booktitle+maintitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{bybookauthor}%
+  \iffieldundef{type}
+    {\toggletrue{inentrytype}%
+     \usebibmacro{title}%
+     \setunit{\addspace}%
+     \usebibmacro{in}}
+    {\printfield{type}%
+     \usebibmacro{language}%
+     \setunit{\addspace}%
+     \usebibmacro{to}}%
+  \usebibmacro{booktitle}%
+  \usebibmacro{bybookauthor/bybookeditor+others/bybooktranslator+others}%
+  \clearfield{booktitle}%
   \newunit
-  \usebibmacro{byeditor+others}%
+  \usebibmacro{chapter+pagesin}%
+  \usebibmacro{volume+partof}%
+  \usebibmacro{maintitle}%
   \newunit
+  \usebibmacro{bymainauthor/bymaineditor+others/bymaintranslator+others}%
+  \newunit
   \printfield{edition}%
   \newunit
   \printfield{volumes}%
   \newunit
   \usebibmacro{shortseries+number}%
+  \newunit
+  \printfield{note}%
   \newunit%
   \usebibmacro{publisher+location+date}%
   \newunit
+  \usebibmacro{ebook}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
+  \usebibmacro{isbn}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -145,6 +222,7 @@
 }
 
 \DeclareBibliographyDriver{incommentary}{%
+  \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \iffieldundef{volume}
     {\usedriver{}{incollection}}
@@ -157,17 +235,33 @@
 \DeclareBibliographyDriver{incommentary:short}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{author/editor+others/translator+others}%
+  \usebibmacro{author/translator+others}%
   \newunit
   \usebibmacro{title}%
   \newunit
+  \usebibmacro{byauthor}%
+  \newunit
+  \usebibmacro{bytranslator+others}%
+  \newunit
+  \printfield{note}%
+  \newunit
   \usebibmacro{xrefshortmaintitle}%
   \newunit
   \usebibmacro{volume+pages}%
   \newunit
+  \usebibmacro{ebook}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
+  \usebibmacro{isbn}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -175,30 +269,37 @@
 }
 
 \DeclareBibliographyDriver{incollection}{%
+  \toggletrue{inentrytype}%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others/translator+others}%
   \newunit
   \usebibmacro{title}%
-  \ifentrytype{bookinbook}
-    {\newunit
-     \usebibmacro{byeditor+others}}
-    {}%
   \newunit
-  \printfield[pagesin]{pages}%
+  \ifentrytype{classictext}
+    {\usebibmacro{byauthor}%
+     \newunit
+     \usebibmacro{bytranslator+others}}
+    {\usebibmacro{byauthor/byeditor+others/bytranslator+others}}%
+  \newunit
+  \usebibmacro{chapter+pagesin}%
   \iffieldundef{booktitle}
     {}
     {\usebibmacro{booktitle}%
      \newunit
-     \usebibmacro{bybookauthor}%
+     \usebibmacro{event+venue+date}%
      \newunit
-     \usebibmacro{bybookeditor+others}%
-     \newunit}
-  \usebibmacro{involume+part}%
-  \usebibmacro{maintitle}%
+     \usebibmacro{bybookauthor/bybookeditor+others/bybooktranslator+others}%
+     \newunit}%
+  \usebibmacro{volume+partof}%
+  \iffieldundef{maintitle}
+    {}
+    {\usebibmacro{maintitle}%
+     \newunit
+     \usebibmacro{event+venue+date}%
+     \newunit
+     \usebibmacro{bymainauthor/bymaineditor+others/bymaintranslator+others}}%
   \newunit
-  \usebibmacro{bymaineditor+others}%
-  \newunit
   \printfield{edition}%
   \newunit
   \printfield{volumes}%
@@ -205,10 +306,22 @@
   \newunit
   \usebibmacro{shortseries+number}%
   \newunit
+  \printfield{note}%
+  \newunit
   \usebibmacro{publisher+location+date}%
   \newunit
+  \usebibmacro{ebook}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
+  \usebibmacro{isbn}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -221,6 +334,7 @@
 }
 
 \DeclareBibliographyDriver{inreference}{%
+  \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \iffieldundef{volume}
     {\usedriver{}{incollection}}
@@ -237,13 +351,29 @@
   \newunit
   \usebibmacro{title}%
   \newunit
-  \usebibmacro{xrefshortbooktitle+xrefshortmaintitle}%
+  \usebibmacro{byauthor}%
   \newunit
+  \usebibmacro{bytranslator+others}%
+  \newunit
+  \printfield{note}%
+  \newunit
+  \usebibmacro{xrefshortmaintitle+xrefshortbooktitle}%
+  \newunit
   \usebibmacro{volume+pages}%
   \newunit
+  \usebibmacro{ebook}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
+  \usebibmacro{isbn}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -255,20 +385,40 @@
   \usebibmacro{begentry}%
   \usebibmacro{author/translator+others}%
   \newunit
-  \usebibmacro{title}%
   \iffieldundef{title}
     {\newunit}
-    {\setunit{\addcomma\addspace}}%
+    {\usebibmacro{title}%
+     \newunit
+     \usebibmacro{byauthor}%
+     \newunit
+     \usebibmacro{bytranslator+others}%
+     \setunit{\addcomma\addspace}}%
   \usebibmacro{revdtitle}%
   \setunit{\addcomma\addspace}%
   \usebibmacro{revdauthor/revdeditor}%
   \newunit
-  \usebibmacro{shortjournal+issuetitle}%
-  \printfield[plainpages]{pages}%
+  \usebibmacro{inissuetitle}%
   \newunit
+  \printfield{version}%
+  \newunit
+  \printlist{organization}%
+  \newunit
+  \printfield{note}%
+  \newunit
+  \usebibmacro{shortjournal+issue}%
+  \usebibmacro{pages}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
+  \usebibmacro{issn}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -275,36 +425,34 @@
   \usebibmacro{finentry}%
 }
 
-\DeclareBibliographyDriver{seminarpaper}{%
+\DeclareBibliographyDriver{thesis}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{author/editor+others/translator+others}%
+  \usebibmacro{author}%
   \newunit
   \usebibmacro{title}%
   \newunit
-  \printfield[pagesin]{pages}%
-  \iffieldundef{booktitle}
-    {}
-    {\usebibmacro{booktitle}%
-     \newunit
-     \usebibmacro{bybookeditor+others}%
-     \newunit}
-  \usebibmacro{involume+part}%
-  \usebibmacro{maintitle}%
+  \usebibmacro{pagesin}%
   \newunit
-  \usebibmacro{bymaineditor+others}%
+  \printfield{note}%
   \newunit
-  \printfield{edition}%
+  \printfield{type}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{publisher+location+date}%
   \newunit
-  \printfield{volumes}%
+  \usebibmacro{ebook}%
   \newunit
-  \usebibmacro{shortseries+number}%
+  \printfield{addendum}%
   \newunit
-  \usebibmacro{publisher+location+date}%
+  \printfield{isbn}%
   \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -311,20 +459,33 @@
   \usebibmacro{finentry}%
 }
 
-\DeclareBibliographyDriver{thesis}{%
+\DeclareBibliographyDriver{misc}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{author}%
+  \usebibmacro{author/editor+others/translator+others}%
   \newunit
   \usebibmacro{title}%
+  \usebibmacro{byauthor/byeditor+others/bytranslator+others}%
   \newunit
   \printfield{type}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{institution+location+date}%
   \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit
+  \usebibmacro{publisher+location+date}%
+  \newunit
+  \usebibmacro{ebook}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -331,31 +492,60 @@
   \usebibmacro{finentry}%
 }
 
-\DeclareBibliographyDriver{misc}{%
+\DeclareBibliographyDriver{conferencepaper}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{author/editor+others/translator+others}%
+  \usebibmacro{author}%
   \newunit
   \usebibmacro{title}%
   \newunit
   \printfield{note}%
   \newunit
-  \usebibmacro{byauthor}%
+  \usebibmacro{eventtitle}%
   \newunit
-  \usebibmacro{byeditor+others}%
+  \printfield{organization}%
   \newunit
-  \printfield{howpublished}%
+  \usebibmacro{venue+eventdate}%
   \newunit
-  \usebibmacro{shortseries+number}%
+  \printfield{addendum}%
   \newunit
-  \iffieldundef{journaltitle}
-    {\usebibmacro{publisher+location+date}}
-    {\usebibmacro{shortjournal+issuetitle}%
-     \printfield[plainpages]{pages}}%
+  \usebibmacro{doi+eprint+url}%
   \newunit
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
+    {}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}%
+  \usebibmacro{finentry}%
+}
+
+\DeclareBibliographyDriver{periodical}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{editor+others}%
+  \newunit
+  \usebibmacro{issuetitle}%
+  \usebibmacro{language}%
+  \newunit
+  \printfield{note}%
+  \newunit
+  \usebibmacro{shortjournal+issue}%
+  \usebibmacro{pages}%
+  \newunit
+  \printfield{addendum}%
+  \newunit
+  \usebibmacro{issn}%
+  \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -362,28 +552,39 @@
   \usebibmacro{finentry}%
 }
 
-\DeclareBibliographyDriver{conferencepaper}{%
+\DeclareBibliographyDriver{patent}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{author}%
+  \usebibmacro{author+holder}%
   \newunit
   \usebibmacro{title}%
   \newunit
-  \usebibmacro{eventtitle}%
-  \newunit
   \printfield{note}%
   \newunit
-  \printfield{organization}%
+  \printfield{type}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \iflistundef{location}
+    {}
+    {\setunit*{\addspace}%
+     \printtext[parens]{\printlist{location}}}%
+  \setunit{\addcomma\space}%
+  \printfield{version}%
+  \setunit{\addcomma\space}%
+  \usebibmacro{patentdate}%
   \newunit
-  \usebibmacro{venue+eventdate}%
+  \printfield{addendum}%
   \newunit
   \usebibmacro{doi+eprint+url}%
   \newunit
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+  }
     {}
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
   \usebibmacro{finentry}%
 }
-
 \endinput

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx	2017-01-16 23:12:25 UTC (rev 42972)
@@ -8,11 +8,15 @@
 \newtoggle{cbx:loccit}
 \newtoggle{usingibid}
 \newtoggle{relatedseen}
+\newtoggle{inentrytype}
+\newtoggle{cbx:involcite}
 
 \newbibmacro*{cite}{%
   \boolfalse{suppresspostnote}%
   \boolfalse{usevolpostnotedelim}%
   \global\togglefalse{usingibid}%
+  \global\togglefalse{inentrytype}%
+  \global\toggletrue{blx at testpostnotedelim}%
   \ifciteseen
     {\global\toggletrue{relatedseen}}
     {\global\togglefalse{relatedseen}}%
@@ -24,11 +28,15 @@
     \ifboolexpr{%
         test {\ifciteibid}
         and
-        not test {\iffirstonpage}}
+        not test {\iffirstonpage}
+    }
       {\usebibmacro{cite:ibid}}
-      {\usebibmacro{ifuseshorthand}
+      {\usebibmacro{ifciteuseshorthand}
          {\usebibmacro{cite:shorthand}}
-         {\usedriver{}{cite:\thefield{entrytype}}}}}}
+         {\usedriver{}{cite:\thefield{entrytype}}%
+          \ifcsstring{blx at shorthand}{intro}
+            {\usebibmacro{shorthandintro}}
+            {}}}}}
 
 % redefine default loccit tracker so that citations with no postnote also match
 \def\blx at loccit@tracker#1{%
@@ -53,12 +61,6 @@
     {\global\booltrue{suppresspostnote}}
     {}}
 
-\newbibmacro{shorthand}{%
-  \iffieldsequal{shorthand}{shorttitle}
-    {\printtext{\mkbibemph{\printtext{%
-       \bibhyperlink{\strfield{shorthand}}{\thefield{shorthand}}}}}}
-    {\printtext{\bibhyperlink{\strfield{shorthand}}{\thefield{shorthand}}}}}
-
 \newbibmacro*{cite:shorthand}{%
   \togglefalse{blx at citeindex}%
   \global\toggletrue{relatedseen}%
@@ -79,7 +81,10 @@
        \usebibmacro{related:init}%
        \usebibmacro{related}%
        \usebibmacro{volume+part+postnote}}} 
-    {}}
+    {\ifciteseen
+       {}
+       {\newunit
+        \printfield{pages}}}}
 
 \newbibmacro*{bibentrycite}{%
   \citereset
@@ -109,12 +114,28 @@
   \hskip 6em \setunit{}\usedriver{}{abbreviations}\par
 }
 
+\renewrobustcmd*{\volcitecmd}{%
+  \AtNextCite{%
+    \toggletrue{cbx:involcite}%
+    \DeclareFieldAlias{postnote}{volcitenote}}%
+  \begingroup\let\blx at citeargs\blx at volciteargs}
+
+\renewrobustcmd*{\multivolcitecmd}{%
+  \AtNextCite{%
+    \toggletrue{cbx:involcite}%
+    \DeclareFieldAlias{postnote}{volcitenote}}%
+  \def\blx at hook@mcite at before{%
+    \global\undef\blx at hook@mcite at before
+    \let\blx at citeargs\blx at volmciteargs}}
+
 \newbibmacro*{cite:postnote}{%
   \iffieldundef{shorthand}
     {}
     {\iftoggle{usingibid}
        {}
-       {\usebibmacro{setpostnotedelim}}}%
+       {\usebibmacro{ifneedsetpostnotedelim}
+          {\usebibmacro{setpostnotedelim}}
+          {}}}%
   \ifbool{suppresspostnote}{}{%
     \ifboolexpr{%
       not test {\iffieldundef{postnote}}
@@ -126,13 +147,17 @@
          {\setunit{\postnotedelim}}%
        \usebibmacro{postnote}}
       {}}%
-  \iftoggle{relatedseen}
+  \ifboolexpr{
+    togl {relatedseen}
+    or
+    not togl {bbx:related}
+    or
+    test {\iffieldundef{related}}
+  }
     {}
-    {\iffieldundef{related}
-       {}
-       {\setunit{\addsemicolon\space}%
-        \usebibmacro{related:init}%
-        \usebibmacro{related}}}}
+    {\setunit{\addsemicolon\space}%
+     \usebibmacro{related:init}%
+     \usebibmacro{related}}}
 
 \DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
   {\usebibmacro{prenote}}
@@ -176,6 +201,22 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
+\DeclareCiteCommand{\fullcite}
+  {\usebibmacro{prenote}}
+  {\def\blx at shorthand{false}%
+   \let\ifciteseen\@secondoftwo
+   \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
+  {\usebibmacro{prenote}}
+  {\def\blx at shorthand{false}%
+   \let\ifciteseen\@secondoftwo
+   \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
 \DeclareCiteCommand{\citeseries}
   {}
   {\usebibmacro{shortseries}}
@@ -194,26 +235,107 @@
   {}
   {}
 
+\newbibmacro*{textcite}{%
+  \ifnameundef{labelname}
+    {\printfield[citetitle]{labeltitle}}
+    {\printnames{labelname}}}
 
+\newbibmacro*{textcite:init}{%
+  \citetrackerfalse%
+  \pagetrackerfalse%
+  \iffirstcitekey
+    {\global\undef\cbx at lasthash}
+    {}}
+
+\newbibmacro*{textcite:count}{%
+  \stepcounter{textcitetotal}%
+  \ifnumgreater{\value{uniquelist}}{\value{maxnames}}
+    {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}}
+       {\setcounter{textcitemaxnames}{\value{uniquelist}}}
+       {}}
+    {\ifnumless{\value{labelname}}{\value{maxnames}}
+       {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+          {\setcounter{textcitemaxnames}{\value{labelname}}}
+          {}}
+       {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}}
+          {\setcounter{textcitemaxnames}{\value{maxnames}}}
+          {}}}}
+
+\DeclareCiteCommand{\cbx at textcite}
+  {\usebibmacro{textcite:init}}
+  {\iffieldequals{namehash}{\cbx at lasthash}
+     {}
+     {\iffirstcitekey
+        {}
+        {\textcitedelim}%
+      \stepcounter{textcitecount}%
+      \usebibmacro{textcite}%
+      \savefield{namehash}{\cbx at lasthash}}}
+  {}
+  {}
+
+\DeclareCiteCommand{\textcite}[\cbx at textcite@init\cbx at textcite\footcite]
+  {\usebibmacro{textcite:init}%
+   \gdef\cbx at savedkeys{}%
+   \DeferNextCitekeyHook}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+     {\protected at xappto\cbx at footcite@args{%
+        (\thefield{multiprenote})(\thefield{multipostnote})}}
+     {}%
+   \xappto\cbx at savedkeys{\thefield{entrykey},}%
+   \iffieldequals{namehash}{\cbx at lasthash}
+     {}
+     {\usebibmacro{textcite:count}%
+      \savefield{namehash}{\cbx at lasthash}}%
+   \ifnumequal{\value{citecount}}{\value{citetotal}}
+     {\protected at xappto\cbx at textcite@args{{\cbx at savedkeys}}%
+      \protected at xappto\cbx at footcite@args{%
+        [\thefield{prenote}][\thefield{postnote}]{\cbx at savedkeys}}%
+      \iflastcitekey
+        {\protected at xappto\cbx at textcite@args{\thefield{postpunct}}%
+         \protected at xappto\cbx at footcite@args{\nopunct}}
+        {}}
+     {}}
+  {}
+  {}
+
+% textcite has nested \DeclareCiteCommand definitions for textcite and we want to use
+% the normal textcite context
+\DeclareDelimcontextAlias{cbx at textcite}{textcite}
+
+\newrobustcmd{\cbx at textcite@init}[3]{%
+  \setcounter{textcitetotal}{0}%
+  \setcounter{textcitecount}{0}%
+  \setcounter{textcitemaxnames}{0}%
+  \def\cbx at textcite@args{#1}\def\cbx at footcite@args{#2}#3%
+  \cbx at textcite@args\empty\cbx at footcite@args\empty}
+
+\DeclareMultiCiteCommand{\cbx at textcites}{\cbx at textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+  [\cbx at textcites@init\cbx at textcites\footcites]{\textcite}{}
+
+\let\cbx at textcites@init\cbx at textcite@init
+\pretocmd{\cbx at textcites@init}{%
+  \UseNextMultiCiteHook%
+  \AtNextMultiCite{%
+    \renewbibmacro{multiprenote}{}%
+    \renewbibmacro{multipostnote}{}}}{}{}
+
 % ------------------------------------------------------------------
 % CITE DRIVERS
 % ------------------------------------------------------------------
 
 \DeclareBibliographyDriver{cite:set}{%
+  \booltrue{bbx at inset}%
   \ifciteseen
-    {%
-     \printnames{labelname}%
-     \newunit%
-     \printtext[bibhyperlink]{%
-       \iffieldundef{shorttitle}
-         {\printfield[citetitle]{title}}
-         {\printfield[citetitle]{shorttitle}}}}
-    {\booltrue{bbx at inset}%
-     \entryset{}{}%
-     \newunit\newblock
-     \usebibmacro{setpageref}%
-     \finentry
-     \global\boolfalse{suppresspostnote}}}
+    {\let\abx at field@setkey\abx at field@entrykey
+     \let\ifciteseen\@firstoftwo}
+    {}%
+  \entryset{}{}%
+  \newunit\newblock
+  \printfield{postnote}%
+  \finentry
+  \global\booltrue{suppresspostnote}}
 
 \DeclareBibliographyDriver{cite:ancienttext}{%
   \usebibmacro{citeindex}%
@@ -227,7 +349,7 @@
   \newunit
   \ifciteseen
     {}
-    {\usebibmacro{byeditor+others}}%
+    {\usebibmacro{byauthor/byeditor+others/bytranslator+others}}%
   \ifboolexpr{
     test {\iffieldequalstr{entrysubtype}{ANRW}}
     or
@@ -283,15 +405,31 @@
   \usebibmacro{title}%
   \ifciteseen
     {}
-    {\usebibmacro{shortjournal+issuetitle}%
+    {\newunit
+     \usebibmacro{byauthor}%
+     \newunit
+     \usebibmacro{bytranslator+others}%
+     \newunit
+     \usebibmacro{inissuetitle}%
+     \newunit
+     \printfield{version}%
+     \newunit
+     \printlist{organization}%
+     \newunit
+     \printfield{note}%
+     \newunit
+     \usebibmacro{shortjournal+issue}%
      \usebibmacro{pages}%
      \newunit
-     \usebibmacro{releasedate}%
+     \printfield{addendum}%
      \newunit
+     \usebibmacro{issn}%
+     \newunit
      \usebibmacro{doi+eprint+url}}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:book}{%
+  \clearfield{booktitle}%
   \usebibmacro{citeindex}%
   \usebibmacro{begentry}%
   \iftoggle{blx at usefullcite}
@@ -301,24 +439,50 @@
   \newunit
   \usebibmacro{title}%
   \ifciteseen
-    {}
     {\newunit
-     \usebibmacro{byauthor}%
+     \usebibmacro{volume+part}}
+    {\usebibmacro{byauthor/byeditor+others/bytranslator+others}%
      \newunit
-     \usebibmacro{volumeof}%
+     \usebibmacro{chapter+pagesin}%
+     \usebibmacro{volume+partof}%
      \usebibmacro{maintitle}%
      \newunit
-     \usebibmacro{bymaineditor+others}%
+     \usebibmacro{event+venue+date}%
      \newunit
-     \printfield{volumes}%
+     \usebibmacro{bymainauthor/bymaineditor+others/bymaintranslator+others}%
      \newunit
      \printfield{edition}%
      \newunit
-     \usebibmacro{shortseries+number}%
-     \usebibmacro{parens+publisher+location+date}%
+     \printfield{volumes}%
      \newunit
+     \ifentrytype{report}
+       {\printfield{type}%
+        \clearfield{type}%
+        \setunit*{\addspace}%
+        \printfield{number}}
+       {\usebibmacro{shortseries+number}}%
+     \newunit
+     \printfield{type}%
+     \newunit
+     \printfield{version}%
+     \newunit
+     \printfield{note}%
+     \iflistundef{institution}
+       {\usebibmacro{parens+publisher+location+date}}
+       {\setunit{\addspace}%
+        \printtext[parens]{\usebibmacro{institution+location+date}}}%
+     \newunit
+     \usebibmacro{ebook}%
+     \newunit
+     \printfield{addendum}%
+     \newunit
+     \usebibmacro{volume+part+pages}%
+     \newunit
+     \usebibmacro{isbn}%
+     \newunit
+     \usebibmacro{isrn}%
+     \newunit
      \usebibmacro{doi+eprint+url}}%
-  \usebibmacro{volume+part+nomaintitle}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:suppbook}{%
@@ -330,30 +494,45 @@
   \usebibmacro{author/editor+others/translator+others}%
   \newunit
   \ifciteseen
-    {\printfield{type}}
-    {\printfield{type}%
-     \setunit{\addspace}%
-     \usebibmacro{to}%
+    {\iffieldundef{type}
+       {\usebibmacro{title}}
+       {\printfield{type}}}
+    {\iffieldundef{type}
+       {\toggletrue{inentrytype}%
+        \usebibmacro{title}%
+        \setunit{\addspace}%
+        \usebibmacro{in}}
+       {\printfield{type}%
+        \usebibmacro{language}%
+        \setunit{\addspace}%
+        \usebibmacro{to}}%
      \usebibmacro{booktitle}%
-     \setunit*{\newunitpunct}%
-     \usebibmacro{bybookauthor}%
-     \setunit*{\newunitpunct}%
-     \usebibmacro{bybookeditor+others}%
-     \setunit*{\newunitpunct}%
-     \usebibmacro{volumeof}%
+     \usebibmacro{bybookauthor/bybookeditor+others/bybooktranslator+others}%
+     \clearfield{booktitle}%
+     \newunit
+     \usebibmacro{chapterin}%
+     \usebibmacro{volume+partof}%
      \usebibmacro{maintitle}%
      \newunit
-     \usebibmacro{bymaineditor+others}%
+     \usebibmacro{bymainauthor/bymaineditor+others/bymaintranslator+others}%
      \newunit
+     \printfield{edition}%
+     \newunit
      \printfield{volumes}%
      \newunit
-     \printfield{edition}%
+     \usebibmacro{shortseries+number}%
      \newunit
-     \usebibmacro{shortseries+number}%
+     \printfield{note}%
      \usebibmacro{parens+publisher+location+date}%
      \newunit
+     \usebibmacro{ebook}%
+     \newunit
+     \printfield{addendum}%
+     \newunit
      \usebibmacro{pages}%
      \newunit
+     \usebibmacro{isbn}%
+     \newunit
      \usebibmacro{doi+eprint+url}}%
   \usebibmacro{finentry}}
 
@@ -368,37 +547,62 @@
   \usebibmacro{title}%
   \ifciteseen
     {}
-    {\printfield{volumes}%
+    {\usebibmacro{byauthor/byeditor+others/bytranslator+others}%
      \newunit
      \printfield{edition}%
      \newunit
+     \printfield{volumes}%
+     \newunit
      \usebibmacro{shortseries+number}%
+     \newunit
+     \printfield{note}%
      \usebibmacro{parens+publisher+location+date}%
      \newunit
+     \usebibmacro{ebook}%
+     \newunit
+     \printfield{addendum}%
+     \newunit
+     \usebibmacro{pages}%
+     \newunit
+     \usebibmacro{isbn}%
+     \newunit
      \usebibmacro{doi+eprint+url}}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:incommentary}{%
-  \usebibmacro{citeindex}%
-  \usebibmacro{begentry}%
-  \iftoggle{blx at usefullcite}
-    {}
-    {\let\ifciteseen\@firstoftwo}%
   \iffieldundef{volume}
     {\usedriver{}{cite:incollection}}
-    {\iffieldundef{xref}{}{\addskipentry{\thefield{xref}}}%
+    {\usebibmacro{citeindex}%
+     \usebibmacro{begentry}%
+     \iftoggle{blx at usefullcite}
+       {}
+       {\let\ifciteseen\@firstoftwo}%
+     \iffieldundef{xref}{}{\addskipentry{\thefield{xref}}}%
      \cbx at opt@citepages at omit
-     \global\booltrue{suppresspostnote}%
      \usebibmacro{author/translator+others}%
      \newunit
-     \usebibmacro{xrefshortmaintitle}%
-     \newunit
-     \usebibmacro{volume+pages}%
-     \newunit
-     \usebibmacro{doi+eprint+url}%
+     \ifciteseen
+       {\usebibmacro{xrefshortmaintitle}%
+        \iffieldundef{volume}
+          {}
+          {\setunit{\addspace}%
+           \printfield{volume}%
+           \setunit*{\addperiod}%
+           \printfield{part}%
+           \global\booltrue{usevolpostnotedelim}}}
+       {\printfield{note}%
+        \newunit
+        \usebibmacro{xrefshortmaintitle}%
+        \newunit
+        \usebibmacro{volume+pages}%
+        \newunit
+        \printfield{addendum}}%
      \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:incollection}{%
+  \ifentrytype{seminarpaper}
+    {}
+    {\toggletrue{inentrytype}}%
   \usebibmacro{citeindex}%
   \usebibmacro{begentry}%
   \iftoggle{blx at usefullcite}
@@ -409,31 +613,43 @@
   \usebibmacro{title}%
   \ifciteseen
     {}
-    {\ifentrytype{bookinbook}
-       {\newunit
-        \usebibmacro{byeditor+others}}
-       {}%
-     \usebibmacro{in}%
-     \usebibmacro{booktitle}%
-     \setunit*{\newunitpunct}%
-     \usebibmacro{bybookauthor}%
-     \setunit*{\newunitpunct}%
-     \usebibmacro{bybookeditor+others}%
-     \setunit*{\newunitpunct}%
-     \usebibmacro{volumeof}%
-     \usebibmacro{maintitle}%
+    {\usebibmacro{byauthor/byeditor+others/bytranslator+others}%
      \newunit
-     \usebibmacro{bymaineditor+others}%
+     \usebibmacro{chapter+pagesin}%
+     \iffieldundef{booktitle}
+       {}
+       {\usebibmacro{booktitle}%
+        \newunit
+        \usebibmacro{event+venue+date}%
+        \newunit
+        \usebibmacro{bybookauthor/bybookeditor+others/bybooktranslator+others}%
+        \newunit}%
+     \usebibmacro{volume+partof}%
+     \iffieldundef{maintitle}
+       {}
+       {\usebibmacro{maintitle}%
+        \newunit
+        \usebibmacro{event+venue+date}%
+        \newunit
+        \usebibmacro{bymainauthor/bymaineditor+others/bymaintranslator+others}}%
      \newunit
+     \printfield{edition}%
+     \newunit
      \printfield{volumes}%
      \newunit
-     \printfield{edition}%
+     \usebibmacro{shortseries+number}%
      \newunit
-     \usebibmacro{shortseries+number}%
+     \printfield{note}%
      \usebibmacro{parens+publisher+location+date}%
      \newunit
+     \usebibmacro{ebook}%
+     \newunit
+     \printfield{addendum}%
+     \newunit
      \usebibmacro{volume+part+pages}%
      \newunit
+     \usebibmacro{isbn}%
+     \newunit
      \usebibmacro{doi+eprint+url}}%
   \usebibmacro{finentry}}
 
@@ -446,14 +662,23 @@
   \usebibmacro{author/translator+others}%
   \newunit
   \ifciteseen
-    {\usebibmacro{xrefshortbooktitle+xrefshortmaintitle}%
-     \usebibmacro{volume}}
+    {\usebibmacro{xrefshortmaintitle+xrefshortbooktitle}%
+     \iffieldundef{volume}
+       {}
+       {\setunit{\addspace}%
+        \printfield{volume}%
+        \setunit*{\addperiod}%
+        \printfield{part}%
+        \global\booltrue{usevolpostnotedelim}}}
     {\usebibmacro{title}%
-     \usebibmacro{xrefshortbooktitle+xrefshortmaintitle}%
      \newunit
+     \printfield{note}%
+     \newunit
+     \usebibmacro{xrefshortmaintitle+xrefshortbooktitle}%
+     \newunit
      \usebibmacro{volume+pages}%
      \newunit
-     \usebibmacro{doi+eprint+url}}%
+     \printfield{addendum}}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:inreference}{%
@@ -472,12 +697,17 @@
        {}
        {\newunit
         \global\booltrue{usevolpostnotedelim}%
-        \printfield{volume}}}
-    {\usebibmacro{xrefshortbooktitle+xrefshortmaintitle}%
+        \printfield{volume}%
+        \setunit*{\addperiod}%
+        \printfield{part}}}
+    {\newunit
+     \printfield{note}%
      \newunit
+     \usebibmacro{xrefshortmaintitle+xrefshortbooktitle}%
+     \newunit
      \usebibmacro{volume+pages}%
      \newunit
-     \usebibmacro{doi+eprint+url}}%
+     \printfield{addendum}}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:review}{%
@@ -488,8 +718,16 @@
     {\let\ifciteseen\@firstoftwo}%
   \usebibmacro{author/translator+others}%
   \newunit
-  \usebibmacro{title}%
-  \newunit
+  \iffieldundef{title}
+    {}
+    {\usebibmacro{title}%
+     \newunit
+     \ifciteseen
+       {}
+       {\usebibmacro{byauthor}%
+        \newunit
+        \usebibmacro{bytranslator+others}%
+        \newunit}}%
   \usebibmacro{revdtitle}%
   \newunit
   \ifciteseen
@@ -497,41 +735,21 @@
      \printtext[parens]{\usebibmacro{revdauthor/revdeditor}}}
     {\usebibmacro{revdauthor/revdeditor}%
      \newunit
-     \usebibmacro{shortjournal+issuetitle}%
-     \usebibmacro{pages}%
-     \renewcommand*{\newunitpunct}{\addperiod\space}%
-     \usebibmacro{doi+eprint+url}}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:seminarpaper}{%
-  \usebibmacro{citeindex}%
-  \usebibmacro{begentry}%
-  \iftoggle{blx at usefullcite}
-    {}
-    {\let\ifciteseen\@firstoftwo}%
-  \usebibmacro{author/editor+others/translator+others}%
-  \newunit
-  \usebibmacro{title}%
-  \ifciteseen
-    {}
-    {\usebibmacro{booktitle}%
+     \usebibmacro{inissuetitle}%
      \newunit
-     \usebibmacro{bybookeditor+others}%
+     \printfield{version}%
      \newunit
-     \usebibmacro{volumeof}%
-     \usebibmacro{maintitle}%
+     \printlist{organization}%
      \newunit
-     \usebibmacro{bymaineditor+others}%
+     \printfield{note}%
      \newunit
-     \printfield{volumes}%
+     \usebibmacro{shortjournal+issue}%
+     \usebibmacro{pages}%
      \newunit
-     \printfield{edition}%
+     \printfield{addendum}%
      \newunit
-     \usebibmacro{shortseries+number}%
-     \usebibmacro{parens+publisher+location+date}%
+     \usebibmacro{issn}%
      \newunit
-     \usebibmacro{volume+part+pages}%
-     \newunit
      \usebibmacro{doi+eprint+url}}%
   \usebibmacro{finentry}}
 
@@ -546,7 +764,11 @@
   \usebibmacro{title}%
   \ifciteseen
     {}
-    {\setunit{\addspace}%
+    {\newunit
+     \printfield{chapter}%
+     \newunit
+     \printfield{note}%
+     \setunit{\addspace}%
      \printtext[parens]{%
        \renewcommand*{\newunitpunct}{\addsemicolon\space}%
        \printfield{type}%
@@ -553,6 +775,14 @@
        \setunit{\addcomma\addspace}%
        \usebibmacro{institution+location+date}}%
      \newunit
+     \usebibmacro{ebook}%
+     \newunit
+     \printfield{addendum}%
+     \newunit
+     \usebibmacro{pages}%
+     \newunit
+     \printfield{isbn}%
+     \newunit
      \usebibmacro{doi+eprint+url}}%
   \usebibmacro{finentry}}
 
@@ -567,23 +797,23 @@
   \usebibmacro{title}%
   \ifciteseen
     {}
-    {\printfield{note}%
+    {\usebibmacro{byauthor/byeditor+others/bytranslator+others}%
      \newunit
-     \usebibmacro{byauthor}%
+     \printfield{type}%
      \newunit
-     \usebibmacro{byeditor+others}%
+     \printfield{version}%
      \newunit
-     \printfield{howpublished}%
+     \printfield{note}%
+     \setunit{\addspace}%
+     \printtext[parens]{%
+       \usebibmacro{publisher+location+date}}%
      \newunit
-     \usebibmacro{shortseries+number}%
+     \usebibmacro{ebook}%
      \newunit
-     \iffieldundef{journaltitle}
-       {\setunit{\addspace}%
-        \printtext[parens]{%
-        \usebibmacro{publisher+location+date}}}
-       {\usebibmacro{shortjournal+issuetitle}%
-        \usebibmacro{pages}}%
+     \printfield{addendum}%
      \newunit
+     \usebibmacro{pages}%
+     \newunit
      \usebibmacro{doi+eprint+url}}%
   \usebibmacro{finentry}}
 
@@ -598,17 +828,76 @@
   \usebibmacro{title}%
   \ifciteseen
     {}
-    {\setunit{\addspace}%
+    {\newunit
+     \printfield{note}%
+     \setunit{\addspace}%
      \printtext[parens]{%
        \usebibmacro{eventtitle}%
        \newunit
-       \printfield{note}%
-       \newunit
        \printfield{organization}%
        \newunit
        \usebibmacro{venue+eventdate}}%
      \newunit
+     \printfield{addendum}%
+     \newunit
      \usebibmacro{doi+eprint+url}}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{cite:periodical}{%
+  \usebibmacro{citeindex}%
+  \usebibmacro{begentry}%
+  \iftoggle{blx at usefullcite}
+    {}
+    {\let\ifciteseen\@firtoftwo}%
+  \usebibmacro{editor+others}%
+  \newunit
+  \ifciteseen
+    {\usebibmacro{shorttitle}}
+    {\usebibmacro{issuetitle}%
+     \usebibmacro{language}%
+     \newunit
+     \printfield{note}%
+     \newunit
+     \usebibmacro{shortjournal+issue}%
+     \usebibmacro{pages}%
+     \newunit
+     \printfield{addendum}%
+     \newunit
+     \usebibmacro{issn}%
+     \newunit
+     \usebibmacro{doi+eprint+url}}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:patent}{%
+  \usebibmacro{citeindex}%
+  \usebibmacro{begentry}%
+  \iftoggle{blx at usefullcite}
+    {}
+    {\let\ifciteseen\@firtoftwo}%
+  \usebibmacro{author+holder}%
+  \newunit
+  \usebibmacro{title}%
+  \ifciteseen
+    {}
+    {\newunit
+     \printfield{note}%
+     \setunit{\addspace}%
+     \printtext[parens]{%
+       \printfield{type}%
+       \setunit*{\addspace}%
+       \printfield{number}%
+       \iflistundef{location}
+         {}
+         {\setunit*{\addspace}%
+          \printtext[parens]{\printlist{location}}}%
+       \newunit
+       \printfield{version}%
+       \newunit
+       \usebibmacro{patentdate}%
+       \newunit
+       \printfield{addendum}}%
+     \newunit
+     \usebibmacro{doi+eprint+url}}%
+  \usebibmacro{finentry}}
+
 \endinput

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.dbx	2017-01-16 23:11:54 UTC (rev 42971)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.dbx	2017-01-16 23:12:25 UTC (rev 42972)
@@ -15,6 +15,7 @@
   revdsubtitle,
   revdtitleaddon,
   shortbooktitle,
+  shortissuetitle,
   shortmaintitle,
   withauthortype,
   witheditortype,
@@ -29,6 +30,7 @@
 \DeclareDatamodelFields[type=list, datatype=name]{
   bookeditor,
   booktranslator,
+  mainauthor,
   maineditor,
   maintranslator,
   revdauthor,
@@ -44,10 +46,10 @@
   withmaintranslator}
 
 \DeclareDatamodelFields[type=field, datatype=date]{
-  releasedate}
+  eprintdate}
 
 \DeclareDatamodelFields[type=field, datatype=datepart]{
-  releaseday,
-  releasemonth,
-  releaseyear}
+  eprintday,
+  eprintmonth,
+  eprintyear}
 



More information about the tex-live-commits mailing list