doc: Split revhistory to separate file for html docs

This avoids having the revhistory clutter the top of the document.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/doc/Makefile b/doc/Makefile
index 0b66a1d18a23dc9adc846ba4402d133528bda252..d3c88b3774961d7824bec361ffcece7945e40926 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -167,10 +167,16 @@ ONEFILE_PDF_FILES=$(ONEFILE_TXT_FILES:.txt=.pdf)
 
 HTML=altusmetrum.html micropeak.html telegps.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES)
 
+HTML_REVHISTORY=\
+       altusmetrum-revhistory.html \
+       micropeak-revhistory.html \
+       telegps-revhistory.html
+
 PDF=altusmetrum.pdf micropeak.pdf telegps.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILES) \
        $(OUTLINE_PDF_FILES)
 
 FOP_STYLE=am-fo.xsl
+HTML_STYLE=am-html.xsl
 FOP_XCONF=fop.xconf
 STYLESHEET=am.css
 
@@ -189,9 +195,9 @@ TEMPLATES_TMPL=titlepage.templates.tmpl
 TEMPLATES_XSL=$(TEMPLATES_TMPL:.tmpl=.xsl)
 
 PDF_CONFIG_FILES=$(FOP_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL)
-HTML_CONFIG_FILES=$(TEMPLATES_XSL) $(STYLESHEET)
+HTML_CONFIG_FILES=$(TEMPLATES_XSL)
 
-DOC=$(HTML) $(PDF) $(IMAGES) $(STYLESHEET)
+DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 
 .SUFFIXES: .tmpl .xsl .inc .txt .raw .pdf .html
 
@@ -205,7 +211,7 @@ DOC=$(HTML) $(PDF) $(IMAGES) $(STYLESHEET)
        a2x -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw
 
 .raw.html:
-       a2x -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --stylesheet=$(STYLESHEET) $*.raw
+       a2x -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw
 
 .tmpl.xsl:
        xsltproc --output $@ /usr/share/xml/docbook/stylesheet/docbook-xsl/template/titlepage.xsl $*.tmpl
@@ -214,6 +220,12 @@ all:       $(HTML) $(PDF)
 
 $(HTML): $(PDF)
 
+altusmetrum-revhistory.html: altusmetrum.html
+
+micropeak-revhistory.html: micropeak.html
+
+telegps-revhistory.html: telegps.html
+
 altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(RAW_INC) $(IMAGES)
 
 telegps.html telegps.pdf: telegps-docinfo.xml $(TELEGPS_RAW_FILES) $(IMAGES)
@@ -238,7 +250,7 @@ publish-keithp:     $(DOC) $(FONTS)
        scp -p $(FONTS) keithp.com:~keithp/public_html/altos/fonts
 
 clean:
-       rm -f $(HTML) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
+       rm -f $(HTML) $(HTML_REVHISTORY) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
 
 distclean: clean
        rm -f $(HTML) $(PDF)

diff --git a/doc/altos-docinfo.xml b/doc/altos-docinfo.xml
index 1b6ad648f7f0f5ce8ef09ab7fe4087c4bcd10ee4..b9193a8f6c9448169b6962115e5a7bf4d361293d 100644 (file)
--- a/doc/altos-docinfo.xml
+++ b/doc/altos-docinfo.xml
@@ -19,6 +19,7 @@
   </para>
 </legalnotice>
 <revhistory>
+  <?dbhtml filename="altos-revhistory.html"?>
   <revision>
     <revnumber>1.1</revnumber>
     <date>05 November 2012</date>

diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml
index 19c1e5d9ac2f1fb616577600076b45cc288c3ac5..11df900c8466f4fbf7ec1457174779f0ab15801b 100644 (file)
--- a/doc/altusmetrum-docinfo.xml
+++ b/doc/altusmetrum-docinfo.xml
@@ -36,6 +36,7 @@
   </para>
 </legalnotice>
 <revhistory>
+  <?dbhtml filename="altusmetrum-revhistory.html"?>
   <revision>
     <revnumber>1.6.1</revnumber>
     <date>15 July 2015</date>

diff --git a/doc/am-html.xsl b/doc/am-html.xsl
new file mode 100644 (file)
index 0000000..cdfe27f
--- /dev/null
+++ b/doc/am-html.xsl
@@ -0,0 +1,14 @@
+<!--
+  Generates single XHTML document from DocBook XML source using DocBook XSL
+  stylesheets.
+
+  NOTE: The URL reference to the current DocBook XSL stylesheets is
+  rewritten to point to the copy on the local disk drive by the XML catalog
+  rewrite directives so it doesn't need to go out to the Internet for the
+  stylesheets. This means you don't need to edit the <xsl:import> elements on
+  a machine by machine basis.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
+<xsl:import href="common.xsl"/>
+</xsl:stylesheet>

diff --git a/doc/am.css b/doc/am.css
index c2faa01500e573b7521642fabb17b6a66e3ecd6c..7723b14acc22c89ee76dd8919652f28e569a0427 100644 (file)
--- a/doc/am.css
+++ b/doc/am.css
@@ -348,24 +348,16 @@ div.variablelist p.title
   margin-bottom: -0.8em;
 }
 
-table {
-    border: none;
-}
-
 div.revhistory {
     border-style: none;
 }
 
-div.revhistory table, th, td, tr {
-    margin-top: 1em;
-    border-width: 1px;
+div.revhistory table, div.revhistory th, div.revhistory td {
     border-collapse: collapse;
-    border-top: 1px;
-    border-bottom: 1px;
-    border-left: 1px;
-    border-right: 1px;
-    border: 1px solid black;
+    border: 1px solid #0080ff;
+    padding: 0.25em;
 }
+
 div.revhistory th {
   color: #0080ff;
 }
@@ -385,12 +377,18 @@ div.indexdiv dl, div.indexdiv dt
   Table styling does not work because of overriding attributes in
   generated HTML.
 */
+div.table-contents p,
+div.informaltable p
+{
+    margin: 0px;
+}
+/*
 div.table table,
 div.informaltable table
 {
     margin-left: 0;
-    margin-right: 5%;
-    margin-bottom: 0.8em;
+    margin-right: 0.25em;
+    margin-bottom: 0.25em;
 }
 div.informaltable table
 {
@@ -404,9 +402,15 @@ div.informaltable tfoot,
 div.informaltable tbody
 {
     /* No effect in IE6. */
-    border-top: 3px solid #527bbd;
-    border-bottom: 3px solid #527bbd;
+    border-top: 1px solid #0080ff;
+    border-bottom: 1px solid #0080ff;
+    border-left: 1px solid #0080ff;
+    border-right: 1px solid #0080ff !important;
+    border-width: 1px !important;
 }
+*/
+
+
 div.table thead, div.table tfoot,
 div.informaltable thead, div.informaltable tfoot
 {

diff --git a/doc/common.xsl b/doc/common.xsl
index 2e5cbc2325c45540aca8f3b426f8fc1b7c752d14..1bb323c09278b07a1a8ae77b3cc7c0386555daab 100644 (file)
--- a/doc/common.xsl
+++ b/doc/common.xsl
@@ -56,17 +56,35 @@
 <xsl:param name="html.cellspacing" select="''"/>
 
 <xsl:param name="table.borders.with.css" select="1"/>
-<xsl:param name="table.cell.border.color" select="'#527bbd'"/>
-
+<xsl:param name="table.cell.border.color" select="'#0080ff'"/>
 <xsl:param name="table.cell.border.style" select="'solid'"/>
 <xsl:param name="table.cell.border.thickness" select="'1px'"/>
 <xsl:param name="table.footnote.number.format" select="'a'"/>
 <xsl:param name="table.footnote.number.symbols" select="''"/>
-<xsl:param name="table.frame.border.color" select="'#527bbd'"/>
+<xsl:param name="table.frame.border.color" select="'#0080ff'"/>
 <xsl:param name="table.frame.border.style" select="'solid'"/>
-<xsl:param name="table.frame.border.thickness" select="'3px'"/>
+<xsl:param name="table.frame.border.thickness" select="'1px'"/>
 <xsl:param name="tablecolumns.extension" select="'1'"/>
 
+<xsl:attribute-set name="revhistory.title.properties">
+  <xsl:attribute name="font-size">12pt</xsl:attribute>
+  <xsl:attribute name="font-weight">bold</xsl:attribute>
+  <xsl:attribute name="text-align">center</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="revhistory.table.properties">
+  <xsl:attribute name="border">0.5pt solid #0080ff</xsl:attribute>
+  <xsl:attribute name="width">50%</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="revhistory.table.cell.properties">
+  <xsl:attribute name="border">0.5pt solid #0080ff</xsl:attribute>
+  <xsl:attribute name="font-size">12pt</xsl:attribute>
+  <xsl:attribute name="padding">2pt</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:param name="generate.revhistory.link" select="1"/>
+
 <xsl:param name="highlight.source" select="1"/>
 
 <xsl:param name="section.label.includes.component.label" select="1"/>

diff --git a/doc/companion-docinfo.xml b/doc/companion-docinfo.xml
index 2e0bc567e766d3714f02d17dab34e5419427a572..243bded0e59a5d3b1be17eb1978e76f1b5775cc5 100644 (file)
--- a/doc/companion-docinfo.xml
+++ b/doc/companion-docinfo.xml
@@ -19,6 +19,7 @@
   </para>
 </legalnotice>
 <revhistory>
+  <?dbhtml filename="companion-revhistory.html"?>
   <revision>
     <revnumber>0.1</revnumber>
     <date>13 January 2012</date>

diff --git a/doc/micropeak-docinfo.xml b/doc/micropeak-docinfo.xml
index b401a193cb3bd1d21e2f071d30de5aa97c5810cd..4b33e0be6f000940b22da1a78080388486993f02 100644 (file)
--- a/doc/micropeak-docinfo.xml
+++ b/doc/micropeak-docinfo.xml
@@ -23,6 +23,7 @@
   </para>
 </legalnotice>
 <revhistory>
+  <?dbhtml filename="micropeak-revhistory.html"?>
   <revision>
     <revnumber>1.3.2</revnumber>
     <date>12 February 2014</date>

diff --git a/doc/telegps-docinfo.xml b/doc/telegps-docinfo.xml
index fcceae3f7727f62e0d5778556144c848d20495b0..633e56cc840fe5408a21ddb97b3dd908d28be3ec 100644 (file)
--- a/doc/telegps-docinfo.xml
+++ b/doc/telegps-docinfo.xml
@@ -28,6 +28,7 @@
   </para>
 </legalnotice>
 <revhistory>
+  <?dbhtml filename="telegps-revhistory.html"?>
   <revision>
     <revnumber>1.6.1</revnumber>
     <date>15 July 2015</date>

diff --git a/doc/telemetry-docinfo.xml b/doc/telemetry-docinfo.xml
index c7b1f0606e6b988ed83039e31a582494ffad7223..19f90ca486e6c3d6336678945b5b87580286f815 100644 (file)
--- a/doc/telemetry-docinfo.xml
+++ b/doc/telemetry-docinfo.xml
@@ -19,6 +19,7 @@
   </para>
 </legalnotice>
 <revhistory>
+  <?dbhtml filename="telemetry-revhistory.html"?>
   <revision>
     <revnumber>0.1</revnumber>
     <date>1 July 2011</date>