*** lib/TWiki.pm.orig	Mon Nov  3 13:45:00 2003
--- lib/TWiki.pm	Mon Nov  3 13:52:10 2003
***************
*** 1807,1812 ****
--- 1807,1825 ----
      $spacedTopic =~ s/($singleLowerAlphaRegex+)($singleUpperAlphaNumRegex+)/$1%20*$2/go;   # "%20*" is " *"
      return $spacedTopic;
  }
+ # wrapper for handleSpacedTopic and SpacedWikiWordPlugin::spacedWikiWord
+ # $_[0] is "" or "P"
+ # $_[1] is %TOPIC%
+ sub handleSpacedTopics
+ {
+     if ($_[0] eq 'P') {
+       use TWiki::Plugins::SpacedWikiWordPlugin;
+       return &TWiki::Plugins::SpacedWikiWordPlugin::spacedWikiWord( $_[1] ); 
+     } else {
+       return &handleSpacedTopic($_[1]);
+     }
+ }
+ 
  
  # =========================
  sub handleInternalTags
***************
*** 1834,1840 ****
      $_[0] =~ s/%TOPIC%/$_[1]/g;
      $_[0] =~ s/%BASETOPIC%/$topicName/g;
      $_[0] =~ s/%INCLUDINGTOPIC%/$includingTopicName/g;
!     $_[0] =~ s/%SPACEDTOPIC%/&handleSpacedTopic($_[1])/ge;
      $_[0] =~ s/%WEB%/$_[2]/g;
      $_[0] =~ s/%BASEWEB%/$webName/g;
      $_[0] =~ s/%INCLUDINGWEB%/$includingWebName/g;
--- 1847,1853 ----
      $_[0] =~ s/%TOPIC%/$_[1]/g;
      $_[0] =~ s/%BASETOPIC%/$topicName/g;
      $_[0] =~ s/%INCLUDINGTOPIC%/$includingTopicName/g;
!     $_[0] =~ s/%SPACEDTOPIC(P?)%/&handleSpacedTopics($1,$_[1])/ge;
      $_[0] =~ s/%WEB%/$_[2]/g;
      $_[0] =~ s/%BASEWEB%/$webName/g;
      $_[0] =~ s/%INCLUDINGWEB%/$includingWebName/g;