New wildcard symbol for more fine-control (revised)

Using the Extend Pathes feature of Taxonomy Theme I have run into the following problem: I have two themes, A and B, and want the following mapping:

A: node/[any number]
B: node/[any number]/add

If I code this in module Taxonomy Theme,

A: node/*
B: node/*/add

the behaviour is dependent on the order in which the themes are checked: For instance, if I am visiting page 'node/3/add' and the rule for theme A is checked first then the rule for theme B is the last matching one (and therfore B will be taken). However, if the rule for theme A is checked last, it applies (as * matches '3/add') and therefore A will be taken — not what I wanted in the first place! This leads to undeterministic behaviour.

I propose to add the wildcard # which shall match any string not containing a forward slash. With this, the above problem can be solved via

A: node/#
B: node/#/add

The attached patch changes mainly two lines of the existing code. Here it is:

Index: taxonomy_theme_admin.inc
===================================================================
--- taxonomy_theme_admin.inc	(revision 1)
+++ taxonomy_theme_admin.inc	(working copy)
@@ -340,7 +340,7 @@
     '#collapsed' => FALSE,
   );
   if (variable_get('taxonomy_theme_extended_enable', 0)) {
-    $form['taxonomy_theme_extended']['help'] = array('#value' => t('<p>To assign a theme for a particular path enter the path into according textarea.<br />Enter one path per line as Drupal paths (or path aliases). Character \'*\' is a wildcard.<br /><i>Adding \'node/6\' to the \'bluemarine\' field will assign bluemarine theme to node 6.</i></p>'));
+    $form['taxonomy_theme_extended']['help'] = array('#value' => t('<p>To assign a theme for a particular path enter the path into according textarea.<br />Enter one path per line as Drupal paths (or path aliases). Character \'*\' is a wildcard for any string and character \'#\' is a wildcard for any string not containing a forward slash (\'/\').<br /><i>Adding \'node/6\' to the \'bluemarine\' field will assign bluemarine theme to node 6.</i></p>'));
     $form['taxonomy_theme_extended']['theme_pathes'] = array('#tree' => TRUE);
     $options_admin_themes = _taxonomy_theme_options(TRUE, FALSE);
     foreach($options_admin_themes as $themex) {
Index: taxonomy_theme_pathes.inc
===================================================================
--- taxonomy_theme_pathes.inc	(revision 1)
+++ taxonomy_theme_pathes.inc	(working copy)
@@ -16,6 +16,7 @@
   foreach ($themes as $themex) {
     $pathes_regexp = _taxonomy_theme_expcache($themex->name);
     if (preg_grep($pathes_regexp, array($uri, $alias_uri))) {
+      error_log('new theme "'.$themex->name.'"', 0);
       $custom_theme = $themex->name;
     }
   }
@@ -37,7 +38,7 @@
     if (db_num_rows($result)) {
       while ($path = db_fetch_object($result)) {
         $pathes .= empty($pathes) ? '' : '|';
-        $pathes .= str_replace(array('*', '/'), array('.*', '\/'), drupal_get_normal_path($path->path));
+        $pathes .= str_replace(array('*', '/', '#'), array('.*', '\/', '[^\/]*'), drupal_get_normal_path($path->path));
       }
     }
     $cache[$theme_name] = '/^('.$pathes.')$/';