[Docstring-checkins] CVS: dps/dps nodes.py,1.18,1.19

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

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

Modified Files:
	nodes.py 
Log Message:
- Removed generic 'directive'.
- Changed 'substitution' to 'substitution_defnition'.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** nodes.py	2001/11/09 23:13:22	1.18
--- nodes.py	2001/11/19 04:06:00	1.19
***************
*** 347,351 ****
          self.externaltargets = {}
          self.indirecttargets = {}
!         self.substitutions = {}
          self.refnames = {}
          self.substitutionrefs = {}
--- 347,351 ----
          self.externaltargets = {}
          self.indirecttargets = {}
!         self.substitutiondefs = {}
          self.refnames = {}
          self.substitutionrefs = {}
***************
*** 450,460 ****
          self.autofootnoterefs.append((refname, refnode))
  
!     def addsubstitution(self, name, substitutionnode, innode):
!         if self.substitutions.has_key(name):
              sw = self.errorhandler.error(
!                   'Duplicate substitution name: "%s"' % name)
              innode += sw
!         self.substitutions[name] = substitutionnode
!         substitutionnode['name'] = name
  
      def addsubstitutionref(self, refname, subrefnode):
--- 450,462 ----
          self.autofootnoterefs.append((refname, refnode))
  
!     def addsubstitutiondef(self, name, substitutiondefnode, innode):
!         if self.substitutiondefs.has_key(name):
              sw = self.errorhandler.error(
!                   'Duplicate substitution definition name: "%s"' % name)
              innode += sw
!             oldnode = self.substitutiondefs[name]
!             oldnode['dupname'] = oldnode['name']
!             del oldnode['name']
!         self.substitutiondefs[name] = substitutiondefnode
  
      def addsubstitutionref(self, refname, subrefnode):
***************
*** 555,560 ****
  class warning(Admonition, Element): pass
  class comment(Special, TextElement): pass
! class directive(Special, TextElement): pass
! class substitution(Special, TextElement): pass
  class target(Special, Inline, TextElement): pass
  class footnote(General, Element): pass
--- 557,561 ----
  class warning(Admonition, Element): pass
  class comment(Special, TextElement): pass
! class substitution_definition(Special, TextElement): pass
  class target(Special, Inline, TextElement): pass
  class footnote(General, Element): pass