[Epydoc-commits] SF.net SVN: epydoc: [1242] trunk/epydoc/src/epydoc/docwriter/html_css.py
Brought to you by:
edloper
Menu
▾
▴
[Epydoc-commits] SF.net SVN: epydoc: [1242] trunk/epydoc/src/epydoc/docwriter/html_css.py
|
From: <ed...@us...> - 2006-07-05 20:49:49
|
Revision: 1242 Author: edloper Date: 2006-07-05 13:49:46 -0700 (Wed, 05 Jul 2006) ViewCVS: http://svn.sourceforge.net/epydoc/?rev=1242&view=rev Log Message: ----------- HTML output: - put module & class trees on separate pages. - put identifier index, term index, & bug index on separate pgaes. - various CSS changes/markup changes - Improved tree & index pages - Misc code clean-up - Doctest colorization moved to epydoc/markup/doctest.py - Various CSS changes Modified Paths: -------------- trunk/epydoc/src/epydoc/docwriter/html_css.py Modified: trunk/epydoc/src/epydoc/docwriter/html_css.py =================================================================== --- trunk/epydoc/src/epydoc/docwriter/html_css.py 2006-07-05 20:49:30 UTC (rev 1241) +++ trunk/epydoc/src/epydoc/docwriter/html_css.py 2006-07-05 20:49:46 UTC (rev 1242) @@ -38,397 +38,271 @@ # Also, in principle I'm mangling classes, but it looks like I'm # failing. # -# Should all epydoc css classes start with epydoc-? -# -# Base stylesheet -- just the layout details (no color) -_LAYOUT = """ - -/* Tables */ -table.help { margin-left: auto; margin-right: auto; } -table.summary { border-collapse: collapse; - border-width: 1px; border-style: solid; } -table.details { border-collapse: collapse; - border-width: 1px; border-style: solid; - margin: .2em 0 0 0; } -table.index { border-collapse: collapse; - border-width: 1px; border-style: solid; } -td.summary { border-width: 1px; border-style: solid; } -td.details { border-width: 1px; border-style: solid; } -td.index { border-width: 0px; } -th.group { text-align: left; font-size: 115%; font-style: italic; - border-width: 1px; border-style: solid; } - -/* Documentation page titles */ -h2.module { margin-top: 0.2em; } -h2.class { margin-top: 0.2em; } -h2.type { margin-top: 0.2em; } -h2.py-src { margin-top: 0.2em; } -h2.index { margin-top: 0.2em; margin-bottom: 0; } - -/* Headings */ -h1.help { text-align: center; } -h1.heading { font-size: +140%; font-style: italic; - font-weight: bold; } -h2.heading { font-size: +125%; font-style: italic; - font-weight: bold; } -h3.heading { font-size: +110%; font-style: italic; - font-weight: normal; } -h1.tocheading { text-align: center; font-size: 105%; margin: 0; - font-weight: bold; padding: 0; } -h2.tocheading { font-size: 100%; margin: 0.5em 0 0 -0.3em; - font-weight: bold; } -h3.summary, h3.details, h3.index /* used in table headers */ - { font-size: 120%; margin: 0; } - -/* Table of contents */ -p.toc { margin: 0; padding: 0; } - -/* Base tree */ -pre.base-tree { font-size: 80%; margin: 0; } - -/* Summary Sections */ -p.varlist { padding: 0 0 0 7em; text-indent: -7em; - margin: 0; } -.varlist-header { font-weight: bold; } -p.imports { padding: 0 0 0 7em; text-indent: -7em; } -.imports-header { font-weight: bold; } - -/* Function signatures */ -.sig { font-weight: bold; } - -/* Doctest blocks */ -.py-prompt { font-weight: bold;} -pre.doctestblock { padding: .5em; margin: 1em; - border-width: 1px; border-style: solid; } -table pre.doctestblock - { padding: .5em; margin: 1em; - border-width: 1px; border-style: solid; } - -/* Variable values */ -pre.variable { padding: .5em; margin: 0; - border-width: 1px; border-style: solid; } - -/* Navigation bar */ -table.navbar { border-width: 2px; border-style: groove; } -.nomargin { margin: 0; } - -/* This is used in <div> sections containing tables of private -values, to make them flow more seamlessly with the table that -comes before them. */ -.continue { border-top: 0; } - -/* Links */ -a.navbar { text-decoration: none; } - -/* Source Code Listings */ -pre.py-src { border: 2px solid black; } -div.highlight-hdr { border-top: 2px solid black; - border-bottom: 1px solid black; } -div.highlight { border-bottom: 2px solid black; } -a.pysrc-toggle { text-decoration: none; } -.py-line { border-left: 2px solid black; margin-left: .2em; - padding-left: .4em; } -.lineno { font-style: italic; font-size: 90%; - padding-left: .5em; } -/*a.py-name { text-decoration: none; }*/ - -/* Graphs */ -.graph-without-title { border: none; } -.graph-with-title { border: 1px solid black; } -.graph-title { font-weight: bold; } - -/* Lists */ -ul { margin-top: 0; } - -/* Misc. */ -.footer { font-size: 85%; } -.header { font-size: 85%; } -.breadcrumbs { font-size: 85%; font-weight: bold; } -.options { font-size: 70%; } -.rtype, .ptype, .vtype - { font-size: 85%; } -dt { font-weight: bold; } -.small { font-size: 85%; } - -h2 span.codelink { font-size: 58%; font-weight: normal; } -span.codelink { font-size: 85%; font-weight; normal; } -""" - # Black on white, with blue highlights. This is similar to how # javadoc looks. -_WHITE = _LAYOUT + """ -/* Body color */ -body { background: #ffffff; color: #000000; } - -/* Tables */ -table.summary { background: #e8f0f8; color: #000000; - border-color: #608090; } -table.details { background: #e8f0f8; color: #000000; - border-color: #608090; } -table.index { background: #e8f0f8; color: #000000; - border-color: #608090; } -tr.summary { background: #70b0ff; color: #000000; - border-color: #608090; } -tr.details { background: #70b0ff; color: #000000; - border-color: #608090; } -tr.index { background: #70b0ff; color: #000000; } -th.group { background: #c0e0f8; color: #000000; } +TEMPLATE = """ -/* Function signatures */ -.sig { background: transparent; color: #000000; } -.sig-name { background: transparent; color: #006080; } -.sig-arg, .sig-kwarg, .sig-vararg - { background: transparent; color: #008060; } -.sig-default { background: transparent; color: #602000; } -.summary-sig { background: transparent; color: #000000; } -.summary-sig-name { background: transparent; color: #204080; } -.summary-sig-arg, .summary-sig-kwarg, .summary-sig-vararg - { background: transparent; color: #008060; } +/* Epydoc CSS Stylesheet + * + * This stylesheet can be used to customize the appearance of epydoc's + * HTML output. + * + */ -/* Souce code listings & doctest blocks */ -.py-src { background: transparent; color: #000000; } -.py-prompt { background: transparent; color: #005050; } -.py-string { background: transparent; color: #006030; } -.py-comment { background: transparent; color: #003060; } -.py-keyword { background: transparent; color: #600000; } -.py-output { background: transparent; color: #404040; } -.py-name { background: transparent; color: #000050; } -.py-name:link { background: transparent; color: #000050; } -.py-name:visited { background: transparent; color: #000050; } -.py-number { background: transparent; color: #005000; } -.py-def-name { background: transparent; color: #000060; - font-weight: bold; } -.py-base-class { background: transparent; color: #000060; } -.py-param { background: transparent; color: #000060; } -.py-docstring { background: transparent; color: #006030; } -.py-decorator { background: transparent; color: #804020; } - -pre.doctestblock { background: #f4faff; color: #000000; - border-color: #708890; } -table pre.doctestblock - { background: #dce4ec; color: #000000; - border-color: #708890; } -div.py-src { background: #f0f0f0; } -div.highlight-hdr { background: #d8e8e8; } -div.highlight { background: #d0e0e0; } - - -/* Variable values */ -pre.variable { background: #dce4ec; color: #000000; - border-color: #708890; } -.variable-linewrap { background: transparent; color: #604000; } -.variable-ellipsis { background: transparent; color: #604000; } -.variable-quote { background: transparent; color: #604000; } -.re { background: transparent; color: #000000; } -.re-char { background: transparent; color: #006030; } -.re-op { background: transparent; color: #600000; } -.re-group { background: transparent; color: #003060; } -.re-ref { background: transparent; color: #404040; } - -/* Navigation bar */ -table.navbar { background: #a0c0ff; color: #0000ff; - border-color: #c0d0d0; } -th.navbar { background: #a0c0ff; color: #0000ff; } -th.navselect { background: #70b0ff; color: #000000; } - -/* Links */ -a:link { background: transparent; color: #0000ff; } -a:visited { background: transparent; color: #204080; } -a.navbar:link { background: transparent; color: #0000ff; } -a.navbar:visited { background: transparent; color: #204080; } -""" - -# Black on steel blue (old version) -_OLD_BLUE = _LAYOUT + """ -/* Body color */ -body { background: #88a0a8; color: #000000; } +/* Default Colors & Styles + * - Set the default foreground & background color with 'body'; and + * link colors with 'a:link' and 'a:visited'. + * - Use bold for decision list terms. + * - The heading styles defined here are used for headings *within* + * docstring descriptions. All headings used by epydoc itself use + * either class='epydoc' or class='toc' (CSS styles for both + * defined below). + */ +body { background: #ffffff; color: #000000; } +a:link { color: #0000ff; } +a:visited { color: #204080; } +dt { font-weight: bold; } +h1 { font-size: +140%; font-style: italic; + font-weight: bold; } +h2 { font-size: +125%; font-style: italic; + font-weight: bold; } +h3 { font-size: +110%; font-style: italic; + font-weight: normal; } -/* Tables */ -table.summary, table.details, table.index - { background: #a8c0c8; color: #000000; } -tr.summary { background: #c0e0e0; color: #000000; } -tr.details, tr.index - { background: #c0e0e0; color: #000000; } -th.group { background: #bad8e0; color: #000000; } +/* Page Header & Footer + * - The standard page header consists of a navigation bar (with + * pointers to standard pages such as 'home' and 'trees'); a + * breadcrumbs list, which can be used to navigate to containing + * classes or modules; options links, to show/hide private + * variables and to show/hide frames; and a page title (using + * <h1>). The page title may be followed by a link to the + * corresponding source code (using 'span.codelink'). + * - The footer consists of a navigation bar, a timestamp, and a + * pointer to epydoc's homepage. + */ +h1.epydoc { margin: 0; font-size: +140%; font-weight: bold; } +h2.epydoc { font-size: +130%; font-weight: bold; } +h3.epydoc { font-size: +115%; font-weight: bold; } +table.navbar { background: #a0c0ff; color: #000000; + border: 2px groove #c0d0d0; } +table.navbar table { color: #000000; } +th.navbar-select { background: #70b0ff; + color: #000000; } +table.navbar a { text-decoration: none; } +table.navbar a:link { color: #0000ff; } +table.navbar a:visited { color: #204080; } +span.breadcrumbs { font-size: 85%; font-weight: bold; } +span.options { font-size: 70%; } +span.codelink { font-size: 85%; } +td.footer { font-size: 85%; } -/* Documentation page titles */ -h2.module { margin-top: 0.2em; } -h2.class { margin-top: 0.2em ; } - -/* Headings */ -h1.heading { background: transparent; color: #002040; } -h2.heading { background: transparent; color: #002040; } -h3.heading { background: transparent; color: #002040; } +/* Table Headers + * - Each summary table and details section begins with a 'header' + * row. This row contains a section title (marked by + * 'span.table-header') as well as a show/hide private link + * (marked by 'span.options', defined above). + * - Summary tables that contain user-defined groups mark those + * groups using 'group header' rows. + */ +td.table-header { background: #70b0ff; color: #000000; + border: 1px solid #608090; } +td.table-header table { color: #000000; } +td.table-header table a:link { color: #0000ff; } +td.table-header table a:visited { color: #204080; } +span.table-header { font-size: 120%; font-weight: bold; } +th.group-header { background: #c0e0f8; color: #000000; + text-align: left; font-style: italic; + font-size: 115%; + border: 1px solid #608090; } -/* Details Sections */ -table.func-details { background: #a8c0c8; color: #000000; - border-color: #c0d0d0; } -h3.func-detail { background: transparent; color: #000000; } -table.var-details { background: #a8c0c8; color: #000000; - border-color: #c0d0d0; } -h3.var-details { background: transparent; color: #000000; } -table.prop-details { background: #a8c0c8; color: #000000; - border-color: #c0d0d0; } -h3.prop-details { background: transparent; color: #000000; } +/* Summary Tables (functions, variables, etc) + * - Each object is described by a single row of the table with + * two cells. The left cell gives the object's type, and is + * marked with 'code.summary-type'. The right cell gives the + * object's name and a summary description. + * - CSS styles for the table's header and group headers are + * defined above, under 'Table Headers' + */ +table.summary { border-collapse: collapse; + background: #e8f0f8; color: #000000; + border: 1px solid #608090; } +td.summary { border: 1px solid #608090; } +code.summary-type { font-size: 85%; } +table.summary a:link { color: #0000ff; } +table.summary a:visited { color: #204080; } -/* Function signatures */ -.sig { background: transparent; color: #000000; } -.sig-name { background: transparent; color: #006080; } -.sig-arg, .sig-kwarg, .sig-vararg - { background: transparent; color: #008060; } -.sig-default { background: transparent; color: #602000; } -.summary-sig { background: transparent; color: #000000; } -.summary-sig-name { background: transparent; color: #104060; } -.summary-sig-arg, .summary-sig-kwarg, .summary-sig-vararg - { background: transparent; color: #008060; } -/* Souce code listings & doctest blocks */ -.py-src { background: transparent; color: #000000; } -.py-prompt { background: transparent; color: #005050; } -.py-string { background: transparent; color: #006030; } -.py-comment { background: transparent; color: #003060; } -.py-keyword { background: transparent; color: #600000; } -.py-output { background: transparent; color: #404040; } -.py-name { background: transparent; color: #000050; } -.py-name:link { background: transparent; color: #000050; } -.py-name:visited { background: transparent; color: #000050; } -.py-number { background: transparent; color: #005000; } -.py-def-name { background: transparent; color: #000060; - font-weight: bold; } -.py-base-class { background: transparent; color: #000060; } -.py-param { background: transparent; color: #000060; } -.py-docstring { background: transparent; color: #006030; } -.py-decorator { background: transparent; color: #804020; } +/* Details Tables (functions, variables, etc) + * - Each object is described in its own single-celled table. + * - A single-row summary table w/ table-header is used as + * a header for each details section (CSS style for table-header + * is defined above, under 'Table Headers'). + */ +table.details { border-collapse: collapse; + background: #e8f0f8; color: #000000; + border: 1px solid #608090; + margin: .2em 0 0 0; } +table.details table { color: #000000; } +table.details a:link { color: #0000ff; } +table.details a:visited { color: #204080; } -pre.doctestblock { background: #90a8b0; color: #000000; } - border-color: #708890; } -table pre.doctestblock - { background: #b0c8d0; color: #000000; - border-color: #708890; } -div.py-src { background: #f0f0f0; } -div.highlight-hdr { background: #d8e8e8; } -div.highlight { background: #d0e0e0; } - -/* Variable values */ -pre.variable { background: #b0c8d0; color: #000000; - border-color: #708890; } -.variable-linewrap { background: transparent; color: #604000; } -.variable-ellipsis { background: transparent; color: #604000; } -.variable-quote { background: transparent; color: #604000; } -.re { background: transparent; color: #000000; } -.re-char { background: transparent; color: #006030; } -.re-op { background: transparent; color: #600000; } -.re-group { background: transparent; color: #003060; } -.re-ref { background: transparent; color: #404040; } - -/* Navigation bar */ -table.navbar { background: #607880; color: #b8d0d0; - border-color: #c0d0d0; } -th.navbar { background: #607880; color: #b8d0d0; } -th.navselect { background: #88a0a8; color: #000000; } - -/* Links */ -a:link { background: transparent; color: #104060; } -a:visited { background: transparent; color: #082840; } -a.navbar:link { background: transparent; color: #b8d0d0; } -a.navbar:visited { background: transparent; color: #b8d0d0; } -""" +/* Index tables (identifier index, term index, etc) + * - link-index is used for indices containing lists of links + * (namely, the identifier index & term index). + * - index-where is used in link indices for the text indicating + * the container/source for each link. + * - metadata-index is used for indices containing metadata + * extracted from fields (namely, the bug index & todo index). + */ +table.link-index { border-collapse: collapse; + background: #e8f0f8; color: #000000; + border: 1px solid #608090; } +td.link-index { border-width: 0px; } +table.link-index a:link { color: #0000ff; } +table.link-index a:visited { color: #204080; } +span.index-where { font-size: 70%; } +table.metadata-index { border-collapse: collapse; + background: #e8f0f8; color: #000000; + border: 1px solid #608090; + margin: .2em 0 0 0; } +td.metadata-index { border-width: 1px; border-style: solid; } +table.metadata-index a:link { color: #0000ff; } +table.metadata-index a:visited { color: #204080; } -# Black on steel blue (new version: higher contrast) -_BLUE = _LAYOUT + """ -/* Body color */ -body { background: #b0c8d0; color: #000000; } - -/* Tables */ -table.summary, table.details, table.index - { background: #c8e0e8; color: #000000; } -tr.summary { background: #dcf4fc; color: #000000; } -tr.details, tr.index - { background: #dcf4fc; color: #000000; } -th.group { background: #bad8e0; color: #000000; } +/* Function signatures + * - sig* is used for the signature in the details section. + * - .summary-sig* is used for the signature in the summary + * table, and when listing property accessor functions. + * */ +.sig-name { color: #006080; } +.sig-arg { color: #008060; } +.sig-default { color: #602000; } +.summary-sig { font-family: monospace; } +.summary-sig-name { color: #006080; font-weight: bold; } +a.summary-sig-name:link { color: #006080; font-weight: bold; } +a.summary-sig-name:visited { color: #006080; font-weight: bold; } +.summary-sig-arg { color: #006040; } +.summary-sig-default { color: #501800; } -/* Documentation page titles */ -h2.module { margin-top: 0.2em; } -h2.class { margin-top: 0.2em ; } - -/* Headings */ -h1.heading { background: transparent; color: #002060; } -h2.heading { background: transparent; color: #002060; } -h3.heading { background: transparent; color: #002060; } +/* Variable values + * - In the 'variable details' sections, each varaible's value is + * listed in a 'pre.variable' box. The width of this box is + * restricted to 80 chars; if the value's repr is longer than + * this it will be wrapped, using a backslash marked with + * class 'variable-linewrap'. If the value's repr is longer + * than 3 lines, the rest will be ellided; and an ellipsis + * marker ('...' marked with 'variable-ellipsis') will be used. + * - If the value is a string, its quote marks will be marked + * with 'variable-quote'. + * - If the variable is a regexp, it is syntax-highlighted using + * the re* CSS classes. + */ +pre.variable { padding: .5em; margin: 0; + background: #dce4ec; color: #000000; + border: 1px solid #708890; } +.variable-linewrap { color: #604000; font-weight: bold; } +.variable-ellipsis { color: #604000; font-weight; bold; } +.variable-quote { color: #604000; font-weight: bold; } +.re { color: #000000; } +.re-char { color: #006030; } +.re-op { color: #600000; } +.re-group { color: #003060; } +.re-ref { color: #404040; } -/* Details Sections */ -table.func-details { background: #c8e0e8; color: #000000; - border-color: #c0d0d0; } -h3.func-detail { background: transparent; color: #000000; } -table.var-details { background: #c8e0e8; color: #000000; - border-color: #ffffff; } -h3.var-details { background: transparent; color: #000000; } -table.prop-details { background: #c8e0e8; color: #000000; - border-color: #ffffff; } -h3.prop-details { background: transparent; color: #000000; } +/* Base tree + * - Used by class pages to display the base class hierarchy. + */ +pre.base-tree { font-size: 80%; margin: 0; } -/* Function signatures */ -.sig { background: transparent; color: #000000; } -.sig-name { background: transparent; color: #006080; } -.sig-arg, .sig-kwarg, .sig-vararg - { background: transparent; color: #008060; } -.sig-default { background: transparent; color: #602000; } -.summary-sig { background: transparent; color: #000000; } -.summary-sig-name { background: transparent; color: #082840; } -.summary-sig-arg, .summary-sig-kwarg, .summary-sig-vararg - { background: transparent; color: #008060; } +/* Frames-based table of contents headers + * - Consists of two frames: one for selecting modules; and + * the other listing the contents of the selected module. + * - h1.toc is used for each frame's heading + * - h2.toc is used for subheadings within each frame. + */ +h1.toc { text-align: center; font-size: 105%; + margin: 0; font-weight: bold; + padding: 0; } +h2.toc { font-size: 100%; font-weight: bold; + margin: 0.5em 0 0 -0.3em; } -/* Souce code listings & doctest blocks */ -.py-src { background: transparent; color: #000000; } -.py-prompt { background: transparent; color: #006070; } -.py-string { background: transparent; color: #007050; } -.py-comment { background: transparent; color: #004080; } -.py-keyword { background: transparent; color: #800000; } -.py-output { background: transparent; color: #484848; } -.py-name { background: transparent; color: #000050; } -.py-name:link { background: transparent; color: #000050; } -.py-name:visited { background: transparent; color: #000050; } -.py-number { background: transparent; color: #005000; } -.py-def-name { background: transparent; color: #000060; - font-weight: bold; } -.py-base-class { background: transparent; color: #000060; } -.py-param { background: transparent; color: #000060; } -.py-docstring { background: transparent; color: #006030; } -.py-decorator { background: transparent; color: #804020; } +/* Syntax Highlighting for Source Code + * - doctest examples are displayed in a 'pre.py-doctest' block. + * If the example is in a details table entry, then it will use + * the colors specified by the 'table pre.py-doctest' line. + * - Source code listings are displayed in a 'pre.py-src' block. + * Each line is marked with 'span.py-line' (used to draw a line + * down the left margin, separating the code from the line + * numbers). Line numbers are displayed with 'span.py-lineno'. + * The expand/collapse block toggle button is displayed with + * 'a.py-toggle' (Note: the CSS style for 'a.py-toggle' should not + * modify the font size of the text.) + * - If a source code page is opened with an anchor, then the + * corresponding code block will be highlighted. The code + * block's header is highlighted with 'py-highlight-hdr'; and + * the code block's body is highlighted with 'py-highlight'. + * - The remaining py-* classes are used to perform syntax + * highlighting (py-string for string literals, py-name for names, + * etc.) + */ +pre.py-doctest { padding: .5em; margin: 1em; + background: #e8f0f8; color: #000000; + border: 1px solid #708890; } +table pre.py-doctest { background: #dce4ec; + color: #000000; } +pre.py-src { border: 2px solid #000000; + background: #f0f0f0; color: #000000; } +span.py-line { border-left: 2px solid #000000; + margin-left: .2em; padding-left: .4em; } +span.py-lineno { font-style: italic; font-size: 90%; + padding-left: .5em; } +a.py-toggle { text-decoration: none; } +div.py-highlight-hdr { border-top: 2px solid #000000; + border-bottom: 2px solid #000000; + background: #d8e8e8; } +div.py-highlight { border-bottom: 2px solid #000000; + background: #d0e0e0; } +.py-prompt { color: #005050; font-weight: bold;} +.py-string { color: #006030; } +.py-comment { color: #003060; } +.py-keyword { color: #600000; } +.py-output { color: #404040; } +.py-name { color: #000050; } +.py-name:link { color: #000050; } +.py-name:visited { color: #000050; } +.py-number { color: #005000; } +.py-def-name { color: #000060; font-weight: bold; } +.py-base-class { color: #000060; } +.py-param { color: #000060; } +.py-docstring { color: #006030; } +.py-decorator { color: #804020; } +/* Use this if you don't want links to names underlined: */ +/*a.py-name { text-decoration: none; }*/ -pre.doctestblock { background: #c8e0e8; color: #000000; - border-color: #708890; } -table pre.doctestblock - { background: #c0d8e0; color: #000000; - border-color: #708890; } -div.py-src { background: #f0f0f0; } -div.highlight-hdr { background: #d8e8e8; } -div.highlight { background: #d0e0e0; } - -/* Variable values */ -pre.variable { background: #c0d8e0; color: #000000; - border-color: #708890; } -.variable-linewrap { background: transparent; color: #705000; } -.variable-ellipsis { background: transparent; color: #705000; } -.variable-quote { background: transparent; color: #705000; } -.re { background: transparent; color: #000000; } -.re-char { background: transparent; color: #007050; } -.re-op { background: transparent; color: #800000; } -.re-group { background: transparent; color: #004080; } -.re-ref { background: transparent; color: #484848; } - -/* Navigation bar */ -table.navbar { background: #688088; color: #d8f0f0; - border-color: #c0d0d0; } -th.navbar { background: #688088; color: #d8f0f0; } -th.navselect { background: #88a0a8; color: #000000; } - -/* Links */ -a:link { background: transparent; color: #104060; } -a:visited { background: transparent; color: #082840; } -a.navbar:link { background: transparent; color: #d8f0f0; } -a.navbar:visited { background: transparent; color: #d8f0f0; } +/* Graphs & Diagrams + * - These CSS styles are used for graphs & diagrams generated using + * Graphviz dot. 'img.graph-without-title' is used for bare + * diagrams (to remove the border created by making the image + * clickable). + */ +img.graph-without-title { border: none; } +img.graph-with-title { border: 1px solid #000000; } +span.graph-title { font-weight: bold; } +span.graph-caption { } + +/* General-purpose classes + * - 'p.indent-wrapped-lines' defines a paragraph whose first line + * is not indented, but whose subsequent lines are. + * - The 'nomargin-top' class is used to remove the top margin (e.g. + * from lists). The 'nomargin' class is used to remove both the + * top and bottom margin (but not the left or right margin -- + * for lists, that would cause the bullets to disappear.) + */ +p.indent-wrapped-lines { padding: 0 0 0 7em; text-indent: -7em; + margin: 0; } +.nomargin-top { margin-top: 0; } +.nomargin { margin-top: 0; margin-bottom: 0; } """ ############################################################ @@ -440,6 +314,11 @@ _COLOR_RE = re.compile(r'#(..)(..)(..)') +def _set_colors(template, *dicts): + colors = dicts[0].copy() + for d in dicts[1:]: colors.update(d) + return re.sub(r'\$(\w+)', lambda m:colors[m.group(1)], template) + def _rv(match): """ Given a regexp match for a color, return the reverse-video version @@ -450,15 +329,125 @@ @return: The reverse-video color. @rtype: C{string} """ - str = '#' - for color in match.groups(): - str += '%02x' % (255-int(color, 16)) - return str + rgb = [int(grp, 16) for grp in match.groups()] + return '#' + ''.join(['%02x' % (255-c) for c in rgb]) -# Black-on-green -_OLD_GREEN = _COLOR_RE.sub(r'#\1\3\2', _OLD_BLUE) -_GREEN = _COLOR_RE.sub(r'#\1\3\2', _BLUE) +def _darken_darks(match): + rgb = [int(grp, 16) for grp in match.groups()] + return '#' + ''.join(['%02x' % (((c/255.)**2) * 255) for c in rgb]) +_WHITE_COLORS = dict( + # Defaults: + body_bg = '#ffffff', + body_fg = '#000000', + body_link = '#0000ff', + body_visited_link = '#204080', + # Navigation bar: + navbar_bg = '#a0c0ff', + navbar_fg = '#000000', + navbar_border = '2px groove #c0d0d0', + navbar_select_bg = '#70b0ff', + navbar_select_fg = '#000000', + navbar_link = '#0000ff', + navbar_visited_link = '#204080', + # Tables (summary tables, details tables, indices): + table_bg = '#e8f0f8', + table_fg = '#000000', + table_link = '#0000ff', + table_visited_link = '#204080', + table_border = '1px solid #608090', + table_hdr_bg = '#70b0ff', + table_hdr_fg = '#000000', + table_hdr_link = '#0000ff', + table_hdr_visited_link = '#204080', + group_hdr_bg = '#c0e0f8', + group_hdr_fg = '#000000', + # Function signatures: + sig_name = '#006080', + sig_arg = '#008060', + sig_default = '#602000', + summary_sig_name = '#006080', + summary_sig_arg = '#006040', + summary_sig_default = '#501800', + # Variable values: + variable_bg = '#dce4ec', + variable_fg = '#000000', + variable_border = '1px solid #708890', + variable_linewrap = '#604000', + variable_ellipsis = '#604000', + variable_quote = '#604000', + re = '#000000', + re_char = '#006030', + re_op = '#600000', + re_group = '#003060', + re_ref = '#404040', + # Python source code: + doctest_bg = '#e8f0f8', + doctest_fg = '#000000', + doctest_border = '1px solid #708890', + doctest_in_table_bg = '#dce4ec', + doctest_in_table_fg = '#000000', + pysrc_border = '2px solid #000000', + pysrc_sep_border = '2px solid #000000', + pysrc_bg = '#f0f0f0', + pysrc_fg = '#000000', + pysrc_highlight_hdr_bg = '#d8e8e8', + pysrc_highlight_bg = '#d0e0e0', + py_prompt = '#005050', + py_string = '#006030', + py_comment = '#003060', + py_keyword = '#600000', + py_output = '#404040', + py_name = '#000050', + py_number = '#005000', + py_def_name = '#000060', + py_base_class = '#000060', + py_param = '#000060', + py_docstring = '#006030', + py_decorator = '#804020', + # Graphs + graph_border = '1px solid #000000', + ) + +_BLUE_COLORS = _WHITE_COLORS.copy() +_BLUE_COLORS.update(dict( + # Body: white text on a dark blue background + body_bg = '#000070', + body_fg = '#ffffff', + body_link = '#ffffff', + body_visited_link = '#d0d0ff', + # Tables: cyan headers, black on white bodies + table_bg = '#ffffff', + table_fg = '#000000', + table_hdr_bg = '#70b0ff', + table_hdr_fg = '#000000', + table_hdr_link = '#000000', + table_hdr_visited_link = '#000000', + table_border = '1px solid #000000', + # Navigation bar: blue w/ cyan selection + navbar_bg = '#0000ff', + navbar_fg = '#ffffff', + navbar_link = '#ffffff', + navbar_visited_link = '#ffffff', + navbar_select_bg = '#70b0ff', + navbar_select_fg = '#000000', + navbar_border = '1px solid #70b0ff', + # Variable values & doctest blocks: cyan + variable_bg = '#c0e0f8', + variable_fg = '#000000', + doctest_bg = '#c0e0f8', + doctest_fg = '#000000', + doctest_in_table_bg = '#c0e0f8', + doctest_in_table_fg = '#000000', + )) + +_WHITE = _set_colors(TEMPLATE, _WHITE_COLORS) +_BLUE = _set_colors(TEMPLATE, _BLUE_COLORS) +_WHITE = _BLUE + + # Black-on-green +_GREEN = _COLOR_RE.sub(_darken_darks, _COLOR_RE.sub(r'#\1\3\2', _BLUE)) + # White-on-black, with blue highlights. _BLACK = _COLOR_RE.sub(r'#\3\2\1', _COLOR_RE.sub(_rv, _WHITE)) @@ -469,7 +458,6 @@ ## Stylesheet table ############################################################ -# Leave _OLD_GREEN and _OLD_BLUE out for now. STYLESHEETS = { 'white': (_WHITE, "Black on white, with blue highlights"), 'blue': (_BLUE, "Black on steel blue"), @@ -477,5 +465,5 @@ 'black': (_BLACK, "White on black, with blue highlights"), 'grayscale': (_GRAYSCALE, "Grayscale black on white"), 'default': (_WHITE, "Default stylesheet (=white)"), - 'none': (_LAYOUT, "A base stylesheet (no color modifications)"), +# 'none': (_LAYOUT, "A base stylesheet (no color modifications)"), } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
