Index: nodewords.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords.module,v
retrieving revision 1.57.2.356
diff -u -r1.57.2.356 nodewords.module
--- nodewords.module	30 May 2010 01:44:53 -0000	1.57.2.356
+++ nodewords.module	28 Jun 2010 19:07:42 -0000
@@ -251,10 +251,18 @@
  */
 function nodewords_add_tokens_help(&$form, $type) {
   switch ($type['type']) {
-    case NODEWORDS_TYPE_ERRORPAGE:
     case NODEWORDS_TYPE_PAGE:
       $tokens_type[] = 'global';
       $tokens_type[] = 'global meta tags';
+      $tokens_type[] = 'node';
+      $tokens_type[] = 'node meta tags';
+      $tokens_type[] = 'taxonomy';
+      $tokens_type[] = 'user';
+      break;
+	  
+    case NODEWORDS_TYPE_ERRORPAGE:
+      $tokens_type[] = 'global';
+      $tokens_type[] = 'global meta tags';
       break;
 
     case NODEWORDS_TYPE_DEFAULT:
@@ -578,9 +586,23 @@
   }
 
   switch ($options['type']) {
-    case NODEWORDS_TYPE_ERRORPAGE:
     case NODEWORDS_TYPE_PAGE:
       $token_objects['global'] = NULL;
+      $token_objects['global meta tags'] = NULL;
+	  if (arg(0) == 'node') {
+		$token_objects['node'] = _nodewords_node_load($options);
+		$token_objects['node meta tags'] = $token_objects['node'];
+	  }
+	  if (arg(0) == 'taxonomy' && arg(1) == 'term' && is_numeric(arg(2))) {
+		$token_objects['taxonomy'] = _nodewords_taxonomy_object_load($options);
+	  }
+	  if (arg(0) == 'user') {
+		$token_objects['user'] = user_load($options['id']);
+	  }
+      break;
+	  
+    case NODEWORDS_TYPE_ERRORPAGE:
+      $token_objects['global'] = NULL;
       break;
 
     case NODEWORDS_TYPE_NODE: