From c5a61ffdd836c551426a200334814e30333b742a Mon Sep 17 00:00:00 2001
From: Scott Vandehey <fake-scott@spaceninja.com>
Date: Fri, 11 Aug 2023 14:08:47 -0700
Subject: [PATCH] better url structure

---
 .eleventy.js                        |  5 +----
 package.json                        |  1 -
 src/_data/parts.json                |  8 ++++++++
 src/_includes/chapter.njk           | 25 +++++++++++++++++++++++++
 src/_includes/layout.njk            |  6 +++---
 src/_scss/theme.scss                |  8 ++++++++
 src/index.njk                       |  9 ++++-----
 src/{1-1.md => part-1/chapter-1.md} | 17 ++++-------------
 src/{1-2.md => part-1/chapter-2.md} | 10 ++++------
 src/{1-3.md => part-1/chapter-3.md} | 10 ++++------
 src/{1-4.md => part-1/chapter-4.md} | 10 ++++------
 src/{1-5.md => part-1/chapter-5.md} | 10 ++++------
 src/{1-6.md => part-1/chapter-6.md} | 10 ++++------
 src/{1-7.md => part-1/chapter-7.md} | 10 ++++------
 src/part-1/index.njk                | 25 +++++++++++++++++++++++++
 src/part-1/part-1.11tydata.json     |  3 +++
 src/{2-1.md => part-2/chapter-1.md} | 15 +++++----------
 src/{2-2.md => part-2/chapter-2.md} | 10 ++++------
 src/{2-3.md => part-2/chapter-3.md} | 10 ++++------
 src/{2-4.md => part-2/chapter-4.md} | 10 ++++------
 src/{2-5.md => part-2/chapter-5.md} | 10 ++++------
 src/{2-6.md => part-2/chapter-6.md} | 10 ++++------
 src/{2-7.md => part-2/chapter-7.md} |  8 +++-----
 src/part-2/index.njk                | 25 +++++++++++++++++++++++++
 src/part-2/part-2.11tydata.json     |  3 +++
 yarn.lock                           |  5 -----
 26 files changed, 161 insertions(+), 112 deletions(-)
 create mode 100644 src/_data/parts.json
 create mode 100644 src/_includes/chapter.njk
 rename src/{1-1.md => part-1/chapter-1.md} (98%)
 rename src/{1-2.md => part-1/chapter-2.md} (99%)
 rename src/{1-3.md => part-1/chapter-3.md} (99%)
 rename src/{1-4.md => part-1/chapter-4.md} (99%)
 rename src/{1-5.md => part-1/chapter-5.md} (99%)
 rename src/{1-6.md => part-1/chapter-6.md} (99%)
 rename src/{1-7.md => part-1/chapter-7.md} (99%)
 create mode 100644 src/part-1/index.njk
 create mode 100644 src/part-1/part-1.11tydata.json
 rename src/{2-1.md => part-2/chapter-1.md} (99%)
 rename src/{2-2.md => part-2/chapter-2.md} (99%)
 rename src/{2-3.md => part-2/chapter-3.md} (99%)
 rename src/{2-4.md => part-2/chapter-4.md} (99%)
 rename src/{2-5.md => part-2/chapter-5.md} (99%)
 rename src/{2-6.md => part-2/chapter-6.md} (99%)
 rename src/{2-7.md => part-2/chapter-7.md} (99%)
 create mode 100644 src/part-2/index.njk
 create mode 100644 src/part-2/part-2.11tydata.json

diff --git a/.eleventy.js b/.eleventy.js
index 335d222..cd20e1d 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -1,5 +1,4 @@
 const markdownIt = require('markdown-it');
-const markdownItAnchor = require('markdown-it-anchor');
 const markdownItFootnote = require('markdown-it-footnote');
 
 module.exports = function (eleventyConfig) {
@@ -15,9 +14,7 @@ module.exports = function (eleventyConfig) {
   let options = {
     html: true,
   };
-  let markdownLibrary = markdownIt(options)
-    .use(markdownItAnchor)
-    .use(markdownItFootnote);
+  let markdownLibrary = markdownIt(options).use(markdownItFootnote);
   eleventyConfig.setLibrary('md', markdownLibrary);
 
   return {
diff --git a/package.json b/package.json
index ba5200e..d48d31e 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
   },
   "devDependencies": {
     "@11ty/eleventy": "2.0.1",
-    "markdown-it-anchor": "8.6.7",
     "markdown-it-footnote": "3.0.3",
     "npm-run-all": "4.1.5",
     "prettier": "3.0.1",
diff --git a/src/_data/parts.json b/src/_data/parts.json
new file mode 100644
index 0000000..6e381c2
--- /dev/null
+++ b/src/_data/parts.json
@@ -0,0 +1,8 @@
+{
+  "I": {
+    "title": "(Being a Reprint from the Reminiscences of John H. Watson, M.D., late of the Army Medical Department.)"
+  },
+  "II": {
+    "title": "The Country of the Saints."
+  }
+}
diff --git a/src/_includes/chapter.njk b/src/_includes/chapter.njk
new file mode 100644
index 0000000..3e18bde
--- /dev/null
+++ b/src/_includes/chapter.njk
@@ -0,0 +1,25 @@
+---
+layout: layout.njk
+---
+
+{% if showPartTitle %}
+  <header class="part-header">
+    <h2
+      id="pt-{{ currentPart}}"
+      >
+      Part {{ currentPart }}.
+    </h2>
+    <p><em>{{ parts[currentPart].title }}</em></p>
+  </header>
+  <hr>
+{% endif %}
+
+<h3
+  class="chapter-title"
+  id="ch-{{ chapter }}-{{ title | slugify }}"
+  >
+  <strong>Chapter {{ chapter }}:</strong>
+  {{ title }}
+</h3>
+
+{{ content | safe }}
diff --git a/src/_includes/layout.njk b/src/_includes/layout.njk
index efe185f..88ebdd1 100644
--- a/src/_includes/layout.njk
+++ b/src/_includes/layout.njk
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>{{ title }} - A Study in Scarlet</title>
+  <title>{% if chapter %}Chapter {{ chapter }}: {% endif %}{{ title }}{% if title %}, {% endif %}A Study in Scarlet</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@@ -23,7 +23,7 @@
   </main>
   <hr />
   <footer class="footer">
-    {% if show_nav %}
+    {% if showNav %}
     <nav class="chapter-nav">
       <div class="chapter-nav__item chapter-nav__prev{% if not prev %} is-disabled{% endif %}">
         {% if prev %}
@@ -33,7 +33,7 @@
         {% endif %}
       </div>
       <div class="chapter-nav__item chapter-nav__toc">
-        <a class="chapter-nav__link" href="../">Table of Contents</a>
+        <a class="chapter-nav__link" href="/">Table of Contents</a>
       </div>
       <div class="chapter-nav__item chapter-nav__next{% if not next %} is-disabled{% endif %}">
         {% if next %}
diff --git a/src/_scss/theme.scss b/src/_scss/theme.scss
index fd943b7..14e4823 100644
--- a/src/_scss/theme.scss
+++ b/src/_scss/theme.scss
@@ -132,6 +132,14 @@ figcaption {
   text-align: center;
 }
 
+.chapter-title {
+  text-align: center;
+
+  strong {
+    display: block;
+  }
+}
+
 .chapter-nav {
   display: flex;
   gap: 1em;
diff --git a/src/index.njk b/src/index.njk
index 6495c5e..eda182f 100644
--- a/src/index.njk
+++ b/src/index.njk
@@ -1,10 +1,9 @@
 ---
 layout: layout.njk
-title: A Study in Scarlet
 main_class: toc
 ---
 
-<h1>A Study in Scarlet</h1>
+<h1 id="a-study-in-scarlet">A Study in Scarlet</h1>
 <p class="credits">By A. Conan Doyle</p>
 <p class="credits">With numerous original engravings by D.H. Friston.</p>
 
@@ -20,13 +19,13 @@ main_class: toc
   </figcaption>
 </figure>
 
-<h2>Contents</h2>
+<h2 id="contents">Contents</h2>
 
 <section>
   <header class="toc-header">
     <h3>Part I.</h3>
     <p>
-      <i>(Being a Reprint from the Reminiscences of <em>John H. Watson, M.D.</em>, late of the Army Medical Department.)</i>
+      <i>{{ parts['I'].title }}</i>
     </p>
   </header>
   <ol type="I">
@@ -44,7 +43,7 @@ main_class: toc
   <header class="toc-header">
     <h3>Part II.</h3>
     <p>
-      <i>The Country of the Saints.</i>
+      <i>{{ parts['I'].title }}</i>
     </p>
   </header>
   <ol type="I">
diff --git a/src/1-1.md b/src/part-1/chapter-1.md
similarity index 98%
rename from src/1-1.md
rename to src/part-1/chapter-1.md
index cddf71c..2f1b83f 100644
--- a/src/1-1.md
+++ b/src/part-1/chapter-1.md
@@ -1,25 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: I
 title: Mr. Sherlock Holmes
 tags:
   - chapters
   - partOne
 date: 1887-01-01
-show_nav: true
-next: 1-2
+showNav: true
+showPartTitle: true
+next: chapter-2
 ---
 
-<header class="part-header">
-
-## Part I.
-
-_(Being a Reprint from the Reminiscences of *John H. Watson, M.D.*, late of the Army Medical Department.)_
-
-</header>
-
-### Chapter {{chapter}}: {{ title }}
-
 In the year 1878 I took my degree of Doctor of Medicine of the University of London, and proceeded to Netley to go through the course prescribed for surgeons in the army. Having completed my studies there, I was duly attached to the Fifth Northumberland Fusiliers as Assistant Surgeon. The regiment was stationed in India at the time, and before I could join it, the second Afghan war had broken out. On landing at Bombay, I learned that my corps had advanced through the passes, and was already deep in the enemy’s country. I followed, however, with many other officers who were in the same situation as myself, and succeeded in reaching Candahar in safety, where I found my regiment, and at once entered upon my new duties.
 
 The campaign brought honours and promotion to many, but for me it had nothing but misfortune and disaster. I was removed from my brigade and attached to the Berkshires, with whom I served at the fatal battle of Maiwand. There I was struck on the shoulder by a Jezail bullet, which shattered the bone and grazed the subclavian artery. I should have fallen into the hands of the murderous Ghazis had it not been for the devotion and courage shown by Murray, my orderly, who threw me across a pack-horse, and succeeded in bringing me safely to the British lines.
diff --git a/src/1-2.md b/src/part-1/chapter-2.md
similarity index 99%
rename from src/1-2.md
rename to src/part-1/chapter-2.md
index 0fcd0ee..02c6bf5 100644
--- a/src/1-2.md
+++ b/src/part-1/chapter-2.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: II
 title: The Science of Deduction
 tags:
   - chapters
   - partOne
 date: 1887-01-02
-show_nav: true
-prev: 1-1
-next: 1-3
+showNav: true
+prev: chapter-1
+next: chapter-3
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 We met next day as he had arranged, and inspected the rooms at No. 221B, Baker Street, of which he had spoken at our meeting. They consisted of a couple of comfortable bed-rooms and a single large airy sitting-room, cheerfully furnished, and illuminated by two broad windows. So desirable in every way were the apartments, and so moderate did the terms seem when divided between us, that the bargain was concluded upon the spot, and we at once entered into possession. That very evening I moved my things round from the hotel, and on the following morning Sherlock Holmes followed me with several boxes and portmanteaus. For a day or two we were busily employed in unpacking and laying out our property to the best advantage. That done, we gradually began to settle down and to accommodate ourselves to our new surroundings.
 
 Holmes was certainly not a difficult man to live with. He was quiet in his ways, and his habits were regular. It was rare for him to be up after ten at night, and he had invariably breakfasted and gone out before I rose in the morning. Sometimes he spent his day at the chemical laboratory, sometimes in the dissecting-rooms, and occasionally in long walks, which appeared to take him into the lowest portions of the City. Nothing could exceed his energy when the working fit was upon him; but now and again a reaction would seize him, and for days on end he would lie upon the sofa in the sitting-room, hardly uttering a word or moving a muscle from morning to night. On these occasions I have noticed such a dreamy, vacant expression in his eyes, that I might have suspected him of being addicted to the use of some narcotic, had not the temperance and cleanliness of his whole life forbidden such a notion.
diff --git a/src/1-3.md b/src/part-1/chapter-3.md
similarity index 99%
rename from src/1-3.md
rename to src/part-1/chapter-3.md
index a538760..dfc6724 100644
--- a/src/1-3.md
+++ b/src/part-1/chapter-3.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: III
 title: The Lauriston Gardens Mystery
 tags:
   - chapters
   - partOne
 date: 1887-01-03
-show_nav: true
-prev: 1-2
-next: 1-4
+showNav: true
+prev: chapter-2
+next: chapter-4
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 I confess that I was considerably startled by this fresh proof of the practical nature of my companion’s theories. My respect for his powers of analysis increased wondrously. There still remained some lurking suspicion in my mind, however, that the whole thing was a pre-arranged episode, intended to dazzle me, though what earthly object he could have in taking me in was past my comprehension. When I looked at him he had finished reading the note, and his eyes had assumed the vacant, lack-lustre expression which showed mental abstraction.
 
 “How in the world did you deduce that?” I asked.
diff --git a/src/1-4.md b/src/part-1/chapter-4.md
similarity index 99%
rename from src/1-4.md
rename to src/part-1/chapter-4.md
index b819bef..eb73031 100644
--- a/src/1-4.md
+++ b/src/part-1/chapter-4.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: IV
 title: What John Rance had to Tell
 tags:
   - chapters
   - partOne
 date: 1887-01-04
-show_nav: true
-prev: 1-3
-next: 1-5
+showNav: true
+prev: chapter-3
+next: chapter-5
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 It was one o’clock when we left No. 3, Lauriston Gardens. Sherlock Holmes led me to the nearest telegraph office, whence he dispatched a long telegram. He then hailed a cab, and ordered the driver to take us to the address given us by Lestrade.
 
 “There is nothing like first hand evidence,” he remarked; “as a matter of fact, my mind is entirely made up upon the case, but still we may as well learn all that is to be learned.”
diff --git a/src/1-5.md b/src/part-1/chapter-5.md
similarity index 99%
rename from src/1-5.md
rename to src/part-1/chapter-5.md
index d441158..f98d6f0 100644
--- a/src/1-5.md
+++ b/src/part-1/chapter-5.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: V
 title: Our Advertisement Brings a Visitor
 tags:
   - chapters
   - partOne
 date: 1887-01-05
-show_nav: true
-prev: 1-4
-next: 1-6
+showNav: true
+prev: chapter-4
+next: chapter-6
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 Our morning’s exertions had been too much for my weak health, and I was tired out in the afternoon. After Holmes’ departure for the concert, I lay down upon the sofa and endeavoured to get a couple of hours’ sleep. It was a useless attempt. My mind had been too much excited by all that had occurred, and the strangest fancies and surmises crowded into it. Every time that I closed my eyes I saw before me the distorted baboon-like countenance of the murdered man. So sinister was the impression which that face had produced upon me that I found it difficult to feel anything but gratitude for him who had removed its owner from the world. If ever human features bespoke vice of the most malignant type, they were certainly those of Enoch J. Drebber, of Cleveland. Still I recognized that justice must be done, and that the depravity of the victim was no condonement in the eyes of the law.
 
 The more I thought of it the more extraordinary did my companion’s hypothesis, that the man had been poisoned, appear. I remembered how he had sniffed his lips, and had no doubt that he had detected something which had given rise to the idea. Then, again, if not poison, what had caused the man’s death, since there was neither wound nor marks of strangulation? But, on the other hand, whose blood was that which lay so thickly upon the floor? There were no signs of a struggle, nor had the victim any weapon with which he might have wounded an antagonist. As long as all these questions were unsolved, I felt that sleep would be no easy matter, either for Holmes or myself. His quiet self-confident manner convinced me that he had already formed a theory which explained all the facts, though what it was I could not for an instant conjecture.
diff --git a/src/1-6.md b/src/part-1/chapter-6.md
similarity index 99%
rename from src/1-6.md
rename to src/part-1/chapter-6.md
index dd161c9..305bf2a 100644
--- a/src/1-6.md
+++ b/src/part-1/chapter-6.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: VI
 title: Tobias Gregson Shows What he Can do
 tags:
   - chapters
   - partOne
 date: 1887-01-06
-show_nav: true
-prev: 1-5
-next: 1-7
+showNav: true
+prev: chapter-5
+next: chapter-7
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 The papers next day were full of the “Brixton Mystery,” as they termed it. Each had a long account of the affair, and some had leaders upon it in addition. There was some information in them which was new to me. I still retain in my scrap-book numerous clippings and extracts bearing upon the case. Here is a condensation of a few of them:—
 
 The _Daily Telegraph_ remarked that in the history of crime there had seldom been a tragedy which presented stranger features. The German name of the victim, the absence of all other motive, and the sinister inscription on the wall, all pointed to its perpetration by political refugees and revolutionists. The Socialists had many branches in America, and the deceased had, no doubt, infringed their unwritten laws, and been tracked down by them. After alluding airily to the Vehmgericht, aqua tofana, Carbonari, the Marchioness de Brinvilliers, the Darwinian theory, the principles of Malthus, and the Ratcliff Highway murders, the article concluded by admonishing the Government and advocating a closer watch over foreigners in England.
diff --git a/src/1-7.md b/src/part-1/chapter-7.md
similarity index 99%
rename from src/1-7.md
rename to src/part-1/chapter-7.md
index 05a6026..aef197e 100644
--- a/src/1-7.md
+++ b/src/part-1/chapter-7.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: VII
 title: Light in the Darkness
 tags:
   - chapters
   - partOne
 date: 1887-01-07
-show_nav: true
-prev: 1-6
-next: 2-1
+showNav: true
+prev: chapter-6
+next: ../part-2/chapter-1
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 The intelligence with which Lestrade greeted us was so momentous and so unexpected, that we were all three fairly dumfoundered. Gregson sprang out of his chair and upset the remainder of his whiskey and water. I stared in silence at Sherlock Holmes, whose lips were compressed and his brows drawn down over his eyes.
 
 “Stangerson too!” he muttered. “The plot thickens.”
diff --git a/src/part-1/index.njk b/src/part-1/index.njk
new file mode 100644
index 0000000..f94c2c6
--- /dev/null
+++ b/src/part-1/index.njk
@@ -0,0 +1,25 @@
+---
+layout: layout.njk
+eleventyComputed:
+  title: 'Part {{ currentPart }}'
+---
+
+<h2>Contents</h2>
+
+<section>
+  <header class="toc-header">
+    <h3>Part {{ currentPart }}.</h3>
+    <p>
+      <i>{{ parts[currentPart].title }}</i>
+    </p>
+  </header>
+  <ol type="I">
+    {% for chapter in collections.partOne %}
+      <li>
+        <a href="{{ chapter.page.url }}">
+          {{ chapter.data.title }}
+        </a>
+      </li>
+    {% endfor %}
+  </ol>
+</section>
diff --git a/src/part-1/part-1.11tydata.json b/src/part-1/part-1.11tydata.json
new file mode 100644
index 0000000..e72183b
--- /dev/null
+++ b/src/part-1/part-1.11tydata.json
@@ -0,0 +1,3 @@
+{
+  "currentPart": "I"
+}
diff --git a/src/2-1.md b/src/part-2/chapter-1.md
similarity index 99%
rename from src/2-1.md
rename to src/part-2/chapter-1.md
index cd14e23..a6dcee0 100644
--- a/src/2-1.md
+++ b/src/part-2/chapter-1.md
@@ -1,22 +1,17 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: I
 title: On the Great Alkali Plain
 tags:
   - chapters
   - partTwo
 date: 1887-02-01
-show_nav: true
-prev: 1-7
-next: 2-2
+showNav: true
+showPartTitle: true
+prev: ../part-1/chapter-7
+next: chapter-2
 ---
 
-## Part II.
-
-_The Country of the Saints._
-
-### Chapter {{chapter}}: {{ title }}
-
 In the central portion of the great North American Continent there lies an arid and repulsive desert, which for many a long year served as a barrier against the advance of civilisation. From the Sierra Nevada to Nebraska, and from the Yellowstone River in the north to the Colorado upon the south, is a region of desolation and silence. Nor is Nature always in one mood throughout this grim district. It comprises snow-capped and lofty mountains, and dark and gloomy valleys. There are swift-flowing rivers which dash through jagged cañons; and there are enormous plains, which in winter are white with snow, and in summer are grey with the saline alkali dust. They all preserve, however, the common characteristics of barrenness, inhospitality, and misery.
 
 There are no inhabitants of this land of despair. A band of Pawnees or of Blackfeet may occasionally traverse it in order to reach other hunting-grounds, but the hardiest of the braves are glad to lose sight of those awesome plains, and to find themselves once more upon their prairies. The coyote skulks among the scrub, the buzzard flaps heavily through the air, and the clumsy grizzly bear lumbers through the dark ravines, and picks up such sustenance as it can amongst the rocks. These are the sole dwellers in the wilderness.
diff --git a/src/2-2.md b/src/part-2/chapter-2.md
similarity index 99%
rename from src/2-2.md
rename to src/part-2/chapter-2.md
index 7771d57..a20c5b4 100644
--- a/src/2-2.md
+++ b/src/part-2/chapter-2.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: II
 title: The Flower of Utah
 tags:
   - chapters
   - partTwo
 date: 1887-02-02
-show_nav: true
-prev: 2-1
-next: 2-3
+showNav: true
+prev: chapter-1
+next: chapter-3
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 This is not the place to commemorate the trials and privations endured by the immigrant Mormons before they came to their final haven. From the shores of the Mississippi to the western slopes of the Rocky Mountains they had struggled on with a constancy almost unparalleled in history. The savage man, and the savage beast, hunger, thirst, fatigue, and disease—every impediment which Nature could place in the way, had all been overcome with Anglo-Saxon tenacity. Yet the long journey and the accumulated terrors had shaken the hearts of the stoutest among them. There was not one who did not sink upon his knees in heartfelt prayer when they saw the broad valley of Utah bathed in the sunlight beneath them, and learned from the lips of their leader that this was the promised land, and that these virgin acres were to be theirs for evermore.
 
 Young speedily proved himself to be a skilful administrator as well as a resolute chief. Maps were drawn and charts prepared, in which the future city was sketched out. All around farms were apportioned and allotted in proportion to the standing of each individual. The tradesman was put to his trade and the artisan to his calling. In the town streets and squares sprang up, as if by magic. In the country there was draining and hedging, planting and clearing, until the next summer saw the whole country golden with the wheat crop. Everything prospered in the strange settlement. Above all, the great temple which they had erected in the centre of the city grew ever taller and larger. From the first blush of dawn until the closing of the twilight, the clatter of the hammer and the rasp of the saw was never absent from the monument which the immigrants erected to Him who had led them safe through many dangers.
diff --git a/src/2-3.md b/src/part-2/chapter-3.md
similarity index 99%
rename from src/2-3.md
rename to src/part-2/chapter-3.md
index 0310d02..cb08941 100644
--- a/src/2-3.md
+++ b/src/part-2/chapter-3.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: III
 title: John Ferrier Talks with the Prophet
 tags:
   - chapters
   - partTwo
 date: 1887-02-03
-show_nav: true
-prev: 2-2
-next: 2-4
+showNav: true
+prev: chapter-2
+next: chapter-4
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 Three weeks had passed since Jefferson Hope and his comrades had departed from Salt Lake City. John Ferrier’s heart was sore within him when he thought of the young man’s return, and of the impending loss of his adopted child. Yet her bright and happy face reconciled him to the arrangement more than any argument could have done. He had always determined, deep down in his resolute heart, that nothing would ever induce him to allow his daughter to wed a Mormon. Such a marriage he regarded as no marriage at all, but as a shame and a disgrace. Whatever he might think of the Mormon doctrines, upon that one point he was inflexible. He had to seal his mouth on the subject, however, for to express an unorthodox opinion was a dangerous matter in those days in the Land of the Saints.
 
 Yes, a dangerous matter—so dangerous that even the most saintly dared only whisper their religious opinions with bated breath, lest something which fell from their lips might be misconstrued, and bring down a swift retribution upon them. The victims of persecution had now turned persecutors on their own account, and persecutors of the most terrible description. Not the Inquisition of Seville, nor the German Vehmgericht, nor the Secret Societies of Italy, were ever able to put a more formidable machinery in motion than that which cast a cloud over the State of Utah.
diff --git a/src/2-4.md b/src/part-2/chapter-4.md
similarity index 99%
rename from src/2-4.md
rename to src/part-2/chapter-4.md
index 187609d..5e62092 100644
--- a/src/2-4.md
+++ b/src/part-2/chapter-4.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: IV
 title: A Flight for Life
 tags:
   - chapters
   - partTwo
 date: 1887-02-04
-show_nav: true
-prev: 2-3
-next: 2-5
+showNav: true
+prev: chapter-3
+next: chapter-5
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 On the morning which followed his interview with the Mormon Prophet, John Ferrier went in to Salt Lake City, and having found his acquaintance, who was bound for the Nevada Mountains, he entrusted him with his message to Jefferson Hope. In it he told the young man of the imminent danger which threatened them, and how necessary it was that he should return. Having done thus he felt easier in his mind, and returned home with a lighter heart.
 
 As he approached his farm, he was surprised to see a horse hitched to each of the posts of the gate. Still more surprised was he on entering to find two young men in possession of his sitting-room. One, with a long pale face, was leaning back in the rocking-chair, with his feet cocked up upon the stove. The other, a bull-necked youth with coarse bloated features, was standing in front of the window with his hands in his pocket, whistling a popular hymn. Both of them nodded to Ferrier as he entered, and the one in the rocking-chair commenced the conversation.
diff --git a/src/2-5.md b/src/part-2/chapter-5.md
similarity index 99%
rename from src/2-5.md
rename to src/part-2/chapter-5.md
index e09088a..f0f9fc2 100644
--- a/src/2-5.md
+++ b/src/part-2/chapter-5.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: V
 title: The Avenging Angels
 tags:
   - chapters
   - partTwo
 date: 1887-02-05
-show_nav: true
-prev: 2-4
-next: 2-6
+showNav: true
+prev: chapter-4
+next: chapter-6
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 All night their course lay through intricate defiles and over irregular and rock-strewn paths. More than once they lost their way, but Hope’s intimate knowledge of the mountains enabled them to regain the track once more. When morning broke, a scene of marvellous though savage beauty lay before them. In every direction the great snow-capped peaks hemmed them in, peeping over each other’s shoulders to the far horizon. So steep were the rocky banks on either side of them, that the larch and the pine seemed to be suspended over their heads, and to need only a gust of wind to come hurtling down upon them. Nor was the fear entirely an illusion, for the barren valley was thickly strewn with trees and boulders which had fallen in a similar manner. Even as they passed, a great rock came thundering down with a hoarse rattle which woke the echoes in the silent gorges, and startled the weary horses into a gallop.
 
 As the sun rose slowly above the eastern horizon, the caps of the great mountains lit up one after the other, like lamps at a festival, until they were all ruddy and glowing. The magnificent spectacle cheered the hearts of the three fugitives and gave them fresh energy. At a wild torrent which swept out of a ravine they called a halt and watered their horses, while they partook of a hasty breakfast. Lucy and her father would fain have rested longer, but Jefferson Hope was inexorable. “They will be upon our track by this time,” he said. “Everything depends upon our speed. Once safe in Carson we may rest for the remainder of our lives.”
diff --git a/src/2-6.md b/src/part-2/chapter-6.md
similarity index 99%
rename from src/2-6.md
rename to src/part-2/chapter-6.md
index 0194170..c794a14 100644
--- a/src/2-6.md
+++ b/src/part-2/chapter-6.md
@@ -1,18 +1,16 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: VI
 title: A Continuation of the Reminiscences of John H. Watson, M.D.
 tags:
   - chapters
   - partTwo
 date: 1887-02-06
-show_nav: true
-prev: 2-5
-next: 2-7
+showNav: true
+prev: chapter-5
+next: chapter-7
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 Our prisoner’s furious resistance did not apparently indicate any ferocity in his disposition towards ourselves, for on finding himself powerless, he smiled in an affable manner, and expressed his hopes that he had not hurt any of us in the scuffle. “I guess you’re going to take me to the police-station,” he remarked to Sherlock Holmes. “My cab’s at the door. If you’ll loose my legs I’ll walk down to it. I’m not so light to lift as I used to be.”
 
 Gregson and Lestrade exchanged glances as if they thought this proposition rather a bold one; but Holmes at once took the prisoner at his word, and loosened the towel which we had bound round his ankles. He rose and stretched his legs, as though to assure himself that they were free once more. I remember that I thought to myself, as I eyed him, that I had seldom seen a more powerfully built man; and his dark sunburned face bore an expression of determination and energy which was as formidable as his personal strength.
diff --git a/src/2-7.md b/src/part-2/chapter-7.md
similarity index 99%
rename from src/2-7.md
rename to src/part-2/chapter-7.md
index 91bf689..c1a0f9f 100644
--- a/src/2-7.md
+++ b/src/part-2/chapter-7.md
@@ -1,17 +1,15 @@
 ---
-layout: layout.njk
+layout: chapter.njk
 chapter: VII
 title: The Conclusion
 tags:
   - chapters
   - partTwo
 date: 1887-02-07
-show_nav: true
-prev: 2-6
+showNav: true
+prev: chapter-6
 ---
 
-### Chapter {{chapter}}: {{ title }}
-
 We had all been warned to appear before the magistrates upon the Thursday; but when the Thursday came there was no occasion for our testimony. A higher Judge had taken the matter in hand, and Jefferson Hope had been summoned before a tribunal where strict justice would be meted out to him. On the very night after his capture the aneurism burst, and he was found in the morning stretched upon the floor of the cell, with a placid smile upon his face, as though he had been able in his dying moments to look back upon a useful life, and on work well done.
 
 “Gregson and Lestrade will be wild about his death,” Holmes remarked, as we chatted it over next evening. “Where will their grand advertisement be now?”
diff --git a/src/part-2/index.njk b/src/part-2/index.njk
new file mode 100644
index 0000000..acecbf6
--- /dev/null
+++ b/src/part-2/index.njk
@@ -0,0 +1,25 @@
+---
+layout: layout.njk
+eleventyComputed:
+  title: 'Part {{ currentPart }}'
+---
+
+<h2>Contents</h2>
+
+<section>
+  <header class="toc-header">
+    <h3>Part {{ currentPart }}.</h3>
+    <p>
+      <i>{{ parts[currentPart].title }}</i>
+    </p>
+  </header>
+  <ol type="I">
+    {% for chapter in collections.partTwo %}
+      <li>
+        <a href="{{ chapter.page.url }}">
+          {{ chapter.data.title }}
+        </a>
+      </li>
+    {% endfor %}
+  </ol>
+</section>
diff --git a/src/part-2/part-2.11tydata.json b/src/part-2/part-2.11tydata.json
new file mode 100644
index 0000000..80bcbb5
--- /dev/null
+++ b/src/part-2/part-2.11tydata.json
@@ -0,0 +1,3 @@
+{
+  "currentPart": "II"
+}
diff --git a/yarn.lock b/yarn.lock
index 511478c..498c98f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1538,11 +1538,6 @@ map-obj@^4.1.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
-markdown-it-anchor@8.6.7:
-  version "8.6.7"
-  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
-  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
-
 markdown-it-footnote@3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz#e0e4c0d67390a4c5f0c75f73be605c7c190ca4d8"