Index: pathauto_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto_node.inc,v
retrieving revision 1.7
diff -u -F^f -r1.7 pathauto_node.inc
--- pathauto_node.inc	20 Aug 2005 19:28:15 -0000	1.7
+++ pathauto_node.inc	27 Aug 2005 09:26:49 -0000
@@ -54,13 +54,25 @@ function node_pathauto($op) {
         $settings['placeholders'][t('[bookpath]')] = 
           t('For book pages, the full hierarchy from the top-level book.');
       }
-      
+
+      if (defined('PATHAUTO_MENU')) {
+        $settings['placeholders'][t('[menu]')] =
+          t('The name of the menu the node belongs to.');
+        $settings['placeholders'][t('[menupath]')] =
+          t('The menu path (as reflected in the breadcrumb), not including Home or [menu].');
+      }
+
       $nodetypes = node_list();
       foreach ($nodetypes as $ntype) {
         $displaytype = node_invoke($ntype,'node_name');
         $fieldlabel = t('Pattern for all '.$displaytype.' paths');
         $settings['patternitems'][$ntype] = $fieldlabel;
       }
+
+      if (defined('PATHAUTO_MENU')) {
+        $settings['patternitems']['menu'] = t('Pattern for all nodes that are in the menu');
+      }
+
       return array2object($settings);
     default:
       break;
@@ -172,6 +184,11 @@ function node_get_placeholders($node) {
     $placeholders[t('[vocab]')] = '';
     $placeholders[t('[catalias]')] = '';
   }
+
+  if (defined('PATHAUTO_MENU')) {
+    $placeholders = array_merge($placeholders, pathauto_menu_get_placeholders('node/'.$node->nid));
+  }
+
   return $placeholders;
 }