From 8a59bef2d86da7bbe2ffd977865b0e011b4175aa Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 10 May 2016 21:26:42 +0000
Subject: langsci (10may16)

git-svn-id: svn://tug.org/texlive/trunk@41007 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/xelatex/langsci/README.md    |   4 +-
 .../xelatex/langsci/biblatex-langsci-unified.bbx   | 562 +++++++++++++++++++++
 .../tex/xelatex/langsci/biblatex-sp-unified.bbx    | 562 ---------------------
 .../xelatex/langsci/langsci-authoryear-comp.cbx    | 289 +++++++++++
 .../tex/xelatex/langsci/langsci-series.def         |   2 +-
 .../texmf-dist/tex/xelatex/langsci/langscibook.cls |   8 +-
 .../tex/xelatex/langsci/sp-authoryear-comp.cbx     | 289 -----------
 7 files changed, 858 insertions(+), 858 deletions(-)
 create mode 100644 Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx
 delete mode 100644 Master/texmf-dist/tex/xelatex/langsci/biblatex-sp-unified.bbx
 create mode 100644 Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx
 delete mode 100644 Master/texmf-dist/tex/xelatex/langsci/sp-authoryear-comp.cbx

diff --git a/Master/texmf-dist/doc/xelatex/langsci/README.md b/Master/texmf-dist/doc/xelatex/langsci/README.md
index 760232543dd..ab936dbe555 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/README.md
+++ b/Master/texmf-dist/doc/xelatex/langsci/README.md
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%   Project: langsci
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2016-05-09 11:11:11 UTC
+%%      Date: 2016-05-10 11:11:11 UTC
 %%   Purpose: publishing boks with Language Science Press.
 %% Languages: LaTeX, tikz, eps
 %%  Copyright 2012- Language Science Press
@@ -22,7 +22,7 @@
 %% - series.def: metadata for series
 %% - colors.def: colors used by the series
 %% - langsci-basic.sty for commands required by the standard template
-%% - bib style definitions langsci-unified.bst, biblatex-sp-unified.bbx, sp-authoryear-comp.cbx
+%% - bib style definitions langsci-unified.bst, biblatex-langsci-unified.bbx, langsci-authoryear-comp.cbx
 %% - files for the logos used in the textbook series Textbooks in Language Sciences: book.eps  bulb.eps  glass.eps  law.eps
 %% - the file logo.pdf as a dummy, to be replaced with a file for the hosting institution
 %% - a file advertisement.tex added to the very last page in tikz
diff --git a/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx b/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx
new file mode 100644
index 00000000000..84d10be4588
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx
@@ -0,0 +1,562 @@
+% Modified by LSP, Thu Jul 31 22:36:02 CEST 2014
+\ProvidesFile{sp-biblatex.bbx}
+
+% NB: The Unified Style Sheet wants abbreviated "ed(s)", "edn". But using the abbreviate option also abbreviates the names of months. But then dateabbrev=false restores the long names of months
+% biblatex has a "useprefix" option, which makes "von" count for alphabetization; the Unified Stylesheet does not want that, so it is important that this option be disabled (even if an author tries to set it to true)
+
+\ExecuteBibliographyOptions{labeldate,sorting=nyt,abbreviate,dateabbrev=false,useprefix=false}
+
+% biblatex by default calls biblatex.def, we add to this authoryear.bbx, which in turn loads standard.bbx. So, sp-biblatex.bbx is built on top of those styles; once authoryear.bbx is loaded, we tell it not to put in dashes for repeated authors (in accordance with the Unified Stylesheet)
+
+\RequireBibliographyStyle{authoryear}
+\ExecuteBibliographyOptions{dashed=false}
+
+% Formatting directives for name lists
+% ------------------------------------------------------------------
+%
+% In biblatex.def, there are name formats defined: first-last, last-first, last-first/first-last. They could be simplified (we don't need provisions for using initials only, since the Unified Style doesn't do that), but since biblatex.def is loaded automatically, there's no point. The name formats call bibmacros that figure out how to order the internal of name components. These are re-defined here to make sure that "von" is treated as part of the last name (it still doesn't count for sorting -- which is controlled by the \useprefix package option)
+% name:last is used to produce citation labels
+% name:last-first is used to produce the first author's name listing in the alphabetical bibliography
+
+% Also moved the Jr part to after the first name and inserted another comma, because the Unified Stylesheet disagrees with standard.bbx: it wants "Jr." not to be treated as part of the last name.
+
+% The macros here get 4 arguments passed to them. They are: #1 last name, #2 first name, #3 von, #4 Jr.
+
+\renewbibmacro*{name:last}[4]{%				
+     \usebibmacro{name:delim}{#3#1}%
+     \usebibmacro{name:hook}{#3#1}%
+     \ifblank{#3}
+       {}
+       {\ifcapital
+          {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+          {\mkbibnameprefix{#3}\isdot}%
+        \ifpunctmark{'}{}{\bibnamedelimc}}%
+  \mkbibnamelast{#1}}%
+  
+\renewbibmacro*{name:last-first}[4]{%      
+     \usebibmacro{name:delim}{#3#1}%
+     \usebibmacro{name:hook}{#3#1}%
+     \ifblank{#3}{}{%
+	   \mkbibnameprefix{#3}\isdot%
+       \ifpunctmark{'}{}{\bibnamedelimc}}%
+     \mkbibnamelast{#1}\isdot
+     \ifblank{#2}{}{\addcomma\bibnamedelimd\mkbibnamefirst{#2}\isdot}%
+     \ifblank{#4}{}{\addcomma\bibnamedelimd\mkbibnameaffix{#4}\isdot}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Various bibmacros used in producing the bibliography
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\renewbibmacro*{date+extrayear}{%
+  \iffieldundef{labelyear}
+    {}
+    {\printtext{\printdateextralabel}}}%     Took out the parentheses around the year
+
+\renewbibmacro*{author}{%
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\usebibmacro{bbx:savehash}%
+        \printnames{author}%
+  \iffieldundef{authortype}
+    {\newunit}%                               period instead of space
+    {\setunit{\addcomma\space}}}%
+     \iffieldundef{authortype}
+       {}
+       {\usebibmacro{authorstrg}%
+  \newunit}}%                                 period instead of space
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \newunit}%                               period instead of space
+  \usebibmacro{date+extrayear}}
+
+\renewbibmacro*{editor}{%
+  \usebibmacro{bbx:editor}{editorstrg}}
+\renewbibmacro*{editor+others}{%
+  \usebibmacro{bbx:editor}{editor+othersstrg}}
+\renewbibmacro*{bbx:editor}[1]{%
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\printnames{editor}%
+  \setunit{\addspace}%
+  \usebibmacro{bbx:savehash}}%
+     \printtext[parens]{\usebibmacro{#1}}%
+     \clearname{editor}%
+     \newunit}%                                         period instead of space
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \newunit}%                                         period instead of space
+  \usebibmacro{date+extrayear}}
+
+\renewbibmacro*{translator}{%
+  \usebibmacro{bbx:translator}{translatorstrg}}
+\renewbibmacro*{translator+others}{%
+  \usebibmacro{bbx:translator}{translator+othersstrg}}
+\renewbibmacro*{bbx:translator}[1]{%
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+ ts      {\bibnamedash}
+       {\printnames{translator}%
+  \setunit{\addcomma\space}%
+  \usebibmacro{bbx:savehash}}%
+     \usebibmacro{translator+othersstrg}%
+     \clearname{translator}%
+     \newunit}%                                     period instead of space
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \newunit}%                                     period instead of space
+  \usebibmacro{date+extrayear}}
+
+\renewbibmacro*{journal}{%
+  \iffieldundef{journaltitle}
+    {}
+    {\printtext{%
+       \printfield{journaltitle}%
+       \setunit{\subtitlepunct}%
+       \printfield{journalsubtitle}}}}
+
+\renewbibmacro*{volume+number+eid}{%
+  \printfield{volume}%
+%  \setunit*{\adddot}%
+  \printfield[parens]{number}%        parentheses instead of dot before issue number
+  \setunit{\addcomma\space}%
+  \printfield{eid}}
+
+% Because of the weird format "3 May, 2007" specified in the Unified Stylesheet for URL access dates, we need a special way to format the urldate
+  
+\newcommand{\mkbibdateunified}[3]{% Year-Month-Day as input --> xx Month, Year
+  \iffieldundef{#3}
+    {}
+    {\stripzeros{\thefield{#3}}%
+     \nobreakspace}%
+  \iffieldundef{#2}
+    {\iffieldundef{#1}%
+      {}%
+      {\stripzeros{\thefield{#1}}}}%
+    {\mkbibmonth{\thefield{#2}}%
+     \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#3}%
+           {}%
+           {,}%
+         \space\stripzeros{\thefield{#1}}}%
+    }%
+  }% 
+
+\renewbibmacro*{url+urldate}{%
+  \printfield{url}%
+  \iffieldundef{urlyear}%
+  	{}%
+  	{\setunit*{\addspace}%
+     \printtext[parens]{\mkbibdateunified{urlyear}{urlmonth}{urlday}}}%
+  }
+
+\renewbibmacro*{series+number}{%
+  \iffieldundef{series}
+    {}
+    {\printtext[parens]{%
+      \printfield{series}%
+      \setunit*{\addspace}%
+      \printfield{number}}%
+    }}
+
+\renewbibmacro*{byeditor+others}{%
+  \ifnameundef{editor}
+    {}
+    {\printnames[byeditor]{editor}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{editor+othersstrg}}%  putting (ed.) or (eds.) after editors of books
+     \clearname{editor}%
+     \newunit}%
+  \usebibmacro{byeditorx}%
+  \usebibmacro{bytranslator+others}}
+
+\renewbibmacro*{chapter+pages}{%
+  \iffieldundef{chapter}%
+  {}%
+  {\printfield{chapter}%
+  \setunit{\addcomma\space}}%
+  \printfield{pages}%
+  \newunit}
+
+\renewbibmacro*{note+pages}{%
+  \iffieldundef{note}%
+  {}%
+  {\printfield{note}%
+  \setunit{\addcomma\space}}%
+  \printfield{pages}%
+  \newunit}
+
+\newbibmacro*{institution+location+type+date}{%
+  \printlist{location}%
+  \iflistundef{institution}
+    {}
+    {\setunit*{\addcolon\space}}%
+  \printlist{institution}%
+  \setunit{\addspace}%
+  \printfield{type}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date}%
+  \newunit}
+
+% The following is a hack to satisfy the Unified Stylesheet's decision to give the edition right after the OED as used as a sortlabel.
+
+\renewbibmacro*{labeltitle}{%
+  \iffieldundef{label}
+    {\iffieldundef{shorttitle}
+       {\printfield{title}%
+        \setunit{\addcomma\space}%     Here it comes, preparing for the edition
+        \printfield{edition}%          Here's the edition
+        \clearfield{title}%
+        \clearfield{edition}}%         Clearing the edition field, so it's not printed again below
+       {\printfield[title]{shorttitle}}}
+    {\printfield{label}}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Punctuation & formatting
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% This gets rid of the Oxford comma in name lists and uses the ampersand rather than "and":
+
+\renewcommand*{\finalnamedelim}{\addspace\&\addspace}     
+\renewcommand*{\finallistdelim}{\addspace\&\addspace}   
+
+% no colon after "In" in incollection entries (overriding biblatex.def):
+
+\renewcommand{\intitlepunct}{\addspace}  
+
+\renewcommand{\subtitlepunct}{\addcolon\space}
+\renewcommand*{\bibpagespunct}{\newunitpunct}  % No comma before pages, just the usual new unit period
+
+\DefineBibliographyStrings{english}{%
+  edition          = {edn\adddot},
+}
+
+% basically everything is in sentence case, other than journals and book series (recurring titles)
+\DeclareFieldFormat[article,periodical,book,thesis,incollection,unpublished,inproceedings]{titlecase}{\MakeSentenceCase*{#1}}%
+
+% No quotes around titles
+\DeclareFieldFormat[article,periodical,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{#1}
+
+% Just like book titles, thesis titles are in italics
+\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
+
+\DeclareFieldFormat{pages}{#1}     % no pp. prefix, took \mkpageprefix out [kvf]
+\DeclareFieldFormat{doi}{\doi{#1}}
+\DeclareFieldFormat{url}{\url{#1}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% The bibliography drivers, specifying the formats of each type of entry in the bibliography
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% First, the entry types used in the Unified Test Bibliography. Could rely on standard.bbx for all others as a fallback.
+
+% For the article type, the only departure from standard.bbx is that 
+% we don't use a literal "In: " before the journal title; other formatting
+% departures are done in the format specs and bibmacros
+
+\DeclareBibliographyDriver{article}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{bytranslator+others}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+%  \usebibmacro{in:}%                         We don't use "In: " before journal titles
+  \usebibmacro{journal+issuetitle}%
+  \newunit
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock%                          \newblock ensures period before pages
+  \usebibmacro{note+pages}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{issn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{periodical}{%
+\usebibmacro{bibindex}%
+\usebibmacro{begentry}%
+\usebibmacro{author/editor+others/translator+others}%
+\setunit{\labelnamepunct}\newblock
+\usebibmacro{title}%
+\newunit
+\printlist{language}%
+\newunit\newblock
+\usebibmacro{byauthor}%
+\newunit\newblock
+\usebibmacro{bytranslator+others}%
+\newunit\newblock
+\printfield{version}%
+\newunit\newblock
+%  \usebibmacro{in:}%                         We don't use "In: " before journal titles
+\usebibmacro{journal+issuetitle}%
+\newunit
+\usebibmacro{byeditor+others}%
+\newunit\newblock%                          \newblock ensures period before pages
+\usebibmacro{note+pages}%
+\newunit\newblock
+\iftoggle{bbx:isbn}
+{\printfield{issn}}
+{}%
+\newunit\newblock
+\usebibmacro{doi+eprint+url}%
+\newunit\newblock
+\usebibmacro{addendum+pubstate}%
+\setunit{\bibpagerefpunct}\newblock
+\usebibmacro{pageref}%
+\newunit\newblock
+\iftoggle{bbx:related}
+{\usebibmacro{related:init}%
+\usebibmacro{related}}
+{}%
+\usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \setunit{\addspace}%                         crucial difference from standard.bbx: space and then (Series + number)
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  % \newunit\newblock                         commented by LSP
+  % \usebibmacro{chapter+pages}%
+  % \newunit
+  % \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+ \DeclareBibliographyDriver{incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \ifnameundef{editor}
+    {\setunit{\addspace}}
+    {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
+  \usebibmacro{maintitle+booktitle}%
+  \setunit{\addcomma\space}
+  \printfield{edition}%
+  \setunit{\addcomma\space}
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \setunit{\addcomma\space}
+  \printfield{volumes}%
+  \setunit{\addspace}%
+  \usebibmacro{series+number}%
+  \setunit{\addcomma\space}
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \ifnameundef{editor}
+    {\setunit{\addspace}}
+    {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
+  \usebibmacro{maintitle+booktitle}%
+  \setunit{\addcomma\space}
+  \printfield{edition}%
+  \setunit{\addcomma\space}
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \setunit{\addcomma\space}
+  \printfield{volumes}%
+  \setunit{\addspace}%
+  \usebibmacro{series+number}%
+  \setunit{\addcomma\space}
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+ 
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+location+type+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{unpublished}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+date}%
+  \newunit\newblock
+  \iftoggle{bbx:url}
+    {\usebibmacro{url+urldate}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+	
diff --git a/Master/texmf-dist/tex/xelatex/langsci/biblatex-sp-unified.bbx b/Master/texmf-dist/tex/xelatex/langsci/biblatex-sp-unified.bbx
deleted file mode 100644
index 84d10be4588..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/biblatex-sp-unified.bbx
+++ /dev/null
@@ -1,562 +0,0 @@
-% Modified by LSP, Thu Jul 31 22:36:02 CEST 2014
-\ProvidesFile{sp-biblatex.bbx}
-
-% NB: The Unified Style Sheet wants abbreviated "ed(s)", "edn". But using the abbreviate option also abbreviates the names of months. But then dateabbrev=false restores the long names of months
-% biblatex has a "useprefix" option, which makes "von" count for alphabetization; the Unified Stylesheet does not want that, so it is important that this option be disabled (even if an author tries to set it to true)
-
-\ExecuteBibliographyOptions{labeldate,sorting=nyt,abbreviate,dateabbrev=false,useprefix=false}
-
-% biblatex by default calls biblatex.def, we add to this authoryear.bbx, which in turn loads standard.bbx. So, sp-biblatex.bbx is built on top of those styles; once authoryear.bbx is loaded, we tell it not to put in dashes for repeated authors (in accordance with the Unified Stylesheet)
-
-\RequireBibliographyStyle{authoryear}
-\ExecuteBibliographyOptions{dashed=false}
-
-% Formatting directives for name lists
-% ------------------------------------------------------------------
-%
-% In biblatex.def, there are name formats defined: first-last, last-first, last-first/first-last. They could be simplified (we don't need provisions for using initials only, since the Unified Style doesn't do that), but since biblatex.def is loaded automatically, there's no point. The name formats call bibmacros that figure out how to order the internal of name components. These are re-defined here to make sure that "von" is treated as part of the last name (it still doesn't count for sorting -- which is controlled by the \useprefix package option)
-% name:last is used to produce citation labels
-% name:last-first is used to produce the first author's name listing in the alphabetical bibliography
-
-% Also moved the Jr part to after the first name and inserted another comma, because the Unified Stylesheet disagrees with standard.bbx: it wants "Jr." not to be treated as part of the last name.
-
-% The macros here get 4 arguments passed to them. They are: #1 last name, #2 first name, #3 von, #4 Jr.
-
-\renewbibmacro*{name:last}[4]{%				
-     \usebibmacro{name:delim}{#3#1}%
-     \usebibmacro{name:hook}{#3#1}%
-     \ifblank{#3}
-       {}
-       {\ifcapital
-          {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
-          {\mkbibnameprefix{#3}\isdot}%
-        \ifpunctmark{'}{}{\bibnamedelimc}}%
-  \mkbibnamelast{#1}}%
-  
-\renewbibmacro*{name:last-first}[4]{%      
-     \usebibmacro{name:delim}{#3#1}%
-     \usebibmacro{name:hook}{#3#1}%
-     \ifblank{#3}{}{%
-	   \mkbibnameprefix{#3}\isdot%
-       \ifpunctmark{'}{}{\bibnamedelimc}}%
-     \mkbibnamelast{#1}\isdot
-     \ifblank{#2}{}{\addcomma\bibnamedelimd\mkbibnamefirst{#2}\isdot}%
-     \ifblank{#4}{}{\addcomma\bibnamedelimd\mkbibnameaffix{#4}\isdot}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Various bibmacros used in producing the bibliography
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\renewbibmacro*{date+extrayear}{%
-  \iffieldundef{labelyear}
-    {}
-    {\printtext{\printdateextralabel}}}%     Took out the parentheses around the year
-
-\renewbibmacro*{author}{%
-  \ifboolexpr{
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{author}}
-  }
-    {\usebibmacro{bbx:dashcheck}
-       {\bibnamedash}
-       {\usebibmacro{bbx:savehash}%
-        \printnames{author}%
-  \iffieldundef{authortype}
-    {\newunit}%                               period instead of space
-    {\setunit{\addcomma\space}}}%
-     \iffieldundef{authortype}
-       {}
-       {\usebibmacro{authorstrg}%
-  \newunit}}%                                 period instead of space
-    {\global\undef\bbx@lasthash
-     \usebibmacro{labeltitle}%
-     \newunit}%                               period instead of space
-  \usebibmacro{date+extrayear}}
-
-\renewbibmacro*{editor}{%
-  \usebibmacro{bbx:editor}{editorstrg}}
-\renewbibmacro*{editor+others}{%
-  \usebibmacro{bbx:editor}{editor+othersstrg}}
-\renewbibmacro*{bbx:editor}[1]{%
-  \ifboolexpr{
-    test \ifuseeditor
-    and
-    not test {\ifnameundef{editor}}
-  }
-    {\usebibmacro{bbx:dashcheck}
-       {\bibnamedash}
-       {\printnames{editor}%
-  \setunit{\addspace}%
-  \usebibmacro{bbx:savehash}}%
-     \printtext[parens]{\usebibmacro{#1}}%
-     \clearname{editor}%
-     \newunit}%                                         period instead of space
-    {\global\undef\bbx@lasthash
-     \usebibmacro{labeltitle}%
-     \newunit}%                                         period instead of space
-  \usebibmacro{date+extrayear}}
-
-\renewbibmacro*{translator}{%
-  \usebibmacro{bbx:translator}{translatorstrg}}
-\renewbibmacro*{translator+others}{%
-  \usebibmacro{bbx:translator}{translator+othersstrg}}
-\renewbibmacro*{bbx:translator}[1]{%
-  \ifboolexpr{
-    test \ifusetranslator
-    and
-    not test {\ifnameundef{translator}}
-  }
-    {\usebibmacro{bbx:dashcheck}
- ts      {\bibnamedash}
-       {\printnames{translator}%
-  \setunit{\addcomma\space}%
-  \usebibmacro{bbx:savehash}}%
-     \usebibmacro{translator+othersstrg}%
-     \clearname{translator}%
-     \newunit}%                                     period instead of space
-    {\global\undef\bbx@lasthash
-     \usebibmacro{labeltitle}%
-     \newunit}%                                     period instead of space
-  \usebibmacro{date+extrayear}}
-
-\renewbibmacro*{journal}{%
-  \iffieldundef{journaltitle}
-    {}
-    {\printtext{%
-       \printfield{journaltitle}%
-       \setunit{\subtitlepunct}%
-       \printfield{journalsubtitle}}}}
-
-\renewbibmacro*{volume+number+eid}{%
-  \printfield{volume}%
-%  \setunit*{\adddot}%
-  \printfield[parens]{number}%        parentheses instead of dot before issue number
-  \setunit{\addcomma\space}%
-  \printfield{eid}}
-
-% Because of the weird format "3 May, 2007" specified in the Unified Stylesheet for URL access dates, we need a special way to format the urldate
-  
-\newcommand{\mkbibdateunified}[3]{% Year-Month-Day as input --> xx Month, Year
-  \iffieldundef{#3}
-    {}
-    {\stripzeros{\thefield{#3}}%
-     \nobreakspace}%
-  \iffieldundef{#2}
-    {\iffieldundef{#1}%
-      {}%
-      {\stripzeros{\thefield{#1}}}}%
-    {\mkbibmonth{\thefield{#2}}%
-     \iffieldundef{#1}%
-      {}%
-      {\iffieldundef{#3}%
-           {}%
-           {,}%
-         \space\stripzeros{\thefield{#1}}}%
-    }%
-  }% 
-
-\renewbibmacro*{url+urldate}{%
-  \printfield{url}%
-  \iffieldundef{urlyear}%
-  	{}%
-  	{\setunit*{\addspace}%
-     \printtext[parens]{\mkbibdateunified{urlyear}{urlmonth}{urlday}}}%
-  }
-
-\renewbibmacro*{series+number}{%
-  \iffieldundef{series}
-    {}
-    {\printtext[parens]{%
-      \printfield{series}%
-      \setunit*{\addspace}%
-      \printfield{number}}%
-    }}
-
-\renewbibmacro*{byeditor+others}{%
-  \ifnameundef{editor}
-    {}
-    {\printnames[byeditor]{editor}%
-     \setunit{\addspace}%
-     \printtext[parens]{\usebibmacro{editor+othersstrg}}%  putting (ed.) or (eds.) after editors of books
-     \clearname{editor}%
-     \newunit}%
-  \usebibmacro{byeditorx}%
-  \usebibmacro{bytranslator+others}}
-
-\renewbibmacro*{chapter+pages}{%
-  \iffieldundef{chapter}%
-  {}%
-  {\printfield{chapter}%
-  \setunit{\addcomma\space}}%
-  \printfield{pages}%
-  \newunit}
-
-\renewbibmacro*{note+pages}{%
-  \iffieldundef{note}%
-  {}%
-  {\printfield{note}%
-  \setunit{\addcomma\space}}%
-  \printfield{pages}%
-  \newunit}
-
-\newbibmacro*{institution+location+type+date}{%
-  \printlist{location}%
-  \iflistundef{institution}
-    {}
-    {\setunit*{\addcolon\space}}%
-  \printlist{institution}%
-  \setunit{\addspace}%
-  \printfield{type}%
-  \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-  \newunit}
-
-% The following is a hack to satisfy the Unified Stylesheet's decision to give the edition right after the OED as used as a sortlabel.
-
-\renewbibmacro*{labeltitle}{%
-  \iffieldundef{label}
-    {\iffieldundef{shorttitle}
-       {\printfield{title}%
-        \setunit{\addcomma\space}%     Here it comes, preparing for the edition
-        \printfield{edition}%          Here's the edition
-        \clearfield{title}%
-        \clearfield{edition}}%         Clearing the edition field, so it's not printed again below
-       {\printfield[title]{shorttitle}}}
-    {\printfield{label}}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Punctuation & formatting
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% This gets rid of the Oxford comma in name lists and uses the ampersand rather than "and":
-
-\renewcommand*{\finalnamedelim}{\addspace\&\addspace}     
-\renewcommand*{\finallistdelim}{\addspace\&\addspace}   
-
-% no colon after "In" in incollection entries (overriding biblatex.def):
-
-\renewcommand{\intitlepunct}{\addspace}  
-
-\renewcommand{\subtitlepunct}{\addcolon\space}
-\renewcommand*{\bibpagespunct}{\newunitpunct}  % No comma before pages, just the usual new unit period
-
-\DefineBibliographyStrings{english}{%
-  edition          = {edn\adddot},
-}
-
-% basically everything is in sentence case, other than journals and book series (recurring titles)
-\DeclareFieldFormat[article,periodical,book,thesis,incollection,unpublished,inproceedings]{titlecase}{\MakeSentenceCase*{#1}}%
-
-% No quotes around titles
-\DeclareFieldFormat[article,periodical,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{#1}
-
-% Just like book titles, thesis titles are in italics
-\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
-
-\DeclareFieldFormat{pages}{#1}     % no pp. prefix, took \mkpageprefix out [kvf]
-\DeclareFieldFormat{doi}{\doi{#1}}
-\DeclareFieldFormat{url}{\url{#1}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% The bibliography drivers, specifying the formats of each type of entry in the bibliography
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% First, the entry types used in the Unified Test Bibliography. Could rely on standard.bbx for all others as a fallback.
-
-% For the article type, the only departure from standard.bbx is that 
-% we don't use a literal "In: " before the journal title; other formatting
-% departures are done in the format specs and bibmacros
-
-\DeclareBibliographyDriver{article}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/translator+others}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{bytranslator+others}%
-  \newunit\newblock
-  \printfield{version}%
-  \newunit\newblock
-%  \usebibmacro{in:}%                         We don't use "In: " before journal titles
-  \usebibmacro{journal+issuetitle}%
-  \newunit
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock%                          \newblock ensures period before pages
-  \usebibmacro{note+pages}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{issn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-  \usebibmacro{addendum+pubstate}%
-  \setunit{\bibpagerefpunct}\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
-    {}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{periodical}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{author/editor+others/translator+others}%
-\setunit{\labelnamepunct}\newblock
-\usebibmacro{title}%
-\newunit
-\printlist{language}%
-\newunit\newblock
-\usebibmacro{byauthor}%
-\newunit\newblock
-\usebibmacro{bytranslator+others}%
-\newunit\newblock
-\printfield{version}%
-\newunit\newblock
-%  \usebibmacro{in:}%                         We don't use "In: " before journal titles
-\usebibmacro{journal+issuetitle}%
-\newunit
-\usebibmacro{byeditor+others}%
-\newunit\newblock%                          \newblock ensures period before pages
-\usebibmacro{note+pages}%
-\newunit\newblock
-\iftoggle{bbx:isbn}
-{\printfield{issn}}
-{}%
-\newunit\newblock
-\usebibmacro{doi+eprint+url}%
-\newunit\newblock
-\usebibmacro{addendum+pubstate}%
-\setunit{\bibpagerefpunct}\newblock
-\usebibmacro{pageref}%
-\newunit\newblock
-\iftoggle{bbx:related}
-{\usebibmacro{related:init}%
-\usebibmacro{related}}
-{}%
-\usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{book}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/editor+others/translator+others}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{maintitle+title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{edition}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \setunit{\addspace}%                         crucial difference from standard.bbx: space and then (Series + number)
-  \usebibmacro{series+number}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publisher+location+date}%
-  % \newunit\newblock                         commented by LSP
-  % \usebibmacro{chapter+pages}%
-  % \newunit
-  % \printfield{pagetotal}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{isbn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-  \usebibmacro{addendum+pubstate}%
-  \setunit{\bibpagerefpunct}\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
-    {}%
-  \usebibmacro{finentry}}
-
- \DeclareBibliographyDriver{incollection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/translator+others}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{in:}%
-  \ifnameundef{editor}
-    {\setunit{\addspace}}
-    {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
-  \usebibmacro{maintitle+booktitle}%
-  \setunit{\addcomma\space}
-  \printfield{edition}%
-  \setunit{\addcomma\space}
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \setunit{\addcomma\space}
-  \printfield{volumes}%
-  \setunit{\addspace}%
-  \usebibmacro{series+number}%
-  \setunit{\addcomma\space}
-  \usebibmacro{chapter+pages}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publisher+location+date}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{isbn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-  \usebibmacro{addendum+pubstate}%
-  \setunit{\bibpagerefpunct}\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
-    {}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{inproceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/translator+others}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{in:}%
-  \ifnameundef{editor}
-    {\setunit{\addspace}}
-    {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
-  \usebibmacro{maintitle+booktitle}%
-  \setunit{\addcomma\space}
-  \printfield{edition}%
-  \setunit{\addcomma\space}
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \setunit{\addcomma\space}
-  \printfield{volumes}%
-  \setunit{\addspace}%
-  \usebibmacro{series+number}%
-  \setunit{\addcomma\space}
-  \usebibmacro{chapter+pages}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \printlist{organization}%
-  \newunit
-  \usebibmacro{publisher+location+date}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{isbn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-  \usebibmacro{addendum+pubstate}%
-  \setunit{\bibpagerefpunct}\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
-    {}%
-  \usebibmacro{finentry}}
- 
-\DeclareBibliographyDriver{thesis}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{institution+location+type+date}%
-  \newunit\newblock
-  \usebibmacro{chapter+pages}%
-  \newunit
-  \printfield{pagetotal}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{isbn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-  \usebibmacro{addendum+pubstate}%
-  \setunit{\bibpagerefpunct}\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
-    {}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{unpublished}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \printfield{howpublished}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{location+date}%
-  \newunit\newblock
-  \iftoggle{bbx:url}
-    {\usebibmacro{url+urldate}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{addendum+pubstate}%
-  \setunit{\bibpagerefpunct}\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
-    {}%
-  \usebibmacro{finentry}}
-	
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx b/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx
new file mode 100644
index 00000000000..12638193071
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx
@@ -0,0 +1,289 @@
+\ProvidesFile{sp-authoryear-comp.cbx}
+
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,autocite=inline}
+% disabled sortcites option, since it was sorting by name, instead of
+% year, and we often want to keep citations in the order chosen by the
+% author
+\newbool{cbx:parens}
+
+\newbibmacro*{cite:init}{%
+  \ifnumless{\value{multicitecount}}{2}
+    {\global\boolfalse{cbx:parens}%
+     \global\undef\cbx@lasthash
+     \global\undef\cbx@lastyear}
+    {\iffieldundef{prenote}
+       {}
+       {\global\undef\cbx@lasthash
+	\global\undef\cbx@lastyear}}}
+
+\newbibmacro*{cite:reinit}{%
+  \global\undef\cbx@lasthash
+  \global\undef\cbx@lastyear}
+
+\newbibmacro*{cite}{% Based on cite bib macro from authoryear-comp.cbx
+  \iffieldundef{shorthand}
+    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+       {\printtext[bibhyperref]{% Include labelname in hyperlink
+          \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
+          \usebibmacro{cite:label}%
+          \setunit{\addspace}%
+          \usebibmacro{cite:labelyear+extrayear}}%
+          \usebibmacro{cite:reinit}}
+       {\iffieldequals{namehash}{\cbx@lasthash}
+          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+             {\setunit{\addcomma}%
+              \usebibmacro{cite:extrayear}}
+             {\setunit{\compcitedelim}%
+              \usebibmacro{cite:labelyear+extrayear}%
+              \savefield{labelyear}{\cbx@lastyear}}}
+          {\printtext[bibhyperref]{% Include labelname in hyperlink
+             \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
+             \printnames{labelname}%
+             \setunit{\nameyeardelim}%
+             \usebibmacro{cite:labelyear+extrayear}}%
+             \savefield{namehash}{\cbx@lasthash}%
+             \savefield{labelyear}{\cbx@lastyear}}}}
+    {\usebibmacro{cite:shorthand}%
+     \usebibmacro{cite:reinit}}%
+  \setunit{\multicitedelim}}
+
+\newbibmacro*{citeyear}{%
+  \iffieldundef{shorthand}
+    {\iffieldundef{labelyear}
+       {\usebibmacro{cite:label}%
+        \usebibmacro{cite:reinit}}
+       {\iffieldequals{namehash}{\cbx@lasthash}
+          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+             {\setunit{\addcomma}%
+              \usebibmacro{cite:extrayear}}
+             {\setunit{\compcitedelim}%
+              \usebibmacro{cite:labelyear+extrayear}%
+              \savefield{labelyear}{\cbx@lastyear}}}
+          {\usebibmacro{cite:labelyear+extrayear}%
+           \savefield{namehash}{\cbx@lasthash}%
+           \savefield{labelyear}{\cbx@lastyear}}}}
+    {\usebibmacro{cite:shorthand}%
+     \usebibmacro{cite:reinit}}%
+  \setunit{\multicitedelim}}
+
+\renewbibmacro*{textcite}{% Based on textcite bib macro from authoryear-comp.cbx
+  \iffieldequals{namehash}{\cbx@lasthash}
+    {\iffieldundef{shorthand}
+       {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+          {\setunit{\addcomma}%
+           \usebibmacro{cite:extrayear}}
+          {\setunit{\compcitedelim}%
+           \usebibmacro{cite:labelyear+extrayear}%
+           \savefield{labelyear}{\cbx@lastyear}}}
+       {\setunit{\compcitedelim}%
+        \usebibmacro{cite:shorthand}%
+        \global\undef\cbx@lastyear}}
+    {\ifnameundef{labelname}
+       {\printtext[bibhyperref]{% Include labelname in hyperlink
+          \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
+          \iffieldundef{shorthand}
+            {\usebibmacro{cite:label}%
+             \setunit{%
+               \global\booltrue{cbx:parens}%
+               \addspace\bibopenparen}%
+             \ifnumequal{\value{citecount}}{1}
+               {\usebibmacro{prenote}}
+               {}%
+             \usebibmacro{cite:labelyear+extrayear}}
+            {\usebibmacro{cite:shorthand}}%
+          \ifthenelse{\iffieldundef{postnote}\AND
+                      \(\value{multicitetotal}=0\AND\value{citetotal}=1\)}
+            {\bibcloseparen% Include closing parenthesis in hyperlink
+             \global\boolfalse{cbx:parens}}
+            {}}}
+       {\printtext[bibhyperref]{% Include labelname in hyperlink
+          \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
+          \printnames{labelname}%
+          \setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}
+            {\usebibmacro{prenote}}
+            {}%
+          \iffieldundef{shorthand}
+            {\iffieldundef{labelyear}
+               {\usebibmacro{cite:label}}
+               {\usebibmacro{cite:labelyear+extrayear}}%
+             \savefield{labelyear}{\cbx@lastyear}}
+            {\usebibmacro{cite:shorthand}%
+             \global\undef\cbx@lastyear}%
+          \ifthenelse{\iffieldundef{postnote}\AND
+                      \(\value{multicitetotal}=0\AND\value{citetotal}=1\)}
+            {\bibcloseparen% Include closing parenthesis in hyperlink
+             \global\boolfalse{cbx:parens}}
+            {}}%
+          \savefield{namehash}{\cbx@lasthash}}}%
+  \setunit{%
+    \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}%
+    \multicitedelim}}
+
+\newbibmacro*{cite:shorthand}{%
+  \printtext[bibhyperref]{\printfield{shorthand}}}
+
+\newbibmacro*{cite:label}{%
+  \iffieldundef{label}
+    {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+    {\printtext[bibhyperref]{\printfield{label}}}}
+
+\newbibmacro*{cite:labelyear+extrayear}{%
+  \iffieldundef{labelyear}
+    {}
+    {\printtext[bibhyperref]{%
+       \printfield{labelyear}%
+       \printfield{extrayear}}}}
+
+\newbibmacro*{cite:extrayear}{%
+  \iffieldundef{extrayear}
+    {}
+    {\printtext[bibhyperref]{\printfield{extrayear}}}}
+
+\newbibmacro*{textcite:postnote}{%
+  \usebibmacro{postnote}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+    {\setunit{}%
+     \printtext{%
+       \ifbool{cbx:parens}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}}}
+    {\setunit{%
+       \ifbool{cbx:parens}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}%
+       \multicitedelim}}}
+
+\DeclareCiteCommand{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\textcite}
+  {\usebibmacro{cite:init}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{textcite}}
+  {}
+  {\usebibmacro{textcite:postnote}}
+
+\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
+                                     {\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+
+\renewcommand*{\nameyeardelim}{\addspace} 
+
+\let\citealt\cite
+\let\citet\textcite
+\let\Citet\Textcite
+\newcommand{\pgcitep}[2]{(\cite{#1}:~#2)}
+\newcommand{\pgcitealt}[2]{\cite{#1}:~#2}
+\newcommand{\pgcitet}[2]{\citeauthor{#1} (\citeyear{#1}:~#2)}
+\newcommand{\pgposscitet}[2]{\citeauthor{#1}'s (\citeyear{#1}:~#2)}
+\let\citep\parencite
+
+\DeclareCiteCommand{\citeauthor}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\ifciteindex
+     {\indexnames{labelname}}
+     {}%
+   \printtext[bibhyperref]{\printnames{labelname}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\citeyear}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printfield[bibhyperref]{year}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+  
+\DeclareCiteCommand{\citeyearpar}[\mkbibparens]
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printfield[bibhyperref]{year}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\posscitet}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}}
+  {\printtext[bibhyperref]{\printnames{labelname}'s \printfield[parens]{year}}}
+  {}
+  {}
+
+\DeclareCiteCommand{\possciteauthor}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}}
+  {\printtext[bibhyperref]{\printnames{labelname}'s}}
+  {}
+  {}
+  
+\renewcommand*{\multicitedelim}{\addcomma\space}
+
+ \endinput
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def b/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
index b97954e3b1f..65f14ded6e2 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
@@ -4,7 +4,7 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\input{\seriesinfopath colors.def} % color definitions
+\input{\seriesinfopath langsci-colors.def} % color definitions
 
 \newcommand{\calseries}{calseries}
 \newcommand{\eotms}{eotms}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls b/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
index a346fbcf697..0d43722dcba 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
+++ b/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%      File: langscibook.cls
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2016-05-09 11:11:11 UTC
+%%      Date: 2016-05-10 11:11:11 UTC
 %%   Purpose: This file defines the basic document class 
 %%            for books published with Language Science Press.
 %%  Language: LaTeX
@@ -766,7 +766,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \usepackage{xcolor}
-\input{\seriesinfopath series.def} % \lsSeriesColor, \lsSeriesTitle, \lsISSN and colors are defined here
+\input{\seriesinfopath langsci-series.def} % \lsSeriesColor, \lsSeriesTitle, \lsISSN and colors are defined here
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -1233,8 +1233,8 @@ is, or will remain, accurate or appropriate.
 \iflsBiblatex	% BibLaTeX
 	\usepackage[
 		natbib=true,
-		style=\bstpath biblatex-sp-unified,
-		citestyle=\bstpath sp-authoryear-comp,
+		style=\bstpath biblatex-langsci-unified,
+		citestyle=\bstpath langsci-authoryear-comp,
 		%refsection=chapter,
 		maxbibnames=99,
 		isbn=false,
diff --git a/Master/texmf-dist/tex/xelatex/langsci/sp-authoryear-comp.cbx b/Master/texmf-dist/tex/xelatex/langsci/sp-authoryear-comp.cbx
deleted file mode 100644
index 12638193071..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/sp-authoryear-comp.cbx
+++ /dev/null
@@ -1,289 +0,0 @@
-\ProvidesFile{sp-authoryear-comp.cbx}
-
-\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,autocite=inline}
-% disabled sortcites option, since it was sorting by name, instead of
-% year, and we often want to keep citations in the order chosen by the
-% author
-\newbool{cbx:parens}
-
-\newbibmacro*{cite:init}{%
-  \ifnumless{\value{multicitecount}}{2}
-    {\global\boolfalse{cbx:parens}%
-     \global\undef\cbx@lasthash
-     \global\undef\cbx@lastyear}
-    {\iffieldundef{prenote}
-       {}
-       {\global\undef\cbx@lasthash
-	\global\undef\cbx@lastyear}}}
-
-\newbibmacro*{cite:reinit}{%
-  \global\undef\cbx@lasthash
-  \global\undef\cbx@lastyear}
-
-\newbibmacro*{cite}{% Based on cite bib macro from authoryear-comp.cbx
-  \iffieldundef{shorthand}
-    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
-       {\printtext[bibhyperref]{% Include labelname in hyperlink
-          \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
-          \usebibmacro{cite:label}%
-          \setunit{\addspace}%
-          \usebibmacro{cite:labelyear+extrayear}}%
-          \usebibmacro{cite:reinit}}
-       {\iffieldequals{namehash}{\cbx@lasthash}
-          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
-             {\setunit{\addcomma}%
-              \usebibmacro{cite:extrayear}}
-             {\setunit{\compcitedelim}%
-              \usebibmacro{cite:labelyear+extrayear}%
-              \savefield{labelyear}{\cbx@lastyear}}}
-          {\printtext[bibhyperref]{% Include labelname in hyperlink
-             \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
-             \printnames{labelname}%
-             \setunit{\nameyeardelim}%
-             \usebibmacro{cite:labelyear+extrayear}}%
-             \savefield{namehash}{\cbx@lasthash}%
-             \savefield{labelyear}{\cbx@lastyear}}}}
-    {\usebibmacro{cite:shorthand}%
-     \usebibmacro{cite:reinit}}%
-  \setunit{\multicitedelim}}
-
-\newbibmacro*{citeyear}{%
-  \iffieldundef{shorthand}
-    {\iffieldundef{labelyear}
-       {\usebibmacro{cite:label}%
-        \usebibmacro{cite:reinit}}
-       {\iffieldequals{namehash}{\cbx@lasthash}
-          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
-             {\setunit{\addcomma}%
-              \usebibmacro{cite:extrayear}}
-             {\setunit{\compcitedelim}%
-              \usebibmacro{cite:labelyear+extrayear}%
-              \savefield{labelyear}{\cbx@lastyear}}}
-          {\usebibmacro{cite:labelyear+extrayear}%
-           \savefield{namehash}{\cbx@lasthash}%
-           \savefield{labelyear}{\cbx@lastyear}}}}
-    {\usebibmacro{cite:shorthand}%
-     \usebibmacro{cite:reinit}}%
-  \setunit{\multicitedelim}}
-
-\renewbibmacro*{textcite}{% Based on textcite bib macro from authoryear-comp.cbx
-  \iffieldequals{namehash}{\cbx@lasthash}
-    {\iffieldundef{shorthand}
-       {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
-          {\setunit{\addcomma}%
-           \usebibmacro{cite:extrayear}}
-          {\setunit{\compcitedelim}%
-           \usebibmacro{cite:labelyear+extrayear}%
-           \savefield{labelyear}{\cbx@lastyear}}}
-       {\setunit{\compcitedelim}%
-        \usebibmacro{cite:shorthand}%
-        \global\undef\cbx@lastyear}}
-    {\ifnameundef{labelname}
-       {\printtext[bibhyperref]{% Include labelname in hyperlink
-          \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
-          \iffieldundef{shorthand}
-            {\usebibmacro{cite:label}%
-             \setunit{%
-               \global\booltrue{cbx:parens}%
-               \addspace\bibopenparen}%
-             \ifnumequal{\value{citecount}}{1}
-               {\usebibmacro{prenote}}
-               {}%
-             \usebibmacro{cite:labelyear+extrayear}}
-            {\usebibmacro{cite:shorthand}}%
-          \ifthenelse{\iffieldundef{postnote}\AND
-                      \(\value{multicitetotal}=0\AND\value{citetotal}=1\)}
-            {\bibcloseparen% Include closing parenthesis in hyperlink
-             \global\boolfalse{cbx:parens}}
-            {}}}
-       {\printtext[bibhyperref]{% Include labelname in hyperlink
-          \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
-          \printnames{labelname}%
-          \setunit{%
-            \global\booltrue{cbx:parens}%
-            \addspace\bibopenparen}%
-          \ifnumequal{\value{citecount}}{1}
-            {\usebibmacro{prenote}}
-            {}%
-          \iffieldundef{shorthand}
-            {\iffieldundef{labelyear}
-               {\usebibmacro{cite:label}}
-               {\usebibmacro{cite:labelyear+extrayear}}%
-             \savefield{labelyear}{\cbx@lastyear}}
-            {\usebibmacro{cite:shorthand}%
-             \global\undef\cbx@lastyear}%
-          \ifthenelse{\iffieldundef{postnote}\AND
-                      \(\value{multicitetotal}=0\AND\value{citetotal}=1\)}
-            {\bibcloseparen% Include closing parenthesis in hyperlink
-             \global\boolfalse{cbx:parens}}
-            {}}%
-          \savefield{namehash}{\cbx@lasthash}}}%
-  \setunit{%
-    \ifbool{cbx:parens}
-      {\bibcloseparen\global\boolfalse{cbx:parens}}
-      {}%
-    \multicitedelim}}
-
-\newbibmacro*{cite:shorthand}{%
-  \printtext[bibhyperref]{\printfield{shorthand}}}
-
-\newbibmacro*{cite:label}{%
-  \iffieldundef{label}
-    {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
-    {\printtext[bibhyperref]{\printfield{label}}}}
-
-\newbibmacro*{cite:labelyear+extrayear}{%
-  \iffieldundef{labelyear}
-    {}
-    {\printtext[bibhyperref]{%
-       \printfield{labelyear}%
-       \printfield{extrayear}}}}
-
-\newbibmacro*{cite:extrayear}{%
-  \iffieldundef{extrayear}
-    {}
-    {\printtext[bibhyperref]{\printfield{extrayear}}}}
-
-\newbibmacro*{textcite:postnote}{%
-  \usebibmacro{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
-    {\setunit{}%
-     \printtext{%
-       \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}}}
-    {\setunit{%
-       \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}%
-       \multicitedelim}}}
-
-\DeclareCiteCommand{\cite}
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand*{\cite}
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{citeyear}}
-  {}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\parencite}[\mkbibparens]
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand*{\parencite}[\mkbibparens]
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{citeyear}}
-  {}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\footcite}[\mkbibfootnote]
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\textcite}
-  {\usebibmacro{cite:init}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{textcite}}
-  {}
-  {\usebibmacro{textcite:postnote}}
-
-\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
-                                     {\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\textcites}{\textcite}{}
-
-\renewcommand*{\nameyeardelim}{\addspace} 
-
-\let\citealt\cite
-\let\citet\textcite
-\let\Citet\Textcite
-\newcommand{\pgcitep}[2]{(\cite{#1}:~#2)}
-\newcommand{\pgcitealt}[2]{\cite{#1}:~#2}
-\newcommand{\pgcitet}[2]{\citeauthor{#1} (\citeyear{#1}:~#2)}
-\newcommand{\pgposscitet}[2]{\citeauthor{#1}'s (\citeyear{#1}:~#2)}
-\let\citep\parencite
-
-\DeclareCiteCommand{\citeauthor}
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}
-  {\ifciteindex
-     {\indexnames{labelname}}
-     {}%
-   \printtext[bibhyperref]{\printnames{labelname}}}
-  {\multicitedelim}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\citeyear}
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}
-  {\printfield[bibhyperref]{year}}
-  {\multicitedelim}
-  {\usebibmacro{postnote}}
-  
-\DeclareCiteCommand{\citeyearpar}[\mkbibparens]
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}
-  {\printfield[bibhyperref]{year}}
-  {\multicitedelim}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\posscitet}
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}}
-  {\printtext[bibhyperref]{\printnames{labelname}'s \printfield[parens]{year}}}
-  {}
-  {}
-
-\DeclareCiteCommand{\possciteauthor}
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}}
-  {\printtext[bibhyperref]{\printnames{labelname}'s}}
-  {}
-  {}
-  
-\renewcommand*{\multicitedelim}{\addcomma\space}
-
- \endinput
-- 
cgit v1.2.3