From 1f261b862e4f065505970c945531bf94843d5d17 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Feb 2021 01:34:21 +0100
Subject: [PATCH] Manual tweaks; both content and style for new website.

---
 doc/manual/dcpomatic-html.xsl |  3 +++
 doc/manual/dcpomatic.css      | 43 ++++++++++++++++++++++++++++++-----
 doc/manual/dcpomatic.xml      | 13 ++++-------
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/doc/manual/dcpomatic-html.xsl b/doc/manual/dcpomatic-html.xsl
index 72863d7db..a8a65cfc8 100644
--- a/doc/manual/dcpomatic-html.xsl
+++ b/doc/manual/dcpomatic-html.xsl
@@ -9,6 +9,9 @@
 <!-- I can't fathom xmlto's logic with image scaling, so I've turned it off -->
 <xsl:param name="ignore.image.scaling" select="1"/>
 
+<xsl:param name="generate.toc">article</xsl:param>
+<xsl:param name="generate.toc">book</xsl:param>
+
 <!-- <note> in a div with no heading -->
 <xsl:template name="note.frobozz">
   <xsl:param name="content">
diff --git a/doc/manual/dcpomatic.css b/doc/manual/dcpomatic.css
index 330131dbb..460040b0a 100644
--- a/doc/manual/dcpomatic.css
+++ b/doc/manual/dcpomatic.css
@@ -1,10 +1,41 @@
+@import url('https://fonts.googleapis.com/css?family=Noto+Serif+JP');
+@import url('https://fonts.googleapis.com/css?family=Bebas+Neue');
+
+h1, h2 {
+    font-family: 'Bebas Neue';
+}
+
+h1 {
+	color: #d04040;
+}
+
+h2 {
+	color: #1a9191;
+}
+ 
 body {
-    font-family: luxi sans, sans-serif;
+    font-family: 'Noto Serif JP';
     margin-left: 4em;
     margin-right: 4em;
     margin-top: 1em;
     margin-bottom: 1em;
-    background-color: #E2E8EE;
+    background-color: #fff7f5;
+}
+
+@media (min-width: 1024px) {
+    body {
+        font-size: 1.2vw;
+    }
+
+@media (max-width: 1024px) {
+    body {
+        font-size: 3vw;
+    }
+}
+
+a {
+	color: black;
+	text-underline-offset: 3px;
 }
 
 div.sidebar {
@@ -19,9 +50,9 @@ div.sidebar {
 }
 
 span.guilabel {
-    border-width: 1px;
-    border-style: solid;
-    background-color: #BED2E6;
+    border: 2px solid black;
+	color: white;
+    background-color: #1a9191;
     padding-top: 1px;
     padding-bottom: 1px;
     padding-left: 3px;
@@ -43,5 +74,5 @@ div.note {
 }
 
 code.code {
-    font-size: 125%;
+    font-size: 90%;
 }
diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index 557538b69..76fa4c2d7 100644
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -112,17 +112,13 @@ version.
 <title>macOS</title>
 
 <para>
-DCP-o-matic will run on macOS version 10.6 (Snow Leopard) and
+DCP-o-matic will run on macOS version 10.10 (Yosemite) and
 higher.  DCP-o-matic is split into seven separate applications, each of
 which can be installed by downloading the <code>.dmg</code>,
 double-clicking to open and then dragging the icon to your
 <guilabel>Applications</guilabel> folder.
 </para>
 
-<para>
-Make sure you choose the correct download, depending on whether you are running macOS 10.9 (Mavericks) (or higher) or something older.
-</para>
-
 <para>
 If you don't know which parts of DCP-o-matic to install, start
 with the first (main) part.
@@ -140,7 +136,7 @@ with the first (main) part.
 
 <itemizedlist>
   <listitem>Debian 9 (&lsquo;squeeze&rsquo;), 10 (&lsquo;buster&rsquo;) and unstable (&lsquo;sid&rsquo;)</listitem>
-  <listitem>Ubuntu 16.04 (&lsquo;Xenial Xerus&rsquo;), 18.04 (&lsquo;Bionic Beaver&rsquo;), 19.10 (&lsquo;Eoan Ermine&rsquo;) and 20.04 (&lsquo;Focal Fossa&rsquo;)</listitem>
+  <listitem>Ubuntu 16.04, 18.04, 20.04 and 20.10</listitem>
   <listitem>Mint 18 and 19</listitem>
 </itemizedlist>
 
@@ -158,7 +154,7 @@ pieces and set DCP-o-matic up for you.
 <section>
   <title>Fedora, Centos and Mageia Linux</title>
 
-  <para>There are <code>.rpm</code> packages for Fedora 30, 31 and 32, Centos 7 and 8 and Mageia 7 on
+  <para>There are <code>.rpm</code> packages for Fedora 31, 32 and 33, Centos 7 and 8 and Mageia 7 on
   <ulink url="https://dcpomatic.com/">https://dcpomatic.com/</ulink>
   </para>
 </section>
@@ -412,8 +408,7 @@ linkend="ch-files"/> for details about the files that DCP-o-matic creates.
 <para>
 Alternatively, DCP-o-matic can upload your DCP directly to a projector
 or Theatre Management System (TMS) that is accessible via SCP or FTP
-across your network.  See the <xref linkend="sec-prefs-tms"
-endterm="sec-prefs-tms-short"/> in <xref linkend="sec-prefs-tms"/>.
+across your network.  See <xref linkend="sec-prefs-tms"/>.
 </para>
 
 </section>
-- 
2.30.2