doc: Update docs for asciidoctor-pdf version 2.x

Some of the theming stuff changed

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

diff --git a/doc/altos.txt b/doc/altos.txt
index 9d12f12b324e2d0b02fe86457976dddc49b9f790..8a042df852428aabe98b31bebc987979f7349368 100644 (file)
--- a/doc/altos.txt
+++ b/doc/altos.txt
@@ -5,8 +5,8 @@ Keith Packard <keithp@keithp.com>
 :stylesheet: am.css
 :linkcss:
 :numbered:
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
        include::header.adoc[]

diff --git a/doc/altusmetrum-theme.yml b/doc/altusmetrum-theme.yml
index c4f6f96bdf5368588330d7f0d34d448b8ba78cda..78e1064f319d37c971d28854a7c46a7e499ef617 100644 (file)
--- a/doc/altusmetrum-theme.yml
+++ b/doc/altusmetrum-theme.yml
@@ -1,10 +1,13 @@
+extends: default
 base:
   font_family: Open Sans Light
+  font-size: 12
 heading:
   font_color: #78079a
   font_size: 17
 font:
   catalog:
+    merge: true
     Open Sans Light:
       normal: OpenSans-Light.ttf
       italic: OpenSans-LightItalic.ttf
@@ -42,7 +45,7 @@ admonition_label:
 page:
   background_color: ffffff
   layout: portrait
-  margin: [0.5in, 0.67in, 0.75in, 0.67in]
+  margin: [0.5in, 0.67in, 0.67in, 0.67in]
   size: letter
 footer:
   height: 0.5in
@@ -57,7 +60,7 @@ footer:
       content: $footer_recto_right_content
     right:
       content: '{page-number}'
-literal:
+codespan:
   font_family: DejaVu Sans Mono
 code:
   font_family: DejaVu Sans Mono

diff --git a/doc/altusmetrum.txt b/doc/altusmetrum.txt
index b655c0b23a166e0ff480f2b5ec7cc4d68fe1584f..a66f31a2208fcbf49ddc9c1e651b61e5c24fed36 100644 (file)
--- a/doc/altusmetrum.txt
+++ b/doc/altusmetrum.txt
@@ -23,8 +23,8 @@ Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>; Bob Finch; Anth
 :easytimer: 1
 :easymotor: 1
 :application: AltosUI
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
        include::header.adoc[]

diff --git a/doc/companion.txt b/doc/companion.txt
index 256ffad77cae3c4a11dd142030a67f17ae4bb9f9..c23aab1872b7cf4a874fbfe0fc635b2a2be359dd 100644 (file)
--- a/doc/companion.txt
+++ b/doc/companion.txt
@@ -4,8 +4,8 @@ Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
 :copyright: Bdale Garbee and Keith Packard 2018
 :stylesheet: am.css
 :linkcss:
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 :toc:
 

diff --git a/doc/easymini.txt b/doc/easymini.txt
index 6a4b1e4abedc9e17b442e34866d1182329ed3afc..322a5ef43ddf983b6175565f9376cb7dddab675d 100644 (file)
--- a/doc/easymini.txt
+++ b/doc/easymini.txt
@@ -12,8 +12,8 @@ Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
 :altusmetrum: 1
 :easymini: 1
 :application: AltosUI
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
        include::header.adoc[]

diff --git a/doc/map-loading.txt b/doc/map-loading.txt
index f83281769a949ff0dd7884308527b18f40bbfca0..b1c5c10a004f8d6d04198df1a29e00a4fcca4988 100644 (file)
--- a/doc/map-loading.txt
+++ b/doc/map-loading.txt
@@ -5,8 +5,8 @@ Keith Packard <keithp@keithp.com>
 :doctype: article
 :stylesheet: am-notoc.css
 :linkcss:
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
 == The Google Maps Problem

diff --git a/doc/micropeak.txt b/doc/micropeak.txt
index c02c613a8287c14a145254545c75d674044c1fdd..fb75aacb4d3dd6d165073059207f05b1bff68060 100644 (file)
--- a/doc/micropeak.txt
+++ b/doc/micropeak.txt
@@ -8,8 +8,8 @@ Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
 :toc:
 :doctype: book
 :numbered:
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
        include::header.adoc[]

diff --git a/doc/motortest.txt b/doc/motortest.txt
index 97926c0e34d6db201dbf5bded2bb56c5eeda90c5..c3d25c96afbf94dbe23e3393df2b5116f6e0cd0f 100644 (file)
--- a/doc/motortest.txt
+++ b/doc/motortest.txt
@@ -13,8 +13,8 @@ Bdale Garbee <bdale@gag.com>
 :toc:
 :motortest: 1
 :application: Motor Testing
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
        include::header.adoc[]

diff --git a/doc/release-head.inc b/doc/release-head.inc
index 0dbdfc2b5656648c7225334cb1dc23083433ca09..2c04a84d7ce1da424d7a38804244aca1599bb800 100644 (file)
--- a/doc/release-head.inc
+++ b/doc/release-head.inc
@@ -2,6 +2,6 @@
 :doctype: article
 :stylesheet: am-notoc.css
 :linkcss:
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts

diff --git a/doc/telegps.txt b/doc/telegps.txt
index 608a6db363c110737cce7b143c4069789cb17ec5..aae74424966a6867d65c40475c90f6e274e1f488 100644 (file)
--- a/doc/telegps.txt
+++ b/doc/telegps.txt
@@ -13,8 +13,8 @@ Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
 :radio: 1
 :gps: 1
 :application: TeleGPS
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
        include::header.adoc[]

diff --git a/doc/telelaunch.txt b/doc/telelaunch.txt
index 89f98dd451eca44d437c311e25ae45108da4f3c1..b72ec06f2df7d2b06e9b63b6895534006814a91b 100644 (file)
--- a/doc/telelaunch.txt
+++ b/doc/telelaunch.txt
@@ -13,8 +13,8 @@ Bdale Garbee <bdale@gag.com>
 :toc:
 :telelaunch: 1
 :application: TeleLaunch
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
        include::header.adoc[]

diff --git a/doc/telemetry.txt b/doc/telemetry.txt
index 0df96abdd2b199efd72bd4937f460f7fff728ccb..c867c6cdac0e5eb0dc65c11c4ef51b78937cc8a5 100644 (file)
--- a/doc/telemetry.txt
+++ b/doc/telemetry.txt
@@ -8,8 +8,8 @@ Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
 :doctype: article
 :toc:
 :numbered:
-:pdf-stylesdir: .
-:pdf-style: altusmetrum
+:pdf-themesdir: .
+:pdf-theme: altusmetrum
 :pdf-fontsdir: fonts
 
        include::header.adoc[]