[Python-checkins] python/nondist/peps/docutils/writers docutils_xml.py,1.1,1.2 html4css1.py,1.2,1.3 .cvsignore,1.1,NONE

[goodger@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/peps/docutils/writers
In directory sc8-pr-cvs1:/tmp/cvs-serv30174/writers

Modified Files:
	docutils_xml.py html4css1.py 
Removed Files:
	.cvsignore 
Log Message:
update from latest Docutils code

Index: docutils_xml.py
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/docutils/writers/docutils_xml.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** docutils_xml.py	8 Nov 2002 23:47:53 -0000	1.1
--- docutils_xml.py	1 Jan 2003 02:36:01 -0000	1.2
***************
*** 23,32 ****
      settings_spec = (
          '"Docutils XML" Writer Options',
!         'Warning: these options may adversely affect whitespace; use them '
!         'only for reading convenience.',
          (('Generate XML with newlines before and after tags.',
            ['--newlines'], {'action': 'store_true'}),
           ('Generate XML with indents and newlines.',
!           ['--indents'], {'action': 'store_true'}),),)
  
      output = None
--- 23,38 ----
      settings_spec = (
          '"Docutils XML" Writer Options',
!         'Warning: the --newlines and --indents options may adversely affect '
!         'whitespace; use them only for reading convenience.',
          (('Generate XML with newlines before and after tags.',
            ['--newlines'], {'action': 'store_true'}),
           ('Generate XML with indents and newlines.',
!           ['--indents'], {'action': 'store_true'}),
!          ('Omit the XML declaration.  Use with caution.',
!           ['--no-xml-declaration'], {'dest': 'xml_declaration', 'default': 1,
!                                      'action': 'store_false'}),
!          ('Omit the DOCTYPE declaration.',
!           ['--no-doctype'], {'dest': 'doctype_declaration', 'default': 1,
!                              'action': 'store_false'}),))
  
      output = None
***************
*** 49,55 ****
              newline = '\n'
              indent = '    '
!         output_prefix = [self.xml_declaration % settings.output_encoding,
!                          self.doctype,
!                          self.generator % docutils.__version__]
          docnode = self.document.asdom().childNodes[0]
          self.output = (''.join(output_prefix)
--- 55,65 ----
              newline = '\n'
              indent = '    '
!         output_prefix = []
!         if settings.xml_declaration:
!             output_prefix.append(
!                 self.xml_declaration % settings.output_encoding)
!         if settings.doctype_declaration:
!             output_prefix.append(self.doctype)
!         output_prefix.append(self.generator % docutils.__version__)
          docnode = self.document.asdom().childNodes[0]
          self.output = (''.join(output_prefix)

Index: html4css1.py
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/docutils/writers/html4css1.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** html4css1.py	17 Nov 2002 00:09:20 -0000	1.2
--- html4css1.py	1 Jan 2003 02:36:01 -0000	1.3
***************
*** 126,133 ****
        are allowed a label first).
  
!     - Regardless of the above, in definitions, table cells, field
!       bodies, option descriptions, and list items, mark the first
!       child with 'class="first"' if it is a paragraph.  The stylesheet
!       sets the top margin to 0 for these paragraphs.
  
      The ``no_compact_lists`` setting (``--no-compact-lists`` command-line
--- 126,133 ----
        are allowed a label first).
  
!     - Regardless of the above, in definitions, table cells, field bodies,
!       option descriptions, and list items, mark the first child with
!       'class="first"' and the last child with 'class="last"'.  The stylesheet
!       sets the margins (top & bottom respecively) to 0 for these elements.
  
      The ``no_compact_lists`` setting (``--no-compact-lists`` command-line
***************
*** 781,785 ****
  
      def visit_meta(self, node):
!         self.head.append(self.starttag(node, 'meta', **node.attributes))
  
      def depart_meta(self, node):
--- 781,785 ----
  
      def visit_meta(self, node):
!         self.head.append(self.emptytag(node, 'meta', **node.attributes))
  
      def depart_meta(self, node):

--- .cvsignore DELETED ---