Menu
▾
▴
ht2html-devel — For development of ht2html
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(22) |
Apr
(10) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(23) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
(10) |
Aug
|
Sep
(5) |
Oct
(5) |
Nov
|
Dec
(1) |
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
(15) |
Jul
(10) |
Aug
|
Sep
(2) |
Oct
(10) |
Nov
(1) |
Dec
(4) |
| 2005 |
Jan
(1) |
Feb
(6) |
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: David G. <go...@us...> - 2004-06-28 02:53:55
|
Update of /cvsroot/ht2html/ht2html/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32475 Modified Files: bugs.ht Log Message: typo Index: bugs.ht =================================================================== RCS file: /cvsroot/ht2html/ht2html/doc/bugs.ht,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** bugs.ht 5 Apr 2002 04:49:11 -0000 2.1 --- bugs.ht 28 Jun 2004 02:53:46 -0000 2.2 *************** *** 5,9 **** <p>If you have really wide <pre> stuff in the body section, the banner can get drawn too wide by most browsers. In this case, you ! might want to but the wide body text in a <a href="components.html#continuation">continuation</a> section. --- 5,9 ---- <p>If you have really wide <pre> stuff in the body section, the banner can get drawn too wide by most browsers. In this case, you ! might want to put the wide body text in a <a href="components.html#continuation">continuation</a> section. |
|
From: Marty P. <ma...@gr...> - 2004-06-04 17:04:47
|
Hi
I'm using ht2html and I'm found of it.
But I have problems with subdirectories...
My site map:
rootdir : index.ht aproposht
subir of roodir : Recherche: index.ht publications.ht
The links in Recherche/inde.html are wrong, and I don't understand why !
Here is a tarball of my site (under construction).
I didn't find some pages to help on the net.
Please help me.
Yours, Patrick
|
|
From: Fred L. D. Jr. <fd...@us...> - 2004-04-09 00:35:53
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18347 Modified Files: DocsPDOGenerator.py Log Message: - neaten up a bit - use the old color abstraction to implement the new one! Index: DocsPDOGenerator.py =================================================================== RCS file: /cvsroot/ht2html/ht2html/DocsPDOGenerator.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DocsPDOGenerator.py 8 Apr 2004 18:38:41 -0000 1.4 --- DocsPDOGenerator.py 9 Apr 2004 00:22:37 -0000 1.5 *************** *** 12,18 **** sitelinks = [ ! ('http://www.python.org/', 'Python Home'), ('%(rootdir)s/download.html', 'Download'), ! ('%(rootdir)s/', 'Documentation'), ] --- 12,18 ---- sitelinks = [ ! ('http://www.python.org/', 'Python Home'), ('%(rootdir)s/download.html', 'Download'), ! ('%(rootdir)s/', 'Documentation'), ] *************** *** 21,25 **** def get_banner_bgcolor(self): ! return "#003366" --- 21,25 ---- def get_banner_bgcolor(self): ! return self.get_darkshade() |
|
From: Fred L. D. Jr. <fd...@us...> - 2004-04-08 18:51:52
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12285 Modified Files: DocsPDOGenerator.py Log Message: contrl the banner color; there's only the search box now Index: DocsPDOGenerator.py =================================================================== RCS file: /cvsroot/ht2html/ht2html/DocsPDOGenerator.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DocsPDOGenerator.py 8 Apr 2004 17:59:06 -0000 1.3 --- DocsPDOGenerator.py 8 Apr 2004 18:38:41 -0000 1.4 *************** *** 20,23 **** --- 20,26 ---- return SEARCHBOX + def get_banner_bgcolor(self): + return "#003366" + SEARCHBOX = \ |
|
From: Fred L. D. Jr. <fd...@us...> - 2004-04-08 18:38:15
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9585 Modified Files: Skeleton.py Log Message: abstract out the banner background color (this should be done for the sidebar as well); this allows the application of light/dark to be different from the current expectations Index: Skeleton.py =================================================================== RCS file: /cvsroot/ht2html/ht2html/Skeleton.py,v retrieving revision 2.10 retrieving revision 2.11 diff -C2 -d -r2.10 -r2.11 *** Skeleton.py 25 Jul 2003 04:59:52 -0000 2.10 --- Skeleton.py 8 Apr 2004 18:24:49 -0000 2.11 *************** *** 134,137 **** --- 134,140 ---- return 'cellspacing="0" cellpadding="2"' + def get_banner_bgcolor(self): + return self.get_lightshade() + def get_charset(self): """Return charset of pages""" *************** *** 199,203 **** print '<!-- start of banner -->' print '<td width="%s%%" bgcolor="%s" class="banner">' % ( ! self.get_banner_width(), self.get_lightshade()) print banner print '</td><!-- end of banner -->' --- 202,206 ---- print '<!-- start of banner -->' print '<td width="%s%%" bgcolor="%s" class="banner">' % ( ! self.get_banner_width(), self.get_banner_bgcolor()) print banner print '</td><!-- end of banner -->' *************** *** 242,246 **** print '</td>' print '<td width="15" bgcolor="%s"> </td><!--spacer-->' % ( ! self.get_lightshade()) print '<!-- end of corner cells -->' --- 245,249 ---- print '</td>' print '<td width="15" bgcolor="%s"> </td><!--spacer-->' % ( ! self.get_banner_bgcolor()) print '<!-- end of corner cells -->' |
|
From: Fred L. D. Jr. <fd...@us...> - 2004-04-08 18:12:22
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4410 Modified Files: DocsPDOGenerator.py Log Message: tighten things up a bit; change the banner (still not right) Index: DocsPDOGenerator.py =================================================================== RCS file: /cvsroot/ht2html/ht2html/DocsPDOGenerator.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DocsPDOGenerator.py 8 Apr 2004 05:56:49 -0000 1.2 --- DocsPDOGenerator.py 8 Apr 2004 17:59:06 -0000 1.3 *************** *** 17,39 **** ] - def __init__(self, file, rootdir, relthis): - PDOGenerator.__init__(self, file, rootdir, relthis) - self._Banner__cols = 2 - def get_banner(self): ! banner = PDOGenerator.get_banner(self) ! banner = banner.replace("</tr>", SEARCHBOX + "</tr>", 1) ! return banner ! SEARCHBOX = ''' ! <td rowspan="2" id="search" align="right" width="30%"> <form method="get" action="http://www.google.com/search"> Search: <input id="q" name="q" size="30" value=""> ! <input type="hidden" id="domains" name="domains" value="docs.python.org"> ! <input type="hidden" id="sitesearch" name="sitesearch" value="docs.python.org"> ! <input type="hidden" id="sourceid" name="sourceid" value="google-search"> ! <input type="submit" id="submit" name="submit" value="submit"> </form> ! ! </td>''' --- 17,37 ---- ] def get_banner(self): ! return SEARCHBOX ! SEARCHBOX = \ ! '''<!-- start of search bar --> ! <div id="search"> <form method="get" action="http://www.google.com/search"> Search: <input id="q" name="q" size="30" value=""> ! <input type="hidden" id="domains" name="domains" ! value="docs.python.org" /> ! <input type="hidden" id="sitesearch" name="sitesearch" ! value="docs.python.org" /> ! <input type="hidden" id="sourceid" name="sourceid" ! value="google-search" /> ! <input type="submit" id="submit" name="submit" value="submit" /> </form> ! </div><!-- end of search bar --> ! ''' |
|
From: Fred L. D. Jr. <fd...@us...> - 2004-04-08 06:10:09
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26857 Modified Files: DocsPDOGenerator.py Log Message: simplify! getting the right stylesheet makes all the difference in the world Index: DocsPDOGenerator.py =================================================================== RCS file: /cvsroot/ht2html/ht2html/DocsPDOGenerator.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DocsPDOGenerator.py 8 Apr 2004 05:45:49 -0000 1.1 --- DocsPDOGenerator.py 8 Apr 2004 05:56:49 -0000 1.2 *************** *** 23,36 **** def get_banner(self): banner = PDOGenerator.get_banner(self) ! searchbox = SEARCHBOX % self.get_lightshade() ! banner = banner.replace("</tr>", searchbox + "</tr>", 1) return banner - # %-substitutions will be performed on this string SEARCHBOX = ''' ! <td rowspan="2" id="search" align="right" width="30%%" ! style="padding: 5pt; vertical-align: middle;" ! bgcolor="%s"> <form method="get" action="http://www.google.com/search"> Search: <input id="q" name="q" size="30" value=""> --- 23,32 ---- def get_banner(self): banner = PDOGenerator.get_banner(self) ! banner = banner.replace("</tr>", SEARCHBOX + "</tr>", 1) return banner SEARCHBOX = ''' ! <td rowspan="2" id="search" align="right" width="30%"> <form method="get" action="http://www.google.com/search"> Search: <input id="q" name="q" size="30" value=""> |
|
From: Fred L. D. Jr. <fd...@us...> - 2004-04-08 05:58:54
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25358 Added Files: DocsPDOGenerator.py Log Message: simple style for docs.python.org --- NEW FILE: DocsPDOGenerator.py --- """Generate the docs.python.org website style. This mostly inherits from PDOGenerator, but changes a few of the links and default values. """ from PDOGenerator import PDOGenerator class DocsPDOGenerator(PDOGenerator): AUTHOR = 'do...@py...' sitelinks = [ ('http://www.python.org/', 'Python Home'), ('%(rootdir)s/download.html', 'Download'), ('%(rootdir)s/', 'Documentation'), ] def __init__(self, file, rootdir, relthis): PDOGenerator.__init__(self, file, rootdir, relthis) self._Banner__cols = 2 def get_banner(self): banner = PDOGenerator.get_banner(self) searchbox = SEARCHBOX % self.get_lightshade() banner = banner.replace("</tr>", searchbox + "</tr>", 1) return banner # %-substitutions will be performed on this string SEARCHBOX = ''' <td rowspan="2" id="search" align="right" width="30%%" style="padding: 5pt; vertical-align: middle;" bgcolor="%s"> <form method="get" action="http://www.google.com/search"> Search: <input id="q" name="q" size="30" value=""> <input type="hidden" id="domains" name="domains" value="docs.python.org"> <input type="hidden" id="sitesearch" name="sitesearch" value="docs.python.org"> <input type="hidden" id="sourceid" name="sourceid" value="google-search"> <input type="submit" id="submit" name="submit" value="submit"> </form> </td>''' |
|
From: Fred L. D. Jr. <fd...@us...> - 2004-04-08 05:57:06
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25079 Modified Files: PDOGenerator.py Log Message: make the sitelinks value easier to override in a subclass Index: PDOGenerator.py =================================================================== RCS file: /cvsroot/ht2html/ht2html/PDOGenerator.py,v retrieving revision 2.17 retrieving revision 2.18 diff -C2 -d -r2.17 -r2.18 *** PDOGenerator.py 12 Aug 2003 16:12:06 -0000 2.17 --- PDOGenerator.py 8 Apr 2004 05:43:55 -0000 2.18 *************** *** 23,41 **** - sitelinks = [ - ('%(rootdir)s/', 'Home'), - ('%(rootdir)s/search/', 'Search'), - ('%(rootdir)s/download/', 'Download'), - ('%(rootdir)s/doc/', 'Documentation'), - ('%(rootdir)s/Help.html', 'Help'), - ('%(rootdir)s/dev/', 'Developers'), - ('%(rootdir)s/community/', 'Community'), - ('%(rootdir)s/sigs/', 'SIGs'), - ] - - class PDOGenerator(Skeleton, Sidebar, Banner): AUTHOR = 'web...@py...' def __init__(self, file, rootdir, relthis): root, ext = os.path.splitext(file) --- 23,40 ---- class PDOGenerator(Skeleton, Sidebar, Banner): AUTHOR = 'web...@py...' + sitelinks = [ + ('%(rootdir)s/', 'Home'), + ('%(rootdir)s/search/', 'Search'), + ('%(rootdir)s/download/', 'Download'), + ('%(rootdir)s/doc/', 'Documentation'), + ('%(rootdir)s/Help.html', 'Help'), + ('%(rootdir)s/dev/', 'Developers'), + ('%(rootdir)s/community/', 'Community'), + ('%(rootdir)s/sigs/', 'SIGs'), + ] + def __init__(self, file, rootdir, relthis): root, ext = os.path.splitext(file) *************** *** 70,75 **** # sitelink_fixer = LinkFixer(f.myurl(), rootdir) ! sitelink_fixer.massage(sitelinks, self.__d, aboves=1) ! Banner.__init__(self, sitelinks) # grab a random banner from the pile s = random.choice(glob.glob("%(rootdir)s/pics/PyBanner*.gif" % --- 69,74 ---- # sitelink_fixer = LinkFixer(f.myurl(), rootdir) ! sitelink_fixer.massage(self.sitelinks, self.__d, aboves=1) ! Banner.__init__(self, self.sitelinks) # grab a random banner from the pile s = random.choice(glob.glob("%(rootdir)s/pics/PyBanner*.gif" % |
|
From: Fred L. D. Jr. <fd...@us...> - 2004-04-08 05:35:30
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22102 Modified Files: Banner.py Log Message: sanitize the generated HTML a little bit Index: Banner.py =================================================================== RCS file: /cvsroot/ht2html/ht2html/Banner.py,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** Banner.py 27 Mar 2002 03:59:48 -0000 2.3 --- Banner.py 8 Apr 2004 05:22:17 -0000 2.4 *************** *** 41,45 **** print '<!-- start of site links table -->' print '<table width="100%" border="0"' ! print self.get_banner_attributes() print ' bgcolor="%s">' % ( self.get_bgcolor()) --- 41,47 ---- print '<!-- start of site links table -->' print '<table width="100%" border="0"' ! attrs = self.get_banner_attributes() ! if attrs: ! print ' ', attrs print ' bgcolor="%s">' % ( self.get_bgcolor()) |
|
From: Skip M. <mon...@us...> - 2003-12-04 20:10:46
|
Update of /cvsroot/ht2html/ht2html In directory sc8-pr-cvs1:/tmp/cvs-serv29191 Added Files: .sitemap-ignore Log Message: not part of Site Map --- NEW FILE: .sitemap-ignore --- |
|
From: Barry A. W. <bw...@us...> - 2003-10-27 20:06:29
|
Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv5799
Modified Files:
BAWGenerator.py
Log Message:
absolute url
Index: BAWGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/BAWGenerator.py,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -d -r2.3 -r2.4
*** BAWGenerator.py 27 Oct 2003 19:59:41 -0000 2.3
--- BAWGenerator.py 27 Oct 2003 20:03:01 -0000 2.4
***************
*** 91,94 ****
def get_meta(self):
meta = Skeleton.get_meta(self)
! favicon = '<link REL="shortcut icon" HREF="images/bassclef.png">'
return meta + '\n' + favicon
--- 91,94 ----
def get_meta(self):
meta = Skeleton.get_meta(self)
! favicon = '<link REL="shortcut icon" HREF="/images/bassclef.png">'
return meta + '\n' + favicon
|
|
From: Barry A. W. <bw...@us...> - 2003-10-27 20:04:12
|
Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv5108
Modified Files:
BAWGenerator.py
Log Message:
Add my favicon
Index: BAWGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/BAWGenerator.py,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -d -r2.2 -r2.3
*** BAWGenerator.py 4 Apr 2003 22:50:33 -0000 2.2
--- BAWGenerator.py 27 Oct 2003 19:59:41 -0000 2.3
***************
*** 88,89 ****
--- 88,94 ----
self.__body = self.__parser.fp.read()
return self.__body
+
+ def get_meta(self):
+ meta = Skeleton.get_meta(self)
+ favicon = '<link REL="shortcut icon" HREF="images/bassclef.png">'
+ return meta + '\n' + favicon
|
|
From: Barry W. <ba...@py...> - 2003-10-09 18:46:39
|
On Mon, 2003-09-22 at 20:27, Aahz wrote: > Please add me to the list of people with CVS privs. My SF id is aahz > (surprise, surprise). Now that I know the admin password for this list, and cleared out its pending queue, I've seen this message and I've done the request. Glad you didn't have to wait a year for that. :) -Barry |
|
From: SourceForge.net <no...@so...> - 2003-10-05 06:34:56
|
Patches item #818008, was opened at 2003-10-05 06:34 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=447267&aid=818008&group_id=46757 Category: None Group: None Status: Open Resolution: None Priority: 5 Submitted By: Rob W.W. Hooft (hooft) Assigned to: Nobody/Anonymous (nobody) Summary: Object composition tricks Initial Comment: See mailing list posting. Diff to 2.0 with the following implications: * Support for internationalized .ht files (xxx.language.ht -> xxx.html.language) * A new style of generator class that doesn't use multiple inheritance but object composition. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=447267&aid=818008&group_id=46757 |
|
From: Rob H. <ro...@ho...> - 2003-10-05 06:18:25
|
Hi all,
Barry suggested I send this here. I didn't see much textual discussion
on the mailinglist archives recently....
I am moving my family website from a self-organized host with an ancient
Zope to a sort-of ISP without Zope, and looking for tools I stumbled
upon ht2html. It looked like a good tool matching my web-habits, except
that I do not like the multiple inheritance headaches....
Starting from the 2.0 release I wrote a new module Generator containing
some classes derived (and largely copied) from some of the classes in
the package, that uses object composition instead of inheritance for
the components. I also derived a generator for my site from it.
It also has a few tricks to start internationalizing my website: it does
convert files named xxx.en.ht -> xxx.html.en; something similar should
be implemented for the .h files.
Is this is a route that might be interesting to incorporate into ht2html?
Another thing I'm toying with is to build in py-interpolation into the
.ht body: everything between {{ }} would be executed in a python
interpreter and replaced by its stdout. Did anyone ever try something
like that? Going one step further, the .ht file could have a #! line
and the whole thing could be dynamically parsed...
Regards,
Rob
--
Rob W.W. Hooft || ro...@ho... || http://www.hooft.net/people/rob/
|
|
From: Jens J. M. <je...@fy...> - 2003-09-29 07:41:22
|
Hi, Would it be possible to use "fixed positioning" for the top and side=20 bars - instead of a table? (so that they don't scroll). I know nothing=20 about how "fixed positioning" works, but is seems like a nice idea, and=20 simpler than using frames. Jens J=F8rgen |
|
From: Barry A. W. <bw...@us...> - 2003-09-25 04:13:03
|
Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv13086
Modified Files:
ht2html.py
Log Message:
Fix usage() method call.
Index: ht2html.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/ht2html.py,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -d -r2.2 -r2.3
*** ht2html.py 25 Jul 2003 05:20:18 -0000 2.2
--- ht2html.py 25 Sep 2003 04:12:46 -0000 2.3
***************
*** 136,140 ****
self.prefix = os.path.commonprefix([self.absroot, self.curdir])
if self.prefix != self.absroot:
! usage(1, 'Root directory must be relative to current directory')
self.relthis = self.curdir[len(self.prefix)+1:]
if not self.relthis:
--- 136,141 ----
self.prefix = os.path.commonprefix([self.absroot, self.curdir])
if self.prefix != self.absroot:
! self.usage(
! 1, 'Root directory must be relative to current directory')
self.relthis = self.curdir[len(self.prefix)+1:]
if not self.relthis:
|
|
From: Aahz <aa...@py...> - 2003-09-23 00:27:35
|
Please add me to the list of people with CVS privs. My SF id is aahz (surprise, surprise). -- Aahz (aa...@py...) <*> http://www.pythoncraft.com/ "It is easier to optimize correct code than to correct optimized code." --Bill Harlan |
|
From: W.T. B. <wtb...@ra...> - 2003-09-21 16:16:28
|
Discovered your nifty little web site generator recently. It seems to
do *almost* exactly what I need if I could figure out some of the
documentation.
A couple of questions. I quickly perused the RFC 2822 page but didn't
see anything on metatags. I see some pieces that suggest ht2html can
support metatags in the HTML header, but I can't find any good example
of the .ht & resulting .html. Can you direct me to a good example?
Also, when I try to generate multiple pages, the links across the top
of the page seem to lose their link character. For example, if my
WebGenerator.py class has
sitelinks = [
('%(rootdir)s/index.html', 'Home'),
('%(rootdir)s/links.html', 'Links'),
('%(rootdir)s/resources.html', 'Resources'),
]
and I generate
ht2html.py -s WebGenerator index.ht links.ht resources.ht
then the Links and Resources pages don't have the previous links, ie.
Home, active. Is there a solution for this? I've seen sites
apparently generated with this tool that handle these topics, but
without the .ht file or more command-line examples, it's difficult to
figure out what's going on.
Thanks,
Tom
|
|
From: A.M. K. <aku...@us...> - 2003-09-13 12:29:54
|
Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv16072
Modified Files:
LinkFixer.py
Log Message:
Fix for bug reported by Brett C.: normpath() would turn '../../pics' into 'pics'.
'..' should only remove the previous path segment if that segment isn't also '..'.
Index: LinkFixer.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/LinkFixer.py,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -d -r2.1 -r2.2
*** LinkFixer.py 12 Aug 2003 16:10:19 -0000 2.1
--- LinkFixer.py 13 Sep 2003 12:29:48 -0000 2.2
***************
*** 108,112 ****
if p == '.':
continue
! if p == '..' and len(parts) > 0:
del parts[-1]
continue
--- 108,112 ----
if p == '.':
continue
! if p == '..' and len(parts) > 0 and parts[-1] != '..':
del parts[-1]
continue
|
|
From: Fred L. D. <fd...@us...> - 2003-07-30 21:46:50
|
Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv6369
Modified Files:
PDOGenerator.py
Log Message:
normalize whitespace
Index: PDOGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/PDOGenerator.py,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** PDOGenerator.py 26 Jul 2003 17:45:36 -0000 2.14
--- PDOGenerator.py 30 Jul 2003 21:46:47 -0000 2.15
***************
*** 126,130 ****
<img alt="" border="0"
src="%(rootdir)s/pics/%(banner)s" /></a></center>''' % \
! self.__d
def get_corner_bgcolor(self):
--- 126,130 ----
<img alt="" border="0"
src="%(rootdir)s/pics/%(banner)s" /></a></center>''' % \
! self.__d
def get_corner_bgcolor(self):
***************
*** 133,148 ****
# value. Some images may be `bizarre'. See .../pics/backgrounds.py
return [
! '#3399ff', '#6699cc', '#3399ff', '#0066cc', '#3399ff',
! '#0066cc', '#0066cc', '#3399ff', '#3399ff', '#3399ff',
! '#3399ff', '#6699cc', '#3399ff', '#3399ff', '#ffffff',
! '#6699cc', '#0066cc', '#3399ff', '#0066cc', '#3399ff',
! '#6699cc', '#0066cc', '#6699cc', '#3399ff', '#3399ff',
! '#6699cc', '#3399ff', '#3399ff', '#6699cc', '#6699cc',
! '#0066cc', '#6699cc', '#0066cc', '#6699cc', '#0066cc',
! '#0066cc', '#6699cc', '#3399ff', '#0066cc', '#bbd6f1',
! '#0066cc', '#6699cc', '#3399ff', '#3399ff', '#0066cc',
! '#0066cc', '#0066cc', '#6699cc', '#6699cc', '#3399ff',
! '#3399ff', '#6699cc', '#0066cc', '#0066cc', '#6699cc',
! '#0066cc', '#6699cc', '#3399ff', '#6699cc', '#3399ff',
'#d6ebff', '#6699cc', '#3399ff', '#0066cc',
][self.__whichbanner]
--- 133,148 ----
# value. Some images may be `bizarre'. See .../pics/backgrounds.py
return [
! '#3399ff', '#6699cc', '#3399ff', '#0066cc', '#3399ff',
! '#0066cc', '#0066cc', '#3399ff', '#3399ff', '#3399ff',
! '#3399ff', '#6699cc', '#3399ff', '#3399ff', '#ffffff',
! '#6699cc', '#0066cc', '#3399ff', '#0066cc', '#3399ff',
! '#6699cc', '#0066cc', '#6699cc', '#3399ff', '#3399ff',
! '#6699cc', '#3399ff', '#3399ff', '#6699cc', '#6699cc',
! '#0066cc', '#6699cc', '#0066cc', '#6699cc', '#0066cc',
! '#0066cc', '#6699cc', '#3399ff', '#0066cc', '#bbd6f1',
! '#0066cc', '#6699cc', '#3399ff', '#3399ff', '#0066cc',
! '#0066cc', '#0066cc', '#6699cc', '#6699cc', '#3399ff',
! '#3399ff', '#6699cc', '#0066cc', '#0066cc', '#6699cc',
! '#0066cc', '#6699cc', '#3399ff', '#6699cc', '#3399ff',
'#d6ebff', '#6699cc', '#3399ff', '#0066cc',
][self.__whichbanner]
***************
*** 164,168 ****
else:
text = rst_html.process_rst(self.filename, text)
!
i = text.find('<!--table-stop-->')
if i >= 0:
--- 164,168 ----
else:
text = rst_html.process_rst(self.filename, text)
!
i = text.find('<!--table-stop-->')
if i >= 0:
|
|
From: Fred L. D. <fd...@us...> - 2003-07-30 21:08:09
|
Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv31621
Modified Files:
htwf.py
Log Message:
Add more elaborate checks here so error messages can make more sense,
and be issued closer to markup where things start to go wrong.
Index: htwf.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/htwf.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** htwf.py 29 Jul 2003 22:47:07 -0000 1.3
--- htwf.py 30 Jul 2003 21:05:14 -0000 1.4
***************
*** 50,53 ****
--- 50,58 ----
+ BLOCK_TAGS = ('blockquote', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p',
+ 'pre', 'table', 'td', 'th', 'tr')
+ EMPTY_TAGS = ('br', 'hr')
+
+
class HTWF(ht2html.Command):
***************
*** 65,82 ****
p = expat.ParserCreate()
p.StartElementHandler = self.startElement
try:
! p.Parse(newtext, 1)
except expat.ExpatError, e:
print e
except RuntimeError, e:
print e
def startElement(self, name, attrs):
if not name.islower():
! raise RuntimeError("found non-lowercase tag name: " + `name`)
for attrname in attrs.keys():
if not attrname.islower():
! raise RuntimeError("found non-lowercase attribute name: "
! + `attrname`)
--- 70,127 ----
p = expat.ParserCreate()
p.StartElementHandler = self.startElement
+ p.EndElementHandler = self.endElement
+ self.parser = p
+ self.stack = []
try:
! try:
! p.Parse(newtext, 1)
! except:
! if self.quiet:
! print 'Checking %s...' % file
! raise
except expat.ExpatError, e:
print e
+ print "open elements:", " ".join(self.stack)
+ print
except RuntimeError, e:
print e
+ print "discovered on line:", e.lineno
+ print "open elements:", " ".join(self.stack)
+ print
def startElement(self, name, attrs):
if not name.islower():
! err = RuntimeError("found non-lowercase tag name: "
! + tagrepr(name))
! err.lineno = self.parser.ErrorLineNumber
! raise err
for attrname in attrs.keys():
if not attrname.islower():
! err = RuntimeError("found non-lowercase attribute name: "
! + tagrepr(attrname))
! err.lineno = self.parser.ErrorLineNumber
! raise err
! if self.stack and self.stack[-1] in EMPTY_TAGS:
! err = RuntimeError("empty tag not XHTML-adjusted: %s before %s"
! % (tagrepr(self.stack[-1]), tagrepr(name)))
! err.lineno = self.parser.ErrorLineNumber
! raise err
! if name in BLOCK_TAGS and 'p' in self.stack:
! err = RuntimeError("block element opened while 'p' is still open: "
! + tagrepr(name))
! err.lineno = self.parser.ErrorLineNumber
! raise err
! self.stack.append(name)
!
! def endElement(self, name):
! del self.stack[-1]
!
!
! def tagrepr(name):
! r = `name`
! if r[0] == "u":
! return r[1:]
! else:
! return r
|
|
From: Fred L. D. <fd...@us...> - 2003-07-30 15:41:03
|
Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv2705
Modified Files:
SelfGenerator.py
Log Message:
better XHTML compliance
Index: SelfGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/SelfGenerator.py,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -d -r2.5 -r2.6
*** SelfGenerator.py 1 Nov 2002 15:44:17 -0000 2.5
--- SelfGenerator.py 30 Jul 2003 15:41:00 -0000 2.6
***************
*** 42,46 ****
<center>
<img alt="[Python Powered]" border="0"
! src="PythonPoweredSmall.png"></center>
''' % self.__d))
self.__linkfixer.massage(p.sidebar, self.__d)
--- 42,46 ----
<center>
<img alt="[Python Powered]" border="0"
! src="PythonPoweredSmall.png" /></center>
''' % self.__d))
self.__linkfixer.massage(p.sidebar, self.__d)
***************
*** 52,56 ****
p.sidebar.append(('http://www.python.org/psf/',
'Python Software Foundation'))
! p.sidebar.append((None, '<hr>'))
p.sidebar.append((file, '[page source]'))
# Fix up our site links, no relthis because the site links are
--- 52,56 ----
p.sidebar.append(('http://www.python.org/psf/',
'Python Software Foundation'))
! p.sidebar.append((None, '<hr />'))
p.sidebar.append((file, '[page source]'))
# Fix up our site links, no relthis because the site links are
***************
*** 81,85 ****
<a href="index.html">
<img alt="ht2html" border="0"
! src="ht2html.png"></a></center>''' % \
self.__d
--- 81,85 ----
<a href="index.html">
<img alt="ht2html" border="0"
! src="ht2html.png" /></a></center>''' % \
self.__d
|
|
From: Fred L. D. <fd...@us...> - 2003-07-29 22:47:15
|
Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv30404
Modified Files:
htwf.py
Log Message:
desparately try to support encodings: this works for us-ascii and
iso-8859-1, but that's probably it
Index: htwf.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/htwf.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** htwf.py 29 Jul 2003 20:29:41 -0000 1.2
--- htwf.py 29 Jul 2003 22:47:07 -0000 1.3
***************
*** 59,63 ****
return
newtext = g.makepage()
! p = expat.ParserCreate()
p.StartElementHandler = self.startElement
try:
--- 59,67 ----
return
newtext = g.makepage()
! charset = g.get_charset()
! if charset:
! p = expat.ParserCreate(charset)
! else:
! p = expat.ParserCreate()
p.StartElementHandler = self.startElement
try:
|
