biblatex-mla (9jul16)

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

2 files changed, 68 insertions, 37 deletions

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