[TWiki-Dev] CVS: twiki/lib TWiki.pm,1.308,1.309

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

Update of /cvsroot/twiki/twiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2756

Modified Files:
	TWiki.pm 
Log Message:
Codev.EasierNop feature with exclamation point preceeding variables

Index: TWiki.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki.pm,v
retrieving revision 1.308
retrieving revision 1.309
diff -C2 -r1.308 -r1.309
*** TWiki.pm	22 Mar 2004 06:32:54 -0000	1.308
--- TWiki.pm	26 Mar 2004 05:49:00 -0000	1.309
***************
*** 132,136 ****
  # ===========================
  # TWiki version:
! $wikiversion      = "21 Mar 2004";
  
  # ===========================
--- 132,136 ----
  # ===========================
  # TWiki version:
! $wikiversion      = "25 Mar 2004";
  
  # ===========================
***************
*** 1985,1988 ****
--- 1985,1992 ----
      $text = takeOutVerbatim( $text, $verbatim );
  
+     # Escape rendering: Change "!%VARIABLE%" to "%<nop>VARIABLE%", for final "%VARIABLE%" output
+     # Special case: Do not escape if preceeded by ";" for "this;that;!%TOPIC%" AND NOT regex search
+     $text =~ s/(^|[^\;])\!\%([A-Z])/$1%<nop>$2/g;
+ 
      # handle all preferences and internal tags
      &TWiki::Prefs::handlePreferencesTags( $text );
***************
*** 2968,2971 ****
--- 2972,2979 ----
      $text = takeOutVerbatim( $text, \@verbatim );
  
+     # Escape rendering: Change "!%VARIABLE%" to "%<nop>VARIABLE%", for final "%VARIABLE%" output
+     # Special case: Do not escape if preceeded by ";" for "this;that;!%TOPIC%" AND NOT regex search
+     $text =~ s/(^|[^\;])\!\%([A-Z])/$1%<nop>$2/g;
+ 
      # handle all preferences and internal tags (for speed: call by reference)
      $includingWebName = $theWeb;
***************
*** 3915,3919 ****
  
  # Escape rendering: Change " !AnyWord" to " <nop>AnyWord", for final " AnyWord" output
!             s/([\s\(])\!(?=\w)/$1<nop>/g;
  
  # Blockquoted email (indented with '> ')
--- 3923,3927 ----
  
  # Escape rendering: Change " !AnyWord" to " <nop>AnyWord", for final " AnyWord" output
!             s/(^|[\s\(])\!(?=[\w\*\=])/$1<nop>/g;
  
  # Blockquoted email (indented with '> ')