Commit 984e07176c98ef6513d9b2210656fec1abf57827
2014-11-28T05:33:58
[docmaker] Replace some `<table>' tags with `<h4>' and `<div>'. * src/tools/docmaker/tohtml.py (marker_*): Use `<h4>'. (source_*): Use `<div>'. (HtmlFormatter::block_enter): s/<h4>/<h3>/.
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 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105
diff --git a/ChangeLog b/ChangeLog
index 2b744ed..dcf36ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-11-27 Werner Lemberg <wl@gnu.org>
+
+ [docmaker] Replace some `<table>' tags with `<h4>' and `<div>'.
+
+ * src/tools/docmaker/tohtml.py (marker_*): Use `<h4>'.
+ (source_*): Use `<div>'.
+ (HtmlFormatter::block_enter): s/<h4>/<h3>/.
+
2014-11-28 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Fix compiler warning to conversion specifiers in debug messages.
@@ -8,7 +16,7 @@
2014-11-27 Werner Lemberg <wl@gnu.org>
- * src/tools/docmaker/tohtml.py: Usee more CSS for index.
+ * src/tools/docmaker/tohtml.py: Use more CSS for index.
2014-11-27 Werner Lemberg <wl@gnu.org>
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index 3797ff8..cf702e7 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -43,6 +43,10 @@ html_header_2 = """\
color: #000000;
background: #FFFFFF; }
+ div.code { width: 100%;
+ background-color: #D6E8FF;
+ margin: 0 0 0 -0.5em;
+ padding: 0.3ex 0 0.3ex 0.5em; }
div.indent1 { width: 87%;
margin: auto; }
div.indent2 { width: 75%;
@@ -51,6 +55,14 @@ html_header_2 = """\
font-size: 69%; }
h1 { text-align: center; }
+ h3 { font-size: medium; }
+ h4 { background-color: #EEEEFF;
+ width: 100%;
+ font-size: medium;
+ font-style: oblique;
+ font-weight: bold;
+ margin: 0 0 0 -0.5em;
+ padding: 0.3ex 0 0.3ex 0.5em; }
li { text-align: justify; }
@@ -64,7 +76,6 @@ html_header_2 = """\
color: darkblue; }
table.center { margin: auto; }
- table.fill { width: 100%; }
table.index { margin: auto;
border: 0;
border-collapse: collapse;
@@ -89,9 +100,6 @@ html_header_2 = """\
td.left { padding: 0 0.5em 0 0.5em;
text-align: left; }
- tr.mark { background-color: #EEEEFF; }
- tr.code { background-color: #D6E8FF; }
-
ul.empty { list-style-type: none; }
</style>
</head>
@@ -158,17 +166,17 @@ description_header = '<div class="indent1">'
description_footer = "</div><br>"
# Marker header/inter/footer combination.
-marker_header = '<div class="indent1"><table class="fill" cellpadding="5"><tr class="mark"><td><em><b>'
-marker_inter = "</b></em></td></tr><tr><td>"
-marker_footer = "</td></tr></table></div>"
+marker_header = '<div class="indent1"><h4>'
+marker_inter = "</h4>"
+marker_footer = "</div>"
# Header location header/footer.
header_location_header = '<div class="indent1">'
header_location_footer = "</div><br>"
# Source code extracts header/footer.
-source_header = '<div class="indent1"><table class="fill"><tr class="code"><td><pre>\n'
-source_footer = "\n</pre></td></tr></table></div><br>"
+source_header = '<div class="indent1"><div class="code"><pre>'
+source_footer = "</pre></div></div>"
# Chapter header/inter/footer.
chapter_header = '<br><div class="indent2"><h2>'
@@ -564,7 +572,7 @@ class HtmlFormatter( Formatter ):
# place html anchor if needed
if block.name:
- print( '<h4 id="' + block.name + '">' + block.name + '</h4>' )
+ print( '<h3 id="' + block.name + '">' + block.name + '</h3>' )
# dump the block C source lines now
if block.code: