diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx | 99 |
1 files changed, 58 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx index f75dd18b810..a8d62a8a1b6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx @@ -1,11 +1,11 @@ -% mla.cbx, v1.6 2016/07/08 * compatible with biblatex 3.3 +% mla-this.cbx, v1.9 2016/11/01 * compatible with biblatex 3.4 % 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. -\ProvidesFile{mla.cbx}[2016/07/08 v1.6 biblatex citation style] +\ProvidesFile{mla-this.cbx}[2016/11/01 v1.9 biblatex citation style] \newboolean{cbx@firstlonghand}% \DeclareBibliographyOption{firstlonghand}[true]{\setboolean{cbx@firstlonghand}{#1}} @@ -39,7 +39,6 @@ \xdef\split@prev{\the\insertpenalties}% }} - \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}% @@ -150,7 +149,6 @@ \newbibmacro*{cite:name}{% \ifsingletitle% {\printtext[bibhyperref]{% - % \ifbool{bbx@totalnames}% platypus - still need to add support for option totalnames in citations \printnames{labelname}}% \savefield{namehash}{\cbx@lasthash}% \global\booltrue{cbx@named}}% @@ -158,7 +156,7 @@ \savefield{namehash}{\cbx@lasthash}% \global\booltrue{cbx@named}}}% -\newbibmacro*{cite:mla:title}{% 1.4.9 platypus testing +\newbibmacro*{cite:mla:title}{% \ifnameundef{labelname}% {\printtext[bibhyperref]{% \printfield[citetitle:\strfield{entrytype}]{labeltitle}}}% @@ -173,9 +171,9 @@ \setunit{\addspace}% \printfield{booktitle}}}}% {}% - \setunit{\addspace}}% 1.4.9 platypus testing + \setunit{\addspace}}% -\newbibmacro*{cite:mla:title:internal}{% 1.4.9 platypus testing +\newbibmacro*{cite:mla:title:internal}{% \ifbool{cbx@named}{\setunit{\addcomma\addspace}}{}% \iffieldundef{title}% {\iffieldequalstr{entrytype}{review}% @@ -193,26 +191,22 @@ % %%%%%%%%%% for ibid, idem, opcit %%%%%%%% -\newbibmacro*{cite:idem}{% 1.4.9 platypus testing removing unspaces +\newbibmacro*{cite:idem}{% \ifsingletitle% - % {\iffieldundef{postnote}% - % {\usebibmacro{cite:name}}% - % {\global\boolfalse{cbx@named}}}% This condition could never be met; that's ibid. {\usebibmacro{cite:name}}% {\global\boolfalse{cbx@named}}} \newbibmacro*{cite:opcit}{% \usebibmacro{cite:mla:title}\setunit{\addspace}} -\newbibmacro*{cite:ibid}{% 1.4.9 platypus testing +\newbibmacro*{cite:ibid}{% \iffieldundef{postnote}% {\usebibmacro{cite:mla:noibid}}% {\global\booltrue{cbx@hyperpages}}% \usebibmacro{cite:save}% \iffieldundef{prenote}% {}% - {\usebibmacro{cite:mla:noibid}\usebibmacro{cite:reset}}}% 1.4.9 platypus rethink this - % {\usebibmacro{cite:reset}}}% 1.4.9 platypus rethink this + {\usebibmacro{cite:mla:noibid}\usebibmacro{cite:reset}}}% \renewcommand*{\postnotedelim}{\addspace}% @@ -647,16 +641,9 @@ {\unspace\addspace\printfield[footpostnote]{postnote}}% \usebibmacro{cite:reset}} -%%%%% platypus TODO for footnotes %%%%% -% - inproceedings -% - articles -% - proceedings - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%% Format Declarations %%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareFieldFormat{citetitle:article}{\mkbibquote{#1}} \DeclareFieldFormat{citetitle:inreference}{\mkbibquote{#1}} @@ -700,12 +687,10 @@ \DeclareFieldFormat{supptotitle}% {\bibstring{supptotitle}\addspace\mkbibemph{#1}} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%% Cite Commands %%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% updated for parity with mla-new.cbx \renewbibmacro*{prenote}{% \iffieldundef{prenote} @@ -734,15 +719,41 @@ {} {\usebibmacro{postnote}} -\DeclareCiteCommand{\cite}[\mkbibparens] - {\usebibmacro{prenote}}% +\DeclareCiteCommand{\cite}% 1.9 added support for smart switching when used in footnote + {\iffootnote{\iffieldundef{prenote} + {\global\undef\cbx@lastprenote + \printtext{See\addspace}}} + \usebibmacro{prenote}}% + {\usebibmacro{citeindex}% + \usebibmacro{cite:mla}}% + {}% + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\textcite} + {\iffootnote{\iffieldundef{prenote} + {\global\undef\cbx@lastprenote + \printtext{See\addspace}}} + \usebibmacro{prenote}}% {\usebibmacro{citeindex}% \usebibmacro{cite:mla}}% {}% {\usebibmacro{postnote}} -\DeclareCiteCommand*{\cite}[\mkbibparens] - {\usebibmacro{prenote}}% +\DeclareCiteCommand{\headlesscite}% 1.9 added alias to starred command for Chicago compatibility + {\iffootnote{\iffieldundef{prenote} + {\global\undef\cbx@lastprenote + \printtext{See\addspace}}} + \usebibmacro{prenote}}% + {\usebibmacro{citeindex}% + \usebibmacro{cite:mla:starred:title}} + {}% + {\usebibmacro{postnote}} + +\DeclareCiteCommand*{\cite}% 1.9 added support for smart switching when used in footnote + {\iffootnote{\iffieldundef{prenote} + {\global\undef\cbx@lastprenote + \printtext{See\addspace}}} + \usebibmacro{prenote}}% {\usebibmacro{citeindex}% \usebibmacro{cite:mla:starred:title}} {}% @@ -759,19 +770,25 @@ {} {\usebibmacro{mla:foot:postnote}} -\DeclareCiteCommand{\fullcite} - {\citereset\renewbibmacro*{author}{% - \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}} - {\ifthenelse{\iffieldequals{namehash}{\cbx@lasthash}\AND\NOT - \iffirstonpage} - {\mbox{\mlanamedash\unspace\newunitpunct}} - {\printnames{author}% - \savefield{namehash}{\cbx@lasthash}}} - {\let\cbx@lasthash\undefined}} -\begin{thebibliography}\item}% kc9jud on GitHub helped to fix this - {\usedriver{}{\thefield{entrytype}}\addperiod} - {\item} - {\end{thebibliography}\citereset} +\DeclareCiteCommand{\fullcite}% + {\iffootnote{\iffieldundef{prenote} + {\global\undef\cbx@lastprenote + \printtext{See\addspace}}} + \usebibmacro{prenote}}% + {\usebibmacro{citeindex}% + \usebibmacro{cite:mla:title}} + {}% + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\headlessfullcite} + {\iffootnote{\iffieldundef{prenote} + {\global\undef\cbx@lastprenote + \printtext{See\addspace}}} + \usebibmacro{prenote}}% + {\usebibmacro{citeindex}% + \usebibmacro{cite:mla:starred:title}} + {}% + {\usebibmacro{postnote}} \newbibmacro{mla:fullcite:prenote}{% \citereset\renewbibmacro*{author}{% |