From: Rudi Schlatte <rudi@constantly.at>
Date: Tue, 15 Dec 2009 16:09:02 +0000 (+0000)
Subject: 1.0.33.12: Less ugly html manuals
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=f134cff89a7d724c1a22656e958ce5d1c7269b76;p=sbcl.git

1.0.33.12: Less ugly html manuals
... add some light css styling
... also create single-file manual for easier grepping
... unilaterally deciding on light blue as our new corporate colour
---

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 43a6257..2188175 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -7,6 +7,7 @@ PSFILES=sbcl.ps asdf.ps
 PDFFILES=sbcl.pdf asdf.pdf
 INFOFILES=sbcl.info asdf.info
 HTMLDIRS=$(basename $(SBCLTEXI)) $(basename $(ASDFTEXI))
+HTMLFILES=sbcl.html asdf.html
 # Place where generated documentation ends up. The value of
 # DOCSTRINGDIR has to end with a slash or you lose (it's passed to
 # Lisp's `pathname' function).
@@ -53,8 +54,11 @@ html: html-stamp
 
 html-stamp: $(DOCFILES) docstrings
 	@rm -rf $(HTMLDIRS)
-	$(MAKEINFO) $(I_FLAGS) --html $(SBCLTEXI)
-	$(MAKEINFO) --html $(ASDFTEXI)
+	@rm -f $(HTMLFILES)
+	$(MAKEINFO) $(I_FLAGS) --html --css-include=style-multi.css $(SBCLTEXI)
+	$(MAKEINFO) --html --css-include=style-multi.css $(ASDFTEXI)
+	$(MAKEINFO) $(I_FLAGS) --html --no-split --css-include=style-single.css $(SBCLTEXI)
+	$(MAKEINFO) --html --no-split --css-include=style-single.css $(ASDFTEXI)
 	touch html-stamp
 
 # Postscript documentation
@@ -98,6 +102,7 @@ tempfiles-stamp:
 clean: 
 	rm -f *~ *.bak *.orig \#*\# .\#* texput.log *.fasl
 	rm -rf $(HTMLDIRS) $(DOCSTRINGDIR)
+	rm -f  $(HTMLFILES)
 	rm -f contrib-docs.texi-temp
 	rm -f package-locks.texi-temp
 	rm -f variables.texinfo
diff --git a/doc/manual/style-multi.css b/doc/manual/style-multi.css
new file mode 100644
index 0000000..d8468a3
--- /dev/null
+++ b/doc/manual/style-multi.css
@@ -0,0 +1,8 @@
+  .chapter { background-color:#d0e4fe; }
+  .section { background-color:#d0e4fe; }
+  .subsection { background-color:#d0e4fe; }
+  .settitle { background-color:#d0e4fe; }
+  .contents { border: 2px solid black;
+              margin: 1cm 1cm 1cm 1cm; 
+              padding-left: 3mm; }
+  body { padding-left: 3mm; }
\ No newline at end of file
diff --git a/doc/manual/style-single.css b/doc/manual/style-single.css
new file mode 100644
index 0000000..f5bae2d
--- /dev/null
+++ b/doc/manual/style-single.css
@@ -0,0 +1,10 @@
+  .node { visibility:hidden; height: 0px; }
+  .menu { visibility:hidden; height: 0px; }
+  .chapter { background-color:#d0e4fe; }
+  .section { background-color:#d0e4fe; }
+  .subsection { background-color:#d0e4fe; }
+  .settitle { background-color:#d0e4fe; }
+  .contents { border: 2px solid black;
+              margin: 1cm 1cm 1cm 1cm; 
+              padding-left: 3mm; }
+  body { padding-left: 3mm; }
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 35c985f..1400791 100644
--- a/install.sh
+++ b/install.sh
@@ -138,6 +138,12 @@ do
       && echo " html $BUILD_ROOT$DOC_DIR/html/`basename $html`/index.html"
 done
 
+for html in doc/manual/sbcl.html doc/manual/asdf.html
+do
+  cp $html "$BUILD_ROOT$DOC_DIR"/ \
+      && echo " html $BUILD_ROOT$DOC_DIR/`basename $html`"
+done
+
 for f in BUGS CREDITS COPYING NEWS
 do
   cp $f "$BUILD_ROOT$DOC_DIR"/
diff --git a/version.lisp-expr b/version.lisp-expr
index 766a544..b4cca35 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.33.11"
+"1.0.33.12"