[Moin-devel] CVS: MoinMoin/formatter base.py,1.20,1.21 text_html.py,1.38,1.39 text_plain.py,1.16,1.17 text_xml.py,1.25,1.26

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin/formatter
In directory usw-pr-cvs1:/tmp/cvs-serv27213/MoinMoin/formatter

Modified Files:
	base.py text_html.py text_plain.py text_xml.py 
Log Message:
Macro-generated pagelinks are no longer added to the list of links;
WantedPages now highlights the wanted page on the wanting pages


Index: base.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/base.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** base.py	17 Mar 2002 11:03:57 -0000	1.20
--- base.py	20 Mar 2002 23:57:07 -0000	1.21
***************
*** 51,55 ****
          return markup
  
!     def pagelink(self, pagename, text=None):
          if self._store_pagelinks and pagename not in self.pagelinks:
              self.pagelinks.append(pagename)
--- 51,56 ----
          return markup
  
!     def pagelink(self, pagename, text=None, **kw):
!         if kw.get('generated', 0): return
          if self._store_pagelinks and pagename not in self.pagelinks:
              self.pagelinks.append(pagename)

Index: text_html.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_html.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** text_html.py	17 Mar 2002 11:03:57 -0000	1.38
--- text_html.py	20 Mar 2002 23:57:07 -0000	1.39
***************
*** 51,56 ****
  
  
!     def pagelink(self, pagename, text=None):
!         FormatterBase.pagelink(self, pagename, text)
          return Page(pagename).link_to(text)
  
--- 51,56 ----
  
  
!     def pagelink(self, pagename, text=None, **kw):
!         apply(FormatterBase.pagelink, (self, pagename, text), kw)
          return Page(pagename).link_to(text)
  

Index: text_plain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_plain.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** text_plain.py	17 Mar 2002 11:03:57 -0000	1.16
--- text_plain.py	20 Mar 2002 23:57:07 -0000	1.17
***************
*** 34,39 ****
          return '\n'
  
!     def pagelink(self, pagename, text=None):
!         FormatterBase.pagelink(self, pagename, text)
          return ">>%s<<" % (pagename,)
  
--- 34,39 ----
          return '\n'
  
!     def pagelink(self, pagename, text=None, **kw):
!         apply(FormatterBase.pagelink, (self, pagename, text), kw)
          return ">>%s<<" % (pagename,)
  

Index: text_xml.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_xml.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** text_xml.py	17 Mar 2002 11:03:57 -0000	1.25
--- text_xml.py	20 Mar 2002 23:57:07 -0000	1.26
***************
*** 55,60 ****
          return '<![CDATA[' + string.replace(markup, ']]>', ']]>]]><![CDATA[') + ']]>'
  
!     def pagelink(self, pagename, text=None):
!         FormatterBase.pagelink(self, pagename, text)
          return Page(pagename, formatter=self).link_to(text)
  
--- 55,60 ----
          return '<![CDATA[' + string.replace(markup, ']]>', ']]>]]><![CDATA[') + ']]>'
  
!     def pagelink(self, pagename, text=None, **kw):
!         apply(FormatterBase.pagelink, (self, pagename, text), kw)
          return Page(pagename, formatter=self).link_to(text)