Font improvement to the manual

diff --git a/include/the-region-list.html b/include/the-region-list.html
index e222c86fdd84aa05c264e0cd86cf87b3320fc286..e9183d9fa031d1f96345f0cfec42e6e272cdd8b3 100644 (file)
--- a/include/the-region-list.html
+++ b/include/the-region-list.html
@@ -22,14 +22,14 @@
 </p>
 
 <table class="dl">
-  <tr><th>&square; L</th>
+  <tr><th>&square;&nbsp;L</th>
   <td>whether the region position is locked, so that it cannot be moved.</td></tr>
-  <tr><th>&square; G</th>
+  <tr><th>&square;&nbsp;G</th>
   <td>whether the region's position is &lsquo;glued&rsquo; to bars and beats.
   If so, the region will stay at the same position in bars and beats even if the tempo and/or time signature change.</td></tr>
-  <tr><th>&square; M</th>
+  <tr><th>&square;&nbsp;M</th>
   <td>whether the region is muted, so that it will not be heard.</td></tr>
-  <tr><th>&square; O</th>
+  <tr><th>&square;&nbsp;O</th>
   <td>whether the region is opaque; opaque regions &lsquo;block&rsquo; regions below them from being heard, whereas &lsquo;transparent&rsquo; regions have their contents mixed with whatever is underneath. </td></tr>
 </table>
 

diff --git a/master-doc.txt b/master-doc.txt
index 34c17a45d381667bc3165d7af99848090e649b5d..d3cabb45db8c7fe223c03cc9df73c67ddd5f799c 100644 (file)
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -1808,6 +1808,7 @@ part: part
 ---
 title: Controlling Ardour with OSC
 include: controlling-ardour-with-osc.html
+pdf-exclude: yes
 link: controlling-ardour-with-osc
 uri: using-control-surfaces/controlling-ardour-with-osc
 part: chapter

diff --git a/source/css/Lora-Regular.ttf b/source/css/Lora-Regular.ttf
new file mode 100644 (file)
index 0000000..5ad50b2
Binary files /dev/null and b/source/css/Lora-Regular.ttf differ

diff --git a/source/css/common.css b/source/css/common.css
index 98d12e580ef06f133d604085b912527012d245a9..528c25fb06d4f1a3328bd1e2ca8496cb1734ff0a 100644 (file)
--- a/source/css/common.css
+++ b/source/css/common.css
@@ -1,13 +1,6 @@
-@font-face {
-    font-family: 'junge-regular';
-    src: url('../css/junge-regular-webfont.ttf')  format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
+
 
 body {
-  font-family: 'junge-regular';
-  font-size: 16px;
   line-height: normal;
 }
 

diff --git a/source/css/pdf.css b/source/css/pdf.css
index 5756d56290947e88dfbe281c864aa56940c9c73d..a8d1cc149a161a9fd14cc002d9617ec8df45f375 100644 (file)
--- a/source/css/pdf.css
+++ b/source/css/pdf.css
@@ -5,21 +5,34 @@
    margin: 1.5cm 1.5cm 1.5cm 1.5cm;
 }
 
+@font-face {
+    font-family: 'lora';
+    src: url('../css/Lora-Regular.ttf')  format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
+body {
+       font-family: 'lora';
+       font-size: 12px;
+}
+
 img {
-  max-width: 100%;
+       max-width: 100%;
 }
 
 div.frontcover {
-  page-break-after: always;
+       page-break-after: always;
        margin: auto;
        width: 80%;
-       font-size: 4em;
+       font-size: 3em;
        text-align: center;
 }
 
 .frontcover #generationdate {
        font-size: .25em;
        text-align: right;
+       bottom: 3cm;
 }
 
 /* styles for the right hand spread
@@ -30,7 +43,7 @@ div.frontcover {
    @bottom-left {
        margin: 10pt 0 30pt 0;
        /*border-top: .25pt solid #666;*/
-            content: "The Ardour Manual";
+          content: "The Ardour Manual";
        font-size: 7pt;
        color: #333;
    }
@@ -55,7 +68,7 @@ div.frontcover {
    @bottom-right {
        margin: 10pt 0 30pt 0;
        /*border-top: .25pt solid #666;*/
-            content: "The Ardour Manual";
+          content: "The Ardour Manual";
        font-size: 7pt;
        color: #333;
    }
@@ -88,7 +101,7 @@ body {
 
 }
 
-h1 {
+h1, h2 {
   string-set: doctitle content(); /* get the title of the current chapter */
   page-break-before: always;
 }
@@ -100,7 +113,7 @@ h1 {
 }
 
 h1::before { /* parts */
-  counter-increment: partnum;
+       counter-increment: partnum;
        content: "Part " counter(partnum) " - ";
 }
 
@@ -130,7 +143,7 @@ h1,h2,h3,h4,h5 {
        font-weight: bold;
        page-break-after: avoid;
        page-break-inside: avoid;
-  line-height: 1.25em;
+       line-height: 1.25em;
 }
 
 h1+p, h2+p, h3+p {

diff --git a/source/css/screen.css b/source/css/screen.css
index 88c754cdb4c7f2c73c2da0ae3c58cf20b1b93567..acc41d039429d2236848d61b60582b7d884c405d 100644 (file)
--- a/source/css/screen.css
+++ b/source/css/screen.css
@@ -1,3 +1,15 @@
+@font-face {
+    font-family: 'junge-regular';
+    src: url('../css/junge-regular-webfont.ttf')  format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
+body {
+  font-family: 'junge-regular';
+  font-size: 16px;
+}
+
 
 .clear {
   clear:both;