diff --git a/ChangeLog b/ChangeLog index 540b18cbc..cb15dd37f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2014-11-27 Werner Lemberg + + * src/tools/docmaker/tohtml.py: Remove remaining `width' attributes. + + For `Index' and `TOC' links, we now simply use the `text-align' CSS + property of `' to enforce flush-left and flush-right, + eliminating the hack with an empty, full-width `' element + inbetween. + + The change also enforces the same (smaller) size for all index and + TOC links. + 2014-11-27 suzuki toshiya * src/cff/cf2font.c: Include `ftcalc.h' to use FT_MSB(), diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py index 6a45aace2..e2759d882 100644 --- a/src/tools/docmaker/tohtml.py +++ b/src/tools/docmaker/tohtml.py @@ -65,14 +65,23 @@ html_header_2 = """\ table.center { margin: auto; } table.fill { width: 100%; } + table.index-toc-link { width: 100%; } + table.index-toc-link td.left { padding: 0 0.5em 0 0.5em; + font-size: 83%; + text-align: left; } + table.index-toc-link td.right { padding: 0 0.5em 0 0.5em; + font-size: 83%; + text-align: right; } + table.synopsis { margin: auto; + border: 0; + border-collapse: separate; + border-spacing: 1em 1ex; } + table.synopsis tr { padding: 0; } + table.synopsis td { padding: 0; } td { padding: 0 0.5em 0 0.5em; } td.left { padding: 0 0.5em 0 0.5em; text-align: left; } - td.small { padding: 0 0.5em 0 0.5em; - font-size: 83%; } - td.tiny { padding: 0 0.5em 0 0.5em; - font-size: 69%; } tr.mark { background-color: #EEEEFF; } tr.code { background-color: #D6E8FF; } @@ -83,19 +92,17 @@ html_header_2 = """\ """ -html_header_3 = """ - - - - -
[
[
[
[Index][[\ """ -html_header_5t = """\ -">Index]
-

\ -""" - html_header_6 = """\ API Reference

""" @@ -136,12 +137,11 @@ para_footer = "

" block_header = '
' block_footer_start = """\
- - -
[
[Index][[TOC]
@@ -172,8 +172,7 @@ chapter_footer = '' # Index footer. index_footer_start = """\
- -
[
[TOC]
@@ -182,12 +181,10 @@ index_footer_end = """\ # TOC footer. toc_footer_start = """\
- - -
[
[Index]
+">Index] """ @@ -232,21 +229,21 @@ class HtmlFormatter( Formatter ): self.html_header = ( html_header_1 + project_title + html_header_2 - + html_header_3 + file_prefix + "index.html" + + html_header_3l + file_prefix + "index.html" + html_header_4 + file_prefix + "toc.html" + html_header_5 + project_title + html_header_6 ) self.html_index_header = ( html_header_1 + project_title + html_header_2 - + html_header_3i + file_prefix + "toc.html" + + html_header_3r + file_prefix + "toc.html" + html_header_5 + project_title + html_header_6 ) self.html_toc_header = ( html_header_1 + project_title + html_header_2 - + html_header_3 + file_prefix + "index.html" - + html_header_5t + project_title + + html_header_3l + file_prefix + "index.html" + + html_header_5 + project_title + html_header_6 ) self.html_footer = ( '
generated on ' @@ -526,7 +523,7 @@ class HtmlFormatter( Formatter ): if maxwidth <> 0: # print section synopsis print section_synopsis_header - print '' + print '
' columns = width / maxwidth if columns < 1: