Commit 8f795118b8773caa21e6077ffc971c3f44a10332
2014-11-29T06:49:15
* src/tools/docmaker/tohtml.py: Fix index and TOC templates. This thinko was introduced 2014-11-27.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
diff --git a/ChangeLog b/ChangeLog
index 6aa3ae9..095049c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-29 Werner Lemberg <wl@gnu.org>
+
+ * src/tools/docmaker/tohtml.py: Fix index and TOC templates.
+
+ This thinko was introduced 2014-11-27.
+
2014-11-28 Werner Lemberg <wl@gnu.org>
[docmaker] Format field lists with CSS.
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index 44544cc..30c1dde 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -130,11 +130,16 @@ html_header_4 = """\
<td class="right">[<a href="\
"""
-html_header_5 = """\
+html_header_5t = """\
">TOC</a>]</td></tr></table>
<h1>\
"""
+html_header_5i = """\
+">Index</a>]</td></tr></table>
+<h1>\
+"""
+
html_header_6 = """\
API Reference</h1>
"""
@@ -240,8 +245,13 @@ class HtmlFormatter( Formatter ):
def __init__( self, processor, project_title, file_prefix ):
Formatter.__init__( self, processor )
- global html_header_1, html_header_2, html_header_3
- global html_header_4, html_header_5, html_footer
+ global html_header_1
+ global html_header_2
+ global html_header_3l, html_header_3r
+ global html_header_4
+ global html_header_5t, html_header_5i
+ global html_header_6
+ global html_footer
if file_prefix:
file_prefix = file_prefix + "-"
@@ -256,19 +266,19 @@ class HtmlFormatter( Formatter ):
+ html_header_2
+ html_header_3l + file_prefix + "index.html"
+ html_header_4 + file_prefix + "toc.html"
- + html_header_5 + project_title
+ + html_header_5t + project_title
+ html_header_6 )
self.html_index_header = (
html_header_1 + project_title
+ html_header_2
+ html_header_3r + file_prefix + "toc.html"
- + html_header_5 + project_title
+ + html_header_5t + project_title
+ html_header_6 )
self.html_toc_header = (
html_header_1 + project_title
+ html_header_2
+ html_header_3l + file_prefix + "index.html"
- + html_header_5 + project_title
+ + html_header_5i + project_title
+ html_header_6 )
self.html_footer = (
'<div class="timestamp">generated on '