From 28db7e54dbac696ee5b3be684ff29f9a93998f8d Mon Sep 17 00:00:00 2001
From: Greg Albers <galbers@getty.edu>
Date: Mon, 11 Oct 2021 08:44:08 -0700
Subject: [PATCH 1/4] Add file-path partial to convert backslashes

---
 .../partials/contents-list/closing-tags.html        | 13 ++++++++++---
 .../partials/contents-list/contents-list.html       |  7 +++++--
 .../layouts/partials/contents-list/file-path.html   |  6 ++++++
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 themes/default/layouts/partials/contents-list/file-path.html

diff --git a/themes/default/layouts/partials/contents-list/closing-tags.html b/themes/default/layouts/partials/contents-list/closing-tags.html
index 086c7f42f..b2c4c0b36 100644
--- a/themes/default/layouts/partials/contents-list/closing-tags.html
+++ b/themes/default/layouts/partials/contents-list/closing-tags.html
@@ -1,7 +1,14 @@
 {{/*  If the .File.Dir of the current page matches the START of the .File.Dir of the next page, we’re still in the same section, so do nothing. Otherwise proceed to next section to add the appropriate number of closing /ul/li tags to close section(s)
 --------------------------------------------------------------------------- */}}
-{{- $currentPageDirectory := (index .AllPages .PageIndex).File.Dir -}}
-{{- $nextPageDirectory := (index .AllPages (add .PageIndex 1)).File.Dir -}}
+{{- $currentPage := (index .AllPages .PageIndex).File.Dir -}}
+{{- $currentPageDirectory := partial "contents-list/file-path.html" $currentPage -}}
+
+{{- $nextPage := (index .AllPages (add .PageIndex 1)).File.Dir -}}
+{{- $nextPageDirectory := "" -}}
+{{- if $nextPage }}
+{{- $nextPageDirectory = partial "contents-list/file-path.html" $nextPage -}}
+{{- end -}}
+
 {{- $findPattern := printf "%s%s" "^" $currentPageDirectory -}}
 
 {{- if (findRE $findPattern $nextPageDirectory) -}}
@@ -13,7 +20,7 @@
   {{/* Find the last page within the same .File.Dir as the current page, if the current page IS the last page, we need to add at least one set of closing /ul/li tags. to determine how many sets of tags are needed, check the sub-section level difference between the current page and the next page. For example, a page with a file directory of `section/sub-section/sub-sub-section/` is at sub-section level of 3. If the next page is at `section/`, with sub-section level of 1, there are 2 levels of difference between them and so we need 2 sets of closing tags. (We use a findRE pattern to count the number of instances of one or more characters followed by a slash in the .File.Dir to determine the sub-section level.)
   ------------------------------------------------------------------------- */}}
   {{- $currentPageID := .Page.File.UniqueID -}}
-  {{- $pagesInSection := where .AllPages "File.Dir" "eq" $currentPageDirectory -}}
+  {{- $pagesInSection := where .AllPages "File.Dir" "eq" $currentPage -}}
   {{- $openSections := .openSections -}}
 
   {{- range last 1 $pagesInSection -}}
diff --git a/themes/default/layouts/partials/contents-list/contents-list.html b/themes/default/layouts/partials/contents-list/contents-list.html
index a7f681a63..813c20915 100644
--- a/themes/default/layouts/partials/contents-list/contents-list.html
+++ b/themes/default/layouts/partials/contents-list/contents-list.html
@@ -85,14 +85,17 @@
 
 {{- $lastSection := "/" -}}
 {{- $openSections := dict -}}
-{{- $renderedSections := .contentsScope -}}
+{{- $renderedSections := "" -}}
+{{- if .contentsScope -}}
+{{- $renderedSections = partial "contents-list/file-path.html" .contentsScope -}}
+{{- end -}}
 {{- $contentsScopePattern := printf "%s%s" "^" $renderedSections -}}
 {{- $contentsPageID := .contentsPage.File.UniqueID -}}
 
 <ul>
 {{- range $index, $page := $pages -}}
 
-  {{- $section := .File.Dir -}}
+  {{- $section := partial "contents-list/file-path.html" .File.Dir -}}
   {{- $sectionLevel := len (findRE "(.+?)/" $section) -}}
   {{- $sameAsOpenSection := false -}}
 
diff --git a/themes/default/layouts/partials/contents-list/file-path.html b/themes/default/layouts/partials/contents-list/file-path.html
new file mode 100644
index 000000000..3c7f17d76
--- /dev/null
+++ b/themes/default/layouts/partials/contents-list/file-path.html
@@ -0,0 +1,6 @@
+{{/* Converts the given .File.Dir to a path that uses forward slashes to make it consistent for both Windows and macOS/Linux/Unix users
+--------------------------------------------------------------------------- */}}
+{{- $filePath := path.Dir . -}}
+{{- $filePath = printf "%s%s" $filePath "/" -}}
+{{- $filePath = replaceRE "//" "/" $filePath -}}
+{{- return $filePath -}}

From 4127713699e1d60ee3e8eb3c0b12bfd76d4cec73 Mon Sep 17 00:00:00 2001
From: Greg Albers <geealbers@gmail.com>
Date: Mon, 25 Oct 2021 12:20:59 -0700
Subject: [PATCH 2/4] Clarify logic and description of file-path partial

Co-authored-by: Hannah Balenda <hbalenda@getty.edu>
---
 .../default/layouts/partials/contents-list/file-path.html  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/themes/default/layouts/partials/contents-list/file-path.html b/themes/default/layouts/partials/contents-list/file-path.html
index 3c7f17d76..41f96e745 100644
--- a/themes/default/layouts/partials/contents-list/file-path.html
+++ b/themes/default/layouts/partials/contents-list/file-path.html
@@ -1,6 +1,7 @@
-{{/* Converts the given .File.Dir to a path that uses forward slashes to make it consistent for both Windows and macOS/Linux/Unix users
+{{/* Uses the Hugo `path.Dir` function to return the given path's directory and normalize it, making it consistent for both Windows and macOS/Linux/Unix users
 --------------------------------------------------------------------------- */}}
 {{- $filePath := path.Dir . -}}
-{{- $filePath = printf "%s%s" $filePath "/" -}}
-{{- $filePath = replaceRE "//" "/" $filePath -}}
+{{- if ne $filePath "/" -}}
+  {{- $filePath = printf "%s%s" $filePath "/" -}}
+{{- end -}}
 {{- return $filePath -}}

From 18b0d8f34f1592bdaad9e62d8a9c02cb23bb5f32 Mon Sep 17 00:00:00 2001
From: Greg Albers <galbers@getty.edu>
Date: Mon, 25 Oct 2021 12:24:24 -0700
Subject: [PATCH 3/4] Rename partial

---
 .../layouts/partials/contents-list/closing-tags.html      | 4 ++--
 .../layouts/partials/contents-list/contents-list.html     | 4 ++--
 .../contents-list/{file-path.html => file-dir.html}       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename themes/default/layouts/partials/contents-list/{file-path.html => file-dir.html} (65%)

diff --git a/themes/default/layouts/partials/contents-list/closing-tags.html b/themes/default/layouts/partials/contents-list/closing-tags.html
index b2c4c0b36..cb5614cec 100644
--- a/themes/default/layouts/partials/contents-list/closing-tags.html
+++ b/themes/default/layouts/partials/contents-list/closing-tags.html
@@ -1,12 +1,12 @@
 {{/*  If the .File.Dir of the current page matches the START of the .File.Dir of the next page, we’re still in the same section, so do nothing. Otherwise proceed to next section to add the appropriate number of closing /ul/li tags to close section(s)
 --------------------------------------------------------------------------- */}}
 {{- $currentPage := (index .AllPages .PageIndex).File.Dir -}}
-{{- $currentPageDirectory := partial "contents-list/file-path.html" $currentPage -}}
+{{- $currentPageDirectory := partial "contents-list/file-dir.html" $currentPage -}}
 
 {{- $nextPage := (index .AllPages (add .PageIndex 1)).File.Dir -}}
 {{- $nextPageDirectory := "" -}}
 {{- if $nextPage }}
-{{- $nextPageDirectory = partial "contents-list/file-path.html" $nextPage -}}
+{{- $nextPageDirectory = partial "contents-list/file-dir.html" $nextPage -}}
 {{- end -}}
 
 {{- $findPattern := printf "%s%s" "^" $currentPageDirectory -}}
diff --git a/themes/default/layouts/partials/contents-list/contents-list.html b/themes/default/layouts/partials/contents-list/contents-list.html
index 813c20915..08ed14258 100644
--- a/themes/default/layouts/partials/contents-list/contents-list.html
+++ b/themes/default/layouts/partials/contents-list/contents-list.html
@@ -87,7 +87,7 @@
 {{- $openSections := dict -}}
 {{- $renderedSections := "" -}}
 {{- if .contentsScope -}}
-{{- $renderedSections = partial "contents-list/file-path.html" .contentsScope -}}
+{{- $renderedSections = partial "contents-list/file-dir.html" .contentsScope -}}
 {{- end -}}
 {{- $contentsScopePattern := printf "%s%s" "^" $renderedSections -}}
 {{- $contentsPageID := .contentsPage.File.UniqueID -}}
@@ -95,7 +95,7 @@
 <ul>
 {{- range $index, $page := $pages -}}
 
-  {{- $section := partial "contents-list/file-path.html" .File.Dir -}}
+  {{- $section := partial "contents-list/file-dir.html" .File.Dir -}}
   {{- $sectionLevel := len (findRE "(.+?)/" $section) -}}
   {{- $sameAsOpenSection := false -}}
 
diff --git a/themes/default/layouts/partials/contents-list/file-path.html b/themes/default/layouts/partials/contents-list/file-dir.html
similarity index 65%
rename from themes/default/layouts/partials/contents-list/file-path.html
rename to themes/default/layouts/partials/contents-list/file-dir.html
index 41f96e745..23943ebf8 100644
--- a/themes/default/layouts/partials/contents-list/file-path.html
+++ b/themes/default/layouts/partials/contents-list/file-dir.html
@@ -1,7 +1,7 @@
 {{/* Uses the Hugo `path.Dir` function to return the given path's directory and normalize it, making it consistent for both Windows and macOS/Linux/Unix users
 --------------------------------------------------------------------------- */}}
-{{- $filePath := path.Dir . -}}
-{{- if ne $filePath "/" -}}
-  {{- $filePath = printf "%s%s" $filePath "/" -}}
+{{- $fileDir := path.Dir . -}}
+{{- if ne $fileDir "/" -}}
+  {{- $fileDir = printf "%s%s" $fileDir "/" -}}
 {{- end -}}
-{{- return $filePath -}}
+{{- return $fileDir -}}

From b153949401b6e357558e9d94aed6bd664c62db26 Mon Sep 17 00:00:00 2001
From: Hannah Balenda <hbalenda@getty.edu>
Date: Mon, 25 Oct 2021 13:26:12 -0700
Subject: [PATCH 4/4] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41e06b179..661609b41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Project versions conform to [Semantic Versioning](https://semver.org/)
 
 ## [Unreleased]
 - Adds `disableFastRender` option to `quire preview` command
+- Adds `contents-list/file-dir` partial to normalize directories in `contents-list`
 
 ## [0.20.1]