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

Sat, 16 Nov 2002 16:09:22 -0800

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

Modified Files:
	html4css1.py 
Log Message:
updated from Docutils

Index: html4css1.py
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/docutils/writers/html4css1.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** html4css1.py	8 Nov 2002 23:47:53 -0000	1.1
--- html4css1.py	17 Nov 2002 00:09:20 -0000	1.2
***************
*** 135,144 ****
      """
  
!     xml_declaration = '<?xml version="1.0" encoding="%s"?>\n'
      doctype = ('<!DOCTYPE html' 
                 ' PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'
                 ' "http://www.w3.org/TR/xhtml1/DTD/'
                 'xhtml1-transitional.dtd">\n')
!     html_head = '<html lang="%s">\n<head>\n'
      content_type = ('<meta http-equiv="Content-Type" content="text/html; '
                      'charset=%s" />\n')
--- 135,145 ----
      """
  
!     xml_declaration = '<?xml version="1.0" encoding="%s" ?>\n'
      doctype = ('<!DOCTYPE html' 
                 ' PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'
                 ' "http://www.w3.org/TR/xhtml1/DTD/'
                 'xhtml1-transitional.dtd">\n')
!     html_head = ('<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%s" '
!                  'lang="%s">\n<head>\n')
      content_type = ('<meta http-equiv="Content-Type" content="text/html; '
                      'charset=%s" />\n')
***************
*** 154,162 ****
          nodes.NodeVisitor.__init__(self, document)
          self.settings = settings = document.settings
!         self.language = languages.get_language(settings.language_code)
          self.head_prefix = [
                self.xml_declaration % settings.output_encoding,
                self.doctype,
!               self.html_head % settings.language_code,
                self.content_type % settings.output_encoding,
                self.generator % docutils.__version__]
--- 155,164 ----
          nodes.NodeVisitor.__init__(self, document)
          self.settings = settings = document.settings
!         lcode = settings.language_code
!         self.language = languages.get_language(lcode)
          self.head_prefix = [
                self.xml_declaration % settings.output_encoding,
                self.doctype,
!               self.html_head % (lcode, lcode),
                self.content_type % settings.output_encoding,
                self.generator % docutils.__version__]
***************
*** 168,172 ****
          else:
              stylesheet = self.get_stylesheet_reference()
!             self.stylesheet = [self.stylesheet_link % stylesheet]
          self.body_prefix = ['</head>\n<body>\n']
          self.body_pre_docinfo = []
--- 170,177 ----
          else:
              stylesheet = self.get_stylesheet_reference()
!             if stylesheet:
!                 self.stylesheet = [self.stylesheet_link % stylesheet]
!             else:
!                 self.stylesheet = []
          self.body_prefix = ['</head>\n<body>\n']
          self.body_pre_docinfo = []