From 9b6f5a9840688a4bf544dabf4548f570862f5f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=B6ln?= <s3bk@rynx.org>
Date: Wed, 20 Mar 2019 15:21:36 +0100
Subject: [PATCH 1/6] add Book theme (Liberation fonts need to be in /fonts/ on
 the server)

---
 src/book/init.rs                             |  3 +
 src/renderer/html_handlebars/hbs_renderer.rs |  3 +-
 src/theme/book.js                            |  6 ++
 src/theme/css/book.css                       | 68 ++++++++++++++++++++
 src/theme/index.hbs                          |  3 +-
 src/theme/mod.rs                             |  6 ++
 6 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 src/theme/css/book.css

diff --git a/src/book/init.rs b/src/book/init.rs
index 4acf4b52..4726d570 100644
--- a/src/book/init.rs
+++ b/src/book/init.rs
@@ -134,6 +134,9 @@ impl BookBuilder {
         let mut general_css = File::create(cssdir.join("general.css"))?;
         general_css.write_all(theme::GENERAL_CSS)?;
 
+        let mut book_css = File::create(cssdir.join("book.css"))?;
+        book_css.write_all(theme::BOOK_CSS)?;
+        
         let mut chrome_css = File::create(cssdir.join("chrome.css"))?;
         chrome_css.write_all(theme::CHROME_CSS)?;
 
diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs
index b5ef228d..83a47485 100644
--- a/src/renderer/html_handlebars/hbs_renderer.rs
+++ b/src/renderer/html_handlebars/hbs_renderer.rs
@@ -119,6 +119,7 @@ impl HtmlHandlebars {
 
         write_file(destination, "book.js", &theme.js)?;
         write_file(destination, "css/general.css", &theme.general_css)?;
+        write_file(destination, "css/book.css", &theme.book_css)?;
         write_file(destination, "css/chrome.css", &theme.chrome_css)?;
         write_file(destination, "css/print.css", &theme.print_css)?;
         write_file(destination, "css/variables.css", &theme.variables_css)?;
@@ -558,7 +559,7 @@ fn fix_code_blocks(html: &str) -> String {
             let after = &caps[3];
 
             format!(
-                r#"<code{before}class="{classes}"{after}>"#,
+                r#"<code{before}class="block  {classes}"{after}>"#,
                 before = before,
                 classes = classes,
                 after = after
diff --git a/src/theme/book.js b/src/theme/book.js
index 4640e8fc..9d5cc032 100644
--- a/src/theme/book.js
+++ b/src/theme/book.js
@@ -331,6 +331,12 @@ function playpen_text(playpen) {
             stylesheets.tomorrowNight.disabled = true;
             stylesheets.highlight.disabled = true;
 
+            ace_theme = "ace/theme/tomorrow_night";
+        } else if (theme == 'classic') {
+            stylesheets.ayuHighlight.disabled = true;
+            stylesheets.tomorrowNight.disabled = true;
+            stylesheets.highlight.disabled = true;
+
             ace_theme = "ace/theme/tomorrow_night";
         } else {
             stylesheets.ayuHighlight.disabled = true;
diff --git a/src/theme/css/book.css b/src/theme/css/book.css
new file mode 100644
index 00000000..a7f24a26
--- /dev/null
+++ b/src/theme/css/book.css
@@ -0,0 +1,68 @@
+@font-face {
+  font-family: "Liberation Serif";
+  src: url("/fonts/LiberationSerif-Regular.ttf");
+  font-weight: normal;
+}
+@font-face {
+  font-family: "Liberation Serif";
+  src: url("/fonts/LiberationSerif-Bold.ttf");
+  font-weight: bold;
+}
+@font-face {
+  font-family: "Liberation Serif";
+  src: url("/fonts/LiberationSerif-Italic.ttf");
+  font-style: italic;
+}
+@font-face {
+  font-family: "Liberation Mono";
+  src: url("/fonts/LiberationMono-Regular.ttf");
+  font-weight: normal;
+}
+
+body {
+    font-family: "Liberation Serif", serif;
+}
+p {
+    text-align: justify;
+    line-height: 1.25em;
+}
+code {
+    font-family: "Liberation Mono", monospace;
+}
+pre {
+    margin-left: 2em;
+}
+pre pre {
+    margin-left: 0;
+}
+pre.playpen > div.buttons {
+    float: right;
+    height: 0;
+}
+em {
+    font-style: italic;
+}
+h3::before {
+    content: "¶";
+    width: 1em;
+    display: inline-block;
+    margin-left: -1em;
+}
+h4::before {
+    content: "§";
+    width: 1em;
+    display: inline-block;
+    margin-left: -1em;
+}
+#menu-bar-sticky-container {
+    background-color: rgba(255, 255, 255, 0.8) !important;
+}
+
+@media print {
+    .bottons {
+        display: none;
+    }
+    body {
+        font-size: 11pt;
+    }
+}
diff --git a/src/theme/index.hbs b/src/theme/index.hbs
index bfe4283a..8ecf20c8 100644
--- a/src/theme/index.hbs
+++ b/src/theme/index.hbs
@@ -13,6 +13,7 @@
         <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
         <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
         <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
+        <link rel="stylesheet" href="{{ path_to_root }}css/book.css">
         <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
 
         <!-- Fonts -->
@@ -24,7 +25,6 @@
         <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
         <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
         <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
-
         <!-- Custom theme stylesheets -->
         {{#each additional_css}}
         <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
@@ -102,6 +102,7 @@
                                 <li role="none"><button role="menuitem" class="theme" id="coal">{{ theme_option "Coal" }}</button></li>
                                 <li role="none"><button role="menuitem" class="theme" id="navy">{{ theme_option "Navy" }}</button></li>
                                 <li role="none"><button role="menuitem" class="theme" id="ayu">{{ theme_option "Ayu" }}</button></li>
+                                <li role="none"><button role="menuitem" class="theme" id="book">{{ theme_option "Book" }}</button></li>
                             </ul>
                             {{#if search_enabled}}
                             <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
diff --git a/src/theme/mod.rs b/src/theme/mod.rs
index 37d373ef..22f1550e 100644
--- a/src/theme/mod.rs
+++ b/src/theme/mod.rs
@@ -15,6 +15,7 @@ pub static INDEX: &'static [u8] = include_bytes!("index.hbs");
 pub static HEADER: &'static [u8] = include_bytes!("header.hbs");
 pub static CHROME_CSS: &'static [u8] = include_bytes!("css/chrome.css");
 pub static GENERAL_CSS: &'static [u8] = include_bytes!("css/general.css");
+pub static BOOK_CSS: &'static [u8] = include_bytes!("css/book.css");
 pub static PRINT_CSS: &'static [u8] = include_bytes!("css/print.css");
 pub static VARIABLES_CSS: &'static [u8] = include_bytes!("css/variables.css");
 pub static FAVICON: &'static [u8] = include_bytes!("favicon.png");
@@ -49,6 +50,7 @@ pub struct Theme {
     pub header: Vec<u8>,
     pub chrome_css: Vec<u8>,
     pub general_css: Vec<u8>,
+    pub book_css: Vec<u8>,
     pub print_css: Vec<u8>,
     pub variables_css: Vec<u8>,
     pub favicon: Vec<u8>,
@@ -80,6 +82,7 @@ impl Theme {
                 (theme_dir.join("book.js"), &mut theme.js),
                 (theme_dir.join("css/chrome.css"), &mut theme.chrome_css),
                 (theme_dir.join("css/general.css"), &mut theme.general_css),
+                (theme_dir.join("css/book.css"), &mut theme.book_css),
                 (theme_dir.join("css/print.css"), &mut theme.print_css),
                 (
                     theme_dir.join("css/variables.css"),
@@ -121,6 +124,7 @@ impl Default for Theme {
             header: HEADER.to_owned(),
             chrome_css: CHROME_CSS.to_owned(),
             general_css: GENERAL_CSS.to_owned(),
+            book_css: BOOK_CSS.to_owned(),
             print_css: PRINT_CSS.to_owned(),
             variables_css: VARIABLES_CSS.to_owned(),
             favicon: FAVICON.to_owned(),
@@ -176,6 +180,7 @@ mod tests {
             "favicon.png",
             "css/chrome.css",
             "css/general.css",
+            "css/book.css",
             "css/print.css",
             "css/variables.css",
             "book.js",
@@ -208,6 +213,7 @@ mod tests {
             highlight_css: Vec::new(),
             tomorrow_night_css: Vec::new(),
             ayu_highlight_css: Vec::new(),
+            book_css: Vec::new(),
             highlight_js: Vec::new(),
             clipboard_js: Vec::new(),
         };

From 9c8fae4704ee620921e4c4d8d7d5cba032353f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=B6ln?= <s3bk@rynx.org>
Date: Wed, 20 Mar 2019 15:36:40 +0100
Subject: [PATCH 2/6] fix forgotten rename

---
 src/theme/book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/theme/book.js b/src/theme/book.js
index 9d5cc032..b16c7886 100644
--- a/src/theme/book.js
+++ b/src/theme/book.js
@@ -332,7 +332,7 @@ function playpen_text(playpen) {
             stylesheets.highlight.disabled = true;
 
             ace_theme = "ace/theme/tomorrow_night";
-        } else if (theme == 'classic') {
+        } else if (theme == 'book') {
             stylesheets.ayuHighlight.disabled = true;
             stylesheets.tomorrowNight.disabled = true;
             stylesheets.highlight.disabled = true;

From 3faa3e42f0da24fefe16e44ef44bf4b986f75ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=B6ln?= <s3bk@rynx.org>
Date: Wed, 20 Mar 2019 16:34:19 +0100
Subject: [PATCH 3/6] switch to Source font family

---
 src/theme/css/book.css | 26 +++-----------------------
 src/theme/index.hbs    |  2 +-
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/theme/css/book.css b/src/theme/css/book.css
index a7f24a26..fa541039 100644
--- a/src/theme/css/book.css
+++ b/src/theme/css/book.css
@@ -1,33 +1,13 @@
-@font-face {
-  font-family: "Liberation Serif";
-  src: url("/fonts/LiberationSerif-Regular.ttf");
-  font-weight: normal;
-}
-@font-face {
-  font-family: "Liberation Serif";
-  src: url("/fonts/LiberationSerif-Bold.ttf");
-  font-weight: bold;
-}
-@font-face {
-  font-family: "Liberation Serif";
-  src: url("/fonts/LiberationSerif-Italic.ttf");
-  font-style: italic;
-}
-@font-face {
-  font-family: "Liberation Mono";
-  src: url("/fonts/LiberationMono-Regular.ttf");
-  font-weight: normal;
-}
-
 body {
-    font-family: "Liberation Serif", serif;
+    font-family: "Source Serif Pro", serif;
 }
 p {
     text-align: justify;
     line-height: 1.25em;
 }
 code {
-    font-family: "Liberation Mono", monospace;
+    font-family: "Source Code Pro", monospace;
+    padding: 0 0 1pt 0 !important;
 }
 pre {
     margin-left: 2em;
diff --git a/src/theme/index.hbs b/src/theme/index.hbs
index 8ecf20c8..eeb90501 100644
--- a/src/theme/index.hbs
+++ b/src/theme/index.hbs
@@ -19,7 +19,7 @@
         <!-- Fonts -->
         <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
         <link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
-        <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500" rel="stylesheet" type="text/css">
+        <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro|Source+Serif+Pro" rel="stylesheet">
 
         <!-- Highlight.js Stylesheets -->
         <link rel="stylesheet" href="{{ path_to_root }}highlight.css">

From 6a2e2461fb0b718893f9d337e5c6fe9ca29234b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=B6ln?= <s3bk@rynx.org>
Date: Wed, 20 Mar 2019 17:02:05 +0100
Subject: [PATCH 4/6] quote inline code

---
 src/theme/css/book.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/theme/css/book.css b/src/theme/css/book.css
index fa541039..61281049 100644
--- a/src/theme/css/book.css
+++ b/src/theme/css/book.css
@@ -7,8 +7,17 @@ p {
 }
 code {
     font-family: "Source Code Pro", monospace;
+    padding: 0 !important;
+}
+code:not(.block) {
     padding: 0 0 1pt 0 !important;
 }
+code:not(.block)::before {
+    content: '‘';
+}
+code:not(.block)::after {
+    content: '’';
+}
 pre {
     margin-left: 2em;
 }

From d2470730fc2dd0a9c183d5101eefa4bdb29bea53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=B6ln?= <s3bk@rynx.org>
Date: Wed, 20 Mar 2019 22:13:12 +0100
Subject: [PATCH 5/6] center book title

---
 src/theme/css/book.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/theme/css/book.css b/src/theme/css/book.css
index 61281049..e6c270e1 100644
--- a/src/theme/css/book.css
+++ b/src/theme/css/book.css
@@ -43,6 +43,14 @@ h4::before {
     display: inline-block;
     margin-left: -1em;
 }
+.left-buttons {
+    position: absolute;
+}
+.right-buttons {
+    position: absolute;
+    right: 0;
+}
+    
 #menu-bar-sticky-container {
     background-color: rgba(255, 255, 255, 0.8) !important;
 }

From 9243cf9d958b50a7ce5ed25282f5c8967aec30b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=B6ln?= <s3bk@rynx.org>
Date: Thu, 21 Mar 2019 07:56:48 +0100
Subject: [PATCH 6/6] well. typo

---
 src/theme/css/book.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/theme/css/book.css b/src/theme/css/book.css
index e6c270e1..e129bf81 100644
--- a/src/theme/css/book.css
+++ b/src/theme/css/book.css
@@ -56,7 +56,7 @@ h4::before {
 }
 
 @media print {
-    .bottons {
+    .menu-bar, .buttons {
         display: none;
     }
     body {