apacite 6.01 (26feb12)

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

2 files changed, 74 insertions, 57 deletions

diff --git a/Master/texmf-dist/source/bibtex/apacite/apacite.drv b/Master/texmf-dist/source/bibtex/apacite/apacite.drv
index cbd31bef776..1379e1c0c04 100644
--- a/Master/texmf-dist/source/bibtex/apacite/apacite.drv
+++ b/Master/texmf-dist/source/bibtex/apacite/apacite.drv
@@ -48,13 +48,13 @@
 %% do not change apacite.dtx for this purpose.
 %% 
 \ProvidesFile{apacite.drv}
-   [2012/02/14 v6.00 apacite documentation driver file]
+   [2012/02/25 v6.01 apacite documentation driver file]
 \documentclass{ltxdoc}
 %\documentclass[twoside]{ltxdoc}
 %\documentclass[a4paper]{ltxdoc}
 %\documentclass[twoside,a4paper]{ltxdoc}
 %%
-\usepackage{apacdoc}[2012/02/14 v6.00]
+\usepackage{apacdoc}[2012/02/25 v6.01]
 %% The |\providecommand|s make sure we don't get an error during
 %% installation.
 %% Define document-specific macros that are not interesting for
@@ -86,7 +86,7 @@
 %% \usepackage{german}
 %%
 %% Loading apacite with author index option.
-\usepackage[ltxemindex,bibnewpage]{apacite}[2012/02/14 v6.00]
+\usepackage[ltxemindex,bibnewpage]{apacite}[2012/02/25 v6.01]
 %%
 \raggedbottom
 %%
diff --git a/Master/texmf-dist/source/bibtex/apacite/apacite.dtx b/Master/texmf-dist/source/bibtex/apacite/apacite.dtx
index 1fc67a07e8d..92232a40317 100644
--- a/Master/texmf-dist/source/bibtex/apacite/apacite.dtx
+++ b/Master/texmf-dist/source/bibtex/apacite/apacite.dtx
@@ -56,7 +56,7 @@
 % \iffalse
 %<*dtx>
 \ProvidesFile{apacite.dtx}
-   [2012/02/14 v6.00 apacite dtx file]
+   [2012/02/25 v6.01 apacite dtx file]
 %</dtx>
 %<driver>\ProvidesFile{apacite.drv}
 %<package|docpkg>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
@@ -82,27 +82,27 @@
 %^^A command such that the value of the command is written to the file instead
 %^^A of the name.
 %^^A
-%<driver>   [2012/02/14 v6.00 apacite documentation driver file]
-%<package>   [2012/02/14 v6.00 APA citation]
-%<docpkg>   [2012/02/14 v6.00 apacite documentation style]
-%<english>   [2012/02/14 v6.00 apacite language file]
-%<dutch>   [2012/02/14 v6.00 apacite language file]
-%<finnish>   [2012/02/14 v6.00 apacite language file]
-%<german>   [2012/02/14 v6.00 apacite language file]
-%<ngerman>   [2012/02/14 v6.00 apacite language file]
-%<greek>   [2012/02/14 v6.00 apacite language file]
-%<norsk>   [2012/02/14 v6.00 apacite language file]
-%<spanish>   [2012/02/14 v6.00 apacite language file]
-%<swedish>   [2012/02/14 v6.00 apacite language file]
-%<xmpl>%%   [2012/02/14 v6.00 LaTeX file for examples]
-%<bibdb>%%   [2012/02/14 v6.00 bibliography database for examples]
-%<bibstyle&!annotated>%%   [2012/02/14 v6.00 APA bibliography style]
+%<driver>   [2012/02/25 v6.01 apacite documentation driver file]
+%<package>   [2012/02/25 v6.01 APA citation]
+%<docpkg>   [2012/02/25 v6.01 apacite documentation style]
+%<english>   [2012/02/25 v6.01 apacite language file]
+%<dutch>   [2012/02/25 v6.01 apacite language file]
+%<finnish>   [2012/02/25 v6.01 apacite language file]
+%<german>   [2012/02/25 v6.01 apacite language file]
+%<ngerman>   [2012/02/25 v6.01 apacite language file]
+%<greek>   [2012/02/25 v6.01 apacite language file]
+%<norsk>   [2012/02/25 v6.01 apacite language file]
+%<spanish>   [2012/02/25 v6.01 apacite language file]
+%<swedish>   [2012/02/25 v6.01 apacite language file]
+%<xmpl>%%   [2012/02/25 v6.01 LaTeX file for examples]
+%<bibdb>%%   [2012/02/25 v6.01 bibliography database for examples]
+%<bibstyle&!annotated>%%   [2012/02/25 v6.01 APA bibliography style]
 %<*xbibstyle&!annotated>
-%%   [2012/02/14 v6.00 APA bibl. style with author index info]
+%%   [2012/02/25 v6.01 APA bibl. style with author index info]
 %</xbibstyle&!annotated>
-%<bibstyle&annotated>%%   [2012/02/14 v6.00 APA annotated bibliography style]
+%<bibstyle&annotated>%%   [2012/02/25 v6.01 APA annotated bibliography style]
 %<*xbibstyle&annotated>
-%%   [2012/02/14 v6.00 APA annotated bibl. style with author index info]
+%%   [2012/02/25 v6.01 APA annotated bibl. style with author index info]
 %</xbibstyle&annotated>
 %
 %<*install>
@@ -430,7 +430,7 @@ do not change apacite.dtx for this purpose.
 %<driver>%\documentclass[a4paper]{ltxdoc}
 %<driver>%\documentclass[twoside,a4paper]{ltxdoc}
 %%
-\usepackage{apacdoc}[2012/02/14 v6.00]
+\usepackage{apacdoc}[2012/02/25 v6.01]
 %% The |\providecommand|s make sure we don't get an error during
 %% installation.
 %% Define document-specific macros that are not interesting for
@@ -462,7 +462,7 @@ do not change apacite.dtx for this purpose.
 %% \usepackage{german}
 %%
 %% Loading apacite with author index option.
-\usepackage[ltxemindex,bibnewpage]{apacite}[2012/02/14 v6.00]
+\usepackage[ltxemindex,bibnewpage]{apacite}[2012/02/25 v6.01]
 %%
 \raggedbottom
 %%
@@ -523,7 +523,7 @@ do not change apacite.dtx for this purpose.
 %   and extended language support; more extensive customizability.}
 % \changes{v4.05}{2009/03/01}{Some bug fixes; extended language support;
 %   annotated bibliographies.}
-% \changes{v6.00}{2012/02/14}{First step towards compliance with v6 of
+% \changes{v6.00}{2012/02/25}{First step towards compliance with v6 of
 %   the APA manual; version number now indicates which version of the APA
 %   manual is implemented.}
 %
@@ -647,7 +647,13 @@ will be inconvenient to other users, then I will not pursue it.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection*{New in this version}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-The previous version \APACversiondate{2009/03/01} of \pkg{apacite}
+The current version \fileversion{} \APACversiondate{2012/02/25} fixes a
+small but annoying bug in version v6.00 \APACversiondate{2012/02/14},
+which only affected documents compiled with the \pkgoption{natbibapa}
+option. In the rest of this document, ``the previous version'' should be
+interpreted as ``the \APACversiondate{2009/03/01} version''.
+
+The \APACversiondate{2009/03/01} version of \pkg{apacite}
 implemented the rules in the 5th edition of the APA manual. The current
 version aims to conform with the new (2009) 6th edition of the APA manual.
 It does not completely succeed in this yet, although the instances of
@@ -9839,12 +9845,20 @@ short form, of the examples.
   maskciteyear,maskciteyearNP,masknocite%
 }
 \fi
-%    \end{macrocode}
-% Only handle the commands \pkg{apacite} defines. The rest is
-% \pkg{natbib}'s purview.
-%    \begin{macrocode}
 \if@APAC@natbib@apa
 \AtEndOfPackage{%
+%    \end{macrocode}
+% The \pkg{natbib} commands, if they haven't been declared already.
+%    \begin{macrocode}
+\@ifundefined{@mb@citenamelist}{%
+  \def\@mb@citenamelist{%
+    nocite,citep,citealp,citet,citealt,citeauthor,citefullauthor,%
+    citeyearpar,citeyear,citetext,cite,shortcites,citetalias,%
+    citepalias,Citet,Citep,Citealt,Citealp,Citeauthor,citenum}%
+}{}
+%    \end{macrocode}
+% The commands \pkg{apacite} adds.
+%    \begin{macrocode}
 \let\orig@mb@citenamelist\@mb@citenamelist
 \edef\@mb@citenamelist{%
   \orig@mb@citenamelist,%
@@ -9854,7 +9868,8 @@ short form, of the examples.
   maskciteauthor,maskcitefullauthor,maskciteyearpar,maskciteyear,%
   maskcite,maskcitetalias,maskcitepalias,maskCitet,maskCitep,%
   maskCitealt,maskCitealp,maskCiteauthor,maskcitenum,maskciteauthort,%
-  maskciteauthorp,maskCitefullauthor,maskCiteauthort,maskCiteauthorp%
+  maskciteauthorp,maskCitefullauthor,maskCiteauthort,maskCiteauthorp,%
+  nocitemeta%
 }
 }
 \fi
@@ -15520,12 +15535,12 @@ short form, of the examples.
 \author{Erik Meijer\\
         \textsf{apacite at gmail.com}
 }
-\date{2012/02/14}
+\date{2012/02/25}
 
 \begin{document}
 \maketitle
 \begin{abstract}
-This document tests \textsf{apacite} [2012/02/14 v6.00]. See the
+This document tests \textsf{apacite} [2012/02/25 v6.01]. See the
 \textsf{apacite} documentation for more information.
 \end{abstract}
 
@@ -16717,15 +16732,15 @@ FUNCTION {identify.apacite.version}
 %<*!annotated>
 %<bibstyle>  "apacite.bst"
 %<xbibstyle>  "apacitex.bst"
-%<bibstyle>  " [2012/02/14 v6.00 APA bibliography style]"
-%<xbibstyle> " [2012/02/14 v6.00 APA bibl. style with author index info]"
+%<bibstyle>  " [2012/02/25 v6.01 APA bibliography style]"
+%<xbibstyle> " [2012/02/25 v6.01 APA bibl. style with author index info]"
 %</!annotated>
 %<*annotated>
 %<bibstyle>  "apacann.bst"
 %<xbibstyle>  "apacannx.bst"
-%<bibstyle>  " [2012/02/14 v6.00 APA annotated bibliography style]"
+%<bibstyle>  " [2012/02/25 v6.01 APA annotated bibliography style]"
 %<*xbibstyle>
-" [2012/02/14 v6.00 APA annotated bibl. style with author index info]"
+" [2012/02/25 v6.01 APA annotated bibl. style with author index info]"
 %</xbibstyle>
 %</annotated>
 %<*bibstyle|xbibstyle>
@@ -18377,10 +18392,12 @@ FUNCTION {make.tentative.year.sort.label}
   year empty$
     { "0000" 'year.label := }
     { year "\bibnodate" =
-        year "n.d." =
-        or
+      year "l" change.case$ "no date" = or
+      year "l" change.case$ "n.d."    = or
         { "0000" 'year.label := }
         { year "\BIP" =
+          year "l" change.case$ "in press"    =  or
+          year "l" change.case$ "forthcoming" =  or
             { "9999" 'year.label := }
             {   % It is not checked whether the year field
                 % makes sense.
@@ -19596,8 +19613,12 @@ FUNCTION {make.definitive.year.supplement}
       year empty$
         { "\BCntND " * }
         { year "\bibnodate" =
+          year "l" change.case$ "no date" = or
+          year "l" change.case$ "n.d."    = or
             { "\BCntND " * }
             { year "\BIP" =
+              year "l" change.case$ "in press"    =  or
+              year "l" change.case$ "forthcoming" =  or
                 { "\BCntIP " * }
                 { "\BCnt " * }
               if$
@@ -19617,8 +19638,12 @@ FUNCTION {protect.year}
 { year empty$
     { "{\protect \bibnodate {}}" }
     { year "\bibnodate" =
+      year "l" change.case$ "no date" = or
+      year "l" change.case$ "n.d."    = or
         { "{\protect \bibnodate {}}" }
         { year "\BIP" =
+          year "l" change.case$ "in press"    =  or
+          year "l" change.case$ "forthcoming" =  or
             { "{\protect \BIP {}}" }
             { year }
           if$
@@ -19636,13 +19661,11 @@ FUNCTION {make.definitive.year.label}
   originalyear empty$
     { protect.year }
     { originalyear "\bibnodate" =    % date of original publication unknown
+      originalyear "l" change.case$ "no date" = or
+      originalyear "l" change.case$ "n.d."    = or
         { translator empty$
             { protect.year }
-            { year empty$
-                { "{\protect \BTRANSL {}~\protect \bibnodate {}}" }  % trans. n.d.
-                { "{\protect \BTRANSL {}}~"   protect.year *      }  % trans. 1931
-              if$
-            }
+            { "{\protect \BTRANSL {}}~" protect.year * }
           if$
         }
         { year empty$
@@ -20527,10 +20550,7 @@ FUNCTION {format.in.editors.trans}
 
 FUNCTION {format.year.check}
 { "\APACrefYear{"
-  year empty$
-    { "\bibnodate{}" * }
-    { year * }
-  if$
+  protect.year *
     %
     % Add "a", "b", etc. when necessary.
     %
@@ -20549,10 +20569,7 @@ FUNCTION {format.year.check}
 
 FUNCTION {format.year.month.day.check}
 { "\APACrefYearMonthDay{"
-  year empty$
-    { "\bibnodate{}" * }
-    { year * }
-  if$
+  protect.year *
     %
     % Add "a", "b", etc. when necessary.
     %
@@ -21328,6 +21345,8 @@ FUNCTION {format.orig.note}
             { originalyear empty$
                 'skip$
                 { originalyear "\bibnodate" =
+                  originalyear "l" change.case$ "no date" = or
+                  originalyear "l" change.case$ "n.d."    = or
                     'skip$
                     { output.new.block
                       format.orig.year.note
@@ -22085,11 +22104,9 @@ FUNCTION {thesis}
         % pop default published thesis, top is default unpublished thesis
         %
     { pop$
-      type empty$
-        school empty$
-          originalyear empty$
-          and
-        and
+      type         empty$
+      school       empty$ and
+      originalyear empty$ and
         { pop$
           ""
         }