18 files changed, 98 insertions, 27 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 29d3c428..0b66a1d1 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -174,6 +174,16 @@ FOP_STYLE=am-fo.xsl
 FOP_XCONF=fop.xconf
 STYLESHEET=am.css
 
+FONTS=\
+	fonts/DejaVuSansMono-BoldOblique.ttf \
+	fonts/DejaVuSansMono-Bold.ttf \
+	fonts/DejaVuSansMono-Oblique.ttf \
+	fonts/DejaVuSansMono.ttf \
+	fonts/OpenSans-Light.ttf \
+	fonts/OpenSans-LightItalic.ttf \
+	fonts/OpenSans-Semibold.ttf \
+	fonts/OpenSans-SemiboldItalic.ttf
+
 TEMPLATES_TMPL=titlepage.templates.tmpl
 
 TEMPLATES_XSL=$(TEMPLATES_TMPL:.tmpl=.xsl)
@@ -212,16 +222,20 @@ micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_RAW_FILES) $(IMA
 
 install:	all
 
-publish:	$(DOC)
+publish:	$(DOC) $(FONTS)
 	cp $(DOC) /home/bdale/web/altusmetrum/AltOS/doc/
+	mkdir -p /home/bdale/web/altusmetrum/AltOS/doc/fonts/
+	cp $(FONTS) /home/bdale/web/altusmetrum/AltOS/doc/fonts/
 	(cd /home/bdale/web/altusmetrum ; \
 	 git add /home/bdale/web/altusmetrum/AltOS/doc/* ; \
+	 git add /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \
 	 echo "update docs" | \
-	 git commit -F - /home/bdale/web/altusmetrum/AltOS/doc/* ; \
+	 git commit -F - /home/bdale/web/altusmetrum/AltOS/doc/* /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \
 	 git push)
 
-publish-keithp:	$(DOC)
+publish-keithp:	$(DOC) $(FONTS)
 	scp -p $(DOC) keithp.com:~keithp/public_html/altos
+	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)
diff --git a/doc/am-fo.xsl b/doc/am-fo.xsl
index 35279f22..2166afd4 100644
--- a/doc/am-fo.xsl
+++ b/doc/am-fo.xsl
@@ -30,8 +30,8 @@
 <!-- justify, left or right -->
 <xsl:param name="alignment">left</xsl:param>
 
-<xsl:param name="body.font.family" select="'Frutiger LT Std,sans-serif'"/>
-<xsl:param name="title.font.family" select="'Frutiger LT Std,sans-serif'"/>
+<xsl:param name="body.font.family" select="'Open Sans Light,sans-serif'"/>
+<xsl:param name="title.font.family" select="'Open Sans Light,sans-serif'"/>
 <xsl:param name="monospace.font.family" select="'DejaVu Sans Mono,monospace'"/>
 <xsl:param name="body.font.master">12</xsl:param>
 <xsl:param name="body.font.size">
@@ -43,9 +43,6 @@
 <xsl:param name="bridgehead.in.toc" select="0"/>
 <xsl:param name="footer.column.widths">10 1 1</xsl:param>
 
-<!-- overide setting in common.xsl -->
-<xsl:param name="table.frame.border.thickness" select="'2px'"/>
-
 <!-- Default fetches image from Internet (long timeouts) -->
 <xsl:param name="draft.watermark.image" select="''"/>
 
@@ -108,6 +105,12 @@
   </xsl:choose>
 </xsl:param>
 
+<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param>
+<xsl:param name="table.frame.border.color">#0080ff</xsl:param>
+<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param>
+<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param>
+<xsl:param name="table.cell.border.color">#0080ff</xsl:param>
+<xsl:param name="table.cell.border.with.css" select="1"/>
 
 <xsl:attribute-set name="copyright.title.properties">
   <xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -122,15 +125,14 @@
 </xsl:attribute-set>
 
 <xsl:attribute-set name="revhistory.table.properties">
-  <xsl:attribute name="border">0.5pt solid black</xsl:attribute>
-  <xsl:attribute name="background-color">#EEEEEE</xsl:attribute>
+  <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 black</xsl:attribute>
+  <xsl:attribute name="border">0.5pt solid #0080ff</xsl:attribute>
   <xsl:attribute name="font-size">12pt</xsl:attribute>
-  <xsl:attribute name="padding">4pt</xsl:attribute>
+  <xsl:attribute name="padding">2pt</xsl:attribute>
 </xsl:attribute-set>
 
 <xsl:attribute-set name="monospace.properties">
diff --git a/doc/am.css b/doc/am.css
index 2461e111..e939245c 100644
--- a/doc/am.css
+++ b/doc/am.css
@@ -2,9 +2,65 @@
   CSS stylesheet for XHTML produced by DocBook XSL stylesheets.
 */
 
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-Regular.ttf');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-Italic.ttf');
+    font-weight: normal;
+    font-style: italic;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-Semibold.ttf');
+    font-weight: bold;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-SemiboldItalic.ttf');
+    font-weight: bold;
+    font-style: italic;
+}
+
+@font-face {
+    font-family: 'DejaVu Sans Mono';
+    src: url('fonts/DejaVuSansMono.ttf');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'DejaVu Sans Mono';
+    src: url('fonts/DejaVuSansMono-Oblique.ttf');
+    font-weight: normal;
+    font-style: oblique;
+}
+
+@font-face {
+    font-family: 'DejaVu Sans Mono';
+    src: url('fonts/DejaVuSansMono-Bold.ttf');
+    font-weight: bold;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'DejaVu Sans Mono';
+    src: url('fonts/DejaVuSansMono-BoldOblique.ttf');
+    font-weight: bold;
+    font-style: oblique;
+}
+
 body {
-    font-family: "Frutiger LT Std 45 Light",sans-serif;
-    font-size: 14pt;
+    font-family: "Open Sans",sans-serif;
+    font-size: 12pt;
 }
 
 code, pre {
@@ -41,7 +97,7 @@ a:visited {
 h1, h2, h3, h4, h5, h6
 {
   color: #0080ff;
-  font-family: "Frutiger LT Std 45 Light",sans-serif;
+  font-family: "Open Sans",sans-serif;
 }
 
 div.revhistory table {
@@ -63,7 +119,7 @@ div.sidebar p.title
 {
   font-weight: normal;
   color: #0080ff;
-  font-family: "Frutiger LT Std 45 Light",sans-serif;
+  font-family: "Open Sans",sans-serif;
   margin-bottom: 0.2em;
 }
 
@@ -108,8 +164,8 @@ div.footnotes hr {
 }
 
 div.navheader th, div.navheader td, div.navfooter td {
-    font-family: "Frutiger LT Std 45 Light",sans-serif;
-    font-size: 14pt;
+    font-family: "Open Sans",sans-serif;
+    font-size: 12pt;
     font-weight: normal;
     color: #0080ff;
 }
@@ -244,7 +300,6 @@ div.revhistory table, th, td, tr {
 }
 div.revhistory th {
   color: #0080ff;
-  font-family: "Frutiger LT Std 45 Light",sans-serif;
 }
 
 /* Keep TOC and index lines close together. */
diff --git a/doc/fonts/FrutigerLTStd-Italic.otf b/doc/fonts/FrutigerLTStd-Italic.otf
deleted file mode 100644
index c02ecd00..00000000
--- a/doc/fonts/FrutigerLTStd-Italic.otf
+++ /dev/null
diff --git a/doc/fonts/FrutigerLTStd-Light.otf b/doc/fonts/FrutigerLTStd-Light.otf
deleted file mode 100644
index 6d013a61..00000000
--- a/doc/fonts/FrutigerLTStd-Light.otf
+++ /dev/null
diff --git a/doc/fonts/FrutigerLTStd-LightItalic.otf b/doc/fonts/FrutigerLTStd-LightItalic.otf
deleted file mode 100644
index 70237778..00000000
--- a/doc/fonts/FrutigerLTStd-LightItalic.otf
+++ /dev/null
diff --git a/doc/fonts/FrutigerLTStd-Roman.otf b/doc/fonts/FrutigerLTStd-Roman.otf
deleted file mode 100644
index a6d6edbc..00000000
--- a/doc/fonts/FrutigerLTStd-Roman.otf
+++ /dev/null
diff --git a/doc/fonts/OpenSans-Bold.ttf b/doc/fonts/OpenSans-Bold.ttf
new file mode 100644
index 00000000..fd79d43b
--- /dev/null
+++ b/doc/fonts/OpenSans-Bold.ttf
diff --git a/doc/fonts/OpenSans-BoldItalic.ttf b/doc/fonts/OpenSans-BoldItalic.ttf
new file mode 100644
index 00000000..9bc80095
--- /dev/null
+++ b/doc/fonts/OpenSans-BoldItalic.ttf
diff --git a/doc/fonts/OpenSans-ExtraBold.ttf b/doc/fonts/OpenSans-ExtraBold.ttf
new file mode 100644
index 00000000..21f6f84a
--- /dev/null
+++ b/doc/fonts/OpenSans-ExtraBold.ttf
diff --git a/doc/fonts/OpenSans-ExtraBoldItalic.ttf b/doc/fonts/OpenSans-ExtraBoldItalic.ttf
new file mode 100644
index 00000000..31cb6883
--- /dev/null
+++ b/doc/fonts/OpenSans-ExtraBoldItalic.ttf
diff --git a/doc/fonts/OpenSans-Italic.ttf b/doc/fonts/OpenSans-Italic.ttf
new file mode 100644
index 00000000..c90da48f
--- /dev/null
+++ b/doc/fonts/OpenSans-Italic.ttf
diff --git a/doc/fonts/OpenSans-Light.ttf b/doc/fonts/OpenSans-Light.ttf
new file mode 100644
index 00000000..0d381897
--- /dev/null
+++ b/doc/fonts/OpenSans-Light.ttf
diff --git a/doc/fonts/OpenSans-LightItalic.ttf b/doc/fonts/OpenSans-LightItalic.ttf
new file mode 100644
index 00000000..68299c4b
--- /dev/null
+++ b/doc/fonts/OpenSans-LightItalic.ttf
diff --git a/doc/fonts/OpenSans-Regular.ttf b/doc/fonts/OpenSans-Regular.ttf
new file mode 100644
index 00000000..db433349
--- /dev/null
+++ b/doc/fonts/OpenSans-Regular.ttf
diff --git a/doc/fonts/OpenSans-Semibold.ttf b/doc/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 00000000..1a7679e3
--- /dev/null
+++ b/doc/fonts/OpenSans-Semibold.ttf
diff --git a/doc/fonts/OpenSans-SemiboldItalic.ttf b/doc/fonts/OpenSans-SemiboldItalic.ttf
new file mode 100644
index 00000000..59b6d16b
--- /dev/null
+++ b/doc/fonts/OpenSans-SemiboldItalic.ttf
diff --git a/doc/fop.xconf b/doc/fop.xconf
index 0f470ffd..9ac42820 100644
--- a/doc/fop.xconf
+++ b/doc/fop.xconf
@@ -38,20 +38,20 @@ the location of this file.
 
       <fonts>
         <!-- embedded fonts -->
-	<font embed-url="fonts/FrutigerLTStd-Light.otf">
-	  <font-triplet name="Frutiger LT Std" style="normal"
+	<font embed-url="fonts/OpenSans-Light.ttf">
+	  <font-triplet name="Open Sans Light" style="normal"
 			weight="normal"/>
 	</font>
-	<font embed-url="fonts/FrutigerLTStd-LightItalic.otf">
-	  <font-triplet name="Frutiger LT Std" style="italic"
+	<font embed-url="fonts/OpenSans-LightItalic.ttf">
+	  <font-triplet name="Open Sans Light" style="italic"
 			weight="normal"/>
 	</font>
-	<font embed-url="fonts/FrutigerLTStd-Roman.otf">
-	  <font-triplet name="Frutiger LT Std" style="normal"
+	<font embed-url="fonts/OpenSans-Semibold.ttf">
+	  <font-triplet name="Open Sans Light" style="normal"
 			weight="bold"/>
 	</font>
-	<font embed-url="fonts/FrutigerLTStd-Italic.otf">
-	  <font-triplet name="Frutiger LT Std" style="italic"
+	<font embed-url="fonts/OpenSans-SemiboldItalic.ttf">
+	  <font-triplet name="Open Sans Light" style="italic"
 			weight="bold"/>
 	</font>