From de651e8d3395141f506edeeb511149fa8c8b3803 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Oct 2010 23:09:31 +0000 Subject: biblatex-apa (3oct10) git-svn-id: svn://tug.org/texlive/trunk@19989 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/biblatex-apa/README | 2 +- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 113903 -> 113903 bytes .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 144193 -> 144564 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 6 +- .../tex/latex/biblatex-apa/american-apa.lbx | 70 ++++++++++++++------ Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 67 ++++++++++++++++++- .../tex/latex/biblatex-apa/french-apa.lbx | 71 ++++++++++++++------- .../tex/latex/biblatex-apa/german-apa.lbx | 68 +++++++++++++++----- .../tex/latex/biblatex-apa/ngerman-apa.lbx | 69 +++++++++++++++----- 9 files changed, 272 insertions(+), 81 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index c7fbb71b184..ec7f0f2b9d5 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 1.9 +Version 2.0 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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf index 55bd5a1a900..65761c8fce9 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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf index 8c623797264..6e672da8858 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 49f3534a7e6..87fcd44db45 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={1.9}, + revision={2.0}, date={\today}} \hypersetup{% @@ -329,6 +329,10 @@ to see how it was implemented. Some general notes: \begin{changelog} +\begin{release}{2.0}{2010-09-30} +\item Moved to new date format code internally +\end{release} + \begin{release}{1.9}{2010-09-27} \item Moved docs to LuaLaTeX compat \item Fixed german/ngerman date formats diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx index fda11b61c9b..6df2e0a4619 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx @@ -67,28 +67,56 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored + \DefineBibliographyExtras{american}{% - \protected\def\mkbibdatelong#1#2#3{% - \ifthenelse{\iffieldundef{#1}\OR% - \(\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}\)} - {} - {\thefield{#1}% - \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR% - \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)} - {} - {\addcomma\addspace}}% - \ifthenelse{\iffieldundef{#2}\OR% - \(\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}\)} - {} - {\mkbibmonth{\thefield{#2}}% - \ifthenelse{\(\equal{#2}{month}\AND\iffieldundef{day}\)\OR% - \(\equal{#2}{endmonth}\AND\iffieldundef{endday}\)} - {} - {\addspace}}% - \ifthenelse{\iffieldundef{#3}\OR% - \(\equal{#3}{endday}\AND\iffieldsequal{day}{endday}\)} - {} - {\stripzeros{\thefield{#3}}}}} + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extrayear}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongdmy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\addspace}% + \thefield{#1}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index e48423c38b1..c75b5faf5a3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -74,6 +74,65 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% + +% Date formats. Suppress end range of less specific fields + +\newcommand*{\mkbibrangeapalong}[1]{% + \ifthenelse{\equal{#1}{url}\OR\equal{#1}{event}} + {\printtext{% + \mkbibdateapalongdmy{#1year}{#1month}{#1day}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalongdmy{}{}{#1endday}}}% + {\mkbibdateapalongdmy{}{#1endmonth}{#1endday}}}% + {\mkbibdateapalongdmy{#1endyear}{#1endmonth}{#1endday}}}}}} + {\printtext{% + \mkbibdateapalong{#1year}{#1month}{#1day}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalong{}{}{#1endday}}}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}}}}}}} + + +% Only for DATE as only \printdateextra is used +\newcommand*{\mkbibrangeapalongextra}[1]{% + \printtext{% + \mkbibdateapalongextra{#1year}{#1month}{#1day}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalongextra{}{}{#1endday}}} + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}}}}}} + + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.12) Five author max before "et al" and a one author truncation % policy. Note that this doesn't really work properly due to @@ -98,7 +157,7 @@ minnames=999,% abbreviate=true,% mincrossrefs=999,% - alldates=long} + alldates=apalong} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -242,7 +301,7 @@ {\iffieldundef{origyear} {\printtext[parens]{\usebibmacro{cite:noyear}}} {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}} - {\printtext[yearorunkyear]{\printdate}}} + {\printtext[yearorunkyear]{\printdateextra}}} \DeclareFieldFormat{yearorunkyear}{% \ifthenelse{\iffieldequalstr{usere}{unkdate}\OR\iffieldequalstr{usere}{unkauthdate}} @@ -1622,6 +1681,10 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% + % Unchanged from authoryear-comp (biblatex v0.9) \DeclareBibliographyOption{dashed}[true]{% 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 640ee2c2a38..1c6af30a246 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx @@ -62,28 +62,55 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{french}{% - \protected\def\mkbibdatelong#1#2#3{% - \ifthenelse{\iffieldundef{#1}\OR% - \(\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}\)} - {} - {\thefield{#1}% - \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR% - \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)} - {} - {\addcomma\addspace}}% - \ifthenelse{\iffieldundef{#2}\OR% - \(\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}\)} - {} - {\mkbibmonth{\thefield{#2}}% - \ifthenelse{\(\equal{#2}{month}\AND\iffieldundef{day}\)\OR% - \(\equal{#2}{endmonth}\AND\iffieldundef{endday}\)} - {} - {\addspace}}% - \ifthenelse{\iffieldundef{#3}\OR% - \(\equal{#3}{endday}\AND\iffieldsequal{day}{endday}\)} - {} - {\stripzeros{\thefield{#3}}}}} +\DefineBibliographyExtras{american}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extrayear}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongdmy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\addspace}% + \thefield{#1}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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 5f90c08248a..48bbd593fcf 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx @@ -64,24 +64,58 @@ % You must use \printdate to get here otherwise it will be ignored \DefineBibliographyExtras{german}{% - \protected\def\mkbibdatelong#1#2#3{% - \ifthenelse{\iffieldundef{#1}} - {} - {\thefield{#1}% - \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR% - \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)} - {} - {\addcomma\addspace}}% - \ifthenelse{\iffieldundef{#3}} + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} {} - {\stripzeros{\thefield{#3}}% - \ifthenelse{\(\equal{#3}{day}\AND\iffieldundef{month}\)\OR% - \(\equal{#2}{endday}\AND\iffieldundef{endmonth}\)} - {} - {\adddot\addspace}}% - \ifthenelse{\iffieldundef{#2}} - {} - {\mkbibmonth{\thefield{#2}}}}} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extrayear}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongdmy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \thefield{#1}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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 484f9f88c48..dfb2d08dbf0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx @@ -64,24 +64,59 @@ % You must use \printdate to get here otherwise it will be ignored \DefineBibliographyExtras{ngerman}{% - \protected\def\mkbibdatelong#1#2#3{% - \ifthenelse{\iffieldundef{#1}} - {} - {\thefield{#1}% - \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR% - \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)} - {} - {\addcomma\addspace}}% - \ifthenelse{\iffieldundef{#3}} + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} {} - {\stripzeros{\thefield{#3}}% - \ifthenelse{\(\equal{#3}{day}\AND\iffieldundef{month}\)\OR% - \(\equal{#2}{endday}\AND\iffieldundef{endmonth}\)} - {} - {\adddot\addspace}}% - \ifthenelse{\iffieldundef{#2}} - {} - {\mkbibmonth{\thefield{#2}}}}} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extrayear}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongdmy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \thefield{#1}}}} + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- cgit v1.2.3