10 files changed, 107 insertions, 50 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-mla/CHANGES b/Master/texmf-dist/doc/latex/biblatex-mla/CHANGES
index 4872d0e4454..f55be3776ad 100644
--- a/Master/texmf-dist/doc/latex/biblatex-mla/CHANGES
+++ b/Master/texmf-dist/doc/latex/biblatex-mla/CHANGES
@@ -1,3 +1,10 @@
+Changelog for version 1.6
+- changes for compatibility with Biblatex 3.3+
+- changed behavior of "mancitepar", which now defaults to false
+- fixed buggy repetition of series field (hopefully)
+- an upcoming version will provide support for more entrytypes and reflect changes made 
+  in the 2016 MLA handbook
+
 Changelog for version 1.5:
 - changes for compatibility with Biblatex 2.5
 - added entrytypes @online, @inbook, @bookinbook
diff --git a/Master/texmf-dist/doc/latex/biblatex-mla/doc/biblatex-mla.pdf b/Master/texmf-dist/doc/latex/biblatex-mla/doc/biblatex-mla.pdf
index 3f9bb563bd0..fb35244419f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-mla/doc/biblatex-mla.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-mla/doc/biblatex-mla.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-mla/doc/biblatex-mla.tex b/Master/texmf-dist/doc/latex/biblatex-mla/doc/biblatex-mla.tex
index 5cadd3cc591..99b7ceae2d5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-mla/doc/biblatex-mla.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-mla/doc/biblatex-mla.tex
@@ -1,4 +1,4 @@
-% biblatex-mla.tex v1.5 2013/05/05
+% biblatex-mla.tex v1.6 2016/07/07
 % Maintained at <https://github.com/jmclawson/biblatex-mla/> by James Clawson.
 %
 % This material is subject to the LaTeX Project Public License. Feel free to improve, redistribute, and adapt to your own ends, as allowed by that license. (See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for license details.) For inclusion in future versions, please share improvements in formatting and MLA standards compliance back to James Clawson: <biblatex-mla@konx.net>.
@@ -89,7 +89,7 @@ citecolor=black,%
   url={\biblatexmlahome},
   author={James Clawson},
   email={biblatex-mla@konx.net},
-  revision={1.5},
+  revision={1.6},
   date={\today}}
 
 \hypersetup{%
@@ -285,6 +285,9 @@ citecolor=black,%
 
 % subsection examples (end)
 
+\section{Version Note}
+This minor update addresses compatibility concerns with \biblatex. It does not reflect changes in the 8\superscript{th} edition of the \emph{MLA Handbook}, published April 2016; an upcoming version of \biblatexmla will attend to those style changes.
+
 \section{Introduction}
 \label{int}
 
@@ -457,7 +460,7 @@ Insert the list of Works Cited.
 \subsection{Package Options}
 \label{mla:subsec:options}
 
-\Biblatexmla defaults to the recommendations established by the \mla{}, but there may be times when you need to change some of these options for publication or other uses. As such, a number of package options have been defined to change the functionality of \biblatexmla within reason.
+\Biblatexmla defaults to the recommendations established by the \mla{}, but there may be times when it is appropriate to change some of these options for publication or other uses. Package options change the default functionality of \biblatexmla.
 
 \begin{optionslist}
 \optionitem{autocite=footnote}
@@ -495,7 +498,7 @@ preamble:
 \end{quote}
 
 \optionitem{mladraft}
-When using \mla{} parenthetical citations, it is best practice to cite only as much as is necessary to avoid ambiguity. \Biblatexmla can flag consecutive citations to the same page range, allowing you to defer citations to the end. In draft mode, \biblatexmla will place a clover ($\clubsuit$) in the margin, along with a single footnote explanation. To use the tool outside of draft mode, set the \mycode{mladraft} option in your preamble to true; similarly, to avoid seeing these clovers and the footnote in draft mode, set the option to false:
+When using \mla{} parenthetical citations, it is best practice to cite only when necessary to avoid ambiguity. \Biblatexmla can flag consecutive citations to the same page range, allowing you to defer citations to the end. In draft mode, \biblatexmla will place a clover ($\clubsuit$) in the margin, along with a single footnote explanation. To use the tool outside of draft mode, set the \mycode{mladraft} option in your preamble to true; similarly, to avoid seeing these clovers and the footnote in draft mode, set the option to false:
 \begin{quote}
 	\begin{verbatim}
 		\usepackage[style=mla,mladraft=true]{biblatex}
@@ -511,7 +514,7 @@ Modeled after the implementation in biblatex-apa to suppress remote information
 \end{quote}
 
 \optionitem{showmedium}
-\Biblatexmla version 0.9 introduced support for the latest \mla{} style, defined in the 3\superscript{rd} edition of the \emph{Style Manual}, requiring the publication medium of each entry to be printed in the list of Works Cited. By default, \biblatexmla will do the same, using the \sty{howpublished} field. Turn off this option---and the other new changes from the 3\superscript{rd} edition---by setting the \mycode{showmedium} option to false:
+\Biblatexmla version 0.9 introduced support for the 3\superscript{rd} edition of the \emph{Style Manual}, requiring the publication medium of each entry to be printed in the list of Works Cited. By default, \biblatexmla will do the same, using the \sty{howpublished} field. Turn off this option---and the other new changes from the 3\superscript{rd} edition---by setting the \mycode{showmedium} option to false:
 \begin{quote}
 	\begin{verbatim}
 		\usepackage[style=mla,showmedium=false]{biblatex}
@@ -527,10 +530,10 @@ An entry with no defined \sty{howpublished} field will default either to a <Web>
 \end{quote}
 
 \optionitem{mancitepar}
-By default, the author trackers in \biblatexmla will reset with each paragraph in order to avoid confusing citations when much distance is likely to have passed from the previous citation. In effect, \biblatexmla silently calls the \cmd{mancite} command with each new paragraph. (See \tabref{use:cit:mancite} for the effects of \cmd{mancite}.) To turn off this option, disable the \mycode{mancitepar} package option:
+Although perhaps they should, the author trackers in \biblatexmla do not by default reset with each paragraph or page. As a result, shortened citations may be unclear when much distance has passed from previous, fuller citations. To avoid this ambiguity, the \cmd{mancite} command can be called before an unclear citation. (See \tabref{use:cit:mancite} for the effects of \cmd{mancite}.) Alternatively, consider asking \biblatexmla to silently call the \cmd{mancite} command with each new paragraph by enabling the \mycode{mancitepar} package option:
 \begin{quote}
 	\begin{verbatim}
-		\usepackage[style=mla,mancitepar=false]{biblatex}
+		\usepackage[style=mla,mancitepar=true]{biblatex}
 	\end{verbatim}	
 \end{quote}
 
@@ -542,9 +545,7 @@ By default, the author trackers in \biblatexmla will reset with each paragraph i
 
 % I lost my original documentation files, including original style files I created to maintain them, so I'm transitioning everything to Philipp Lehman's \sty{ltxdockit}. This part of the user guide, explaining how to create \sty{bibtex} entries for use with \biblatexmla, will be updated shortly. Until then, please see \S{} 4 (pages 7--20) of the previous version: \mylink{http://konx.net/biblatex-mla/biblatex-mla.pdf}.
 
-\biblatex (and, thus, \biblatexmla) uses \bibtex-style databases to manage the citations and list of works cited. While these databases are just flat text files, there are many good programs available to help you manage them. Zotero, for example, can export as \bibtex, as can Endnote and other commercial programs; each of these will nevertheless export with varying degrees of success. Standalone \bibtex managers such as JabRef and BibDesk use \sty{.bib} files as their native filetype and are much more reliable for managing your list of sources.
-
-Whether exporting from Zotero or another program, whether managing your .bib files in a standalone editor or manipulating them in a text editor, you will at some point have to know the fields available to \biblatexmla---especially as some of these are unique to \biblatex, and as I've had to repurpose some of the fields to suit \biblatexmla. 
+\biblatex (and, thus, \biblatexmla) uses \bibtex-style databases to manage the citations and list of works cited. While these databases are just flat text files, there are many good programs available to help manage them. Zotero, Endnote, and other commercial programs, for example, can export as \bibtex; each of these will nevertheless export with varying degrees of success. Standalone \bibtex managers such as JabRef and BibDesk use \sty{.bib} files as their native filetype and are much more reliable for managing your list of sources. Whether exporting from a program, managing .bib files in a standalone editor, or manipulating them in a text editor, it is necessary to be familiar with fields available to \biblatexmla---especially as some of these are unique \biblatex and \biblatexmla. 
 
 \subsection{Typical fields} % (fold)
 \label{sub:typical_fields}
@@ -557,7 +558,7 @@ The best way to acquaint oneself with \biblatexmla is to explore the included \s
 	\label{fig:example-book}
 \end{table}
 
-Using \biblatexmla will automatically format the list of works cited entries to follow the most recent guidelines outlined in the \emph{MLA Style Manual}. In addition to many of the standard fields one might expect to find, \biblatexmla is also capable of handling unusual fields, described below. For a fuller consideration of the fields supported by \biblatexmla, see the example files and consult the Biblatex manual.
+In addition to many of the standard fields one might expect to find, \biblatexmla is also capable of handling unusual fields, described below. For a fuller consideration of the fields supported by \biblatexmla, see the example files and consult the Biblatex manual.
 
 
 % \mlafullexample{douglas93aa}{The above entry, found in the \sty{.bib} file, outputs to the below entry in the list of works cited:} %Below are the different \sty{@types} and the fields available to them. Keep in mind that some of the fields in the \sty{@book} and \sty{@article} types (for example, \sty{nameaddon}, \sty{origyear}, and others) are also available in others where it makes sense; I don't repeat them here to save room.
@@ -570,7 +571,7 @@ Using \biblatexmla will automatically format the list of works cited entries to
 \begin{optionslist}
 	
 	\optionitem{crossref}
-	the \sty{key} of a parent source in which a shorter source is found. The \sty{crossref} field is handy to avoid spending time re-inputting similar data, but it is also useful for including \mla{}-style cross-references in the list of Works Cited. Keep in mind the problems inherent in using the \sty{crossref} field, outlined in section 2.4.1 of the \biblatex manual. In the future, \biblatexmla may provide further support for the \biblatex \sty{xref} field, making \sty{crossref} secondary in importance.
+	the \sty{key} of a parent source in which a shorter source is found. The \sty{crossref} field is handy to avoid spending time re-inputting similar data, but it is also useful for including \mla{}-style cross-references in the list of Works Cited. Keep in mind the problems of the \sty{crossref} field, explained in section 2.4.1 of the \biblatex manual.% In the future, \biblatexmla may provide further support for the \biblatex \sty{xref} field, making \sty{crossref} secondary in importance.
 	
 	\optionitem{shorttitle}
 	the shortened title to be printed in citations to disambiguate among multiple titles by one author. \Biblatexmla will only print this field in citations when necessary; when this field is not defined, \biblatexmla will use the whole of the \sty{title} field.
@@ -772,7 +773,7 @@ Using \biblatexmla will automatically format the list of works cited entries to
 \section{Meta}
 \subsection{License}
 
-\biblatexmla is copyrighted \textcopyright\ 2007--2013, by James Clawson. Permission is granted to copy, distribute, and modify this software under the terms of the \lppl, version 1.3: \mylink{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}.
+\biblatexmla is copyrighted \textcopyright\ 2007--2016, by James Clawson. Permission is granted to copy, distribute, and modify this software under the terms of the \lppl, version 1.3: \mylink{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}.
 
 \subsection[Feedback]{Feedback}
 \label{int:feb}
diff --git a/Master/texmf-dist/doc/latex/biblatex-mla/doc/citation-examples.pdf b/Master/texmf-dist/doc/latex/biblatex-mla/doc/citation-examples.pdf
index 44d8bd97254..e54d1511c5c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-mla/doc/citation-examples.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-mla/doc/citation-examples.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-mla/doc/citation-examples.tex b/Master/texmf-dist/doc/latex/biblatex-mla/doc/citation-examples.tex
index 4c14b7ccaf3..525a36d2ed2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-mla/doc/citation-examples.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-mla/doc/citation-examples.tex
@@ -5,6 +5,7 @@
 \setlength{\parindent}{0.5in}
 \usepackage[style=mla]{biblatex}
 \usepackage{hyperref}
+\usepackage{libertine}
 
 \addbibresource{samples.bib}
 
diff --git a/Master/texmf-dist/doc/latex/biblatex-mla/doc/example-book.pdf b/Master/texmf-dist/doc/latex/biblatex-mla/doc/example-book.pdf
new file mode 100644
index 00000000000..7c4c2bde6d5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-mla/doc/example-book.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-mla/doc/handbooksamplebib.pdf b/Master/texmf-dist/doc/latex/biblatex-mla/doc/handbooksamplebib.pdf
new file mode 100644
index 00000000000..ab6aecbb423
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-mla/doc/handbooksamplebib.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-mla/doc/handbooksamplebib.tex b/Master/texmf-dist/doc/latex/biblatex-mla/doc/handbooksamplebib.tex
new file mode 100644
index 00000000000..c0e20c09e70
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-mla/doc/handbooksamplebib.tex
@@ -0,0 +1,17 @@
+\documentclass{article}
+\usepackage[T1]{fontenc}
+\usepackage[american]{babel}
+\usepackage{csquotes}
+\usepackage[style=mla]{biblatex}
+\usepackage{hyperref}
+\usepackage{libertine}
+
+\addbibresource{handbooksamples.bib}
+
+\begin{document}
+
+%\autocite{dietze82aa}
+\nocite{*} 
+
+\printbibliography
+\end{document}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx
index c1f7d722681..f29d070c119 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx
@@ -1,13 +1,11 @@
-% mla.cbx, v1.5 2013/05/05 * compatible with biblatex 2.5
+% mla.bbx, v1.6 2016/07/08 * compatible with biblatex 3.3
 % Maintained at <https://github.com/jmclawson/biblatex-mla> by James Clawson.
 %
 % Feel free to improve, redistribute, and adapt to your own ends. Please share improvements in formatting and MLA standards compliance back to James Clawson: <clawson@gmail.com>.
 %
 % This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
-%
-% File is in constant progress. Things are messy. Ignore platypi.
 
-\ProvidesFile{mla.bbx}[2013/05/05 v1.5 biblatex bibliography style]
+\ProvidesFile{mla.bbx}[2016/07/08 v1.6 biblatex bibliography style]
 
 \RequireBibliographyStyle{standard}
 \DeclareLanguageMapping{american}{american-mla}
@@ -47,15 +45,31 @@
 \NewBibliographyString{generaleditor}%
 
 \setlength{\bibitemsep}{0pt}
-\renewcommand*{\mkbibnameaffix}[1]{\addcomma\addlowpenspace#1}
+\renewcommand*{\mkbibnamesuffix}[1]{\addcomma\addlowpenspace#1}
 
-\DeclareNameFormat{mla:last}{#1}%
 \DeclareNameAlias{author}{sortname}
-\DeclareNameFormat{default}{%
-  \iffirstinits
-    {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
-    {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}%
-  \usebibmacro{name:andothers}}
+\@ifpackagelater{biblatex}{2016/03/01}{%
+  \DeclareNameFormat{mla:last}{\nameparts{#1}\namepartfamily}%
+  \DeclareNameFormat{default}{%
+    \nameparts{#1}%
+    \ifgiveninits{%
+      \usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}%
+    }{%
+      \usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+    }%
+    \usebibmacro{name:andothers}%
+  }%
+}{%
+  \DeclareNameFormat{mla:last}{#1}%
+  \DeclareNameFormat{default}{%
+    \iffirstinits{%
+      \usebibmacro{name:first-last}{#1}{#4}{#5}{#7}%
+    }{%
+      \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+    }%
+    \usebibmacro{name:andothers}%
+  }%
+}
 
 % \renewenvironment*{thebibliography}
 %   {\list
@@ -495,7 +509,7 @@
   \usebibmacro{mla:generaleditor:internal}{c}%
 }
 
-\newbibmacro*{mla:generaleditor:internal}[1]{% 
+\newbibmacro*{mla:generaleditor:internal}[1]{%
   \iffieldequalstr{editor#1type}{generaleditor}%
     {\printnames{editor#1}%
       \setunit{\addcomma\addspace}%
@@ -561,7 +575,7 @@
     \OR%
     \iffieldequalstr{entrysubtype}{play}%
 	\OR%
-	\iffieldequalstr{entrytype}{bookinbook}}% 1.5 platypus 
+	\iffieldequalstr{entrytype}{bookinbook}}% 1.5 platypus
       {\usebibmacro{title:incollection:italics}}%
       {\setboolean{bbx@mla-incollection}{true}%
        \usebibmacro{title}%
@@ -612,7 +626,9 @@
     {\printfield{volumes}\clearfield{volumes}}%
     {}%%
   \newunit\newblock
-  \usebibmacro{series+number}%
+  \ifbool{bbx@publimedium}%
+    {}%
+    {\usebibmacro{series+number}}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -643,7 +659,9 @@
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
-  \usebibmacro{series+number}%
+  \ifbool{bbx@publimedium}%
+    {}%
+    {\usebibmacro{series+number}}%
   \newunit\newblock
   \printfield{note}%
   \newunit
@@ -666,7 +684,9 @@
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
-  \usebibmacro{series+number}%
+  \ifbool{bbx@publimedium}%
+    {}%
+    {\usebibmacro{series+number}}%
   \newunit\newblock
   \printfield{note}%
   \newunit
@@ -752,7 +772,7 @@
     {\printfield[brackets]{location}%
      \printtext{\printdate}%
      \newunit}%
-    {\printfield{series}%
+    {\printfield{series}\clearfield{series}%
      \setunit{\addspace}%
      \printfield[default]{volume}%
      \setunit*{\adddot}%
@@ -794,7 +814,9 @@
       \newunit
       \printfield{volumes}%
       \newunit\newblock
-      \usebibmacro{series+number}%
+	  \ifbool{bbx@publimedium}%
+	    {}%
+	    {\usebibmacro{series+number}}%
       \newunit\newblock
       \printfield{note}%
       \newunit\newblock
@@ -903,7 +925,7 @@
   \usebibmacro{finentry}}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% % % % % % % % % % % % % % % % % % % % % % 
+% % % % % % % % % % % % % % % % % % % % % %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % drivers to add eventually:
 % * \DeclareBibliographyDriver{misc}
@@ -913,7 +935,7 @@
 % * \DeclareBibliographyDriver{movie}
 % * \DeclareBibliographyDriver{music}
 % * \DeclareBibliographyDriver{performance}
-% 
+%
 % Specifically important mainstay types to add for MLA users
 % 0 support for multiple publishers? % can't do with bibtex
 % * editorial
@@ -940,7 +962,7 @@
 \renewbibmacro*{series+number}{%
   \iffieldundef{series}%
     {}%
-    {\printfield{series}\setunit*{\addspace}\printfield{number}}%
+    {\printfield{series}\clearfield{series}\setunit*{\addspace}\printfield{number}}%
 }
 
 \renewbibmacro*{title}{%
@@ -1124,7 +1146,7 @@
      \setunit*{\addcomma\addspace}%
      \printfield[mla:newspaper:section]{chapter}%
     }%
-    {\printfield{series}%
+    {\printfield{series}\clearfield{series}%
      \setunit*{\addspace}%
      \printfield{volume}%
      \setunit*{\adddot}%
@@ -1160,7 +1182,7 @@
      \setunit{\addcomma\addspace}%
      \printfield[mla:newspaper:section]{chapter}%
     }%
-    {\printfield{series}%
+    {\printfield{series}\clearfield{series}%
      \setunit{\addspace}%
      \printfield{volume}%
      \setunit*{\adddot}%
@@ -1223,4 +1245,4 @@
 \endinput
 
 
-\endinput
-\ No newline at end of file
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx
index ac23476287c..f75dd18b810 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx
@@ -1,13 +1,11 @@
-% mla.cbx, v1.5 2013/05/05 * compatible with biblatex 2.5
+% mla.cbx, v1.6 2016/07/08 * compatible with biblatex 3.3
 % Maintained at <https://github.com/jmclawson/biblatex-mla> by James Clawson.
 %
 % Feel free to improve, redistribute, and adapt to your own ends. Please share improvements in formatting and MLA standards compliance back to James Clawson: <clawson@gmail.com>.
 %
 % This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
-%
-% File is in constant progress. Things are messy. Ignore platypi.
 
-\ProvidesFile{mla.cbx}[2013/05/05 v1.5 biblatex citation style]
+\ProvidesFile{mla.cbx}[2016/07/08 v1.6 biblatex citation style]
 
 \newboolean{cbx@firstlonghand}%
 \DeclareBibliographyOption{firstlonghand}[true]{\setboolean{cbx@firstlonghand}{#1}}
@@ -42,7 +40,7 @@
   }}
 
 
-\ExecuteBibliographyOptions{citetracker=true,ibidtracker=constrict,opcittracker=constrict,singletitle,autocite=inline,uniquename=init,hyperref=true,useprefix=true,firstlonghand,annotation=false,loccittracker=strict,noremoteinfo=true,date=long,urldate=long,mancitepar,datezeros=false}%
+\ExecuteBibliographyOptions{citetracker=true,ibidtracker=constrict,opcittracker=constrict,singletitle,autocite=inline,uniquename=init,hyperref=true,useprefix=true,firstlonghand,annotation=false,loccittracker=strict,noremoteinfo=true,date=long,urldate=long,mancitepar=false,datezeros=false}%
 
 \newbool{cbx@named}%
 \newbool{cbx@mlafootnotes}%
@@ -678,12 +676,23 @@
 \DeclareFieldFormat{footpostnote}{#1}%
 \DeclareFieldFormat{mlarepeatedcites}{\fbox{#1}%
   \marginpar{\hfill\footnotesize{$\clubsuit$}}}%
-\DeclareNameFormat{cite:foot:editor}{%
-  \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
-  \usebibmacro{name:andothers}}%
-\DeclareNameFormat{cite:foot:translator}{%
-  \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
-  \usebibmacro{name:andothers}}%
+\@ifpackagelater{biblatex}{2016/03/01}{%
+  \DeclareNameFormat{cite:foot:editor}{%
+    \nameparts{#1}%
+    \usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\partnamesuffix}%
+    \usebibmacro{name:andothers}}%
+  \DeclareNameFormat{cite:foot:translator}{%
+    \nameparts{#1}%
+    \usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\partnamesuffix}%
+    \usebibmacro{name:andothers}}%
+}{%
+  \DeclareNameFormat{cite:foot:editor}{%
+    \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+    \usebibmacro{name:andothers}}%
+  \DeclareNameFormat{cite:foot:translator}{%
+    \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+    \usebibmacro{name:andothers}}%
+}%
 \DeclareFieldFormat{foot:cite:edition:format}{%
   \ifinteger{#1}%
     {\mkbibordinal{#1}~\bibstring{edition}}%
@@ -785,7 +794,7 @@
 \DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]%
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
+   \usebibmacro{cite:mla}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
@@ -811,4 +820,4 @@
     {}}
 
 
-\endinput
-\ No newline at end of file
+\endinput