Index: token_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/Attic/token_node.inc,v
retrieving revision 1.5.4.30
diff -u -p -r1.5.4.30 token_node.inc
--- token_node.inc	24 Jul 2010 20:25:04 -0000	1.5.4.30
+++ token_node.inc	23 Sep 2010 15:32:46 -0000
@@ -79,8 +79,8 @@ function node_token_values($type, $objec
           $trail[] = check_plain($title);
         }
 
-        $values['menupath']            = implode('/', $trail);
-        $values['menupath-raw']        = implode('/', $trail_raw);
+        $values['menupath']            = !empty($options['pathauto']) ? $trail : implode('/', $trail);
+        $values['menupath-raw']        = !empty($options['pathauto']) ? $trail_raw : implode('/', $trail_raw);
         $values['menu']                = check_plain($menu);
         $values['menu-raw']            = $menu;
         $values['menu-link-title']     = check_plain($menu_link['title']);
@@ -294,8 +294,8 @@ function book_token_values($type, $objec
       $tokens['book'] = $book;
       $tokens['book-raw'] = $book_raw;
       $tokens['book_id'] = $node->book['bid'];
-      $tokens['bookpath'] = implode('/', $trail);
-      $tokens['bookpath-raw'] = implode('/', $trail_raw);
+      $tokens['bookpath'] = !empty($options['pathauto']) ? $trail : implode('/', $trail);
+      $tokens['bookpath-raw'] = !empty($options['pathauto']) ? $trail_raw : implode('/', $trail_raw);
     }
 
     return $tokens;