|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r48762 - in website/public_html/beta: common/code doc style style/css_0 style/css_0/theme_grass
From: grafikrobot_at_[hidden]
Date: 2008-09-13 02:58:22
Author: grafik
Date: 2008-09-13 02:58:21 EDT (Sat, 13 Sep 2008)
New Revision: 48762
URL: http://svn.boost.org/trac/boost/changeset/48762
Log:
Remove web styling from doc pages as some people are unhappy with the restyling of their docs. (fixes #1729, #2116)
Added:
website/public_html/beta/style/css_0/section-basic.css (contents, props changed)
- copied, changed from r48761, /website/public_html/beta/style/css_0/section-doc.css
website/public_html/beta/style/section-basic.css (contents, props changed)
- copied, changed from r48761, /website/public_html/beta/style/section-doc.css
Text files modified:
website/public_html/beta/common/code/boost_archive.php | 24 +
website/public_html/beta/doc/display_libs.php | 23
website/public_html/beta/style/css_0/section-basic.css | 588 ++-------------------------------------
website/public_html/beta/style/css_0/theme_grass/links.css | 12
website/public_html/beta/style/css_0/theme_grass/theme.css | 6
website/public_html/beta/style/section-basic.css | 5
6 files changed, 77 insertions(+), 581 deletions(-)
Modified: website/public_html/beta/common/code/boost_archive.php
==============================================================================
--- website/public_html/beta/common/code/boost_archive.php (original)
+++ website/public_html/beta/common/code/boost_archive.php 2008-09-13 02:58:21 EDT (Sat, 13 Sep 2008)
@@ -110,6 +110,11 @@
}
}
+ function is_basic()
+ {
+ return $this->extractor_ == 'basic';
+ }
+
function is_raw()
{
return $this->extractor_ == 'raw' || $this->extractor_ == 'simple';
@@ -495,6 +500,25 @@
print $this->_content_html_pre();
}
+ function _init_basic()
+ {
+ }
+
+ function _content_basic()
+ {
+ $text = $this->_content_html_pre();
+ $text = preg_split('@(</head>)|(<body[^>]*>)@i',$text,-1,PREG_SPLIT_DELIM_CAPTURE);
+ print $text[0];
+ print '<link rel="icon" href="/favicon.ico" type="image/ico" />';
+ print '<link rel="stylesheet" type="text/css" href="/style/section-basic.css" />';
+ print $text[1];
+ print $text[2];
+ print $text[3];
+ print $text[4];
+ virtual("/common/heading-doc.html");
+ print $text[5];
+ }
+
function _init_404()
{
header("HTTP/1.0 404 Not Found");
Modified: website/public_html/beta/doc/display_libs.php
==============================================================================
--- website/public_html/beta/doc/display_libs.php (original)
+++ website/public_html/beta/doc/display_libs.php 2008-09-13 02:58:21 EDT (Sat, 13 Sep 2008)
@@ -39,9 +39,6 @@
array('@.*@','@^libs/type_traits/cxx_type_traits.htm$@i','raw','text/html'),
array('@.*@','@^libs/utility/iterator_adaptors.htm$@i','raw','text/html'),
array('@.*@','@^libs/wave/.*(html|htm)$@i','raw','text/html'),
- array('@.*@','@^more/getting_started.html$@i','raw','text/html'),
- array('@.*@','@^more/lib_guide.htm$@i','raw','text/html'),
- array('@.*@','@^more/regression.html$@i','raw','text/html'),
array('@.*@','@^status/index.html$@i','raw','text/html'),
array('@.*@','@^tools/boostbook/index.html$@i','raw','text/html'),
array('@.*@','@^tools/build/index.html$@i','raw','text/html'),
@@ -56,20 +53,22 @@
array('@.*@','@^libs/system/doc/.*(html|htm)$@i','simple','text/html'),
array('@.*@','@^libs/numeric/conversion/doc/.*(html|htm)$@i','simple','text/html'),
array('@.*@','@^libs/optional/doc/.*(html|htm)$@i','simple','text/html'),
- //~ special cases that look like boost book, but aren't
- array('@.*@','@^libs/parameter/doc/html/.*(html|htm)$@i','boost_libs_html','text/html'),
//~ default to processed output for libs and tools
- array('@.*@','@^libs/[^/]+/doc/html/.*(html|htm)$@i','boost_book_html','text/html'),
- array('@.*@','@^libs/[^/]+/doc/[^/]+/html/.*(html|htm)$@i','boost_book_html','text/html'),
- array('@.*@','@^libs/[^/]+/doc/[^/]+/doc/html/.*(html|htm)$@i','boost_book_html','text/html'),
- array('@.*@','@^libs.*(html|htm)$@i','boost_libs_html','text/html'),
- array('@.*@','@^tools.*(html|htm)$@i','boost_libs_html','text/html'),
- array('@.*@','@^doc/html/.*html$@i','boost_book_html','text/html'),
+ array('@.*@','@^libs/[^/]+/doc/html/.*(html|htm)$@i','basic','text/html'),
+ array('@.*@','@^libs/[^/]+/doc/[^/]+/html/.*(html|htm)$@i','basic','text/html'),
+ array('@.*@','@^libs/[^/]+/doc/[^/]+/doc/html/.*(html|htm)$@i','basic','text/html'),
+ array('@.*@','@^libs.*(html|htm)$@i','basic','text/html'),
+ array('@.*@','@^tools.*(html|htm)$@i','basic','text/html'),
+ array('@.*@','@^doc/html/.*html$@i','basic','text/html'),
+ array('@.*@','@^more/.*html$@i','basic','text/html'),
//~ the headers are text files displayed in an embeded page
array('@.*@','@^boost/.*$@i','cpp','text/plain')
));
-if (!$_file->is_raw()) {
+if ($_file->is_basic()) {
+ print $_file->content();
+}
+else if (!$_file->is_raw()) {
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
Copied: website/public_html/beta/style/css_0/section-basic.css (from r48761, /website/public_html/beta/style/css_0/section-doc.css)
==============================================================================
--- /website/public_html/beta/style/css_0/section-doc.css (original)
+++ website/public_html/beta/style/css_0/section-basic.css 2008-09-13 02:58:21 EDT (Sat, 13 Sep 2008)
@@ -1,583 +1,55 @@
/*
- Copyright 2005 Redshift Software, Inc.
+ Copyright 2005-2008 Redshift Software, Inc.
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
*/
+@import url(theme_grass/theme.css);
/* Heading, title and logo. */
-li#doc-section-tab {
- background: #FFFFFF !important;
- border-bottom: #FFFFFF 1px solid !important;
-}
-#documentation-section-menu ul {
- display: block !important;
-}
-#documentation-section-menu h4 a {
- border-left: 4px solid;
- border-right: 4px solid;
- margin-left: 0px !important;
- margin-right: 0px !important;
-}
-#content #docs {
- margin: 0em;
-}
-#content #notes {
- margin: 0em;
-}
-#content h1, #content h2, #content h3, #content h4, #content h5, #content h6 {
- clear: left;
-}
-/* The Boost.Book navs... */
-#content .spirit-nav {
- float: right;
- padding: 0.25em;
- background: #FFFFFF;
- margin: 0em 0em 1em 1em;
- border: #CCCCCC 1px solid;
-}
-#content .spirit-nav img {
- border: none;
- margin: 0.25em 0.25em 0em 0.25em;
-}
-#content .spirit-nav a {
- border: none;
-}
-#content .spirit-nav a:hover {
- border: none;
- /* background: #EEEEEE; */
- display: inline-block;
-}
-#content .spirit-nav a:visited {
- border: none;
-}
-#content .spirit-nav a:hover:visited {
- border: none;
-}
-#content div.toc,
-#content table.toc,
-#content dl.index,
-#content dl.page-index,
-#content .section div.contents ul.simple
-{
- margin: 1em;
- padding: 0.5em;
- border: 1px solid #CCCCCC;
- background: #FFFFFF;
-}
-#content table.toc
-{
- width: 90%;
-}
-#content dl.index dl,
-#content dl.page-index dl,
-#content .section div.contents ul.simple ul
-{
- margin: 0em;
- padding: 0em;
- border: none;
- background: transparent;
-}
-#content div.toc dl {
- margin: 0em;
- padding: 0em;
-}
-#content div.toc dt,
-#content dl.index dt,
-#content dl.page-index dt,
-#content .section div.contents ul.simple li
-{
- display: block;
- margin: 0em;
- padding: 0em;
- text-indent: 0em;
- list-style-type: none;
-}
-#content div.toc dt dt,
-#content dl.index dt dt,
-#content dl.page-index dt dt,
-#content .section div.contents ul.simple li ul li
-{
- margin: 0em 0em 0em 1em;
-}
-#content table.toc td.toc_cells_L0 {
- padding: 0em 0em 0em 0em;
-}
-#content table.toc td.toc_cells_L1 {
- padding: 0em 0em 0em 1em;
-}
-#content table.toc td.toc_cells_L2 {
- padding: 0em 0em 0em 2em;
-}
-#content dl.index dd,
-#content dl.page-index dd,
-#content div.toc dd {
+#boost-common-heading-doc {
+ position: absolute;
+ left: 0;
+ top: 0;
margin: 0em;
- padding: 0em 0em 0em 1em;
-}
-#content div.toc p {
- display: none;
-}
-#content div.toc a,
-#content table.toc a,
-#content dl.index a,
-#content dl.page-index a,
-#content .section div.contents ul.simple a
-{
- display: block;
- width: 100%;
-}
-#content div.toc a:hover,
-#content table.toc a:hover,
-#content dl.index a:hover,
-#content dl.page-index a:hover,
-#content .section div.contents ul.simple a:hover
-{
-}
-#content div.toc a:visited,
-#content table.toc a:visited,
-#content dl.index a:visited,
-#content dl.page-index a:visited,
-#content .section div.contents ul.simple a:visited
-{
-}
-#content div.toc a:hover:visited,
-#content table.toc a:hover:visited,
-#content dl.index a:hover:visited,
-#content dl.page-index a:hover:visited,
-#content .section div.contents ul.simple a:hover:visited
-{
-}
-#content .section-body {
- padding-bottom: 1em;
-}
-#content .section .section {
- margin: 0em;
-}
-
-/* The rest of the BoostBook styles... */
-#content .section table.footer-table,
-#content .section + table,
-#content .article + table {
- border: none;
- margin: 0.75em 0em 0em 0em;
- font-size: 80%;
+ height: 100px;
width: 100%;
+ overflow: hidden;
}
-#content .section table.footer-table td,
-#content .section + table td,
-#content .article + table td {
- border: none !important;
-}
-#content .section table.footer-table td[align=right],
-#content .section + table td[align=right],
-#content .article + table td[align=right] {
- text-align: right;
-}
-#content .section pre.literallayout {
- margin: 0em;
- border: none;
- padding: 0em;
- overflow: visible;
- font-size: 95%;
-}
-#content .section span.term {
- font-weight: bold;
-}
-#content .section span.term * {
- font-weight: inherit;
-}
-#content .section table.table {
- margin: 1em;
- border: none;
- border-spacing: 2px;
-}
-#content .section table.table th {
- background: #EEEEEE;
- border: 1px solid #CCCCCC !important;
- padding: 0.25em;
-}
-#content .section table.table td {
- border: 1px solid #CCCCCC !important;
- padding: 0.25em;
-}
-#content .section table.table td p {
- margin: 0em;
-}
-#content .section .variablelist table {
- margin: 0em;
-}
-#content .section .variablelist table th,
-#content .section .variablelist table td {
- border: none !important;
-}
-/* #content .section .variablelist dl {
- margin: 0em 0em 0em 0em;
-}
-#content .section .variablelist dl dt {
- width: 10em;
- float: left;
- clear: left;
- margin: 0em 1em 1em 0em;
- font-style: italic;
-}
-#content .section .variablelist dl dt * {
- font-weight: inherit; font-style: inherit; text-decoration: inherit;
-}
-#content .section .variablelist dl dd {
- margin: 0em 0em 1em 10em;
- padding: 0em 0em 0em 1em;
-} */
-#content .section table.simplelist {
- margin: 1em;
- border: none;
- width: auto !important;
- margin: 0em !important;
- padding: 0em !important;
- border: none !important;
-}
-#content .section table.simplelist td
-{
- margin: 0em !important;
- padding: 0em !important;
- text-align: left !important;
- font-size: 9pt !important;
- border: none !important;
-}
-#content .section td table.simplelist {
- margin: 1em;
- border: none;
- border: 4px solid #FFFFFF !important;
- border-bottom: none !important;
- border-right: none !important;
-}
-#content .section table pre.screen,
-#content .section table pre.table-programlisting
-{
- display: inline;
- border: none;
- margin: 0em;
- padding: 0em;
-}
-#content .section img {
- border: none;
-}
-#content .section span.inlinemediaobject img
-{
- vertical-align: middle;
-}
-
-/* */
-#content .section h2 *,
-#content .section h3 *,
-#content .section h4 *,
-#content .section h5 *,
-#content .section h6 *
-{ font-weight: inherit; /* font-style: inherit; */ text-decoration: inherit; }
-
-/* Syntax Highlighting */
-.keyword { color: #0000AA; font-weight: bold; }
-.identifier {}
-.special { color: #707070; }
-.preprocessor { color: #402080; font-weight: bold; }
-.char { color: teal; }
-.comment { color: #800000; }
-.string { color: teal; }
-.number { color: teal; }
-.copyright, .copyright-footer { color: #666666; font-size: small; }
-.white_bkd { background-color: #FFFFFF; }
-.dk_grey_bkd { background-color: #999999; }
-
-/* Docutils generated HTML... */
-#content table.field-list,
-#content table.docinfo
-{
- border: none;
- margin-left: 0em;
- margin-right: 0em;
-}
-#content table.citation,
-#content table.footnote
-{
- border: none;
- border-left: 1px solid #CCCCCC;
- margin: 1em 0em 0em 0em;
- padding: 0em;
- font-size: 95%;
-}
-#content table.citation td,
-#content table.footnote td
-{
- border: none !important;
- padding: 0em 0.25em 0em 0.25em;
-}
-#content table.header,
-#content table.footer
-{
- border: none;
- margin-right: 0em;
- margin-bottom: 1em;
+#boost-common-heading-doc-spacer {
+ height: 100px;
}
-#content table.field-list th,
-#content table.docinfo th,
-#content table.field-list td,
-#content table.docinfo td
-{
- border: none !important;
- text-align: left;
- background: inherit;
-}
-#content table.field-list th.field-name,
-#content table.docinfo th.docinfo-name
-{
- white-space: nowrap;
- text-transform: capitalize;
- width: 10em;
-}
-#content div.footer
-{
- text-align: center;
- font-size: 80%;
-}
-div.contents .topic-title
-{
- font-size: 130%;
- font-weight: bold;
-}
-div.contents .topic-title *
-{ font-weight: inherit; /* font-style: inherit; */ text-decoration: inherit; }
-#content td.navigation-bar,
-#content td.page-location
-{
- float: right;
- clear: right;
- margin: 0.25em;
- background: #DDDDDD url(panel_bkg.png) top left repeat-x;
- border: #CCCCCC 1px solid;
-}
-
-/* Multi-Index... */
-#content div.prev_link,
-#content div.up_link,
-#content div.next_link
-{
- float: right;
- padding: 0.25em;
- background: #DDDDDD url(panel_bkg.png) top left repeat-x;
- margin: 0em 0em 1em 0em;
- border: #CCCCCC 1px solid;
- width: 19px; height: 19px;
-}
-#content div.prev_link img,
-#content div.up_link img,
-#content div.next_link img
-{
+#heading-placard {
display: none;
}
-#content div.prev_link br,
-#content div.up_link br,
-#content div.next_link br
-{
+#heading-title #boost,
+#heading-title #cpplibraries {
display: none;
}
-#content div.prev_link a,
-#content div.up_link a,
-#content div.next_link a
-{
- display: block;
- width: 19px; height: 19px;
- text-indent: 20px;
- overflow: hidden;
- border: none;
-}
-#content div.prev_link a:hover,
-#content div.up_link a:hover,
-#content div.next_link a:hover,
-#content div.prev_link a:visited,
-#content div.up_link a:visited,
-#content div.next_link a:visited
-{
- border: none;
-}
-#content div.prev_link a {
- background: url(prev.png) no-repeat center center;
-}
-#content div.up_link a {
- background: url(up.png) no-repeat center center;
-}
-#content div.next_link a {
- background: url(next.png) no-repeat center center;
-}
-#content div.prev_link {
- background: #EEEEEE url(prev_disabled.png) no-repeat center center;
-}
-#content div.up_link {
- background: #EEEEEE url(up_disabled.png) no-repeat center center;
-}
-#content div.next_link {
- background: #EEEEEE url(next_disabled.png) no-repeat center center;
-}
-
-/* Pyste? */
-#content .pyste-nav {
- float: right;
- padding: 0.25em;
- background: #DDDDDD url(panel_bkg.png) top left repeat-x;
- margin: 0em 0em 1em 0em !important;
- border: #CCCCCC 1px solid !important;
-}
-#content .pyste-nav td {
- margin: 0em !important;
- padding: 0em !important;
-}
-#content .pyste-nav img {
- width: 19px; height: 19px;
- border: none;
- margin: 0.25em 0.25em 0em 0.25em;
+#heading-title {
+ float: left;
}
-#content .pyste-nav a,
-#content .pyste-nav a:hover,
-#content .pyste-nav a:visited
-{
- border: none;
+#heading-title a {
}
-
-/* Various, notes, info, etc. boxes... */
-#content table.note_box
-{
- margin: 1em;
- background: #EEEEEE;
+#heading-logo {
+ width: 270px;
+ height: 90px;
border: none;
- text-align: justify;
- padding: 0em;
-}
-#content table.note_box td
-{
- padding: 0.5em;
- font-size: 90%;
+ vertical-align: bottom;
+ margin: 0px 0px 0px 1.5em;
}
-#content table.note_box td img
-{
- background: #FFFFFF;
- border: none;
- float: left;
- margin: -0.5em 0.5em 0.5em -0.5em;
- padding: 0em 0.25em 0.25em 0em;
- position: relative;
- left: -1px;
- top: -1px;
-}
-
-/* And the boostbook versions of those boxes... */
-#content .section .tip,
-#content .section .note,
-#content .section .warning,
-#content .section .important,
-#content .section .caution,
-#content .section .sidebar,
-#content .section .hint
-{
- margin: 1em !important;
- border: 1px solid #CCCCCC;
- padding: 0.5em 0.5em 0.5em 40px;
- min-height: 22px;
-}
-#content .section .tip > table,
-#content .section .note > table,
-#content .section .warning > table,
-#content .section .important > table,
-#content .section .caution > table,
-#content .section .sidebar > table,
-#content .section .hint > table
-{
- margin: 0em !important;
-}
-#content .section .tip h3 + p,
-#content .section .note h3 + p,
-#content .section .warning h3 + p,
-#content .section .important h3 + p,
-#content .section .caution h3 + p,
-#content .section .sidebar h3 + p,
-#content .section .hint h3 + p
-{
- margin-top: 0em !important;
-}
-#content .section .tip .title,
-#content .section .note .title,
-#content .section .warning .title,
-#content .section .important .title,
-#content .section .caution .title,
-#content .section .sidebar .title,
-#content .section .hint .title
-{
- display: none;
+#heading-quote {
+ text-align: right;
+ padding: 25px 1.5em 10px 0em;
}
-#content .section .tip tbody tr:first-child,
-#content .section .note tbody tr:first-child,
-#content .section .warning tbody tr:first-child,
-#content .section .important tbody tr:first-child,
-#content .section .caution tbody tr:first-child,
-#content .section .sidebar tbody tr:first-child,
-#content .section .hint tbody tr:first-child
-{
- display: none;
+#heading-quote * {
}
-#content .section .tip tbody > tr > td,
-#content .section .note tbody > tr > td,
-#content .section .warning tbody > tr > td,
-#content .section .important tbody > tr > td,
-#content .section .caution tbody > tr > td,
-#content .section .sidebar tbody > tr > td,
-#content .section .hint tbody > tr > td
-{
- border: none !important;
-}
-#content .section .tip { background: #FFFFFF url(tip.png) no-repeat top left; }
-#content .section .note { background: #FFFFFF url(note.png) no-repeat top left; }
-#content .section .warning { background: #FFFFFF url(caution.png) no-repeat top left; }
-#content .section .important { background: #FFFFFF url(important.png) no-repeat top left; }
-#content .section .caution { background: #FFFFFF url(caution.png) no-repeat top left; }
-#content .section .sidebar { background: #FFFFFF url(note.png) no-repeat top left; }
-#content .section .hint { background: #FFFFFF url(tip.png) no-repeat top left; }
-
-/* Wiki display, edit, etc. */
-#wiki-edit-form textarea {
+#heading-quote .quote {
font-size: 90%;
- width: 100%;
- height: 40em;
- border: 1px solid #CCCCCC;
- margin: 0em 0em 0.25em 0em;
-}
-#wiki-edit-form label {
- border: 1px solid #CCCCCC;
- padding: 2px;
- margin: 0em 0em 0.25em 0em;
display: block;
}
-#wiki-edit-form .wiki-label {
- font-family: "Times New Roman",serif;
- font-variant: small-caps;
- width: 20%;
+#heading-quote .attribution {
+ font-size: 85%;
display: block;
- float: left;
- text-align: right;
- padding-right: 0.25em;
- white-space: nowrap;
}
-#wiki-edit-form #summary {
- font-size: 90%;
- border: none;
- width: 78.5%;
- display: block;
- margin-left: 21%;
-}
-#wiki-edit-form #Save,
-#wiki-edit-form #Preview {
- border: 1px solid #CCCCCC;
- padding: 2px;
- float: right;
- margin: 0em 0em 0em 0.25em;
- font-family: "Times New Roman",serif;
- font-variant: small-caps;
-}
-#wiki-preview h2.content-header {
- border-bottom: 1px solid #CCCCCC;
+#heading-sections {
+ display: none;
}
Modified: website/public_html/beta/style/css_0/theme_grass/links.css
==============================================================================
--- website/public_html/beta/style/css_0/theme_grass/links.css (original)
+++ website/public_html/beta/style/css_0/theme_grass/links.css 2008-09-13 02:58:21 EDT (Sat, 13 Sep 2008)
@@ -6,8 +6,8 @@
/* All about link/anchors ("A") elements. It's all here in one file
to facilitate trying out multiple variants. And to help
keep them consistent across all contexts. */
-a.internal,
-a.external {
+#content a.internal,
+#content a.external {
text-decoration: none;
color: #000000;
}
@@ -107,18 +107,18 @@
}
/* The special "Get Boost" button. */
-#get-boost a {
+#body #get-boost a {
color: #2070A0;
}
-#get-boost a span.link {
+#body #get-boost a span.link {
color: #EEEEEE;
display: none;
}
-#get-boost a:hover {
+#body #get-boost a:hover {
color: #6B9D68;
background-color: #EEEEEE;
}
-#get-boost a:hover span.link {
+#body #get-boost a:hover span.link {
color: #6B9D68;
}
Modified: website/public_html/beta/style/css_0/theme_grass/theme.css
==============================================================================
--- website/public_html/beta/style/css_0/theme_grass/theme.css (original)
+++ website/public_html/beta/style/css_0/theme_grass/theme.css 2008-09-13 02:58:21 EDT (Sat, 13 Sep 2008)
@@ -13,10 +13,12 @@
}
/* Heading, title and logo. */
-#heading * {
+#heading *,
+#boost-common-heading-doc * {
color: #FFFFFF;
}
-#heading {
+#heading,
+#boost-common-heading-doc {
background: url(header-fg.png) no-repeat top left;
border: none;
border-bottom: #000000 solid 1px;
Copied: website/public_html/beta/style/section-basic.css (from r48761, /website/public_html/beta/style/section-doc.css)
==============================================================================
--- /website/public_html/beta/style/section-doc.css (original)
+++ website/public_html/beta/style/section-basic.css 2008-09-13 02:58:21 EDT (Sat, 13 Sep 2008)
@@ -1,7 +1,6 @@
/*
- Copyright 2005 Redshift Software, Inc.
+ Copyright 2005-2008 Redshift Software, Inc.
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
*/
-_at_import url(basic.css);
-_at_import url(css_0/section-doc.css);
+@import url(css_0/section-basic.css);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk