[Docstring-checkins] CVS: dps/dps nodes.py,1.11,1.12

[David G. <go...@us...>]

Update of /cvsroot/docstring/dps/dps
In directory usw-pr-cvs1:/tmp/cvs-serv18494/dps/dps

Modified Files:
	nodes.py 
Log Message:
  - Renamed 'indirect' hyperlink targets -> 'external'.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** nodes.py	2001/09/26 03:32:11	1.11
--- nodes.py	2001/10/20 03:07:15	1.12
***************
*** 314,318 ****
          self.explicitlinks = {}
          self.implicitlinks = {}
!         self.indirectlinks = {}
          self.refnames = {}
          self.autofootnotes = []
--- 314,318 ----
          self.explicitlinks = {}
          self.implicitlinks = {}
!         self.externallinks = {}
          self.refnames = {}
          self.autofootnotes = []
***************
*** 329,333 ****
              innode = linknode
          if self.explicitlinks.has_key(name) \
!               or self.indirectlinks.has_key(name) \
                or self.implicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
--- 329,333 ----
              innode = linknode
          if self.explicitlinks.has_key(name) \
!               or self.externallinks.has_key(name) \
                or self.implicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
***************
*** 349,353 ****
              innode += sw
              self.clearlinknames(name, self.explicitlinks, self.implicitlinks,
!                                 self.indirectlinks)
              linknode['dupname'] = name
              self.explicitlinks.setdefault(name, []).append(linknode)
--- 349,353 ----
              innode += sw
              self.clearlinknames(name, self.explicitlinks, self.implicitlinks,
!                                 self.externallinks)
              linknode['dupname'] = name
              self.explicitlinks.setdefault(name, []).append(linknode)
***************
*** 371,375 ****
          self.refnames.setdefault(name, []).append(node)
  
!     def addindirectlink(self, name, reference, linknode, innode):
          if self.explicitlinks.has_key(name):
              level = 0
--- 371,375 ----
          self.refnames.setdefault(name, []).append(node)
  
!     def addexternallink(self, name, reference, linknode, innode):
          if self.explicitlinks.has_key(name):
              level = 0
***************
*** 379,385 ****
                      break
              sw = self.errorhandler.system_warning(
!                   level, 'Duplicate indirect link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.explicitlinks, self.indirectlinks,
                                  self.implicitlinks)
          elif self.implicitlinks.has_key(name):
--- 379,385 ----
                      break
              sw = self.errorhandler.system_warning(
!                   level, 'Duplicate external link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.explicitlinks, self.externallinks,
                                  self.implicitlinks)
          elif self.implicitlinks.has_key(name):
***************
*** 389,393 ****
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
!         self.indirectlinks.setdefault(name, []).append(linknode)
          self.explicitlinks.setdefault(name, []).append(linknode)
          linknode['name'] = name
--- 389,393 ----
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
!         self.externallinks.setdefault(name, []).append(linknode)
          self.explicitlinks.setdefault(name, []).append(linknode)
          linknode['name'] = name