[TWiki-Dev] CVS: twiki/bin TWiki.pm,1.10,1.11

[Peter T. <pet...@us...>]

Update of /cvsroot/twiki/twiki/bin
In directory usw-pr-cvs1:/tmp/cvs-serv24363

Modified Files:
	TWiki.pm 
Log Message:
TOC with INCLUDE possible

Index: TWiki.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/TWiki.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** TWiki.pm	2001/03/03 18:58:41	1.10
--- TWiki.pm	2001/03/05 00:57:45	1.11
***************
*** 100,104 ****
  # ===========================
  # TWiki version:
! $wikiversion      = "02 Mar 2001";
  
  # ===========================
--- 100,104 ----
  # ===========================
  # TWiki version:
! $wikiversion      = "04 Mar 2001";
  
  # ===========================
***************
*** 121,126 ****
    %mon2num = map { $_ => $count++ } @isoMonth; }
  
! $headerPatternDa = '^---+(\++)\s+(.+)\s*$';     # '---++ Header', '---+ Header'
! $headerPatternSp = '^\t(\++)\s+(.+)\s*$';       # '   ++ Header', '   + Header'
  $headerPatternHt = '^<h([1-6])>\s*(.+?)\s*</h[1-6]>'; # '<h6>Header</h6>
  
--- 121,127 ----
    %mon2num = map { $_ => $count++ } @isoMonth; }
  
! # Header patterns based on '+++'. The '###' are reserved for numbered headers
! $headerPatternDa = '^---+(\++|\#+)\s+(.+)\s*$';       # '---++ Header', '---## Header'
! $headerPatternSp = '^\t(\++|\#+)\s+(.+)\s*$';         # '   ++ Header', '   + Header'
  $headerPatternHt = '^<h([1-6])>\s*(.+?)\s*</h[1-6]>'; # '<h6>Header</h6>
  
***************
*** 695,700 ****
              return showError( "TOC: Cannot find topic \"$web.$topicname\"" );
          }
!         @list = split( /\n/, &TWiki::Store::readWebTopic( $web, $topicname ) );
!         # FIXME: Recursively %INCLUDE{...}% handling is pending
      }
  
--- 696,701 ----
              return showError( "TOC: Cannot find topic \"$web.$topicname\"" );
          }
!         @list = split( /\n/, handleCommonTags( 
!             &TWiki::Store::readWebTopic( $web, $topicname ), $topicname, $web ) );
      }
  
***************
*** 814,819 ****
      $_[0] =~ s/%STOPINCLUDE%//go;
      $_[0] =~ s/%SEARCH{(.*?)}%/&handleSearchWeb($1)/geo;
-     $_[0] =~ s/%TOC{([^}]*)}%/&handleToc($_[0],$_[1],$_[2],$1)/geo;
-     $_[0] =~ s/%TOC%/&handleToc($_[0],$_[1],$_[2],"")/geo;
  }
  
--- 815,818 ----
***************
*** 843,846 ****
--- 842,848 ----
      &TWiki::Prefs::handlePreferencesTags( $text );
      handleInternalTags( $text, $theTopic, $theWeb );
+ 
+     $text =~ s/%TOC{([^}]*)}%/&handleToc($text,$theTopic,$theWeb,$1)/geo;
+     $text =~ s/%TOC%/&handleToc($text,$theTopic,$theWeb,"")/geo;
  
      return $text;