From: Keith Packard Date: Sun, 1 Nov 2015 12:18:34 +0000 (-0800) Subject: doc: Switch to free fonts. Publish fonts with docs. X-Git-Tag: 1.6.2^2~38 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f2816b305fc9e18a1190e392d43ff489936f10f0 doc: Switch to free fonts. Publish fonts with docs. Signed-off-by: Keith Packard --- 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. - - + - - + - - + - - +