diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 26ccf3eda55..4fd11e27717 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -183,7 +183,7 @@ % (APA 7.10 Example 67) Unknown names and dates \DeclareNameFormat{apaauthor}{% - \ifthenelse{\value{listcount}=7} + \ifthenelse{\value{listcount}=7\AND\value{listcount}<\value{liststop}} {\addcomma\addspace\ldots} {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index a1da921bb6e..282d58067fe 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -130,8 +130,7 @@ % need to be repeated but the full years must be repeated with % their extrayear postfixes % "in press" extrayear needs a short dash to join to label -% (APA 6.28) If no date, use "n.d." without parentheses and with a comma -% and space before. +% (APA 6.28) If no date, use "(n.d.)" % (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present \newbibmacro*{cite}{% @@ -190,11 +189,9 @@ {\printnames{shortauthor}} {\printnames{author}}}% % Year - \setunit{\iffieldundef{labelyear} - {\nameyeardelim} - {\ifbool{cbx:np} - {\nameyeardelim} - {\global\booltrue{cbx:parens}\addspace\bibleftparen}}}% + \setunit{\ifbool{cbx:np} + {\nameyeardelim} + {\global\booltrue{cbx:parens}\addspace\bibleftparen}}% % Put the shortauthor inside the year brackets if necessary \ifnameundef{shortauthor} {} @@ -335,7 +332,7 @@ \boolfalse{pagetracker}% \usebibmacro{prenote}} {\usebibmacro{cite:labelyear+extrayear}} - {\multicitedelim} + {\multinamedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\cite} |