[Moin-devel] CVS: MoinMoin/parser wiki.py,1.83,1.84

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin/parser
In directory usw-pr-cvs1:/tmp/cvs-serv24018/MoinMoin/parser

Modified Files:
	wiki.py 
Log Message:
Processor bang path must directly follow {{{, except for Colorize (have
to support 0.11 colored code displays); added first version of CSV 
processor


Index: wiki.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/wiki.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** wiki.py	16 Mar 2002 20:31:37 -0000	1.83
--- wiki.py	17 Mar 2002 13:46:16 -0000	1.84
***************
*** 59,62 ****
--- 59,63 ----
  (?P<sup>\^.*?\^)
  (?P<tt>\{\{\{.*?\}\}\})
+ (?P<processor>(\{\{\{#!.*))
  (?P<pre>(\{\{\{ ?|\}\}\}))
  (?P<rule>-{4,})
***************
*** 103,106 ****
--- 104,108 ----
          self.list_types = []
  
+ 
      def _check_p(self):
          if not (self.formatter.in_p or self.in_pre):
***************
*** 572,575 ****
--- 574,599 ----
  
  
+     def _processor_repl(self, word):
+         """Handle processed code displays."""
+         if word[:3] == '{{{': word = word[3:]
+ 
+         from MoinMoin.processor import processors
+         self.processor = None
+         processor_name = string.split(word[2:])[0]
+         if processor_name in processors:
+             self.processor = util.importName("MoinMoin.processor." +
+                 processor_name, "process")
+ 
+         if self.processor:
+             self.in_pre = 2
+             self.colorize_lines = [word]
+             return ''
+         else:
+             self._check_p()
+             self.in_pre = 1
+             return self.formatter.preformatted(self.in_pre) + \
+                 self.formatter.text(word)
+ 
+ 
      def _pre_repl(self, word):
          """Handle code displays."""
***************
*** 585,588 ****
--- 609,613 ----
          return word
  
+ 
      def _smiley_repl(self, word):
          """Handle smileys."""
***************
*** 773,777 ****
              if self.in_pre:
                  if self.in_pre == 2:
!                     # colorization mode
                      endpos = string.find(line, "}}}")
                      if endpos == -1:
--- 798,802 ----
              if self.in_pre:
                  if self.in_pre == 2:
!                     # processing mode
                      endpos = string.find(line, "}}}")
                      if endpos == -1:
***************
*** 785,803 ****
                      # send rest of line through regex machinery
                      line = line[endpos+3:]                    
!                 elif string.strip(line)[:2] == "#!":
!                     self.processor = None
!                     if string.find(line, 'python') > 0:
!                         from MoinMoin.processor.Colorize import process
!                         self.processor = process
!                     else:
!                         from MoinMoin.processor import processors
!                         processor_name = string.split(line[2:])[0]
!                         if processor_name in processors:
!                             self.processor = util.importName("MoinMoin.processor." +
!                                 processor_name, "process")
!                     if self.processor:
!                         self.in_pre = 2
!                         self.colorize_lines = [line]
!                         continue
              else:
                  # paragraph break on empty lines
--- 810,819 ----
                      # send rest of line through regex machinery
                      line = line[endpos+3:]                    
!                 elif string.strip(line)[:2] == "#!" and string.find(line, 'python') > 0:
!                     from MoinMoin.processor.Colorize import process
!                     self.processor = process
!                     self.in_pre = 2
!                     self.colorize_lines = [line]
!                     continue
              else:
                  # paragraph break on empty lines