diff options
Diffstat (limited to 'Master/texmf-dist')
18 files changed, 207 insertions, 246 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/README.md b/Master/texmf-dist/doc/latex/biblatex-sbl/README.md index 0f90d445003..847ea66e785 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/README.md @@ -30,13 +30,13 @@ kpsewhich -var-value=TEXMFHOME The following packages are required: -* `biblatex` (version 3.8a or higher) with the `biber` backend +* `biblatex` (version 3.11 or higher) with the `biber` backend * `xparse` ## Licence ``` -Copyright 2015-2017 David Purton +Copyright 2015-2018 David Purton This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf Binary files differindex 0fc56b8293f..a14db4d42ba 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex index d9d507d7695..c4bab6ab13a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-ibid.tex @@ -9,7 +9,7 @@ \usepackage{imakeidx} \makeindex[title=Author Index,intoc] \usepackage{hyperref} -\usepackage[style=sbl,indexing=cite,ibidtracker=constrict,pagetracker,backend=biber]{biblatex} +\usepackage[style=sbl,indexing=cite]{biblatex} \addbibresource{biblatex-sbl.bib} \setmonofont{DejaVu Sans Mono}[Scale=MatchLowercase] @@ -147,17 +147,14 @@ This file tests the behaviour of the various options related to using \emph{ibidem} and \emph{idem} in Biblatex-SBL. -\section*{Basic \emph{ibidem} tracking} +\section*{Default \emph{ibidem} tracking} -Turn on \emph{ibidem} using the \texttt{ibidtracker} option. By default -ibid.\@ is used across page breaks and \emph{ibidem} is taking to mean ‘same -author + same title’. See \texttt{biblatex-sbl.pdf} for a description of the -options \texttt{ibidtracker} can take. - -\boolfalse{pagetracker} +By default ibid.\@ is not used across page breaks and \emph{ibidem} is taken +to mean ‘same author + same title’. See \texttt{biblatex-sbl.pdf} for a +description of the options \texttt{ibidtracker} can take. \begin{biboutput} - \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,backend=biber]\{biblatex\}} + \samplemacro{\textbackslash usepackage[style=sbl]\{biblatex\}} \samplecite{1}[127]{talbert:1992} \samplecite{2}[22]{talbert:1992} \samplecite{3}[22]{talbert:1992} @@ -168,15 +165,17 @@ options \texttt{ibidtracker} can take. \samplecite{6}[22]{talbert:1992} \end{biboutput} -\section*{Tracking \emph{ibidem} across pages} +\section*{Not tracking \emph{ibidem} across pages} + +\boolfalse{pagetracker} -Set the \texttt{pagetracker} option to \texttt{true} to ensure that the first -citation on a page is never ibid. +Set the \texttt{pagetracker} option to \texttt{false} to allow that the first +citation on a page to be ibid. -\booltrue{pagetracker} +\boolfalse{pagetracker} \begin{biboutput} - \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,pagetracker,backend=biber]\{biblatex\}} + \samplemacro{\textbackslash usepackage[style=sbl,pagetracker=false]\{biblatex\}} \samplecite{7}[53]{scott+etal:1993} \samplecite{8}[42]{scott+etal:1993} \samplemacro{\textbackslash clearpage} @@ -186,7 +185,7 @@ citation on a page is never ibid. \section*{\emph{Ibidem} meaning ‘same author + same title + same page’} -Turn on the \texttt{ibidpage} option to indicate that \emph{ibidmen} should +Turn on the \texttt{ibidpage} option to indicate that \emph{ibidem} should mean ‘same author + same title + same page’. \makeatletter @@ -196,20 +195,20 @@ mean ‘same author + same title + same page’. \makeatother \begin{biboutput} - \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,ibidpage,backend=biber]\{biblatex\}} + \samplemacro{\textbackslash usepackage[style=sbl,ibidpage]\{biblatex\}} \samplecite{10}[28]{egger:1996} \samplecite{11}[28]{egger:1996} \samplecite{12}[291]{egger:1996} \end{biboutput} -\section*{\emph{Idem} tracking} +\section*{Default \emph{idem} tracking} -Turn on \emph{idem} using the \texttt{idemtracker} option. See -\texttt{biblatex-sbl.pdf} for a description of the options -\texttt{idemtracker} can take. +By default \emph{idem} is used. \emph{Idem} tracking is controlled using the +\texttt{idemtracker} option. See \texttt{biblatex-sbl.pdf} for a description +of the options \texttt{idemtracker} can take. \begin{biboutput} - \samplemacro{\textbackslash usepackage[style=sbl,idemtracker=constrict,backend=biber]\{biblatex\}} + \samplemacro{\textbackslash usepackage[style=sbl]\{biblatex\}} \makeatletter\blx@opt@idemtracker@constrict\makeatother \samplemacro{\textbackslash autocites[35]\{vanseters:1997\}\{vanseters:1995\}} \color{biblatex-colour} @@ -223,7 +222,6 @@ Turn on \emph{idem} using the \texttt{idemtracker} option. See \color{black} \end{biboutput} - \printbibliography \printindex diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf Binary files differindex e9fc07da5b0..55407121e12 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex index 0859cc766c9..f15e6db51b9 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl-test.tex @@ -11,7 +11,7 @@ \usepackage{listings} \usepackage{imakeidx} \makeindex[title=Author Index,intoc] -\usepackage[style=sbl,indexing=cite,backend=biber]{biblatex} +\usepackage[style=sbl,indexing=cite,idemtracker=false,ibidtracker=false]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-sbl.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf Binary files differindex 4f54f53d0e4..0397dead963 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex index 957491682d3..bd587669e74 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/biblatex-sbl.tex @@ -9,8 +9,9 @@ \usepackage{realscripts} \usepackage{xparse} \usepackage{framed} +\usepackage{enumitem} -\usepackage[style=sbl,indexing=cite]{biblatex} +\usepackage[style=sbl,indexing=cite,idemtracker=false,ibidtracker=false]{biblatex} \addbibresource{biblatex-sbl.bib} \hypersetup{colorlinks,citecolor=spot} @@ -148,10 +149,11 @@ The style supports all examples given in the handbook (see \sty{biblatex-sbl-test.pdf}). Shorthand citations and a list of abbreviations containing journals, series, and shorthands are handled automatically. Repeated authors in the bibliography are replaced by a horizontal line. -\emph{Ibidem} is supported, but not enabled by default, as is indexing of -names. Only note style citations, not Author-Date citations are supported. -Primary sources can be cited in parentheses. \biblatexsbl is compatible with -\biblatex's support for \sty{hyperref}. +\emph{Ibidem} and \emph{idem} is enabled by default. Indexing of names is +supported, but not enabled by default. Only note style citations, not +Author-Date citations are supported. Primary sources can be cited in +parentheses. \biblatexsbl is compatible with \biblatex's support for +\sty{hyperref}. For anything not covered in this manual, please see the \biblatex documentation. Bugs and feature requests can be submitted at @@ -162,9 +164,9 @@ output carefully checked when you use it. \section{Requirements} -\biblatexsbl requires at least version 3.5 of \biblatex and the \sty{xparse} +\biblatexsbl requires at least version 3.11 of \biblatex and the \sty{xparse} package. \sty{biber} must be used. \sty{bibtex} is not supported. For -localization \sty{babel}\slash\sty{polyglossia} and \sty{csquotes} are +localization \sty{babel} (not \sty{polyglossia}) and \sty{csquotes} are recommended. \section{Usage} @@ -175,7 +177,7 @@ defaults of the \cite{SBLHS}. \begin{quote} \begin{lstlisting}[style=latex]{} \documentclass{article} -\usepackage[style=sbl,backend=biber]{biblatex} +\usepackage[style=sbl]{biblatex} \addbibresource{<bibfile.bib>} \begin{document} \printbiblist{abbreviations} @@ -188,57 +190,35 @@ defaults of the \cite{SBLHS}. By default \biblatexsbl uses American style punctuation and quotation marks. You can choose a different style by including the -\sty{babel}\slash\sty{polyglossia} and \sty{csquotes} packages in your -document preamble. e.g., +\sty{babel} and \sty{csquotes} packages in your +document preamble. \sty{polyglossia} is not well supported by \biblatex and +its use is discouraged. \begin{quote} \begin{lstlisting}[style=latex]{} -\usepackage[german]{babel} +\usepackage[ngerman]{babel} \usepackage{csquotes} -\usepackage[style=sbl,backend=biber]{biblatex} +\usepackage[style=sbl]{biblatex} \end{lstlisting} \end{quote} Currently \opt{english} (including variants such as \opt{british}, \opt{australian}, etc.), \opt{spanish}, and \opt{german} are supported. -For Greek and especially Hebrew, you are probably better off with -\sty{polyglossia} and \sty{xelatex} or \sty{lualatex}. e.g., +For Greek and especially Hebrew, the set up is more complicated and you should +use \sty{xelatex} or \sty{lualatex}. See \sty{sbl-paper.pdf} for example Greek +and Hebrew usage with \sty{babel}. \begin{quote} \begin{lstlisting}[style=latex]{} -\usepackage{fontspec} -\usepackage{polyglossia} -\usepackage[style=australian]{csquotes} -\setdefaultlanguage[variant=australian]{english} -\setotherlanguage[variant=ancient]{greek} -\setotherlanguage{hebrew} -\ifxetex - \renewenvironment{hebrew}[1][]{% - \par - \raggedleft % add to right align paragraphs - \begin{otherlanguage}[#1]{hebrew}}% - {\end{otherlanguage}\par} -\else % luatex - \let\luatexpardir\pardir % luabidi needs this - \let\luatextextdir\textdir % luabidi needs this - % text direction gets stuffed up without these workarounds - \let\luatextextgreek\textgreek - \let\luatextextenglish\textenglish - \AtBeginDocument{% - \renewcommand{\textgreek}[1]{% - \bgroup\luatextextgreek{#1}\egroup} - \renewcommand{\textenglish}[1]{% - \bgroup\setLTR\luatextextenglish{#1}\egroup}} -\fi -% set up fonts -\newfontfamily\greekfont{SBL BibLit}% - [Script=Greek,Contextuals=Alternate] -\newfontfamily\hebrewfont{SBL BibLit}% - [Script=Hebrew,Contextuals=Alternate,Scale=1.2] -\usepackage[style=sbl,backend=biber]{biblatex} -% update language mapping (biblatex can't do it using polyglossia) -\DeclareLanguageMapping{english}{sbl-english} +\usepackage[nil,bidi=default]{babel} +\usepackage{csquotes} +\babelprovide[import=en-US,main]{american} +\babelprovide[import=he]{hebrew} +\babelprovide[import=el]{polutonikogreek} +\babelfont[american]{rm}[Ligatures=TeX]{Linux Libertine O} +\babelfont[hebrew]{rm}[Ligatures=TeX,Contextuals=Alternate,Scale=1.2]{SBL BibLit} +\babelfont[polutonikogreek]{rm}[Ligatures=TeX,Contextuals=Alternate]{SBL BibLit} \end{lstlisting} \end{quote} @@ -440,7 +420,7 @@ entry types. \end{snugshade} \end{valuelist} -\optitem[false]{ibidtracker}{\opt{true}, \opt{false}, \opt{context}, +\optitem[constrict]{ibidtracker}{\opt{true}, \opt{false}, \opt{context}, \opt{strict}, \opt{constrict}} This option controls the \emph{ibidem} tracker. The possible choices are: @@ -474,7 +454,7 @@ may lead to ambiguous citations. If you prefer the wider interpretation of \emph{ibidem}, set the package option \opt{ibidpage=true} or simply \opt{ibidpage} in the preamble. The default setting is \opt{ibidpage=false}. -\optitem[false]{idemtracker}{\opt{true}, \opt{false}, \opt{context}, +\optitem[constrict]{idemtracker}{\opt{true}, \opt{false}, \opt{context}, \opt{strict}, \opt{constrict}} This option controls the \emph{idem} tracker. The possible choices are: @@ -494,7 +474,7 @@ This option controls the \emph{idem} tracker. The possible choices are: footnote. \end{valuelist} -\optitem[false]{pagetracker}{\opt{true}, \opt{false}} +\optitem[true]{pagetracker}{\opt{true}, \opt{false}} This option controls whether \emph{ibidem} and \emph{idem} are used across page breaks or not. @@ -1269,6 +1249,23 @@ e.g., \end{snugshade} \end{quote} +\section{Important Changes} + +\subsection*{0.9\quad 2018-05-20} + +\begin{itemize}[itemsep=0pt] + \item Support and require \biblatex 3.11. + \item Use ibid and idem by default. + \item \sty{polyglossia} is no longer supported. You should use \sty{babel} + instead. +\end{itemize} + +\subsection*{0.8.2\quad 2017-11-16} + +\begin{itemize}[itemsep=0pt] + \item Support and require \biblatex 3.8a +\end{itemize} + \printbiblist[heading=biblistintoc]{abbreviations} \printbibliography[heading=bibintoc] diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf b/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf Binary files differindex 3424a9aac6b..2af7e3491f3 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex b/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex index da8e292bb54..81a9ee6c1f3 100644 --- a/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex +++ b/Master/texmf-dist/doc/latex/biblatex-sbl/sbl-paper.tex @@ -1,13 +1,27 @@ \documentclass[letterpaper,12pt,oneside,openany]{book} -%% Pass ibid and idem options to biblatex -%\PassOptionsToPackage{pagetracker,ibidtracker=context,ibidpage,idemtracker=constrict}{biblatex} - \usepackage{sbl-paper} %% Add your bib resource here \addbibresource{biblatex-sbl.bib} + +%% Language and font set up +%% Note: Polyglossia is *not* well supported +\ifxetexorluatex + \usepackage[nil,bidi=default]{babel} + \babelprovide[import=en-US,main]{american} + \babelprovide[import=he]{hebrew} + \babelprovide[import=el]{polutonikogreek} + \babelfont[american]{rm}[Ligatures=TeX]{Linux Libertine O} + \babelfont[hebrew]{rm}[Ligatures=TeX,Contextuals=Alternate,Scale=1.2]{SBL BibLit} + \babelfont[polutonikogreek]{rm}[Ligatures=TeX,Contextuals=Alternate]{SBL BibLit} +\else + \usepackage[polutonikogreek,american]{babel} + \usepackage{libertineRoman} +\fi + + %% Index set up (optional) %% Include separate indices for subjects, authors, and Scripture references \makeindex[title=Subject Index,intoc] @@ -25,30 +39,6 @@ {\namepartprefix} {\namepartsuffix}} -%% Set default language to German (or similarly to an other language) -%\ifxetexorluatex -% \setdefaultlanguage{german} -%\else -% \usepackage[german]{babel} -%\fi - -%% Set quotation style to British English -%\setquotestyle[british]{english} - -%% Set default fonts -\ifxetexorluatex - \setromanfont{Linux Libertine O} -% \newfontfamily\greekfont{Linux Libertine O}[Script=Greek] -% \newfontfamily\hebrewfont{Linux Libertine O}[Script=Hebrew,Scale=1.2] - -%% Use SBL BibLit font for Greek and Hebrew - \newfontfamily\greekfont{SBL BibLit}% - [Script=Greek,Contextuals=Alternate,Ligatures=Required] - \newfontfamily\hebrewfont{SBL BibLit}% - [Script=Hebrew,Contextuals=Alternate,Ligatures=Required,Scale=1.2] -\else - \usepackage{libertineRoman} -\fi %% Disable hyperlinks %\hypersetup{draft=true} @@ -111,7 +101,7 @@ The page numbers for the noninitial pages of the paper (or chapter) are located at the top right corner. The text of the body of the paper is double-spaced except for blocked quotations. -\begin{quoting} +\begin{quote} \index{quotations!block}% This is a blocked quotation. It should consist of five or more lines of text and be indented one-half inch. Block quotations should be single-spaced. No @@ -121,7 +111,7 @@ quotations. regular spacing resumes after the end of the quotation.\footnote{The first line of a footnote is indented one-half inch. A 10-point font is acceptable. Footnotes, unlike the main text of the paper, should be single-spaced.} -\end{quoting} +\end{quote} After a block quotation, return to double-spaced text justified to the left margin until you finish the paragraph. @@ -142,28 +132,37 @@ citations in parentheses. For example, here is a dictionary with a shorthand: the same article referenced in two different publications.\autocites{freedman:1977,freedman:1980} -%% Use xelatex or lualatex if you need Greek or Hebrew +%% Use xelatex or lualatex if you need Hebrew +\section{Greek + \ifxetexorluatex + and Hebrew% + \fi} + +\index{Greek!paragraph}Paragraph Greek: +\begin{quote} + \selectlanguage{polutonikogreek} + Ἐν ἀρχῇ ἦν ὁ λόγος, καὶ ὁ λόγος ἦν πρὸς τὸν θεόν, καὶ θεὸς ἦν ὁ λόγος. + \foreignlanguage{american}{(\pibibleverse{John 1:1})} +\end{quote} \ifxetexorluatex - \section{Greek and Hebrew} - - \index{Greek!paragraph}Paragraph Greek: - \begin{quoting} - \begin{greek} - Ἐν ἀρχῇ ἦν ὁ λόγος, καὶ ὁ λόγος ἦν πρὸς τὸν θεόν, καὶ θεὸς ἦν ὁ λόγος. - \textenglish{(\pibibleverse{John 1:1})} - \end{greek} - \end{quoting} \index{Hebrew!paragraph}Paragraph Hebrew: - \begin{quoting} - \begin{hebrew} - בְּרֵאשִׁית בָּרָא אֱלֹהִים אֵת הַשָּׁמַיִם וְאֵת הָאָרֶץ. - \textenglish{(\pibibleverse{Genesis 1:1})} - \end{hebrew} - \end{quoting} - \index{Greek!inline}Inline Greek (\textgreek{Ἐν ἀρχῇ}), + \begin{quote} + \selectlanguage{hebrew} + \ifxetex + \raggedleft + \fi + בְּרֵאשִׁית בָּרָא אֱלֹהִים אֵת הַשָּׁמַיִם וְאֵת הָאָרֶץ. + \foreignlanguage{american}{(\pibibleverse{Genesis 1:1})} + \end{quote} +\fi +\ifxetexorluatex + \index{Greek!inline}Inline Greek (\foreignlanguage{greek}{Ἐν ἀρχῇ}), \index{Greek!transliterated}transliterated Greek (\emph{En archē}), - \index{Hebrew!inline}Hebrew (\texthebrew{בראשית}), and + \index{Hebrew!inline}Hebrew (\foreignlanguage{hebrew}{בראשית}), and \index{Hebrew!transliterated}transliterated Hebrew (\emph{bərēʾšı̂t}). +\else + \index{Greek!inline}Inline Greek (\foreignlanguage{greek}{Ἐν ἀρχῇ}) and + \index{Greek!transliterated}transliterated Greek (\emph{En archē}). \fi \appendix diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-american.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/american-sbl.lbx index 4add7d40525..95f47d3d09a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-american.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-sbl/american-sbl.lbx @@ -1,10 +1,10 @@ -\ProvidesFile{sbl-american.lbx}[\sbl@abx@lbxid] +\ProvidesFile{american-sbl.lbx}[\sbl@abx@lbxid] -\InheritBibliographyStrings{sbl-english} +\InheritBibliographyStrings{american} + +\InheritBibliographyExtras{american} \DeclareBibliographyExtras{% - \DeclarePunctuationPairs{colon}{*}% - \uspunctuation \protected\def\mkdaterangecomp{% \mkdaterangetrunc{long}}% \protected\def\mkdaterangeterse{% diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def b/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def index 7a287246d8b..99c1fab599f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def +++ b/Master/texmf-dist/tex/latex/biblatex-sbl/biblatex-sbl.def @@ -1,11 +1,11 @@ \RequireBibliographyStyle{standard} \RequireBiber[3] -% BibLaTeX version 2017/11/05 v3.8a or greater required -\@ifpackagelater{biblatex}{2017/11/05} +% BibLaTeX version 2018/03/04 v3.11 or greater required +\@ifpackagelater{biblatex}{2018/03/04} {} {\PackageError{biblatex-sbl} - {BibLaTeX v3.8a or greater is required} + {BibLaTeX v3.11 or greater is required} {You need to update your TeX distribution to use biblatex-sbl.}} % Require xparse @@ -15,8 +15,8 @@ % VERSION STRINGS % ------------------------------------------------------------------ -\def\sbl@abx@date{2017/11/16} -\def\sbl@abx@version{0.8.2} +\def\sbl@abx@date{2018/05/20} +\def\sbl@abx@version{0.9} \def\sbl@abx@bbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl bibliography style (DCP)} \def\sbl@abx@cbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl citation style (DCP)} \def\sbl@abx@lbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl localization} @@ -173,20 +173,12 @@ % IDEM MACROS % ------------------------------------------------------------------ -% only use idem within footnote -\let\cbx@ifmpfncheck\blx@ifmpfncheck -\patchcmd{\cbx@ifmpfncheck}{\tw@}{\@ne}{}{} -\let\cbx@ifciteidem@constrict\blx@ifciteidem@constrict -\patchcmd{\cbx@ifciteidem@constrict}{\blx@ifmpfncheck}{\cbx@ifmpfncheck}{}{} - -\def\blx@opt@idemtracker@constrict{% - \let\blx@imc@ifciteidem\cbx@ifciteidem@constrict - \let\blx@idemtracker\blx@idemtracker@constrict - \let\blx@idemreset\blx@idemreset@context - \booltrue{citetracker}} - \newbibmacro*{ifidemused}{% - \ifciteidem + \ifboolexpr{ + test {\ifciteidem} + and + not test {\iffirstonpage} + } {\bibstring[\mkibid]{idem\thefield{gender}}% \@firstoftwo} {\@secondoftwo}} @@ -303,7 +295,9 @@ related, minxrefs=1, isbn=false, - ibidtracker=false, + pagetracker, + idemtracker=constrict, + ibidtracker=constrict, ibidpage=false, maxbibnames=99, maxcitenames=3, @@ -315,7 +309,8 @@ usevolume, useseries, accessdate=false, - shorthand=true + shorthand=true, + language=american } \ExecuteBibliographyOptions[classictext,ancienttext]{% @@ -344,16 +339,34 @@ \NewBibliographyString{patentfiled} \NewBibliographyString{released} -\DeclareLanguageMapping{english}{sbl-american} -\DeclareLanguageMapping{american}{sbl-american} -\DeclareLanguageMapping{british}{sbl-british} -\DeclareLanguageMapping{german}{sbl-german} -\DeclareLanguageMapping{spanish}{sbl-spanish} +\DeclareLanguageMappingSuffix{-sbl} + +% Ensure right colon punctuation when reset +\protected\def\blx@resetpunct{% + \DeclareCapitalPunctuation{.!?}% + \DeclarePunctuationPairs{dot}{}% + \DeclarePunctuationPairs{comma}{*!?}% + \DeclarePunctuationPairs{semicolon}{*!?}% + \DeclarePunctuationPairs{colon}{*}% + \DeclarePunctuationPairs{period}{}% + \DeclarePunctuationPairs{exclam}{*}% + \DeclarePunctuationPairs{question}{*}% + \DeclareQuotePunctuation{}% + \def\abx@dot{\ifdim\lastkern>\z@\unkern\fi.\spacefactor\blx@sf@dot}% + \def\abx@comma{\ifdim\lastkern>\z@\unkern\fi\abx@puncthook{,}}% + \def\abx@semicolon{\abx@puncthook{;}}% + \def\abx@colon{\abx@puncthook{:}}% + \def\abx@period{\ifdim\lastkern>\z@\unkern\fi\abx@puncthook{.}}% + \def\abx@exclam{\abx@puncthook{!}}% + \def\abx@question{\abx@puncthook{?}}% + \global\let\abx@puncthook\@firstofone + \global\let\blx@postpunct\@empty} \renewcommand*{\subtitlepunct}{\addcolon\space} \newcommand*{\namedashpunct}{\adddot\space} \newcommand*{\lexiconfinalnamedelim}{\addcomma\space} \renewcommand*{\relateddelim}{\addsemicolon\space} +\renewcommand*{\begrelateddelim}{\addsemicolon\space} \setcounter{mincompwidth}{10} @@ -743,7 +756,7 @@ % - copy titles to shorttitles if they are empty % ------------------------------------------------------------------ -\DeclareSourcemap{ +\DeclareStyleSourcemap{ \maps{ \map{ \step[fieldsource=title, match=\regexp{(.*?):}, final] diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-english.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/english-sbl.lbx index 4a239ee8da2..e56c07368a1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-sbl/english-sbl.lbx @@ -1,4 +1,6 @@ -\ProvidesFile{sbl-english.lbx}[\sbl@abx@lbxid] +\ProvidesFile{english-sbl.lbx}[\sbl@abx@lbxid] + +\InheritBibliographyExtras{english} \DeclareBibliographyStrings{% inherit = {english}, @@ -26,3 +28,7 @@ annodomini = {{AD}{AD}}, beforechrist = {{BC}{BC}} } + +\DeclareBibliographyExtras{% + \DeclarePunctuationPairs{colon}{*}% +} diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-german.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/german-sbl.lbx index 055b51f15ad..cb98da01851 100644 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-sbl/german-sbl.lbx @@ -1,4 +1,6 @@ -\ProvidesFile{sbl-german.lbx}[\sbl@abx@lbxid] +\ProvidesFile{german-sbl.lbx}[\sbl@abx@lbxid] + +\InheritBibliographyExtras{german} \DeclareBibliographyStrings{% inherit = {german}, @@ -24,9 +26,3 @@ annodomini = {{n\adddotspace Chr\adddot}{n\adddotspace Chr\adddot}}, beforechrist = {{v\adddotspace Chr\adddot}{v\adddotspace Chr\adddot}}, } - -\InheritBibliographyExtras{german} - -\DeclareBibliographyExtras{% - \DeclarePunctuationPairs{colon}{*}% -} diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-british.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-british.lbx deleted file mode 100644 index 73f8b0f6287..00000000000 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-british.lbx +++ /dev/null @@ -1,9 +0,0 @@ -\ProvidesFile{sbl-british.lbx}[\sbl@abx@lbxid] - -\InheritBibliographyStrings{sbl-english} - -\InheritBibliographyExtras{british} - -\DeclareBibliographyExtras{% - \DeclarePunctuationPairs{colon}{*}% -} diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty index 77dcb8705ab..438ebf34e8d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty +++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-paper.sty @@ -1,4 +1,4 @@ -%Copyright 2015-2017 David Purton +%Copyright 2015-2018 David Purton % %This work may be distributed and/or modified under the %conditions of the LaTeX Project Public License, either version 1.3 @@ -13,7 +13,7 @@ %The Current Maintainer of this work is David Purton. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{sbl-paper} - [2017/11/16 Society of Bibilical Literature Paper Style (DCP)] + [2018/05/20 Society of Bibilical Literature Paper Style (DCP)] % xetex/luatex engine test set up @@ -34,43 +34,22 @@ % Load required packages -\ifxetexorluatex - \RequirePackage{fontspec} - \RequirePackage{polyglossia} -\else - \RequirePackage[T1]{fontenc} - \RequirePackage[utf8]{inputenc} - \RequirePackage[base]{babel} -\fi - \RequirePackage{csquotes} -\RequirePackage{ragged2e} \RequirePackage[headheight=14.5pt,margin=1in]{geometry} \RequirePackage{textcase} \RequirePackage{setspace} \RequirePackage{titlesec} \RequirePackage{titletoc} -\RequirePackage{quoting} \RequirePackage{fancyhdr} \RequirePackage[bottom]{footmisc} \RequirePackage{bibleref-parse} -\RequirePackage[style=sbl,indexing=cite,backend=biber]{biblatex} +\RequirePackage[style=sbl,indexing=cite]{biblatex} \RequirePackage{imakeidx} \RequirePackage{hyperref} -% work around bidi redefining theindex -\ifxetex - \let\imakeidxtheindex\theindex - \let\imakeidxendtheindex\endtheindex - \AtBeginDocument{% - \let\theindex\imakeidxtheindex - \let\endtheindex\imakeidxendtheindex - } -\fi - - % patch index commands so contents is in all caps + \patchcmd{\imki@putindexsplit} {\addcontentsline{toc}{\imki@toclevel}{\imki@title}} {\addcontentsline{toc}{\imki@toclevel}{\MakeTextUppercase{\imki@title}}} @@ -86,32 +65,6 @@ \fi -% Set up languages - -\ifxetexorluatex - \setdefaultlanguage[variant=american]{english} - \setotherlanguage[variant=ancient]{greek} - \setotherlanguage{hebrew} - \ifxetex - \renewenvironment{hebrew}[1][]{% - \par - \raggedleft % add to right align paragraphs - \begin{otherlanguage}[#1]{hebrew}}% - {\end{otherlanguage}\par} - \else % luatex - \let\luatexpardir\pardir % luabidi needs this - \let\luatextextdir\textdir % luabidi needs this - % text direction gets stuffed up without these workarounds - \let\luatextextgreek\textgreek - \let\luatextextenglish\textenglish - \AtBeginDocument{% - \renewcommand{\textgreek}[1]{\bgroup\luatextextgreek{#1}\egroup} - \renewcommand{\textenglish}[1]{\bgroup\setLTR\luatextextenglish{#1}\egroup} - } - \fi -\fi - - % Set up document spacing \doublespacing @@ -136,8 +89,18 @@ % set up quotations -\quotingsetup{leftmargin=0.5in,rightmargin=0in,vskip=0pt} -\renewcommand*{\quotingfont}{\singlespacing\vspace*{-5pt}} +\renewenvironment{quote}% + {\list{}{\leftmargin 0.5in + \rightmargin \z@ + \topsep \z@ + \partopsep \z@ + \itemsep \z@ + \parsep \z@ + \itemindent \z@ + \listparindent 0.5in + }% + \item[]\singlespacing\vspace*{-5pt}}% + {\endlist} % Set up Bibliography diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx index e496901a84c..b2872b1ee1a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.bbx @@ -7,6 +7,7 @@ \global\undef\bbx@lasthash \def\abx@str{abx@lstr}% \renewcommand*{\relateddelim}{\addperiod\space} + \renewcommand*{\begrelateddelim}{\addperiod\space} \renewcommand*{\revsdnamedelim}{\addcomma}% \DeclareNameAlias{author}{sortname}% \DeclareNameAlias{editor}{sortname}% diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx index 786d77030bd..e19185c6d28 100644 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-sbl/sbl.cbx @@ -76,11 +76,11 @@ {\usebibmacro{setaltpostnotedelim}% \setunit{\postnotedelim}% \printfield{altpostnote}% - \setunit{\addspace}% - \printtext[parens]{% - \usebibmacro{related:init}% - \usebibmacro{related}% - \usebibmacro{volume+part+postnote}}} + \DeclareFieldFormat{related}{\mkbibparens{##1}}% + \renewcommand*{\begrelateddelim}{\addspace}% + \renewbibmacro*{endrelatedloop}{\usebibmacro{volume+part+postnote}}% + \usebibmacro{related:init}% + \usebibmacro{related}}% {\ifciteseen {} {\newunit @@ -98,6 +98,8 @@ \DeclareNameAlias{editor}{sortname}% \DeclareNameAlias{translator}{sortname}% \renewcommand*{\newunitpunct}{\addperiod\space}% + \renewcommand*{\relateddelim}{\addperiod\space} + \renewcommand*{\begrelateddelim}{\addperiod\space} \sloppy \printtext{\usedriver{}{\thefield{entrytype}}}} @@ -155,8 +157,7 @@ test {\iffieldundef{related}} } {} - {\setunit{\addsemicolon\space}% - \usebibmacro{related:init}% + {\usebibmacro{related:init}% \usebibmacro{related}}} \DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote] @@ -359,15 +360,15 @@ test {\iffieldequalstr{entrysubtype}{COS}} }} } - {\newunit + {\renewcommand*{\begrelateddelim}{\newunitpunct}% \usebibmacro{related:init}% \usebibmacro{related}% \usebibmacro{volume+part+postnote}} - {\setunit{\addspace}% - \printtext[parens]{% - \usebibmacro{related:init}% - \usebibmacro{related}% - \usebibmacro{volume+part+postnote}}}% + {\DeclareFieldFormat{related}{\mkbibparens{##1}}% + \renewcommand*{\begrelateddelim}{\addspace}% + \renewbibmacro*{endrelatedloop}{\usebibmacro{volume+part+postnote}}% + \usebibmacro{related:init}% + \usebibmacro{related}}% \global\toggletrue{relatedseen} \usebibmacro{finentry}} @@ -384,11 +385,11 @@ \iffieldequalstr{entrysubtype}{churchfather} {\setunit{\addspace}% \printfield{altpostnote}% - \setunit{\addspace}% - \printtext[parens]{% - \usebibmacro{related:init}% - \usebibmacro{related}% - \usebibmacro{volume+part+postnote}}% + \DeclareFieldFormat{related}{\mkbibparens{##1}}% + \renewcommand*{\begrelateddelim}{\addspace}% + \renewbibmacro*{endrelatedloop}{\usebibmacro{volume+part+postnote}}% + \usebibmacro{related:init}% + \usebibmacro{related}% \global\toggletrue{relatedseen}} {\usebibmacro{volume+part+postnote}% \usebibmacro{classic:translator+series}}% diff --git a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-spanish.lbx b/Master/texmf-dist/tex/latex/biblatex-sbl/spanish-sbl.lbx index 7b2a13dd310..e6a8345dfa4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-sbl/sbl-spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-sbl/spanish-sbl.lbx @@ -1,4 +1,6 @@ -\ProvidesFile{sbl-spanish.lbx}[\sbl@abx@lbxid] +\ProvidesFile{spanish-sbl.lbx}[\sbl@abx@lbxid] + +\InheritBibliographyExtras{spanish} \DeclareBibliographyStrings{% inherit = {spanish}, @@ -25,9 +27,3 @@ annodomini = {{d\adddotspace C\adddot}{d\adddotspace C\adddot}}, beforechrist = {{a\adddotspace C\adddot}{a\adddotspace C\adddot}} } - -\InheritBibliographyExtras{spanish} - -\DeclareBibliographyExtras{% - \DeclarePunctuationPairs{colon}{*}% -} |