Fixed some formatting, and improved blockstyle plugin behaviour

Author: benjymous

cspell.json

@@ -45,7 +45,6 @@
     "Alderdice",
     "Alecto",
     "Aleister",
-    "Alexx",
     "Algoa",
     "Alianora",
     "Alianore",
@@ -115,7 +114,6 @@
     "Averoigne",
     "Avgvst",
     "Avitu",
-    "Awww",
     "Aziraphale",
     "Babd",
     "Bacchante",
@@ -161,7 +159,6 @@
     "Bituah",
     "Bizarro",
     "Bizarros",
-    "blech",
     "Blinken",
     "bloodlust",
     "Blyenberch",
@@ -171,7 +168,6 @@
     "Bonchance",
     "Boneville",
     "booful",
-    "Booful",
     "Boonville",
     "Borghal",
     "bossom",
@@ -187,7 +183,6 @@
     "Brevard",
     "Brobakk",
     "Brookner",
-    "BROWNVM",
     "Bruells",
     "Brujeria",
     "Brust",
@@ -328,6 +323,7 @@
     "Desa",
     "dessine'e",
     "Dickon",
+    "dieth",
     "digg'd",
     "Dimuzi",
     "Dippold",
@@ -581,7 +577,6 @@
     "Hirsch",
     "hissy",
     "Hitchin",
-    "hmmmmmmm",
     "Hobbiton",
     "Hodgson",
     "Hoffmann",
@@ -642,6 +637,7 @@
     "Jarocha",
     "Jasinski",
     "JASINSKI",
+    "Jazzercise",
     "Jeremiel",
     "Jessamy",
     "Jhemon",
@@ -1468,6 +1464,7 @@
     "Winsor",
     "wisewoman",
     "Wissenschaft",
+    "witchmark",
     "Witkin",
     "Woch",
     "Wolfman",
@@ -1506,10 +1503,15 @@
     "Zwanger"
   ],
   "ignoreWords": [
-    "ABAAABAB"
+    "ABAAABAB",
+    "Alexx",
+    "Aww",
+    "benjymous",
+    "blech",
+    "BROWNVM",
+    "hmmmmmmm",
+    "Walkin"
   ],
   "import": [],
-  "files": [
-    "sandman/*.md"
-  ]
+  "files": ["sandman/*.md"]
 }

package.json

@@ -3,7 +3,7 @@
     "build": "honkit build",
     "build-pdf": "honkit pdf ./ ./_publish/annotations.pdf",
     "serve": "honkit serve",
-    "spell": "npx cspell sandman",
+    "spell": "npx cspell sandman/*.md",
     "prettier": "npx prettier sandman/*.md -w"
   },
   "devDependencies": {

plugins/BlockClasses/index.js

@@ -7,10 +7,16 @@ var applyBlockquoteClass = function (page) {
   $("blockquote").each(function () {
     const blockquote = this;
 
+    const replacement = $("<div></div>");
+
     let addedClass = false;
     $(this)
       .find("p")
       .each(function () {
+        const paragraph = this;
+
+        $(blockquote).remove(paragraph);
+
         var data = $(this).contents()[0].data;
         if (data) {
           var check = data.trim();
@@ -20,14 +26,26 @@ var applyBlockquoteClass = function (page) {
           const m = regex.exec(check);
 
           if (m) {
+
+            const newblock = $("<blockquote></blockquote>");
+            newblock.addClass("classedBlock")
+
+            $(paragraph).wrap(newblock);
+
+            $(replacement).append(newblock);
+
             const val = m[1];
-            $(blockquote).addClass(val);
+            $(newblock).addClass(val);
             $(this).contents()[0].data = data.replace(regex, "");
             addedClass = true;
+
+            replacement.append(newblock);
           }
         }
       });
-    if (addedClass) $(this).addClass("classedBlock");
+    if (addedClass) {
+      $(blockquote).replaceWith(replacement);
+    }
   });
 
   page.content = $.html();

sandman/README.md

@@ -6,7 +6,7 @@
 
 Originally written, compiled and edited by Greg Morrow and David Goldfarb. Updated and revised edition by Richard Munn.
 
-This is the 'refreshed' Sandman Annotations (not to be confused with the hardback Annotated Sandman books published by DC themselves.)   These annotations date back to the 80s-90s and were published usenet, Compuserve, Genie, and other services that have long been forgotten by the 21st century.
+This is the 'refreshed' Sandman Annotations (not to be confused with the hardback Annotated Sandman books published by DC themselves.) These annotations date back to the 80s-90s and were published usenet, Compuserve, Genie, and other services that have long been forgotten by the 21st century.
 
 This is now licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](http://creativecommons.org/licenses/by-nc-sa/4.0/), which differs from the original licensing, but I hope follows the original spirit.
 
@@ -15,25 +15,26 @@ This is now licensed under a [Creative Commons Attribution-NonCommercial-ShareAl
 #### Contributions
 
 This is a living community document, and is open to edits and suggestions - these can be done by:
+
 - Make a comment on [reddit](https://www.reddit.com/r/Sandman/), and tag me ([/u/benjymous](https://www.reddit.com/user/benjymous)) in to the discussion.
 - Raise an issue on the [github issues tracker](https://github.com/benjymous/annotations/issues).
 - Make the [edits yourself](https://github.com/benjymous/annotations/) and raise a pull request.
 
 #### What needs doing?
 
-- These annotations were largely written at the time the original issues were published, and so will explain references that might be obscure to an early 90s reader.   Obviously time has passed since then, and there are likely _lots_ of references that may be baffling to someone in the 2020s.  If you spot any of those, please see if you can add a comment.
+- These annotations were largely written at the time the original issues were published, and so will explain references that might be obscure to an early 90s reader. Obviously time has passed since then, and there are likely _lots_ of references that may be baffling to someone in the 2020s. If you spot any of those, please see if you can add a comment.
 
 - The annotations are a bit unevenly edited in places - editing things to have a more passive voice might be a good idea.
 
 - Check the editing/reformatting - the most recent version of the original text versions still live on the [MIT servers](http://theory.csail.mit.edu/ftp-data/pub/ftp/ftp/people/wald/sandman/) so it'd be good for a second set of eyes to check the translation from .txt to markdown hasn't mangled or lost anything important.
 
-- Ideally someone should be able to read these annotations alongside their first ever read of the comic - we shouldn't assume people are coming to this after reading the whole thing.   They might not have read anything yet, and want clarification on something in the Netflix show or Audible adaptation.   This means we aught to be careful with spoilers, and try and edit out any that are already here.
+- Ideally someone should be able to read these annotations alongside their first ever read of the comic - we shouldn't assume people are coming to this after reading the whole thing. They might not have read anything yet, and want clarification on something in the Netflix show or Audible adaptation. This means we aught to be careful with spoilers, and try and edit out any that are already here.
 
-- Originally these were just text files (they pre-date the world wide web, and html), so enriching the pages with photo references helps.  If a real world person, place or thing is mentioned or depicted, it'd be nice to add some reference images.   Likewise linking in wikipedia articles (or other reference material) would be helpful.
+- Originally these were just text files (they pre-date the world wide web, and html), so enriching the pages with photo references helps. If a real world person, place or thing is mentioned or depicted, it'd be nice to add some reference images. Likewise linking in wikipedia articles (or other reference material) would be helpful.
 
-- Neil Gaiman has blogged, tweeted, given many interviews, and much more in the last ~30+ years.  Adding any additional information from him would be really helpful.
+- Neil Gaiman has blogged, tweeted, given many interviews, and much more in the last ~30+ years. Adding any additional information from him would be really helpful.
 
-- The annotations for the last 25-ish issues are much less detailed than the earlier ones.   This seems to be when Greg Morrow (the original editor) stepped away.
+- The annotations for the last 25-ish issues are much less detailed than the earlier ones. This seems to be when Greg Morrow (the original editor) stepped away.
 
 - They currently stop at Issue #75, and don't cover _Endless Nights_, _The Dream Hunters_ or _Overture_.
 

sandman/sandman-how-met.md

@@ -9,9 +9,9 @@
 
 > [marginThumb] ![](thumbnails/sandman-how-met/page01.jpg)
 
-- #### Panel 1
+> [floatright width-30pc] ![How They Met Themselves](images/HowTheyMetThemselves.jpg)
 
-> [floatright width-30pc shift-up] ![How They Met Themselves](images/HowTheyMetThemselves.jpg)
+- #### Panel 1
 
   The drawing is "How They Met Themselves" by [Dante Gabriel Rossetti](https://en.wikipedia.org/wiki/Dante_Gabriel_Rossetti) after which this short story is named.
 

sandman/sandman-vertigojam1.md

@@ -7,22 +7,21 @@
 
 **Note**: One of the few times The Sandman isn't lettered by Todd Klein.
 
-
 ### Page 1
 
 > [marginThumb] ![page 1](thumbnails/sandman-vertigojam1/page01.jpg)
 
 - #### Panels 1-3
 
-  Anyone fancy taking a stab at analyzing this dream?  Attacked by giant faceless (brainless?) women ridden by wolves?
+  Anyone fancy taking a stab at analyzing this dream? Attacked by giant faceless (brainless?) women ridden by wolves?
 
 ### Page 2
 
 > [marginThumb] ![page 2](thumbnails/sandman-vertigojam1/page02.jpg)
 
 - #### Panel 5
 
-  Everyone has a book inside them.  And so everyone has a book in Lucien's Library.
+  Everyone has a book inside them. And so everyone has a book in Lucien's Library.
 
 - #### Panel 6
 

sandman/sandman.02.md

@@ -225,7 +225,6 @@
 
   So that's why there's bad blood I guess. Not between Morpheus and all incarnations of the Three (well…), but the Hecateae specifically. How and where he should have helped—who knows, but god(esses) are born and die in the Dreaming, so to speak, so it would probably always be possible to find a connection that way. It was probably just to tie everything that was happening in the wider DC Universe at the time together.
 
-
 ### Page 21
 
 > [marginThumb] ![page 21](thumbnails/sandman.02/page21.jpg)

sandman/sandman.05.md

@@ -143,7 +143,7 @@
 
 - #### Panel 4
 
-  [Hermeticism](https://en.wikipedia.org/wiki/Hermeticism) is a system of beliefs based on the teachings of Hermes Trismegistus, a mythical figure who combined the aspects of the Greek god Hermes and the Egyptian god Thoth. It involves topics such as magic, astrology, alchemy, and spiritual development. 
+  [Hermeticism](https://en.wikipedia.org/wiki/Hermeticism) is a system of beliefs based on the teachings of Hermes Trismegistus, a mythical figure who combined the aspects of the Greek god Hermes and the Egyptian god Thoth. It involves topics such as magic, astrology, alchemy, and spiritual development.
 
 ### Page 17
 

sandman/sandman.13.md

@@ -333,7 +333,7 @@ Neil Gaiman visited Perth in April 1996, and said there was a major anachronism
 
 - #### Panel 4
 
-  Lovely slang here.  According to [Green's Dictionary of Slang](https://greensdictofslang.com/entry/e2a67va), **chickaleary** is an adjective that means **artful, knowing**. It is usually used as chickaleary cove, which means **an artful, knowing, 'clever' fellow**. The word may have originated from a combination of cheeky, leery and cove, and was popularized by a music-hall song.
+  Lovely slang here. According to [Green's Dictionary of Slang](https://greensdictofslang.com/entry/e2a67va), **chickaleary** is an adjective that means **artful, knowing**. It is usually used as chickaleary cove, which means **an artful, knowing, 'clever' fellow**. The word may have originated from a combination of cheeky, leery and cove, and was popularized by a music-hall song.
 
 - #### Panel 5
 

sandman/sandman.14.md

@@ -275,7 +275,6 @@
 
   The song is "[Wild Thing](https://www.youtube.com/watch?v=gSWInYFVksg)", by the Troggs.
 
-
 ### Page 25
 
 > [marginThumb] ![page 25](thumbnails/sandman.14/page25.jpg)
@@ -318,7 +317,7 @@
 
 - #### left top
 
-  The original script said _"I used to masturbate..."_ but this was changed.  According to The Sandman Companion, Karen Berger told him _"People don't masturbate in the DC Universe."_  This was restored in the Audible version.
+  The original script said _"I used to masturbate..."_ but this was changed. According to The Sandman Companion, Karen Berger told him _"People don't masturbate in the DC Universe."_ This was restored in the Audible version.
 
 - #### middle top.
 
@@ -407,4 +406,4 @@
 - Beth Winter <renfri@astercity.net> for the Don't look now reference.
 - bignickl@swbell.net noted Chris Carter's cameo.
 - Ralf Hildebrandt added more details.
-- Richard Munn added details too.
+- Richard Munn added details too.