[Docutils-checkins] docutils/docutils/writers html4css1.py,1.9,1.10

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/docutils/docutils/docutils/writers
In directory usw-pr-cvs1:/tmp/cvs-serv16492/docutils/docutils/writers

Modified Files:
	html4css1.py 
Log Message:
- Added support for the ``--stylesheet`` option.
- Added support for an option values object which carries default
  settings and overrides (from command-line options and library use).
- Cleaned up imports: no more relative package imports or
  comma-separated lists of top-level modules.

Index: html4css1.py
===================================================================
RCS file: /cvsroot/docutils/docutils/docutils/writers/html4css1.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** html4css1.py	24 May 2002 03:07:14 -0000	1.9
--- html4css1.py	30 May 2002 02:17:28 -0000	1.10
***************
*** 18,22 ****
  
  
! import sys, time, string, re
  from types import ListType
  from docutils import writers, nodes, languages
--- 18,25 ----
  
  
! import sys
! import time
! import string
! import re
  from types import ListType
  from docutils import writers, nodes, languages
***************
*** 28,31 ****
--- 31,38 ----
      """Formats this writer supports."""
  
+     cmdline_options = (
+         ('Specify a stylesheet file.  Default is "default.css".',
+          ['--stylesheet'], {'default': 'default.css', 'metavar': '<file>'}),)
+ 
      output = None
      """Final translated form of `document`."""
***************
*** 52,68 ****
      generator = '<meta name="generator" content="Docutils: ' \
                  'http://docutils.sourceforge.net/">\n'
!     stylesheet_link = '<link rel="stylesheet" href="default.css"' \
!                       ' type="text/css" />\n'
  
      def __init__(self, document):
          nodes.NodeVisitor.__init__(self, document)
!         self.language = languages.get_language(document.language_code)
          self.head_prefix = [
                self.xml_declaration,     # @@@ % output_encoding
                self.doctype,
!               self.html_head % document.language_code,
                self.content_type,        # @@@ % output encoding
                self.generator,
!               self.stylesheet_link]     # @@@ % stylesheet
          self.head = []
          self.body_prefix = ['</head>\n<body>\n']
--- 59,74 ----
      generator = '<meta name="generator" content="Docutils: ' \
                  'http://docutils.sourceforge.net/">\n'
!     stylesheet_link = '<link rel="stylesheet" href="%s" type="text/css" />\n'
  
      def __init__(self, document):
          nodes.NodeVisitor.__init__(self, document)
!         self.language = languages.get_language(document.options.language_code)
          self.head_prefix = [
                self.xml_declaration,     # @@@ % output_encoding
                self.doctype,
!               self.html_head % document.options.language_code,
                self.content_type,        # @@@ % output encoding
                self.generator,
!               self.stylesheet_link % document.options.stylesheet]
          self.head = []
          self.body_prefix = ['</head>\n<body>\n']