docstring-checkins — CVS checkin messages

RE: [Docstring-checkins] CVS: dps/dps nodes.py,1.16,1.17

[Tony J I. (Tibs) <to...@ls...>]

>   - Removed leading underscores from functional node base classes.

Yes! Thanks - that saved me asking for it.

>   - Added element hierarchy base classes.

Yes! I was going to ask about something like this - it will make some of
the stuff I'm working on rather easier, I think - I'll now need to look
at it and see if it does what I want "out of the box".

Tibs

--
Tony J Ibbs (Tibs)      http://www.tibsnjoan.co.uk/
"Bounce with the bunny. Strut with the duck.
 Spin with the chickens now - CLUCK CLUCK CLUCK!"
BARNYARD DANCE! by Sandra Boynton
My views! Mine! Mine! (Unless Laser-Scan ask nicely to borrow them.)

[Docstring-checkins] CVS: dps/dps nodes.py,1.16,1.17

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

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

Modified Files:
	nodes.py 
Log Message:
  - Removed leading underscores from functional node base classes.
  - Added 'hint', 'substitution', 'substitution_reference' classes.
  - Added element hierarchy base classes.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** nodes.py	2001/10/31 05:55:26	1.16
--- nodes.py	2001/11/06 02:09:44	1.17
***************
*** 15,22 ****
  from UserString import MutableString
  
! class _Node:
  
      def __nonzero__(self):
!         """_Node instances are always true."""
          return 1
  
--- 15,26 ----
  from UserString import MutableString
  
! # ==============================
! #  Functional Node Base Classes
! # ==============================
! 
! class Node:
  
      def __nonzero__(self):
!         """Node instances are always true."""
          return 1
  
***************
*** 37,41 ****
  
  
! class Text(_Node, MutableString):
  
      tagname = '#text'
--- 41,45 ----
  
  
! class Text(Node, MutableString):
  
      tagname = '#text'
***************
*** 64,71 ****
  
  
! class _Element(_Node):
  
      """
!     `_Element` is the superclass to all specific elements.
  
      Elements contain attributes and child nodes. Elements emulate dictionaries
--- 68,75 ----
  
  
! class Element(Node):
  
      """
!     `Element` is the superclass to all specific elements.
  
      Elements contain attributes and child nodes. Elements emulate dictionaries
***************
*** 204,208 ****
      def __iadd__(self, other):
          """Append a node or a list of nodes to `self.children`."""
!         if isinstance(other, _Node):
              self.children.append(other)
          elif other is not None:
--- 208,212 ----
      def __iadd__(self, other):
          """Append a node or a list of nodes to `self.children`."""
!         if isinstance(other, Node):
              self.children.append(other)
          elif other is not None:
***************
*** 228,232 ****
  
      def append(self, item):
!         assert isinstance(item, _Node)
          self.children.append(item)
  
--- 232,236 ----
  
      def append(self, item):
!         assert isinstance(item, Node)
          self.children.append(item)
  
***************
*** 235,239 ****
  
      def insert(self, i, item):
!         assert isinstance(item, _Node)
          self.children.insert(i, item)
  
--- 239,243 ----
  
      def insert(self, i, item):
!         assert isinstance(item, Node)
          self.children.insert(i, item)
  
***************
*** 242,246 ****
  
      def remove(self, item):
!         assert isinstance(item, _Node)
          self.children.remove(item)
  
--- 246,250 ----
  
      def remove(self, item):
!         assert isinstance(item, Node)
          self.children.remove(item)
  
***************
*** 284,293 ****
  
  
! class _TextElement(_Element):
  
      """
      An element which directly contains text.
  
!     Its children are all Text or _TextElement nodes.
      """
  
--- 288,297 ----
  
  
! class TextElement(Element):
  
      """
      An element which directly contains text.
  
!     Its children are all Text or TextElement nodes.
      """
  
***************
*** 298,320 ****
          if text != '':
              textnode = Text(text)
!             _Element.__init__(self, rawsource, textnode, *children,
                                **attributes)
          else:
!             _Element.__init__(self, rawsource, *children, **attributes)
  
  
  # ==============
  #  Root Element
  # ==============
  
! class document(_Element):
  
      def __init__(self, errorhandler, *args, **kwargs):
!         _Element.__init__(self, *args, **kwargs)
          self.explicittargets = {}
          self.implicittargets = {}
          self.externaltargets = {}
          self.indirecttargets = {}
          self.refnames = {}
          self.anonymoustargets = []
          self.anonymousrefs = []
--- 302,353 ----
          if text != '':
              textnode = Text(text)
!             Element.__init__(self, rawsource, textnode, *children,
                                **attributes)
          else:
!             Element.__init__(self, rawsource, *children, **attributes)
! 
  
+ # ====================
+ #  Element Categories
+ # ====================
+ 
+ class Root: pass
+ 
+ class Title: pass
  
+ class Bibliographic: pass
+ 
+ class Structural: pass
+ 
+ class Body: pass
+ 
+ class General(Body): pass
+ 
+ class List(Body): pass
+ 
+ class Admonition(Body): pass
+ 
+ class Special(Body): pass
+ 
+ class Component: pass
+ 
+ class Inline: pass
+ 
+ 
  # ==============
  #  Root Element
  # ==============
  
! class document(Root, Element):
  
      def __init__(self, errorhandler, *args, **kwargs):
!         Element.__init__(self, *args, **kwargs)
          self.explicittargets = {}
          self.implicittargets = {}
          self.externaltargets = {}
          self.indirecttargets = {}
+         self.substitutions = {}
          self.refnames = {}
+         self.substitutionrefs = {}
          self.anonymoustargets = []
          self.anonymousrefs = []
***************
*** 325,329 ****
      def asdom(self, dom=xml.dom.minidom):
          domroot = dom.Document()
!         domroot.appendChild(_Element._rooted_dom_node(self, domroot))
          return domroot
  
--- 358,362 ----
      def asdom(self, dom=xml.dom.minidom):
          domroot = dom.Document()
!         domroot.appendChild(Element._rooted_dom_node(self, domroot))
          return domroot
  
***************
*** 334,339 ****
                or self.externaltargets.has_key(name) \
                or self.implicittargets.has_key(name):
!             sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit target name: "%s"' % name)
              innode += sw
              self.cleartargetnames(name, self.implicittargets)
--- 367,372 ----
                or self.externaltargets.has_key(name) \
                or self.implicittargets.has_key(name):
!             sw = self.errorhandler.information(
!                   'Duplicate implicit target name: "%s"' % name)
              innode += sw
              self.cleartargetnames(name, self.implicittargets)
***************
*** 348,353 ****
              innode = targetnode
          if self.explicittargets.has_key(name):
!             sw = self.errorhandler.system_warning(
!                   1, 'Duplicate explicit target name: "%s"' % name)
              innode += sw
              self.cleartargetnames(name, self.explicittargets,
--- 381,386 ----
              innode = targetnode
          if self.explicittargets.has_key(name):
!             sw = self.errorhandler.warning(
!                   'Duplicate explicit target name: "%s"' % name)
              innode += sw
              self.cleartargetnames(name, self.explicittargets,
***************
*** 357,362 ****
              return
          elif self.implicittargets.has_key(name):
!             sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit target name: "%s"' % name)
              innode += sw
              self.cleartargetnames(name, self.implicittargets)
--- 390,395 ----
              return
          elif self.implicittargets.has_key(name):
!             sw = self.errorhandler.information(
!                   'Duplicate implicit target name: "%s"' % name)
              innode += sw
              self.cleartargetnames(name, self.implicittargets)
***************
*** 388,393 ****
          elif self.implicittargets.has_key(name):
              print >>sys.stderr, "already has explicit target"
!             sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit target name: "%s"' % name)
              innode += sw
              self.cleartargetnames(name, self.implicittargets)
--- 421,426 ----
          elif self.implicittargets.has_key(name):
              print >>sys.stderr, "already has explicit target"
!             sw = self.errorhandler.information(
!                   'Duplicate implicit target name: "%s"' % name)
              innode += sw
              self.cleartargetnames(name, self.implicittargets)
***************
*** 417,427 ****
          self.autofootnoterefs.append((refname, refnode))
  
  
  # ================
  #  Title Elements
  # ================
  
! class title(_TextElement): pass
! class subtitle(_TextElement): pass
  
  
--- 450,472 ----
          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):
+         subrefnode['refname'] = refname
+         self.substitutionrefs.setdefault(refname, []).append(subrefnode)
+ 
+ 
  # ================
  #  Title Elements
  # ================
  
! class title(Title, TextElement): pass
! class subtitle(Title, TextElement): pass
  
  
***************
*** 430,444 ****
  # ========================
  
! class docinfo(_Element): pass
! class author(_TextElement): pass
! class authors(_Element): pass
! class organization(_TextElement): pass
! class contact(_TextElement): pass
! class version(_TextElement): pass
! class revision(_TextElement): pass
! class status(_TextElement): pass
! class date(_TextElement): pass
! class copyright(_TextElement): pass
! class abstract(_Element): pass
  
  
--- 475,489 ----
  # ========================
  
! class docinfo(Bibliographic, Element): pass
! class author(Bibliographic, TextElement): pass
! class authors(Bibliographic, Element): pass
! class organization(Bibliographic, TextElement): pass
! class contact(Bibliographic, TextElement): pass
! class version(Bibliographic, TextElement): pass
! class revision(Bibliographic, TextElement): pass
! class status(Bibliographic, TextElement): pass
! class date(Bibliographic, TextElement): pass
! class copyright(Bibliographic, TextElement): pass
! class abstract(Bibliographic, Element): pass
  
  
***************
*** 447,472 ****
  # =====================
  
! class section(_Element): pass
! class transition(_Element): pass
  
! class package_section(_Element): pass
! class module_section(_Element): pass
! class class_section(_Element): pass
! class method_section(_Element): pass
! class function_section(_Element): pass
! class module_attribute_section(_Element): pass
! class class_attribute_section(_Element): pass
! class instance_attribute_section(_Element): pass
  
  # Structural Support Elements
  # ---------------------------
  
! class inheritance_list(_Element): pass
! class parameter_list(_Element): pass
! class parameter_item(_Element): pass
! class optional_parameters(_Element): pass
! class parameter_tuple(_Element): pass
! class parameter_default(_TextElement): pass
! class initial_value(_TextElement): pass
  
  
--- 492,517 ----
  # =====================
  
! class section(Structural, Element): pass
! class transition(Structural, Element): pass
  
! class package_section(Structural, Element): pass
! class module_section(Structural, Element): pass
! class class_section(Structural, Element): pass
! class method_section(Structural, Element): pass
! class function_section(Structural, Element): pass
! class module_attribute_section(Structural, Element): pass
! class class_attribute_section(Structural, Element): pass
! class instance_attribute_section(Structural, Element): pass
  
  # Structural Support Elements
  # ---------------------------
  
! class inheritance_list(Component, Element): pass
! class parameter_list(Component, Element): pass
! class parameter_item(Component, Element): pass
! class optional_parameters(Component, Element): pass
! class parameter_tuple(Component, Element): pass
! class parameter_default(Component, TextElement): pass
! class initial_value(Component, TextElement): pass
  
  
***************
*** 475,520 ****
  # ===============
  
! class paragraph(_TextElement): pass
! class bullet_list(_Element): pass
! class enumerated_list(_Element): pass
! class list_item(_Element): pass
! class definition_list(_Element): pass
! class definition_list_item(_Element): pass
! class term(_TextElement): pass
! class classifier(_TextElement): pass
! class definition(_Element): pass
! class field_list(_Element): pass
! class field(_Element): pass
! class field_name(_TextElement): pass
! class field_argument(_TextElement): pass
! class field_body(_Element): pass
! class literal_block(_TextElement): pass
! class block_quote(_Element): pass
! class attention(_Element): pass
! class caution(_Element): pass
! class danger(_Element): pass
! class error(_Element): pass
! class important(_Element): pass
! class note(_Element): pass
! class tip(_Element): pass
! class warning(_Element): pass
! class comment(_TextElement): pass
! class directive(_Element): pass
! class target(_TextElement): pass
! class footnote(_Element): pass
! class label(_TextElement): pass
! class figure(_Element): pass
! class caption(_TextElement): pass
! class legend(_Element): pass
! class table(_Element): pass
! class tgroup(_Element): pass
! class colspec(_Element): pass
! class thead(_Element): pass
! class tbody(_Element): pass
! class row(_Element): pass
! class entry(_Element): pass
  
  
! class system_warning(_Element):
  
      def __init__(self, comment=None, *children, **attributes):
--- 520,576 ----
  # ===============
  
! class paragraph(General, TextElement): pass
! class bullet_list(List, Element): pass
! class enumerated_list(List, Element): pass
! class list_item(Component, Element): pass
! class definition_list(List, Element): pass
! class definition_list_item(Component, Element): pass
! class term(Component, TextElement): pass
! class classifier(Component, TextElement): pass
! class definition(Component, Element): pass
! class field_list(List, Element): pass
! class field(Component, Element): pass
! class field_name(Component, TextElement): pass
! class field_argument(Component, TextElement): pass
! class field_body(Component, Element): pass
! class option_list(List, Element): pass
! class option_list_item(Component, Element): pass
! class option(Component, Element): pass
! class short_option(Component, TextElement): pass
! class long_option(Component, TextElement): pass
! class vms_option(Component, TextElement): pass
! class option_argument(Component, TextElement): pass
! class description(Component, Element): pass
! class literal_block(General, TextElement): pass
! class block_quote(General, Element): pass
! class doctest_block(General, TextElement): pass
! class attention(Admonition, Element): pass
! class caution(Admonition, Element): pass
! class danger(Admonition, Element): pass
! class error(Admonition, Element): pass
! class important(Admonition, Element): pass
! class note(Admonition, Element): pass
! class tip(Admonition, Element): pass
! class hint(Admonition, Element): pass
! class warning(Admonition, Element): pass
! class comment(Special, TextElement): pass
! class directive(Special, Element): pass
! class substitution(Special, TextElement): pass
! class target(Special, Inline, TextElement): pass
! class footnote(General, Element): pass
! class label(Component, TextElement): pass
! class figure(General, Element): pass
! class caption(Component, TextElement): pass
! class legend(Component, Element): pass
! class table(General, Element): pass
! class tgroup(Component, Element): pass
! class colspec(Component, Element): pass
! class thead(Component, Element): pass
! class tbody(Component, Element): pass
! class row(Component, Element): pass
! class entry(Component, Element): pass
  
  
! class system_warning(Special, Element):
  
      def __init__(self, comment=None, *children, **attributes):
***************
*** 524,542 ****
              p = paragraph('', comment)
              children = (p,) + children
!         _Element.__init__(self, '', *children, **attributes)
  
      def astext(self):
!         return '[level %s] ' % self['level'] + _Element.astext(self)
! 
! 
! class option_list(_Element): pass
! class option_list_item(_Element): pass
! class option(_Element): pass
! class short_option(_TextElement): pass
! class long_option(_TextElement): pass
! class vms_option(_TextElement): pass
! class option_argument(_TextElement): pass
! class description(_Element): pass
! class doctest_block(_TextElement): pass
  
  
--- 580,587 ----
              p = paragraph('', comment)
              children = (p,) + children
!         Element.__init__(self, '', *children, **attributes)
  
      def astext(self):
!         return '[level %s] ' % self['level'] + Element.astext(self)
  
  
***************
*** 545,573 ****
  # =================
  
! class emphasis(_TextElement): pass
! class strong(_TextElement): pass
! class interpreted(_TextElement): pass
! class literal(_TextElement): pass
! class reference(_TextElement): pass
! class footnote_reference(_TextElement): pass
! class image(_TextElement): pass
  
! class package(_TextElement): pass
! class module(_TextElement): pass
  
  
! class inline_class(_TextElement):
  
      tagname = 'class'
  
  
! class method(_TextElement): pass
! class function(_TextElement): pass
! class variable(_TextElement): pass
! class parameter(_TextElement): pass
! class type(_TextElement): pass
! class class_attribute(_TextElement): pass
! class module_attribute(_TextElement): pass
! class instance_attribute(_TextElement): pass
! class exception_class(_TextElement): pass
! class warning_class(_TextElement): pass
--- 590,619 ----
  # =================
  
! class emphasis(Inline, TextElement): pass
! class strong(Inline, TextElement): pass
! class interpreted(Inline, TextElement): pass
! class literal(Inline, TextElement): pass
! class reference(Inline, TextElement): pass
! class footnote_reference(Inline, TextElement): pass
! class substitution_reference(Inline, TextElement): pass
! class image(General, Inline, TextElement): pass
  
! class package(Component, Inline, TextElement): pass
! class module(Component, Inline, TextElement): pass
  
  
! class inline_class(Component, Inline, TextElement):
  
      tagname = 'class'
  
  
! class method(Component, Inline, TextElement): pass
! class function(Component, Inline, TextElement): pass
! class variable(Inline, TextElement): pass
! class parameter(Component, Inline, TextElement): pass
! class type(Inline, TextElement): pass
! class class_attribute(Component, Inline, TextElement): pass
! class module_attribute(Component, Inline, TextElement): pass
! class instance_attribute(Component, Inline, TextElement): pass
! class exception_class(Inline, TextElement): pass
! class warning_class(Inline, TextElement): pass

[Docstring-checkins] CVS: dps/spec dps-notes.txt,1.16,1.17

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

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

Modified Files:
	dps-notes.txt 
Log Message:
updated

Index: dps-notes.txt
===================================================================
RCS file: /cvsroot/docstring/dps/spec/dps-notes.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dps-notes.txt	2001/10/31 05:57:09	1.16
--- dps-notes.txt	2001/11/06 02:10:13	1.17
***************
*** 60,63 ****
--- 60,66 ----
    use them.
  
+ - Once doctree.txt is fleshed out, how about breaking (most of) it up
+   and putting it into nodes.py as docstrings?
+ 
  
  I/O APIs

[Docstring-checkins] CVS: dps HISTORY.txt,1.25,1.26

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

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

Modified Files:
	HISTORY.txt 
Log Message:
updated

Index: HISTORY.txt
===================================================================
RCS file: /cvsroot/docstring/dps/HISTORY.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** HISTORY.txt	2001/10/31 05:56:52	1.25
--- HISTORY.txt	2001/11/06 02:10:08	1.26
***************
*** 64,71 ****
    - Added 'transition'.
    - Renamed 'indirect' hyperlink targets -> 'external'.
!   - Renamed ``*links?`` -> ``*targets?``.
    - Added support for indirect & anonymous targets.
    - External targets' URIs now in "refuri" attribute, not data.
    - Changed "link" to "reference".
  
  * dps/roman.py: Added to project. Written by and courtesy of Mark
--- 64,74 ----
    - Added 'transition'.
    - Renamed 'indirect' hyperlink targets -> 'external'.
!   - Renamed ``.*links?`` -> ``.*targets?``.
    - Added support for indirect & anonymous targets.
    - External targets' URIs now in "refuri" attribute, not data.
    - Changed "link" to "reference".
+   - Removed leading underscores from functional node base classes.
+   - Added "hint", "substitution", "substitution_reference" classes.
+   - Added element hierarchy base classes.
  
  * dps/roman.py: Added to project. Written by and courtesy of Mark
***************
*** 151,155 ****
    - Changed 'graphic' to 'image'.
    - Moved 'caption' to after 'image' in 'figure'.
!   - Added 'error' admonishment element.
    - Added 'docinfo' as container for bibliographic elements.
    - Added 'transition'.
--- 154,158 ----
    - Changed 'graphic' to 'image'.
    - Moved 'caption' to after 'image' in 'figure'.
!   - Added 'error' and 'hint' admonition elements.
    - Added 'docinfo' as container for bibliographic elements.
    - Added 'transition'.
***************
*** 157,165 ****
    - Separated out %reference.atts into constituent parts.
    - Added all reference and "anonymous" attributes to "target".
!   - Added "anonymous" attribute to "link".
    - Added 'image' as body element; 'target' as inline element.
    - Expanded 'authors' content.
    - Clarified 'figure' content.
!   - Changed "link" to "reference".
  
  * spec/pdpi.dtd:
--- 160,171 ----
    - Separated out %reference.atts into constituent parts.
    - Added all reference and "anonymous" attributes to "target".
!   - Changed "link" to "reference".
!   - Added "anonymous" attribute to "reference".
!   - Changed the content model of "reference" to allow inline elements,
!     specifically images and substitution references.
    - Added 'image' as body element; 'target' as inline element.
    - Expanded 'authors' content.
    - Clarified 'figure' content.
!   - Added 'substitution' and 'substitution_reference'.
  
  * spec/pdpi.dtd:

[Docstring-checkins] CVS: dps/spec doctree.txt,1.4,1.5

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

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

Modified Files:
	doctree.txt 
Log Message:
updated

Index: doctree.txt
===================================================================
RCS file: /cvsroot/docstring/dps/spec/doctree.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** doctree.txt	2001/10/31 05:55:39	1.4
--- doctree.txt	2001/11/06 01:07:59	1.5
***************
*** 9,16 ****
  This document describes the internal data structure representing
  document trees in the Python Docstring Processing System. The data
! structure is defined by classes in the ``dps.nodes`` module. It is
! also formally described by the `Generic Plaintext Document Interface
! DTD`_ XML document type definition, gpdi.dtd_, which is the definitive
! source for element hierarchy details.
  
  Below is a simplified diagram of the hierarchy of element types in the
--- 9,16 ----
  This document describes the internal data structure representing
  document trees in the Python Docstring Processing System. The data
! structure is defined by the hierarchy of classes in the ``dps.nodes``
! module. It is also formally described by the `Generic Plaintext
! Document Interface DTD`_ XML document type definition, gpdi.dtd_,
! which is the definitive source for element hierarchy details.
  
  Below is a simplified diagram of the hierarchy of element types in the
***************
*** 39,45 ****
  
  -------------------
!  Element Reference
  -------------------
  
  The elements making up DPS document trees can be categorized into the
  following groups:
--- 39,50 ----
  
  -------------------
!  Element Hierarchy
  -------------------
  
+ A class hierarchy has been implemented in nodes.py where the position
+ of the element (the level at which it can occur) is significant. E.G.,
+ Root, Structural, Body, Inline classes etc. Certain transformations
+ will be easier because we can use isinstance() on them.
+ 
  The elements making up DPS document trees can be categorized into the
  following groups:
***************
*** 66,76 ****
      important_
  
!   - _`Special body elements`: target_, directive_, comment_,
!     system_warning_
  
  - _`Inline elements`: emphasis_, strong_, interpreted_, literal_,
!   reference_, target_, footnote_reference_, image_
  
  
  ``document``
  ============
--- 71,102 ----
      important_
  
!   - _`Special body elements`: target_, directive_, substitution_
!     comment_, system_warning_
  
  - _`Inline elements`: emphasis_, strong_, interpreted_, literal_,
!   reference_, target_, footnote_reference_, substitution_reference_,
!   image_
  
  
+ ``Node``
+ ========
+ 
+ 
+ ``Text``
+ ========
+ 
+ 
+ ``Element``
+ ===========
+ 
+ 
+ ``TextElement``
+ ===============
+ 
+ 
+ -------------------
+  Element Reference
+ -------------------
+ 
  ``document``
  ============
***************
*** 237,241 ****
                  Paragraph
  
! There are several possibilities for the implementation. Solution #2
  was chosen.
  
--- 263,267 ----
                  Paragraph
  
! There are several possibilities for the implementation. Solution 3
  was chosen.
  
***************
*** 281,286 ****
     grouped within a <BODY> element.
  
-    This solution has been chosen.
- 
  3. Implement them as "transitions", empty elements::
  
--- 307,310 ----
***************
*** 300,303 ****
--- 324,330 ----
     "transition" smells bad. A transition isn't a thing itself, it's
     the space between two divisions.
+ 
+    This solution has been chosen for incorporation into the document
+    tree.
  
  

[Docstring-checkins] CVS: dps/spec gpdi.dtd,1.21,1.22

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

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

Modified Files:
	gpdi.dtd 
Log Message:
  - Added 'hint' admonition element.
  - Changed the content model of "reference" to allow inline elements,
    specifically images and substitution references.
  - Added 'substitution' and 'substitution_reference'.

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** gpdi.dtd	2001/10/31 05:56:04	1.21
--- gpdi.dtd	2001/11/06 01:05:33	1.22
***************
*** 104,115 ****
  <!ENTITY % additional.body.elements "">
  <!ENTITY % body.elements
!   " paragraph
      | bullet_list | enumerated_list | definition_list | field_list
      | option_list
!     | literal_block | block_quote | doctest_block | table
!     | figure | image
!     | note | tip | warning | error | caution | danger | important
!     | footnote | target | directive | comment
!     | system_warning
      %additional.body.elements; ">
  
--- 104,114 ----
  <!ENTITY % additional.body.elements "">
  <!ENTITY % body.elements
!   " paragraph | literal_block | block_quote | doctest_block| table
!     | figure | image | footnote 
      | bullet_list | enumerated_list | definition_list | field_list
      | option_list
!     | note | tip | hint | warning | error | caution | danger
!     | important
!     | target | substitution | directive | comment | system_warning
      %additional.body.elements; ">
  
***************
*** 117,121 ****
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | reference | target | footnote_reference | image
      %additional.inline.elements; ">
  
--- 116,121 ----
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | reference | footnote_reference | substitution_reference
!     | target | image
      %additional.inline.elements; ">
  
***************
*** 336,339 ****
--- 336,342 ----
  <!ATTLIST tip %basic.atts;>
  
+ <!ELEMENT hint (%body.elements;)+>
+ <!ATTLIST hint %basic.atts;>
+ 
  <!ELEMENT warning (%body.elements;)+>
  <!ATTLIST warning %basic.atts;>
***************
*** 366,369 ****
--- 369,375 ----
      %anonymous.att;>
  
+ <!ELEMENT substitution (%text.model;)>
+ <!ATTLIST substitution %basic.atts;>
+ 
  <!ELEMENT directive (%body.elements;)*>
  <!ATTLIST directive
***************
*** 430,434 ****
  <!ATTLIST literal %basic.atts;>
  
! <!ELEMENT reference (#PCDATA)>
  <!ATTLIST reference
      %basic.atts;
--- 436,440 ----
  <!ATTLIST literal %basic.atts;>
  
! <!ELEMENT reference (%text.model;)>
  <!ATTLIST reference
      %basic.atts;
***************
*** 441,444 ****
--- 447,456 ----
      %reference.atts;
      %auto.att;>
+ 
+ <!ELEMENT substitution_reference (#PCDATA)>
+ <!ATTLIST substitution_reference
+     %basic.atts;
+     %refname.att;>
+ 
  
  <!--

[Docstring-checkins] CVS: dps/spec dps-notes.txt,1.15,1.16

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

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

Modified Files:
	dps-notes.txt 
Log Message:
updated

Index: dps-notes.txt
===================================================================
RCS file: /cvsroot/docstring/dps/spec/dps-notes.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dps-notes.txt	2001/10/30 05:18:30	1.15
--- dps-notes.txt	2001/10/31 05:57:09	1.16
***************
*** 60,65 ****
    use them.
  
- - Change "link" to "reference"?
- 
  
  I/O APIs
--- 60,63 ----

[Docstring-checkins] CVS: dps HISTORY.txt,1.24,1.25

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

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

Modified Files:
	HISTORY.txt 
Log Message:
updated

Index: HISTORY.txt
===================================================================
RCS file: /cvsroot/docstring/dps/HISTORY.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** HISTORY.txt	2001/10/30 05:18:03	1.24
--- HISTORY.txt	2001/10/31 05:56:52	1.25
***************
*** 67,70 ****
--- 67,71 ----
    - Added support for indirect & anonymous targets.
    - External targets' URIs now in "refuri" attribute, not data.
+   - Changed "link" to "reference".
  
  * dps/roman.py: Added to project. Written by and courtesy of Mark
***************
*** 160,163 ****
--- 161,165 ----
    - Expanded 'authors' content.
    - Clarified 'figure' content.
+   - Changed "link" to "reference".
  
  * spec/pdpi.dtd:

[Docstring-checkins] CVS: dps/spec gpdi.dtd,1.20,1.21

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

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

Modified Files:
	gpdi.dtd 
Log Message:
  - Changed "link" to "reference".

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gpdi.dtd	2001/10/30 05:16:37	1.20
--- gpdi.dtd	2001/10/31 05:56:04	1.21
***************
*** 117,121 ****
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | link | target | footnote_reference | image
      %additional.inline.elements; ">
  
--- 117,121 ----
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | reference | target | footnote_reference | image
      %additional.inline.elements; ">
  
***************
*** 430,435 ****
  <!ATTLIST literal %basic.atts;>
  
! <!ELEMENT link (#PCDATA)>
! <!ATTLIST link
      %basic.atts;
      %reference.atts;
--- 430,435 ----
  <!ATTLIST literal %basic.atts;>
  
! <!ELEMENT reference (#PCDATA)>
! <!ATTLIST reference
      %basic.atts;
      %reference.atts;

[Docstring-checkins] CVS: dps/spec doctree.txt,1.3,1.4

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

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

Modified Files:
	doctree.txt 
Log Message:
  - Changed "link" to "reference".

Index: doctree.txt
===================================================================
RCS file: /cvsroot/docstring/dps/spec/doctree.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** doctree.txt	2001/10/27 05:38:27	1.3
--- doctree.txt	2001/10/31 05:55:39	1.4
***************
*** 70,74 ****
  
  - _`Inline elements`: emphasis_, strong_, interpreted_, literal_,
!   link_, target_, footnote_reference_, image_
  
  
--- 70,74 ----
  
  - _`Inline elements`: emphasis_, strong_, interpreted_, literal_,
!   reference_, target_, footnote_reference_, image_
  
  
***************
*** 188,194 ****
  
  
! ``%link.atts;``
  ===============
! The ``%link.atts;`` parameter entity
  
  
--- 188,194 ----
  
  
! ``%reference.atts;``
  ===============
! The ``%reference.atts;`` parameter entity
  
  

[Docstring-checkins] CVS: dps/dps nodes.py,1.15,1.16

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

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

Modified Files:
	nodes.py 
Log Message:
  - Changed "link" to "reference".

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** nodes.py	2001/10/30 05:11:35	1.15
--- nodes.py	2001/10/31 05:55:26	1.16
***************
*** 549,553 ****
  class interpreted(_TextElement): pass
  class literal(_TextElement): pass
! class link(_TextElement): pass
  class footnote_reference(_TextElement): pass
  class image(_TextElement): pass
--- 549,553 ----
  class interpreted(_TextElement): pass
  class literal(_TextElement): pass
! class reference(_TextElement): pass
  class footnote_reference(_TextElement): pass
  class image(_TextElement): pass

[Docstring-checkins] CVS: dps/spec dps-notes.txt,1.14,1.15

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

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

Modified Files:
	dps-notes.txt 
Log Message:
updated

Index: dps-notes.txt
===================================================================
RCS file: /cvsroot/docstring/dps/spec/dps-notes.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dps-notes.txt	2001/10/18 03:36:12	1.14
--- dps-notes.txt	2001/10/30 05:18:30	1.15
***************
*** 60,63 ****
--- 60,65 ----
    use them.
  
+ - Change "link" to "reference"?
+ 
  
  I/O APIs

[Docstring-checkins] CVS: dps HISTORY.txt,1.23,1.24

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

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

Modified Files:
	HISTORY.txt 
Log Message:
updated

Index: HISTORY.txt
===================================================================
RCS file: /cvsroot/docstring/dps/HISTORY.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** HISTORY.txt	2001/10/27 05:41:58	1.23
--- HISTORY.txt	2001/10/30 05:18:03	1.24
***************
*** 66,69 ****
--- 66,70 ----
    - Renamed ``*links?`` -> ``*targets?``.
    - Added support for indirect & anonymous targets.
+   - External targets' URIs now in "refuri" attribute, not data.
  
  * dps/roman.py: Added to project. Written by and courtesy of Mark
***************
*** 152,157 ****
    - Added 'docinfo' as container for bibliographic elements.
    - Added 'transition'.
!   - Separated out %link.atts into constituent parts.
!   - Added "refname" and "anonymous" attrbites to "target".
    - Added "anonymous" attribute to "link".
    - Added 'image' as body element; 'target' as inline element.
--- 153,159 ----
    - Added 'docinfo' as container for bibliographic elements.
    - Added 'transition'.
!   - Changed %link.atts to %reference.atts.
!   - Separated out %reference.atts into constituent parts.
!   - Added all reference and "anonymous" attributes to "target".
    - Added "anonymous" attribute to "link".
    - Added 'image' as body element; 'target' as inline element.

[Docstring-checkins] CVS: dps/spec gpdi.dtd,1.19,1.20

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

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

Modified Files:
	gpdi.dtd 
Log Message:
  - Changed %link.atts to %reference.atts.
  - Added %reference.atts to target.

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** gpdi.dtd	2001/10/27 05:36:17	1.19
--- gpdi.dtd	2001/10/30 05:16:37	1.20
***************
*** 67,77 ****
    " refname   CDATA     #IMPLIED ">
  
! <!ENTITY % additional.link.atts "">
! <!-- Collected hyperlink attributes. -->
! <!ENTITY % link.atts
    " %refuri.att;
      %refid.att;
      %refname.att;
!     %additional.link.atts; ">
  
  <!-- Unnamed hyperlink. -->
--- 67,77 ----
    " refname   CDATA     #IMPLIED ">
  
! <!ENTITY % additional.reference.atts "">
! <!-- Collected hyperlink reference attributes. -->
! <!ENTITY % reference.atts
    " %refuri.att;
      %refid.att;
      %refname.att;
!     %additional.reference.atts; ">
  
  <!-- Unnamed hyperlink. -->
***************
*** 359,367 ****
  <!ATTLIST label %basic.atts;>
  
! <!-- Also an inline element. -->
  <!ELEMENT target (#PCDATA)>
  <!ATTLIST target
      %basic.atts;
!     %refname.att;
      %anonymous.att;>
  
--- 359,367 ----
  <!ATTLIST label %basic.atts;>
  
! <!-- Also an inline element; empty otherwise. -->
  <!ELEMENT target (#PCDATA)>
  <!ATTLIST target
      %basic.atts;
!     %reference.atts;
      %anonymous.att;>
  
***************
*** 433,437 ****
  <!ATTLIST link
      %basic.atts;
!     %link.atts;
      %anonymous.att;>
  
--- 433,437 ----
  <!ATTLIST link
      %basic.atts;
!     %reference.atts;
      %anonymous.att;>
  
***************
*** 439,443 ****
  <!ATTLIST footnote_reference
      %basic.atts;
!     %link.atts;
      %auto.att;>
  
--- 439,443 ----
  <!ATTLIST footnote_reference
      %basic.atts;
!     %reference.atts;
      %auto.att;>
  

[Docstring-checkins] CVS: dps/dps nodes.py,1.14,1.15

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

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

Modified Files:
	nodes.py 
Log Message:
  - External targets' URIs now in "refuri" attribute, not data.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** nodes.py	2001/10/27 05:41:17	1.14
--- nodes.py	2001/10/30 05:11:35	1.15
***************
*** 378,382 ****
              level = 0
              for t in self.explicittargets.get(name, []):
!                 if len(t) != 1 or str(t[0]) != reference:
                      level = 1
                      break
--- 378,382 ----
              level = 0
              for t in self.explicittargets.get(name, []):
!                 if not t.has_key('refuri') or t['refuri'] != reference:
                      level = 1
                      break
***************
*** 395,407 ****
          self.explicittargets.setdefault(name, []).append(targetnode)
          targetnode['name'] = name
  
      def addindirecttarget(self, refname, targetnode):
-         self.indirecttargets[refname] = targetnode
          targetnode['refname'] = refname
  
      def addanonymoustarget(self, targetnode):
          self.anonymoustargets.append(targetnode)
  
      def addanonymousref(self, refnode):
          self.anonymousrefs.append(refnode)
  
--- 395,410 ----
          self.explicittargets.setdefault(name, []).append(targetnode)
          targetnode['name'] = name
+         targetnode['refuri'] = reference
  
      def addindirecttarget(self, refname, targetnode):
          targetnode['refname'] = refname
+         self.indirecttargets[refname] = targetnode
  
      def addanonymoustarget(self, targetnode):
+         targetnode['anonymous'] = 1
          self.anonymoustargets.append(targetnode)
  
      def addanonymousref(self, refnode):
+         refnode['anonymous'] = 1
          self.anonymousrefs.append(refnode)
  

[Docstring-checkins] CVS: dps HISTORY.txt,1.22,1.23

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

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

Modified Files:
	HISTORY.txt 
Log Message:
updated

Index: HISTORY.txt
===================================================================
RCS file: /cvsroot/docstring/dps/HISTORY.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** HISTORY.txt	2001/10/23 02:23:56	1.22
--- HISTORY.txt	2001/10/27 05:41:58	1.23
***************
*** 62,66 ****
    - Changed 'graphic' to 'image'.
    - Added 'docinfo', container for bibliographic elements.
!   - Added 'division', repeatable container for body elements.
    - Renamed 'indirect' hyperlink targets -> 'external'.
    - Renamed ``*links?`` -> ``*targets?``.
--- 62,66 ----
    - Changed 'graphic' to 'image'.
    - Added 'docinfo', container for bibliographic elements.
!   - Added 'transition'.
    - Renamed 'indirect' hyperlink targets -> 'external'.
    - Renamed ``*links?`` -> ``*targets?``.
***************
*** 84,87 ****
--- 84,89 ----
      StateWS, and to 'extractindented' function.
  
+ * dps/urischemes.py: Known URI schemes; added to project.
+ 
  * dps/utils.py:
  
***************
*** 149,156 ****
    - Added 'error' admonishment element.
    - Added 'docinfo' as container for bibliographic elements.
!   - Added 'division', repeatable container of body elements.
    - Separated out %link.atts into constituent parts.
    - Added "refname" and "anonymous" attrbites to "target".
    - Added "anonymous" attribute to "link".
  
  * spec/pdpi.dtd:
--- 151,161 ----
    - Added 'error' admonishment element.
    - Added 'docinfo' as container for bibliographic elements.
!   - Added 'transition'.
    - Separated out %link.atts into constituent parts.
    - Added "refname" and "anonymous" attrbites to "target".
    - Added "anonymous" attribute to "link".
+   - Added 'image' as body element; 'target' as inline element.
+   - Expanded 'authors' content.
+   - Clarified 'figure' content.
  
  * spec/pdpi.dtd:

[Docstring-checkins] CVS: dps/dps nodes.py,1.13,1.14

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

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

Modified Files:
	nodes.py 
Log Message:
  - Added 'transition'.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** nodes.py	2001/10/23 02:23:25	1.13
--- nodes.py	2001/10/27 05:41:17	1.14
***************
*** 415,424 ****
  
  
  # ========================
  #  Bibliographic Elements
  # ========================
  
- class title(_TextElement): pass
- class subtitle(_TextElement): pass
  class docinfo(_Element): pass
  class author(_TextElement): pass
--- 415,430 ----
  
  
+ # ================
+ #  Title Elements
+ # ================
+ 
+ class title(_TextElement): pass
+ class subtitle(_TextElement): pass
+ 
+ 
  # ========================
  #  Bibliographic Elements
  # ========================
  
  class docinfo(_Element): pass
  class author(_TextElement): pass
***************
*** 439,442 ****
--- 445,449 ----
  
  class section(_Element): pass
+ class transition(_Element): pass
  
  class package_section(_Element): pass

[Docstring-checkins] CVS: dps/spec doctree.txt,1.2,1.3

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

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

Modified Files:
	doctree.txt 
Log Message:
minor mods

Index: doctree.txt
===================================================================
RCS file: /cvsroot/docstring/dps/spec/doctree.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** doctree.txt	2001/10/26 04:31:06	1.2
--- doctree.txt	2001/10/27 05:38:27	1.3
***************
*** 26,33 ****
    |                             | sections  [each begins with a title] |
    +-----------------------------+-------------------------+------------+
!   | divisions                                             | (sections) |
!   +-------------------------------------------------------+------------+
!   | [body elements:]                                      |
!   |         | - literal | - lists  |       | - hyperlink  |
    |         |   blocks  | - tables |       |   targets    |
    | para-   | - doctest | - block  | foot- | - directives |
--- 26,31 ----
    |                             | sections  [each begins with a title] |
    +-----------------------------+-------------------------+------------+
!   | [body elements:]                                      | (sections) |
!   |         | - literal | - lists  |       | - hyperlink  +------------+
    |         |   blocks  | - tables |       |   targets    |
    | para-   | - doctest | - block  | foot- | - directives |
***************
*** 55,64 ****
    copyright_, abstract_
  
! - _`Structural elements`: section_
  
  - _`Body elements`:
  
    - _`General body elements`: paragraph_, literal_block_,
!     block_quote_, doctest_block_, table_, figure_, footnote_
  
    - _`Lists`: bullet_list_, enumerated_list_, definition_list_,
--- 53,62 ----
    copyright_, abstract_
  
! - _`Structural elements`: section_, transition_
  
  - _`Body elements`:
  
    - _`General body elements`: paragraph_, literal_block_,
!     block_quote_, doctest_block_, table_, figure_, image_, footnote_
  
    - _`Lists`: bullet_list_, enumerated_list_, definition_list_,
***************
*** 72,76 ****
  
  - _`Inline elements`: emphasis_, strong_, interpreted_, literal_,
!   link_, footnote_reference_, image_
  
  
--- 70,74 ----
  
  - _`Inline elements`: emphasis_, strong_, interpreted_, literal_,
!   link_, target_, footnote_reference_, image_
  
  
***************
*** 115,164 ****
  ``anonymous``
  -------------
! The ``anonymous`` attribute 
  
  
  ``auto``
  --------
! The ``auto`` attribute 
  
  
  ``dupname``
  -----------
! The ``dupname`` attribute 
  
  
  ``id``
  ------
! The ``id`` attribute 
  
  
  ``name``
  --------
! The ``name`` attribute 
  
  
  ``refid``
  ---------
! The ``refid`` attribute 
  
  
  ``refname``
  -----------
! The ``refname`` attribute 
  
  
  ``refuri``
  ----------
! The ``refuri`` attribute 
  
  
  ``source``
  ----------
! The ``source`` attribute 
  
  
  ``xml:space``
  -------------
! The ``xml:space`` attribute 
  
  
--- 113,162 ----
  ``anonymous``
  -------------
! The ``anonymous`` attribute
  
  
  ``auto``
  --------
! The ``auto`` attribute
  
  
  ``dupname``
  -----------
! The ``dupname`` attribute
  
  
  ``id``
  ------
! The ``id`` attribute
  
  
  ``name``
  --------
! The ``name`` attribute
  
  
  ``refid``
  ---------
! The ``refid`` attribute
  
  
  ``refname``
  -----------
! The ``refname`` attribute
  
  
  ``refuri``
  ----------
! The ``refuri`` attribute
  
  
  ``source``
  ----------
! The ``source`` attribute
  
  
  ``xml:space``
  -------------
! The ``xml:space`` attribute
  
  
***************
*** 182,206 ****
  ``%body.elements;``
  ===================
! The ``%body.elements;`` parameter entity 
  
  
  ``%inline.elements;``
  ====================
! The ``%inline.elements;`` parameter entity 
  
  
  ``%link.atts;``
  ===============
! The ``%link.atts;`` parameter entity 
  
  
  ``%structure.model;``
  =====================
! The ``%structure.model;`` parameter entity 
  
  
  ``%text.model;``
  ================
! The ``%text.model;`` parameter entity 
  
  
--- 180,204 ----
  ``%body.elements;``
  ===================
! The ``%body.elements;`` parameter entity
  
  
  ``%inline.elements;``
  ====================
! The ``%inline.elements;`` parameter entity
  
  
  ``%link.atts;``
  ===============
! The ``%link.atts;`` parameter entity
  
  
  ``%structure.model;``
  =====================
! The ``%structure.model;`` parameter entity
  
  
  ``%text.model;``
  ================
! The ``%text.model;`` parameter entity
  
  
***************
*** 260,264 ****
     "first division". The horizontal rule splits the document body into
     two segments, which should be treated uniformly.
!    
  2. Treating "divisions" uniformly brings us to the second
     possibility::
--- 258,262 ----
     "first division". The horizontal rule splits the document body into
     two segments, which should be treated uniformly.
! 
  2. Treating "divisions" uniformly brings us to the second
     possibility::
***************
*** 282,286 ****
     deeper. This is similar to the way HTML treats document contents:
     grouped within a <BODY> element.
!    
     This solution has been chosen.
  
--- 280,284 ----
     deeper. This is similar to the way HTML treats document contents:
     grouped within a <BODY> element.
! 
     This solution has been chosen.
  
***************
*** 302,306 ****
     "transition" smells bad. A transition isn't a thing itself, it's
     the space between two divisions.
!    
  
  .. _Generic Plaintext Document Interface DTD:
--- 300,304 ----
     "transition" smells bad. A transition isn't a thing itself, it's
     the space between two divisions.
! 
  
  .. _Generic Plaintext Document Interface DTD:

[Docstring-checkins] CVS: dps/spec gpdi.dtd,1.18,1.19

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

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

Modified Files:
	gpdi.dtd 
Log Message:
  - 'image' as body element; 'target' as inline element.
  - 'division' gone; 'transition' added.
  - 'authors' content expanded.
  - 'figure' content clarified.

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** gpdi.dtd	2001/10/20 03:02:05	1.18
--- gpdi.dtd	2001/10/27 05:36:17	1.19
***************
*** 79,82 ****
--- 79,86 ----
    " anonymous %yesorno; #IMPLIED ">
  
+ <!-- Auto-numbered footnote. -->
+ <!ENTITY % auto.att
+   " auto      %yesorno; #IMPLIED ">
+ 
  <!-- XML standard attribute for whitespace-preserving elements. -->
  <!ENTITY % fixedspace.att
***************
*** 103,107 ****
      | bullet_list | enumerated_list | definition_list | field_list
      | option_list
!     | literal_block | block_quote | doctest_block | table | figure
      | note | tip | warning | error | caution | danger | important
      | footnote | target | directive | comment
--- 107,112 ----
      | bullet_list | enumerated_list | definition_list | field_list
      | option_list
!     | literal_block | block_quote | doctest_block | table
!     | figure | image
      | note | tip | warning | error | caution | danger | important
      | footnote | target | directive | comment
***************
*** 112,116 ****
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | link | footnote_reference | image
      %additional.inline.elements; ">
  
--- 117,121 ----
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | link | target | footnote_reference | image
      %additional.inline.elements; ">
  
***************
*** 119,123 ****
  
  <!ENTITY % structure.model
!   " ( (division+, (%structural.elements;)*)
      | (%structural.elements;)+ ) ">
  
--- 124,128 ----
  
  <!ENTITY % structure.model
!   " ( ((%body.elements; | transition)+, (%structural.elements;)*)
      | (%structural.elements;)+ ) ">
  
***************
*** 163,167 ****
  <!--
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!     Bibliographic Elements
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  -->
--- 168,172 ----
  <!--
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!     Title Elements
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  -->
***************
*** 173,176 ****
--- 178,188 ----
  <!ATTLIST subtitle %basic.atts;>
  
+ 
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+     Bibliographic Elements
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ 
  <!-- Container for bibliographic elements. May not be empty. -->
  <!ELEMENT docinfo
***************
*** 181,185 ****
  <!ATTLIST author %basic.atts;>
  
! <!ELEMENT authors (author+)>
  <!ATTLIST authors %basic.atts;>
  
--- 193,197 ----
  <!ATTLIST author %basic.atts;>
  
! <!ELEMENT authors ((author, organization?, contact?)+)>
  <!ATTLIST authors %basic.atts;>
  
***************
*** 218,223 ****
  <!ATTLIST section %basic.atts;>
  
! <!ELEMENT division (%body.elements;)+>
! <!ATTLIST division %basic.atts;>
  
  
--- 230,235 ----
  <!ATTLIST section %basic.atts;>
  
! <!ELEMENT transition EMPTY>
! <!ATTLIST transition %basic.atts;>
  
  
***************
*** 342,350 ****
  <!ATTLIST footnote
      %basic.atts;
!     auto      %yesorno; #IMPLIED>
  
  <!ELEMENT label (#PCDATA)>
  <!ATTLIST label %basic.atts;>
  
  <!ELEMENT target (#PCDATA)>
  <!ATTLIST target
--- 354,363 ----
  <!ATTLIST footnote
      %basic.atts;
!     %auto.att;>
  
  <!ELEMENT label (#PCDATA)>
  <!ATTLIST label %basic.atts;>
  
+ <!-- Also an inline element. -->
  <!ELEMENT target (#PCDATA)>
  <!ATTLIST target
***************
*** 364,370 ****
      %fixedspace.att;>
  
! <!ELEMENT figure (image, caption?, legend?)>
  <!ATTLIST figure %basic.atts;>
  
  <!ELEMENT caption %text.model;>
  <!ATTLIST caption %basic.atts;>
--- 377,392 ----
      %fixedspace.att;>
  
! <!ELEMENT figure (image, ((caption, legend?) | legend) >
  <!ATTLIST figure %basic.atts;>
  
+ <!-- Also an inline element. -->
+ <!ELEMENT image EMPTY>
+ <!ATTLIST image
+     %basic.atts;
+     uri       CDATA     #REQUIRED
+     height    NMTOKEN   #IMPLIED
+     width     NMTOKEN   #IMPLIED
+     scale     NMTOKEN   #IMPLIED>
+ 
  <!ELEMENT caption %text.model;>
  <!ATTLIST caption %basic.atts;>
***************
*** 418,431 ****
      %basic.atts;
      %link.atts;
!     auto      %yesorno; #IMPLIED>
! 
! <!-- Also used in `figure`. -->
! <!ELEMENT image EMPTY>
! <!ATTLIST image
!     %basic.atts;
!     uri       CDATA     #REQUIRED
!     height    NMTOKEN   #IMPLIED
!     width     NMTOKEN   #IMPLIED
!     scale     NMTOKEN   #IMPLIED>
  
  <!--
--- 440,444 ----
      %basic.atts;
      %link.atts;
!     %auto.att;>
  
  <!--

[Docstring-checkins] CVS: dps/dps urischemes.py,NONE,1.1

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

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

Added Files:
	urischemes.py 
Log Message:
known URI schemes

--- NEW FILE: urischemes.py ---
"""
`schemes` is a dictionary with lowercase URI addressing schemes as
keys and descriptions as values. It was compiled from the index at
http://www.w3.org/Addressing/schemes.html, revised 2001-08-20. Many
values are blank and should be filled in with useful descriptions.
"""

schemes = {
      'about': '',
      'acap': 'application configuration access protocol',
      'addbook': "To add vCard entries to Communicator's Address Book",
      'afp': '',
      'afs': 'Andrew File System global file names',
      'aim': '',
      'callto': '',
      'castanet': 'Castanet Tuner URLs for Netcaster',
      'chttp': '',
      'cid': 'content identifier',
      'data': '',
      'dav': '',
      'dns': '',
      'eid': '',
      'fax': '',
      'file': 'Host-specific file names',
      'finger': '',
      'freenet': '',
      'ftp': 'File Transfer Protocol',
      'gopher': 'The Gopher Protocol',
      'gsm-sms': '',
      'h323': '',
      'h324': '',
      'hdl': '',
      'hnews': '',
      'http': 'Hypertext Transfer Protocol',
      'https': '',
      'iioploc': '',
      'ilu': '',
      'imap': 'internet message access protocol',
      'ior': '',
      'ipp': '',
      'irc': 'Internet Relay Chat',
      'jar': '',
      'javascript': '',
      'jdbc': '',
      'ldap': 'Lightweight Directory Access Protocol',
      'lifn': '',
      'livescript': '',
      'lrq': '',
      'mailbox': 'Mail folder access',
      'mailserver': 'Access to data available from mail servers',
      'mailto': 'Electronic mail address',
      'md5': '',
      'mid': 'message identifier',
      'mocha': '',
      'modem': '',
      'news': 'USENET news',
      'nfs': 'network file system protocol',
      'nntp': 'USENET news using NNTP access',
      'opaquelocktoken': '',
      'phone': '',
      'pop': 'Post Office Protocol',
      'pop3': 'Post Office Protocol v3',
      'printer': '',
      'prospero': 'Prospero Directory Service',
      'res': '',
      'rtsp': 'real time streaming protocol',
      'rvp': '',
      'rwhois': '',
      'rx': 'Remote Execution',
      'sdp': '',
      'service': 'service location',
      'sip': 'session initiation protocol',
      'smb': '',
      'snews': 'For NNTP postings via SSL',
      't120': '',
      'tcp': '',
      'tel': 'telephone',
      'telephone': 'telephone',
      'telnet': 'Reference to interactive sessions',
      'tip': 'Transaction Internet Protocol',
      'tn3270': 'Interactive 3270 emulation sessions',
      'tv': '',
      'urn': 'Uniform Resource Name',
      'uuid': '',
      'vemmi': 'versatile multimedia interface',
      'videotex': '',
      'view-source': '',
      'wais': 'Wide Area Information Servers',
      'whodp': '',
      'whois++': 'Distributed directory service.',
      'z39.50r': 'Z39.50 Retrieval',
      'z39.50s': 'Z39.50 Session',}

[Docstring-checkins] CVS: dps/spec doctree.txt,1.1,1.2

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

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

Modified Files:
	doctree.txt 
Log Message:
Added outline of reference text.

Index: doctree.txt
===================================================================
RCS file: /cvsroot/docstring/dps/spec/doctree.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** doctree.txt	2001/10/20 03:04:37	1.1
--- doctree.txt	2001/10/26 04:31:06	1.2
***************
*** 40,43 ****
--- 40,212 ----
  
  
+ -------------------
+  Element Reference
+ -------------------
+ 
+ The elements making up DPS document trees can be categorized into the
+ following groups:
+ 
+ - _`Root element`: document_
+ 
+ - _`Title elements`: title_, subtitle_
+ 
+ - _`Bibliographic elements`: docinfo_, author_, authors_,
+   organization_, contact_, version_, revision_, status_, date_,
+   copyright_, abstract_
+ 
+ - _`Structural elements`: section_
+ 
+ - _`Body elements`:
+ 
+   - _`General body elements`: paragraph_, literal_block_,
+     block_quote_, doctest_block_, table_, figure_, footnote_
+ 
+   - _`Lists`: bullet_list_, enumerated_list_, definition_list_,
+     field_list_, option_list_
+ 
+   - _`Admonitions`: note_, tip_, warning_, error_, caution_, danger_,
+     important_
+ 
+   - _`Special body elements`: target_, directive_, comment_,
+     system_warning_
+ 
+ - _`Inline elements`: emphasis_, strong_, interpreted_, literal_,
+   link_, footnote_reference_, image_
+ 
+ 
+ ``document``
+ ============
+ description
+ 
+ contents
+ 
+ External attributes
+ -------------------
+ `Common external attributes`_.
+ 
+ 
+ Internal attributes
+ -------------------
+ - `Common internal attributes`_.
+ - ``explicittargets``
+ - ``implicittargets``
+ - ``externaltargets``
+ - ``indirecttargets``
+ - ``refnames``
+ - ``anonymoustargets``
+ - ``anonymousrefs``
+ - ``autofootnotes``
+ - ``autofootnoterefs``
+ - ``errorhandler``
+ 
+ 
+ ---------------------
+  Attribute Reference
+ ---------------------
+ 
+ External Attributes
+ ===================
+ 
+ Through the `%basic.atts;`_ parameter entity, all elements share the
+ following _`common external attributes`: id_, name_, dupname_,
+ source_.
+ 
+ 
+ ``anonymous``
+ -------------
+ The ``anonymous`` attribute 
+ 
+ 
+ ``auto``
+ --------
+ The ``auto`` attribute 
+ 
+ 
+ ``dupname``
+ -----------
+ The ``dupname`` attribute 
+ 
+ 
+ ``id``
+ ------
+ The ``id`` attribute 
+ 
+ 
+ ``name``
+ --------
+ The ``name`` attribute 
+ 
+ 
+ ``refid``
+ ---------
+ The ``refid`` attribute 
+ 
+ 
+ ``refname``
+ -----------
+ The ``refname`` attribute 
+ 
+ 
+ ``refuri``
+ ----------
+ The ``refuri`` attribute 
+ 
+ 
+ ``source``
+ ----------
+ The ``source`` attribute 
+ 
+ 
+ ``xml:space``
+ -------------
+ The ``xml:space`` attribute 
+ 
+ 
+ Internal Attributes
+ ===================
+ 
+ All element objects share the following _`common internal attributes`:
+ rawsource_, children_, attributes_, tagname_.
+ 
+ 
+ ------------------------
+  DTD Parameter Entities
+ ------------------------
+ 
+ ``%basic.atts;``
+ ================
+ The ``%basic.atts;`` parameter entity lists attributes common to all
+ elements. See `Common Attributes`_.
+ 
+ 
+ ``%body.elements;``
+ ===================
+ The ``%body.elements;`` parameter entity 
+ 
+ 
+ ``%inline.elements;``
+ ====================
+ The ``%inline.elements;`` parameter entity 
+ 
+ 
+ ``%link.atts;``
+ ===============
+ The ``%link.atts;`` parameter entity 
+ 
+ 
+ ``%structure.model;``
+ =====================
+ The ``%structure.model;`` parameter entity 
+ 
+ 
+ ``%text.model;``
+ ================
+ The ``%text.model;`` parameter entity 
+ 
+ 
+ --------------------------------
+  Appendix: Miscellaneous Topics
+ --------------------------------
+ 
  Representation of Horizontal Rules
  ==================================

[Docstring-checkins] CVS: dps HISTORY.txt,1.21,1.22

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

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

Modified Files:
	HISTORY.txt 
Log Message:
updated

Index: HISTORY.txt
===================================================================
RCS file: /cvsroot/docstring/dps/HISTORY.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** HISTORY.txt	2001/10/20 03:07:56	1.21
--- HISTORY.txt	2001/10/23 02:23:56	1.22
***************
*** 64,67 ****
--- 64,69 ----
    - Added 'division', repeatable container for body elements.
    - Renamed 'indirect' hyperlink targets -> 'external'.
+   - Renamed ``*links?`` -> ``*targets?``.
+   - Added support for indirect & anonymous targets.
  
  * dps/roman.py: Added to project. Written by and courtesy of Mark

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

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

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

Modified Files:
	nodes.py 
Log Message:
  - Renamed ``*links?`` -> ``*targets?``.
  - Added support for indirect & anonymous targets.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** nodes.py	2001/10/20 03:07:15	1.12
--- nodes.py	2001/10/23 02:23:25	1.13
***************
*** 312,319 ****
      def __init__(self, errorhandler, *args, **kwargs):
          _Element.__init__(self, *args, **kwargs)
!         self.explicitlinks = {}
!         self.implicitlinks = {}
!         self.externallinks = {}
          self.refnames = {}
          self.autofootnotes = []
          self.autofootnoterefs = []
--- 312,322 ----
      def __init__(self, errorhandler, *args, **kwargs):
          _Element.__init__(self, *args, **kwargs)
!         self.explicittargets = {}
!         self.implicittargets = {}
!         self.externaltargets = {}
!         self.indirecttargets = {}
          self.refnames = {}
+         self.anonymoustargets = []
+         self.anonymousrefs = []
          self.autofootnotes = []
          self.autofootnoterefs = []
***************
*** 325,367 ****
          return domroot
  
!     def addimplicitlink(self, name, linknode, innode=None):
          if innode == None:
!             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(
!                   0, 'Duplicate implicit link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.implicitlinks)
!             linknode['dupname'] = name
!             self.implicitlinks.setdefault(name, []).append(linknode)
          else:
!             self.implicitlinks[name] = [linknode]
!             linknode['name'] = name
  
!     def addexplicitlink(self, name, linknode, innode=None):
          if innode == None:
!             innode = linknode
!         if self.explicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   1, 'Duplicate explicit link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.explicitlinks, self.implicitlinks,
!                                 self.externallinks)
!             linknode['dupname'] = name
!             self.explicitlinks.setdefault(name, []).append(linknode)
              return
!         elif self.implicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.implicitlinks)
!         self.explicitlinks[name] = [linknode]
!         linknode['name'] = name
  
!     def clearlinknames(self, name, *linkdicts):
!         for linkdict in linkdicts:
!             for node in linkdict.get(name, []):
                  if node.has_key('name'):
                      node['dupname'] = node['name']
--- 328,370 ----
          return domroot
  
!     def addimplicittarget(self, name, targetnode, innode=None):
          if innode == None:
!             innode = targetnode
!         if self.explicittargets.has_key(name) \
!               or self.externaltargets.has_key(name) \
!               or self.implicittargets.has_key(name):
              sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit target name: "%s"' % name)
              innode += sw
!             self.cleartargetnames(name, self.implicittargets)
!             targetnode['dupname'] = name
!             self.implicittargets.setdefault(name, []).append(targetnode)
          else:
!             self.implicittargets[name] = [targetnode]
!             targetnode['name'] = name
  
!     def addexplicittarget(self, name, targetnode, innode=None):
          if innode == None:
!             innode = targetnode
!         if self.explicittargets.has_key(name):
              sw = self.errorhandler.system_warning(
!                   1, 'Duplicate explicit target name: "%s"' % name)
              innode += sw
!             self.cleartargetnames(name, self.explicittargets,
!                                   self.implicittargets, self.externaltargets)
!             targetnode['dupname'] = name
!             self.explicittargets.setdefault(name, []).append(targetnode)
              return
!         elif self.implicittargets.has_key(name):
              sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit target name: "%s"' % name)
              innode += sw
!             self.cleartargetnames(name, self.implicittargets)
!         self.explicittargets[name] = [targetnode]
!         targetnode['name'] = name
  
!     def cleartargetnames(self, name, *targetdicts):
!         for targetdict in targetdicts:
!             for node in targetdict.get(name, []):
                  if node.has_key('name'):
                      node['dupname'] = node['name']
***************
*** 371,395 ****
          self.refnames.setdefault(name, []).append(node)
  
!     def addexternallink(self, name, reference, linknode, innode):
!         if self.explicitlinks.has_key(name):
              level = 0
!             for t in self.explicitlinks.get(name, []):
                  if len(t) != 1 or str(t[0]) != reference:
                      level = 1
                      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):
!             print >>sys.stderr, "already has explicit link"
              sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.implicitlinks)
!         self.externallinks.setdefault(name, []).append(linknode)
!         self.explicitlinks.setdefault(name, []).append(linknode)
!         linknode['name'] = name
  
      def addautofootnote(self, name, footnotenode):
--- 374,408 ----
          self.refnames.setdefault(name, []).append(node)
  
!     def addexternaltarget(self, name, reference, targetnode, innode):
!         if self.explicittargets.has_key(name):
              level = 0
!             for t in self.explicittargets.get(name, []):
                  if len(t) != 1 or str(t[0]) != reference:
                      level = 1
                      break
              sw = self.errorhandler.system_warning(
!                   level, 'Duplicate external target name: "%s"' % name)
              innode += sw
!             self.cleartargetnames(name, self.explicittargets,
!                                   self.externaltargets, self.implicittargets)
!         elif self.implicittargets.has_key(name):
!             print >>sys.stderr, "already has explicit target"
              sw = self.errorhandler.system_warning(
!                   0, 'Duplicate implicit target name: "%s"' % name)
              innode += sw
!             self.cleartargetnames(name, self.implicittargets)
!         self.externaltargets.setdefault(name, []).append(targetnode)
!         self.explicittargets.setdefault(name, []).append(targetnode)
!         targetnode['name'] = name
! 
!     def addindirecttarget(self, refname, targetnode):
!         self.indirecttargets[refname] = targetnode
!         targetnode['refname'] = refname
! 
!     def addanonymoustarget(self, targetnode):
!         self.anonymoustargets.append(targetnode)
! 
!     def addanonymousref(self, refnode):
!         self.anonymousrefs.append(refnode)
  
      def addautofootnote(self, name, footnotenode):

[Docstring-checkins] CVS: dps HISTORY.txt,1.20,1.21

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

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

Modified Files:
	HISTORY.txt 
Log Message:
updated

Index: HISTORY.txt
===================================================================
RCS file: /cvsroot/docstring/dps/HISTORY.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** HISTORY.txt	2001/10/18 03:35:50	1.20
--- HISTORY.txt	2001/10/20 03:07:56	1.21
***************
*** 62,65 ****
--- 62,67 ----
    - Changed 'graphic' to 'image'.
    - Added 'docinfo', container for bibliographic elements.
+   - Added 'division', repeatable container for body elements.
+   - Renamed 'indirect' hyperlink targets -> 'external'.
  
  * dps/roman.py: Added to project. Written by and courtesy of Mark
***************
*** 110,113 ****
--- 112,117 ----
  * test/test_utils.py: Converted from doctest to unittest & updated.
  
+ * spec/doctree.txt: "DPS Document Tree Structure", added to project.
+ 
  * spec/pep-0256.txt:
  
***************
*** 143,147 ****
    - Added 'error' admonishment element.
    - Added 'docinfo' as container for bibliographic elements.
!   - Added 'division'.
  
  * spec/pdpi.dtd:
--- 147,154 ----
    - Added 'error' admonishment element.
    - Added 'docinfo' as container for bibliographic elements.
!   - Added 'division', repeatable container of body elements.
!   - Separated out %link.atts into constituent parts.
!   - Added "refname" and "anonymous" attrbites to "target".
!   - Added "anonymous" attribute to "link".
  
  * spec/pdpi.dtd:

[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