#
#
# add_dir "images"
# 
# add_file "images/bg.png"
#  content [5bd4a653e08c9b60662699cbeca96d9c61dc4374]
# 
# add_file "images/blockquote.png"
#  content [27c66262110a0b7a330ac86eea945b220926f039]
# 
# add_file "images/go-next.png"
#  content [4074aff631d38bbcfa777336665ca44bf8e32e38]
# 
# add_file "images/go-previous.png"
#  content [1bf0d01acb74d38306698d661b7bc737584309e0]
# 
# add_file "images/go-up.png"
#  content [ed3a6357e68e3885ccf33c72bbc4bed5040e5815]
# 
# add_file "images/logo_small.png"
#  content [968d39716800b6351ae79fe95027d0cdc9cef07c]
# 
# add_file "images/toc.png"
#  content [ce22b2b1bb63b2254b6e182ac3cba66f163f3468]
# 
# patch "Makefile.am"
#  from [334ee0bb5ce895ec2c47b6153dfb7714febe7964]
#    to [7c78434ec4c35f89bb05b08bd49ff325b33d668a]
# 
# patch "texinfo.css"
#  from [7df2014835ae4ed8fb49c72c42932f771a00b530]
#    to [7c93a8e72c96138811afbd0e3e49982b22e329b5]
# 
#   set "images/bg.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "images/blockquote.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "images/go-next.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "images/go-previous.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "images/go-up.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "images/logo_small.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "images/toc.png"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# images/bg.png is binary
============================================================
# images/blockquote.png is binary
============================================================
# images/go-next.png is binary
============================================================
# images/go-previous.png is binary
============================================================
# images/go-up.png is binary
============================================================
# images/logo_small.png is binary
============================================================
# images/toc.png is binary
============================================================
--- Makefile.am	334ee0bb5ce895ec2c47b6153dfb7714febe7964
+++ Makefile.am	7c78434ec4c35f89bb05b08bd49ff325b33d668a
@@ -218,8 +218,14 @@ htmldir = $(datadir)/doc/monotone
 			$(NETXX_SOURCES)
 
 htmldir = $(datadir)/doc/monotone
-html_DATA = monotone.html
+html_DATA = monotone.html texinfo.css
 
+htmlfiguredir = $(htmldir)/figures
+htmlfigure_DATA = figures/*.png
+
+htmlimagedir = $(htmldir)/images
+htmlimage_DATA = images/*
+
 # flags
 
 # sets DEFS for just this object (autoconf's -DHAVE_CONFIG_H is useless)
@@ -318,7 +324,7 @@ EXTRA_DIST =								\
 EXTRA_DIST =								\
 	HACKING INSTALL README.changesets README.visualc8 UPGRADE	\
 	audit-includes do-editor-vars.sh doxygen.cfg			\
-	$(wildcard $(srcdir)/m4/*.m4) monotone.html			\
+	$(wildcard $(srcdir)/m4/*.m4) monotone.html images		\
 	texinfo.css schema.sql unix/README util/mtnopt.in win32/README	\
 	win32/monotone.iss win32/modpath.iss win32/monotone.bmp		\
 									\
@@ -704,6 +710,7 @@ monotone.html: monotone.texi version.tex
 	       std_hooks.lua texinfo.css
 	$(V_makeinfo)set -e; if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \
 		cp -r $(srcdir)/figures .; \
+		cp -r $(srcdir)/images .; \
 		cp $(srcdir)/texinfo.css .; \
 	fi; \
 	makeinfo -I $(srcdir) --no-split --no-headers --output $@ --html $<; \
@@ -717,6 +724,7 @@ html: monotone.texi version.texi std_hoo
 	fi; \
 	mkdir -p $@; \
 	cp -r $(srcdir)/figures $@; \
+	cp -r $(srcdir)/images $@; \
 	cp $(srcdir)/texinfo.css $@; \
 	makeinfo -I $(srcdir) --number-sections --html --output $@ $<; \
 	for f in $@/*.html; do \
============================================================
--- texinfo.css	7df2014835ae4ed8fb49c72c42932f771a00b530
+++ texinfo.css	7c93a8e72c96138811afbd0e3e49982b22e329b5
@@ -1,98 +1,319 @@
-h1, h2, h3, h4
-	{
-		color: #990000;
-	}
+body {
+    margin: 20px;
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 0.625em;
+}
 
-hr
-	{
-		border-style: none;
-	}
+h1.settitle,
+div.node {
+    position: fixed;
+    width: 100%;
+    margin: -20px -20px 0;
+    background: url(images/bg.png);
+    padding: 20px;
+    font-size: 2.5em;
+    line-height: 1.2em;
+    height: 30px;
+    font-weight: bold;
+    color: white;
+    border-bottom: 1px solid #474747;
+}
 
-div.node
-	{
-		margin: 0em;
-		padding: 0em;
-	}
+div.node:before {
+    content: "monotone documentation";
+}
 
-div.node hr
-	{
-		float: right;
-		height: 0;
-		width: 0;
-		padding: 0;
-		margin: 0;
-	}
+div.node hr {
+    visibility: hidden;
+    clear: both;
+    margin: 0;
+}
 
-div.node br
-	{
-		float: right;
-		height: 0;
-		width: 0;
-		padding: 0;
-		margin: 0;
-	}
+div.node p {
+    float: right;
+    margin: 0;
+    margin-right: 40px;
+    font-weight: bold;
+    color: transparent;
+    font-size: 0px;
+    line-height: auto;
+}
 
-div.node p
-	{
-		font-style: italic;
-		font-size: small;
-		margin: 0em;
-		padding: 0em;
-		border-bottom: thin solid grey;
-	}
+div.node p a {
+    color: white;
+    margin: 10px;
+    font-weight: normal;
+    text-decoration: none;
+    border-bottom: 1px white dotted;
+    padding-left: 21px;
+    font-size: 19px;
+    line-height: 27px;
+    background-repeat: no-repeat;
+    background-position: left center;
+    vertical-align: top;
+}
 
-ul.menu li
-	{
-		margin: 0.2em;
-	}
+div.node p a[name],
+div.node p a[href="../index.html#dir"] {
+    display: none;
+}
 
-ul.menu li a
-	{
-		font-weight: bold;
-	}
+div.node p a[rel=next] {
+    background-image: url(images/go-next.png);
+}
 
+div.node p a[rel=previous] {
+    background-image: url(images/go-previous.png);
+}
 
-span.command
-	{
-		font-family: sans-serif;
-		font-weight: bold;
-	}
+div.node p a[rel=up] {
+    background-image: url(images/go-up.png);
+}
 
-span.option
-	{
-		font-family: monospace;
-	}
+div.node + *,
+h1.settitle + h2,
+h1.settitle + * + h2 {
+    margin-top: 100px;
+}
 
-span.file
-	{
-		font-family: monospace;
-		color: #aa00aa;
-	}
+a[name] {
+    display: inline-block;
+    height: 50px;
+    margin-top: -50px;
+}
 
-dl
-	{
-		margin-top: 0.5em;
-		margin-bottom: 0.5em;
-	}
+div.contents a[name],
+div.footnote a[name] {
+    display: inline;
+    height: auto;
+    margin-top: auto;
+}
 
-dt
-	{
-		background-color: #eeeeee;
-	}
+h1.settitle + div.node {
+   display: none;
+}
 
-dd
-	{
-		padding-top: 0.5em;
-		padding-bottom: 1.5em;
-		padding-left: 2em;
-	}
+a {
+    color: #4627B4;
+    text-decoration: none;
+}
 
-img
-	{
-		padding: 2em;
-		display: block;
-		float: none;
-		clear: both;
-		margin-right: auto;
-	}
+a:hover {
+    text-decoration: underline;
+}
 
+.clearfloat {
+    clear: both;
+}
+
+/* global margin */
+p,
+ul,
+ol,
+hr,
+div.block-image,
+pre {
+    margin-top: 1em;
+    margin-bottom: 0;
+}
+
+/* less top margin for certain consecutive elements */
+p + ul,
+p + ol,
+p + blockquote,
+h1 + h2,
+h3 + *,
+h4 + * {
+    margin-top: 0.5em;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5 {
+    color: black;
+    line-height: 1.2em;
+    margin-bottom: 0;
+}
+
+h1 {
+    border-bottom: 1px dotted #474747;
+    padding-bottom: 0.2em;
+    margin-bottom: 1em;
+    margin-top: 3.5em;
+}
+
+h2 {
+    border-bottom: 1px dotted #474747;
+    padding-bottom: 0.2em;
+    margin-bottom: 1em;
+    margin-top: 2.5em;
+}
+
+h3 {
+    font-size: 1.4em;
+    margin-top: 2em;
+}
+
+h4 {
+    font-size: 1.3em;
+    font-style: italic;
+    margin-top: 1.5em;
+}
+
+h5 {
+    font-size: 1.2em;
+    margin-top: 1em;
+}
+
+p {
+    line-height: 1.5em;
+}
+
+body > p,
+blockquote > p {
+    font-size: 1.4em;
+}
+
+ul,
+ol {
+    font-size: 1.3em;
+    line-height: 1.75em;
+}
+
+ol li *,
+ul li * {
+    margin-bottom: auto;
+    font-size: 1em;
+}
+
+ul ol,
+ol ol,
+ul ul,
+ol ul {
+    margin-top: 0;
+    padding-left: 2em;
+    font-size: 1em;
+}
+
+dl dd {
+    font-size: 1.3em;
+    margin-bottom: 1em;
+}
+
+dl dd > * {
+    font-size: 1em;
+}
+
+dl dd ul,
+dl dd ol {
+    padding-left: 1em;
+}
+
+dl dd dl {
+    font-size: 0.7692em;
+}
+
+dl dt + dd {
+    margin-top: 1em;
+}
+
+dl dt {
+    font-size: 1.4em;
+}
+
+dl dt strong {
+    font-size: 0.8em;
+}
+
+dl dd dl dd {
+    margin-bottom: 0.5em;
+}
+
+dl dd dl dt + dd {
+    margin-top: 0.5em;
+}
+
+hr {
+    border: 0;
+    border-top: 1px dotted #474747;
+}
+
+pre,
+pre.smallexample {
+    background: #F0F0F0;
+    border: 1px dotted #474747;
+    font-family: monospace, courier;
+    padding: 1em;
+    white-space: -moz-pre-wrap;
+    white-space: pre-wrap;
+    overflow: auto;
+    font-size: 1.2em !important;
+}
+
+/* p is 1.4em, so we need the reciproce here to "reset" the size */
+p pre,
+p pre.smallexample {
+    font-size: 0.8571em !important;
+}
+
+/* same for dd here, 1 / 1.3 * 1.2 */
+dd pre,
+dd pre.smallexample {
+    font-size: 0.9231em !important;
+}
+
+/* makeinfo generates spurios p tags including line breaks in tables;
+   we don't want these pseudo elements create a margin and screw with our
+   layout, so we're hiding them by setting their font-size to 0.
+   This _could_ however make problems in the future where we use legit
+   tables with paragraphs in them! */
+table td + td > pre + p {
+    font-size: 0;
+}
+
+body * pre {
+    font-size: 1.2em;
+}
+
+/* specific styles */
+.contents {
+    margin-top: 1em;
+    border: 1px dotted #474747;
+    background: url(images/toc.png) no-repeat 10px 10px #FAFAFA;
+    padding: 10px;
+    padding-top: 50px;
+}
+
+.contents  ul {
+    list-style-type: none;
+    margin-top: 0;
+}
+
+.contents h2 {
+    display: none;
+}
+
+span.command,
+span.option,
+span.file,
+code,
+sample {
+    font-size: 1.1em !important;
+}
+
+span.file {
+    color: darkred;
+    font-weight: bold;
+}
+
+span.command {
+    color: darkgreen;
+    font-weight: bold;
+}
+
+span.option {
+    color: darkblue;
+}
+