[HT2HTML-devel] CVS: ht2html PDOGenerator.py,2.24,2.25 Skeleton.py,2.12,2.13

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

Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22577

Modified Files:
	PDOGenerator.py Skeleton.py 
Log Message:
Turn <img /> into just <img>; it's unlikely python.org will ever use true XHTML, and the slash breaks HTML 4.01 validity (according to validator.w3.org)

Index: PDOGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/PDOGenerator.py,v
retrieving revision 2.24
retrieving revision 2.25
diff -C2 -d -r2.24 -r2.25
*** PDOGenerator.py	15 Oct 2004 18:01:58 -0000	2.24
--- PDOGenerator.py	15 Oct 2004 18:03:57 -0000	2.25
***************
*** 69,73 ****
  <center>
      <img alt="" border="0"
!          src="%(rootdir)s/pics/PythonPoweredSmall.gif" /></center>
  ''' % self.__d))
          p.sidebar.append(BLANKCELL)
--- 69,73 ----
  <center>
      <img alt="" border="0"
!          src="%(rootdir)s/pics/PythonPoweredSmall.gif" ></center>
  ''' % self.__d))
          p.sidebar.append(BLANKCELL)
***************
*** 93,97 ****
  
      def get_meta(self):
!         favicon = '\n<link rel="SHORTCUT ICON" href="/pics/pyfav.gif" />'
          s1 = Skeleton.get_meta(self)
          s2 = self.__parser.get('meta', '')
--- 93,97 ----
  
      def get_meta(self):
!         favicon = '\n<link rel="SHORTCUT ICON" href="/pics/pyfav.gif" >'
          s1 = Skeleton.get_meta(self)
          s2 = self.__parser.get('meta', '')
***************
*** 149,153 ****
      <a href="%(rootdir)s/">
      <img alt="" border="0"
!          src="%(banner)s" /></a></center>''' % \
      self.__d
  
--- 149,153 ----
      <a href="%(rootdir)s/">
      <img alt="" border="0"
!          src="%(banner)s" ></a></center>''' % \
      self.__d
  

Index: Skeleton.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/Skeleton.py,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -d -r2.12 -r2.13
*** Skeleton.py	3 Oct 2004 00:01:32 -0000	2.12
--- Skeleton.py	15 Oct 2004 18:03:57 -0000	2.13
***************
*** 80,84 ****
          """Return extra meta-data.  Must be a string."""
          import __main__
!         return '<meta name="generator" content="HT2HTML/%s" />' \
                 % __main__.__version__
  
--- 80,84 ----
          """Return extra meta-data.  Must be a string."""
          import __main__
!         return '<meta name="generator" content="HT2HTML/%s" >' \
                 % __main__.__version__
  
***************
*** 262,266 ****
      def __do_body(self, body):
          print '<!-- start of body cell -->'
!         print '<td valign="top" width="%s%%" class="body"><br />' % (
              self.get_banner_width())
          print body
--- 262,266 ----
      def __do_body(self, body):
          print '<!-- start of body cell -->'
!         print '<td valign="top" width="%s%%" class="body"><br>' % (
              self.get_banner_width())
          print body
***************
*** 293,297 ****
  <head>
  <title>%(title)s</title>
! <meta http-equiv="Content-Type" content="text/html; charset=%(charset)s" />
  %(meta)s
  %(style)s
--- 293,297 ----
  <head>
  <title>%(title)s</title>
! <meta http-equiv="Content-Type" content="text/html; charset=%(charset)s" >
  %(meta)s
  %(style)s
***************
*** 315,319 ****
              stylesheet = stylesheet.strip()
              type = self.get_stylesheet_type(stylesheet)
!             s = '<link rel="STYLESHEET" href="%s" type="%s" />' \
                  % (stylesheet, type)
          if localstyle and localstyle.strip():
--- 315,319 ----
              stylesheet = stylesheet.strip()
              type = self.get_stylesheet_type(stylesheet)
!             s = '<link rel="STYLESHEET" href="%s" type="%s" >' \
                  % (stylesheet, type)
          if localstyle and localstyle.strip():