*** lib/TWiki.pm.orig	Wed Jan  5 17:32:55 2005
--- lib/TWiki.pm	Wed Jan  5 19:44:26 2005
***************
*** 2850,2855 ****
--- 2850,2870 ----
      $spacedTopic =~ s/($regex{singleLowerAlphaRegex}+)($regex{singleUpperAlphaNumRegex}+)/$1%20*$2/go;   # "%20*" is " *" - I18N: only in ASCII-derived charsets
      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;
+       my $title= &TWiki::Plugins::SpacedWikiWordPlugin::spacedWikiWord($_[1]);
+       $title =~ s/ / /g;
+       return $title;
+     } else {
+       return &handleSpacedTopic($_[1]);
+     }
+ }
+ 
  
  # =========================
  =pod
***************
*** 2932,2938 ****
      $_[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;
--- 2947,2953 ----
      $_[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;