Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv9708
Modified Files:
PDOGenerator.py Skeleton.py
Log Message:
Make it possible to generate well-formed XHTML using PDOGenerator.
Index: PDOGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/PDOGenerator.py,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** PDOGenerator.py 9 Feb 2003 16:35:26 -0000 2.11
--- PDOGenerator.py 25 Jul 2003 04:59:52 -0000 2.12
***************
*** 46,50 ****
<center>
<img alt="" border="0"
! src="%(rootdir)s/pics/PythonPoweredSmall.gif"></center>
''' % self.__d))
p.sidebar.append(BLANKCELL)
--- 46,50 ----
<center>
<img alt="" border="0"
! src="%(rootdir)s/pics/PythonPoweredSmall.gif" /></center>
''' % self.__d))
p.sidebar.append(BLANKCELL)
***************
*** 72,76 ****
def get_meta(self):
! favicon = '\n<link rel="SHORTCUT ICON" href="/pics/pyfav.gif">'
s1 = Skeleton.get_meta(self)
s2 = self.__parser.get('meta', '')
--- 72,76 ----
def get_meta(self):
! favicon = '\n<link rel="SHORTCUT ICON" href="/pics/pyfav.gif" />'
s1 = Skeleton.get_meta(self)
s2 = self.__parser.get('meta', '')
***************
*** 115,119 ****
<a href="%(rootdir)s/">
<img alt="" border="0"
! src="%(rootdir)s/pics/%(banner)s"></a></center>''' % \
self.__d
--- 115,119 ----
<a href="%(rootdir)s/">
<img alt="" border="0"
! src="%(rootdir)s/pics/%(banner)s" /></a></center>''' % \
self.__d
Index: Skeleton.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/Skeleton.py,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -d -r2.9 -r2.10
*** Skeleton.py 3 Apr 2002 23:01:12 -0000 2.9
--- Skeleton.py 25 Jul 2003 04:59:52 -0000 2.10
***************
*** 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__
***************
*** 256,260 ****
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
--- 256,260 ----
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
***************
*** 273,277 ****
"""Return the HTML <head> stuff."""
print '''\
! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
%(xmlstyle)s<html>
<!-- THIS PAGE IS AUTOMATICALLY GENERATED. DO NOT EDIT. -->
--- 273,278 ----
"""Return the HTML <head> stuff."""
print '''\
! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
! "http://www.w3.org/TR/html4/loose.dtd" >
%(xmlstyle)s<html>
<!-- THIS PAGE IS AUTOMATICALLY GENERATED. DO NOT EDIT. -->
***************
*** 286,290 ****
<head>
<title>%(title)s</title>
! <meta http-equiv="Content-Type" content="text/html; charset=%(charset)s">
%(meta)s
%(style)s
--- 287,291 ----
<head>
<title>%(title)s</title>
! <meta http-equiv="Content-Type" content="text/html; charset=%(charset)s" />
%(meta)s
%(style)s
***************
*** 308,312 ****
stylesheet = stylesheet.strip()
type = self.get_stylesheet_type(stylesheet)
! s = '<link rel="STYLESHEET" href="%s" type="%s">' \
% (stylesheet, type)
if localstyle and localstyle.strip():
--- 309,313 ----
stylesheet = stylesheet.strip()
type = self.get_stylesheet_type(stylesheet)
! s = '<link rel="STYLESHEET" href="%s" type="%s" />' \
% (stylesheet, type)
if localstyle and localstyle.strip():
|
