aomart (8mar11)

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

1 files changed, 26 insertions, 20 deletions

diff --git a/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst b/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst
index 4a781e19693..9fa277d053f 100644
--- a/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst
+++ b/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst
@@ -20,7 +20,7 @@
 % This work consists of the file aomart.dtx the
 % derived file aomart.cls, and the file aomplain.bst
 %
-% Version 1.5, 2011/02/26
+% Version 1.6, 2011/03/06
 %
 %%%
 
@@ -1198,26 +1198,32 @@ FUNCTION {editor.key.organization.label}
 }
 
 FUNCTION {calc.label}
-{ type$ "book" =
-  type$ "inbook" =
-  or
-    'author.editor.key.label
-    { type$ "proceedings" =
-	'editor.key.organization.label
-	{ type$ "manual" =
-	    'author.key.organization.label
-	    'author.key.label
-	  if$
-	}
-      if$
-    }
+{key empty$
+  { type$ "book" =
+    type$ "inbook" =
+    or
+      'author.editor.key.label
+      { type$ "proceedings" =
+  	'editor.key.organization.label
+	  { type$ "manual" =
+	      'author.key.organization.label
+	      'author.key.label
+	    if$
+	  }
+        if$
+      }
+    if$
+    duplicate$
+    year field.or.null purify$ #-1 #2 substring$
+    *
+    'label :=
+    year field.or.null purify$ #-1 #4 substring$
+    *
+  }
+  { 
+    key duplicate$ 'label := 
+  }
   if$
-  duplicate$
-  year field.or.null purify$ #-1 #2 substring$
-  *
-  'label :=
-  year field.or.null purify$ #-1 #4 substring$
-  *
   sortify 'sort.label :=
 }