[Moin-devel] CVS: MoinMoin/parser wiki.py,1.72,1.73

[J?rgen Hermann]

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

Modified Files:
	wiki.py 
Log Message:
Anchor links


Index: wiki.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/wiki.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** wiki.py	2002/01/28 20:58:07	1.72
--- wiki.py	2002/01/30 22:04:13	1.73
***************
*** 69,73 ****
  (?P<interwiki>[A-Z][a-zA-Z]+\:[^\s'\"\:\<]([^\s%(punct)s]|([%(punct)s][^\s%(punct)s]))+)
  (?P<word>%(word_rule)s)
! (?P<url_bracket>\[(%(url)s)\:[^\s\]]+(\s[^\]]+)?\])
  (?P<url>%(url_rule)s)
  (?P<email>[-\w._+]+\@[\w-]+\.[\w.-]+)
--- 69,73 ----
  (?P<interwiki>[A-Z][a-zA-Z]+\:[^\s'\"\:\<]([^\s%(punct)s]|([%(punct)s][^\s%(punct)s]))+)
  (?P<word>%(word_rule)s)
! (?P<url_bracket>\[((%(url)s)\:|#)[^\s\]]+(\s[^\]]+)?\])
  (?P<url>%(url_rule)s)
  (?P<email>[-\w._+]+\@[\w-]+\.[\w.-]+)
***************
*** 306,311 ****
          words = string.split(word[1:-1], None, 1)
          if len(words) == 1: words = words * 2
-         scheme = string.split(words[0], ":", 1)[0]
  
          if scheme == "wiki": return self.interwiki(words, pretty_url=1)
          if scheme == "attachment": return self.attachment(words, pretty_url=1)
--- 306,315 ----
          words = string.split(word[1:-1], None, 1)
          if len(words) == 1: words = words * 2
  
+         if words[0][0] == '#':
+             # anchor link
+             return self.formatter.url(words[0], self.highlight_text(words[1]))
+ 
+         scheme = string.split(words[0], ":", 1)[0]
          if scheme == "wiki": return self.interwiki(words, pretty_url=1)
          if scheme == "attachment": return self.attachment(words, pretty_url=1)
***************
*** 703,707 ****
          eol_re = re.compile(r'\r?\n')
  
!         # get text and replaces TABs
          rawtext = string.expandtabs(self.raw)
  
--- 707,711 ----
          eol_re = re.compile(r'\r?\n')
  
!         # get text and replace TABs
          rawtext = string.expandtabs(self.raw)