From 8cf466d7a767a20387a8d9d6ec81ee00af3fe4a7 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 29 Oct 2015 12:12:15 +0900 Subject: doc: Start doc transition to asciidoc Signed-off-by: Keith Packard --- doc/am.css | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) create mode 100644 doc/am.css (limited to 'doc/am.css') diff --git a/doc/am.css b/doc/am.css new file mode 100644 index 00000000..2461e111 --- /dev/null +++ b/doc/am.css @@ -0,0 +1,356 @@ +/* + CSS stylesheet for XHTML produced by DocBook XSL stylesheets. +*/ + +body { + font-family: "Frutiger LT Std 45 Light",sans-serif; + font-size: 14pt; +} + +code, pre { + font-family: "DejaVu Sans Mono", monospace; +} + +span.strong { + font-weight: bold; +} + +body blockquote { + margin-top: .75em; + line-height: 1.5; + margin-bottom: .75em; +} + +html body { + margin: 1em 5% 1em 5%; + line-height: 1.2; +} + +body div { + margin: 0; +} + +a:link { + color: #0080ff; +} + +a:visited { + color: #0080ff; +} + +h1, h2, h3, h4, h5, h6 +{ + color: #0080ff; + font-family: "Frutiger LT Std 45 Light",sans-serif; +} + +div.revhistory table { + width: 50%; + border-width: 1px; +} + +div titlepage { + margin-top: 100px; + border-top: 2px; +} + +div.toc p:first-child, +div.list-of-figures p:first-child, +div.list-of-tables p:first-child, +div.list-of-examples p:first-child, +div.example p.title, +div.sidebar p.title +{ + font-weight: normal; + color: #0080ff; + font-family: "Frutiger LT Std 45 Light",sans-serif; + margin-bottom: 0.2em; +} + +body h1 { + margin: .0em 0 0 -4%; + line-height: 1.3; + border-bottom: 2px solid silver; +} + +body h2 { + margin: 0.5em 0 0 -4%; + line-height: 1.3; + border-bottom: 2px solid silver; +} + +body h3 { + margin: .8em 0 0 -3%; + line-height: 1.3; +} + +body h4 { + margin: .8em 0 0 -3%; + line-height: 1.3; + border-top: 2px solid silver;goog +} + +body h5 { + margin: .8em 0 0 -2%; + line-height: 1.3; +} + +body h6 { + margin: .8em 0 0 -1%; + line-height: 1.3; +} + +body hr { + border: none; /* Broken on IE6 */ +} +div.footnotes hr { + border: 1px solid silver; +} + +div.navheader th, div.navheader td, div.navfooter td { + font-family: "Frutiger LT Std 45 Light",sans-serif; + font-size: 14pt; + font-weight: normal; + color: #0080ff; +} +div.navheader img, div.navfooter img { + border-style: none; +} +div.navheader a, div.navfooter a { + font-weight: normal; +} +div.navfooter hr { + border: 1px solid silver; +} + +body td { + line-height: 1.2 +} + +body th { + line-height: 1.2; +} + +ol { + line-height: 1.2; +} + +ul, body dir, body menu { + line-height: 1.2; +} + +html { + margin: 0; + padding: 0; +} + +body h1, body h2, body h3, body h4, body h5, body h6 { + margin-left: 0 +} + +body pre { + margin: 0.5em 10% 0.5em 1em; + line-height: 1.0; +} + +tt.literal, code.literal { +} + +.programlisting, .screen { + border: 1px solid silver; + background: #f4f4f4; + margin: 0.5em 10% 0.5em 0; + padding: 0.5em 1em; +} + +div.sidebar { + background: #ffffee; + margin: 1.0em 10% 0.5em 0; + padding: 0.5em 1em; + border: 1px solid silver; +} +div.sidebar * { padding: 0; } +div.sidebar div { margin: 0; } +div.sidebar p.title { + margin-top: 0.5em; + margin-bottom: 0.2em; +} + +div.bibliomixed { + margin: 0.5em 5% 0.5em 1em; +} + +div.glossary dt { + font-weight: bold; +} +div.glossary dd p { + margin-top: 0.2em; +} + +dl { + margin: .8em 0; + line-height: 1.2; +} + +dt { + margin-top: 0.5em; +} + +dt span.term { + font-style: normal; +} + +div.variablelist dd p { + margin-top: 0; +} + +div.itemizedlist li, div.orderedlist li { + margin-left: -0.8em; + margin-top: 0.5em; +} + +ul, ol { + list-style-position: outside; +} + +div.sidebar ul, div.sidebar ol { + margin-left: 2.8em; +} + +div.itemizedlist p.title, +div.orderedlist p.title, +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; + border-collapse: collapse; + border-top: 1px; + border-bottom: 1px; + border-left: 1px; + border-right: 1px; + border: 1px solid black; +} +div.revhistory th { + color: #0080ff; + font-family: "Frutiger LT Std 45 Light",sans-serif; +} + +/* Keep TOC and index lines close together. */ +div.toc dl, div.toc dt, +div.list-of-figures dl, div.list-of-figures dt, +div.list-of-tables dl, div.list-of-tables dt, +div.indexdiv dl, div.indexdiv dt +{ + line-height: normal; + margin-top: 0; + margin-bottom: 0; +} + +/* + Table styling does not work because of overriding attributes in + generated HTML. +*/ +div.table table, +div.informaltable table +{ + margin-left: 0; + margin-right: 5%; + margin-bottom: 0.8em; +} +div.informaltable table +{ + margin-top: 0.4em +} +div.table thead, +div.table tfoot, +div.table tbody, +div.informaltable thead, +div.informaltable tfoot, +div.informaltable tbody +{ + /* No effect in IE6. */ + border-top: 3px solid #527bbd; + border-bottom: 3px solid #527bbd; +} +div.table thead, div.table tfoot, +div.informaltable thead, div.informaltable tfoot +{ + font-weight: bold; +} + +div.mediaobject img { + margin-bottom: 0.8em; +} +div.figure p.title, +div.table p.title +{ + margin-top: 1em; + margin-bottom: 0.4em; +} + +div.calloutlist p +{ + margin-top: 0em; + margin-bottom: 0.4em; +} + +a img { + border-style: none; +} + +@media print { + div.navheader, div.navfooter { display: none; } +} + +span.aqua { color: aqua; } +span.black { color: black; } +span.blue { color: blue; } +span.fuchsia { color: fuchsia; } +span.gray { color: gray; } +span.green { color: green; } +span.lime { color: lime; } +span.maroon { color: maroon; } +span.navy { color: navy; } +span.olive { color: olive; } +span.purple { color: purple; } +span.red { color: red; } +span.silver { color: silver; } +span.teal { color: teal; } +span.white { color: white; } +span.yellow { color: yellow; } + +span.aqua-background { background: aqua; } +span.black-background { background: black; } +span.blue-background { background: blue; } +span.fuchsia-background { background: fuchsia; } +span.gray-background { background: gray; } +span.green-background { background: green; } +span.lime-background { background: lime; } +span.maroon-background { background: maroon; } +span.navy-background { background: navy; } +span.olive-background { background: olive; } +span.purple-background { background: purple; } +span.red-background { background: red; } +span.silver-background { background: silver; } +span.teal-background { background: teal; } +span.white-background { background: white; } +span.yellow-background { background: yellow; } + +span.big { font-size: 2em; } +span.small { font-size: 0.6em; } + +span.underline { text-decoration: underline; } +span.overline { text-decoration: overline; } +span.line-through { text-decoration: line-through; } -- cgit v1.2.3 From f2816b305fc9e18a1190e392d43ff489936f10f0 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 1 Nov 2015 04:18:34 -0800 Subject: doc: Switch to free fonts. Publish fonts with docs. Signed-off-by: Keith Packard --- doc/Makefile | 20 +++++++-- doc/am-fo.xsl | 20 ++++----- doc/am.css | 69 ++++++++++++++++++++++++++++---- doc/fonts/FrutigerLTStd-Italic.otf | Bin 27736 -> 0 bytes doc/fonts/FrutigerLTStd-Light.otf | Bin 27440 -> 0 bytes doc/fonts/FrutigerLTStd-LightItalic.otf | Bin 27888 -> 0 bytes doc/fonts/FrutigerLTStd-Roman.otf | Bin 27328 -> 0 bytes doc/fonts/OpenSans-Bold.ttf | Bin 0 -> 224592 bytes doc/fonts/OpenSans-BoldItalic.ttf | Bin 0 -> 213292 bytes doc/fonts/OpenSans-ExtraBold.ttf | Bin 0 -> 222584 bytes doc/fonts/OpenSans-ExtraBoldItalic.ttf | Bin 0 -> 213420 bytes doc/fonts/OpenSans-Italic.ttf | Bin 0 -> 212896 bytes doc/fonts/OpenSans-Light.ttf | Bin 0 -> 222412 bytes doc/fonts/OpenSans-LightItalic.ttf | Bin 0 -> 213128 bytes doc/fonts/OpenSans-Regular.ttf | Bin 0 -> 217360 bytes doc/fonts/OpenSans-Semibold.ttf | Bin 0 -> 221328 bytes doc/fonts/OpenSans-SemiboldItalic.ttf | Bin 0 -> 212820 bytes doc/fop.xconf | 16 ++++---- 18 files changed, 98 insertions(+), 27 deletions(-) delete mode 100644 doc/fonts/FrutigerLTStd-Italic.otf delete mode 100644 doc/fonts/FrutigerLTStd-Light.otf delete mode 100644 doc/fonts/FrutigerLTStd-LightItalic.otf delete mode 100644 doc/fonts/FrutigerLTStd-Roman.otf create mode 100644 doc/fonts/OpenSans-Bold.ttf create mode 100644 doc/fonts/OpenSans-BoldItalic.ttf create mode 100644 doc/fonts/OpenSans-ExtraBold.ttf create mode 100644 doc/fonts/OpenSans-ExtraBoldItalic.ttf create mode 100644 doc/fonts/OpenSans-Italic.ttf create mode 100644 doc/fonts/OpenSans-Light.ttf create mode 100644 doc/fonts/OpenSans-LightItalic.ttf create mode 100644 doc/fonts/OpenSans-Regular.ttf create mode 100644 doc/fonts/OpenSans-Semibold.ttf create mode 100644 doc/fonts/OpenSans-SemiboldItalic.ttf (limited to 'doc/am.css') 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 @@ left - - + + 12 @@ -43,9 +43,6 @@ 10 1 1 - - - @@ -108,6 +105,12 @@ +0.5pt +#0080ff +0.5pt +0.5pt +#0080ff + 12pt @@ -122,15 +125,14 @@ - 0.5pt solid black - #EEEEEE + 0.5pt solid #0080ff 50% - 0.5pt solid black + 0.5pt solid #0080ff 12pt - 4pt + 2pt 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 Binary files a/doc/fonts/FrutigerLTStd-Italic.otf and /dev/null differ diff --git a/doc/fonts/FrutigerLTStd-Light.otf b/doc/fonts/FrutigerLTStd-Light.otf deleted file mode 100644 index 6d013a61..00000000 Binary files a/doc/fonts/FrutigerLTStd-Light.otf and /dev/null differ diff --git a/doc/fonts/FrutigerLTStd-LightItalic.otf b/doc/fonts/FrutigerLTStd-LightItalic.otf deleted file mode 100644 index 70237778..00000000 Binary files a/doc/fonts/FrutigerLTStd-LightItalic.otf and /dev/null differ diff --git a/doc/fonts/FrutigerLTStd-Roman.otf b/doc/fonts/FrutigerLTStd-Roman.otf deleted file mode 100644 index a6d6edbc..00000000 Binary files a/doc/fonts/FrutigerLTStd-Roman.otf and /dev/null differ diff --git a/doc/fonts/OpenSans-Bold.ttf b/doc/fonts/OpenSans-Bold.ttf new file mode 100644 index 00000000..fd79d43b Binary files /dev/null and b/doc/fonts/OpenSans-Bold.ttf differ diff --git a/doc/fonts/OpenSans-BoldItalic.ttf b/doc/fonts/OpenSans-BoldItalic.ttf new file mode 100644 index 00000000..9bc80095 Binary files /dev/null and b/doc/fonts/OpenSans-BoldItalic.ttf differ diff --git a/doc/fonts/OpenSans-ExtraBold.ttf b/doc/fonts/OpenSans-ExtraBold.ttf new file mode 100644 index 00000000..21f6f84a Binary files /dev/null and b/doc/fonts/OpenSans-ExtraBold.ttf differ diff --git a/doc/fonts/OpenSans-ExtraBoldItalic.ttf b/doc/fonts/OpenSans-ExtraBoldItalic.ttf new file mode 100644 index 00000000..31cb6883 Binary files /dev/null and b/doc/fonts/OpenSans-ExtraBoldItalic.ttf differ diff --git a/doc/fonts/OpenSans-Italic.ttf b/doc/fonts/OpenSans-Italic.ttf new file mode 100644 index 00000000..c90da48f Binary files /dev/null and b/doc/fonts/OpenSans-Italic.ttf differ diff --git a/doc/fonts/OpenSans-Light.ttf b/doc/fonts/OpenSans-Light.ttf new file mode 100644 index 00000000..0d381897 Binary files /dev/null and b/doc/fonts/OpenSans-Light.ttf differ diff --git a/doc/fonts/OpenSans-LightItalic.ttf b/doc/fonts/OpenSans-LightItalic.ttf new file mode 100644 index 00000000..68299c4b Binary files /dev/null and b/doc/fonts/OpenSans-LightItalic.ttf differ diff --git a/doc/fonts/OpenSans-Regular.ttf b/doc/fonts/OpenSans-Regular.ttf new file mode 100644 index 00000000..db433349 Binary files /dev/null and b/doc/fonts/OpenSans-Regular.ttf differ diff --git a/doc/fonts/OpenSans-Semibold.ttf b/doc/fonts/OpenSans-Semibold.ttf new file mode 100644 index 00000000..1a7679e3 Binary files /dev/null and b/doc/fonts/OpenSans-Semibold.ttf differ diff --git a/doc/fonts/OpenSans-SemiboldItalic.ttf b/doc/fonts/OpenSans-SemiboldItalic.ttf new file mode 100644 index 00000000..59b6d16b Binary files /dev/null and b/doc/fonts/OpenSans-SemiboldItalic.ttf differ 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. - - + - - + - - + - - + -- cgit v1.2.3 From 1c0f2cd7cbd8fa1360d6b18a1bf8ac0707634aa4 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 1 Nov 2015 04:20:18 -0800 Subject: doc: Place html book contents on left side of page with separate scrollbar This lets the user see the toc while browsing the document Signed-off-by: Keith Packard --- doc/am.css | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'doc/am.css') diff --git a/doc/am.css b/doc/am.css index e939245c..c2faa015 100644 --- a/doc/am.css +++ b/doc/am.css @@ -110,6 +110,74 @@ div titlepage { border-top: 2px; } +div.warning h1, div.warning h2, div.warning h3, div.warning h4, div.warning h5, div.warning h6 { + color: #ff2020; +} + +div.warning p, div.note p, div.error p { + margin-left: 5%; + margin-left: 5%; +} + +div.toc { + position: fixed; + left: 0px; + top: 0px; + height: 100%; + width: 25em; + margin-right: 5ex; + margin-left: 0px; + float: left; + border-right: 2px solid #0080ff; + border-collapse: collapse; + overflow: auto; +} + +div.toc a:link { + text-decoration: none; +} + +div.toc a:visited { + text-decoration: none; +} + +div.toc a:hover { + text-decoration: underline; +} + +div.toc a:active { + text-decoration: underline; +} + +div.book { + margin-left: 25em; +} + +div.list-of-figures { + display: none; +} + +div.list-of-tables { + display: none; +} + +div.figure p { + text-align: center; +} +div.figure img { + display: block; + margin: auto; +} + +div.table p.title { + text-align: center; +} + +div.table-contents table { + margin-left: auto; + margin-right: auto; +} + div.toc p:first-child, div.list-of-figures p:first-child, div.list-of-tables p:first-child, -- cgit v1.2.3 From edcb80f25875200a73269045db71c1579b0c2c82 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 1 Nov 2015 04:22:27 -0800 Subject: 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 --- doc/Makefile | 20 ++++++++++++++++---- doc/altos-docinfo.xml | 1 + doc/altusmetrum-docinfo.xml | 1 + doc/am-html.xsl | 14 ++++++++++++++ doc/am.css | 36 ++++++++++++++++++++---------------- doc/common.xsl | 26 ++++++++++++++++++++++---- doc/companion-docinfo.xml | 1 + doc/micropeak-docinfo.xml | 1 + doc/telegps-docinfo.xml | 1 + doc/telemetry-docinfo.xml | 1 + 10 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 doc/am-html.xsl (limited to 'doc/am.css') diff --git a/doc/Makefile b/doc/Makefile index 0b66a1d1..d3c88b37 100644 --- 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 1b6ad648..b9193a8f 100644 --- a/doc/altos-docinfo.xml +++ b/doc/altos-docinfo.xml @@ -19,6 +19,7 @@ + 1.1 05 November 2012 diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml index 19c1e5d9..11df900c 100644 --- a/doc/altusmetrum-docinfo.xml +++ b/doc/altusmetrum-docinfo.xml @@ -36,6 +36,7 @@ + 1.6.1 15 July 2015 diff --git a/doc/am-html.xsl b/doc/am-html.xsl new file mode 100644 index 00000000..cdfe27f8 --- /dev/null +++ b/doc/am-html.xsl @@ -0,0 +1,14 @@ + + + + + diff --git a/doc/am.css b/doc/am.css index c2faa015..7723b14a 100644 --- 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 2e5cbc23..1bb323c0 100644 --- a/doc/common.xsl +++ b/doc/common.xsl @@ -56,17 +56,35 @@ - - + - + - + + + 12pt + bold + center + + + + 0.5pt solid #0080ff + 50% + + + + 0.5pt solid #0080ff + 12pt + 2pt + + + + diff --git a/doc/companion-docinfo.xml b/doc/companion-docinfo.xml index 2e0bc567..243bded0 100644 --- a/doc/companion-docinfo.xml +++ b/doc/companion-docinfo.xml @@ -19,6 +19,7 @@ + 0.1 13 January 2012 diff --git a/doc/micropeak-docinfo.xml b/doc/micropeak-docinfo.xml index b401a193..4b33e0be 100644 --- a/doc/micropeak-docinfo.xml +++ b/doc/micropeak-docinfo.xml @@ -23,6 +23,7 @@ + 1.3.2 12 February 2014 diff --git a/doc/telegps-docinfo.xml b/doc/telegps-docinfo.xml index fcceae3f..633e56cc 100644 --- a/doc/telegps-docinfo.xml +++ b/doc/telegps-docinfo.xml @@ -28,6 +28,7 @@ + 1.6.1 15 July 2015 diff --git a/doc/telemetry-docinfo.xml b/doc/telemetry-docinfo.xml index c7b1f060..19f90ca4 100644 --- a/doc/telemetry-docinfo.xml +++ b/doc/telemetry-docinfo.xml @@ -19,6 +19,7 @@ + 0.1 1 July 2011 -- cgit v1.2.3 From ef2ba847ca53a8ddfcddd4e51a0dd43c45161c85 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 1 Nov 2015 21:05:20 -0800 Subject: doc: Add product logos to books This places the product logo on the title verso in pdf form, and above the TOC in html form. Signed-off-by: Keith Packard --- doc/Makefile | 12 +- doc/altusmetrum-docinfo.xml | 9 ++ doc/altusmetrum-oneline.svg | 354 +++++++++++++++++++++++++++++++++++++++++ doc/am-fo.xsl | 14 +- doc/am.css | 40 +++-- doc/common.xsl | 8 +- doc/micropeak-docinfo.xml | 7 + doc/micropeak-oneline-font.svg | 199 +++++++++++++++++++++++ doc/micropeak-oneline.svg | 239 ++++++++++++++++++++++++++++ doc/telegps-docinfo.xml | 8 + doc/telegps-oneline-font.svg | 304 +++++++++++++++++++++++++++++++++++ doc/telegps-oneline.svg | 332 ++++++++++++++++++++++++++++++++++++++ doc/titlepage.templates.tmpl | 62 ++++---- 13 files changed, 1529 insertions(+), 59 deletions(-) create mode 100644 doc/altusmetrum-oneline.svg create mode 100644 doc/micropeak-oneline-font.svg create mode 100644 doc/micropeak-oneline.svg create mode 100644 doc/telegps-oneline-font.svg create mode 100644 doc/telegps-oneline.svg (limited to 'doc/am.css') diff --git a/doc/Makefile b/doc/Makefile index 2aecc230..89a302ff 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -83,7 +83,10 @@ IMAGES=\ telemetrum-v2.0-th.jpg \ telemini.svg \ telemini-v1-top.jpg \ - telemini-v2-top.jpg + telemini-v2-top.jpg \ + altusmetrum-oneline.svg \ + telegps-oneline.svg \ + micropeak-oneline.svg TXT_FILES=altusmetrum.txt @@ -177,6 +180,7 @@ PDF=altusmetrum.pdf micropeak.pdf telegps.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILE FOP_STYLE=am-fo.xsl HTML_STYLE=am-html.xsl +COMMON_STYLE=common.xsl FOP_XCONF=fop.xconf STYLESHEET=am.css @@ -187,6 +191,8 @@ FONTS=\ fonts/DejaVuSansMono.ttf \ fonts/OpenSans-Light.ttf \ fonts/OpenSans-LightItalic.ttf \ + fonts/OpenSans-Regular.ttf \ + fonts/OpenSans-Italic.ttf \ fonts/OpenSans-Semibold.ttf \ fonts/OpenSans-SemiboldItalic.ttf @@ -194,8 +200,8 @@ 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) +PDF_CONFIG_FILES=$(FOP_STYLE) $(COMMON_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL) +HTML_CONFIG_FILES=$(HTML_STYLE) $(COMMON_STYLE) $(TEMPLATES_XSL) DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET) diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml index 11df900c..69a769b6 100644 --- a/doc/altusmetrum-docinfo.xml +++ b/doc/altusmetrum-docinfo.xml @@ -26,6 +26,15 @@ + + + + + + + + + This document is released under the terms of the diff --git a/doc/altusmetrum-oneline.svg b/doc/altusmetrum-oneline.svg new file mode 100644 index 00000000..0ed7b6cd --- /dev/null +++ b/doc/altusmetrum-oneline.svg @@ -0,0 +1,354 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/am-fo.xsl b/doc/am-fo.xsl index 5743a24c..605339d4 100644 --- a/doc/am-fo.xsl +++ b/doc/am-fo.xsl @@ -106,10 +106,10 @@ 0.5pt -#0080ff +#78079a 0.5pt 0.5pt -#0080ff +#78079a @@ -160,12 +160,12 @@ - 0.5pt solid #0080ff + 0.5pt solid #78079a 50% - 0.5pt solid #0080ff + 0.5pt solid #78079a 11pt 2pt @@ -176,12 +176,12 @@ normal - #0080ff + #78079a normal - #0080ff + #78079a @@ -191,7 +191,7 @@ normal - #0080ff + #78079a diff --git a/doc/am.css b/doc/am.css index 7723b14a..1dee27ea 100644 --- a/doc/am.css +++ b/doc/am.css @@ -87,16 +87,16 @@ body div { } a:link { - color: #0080ff; + color: #78079a; } a:visited { - color: #0080ff; + color: #78079a; } h1, h2, h3, h4, h5, h6 { - color: #0080ff; + color: #78079a; font-family: "Open Sans",sans-serif; } @@ -119,16 +119,26 @@ div.warning p, div.note p, div.error p { margin-left: 5%; } -div.toc { +h3.corpauthor img { position: fixed; left: 0px; top: 0px; - height: 100%; - width: 25em; + width: 410px; + height: 90px; + border-right: 2px solid #78079a; + border-bottom: 2px solid #78079a; +} + +div.toc { + position: fixed; + left: 0px; + top: 92px; + bottom: 0; + width: 410px; margin-right: 5ex; margin-left: 0px; float: left; - border-right: 2px solid #0080ff; + border-right: 2px solid #78079a; border-collapse: collapse; overflow: auto; } @@ -186,7 +196,7 @@ div.example p.title, div.sidebar p.title { font-weight: normal; - color: #0080ff; + color: #78079a; font-family: "Open Sans",sans-serif; margin-bottom: 0.2em; } @@ -235,7 +245,7 @@ div.navheader th, div.navheader td, div.navfooter td { font-family: "Open Sans",sans-serif; font-size: 12pt; font-weight: normal; - color: #0080ff; + color: #78079a; } div.navheader img, div.navfooter img { border-style: none; @@ -354,12 +364,12 @@ div.revhistory { div.revhistory table, div.revhistory th, div.revhistory td { border-collapse: collapse; - border: 1px solid #0080ff; + border: 1px solid #78079a; padding: 0.25em; } div.revhistory th { - color: #0080ff; + color: #78079a; } /* Keep TOC and index lines close together. */ @@ -402,10 +412,10 @@ div.informaltable tfoot, div.informaltable tbody { /* No effect in IE6. */ - border-top: 1px solid #0080ff; - border-bottom: 1px solid #0080ff; - border-left: 1px solid #0080ff; - border-right: 1px solid #0080ff !important; + border-top: 1px solid #78079a; + border-bottom: 1px solid #78079a; + border-left: 1px solid #78079a; + border-right: 1px solid #78079a !important; border-width: 1px !important; } */ diff --git a/doc/common.xsl b/doc/common.xsl index 1bb323c0..94b120af 100644 --- a/doc/common.xsl +++ b/doc/common.xsl @@ -56,12 +56,12 @@ - + - + @@ -73,12 +73,12 @@ - 0.5pt solid #0080ff + 0.5pt solid #78079a 50% - 0.5pt solid #0080ff + 0.5pt solid #78079a 12pt 2pt diff --git a/doc/micropeak-docinfo.xml b/doc/micropeak-docinfo.xml index 4b33e0be..37c6e770 100644 --- a/doc/micropeak-docinfo.xml +++ b/doc/micropeak-docinfo.xml @@ -13,6 +13,13 @@ + + + + + + + This document is released under the terms of the diff --git a/doc/micropeak-oneline-font.svg b/doc/micropeak-oneline-font.svg new file mode 100644 index 00000000..f6b23aa3 --- /dev/null +++ b/doc/micropeak-oneline-font.svg @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + μ + + + MicroPeak + + diff --git a/doc/micropeak-oneline.svg b/doc/micropeak-oneline.svg new file mode 100644 index 00000000..4b695827 --- /dev/null +++ b/doc/micropeak-oneline.svg @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/telegps-docinfo.xml b/doc/telegps-docinfo.xml index 633e56cc..4ba3f73c 100644 --- a/doc/telegps-docinfo.xml +++ b/doc/telegps-docinfo.xml @@ -18,6 +18,14 @@ + + + + + + + + This document is released under the terms of the diff --git a/doc/telegps-oneline-font.svg b/doc/telegps-oneline-font.svg new file mode 100644 index 00000000..a2cf540b --- /dev/null +++ b/doc/telegps-oneline-font.svg @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + TeleGPS + + diff --git a/doc/telegps-oneline.svg b/doc/telegps-oneline.svg new file mode 100644 index 00000000..21497899 --- /dev/null +++ b/doc/telegps-oneline.svg @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/doc/titlepage.templates.tmpl b/doc/titlepage.templates.tmpl index 9de1b31f..1669e465 100644 --- a/doc/titlepage.templates.tmpl +++ b/doc/titlepage.templates.tmpl @@ -132,35 +132,37 @@ - - - - <subtitle - text-align="center" - font-size="&hsize4;" - space-before="&hsize4space;" - font-family="{$title.fontset}"/> - <corpauthor font-size="&hsize3;" - keep-with-next.within-column="always" - space-before="2in"/> - <authorgroup space-before="2in"/> - <author font-size="&hsize3;" - space-before="&hsize2space;" - keep-with-next.within-column="always"/> - <!-- If you add editor, include this t:predicate attribute - because only the first editor generates the list of editors. - <editor t:predicate="[position() = 1]"/> - --> - <mediaobject space-before="1.5in"/> - <itermset/> - </t:titlepage-content> +<t:titlepage t:element="book" t:wrapper="fo:block"> + <t:titlepage-content t:side="recto"> + <title + t:named-template="division.title" + param:node="ancestor-or-self::book[1]" + text-align="center" + font-size="&hsize5;" + space-before="&hsize5space;" + font-weight="bold" + font-family="{$title.fontset}"/> + <subtitle + text-align="center" + font-size="&hsize4;" + space-before="&hsize4space;" + font-family="{$title.fontset}"/> +<!-- + <corpauthor font-size="&hsize3;" + keep-with-next.within-column="always" + space-before="2in"/> + --> + <authorgroup space-before="2in"/> + <author font-size="&hsize3;" + space-before="&hsize2space;" + keep-with-next.within-column="always"/> + <!-- If you add editor, include this t:predicate attribute + because only the first editor generates the list of editors. + <editor t:predicate="[position() = 1]"/> + --> + <mediaobject space-before="1.5in"/> + <itermset/> + </t:titlepage-content> <t:titlepage-content t:side="verso"> <title @@ -168,7 +170,6 @@ font-size="&hsize2;" font-weight="bold" font-family="{$title.fontset}"/> - <corpauthor/> <authorgroup t:named-template="verso.authorgroup"/> <author/> <!-- If you add editor, include this t:predicate attribute @@ -181,6 +182,7 @@ <copyright/> <abstract/> <legalnotice font-size="8pt"/> + <corpauthor text-align="center"/> <revhistory space-before="0.5in"/> </t:titlepage-content> -- cgit v1.2.3 From b030dfb3df859b3b3cb9c666394f315edcd11f49 Mon Sep 17 00:00:00 2001 From: Keith Packard <keithp@keithp.com> Date: Fri, 13 Nov 2015 20:59:25 -0800 Subject: doc: Reformat html versions a bit Color more text black, including toc. Add a bit of space around the toc. Make paragraph labels bold. Signed-off-by: Keith Packard <keithp@keithp.com> --- doc/am.css | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) (limited to 'doc/am.css') diff --git a/doc/am.css b/doc/am.css index 1dee27ea..05889a16 100644 --- a/doc/am.css +++ b/doc/am.css @@ -125,8 +125,8 @@ h3.corpauthor img { top: 0px; width: 410px; height: 90px; - border-right: 2px solid #78079a; - border-bottom: 2px solid #78079a; + border-right: 2px solid #808080; + border-bottom: 2px solid #808080; } div.toc { @@ -134,15 +134,30 @@ div.toc { left: 0px; top: 92px; bottom: 0; - width: 410px; - margin-right: 5ex; - margin-left: 0px; + width: 390px; + margin-right: 0; + margin-left: 0; + padding-left: 10px; + padding-right: 10px; float: left; - border-right: 2px solid #78079a; + border-right: 2px solid #808080; border-collapse: collapse; overflow: auto; } +div.toc p, +div.list-of-figures p, +div.list-of-tables p, +div.list-of-examples p, +div.toc a +{ + color: black; +} + +div.toc p { + color: black; +} + div.toc a:link { text-decoration: none; } @@ -188,10 +203,6 @@ div.table-contents table { margin-right: auto; } -div.toc p:first-child, -div.list-of-figures p:first-child, -div.list-of-tables p:first-child, -div.list-of-examples p:first-child, div.example p.title, div.sidebar p.title { @@ -204,13 +215,13 @@ div.sidebar p.title body h1 { margin: .0em 0 0 -4%; line-height: 1.3; - border-bottom: 2px solid silver; + border-bottom: 2px solid #808080; } body h2 { margin: 0.5em 0 0 -4%; line-height: 1.3; - border-bottom: 2px solid silver; + border-bottom: 2px solid #808080; } body h3 { @@ -221,7 +232,7 @@ body h3 { body h4 { margin: .8em 0 0 -3%; line-height: 1.3; - border-top: 2px solid silver;goog + border-top: 2px solid #808080; } body h5 { @@ -238,7 +249,7 @@ body hr { border: none; /* Broken on IE6 */ } div.footnotes hr { - border: 1px solid silver; + border: 1px solid #808080; } div.navheader th, div.navheader td, div.navfooter td { @@ -254,7 +265,7 @@ div.navheader a, div.navfooter a { font-weight: normal; } div.navfooter hr { - border: 1px solid silver; + border: 1px solid #808080; } body td { @@ -291,7 +302,7 @@ tt.literal, code.literal { } .programlisting, .screen { - border: 1px solid silver; + border: 1px solid #808080; background: #f4f4f4; margin: 0.5em 10% 0.5em 0; padding: 0.5em 1em; @@ -301,7 +312,7 @@ div.sidebar { background: #ffffee; margin: 1.0em 10% 0.5em 0; padding: 0.5em 1em; - border: 1px solid silver; + border: 1px solid #808080; } div.sidebar * { padding: 0; } div.sidebar div { margin: 0; } @@ -331,7 +342,7 @@ dt { } dt span.term { - font-style: normal; + font-weight: bold; } div.variablelist dd p { @@ -364,12 +375,12 @@ div.revhistory { div.revhistory table, div.revhistory th, div.revhistory td { border-collapse: collapse; - border: 1px solid #78079a; + border: 1px solid #808080; padding: 0.25em; } div.revhistory th { - color: #78079a; + color: black; } /* Keep TOC and index lines close together. */ -- cgit v1.2.3 From f28d59ddf3e1b763ce5757f572e79085963818e9 Mon Sep 17 00:00:00 2001 From: Keith Packard <keithp@keithp.com> Date: Sat, 14 Nov 2015 00:01:05 -0800 Subject: doc: Remove some bogus bits from am.css Just commented out stuff which had a nested comment and was thus invalid Signed-off-by: Keith Packard <keithp@keithp.com> --- doc/am.css | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'doc/am.css') diff --git a/doc/am.css b/doc/am.css index 05889a16..393ef81b 100644 --- a/doc/am.css +++ b/doc/am.css @@ -403,34 +403,6 @@ div.informaltable p { margin: 0px; } -/* -div.table table, -div.informaltable table -{ - margin-left: 0; - margin-right: 0.25em; - margin-bottom: 0.25em; -} -div.informaltable table -{ - margin-top: 0.4em -} -div.table thead, -div.table tfoot, -div.table tbody, -div.informaltable thead, -div.informaltable tfoot, -div.informaltable tbody -{ - /* No effect in IE6. */ - border-top: 1px solid #78079a; - border-bottom: 1px solid #78079a; - border-left: 1px solid #78079a; - border-right: 1px solid #78079a !important; - border-width: 1px !important; -} -*/ - div.table thead, div.table tfoot, div.informaltable thead, div.informaltable tfoot -- cgit v1.2.3