From e82be56a22fd2464132008f7cdd8c41eb906100e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Nov 2010 23:32:11 +0000 Subject: biblatex-apa (25nov10) git-svn-id: svn://tug.org/texlive/trunk@20565 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/biblatex-apa/README | 2 +- .../biblatex-apa/biblatex-apa-test-citations.bib | 73 +++++++---------- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 102549 -> 118296 bytes .../doc/latex/biblatex-apa/biblatex-apa-test.tex | 30 ++++--- .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 121802 -> 122030 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 11 ++- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 14 +++- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 87 +++++++++++---------- .../tex/latex/biblatex-apa/dutch-apa.lbx | 2 +- .../tex/latex/biblatex-apa/french-apa.lbx | 2 +- .../tex/latex/biblatex-apa/german-apa.lbx | 2 +- .../tex/latex/biblatex-apa/ngerman-apa.lbx | 2 +- 12 files changed, 119 insertions(+), 106 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index 9c1a70e11d2..ec5433c9c16 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 2.4 +Version 2.5 Permission is granted to copy, distribute and/or modify this software under the terms of the LaTeX Project Public License, version diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib index a0c5b0c0025..de56d140614 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib @@ -3,7 +3,6 @@ AUTHOR = {Kessler, Jr., A}, TITLE = {Title}, YEAR = {2003}, - KEYWORDS = {noinclude} } % (APA 6.12) @@ -11,56 +10,48 @@ AUTHOR = {A. Smith and B. Jones}, TITLE = {Title}, YEAR = {2007}, - KEYWORDS = {noinclude} } @BOOK{6.12b, AUTHOR = {A. Kisangau and B. Lyaruu and C. Hosea and D. Joseph}, TITLE = {Title}, YEAR = {2007}, - KEYWORDS = {noinclude} } @BOOK{6.12c, AUTHOR = {A. Ireys and B. Chernoff and C. DeVet and D. Kim}, TITLE = {Title}, YEAR = {2001}, - KEYWORDS = {noinclude} } @BOOK{6.12d, AUTHOR = {A. Ireys and B. Chernoff and E. Stein and C. DeVet and F. Silver}, TITLE = {Title}, YEAR = {2001}, - KEYWORDS = {noinclude} } @BOOK{6.12e, AUTHOR = {A. Kurtines and B. Szapocznik}, TITLE = {Title}, YEAR = {2003}, - KEYWORDS = {noinclude} } @BOOK{6.12f, AUTHOR = {A. Jöreskog and B. Sörbon}, TITLE = {Title}, YEAR = {2007}, - KEYWORDS = {noinclude} } @BOOK{6.12g, AUTHOR = {A. Kosslyn and B. Koenig and C. Barrett and D. Cave and E. Tang and F. Gabrieli}, TITLE = {Title}, YEAR = {1996}, - KEYWORDS = {noinclude} } @BOOK{6.12h, AUTHOR = {A. Kosslyn and B. Koenig and F. Gabrieli and E. Tang and G. Marsolek and H. Daly}, TITLE = {Title}, YEAR = {1996}, - KEYWORDS = {noinclude} } % (APA 6.13) @@ -68,42 +59,36 @@ AUTHOR = {A. Walker}, TITLE = {Title}, YEAR = {2007}, - KEYWORDS = {noinclude} } @BOOK{6.13b, AUTHOR = {A. Walker and B. Allen}, TITLE = {Title}, YEAR = {2004}, - KEYWORDS = {noinclude} } @BOOK{6.13c, AUTHOR = {A. Bradley and B. Ramirez and C. Soo}, TITLE = {Title}, YEAR = {1999}, - KEYWORDS = {noinclude} } @BOOK{6.13d, AUTHOR = {A. Bradley and B. Ramirez and C. Soo and D. Walsh}, TITLE = {Title}, YEAR = {2006}, - KEYWORDS = {noinclude} } @BOOK{6.13e, AUTHOR = {A. Walker and B. Allen and C. Bradley and D. Ramirez and E. Soo}, TITLE = {Title}, YEAR = {2008}, - KEYWORDS = {noinclude} } @BOOK{6.13f, AUTHOR = {Z. Wasserstein and A. Walker and B. Allen and C. Bradley and D. Ramirez and E. Soo}, TITLE = {Title}, YEAR = {2005}, - KEYWORDS = {noinclude} } @BOOK{6.13g, @@ -111,14 +96,12 @@ SHORTAUTHOR = {NIMH}, TITLE = {Title}, YEAR = {2003}, - KEYWORDS = {noinclude} } @BOOK{6.13h, AUTHOR = {{University of Pittsburgh}}, TITLE = {Title}, YEAR = {2005}, - KEYWORDS = {noinclude} } % (APA 6.14) @@ -134,14 +117,12 @@ YEAR = {2006}, LOCATION = {New York, NY}, PUBLISHER = {Russell Sage Foundation}, - KEYWORDS = {noinclude} } @BOOK{6.14a, AUTHOR = {D. Light}, TITLE = {Some title}, YEAR = {2009}, - KEYWORDS = {noinclude} } % (APA 6.15) @@ -149,20 +130,17 @@ TITLE = {Study Finds Something Interesting}, SHORTTITLE = {Study Finds}, YEAR = {2007}, - KEYWORDS = {noinclude} } @BOOK{6.15b, TITLE = {College Bound Seniors}, YEAR = {2008}, - KEYWORDS = {noinclude} } @BOOK{6.15c, AUTHOR = {Anonymous}, TITLE = {Title}, YEAR = {1998}, - KEYWORDS = {noinclude} } % (APA 6.16) @@ -170,105 +148,90 @@ AUTHOR = {{Department of Veterans Affairs}}, TITLE = {Title1}, YEAR = {2001}, - KEYWORDS = {noinclude} } @BOOK{6.16b, AUTHOR = {{Department of Veterans Affairs}}, TITLE = {Title1}, YEAR = {2003}, - KEYWORDS = {noinclude} } @BOOK{6.16c, AUTHOR = {A. Gogel}, TITLE = {Title1}, YEAR = {1990}, - KEYWORDS = {noinclude} } @BOOK{6.16d, AUTHOR = {A. Gogel}, TITLE = {Title2}, YEAR = {2006}, - KEYWORDS = {noinclude} } @BOOK{6.16e, AUTHOR = {A. Gogel}, TITLE = {Title3}, YEAR = {in press}, - KEYWORDS = {noinclude} } @BOOK{6.16f, AUTHOR = {A. Derryberry and B. Reed}, TITLE = {Title1}, YEAR = {2005}, - KEYWORDS = {noinclude} } @BOOK{6.16g, AUTHOR = {A. Derryberry and B. Reed}, TITLE = {Title2}, YEAR = {2005}, - KEYWORDS = {noinclude} } @BOOK{6.16h, AUTHOR = {A. Derryberry and B. Reed}, TITLE = {Title3}, YEAR = {in press}, - KEYWORDS = {noinclude} } @BOOK{6.16i, AUTHOR = {A. Rothbart}, TITLE = {Title1}, YEAR = {2003}, - KEYWORDS = {noinclude} } @BOOK{6.16j, AUTHOR = {A. Rothbart}, TITLE = {Title2}, YEAR = {2003}, - KEYWORDS = {noinclude} } @BOOK{6.16k, AUTHOR = {A. Miller}, TITLE = {Title}, YEAR = {1999}, - KEYWORDS = {noinclude} } @BOOK{6.16l, AUTHOR = {A. Shafrankse and B. Mahoney}, TITLE = {Title}, YEAR = {1998}, - KEYWORDS = {noinclude} } @BOOK{6.16m, AUTHOR = {A. Minor}, TITLE = {Title}, YEAR = {2001}, - KEYWORDS = {noinclude} } @BOOK{6.16n, AUTHOR = {A. Adams}, TITLE = {Title}, YEAR = {1999}, - KEYWORDS = {noinclude} } @BOOK{6.16o, AUTHOR = {A. Storandt}, TITLE = {Title}, YEAR = {2007}, - KEYWORDS = {noinclude} } % (APA 6.17) @@ -276,7 +239,6 @@ AUTHOR = {A. Nicholson}, TITLE = {Title}, YEAR = {2003}, - KEYWORDS = {noinclude} } % (APA 6.18) @@ -285,7 +247,6 @@ TITLE = {Ethics}, TRANSLATOR = {S. Translator}, YEAR = {1931}, - KEYWORDS = {noinclude} } @BOOK{6.18b, @@ -293,7 +254,6 @@ TITLE = {Novel}, ORIGDATE = {1890}, YEAR = {1983}, - KEYWORDS = {noinclude} } % Last two examples need no references entry @@ -303,14 +263,12 @@ AUTHOR = {{Centers for Disease Control and Prevention}}, TITLE = {Title}, YEAR = {2005}, - KEYWORDS = {noinclude} } @BOOK{6.19b, AUTHOR = {A. Shimamura}, TITLE = {Title}, YEAR = {1989}, - KEYWORDS = {noinclude} } % (APA 6.20) - No examples need references entry @@ -320,12 +278,39 @@ AUTHOR = {{U.S. Department of Labor}}, TITLE = {Title}, YEAR = {2007}, - KEYWORDS = {noinclude} } % (APA 6.28a) @BOOK{6.28a, AUTHOR = {Arthur Somebody}, TITLE = {Some Title}, - KEYWORDS = {noinclude} +} + +% These are copied from the references .bib file just so the sections splitting works +@ARTICLE{7.01:3b, + AUTHOR = {M. A. Light and I. H. Light}, + TITLE = {The Geographic Expansion of Mexican Immigration in the United States and its Implications for Local Law Enforcement}, + YEAR = {2008}, + JOURNALTITLE = {Law Enforcement Executive Forum Journal}, + VOLUME = {8}, + NUMBER = {1}, + PAGES = {73--82}, +} + +@ARTICLE{7.01:12c, + TITLE = {Capital Punishment in the United Kingdom}, + SHORTTITLE = {Capital Punishment}, + TITLEADDON = {Special issue}, + JOURNALTITLE = {Psychology, Public Policy and Law}, + VOLUME = {10}, + NUMBER = {4}, + YEAR = {2004} +} + +@PATENT{A7.07, + AUTHOR = {I. M. Smith}, + TITLE = {{U}.{S}. {P}atent {N}o. 123,445}, + DATE = {1998}, + LOCATION = {Washington, DC}, + PUBLISHER = {U.S. Patent and Trademark Office} } diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf index 1f13ad85c34..146e1d6daa3 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf and b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex index a40e9138981..5aaa6b12ab0 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex @@ -25,7 +25,6 @@ {\textcolor{blue}{\texttt{(APA #2 Example #1)}}}} \setlength{\parskip}{3ex} -\bibliography{biblatex-apa-test-citations,biblatex-apa-test-references} \def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\detokenize{#1}}}\\$\rcurvearrowse$ \textbf{#1}} \def\apaexs#1{\hbox{\texttt{\footnotesize\detokenize{#1}}} \textbf{\small #1}} @@ -35,7 +34,7 @@ \reversemarginpar \renewbibmacro*{begentry}{\marginpar{\footnotesize \textcolor{blue}{\thefield{entrykey}}}} -%\usepackage[colorlinks=true]{hyperref} +\usepackage[colorlinks=true]{hyperref} %%%%%%%%%%%%%%%%%%%%%%%%%%%% END PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%%% \DeclareLanguageMapping{american}{american-apa} @@ -55,7 +54,7 @@ requirements for References list alphabetisation and order could also be demonstrated. \section*{Citations} - +\begin{refsection}[biblatex-apa-test-citations] \noindent Please see accompanying file |biblatex-apa-test-citations.bib| for the bibliographic entries which these examples use. @@ -185,9 +184,9 @@ and\\ \noindent\apa{6.15}\\ Use |SHORTTITLE| field of the entry if it exists:\\ -\apaex{\parencite{6.15a}}\\ +\apaex{\parencite{6.15a}}\\\\ Books, reports etc. use italics instead of quotes:\\ -\apaex{\textcite{6.15b}} +\apaex{\textcite{6.15b}}\\\\ Citing anonymous author:\\ \apaex{\textcite{6.15c}} @@ -196,7 +195,7 @@ Two or more works withing the same parentheses:\\ \apaex{\parencite{6.16a,6.16b}}\\ \apaex{\parencite{6.16c,6.16d,6.16e}} -\noindent Citations of works by same authors in the same year:\\ +\noindent Citations of works by same authors in the same year:\\ \apaex{\parencite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\\\ \textcolor{red}{Note: This example, (p. 178 APA Manual 6th edition, 2nd printing) is slightly odd as the ``in-press-a'' is not indicated and @@ -257,9 +256,20 @@ A patent citation uses the title but with no quotes\\ \apaex{\textcite{A7.07}}\\ \apaex{\parencite{A7.07}} -\newpage +Some misc test cases\\ +\apaex{\textcite{6.16c,6.16d,6.16e}}\\ +\apaex{\textcite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\ +\apaex{\cite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\ +\apaex{\cite{6.16k,6.16l}} +\end{refsection} +\begin{refsection}[biblatex-apa-test-references] \nocite{*} -% Exclude the citation examples from the References section - only want to -% see (APA 7.x) examples there. -\printbibliography[notkeyword=noinclude] +\end{refsection} +\newpage +% Just (APA 7.x) real references examples here +\printbibliography[section=2] +\newpage +% Include a references section for citation examples just so hyperref +% targets can be checked +\printbibliography[section=1,title=Misc citation references for checking hyperref targets] \end{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf index 07f6d5ad2ae..7d3a4704d3c 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf and b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex index 7244095d80e..49aa0e3c08f 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -23,7 +23,7 @@ url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={2.4}, + revision={2.5}, date={\today}} \hypersetup{% @@ -289,7 +289,7 @@ state. So, the new citation command but does not put parentheses around the year and separates items with commas. See examples using this command in \path{biblatex-apa-test.tex}. There is also a multi-cite version |\nptextcites| that works in the same -way as |\textcites|; +way as |\textcites|. \subsection{References} @@ -336,6 +336,13 @@ to see how it was implemented. Some general notes: \begin{changelog} +\begin{release}{2.5}{2010-11-24} +\item Refactored hyperref to only link from years to make it + consistent across cite commands +\item Added hyperref target references section for citation examples +\item Fixed textcite multicite issue +\end{release} + \begin{release}{2.4}{2010-11-14} \item Fixed postnotes/hyperref for textcite \end{release} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 5e0e1db5300..178fb4e696b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -1,4 +1,4 @@ -%% apa.bbx v2.4 +%% apa.bbx v2.5 %% Copyright 2010 Philip Kime %% %% This work may be distributed and/or modified under the @@ -324,7 +324,7 @@ \newbibmacro*{labelyear+extrayear}{% \iffieldundef{labelyear} {\iffieldundef{origyear} - {\printtext[parens]{\usebibmacro{cite:noyear}}} + {\printtext[parens]{\usebibmacro{noyear}}} {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}} {\printtext[yearorunkyear]{\printdateextra}}} @@ -333,6 +333,14 @@ {\mkbibbrackets{ca\adddot\addspace#1}} {\mkbibparens{#1}}} +\newbibmacro*{noyear}{% + \ifnameundef{shortauthor} + {} + {\ifciteseen + {} + {\printnames{shortauthor}\setunit{\nameyeardelim}}}% + \biblcstring{nodate}} + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1673,7 +1681,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Unchanged from authoryear-comp (biblatex v0.9) +% Unchanged from authoryear-comp \DeclareBibliographyOption{dashed}[true]{% \ifstrequal{#1}{true} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index ed60ab45700..d55fd69db10 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -1,4 +1,4 @@ -%% apa.cbx v2.4 +%% apa.cbx v2.5 %% Copyright 2010 Philip Kime %% %% This work may be distributed and/or modified under the @@ -137,21 +137,18 @@ \iffieldequals{namehash}{\cbx@lasthash} % Multiple cites in one command {\setunit{\compcitedelim}% - \printtext[bibhyperref]{\usebibmacro{cite:plabelyear+extrayear}}}% + \usebibmacro{cite:plabelyear+extrayear}}% % Single cite {\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}} % No author/editor - {\printtext[bibhyperref]{% - \usebibmacro{cite:noname}% + {\usebibmacro{cite:noname}% \setunit{\nameyeardelim}% \iffieldundef{labelyear} {\usebibmacro{cite:noyear}} {\usebibmacro{cite:plabelyear+extrayear}% - \savefield{namehash}{\cbx@lasthash}}}} + \savefield{namehash}{\cbx@lasthash}}} % Normal cite - {\cbx@tempa - \printtext[bibhyperref]{% - \ifnameundef{shortauthor} + {\ifnameundef{shortauthor} {\printnames{labelname}} {\ifciteseen {\printnames{shortauthor}} @@ -160,18 +157,16 @@ \iffieldundef{labelyear} {\usebibmacro{cite:noyear}} {\usebibmacro{cite:plabelyear+extrayear}% - \savefield{namehash}{\cbx@lasthash}}% - \global\let\cbx@tempa=\multicitedelim}}}} + \savefield{namehash}{\cbx@lasthash}}}}% + \setunit{\multicitedelim}} \newbibmacro*{textcite}{% \iffieldequals{namehash}{\cbx@lasthash} % Compact cite - more than one thing for same author - {\compcitedelim% - \printtext[bibhyperref]{\bibopenparen\usebibmacro{cite:plabelyear+extrayear}\bibcloseparen\global\boolfalse{cbx:parens}}} + {\setunit{\compcitedelim}% + \usebibmacro{cite:plabelyear+extrayear}} % Single cite - {\cbx@tempa - \printtext[bibhyperref]{% - \ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}} + {\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}} % No author/editor or patent {\iffieldundef{shorthand}% % Cite using title @@ -179,7 +174,7 @@ \setunit{\ifbool{cbx:np}% {\nameyeardelim}% {\global\booltrue{cbx:parens}\addspace\bibopenparen}}% - \usebibmacro{cite:plabelyear+extrayear}\bibcloseparen\global\boolfalse{cbx:parens}} + \usebibmacro{cite:plabelyear+extrayear}} % Cite using shorthand {\usebibmacro{cite:shorthand}}} % Normal cite with author/editor @@ -202,35 +197,31 @@ {} {\printnames{shortauthor}\setunit{\nameyeardelim}}}% \iffieldundef{labelyear}% - {\usebibmacro{cite:noyear}% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}} + {\usebibmacro{cite:noyear}} % Actual year printing - {\usebibmacro{cite:plabelyear+extrayear}% - \iffieldundef{postnote} - {} - % Postnote printing - {\postnotedelim\printfield{postnote}}% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}}% - \savefield{namehash}{\cbx@lasthash}}}}% - \global\let\cbx@tempa=\multicitedelim} + {\usebibmacro{cite:plabelyear+extrayear}}% + \savefield{namehash}{\cbx@lasthash}}}% + \setunit{% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% + % multicitedelim semi-colon doesn't make much sense for textcites + \compcitedelim}} \newcommand{\apashortdash}{-} \newbibmacro*{cite:plabelyear+extrayear}{% \iffieldundef{labelyear} {} - {\printfield[noformat]{origyear}\setunit*{\addslash}% + {\printtext[bibhyperref]{% + \printfield[noformat]{origyear}\setunit*{\addslash}% \printfield{labelyear}% \iffieldequalstr{labelyear}{in press} {\iffieldundef{extrayear} {\setunit{\relax}} {\setunit{\apashortdash}}% \printfield{extrayear}} - {\printfield{extrayear}}}}% + {\printfield{extrayear}}}}}% \newbibmacro*{cite:shorthand}{% \ifciteseen @@ -268,7 +259,7 @@ {\ifciteseen {} {\printnames{shortauthor}\setunit{\nameyeardelim}}}% - \printtext{\biblcstring{nodate}}} + \printtext[bibhyperref]{\biblcstring{nodate}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -301,16 +292,14 @@ % \newbibmacro*{citeyear}{% \iffieldundef{labelyear} - {\cbx@tempa - \usebibmacro{cite:noyear}% + {\usebibmacro{cite:noyear}% \usebibmacro{cite:init}} {\iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}% - \usebibmacro{cite:labelyear+extrayear}} - {\cbx@tempa - \usebibmacro{cite:labelyear+extrayear}% + \usebibmacro{pcite:labelyear+extrayear}} + {\usebibmacro{pcite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}}} - \global\let\cbx@tempa=\multicitedelim} + \setunit{\multicitedelim}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -319,9 +308,23 @@ \newbool{cbx:parens} % boolean to say we're inside parens \newbool{cbx:np} % boolean to say we're using a non-parentheses text cite +\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}}} + + \newbibmacro*{cite:init}{% \global\boolfalse{cbx:parens}% - \global\let\cbx@tempa=\empty \global\undef\cbx@lasthash} \newbibmacro*{cite:labelyear}{% @@ -340,7 +343,7 @@ {\boolfalse{citetracker}% \boolfalse{pagetracker}% \usebibmacro{prenote}} - {\usebibmacro{cite:labelyear+extrayear}} + {\usebibmacro{cite:plabelyear+extrayear}} {\multinamedelim} {\usebibmacro{postnote}} @@ -375,6 +378,6 @@ {\usebibmacro{citeindex}% \usebibmacro{textcite}} {} - {} + {\usebibmacro{textcite:postnote}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx index cedb1e3e995..5ec02bb3c78 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx @@ -1,4 +1,4 @@ -% v2.4 +% v2.5 \ProvidesFile{dutch-apa.lbx} \InheritBibliographyExtras{dutch} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx index cf967d6aa5b..67ba0a75b8a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx @@ -1,4 +1,4 @@ -% v2.4 +% v2.5 \ProvidesFile{french-apa.lbx} \InheritBibliographyExtras{french} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx index f22473b97d0..8ba8ff4323e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx @@ -1,4 +1,4 @@ -% v2.4 +% v2.5 \ProvidesFile{german-apa.lbx} \InheritBibliographyExtras{german} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx index e4ea49c367f..2a309b895c2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx @@ -1,4 +1,4 @@ -% v2.4 +% v2.5 \ProvidesFile{ngerman-apa.lbx} \InheritBibliographyExtras{ngerman} -- cgit v1.2.3