apacite 6.01 (26feb12)

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

4 files changed, 96 insertions, 88 deletions

diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacann.bst b/Master/texmf-dist/bibtex/bst/apacite/apacann.bst
index c073b547a78..5784c8a5958 100644
--- a/Master/texmf-dist/bibtex/bst/apacite/apacann.bst
+++ b/Master/texmf-dist/bibtex/bst/apacite/apacann.bst
@@ -43,7 +43,7 @@
 %% the generated files.
 %% 
 %% apacann.bst
-%%   [2012/02/14 v6.00 APA annotated bibliography style]
+%%   [2012/02/25 v6.01 APA annotated bibliography style]
 %% apacann.bst : reference list according to APA manual
 %%               with annotations
 %% Written by Erik Meijer
@@ -51,7 +51,7 @@
 FUNCTION {identify.apacite.version}
 { % Put identifying string in the .blg file
   "apacann.bst"
-  " [2012/02/14 v6.00 APA annotated bibliography style]"
+  " [2012/02/25 v6.01 APA annotated bibliography style]"
   * top$
 }
 ENTRY
@@ -1508,10 +1508,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.
@@ -2576,8 +2578,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$
@@ -2596,8 +2602,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$
@@ -2614,13 +2624,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$
@@ -3340,10 +3348,7 @@ FUNCTION {format.in.editors.trans}
 
 FUNCTION {format.year.check}
 { "\APACrefYear{"
-  year empty$
-    { "\bibnodate{}" * }
-    { year * }
-  if$
+  protect.year *
     %
     % Add "a", "b", etc. when necessary.
     %
@@ -3355,10 +3360,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.
     %
@@ -4026,6 +4028,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
@@ -4710,11 +4714,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$
           ""
         }
diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst b/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst
index 59e57437fdc..efc5ef2d65f 100644
--- a/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst
+++ b/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst
@@ -43,7 +43,7 @@
 %% the generated files.
 %% 
 %% apacannx.bst
-%%   [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]
 %% apacannx.bst : reference list according to APA manual
 %%                with annotations and author indexing information
 %% Written by Erik Meijer
@@ -51,7 +51,7 @@
 FUNCTION {identify.apacite.version}
 { % Put identifying string in the .blg file
   "apacannx.bst"
-" [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]"
   * top$
 }
 ENTRY
@@ -1508,10 +1508,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.
@@ -2576,8 +2578,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$
@@ -2596,8 +2602,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$
@@ -2614,13 +2624,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$
@@ -3340,10 +3348,7 @@ FUNCTION {format.in.editors.trans}
 
 FUNCTION {format.year.check}
 { "\APACrefYear{"
-  year empty$
-    { "\bibnodate{}" * }
-    { year * }
-  if$
+  protect.year *
     %
     % Add "a", "b", etc. when necessary.
     %
@@ -3355,10 +3360,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.
     %
@@ -4026,6 +4028,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
@@ -4710,11 +4714,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$
           ""
         }
diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacite.bst b/Master/texmf-dist/bibtex/bst/apacite/apacite.bst
index f8cdfd16d12..c69c9b3b2de 100644
--- a/Master/texmf-dist/bibtex/bst/apacite/apacite.bst
+++ b/Master/texmf-dist/bibtex/bst/apacite/apacite.bst
@@ -43,14 +43,14 @@
 %% the generated files.
 %% 
 %% apacite.bst
-%%   [2012/02/14 v6.00 APA bibliography style]
+%%   [2012/02/25 v6.01 APA bibliography style]
 %% apacite.bst : reference list according to APA manual
 %% Written by Erik Meijer
 
 FUNCTION {identify.apacite.version}
 { % Put identifying string in the .blg file
   "apacite.bst"
-  " [2012/02/14 v6.00 APA bibliography style]"
+  " [2012/02/25 v6.01 APA bibliography style]"
   * top$
 }
 ENTRY
@@ -1507,10 +1507,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.
@@ -2575,8 +2577,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$
@@ -2595,8 +2601,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$
@@ -2613,13 +2623,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$
@@ -3339,10 +3347,7 @@ FUNCTION {format.in.editors.trans}
 
 FUNCTION {format.year.check}
 { "\APACrefYear{"
-  year empty$
-    { "\bibnodate{}" * }
-    { year * }
-  if$
+  protect.year *
     %
     % Add "a", "b", etc. when necessary.
     %
@@ -3354,10 +3359,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.
     %
@@ -4025,6 +4027,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
@@ -4685,11 +4689,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$
           ""
         }
diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst b/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst
index 046a4951491..007a2804076 100644
--- a/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst
+++ b/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst
@@ -43,7 +43,7 @@
 %% the generated files.
 %% 
 %% apacitex.bst
-%%   [2012/02/14 v6.00 APA bibl. style with author index info]
+%%   [2012/02/25 v6.01 APA bibl. style with author index info]
 %% apacitex.bst : reference list according to APA manual
 %%                with author indexing information
 %% Written by Erik Meijer
@@ -51,7 +51,7 @@
 FUNCTION {identify.apacite.version}
 { % Put identifying string in the .blg file
   "apacitex.bst"
- " [2012/02/14 v6.00 APA bibl. style with author index info]"
+ " [2012/02/25 v6.01 APA bibl. style with author index info]"
   * top$
 }
 ENTRY
@@ -1508,10 +1508,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.
@@ -2576,8 +2578,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$
@@ -2596,8 +2602,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$
@@ -2614,13 +2624,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$
@@ -3340,10 +3348,7 @@ FUNCTION {format.in.editors.trans}
 
 FUNCTION {format.year.check}
 { "\APACrefYear{"
-  year empty$
-    { "\bibnodate{}" * }
-    { year * }
-  if$
+  protect.year *
     %
     % Add "a", "b", etc. when necessary.
     %
@@ -3355,10 +3360,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.
     %
@@ -4026,6 +4028,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
@@ -4686,11 +4690,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$
           ""
         }