From 51f758bf47345d47db72c093d1cf2ab479ad0b7d Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Thu, 15 Aug 2024 17:15:49 -0500
Subject: [PATCH 01/20] Rework page counters for skipping and resets.

Solves #513

This adds the .skipCounting and .resetCounting classes for causing
a page number to not be incremented or to reset the number at 1.

The ToC Snippet is corrected to match the displayed page numbers
while correctly tracking the page ids.
---
 .../V3/5ePHB/snippets/tableOfContents.gen.js  | 49 ++++++++++++++-----
 themes/V3/Blank/style.less                    | 14 ++++--
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 3aea01735..dbd0794d5 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -1,14 +1,41 @@
 const _ = require('lodash');
 const dedent = require('dedent-tabs').default;
 
-const getTOC = (pages)=>{
+const getTOC = ()=>{
 
-	const recursiveAdd = (title, page, targetDepth, child, curDepth=0)=>{
+	const iframe = document.getElementById('BrewRenderer');
+	const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
+	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
+
+	const res = [];
+
+	const pageMap = [];
+
+	const walkPages = ()=>{
+		let current = 0;
+		let skip = 0;
+		let reset = 0;
+		const pages = iframeDocument.querySelectorAll('.page');
+		_.each(pages, (page)=>{
+			current++;
+			if(page.querySelectorAll('.skipCounting').length > 0) {
+				skip += 1;
+			} else if(page.querySelectorAll('.resetCounting').length > 0) {
+				reset = current - 1;
+				skip = 0;
+			}
+			pageMap[current] = current - reset - skip;
+		});
+	};
+
+	const recursiveAdd = (title, page, anchor, targetDepth, child, curDepth=0)=>{
 		if(curDepth > 5) return; // Something went wrong.
 		if(curDepth == targetDepth) {
 			child.push({
 				title    : title,
 				page     : page,
+				anchor   : anchor,
 				children : []
 			});
 		} else {
@@ -16,26 +43,23 @@ const getTOC = (pages)=>{
 				child.push({
 					title    : null,
 					page     : page,
+					anchor   : anchor,
 					children : []
 				});
 			}
-			recursiveAdd(title, page, targetDepth, _.last(child).children, curDepth+1,);
+			recursiveAdd(title, page, anchor, targetDepth, _.last(child).children, curDepth+1,);
 		}
 	};
 
-	const res = [];
-
-	const iframe = document.getElementById('BrewRenderer');
-	const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
-	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
-	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
+	walkPages();
 
 	_.each(headings, (heading)=>{
+		const pageAnchor = heading.closest('.page').id;
 		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
 		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
 
 		if(ToCExclude != 'exclude') {
-			recursiveAdd(heading.textContent.trim(), onPage, headerDepth.indexOf(heading.tagName), res);
+			recursiveAdd(heading.textContent.trim(), pageMap[onPage], pageAnchor, headerDepth.indexOf(heading.tagName), res);
 		}
 	});
 	return res;
@@ -46,7 +70,7 @@ const ToCIterate = (entries, curDepth=0)=>{
 	const levelPad = ['- ###', '  - ####', '    - ', '      - ', '        - ', '          - '];
 	const toc = [];
 	if(entries.title !== null){
-		toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page}}}](#p${entries.page})`);
+		toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page}}}](#${entries.anchor})`);
 	}
 	if(entries.children.length) {
 		_.each(entries.children, (entry, idx)=>{
@@ -60,8 +84,7 @@ const ToCIterate = (entries, curDepth=0)=>{
 };
 
 module.exports = function(props){
-	const pages = props.brew.text.split('\\page');
-	const TOC = getTOC(pages);
+	const TOC = getTOC();
 	const markdown = _.reduce(TOC, (r, g1, idx1)=>{
 		r.push(ToCIterate(g1).join('\n'));
 		return r;
diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less
index 0f779c38b..84bd5ded5 100644
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -12,7 +12,7 @@
 }
 
 @page { margin : 0; }
-body { counter-reset : page-numbers; }
+body { counter-reset : page-numbers 0; }
 * { -webkit-print-color-adjust : exact; }
 
 //*****************************
@@ -51,7 +51,6 @@ body { counter-reset : page-numbers; }
 	height            : 279.4mm;
 	padding           : 1.4cm 1.9cm 1.7cm;
 	overflow          : hidden;
-	counter-increment : page-numbers;
 	background-color  : var(--HB_Color_Background);
 	text-rendering    : optimizeLegibility;
 	contain           : size;
@@ -481,4 +480,13 @@ body { counter-reset : page-numbers; }
 	&:nth-child(even) {
 		.pageNumber { left : 30px; }
 	}
-}
+
+	.resetCounting {
+		counter-set : page-numbers 1;
+	}
+
+	&:not(:has(.skipCounting)) {
+		counter-increment : page-numbers;
+	}
+
+}
\ No newline at end of file

From 03f8fc83ee09b258fcc0a1cac68f035ddb013096 Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Wed, 28 Aug 2024 21:33:32 -0500
Subject: [PATCH 02/20] Add snippets for page Numbering updates

Adds options to add skipCounting and ResetCounting classes
---
 themes/V3/Blank/snippets.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js
index 8437dab2e..934739dac 100644
--- a/themes/V3/Blank/snippets.js
+++ b/themes/V3/Blank/snippets.js
@@ -32,6 +32,16 @@ module.exports = [
 				icon : 'fas fa-sort-numeric-down',
 				gen  : '{{pageNumber,auto}}\n'
 			},
+			{
+				name : 'Skip Page Number Increment this Page',
+				icon : 'fas fa-forward',
+				gen  : '{{skipCounting}}\n'
+			},
+			{
+				name : 'Restart Numbering',
+				icon : 'fas fa-fast-backward',
+				gen  : '{{resetCounting}}\n'
+			},
 			{
 				name        : 'Footer',
 				icon        : 'fas fa-shoe-prints',

From 49e072f03f349e5a4aac29b384caa5d50bdce54a Mon Sep 17 00:00:00 2001
From: Gazook89 <John.W.Jones89@gmail.com>
Date: Wed, 4 Sep 2024 13:54:55 -0500
Subject: [PATCH 03/20] Add button to toggle Preview tools

Toggles a state variable to either visible or hidden which is used to set a related class on the toolbar.  The hiding is done with CSS, just reducing the width of the toolbar and the opacity of the tools.
---
 .../homebrew/brewRenderer/toolBar/toolBar.jsx |  6 +++--
 .../brewRenderer/toolBar/toolBar.less         | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/client/homebrew/brewRenderer/toolBar/toolBar.jsx b/client/homebrew/brewRenderer/toolBar/toolBar.jsx
index fb3b62067..5c0a0c2ba 100644
--- a/client/homebrew/brewRenderer/toolBar/toolBar.jsx
+++ b/client/homebrew/brewRenderer/toolBar/toolBar.jsx
@@ -11,6 +11,7 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
 
 	const [zoomLevel, setZoomLevel] = useState(100);
 	const [pageNum, setPageNum]     = useState(currentPage);
+	const [toolsVisible, setToolsVisible] = useState(true);
 
 	useEffect(()=>{
 		onZoomChange(zoomLevel);
@@ -66,8 +67,9 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
 		return deltaZoom;
 	};
 
-	return (
-		<div className='toolBar'>
+	return (		
+		<div className={`toolBar ${toolsVisible ? 'visible' : 'hidden'}`}>
+			<button class='toggleButton' title={`${toolsVisible ? 'Hide' : 'Show'} Preview Toolbar`} onClick={()=>{setToolsVisible(!toolsVisible)}}><i className='fas fa-glasses' /></button>
 			{/*v=====----------------------< Zoom Controls >---------------------=====v*/}
 			<div className='group'>
 				<button
diff --git a/client/homebrew/brewRenderer/toolBar/toolBar.less b/client/homebrew/brewRenderer/toolBar/toolBar.less
index d565ca7d4..3bed0eeda 100644
--- a/client/homebrew/brewRenderer/toolBar/toolBar.less
+++ b/client/homebrew/brewRenderer/toolBar/toolBar.less
@@ -15,6 +15,10 @@
 	font-family      : 'Open Sans', sans-serif;
 	color            : #CCCCCC;
 	background-color : #555555;
+	& > *:not(.toggleButton) {
+		opacity: 1;
+		transition: all .2s ease;
+	}
 
 	.group {
 		box-sizing       : border-box;
@@ -100,4 +104,25 @@
 			font-size:1.2em;
 		}
 	}
+
+	&.hidden {
+		width: 32px;
+		transition: all .3s ease;
+		flex-wrap:nowrap;
+		overflow: hidden;
+		background-color: unset;
+		opacity: .5;
+		& > *:not(.toggleButton) {
+			opacity: 0;
+			transition: all .2s ease;
+		}
+	}
+}
+
+button.toggleButton {
+	z-index : 5;
+	position:absolute;
+	left: 0;
+	width: 32px;
+	min-width: unset;
 }
\ No newline at end of file

From 03c14e584714a6a51cbbc0a543a21580d7356578 Mon Sep 17 00:00:00 2001
From: Gazook89 <John.W.Jones89@gmail.com>
Date: Thu, 5 Sep 2024 11:24:59 -0500
Subject: [PATCH 04/20] adds meta tags for the Vault page

So they show up when sharing the link in Discord or wherever.
---
 server/app.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/app.js b/server/app.js
index 02075d31d..beb0b249c 100644
--- a/server/app.js
+++ b/server/app.js
@@ -436,6 +436,10 @@ if(isLocalEnvironment){
 
 //Vault Page
 app.get('/vault', asyncHandler(async(req, res, next)=>{
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'The Vault',
+		description : 'Search for Brews'
+	};
 	return next();
 }));
 

From e5f6d28abdd2a98ce61136b67f097cb9992359c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?=
 <losada.hernandez.victor@gmail.com>
Date: Sat, 7 Sep 2024 22:37:22 +0200
Subject: [PATCH 05/20] fixing it once and for all

---
 shared/naturalcrit/splitPane/splitPane.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/naturalcrit/splitPane/splitPane.jsx b/shared/naturalcrit/splitPane/splitPane.jsx
index 9a7b6fe2b..606b22d40 100644
--- a/shared/naturalcrit/splitPane/splitPane.jsx
+++ b/shared/naturalcrit/splitPane/splitPane.jsx
@@ -126,7 +126,7 @@ const SplitPane = createClass({
 
 	renderDivider : function(){
 		return <>
-			{this.renderMoveArrows()}
+			{this.props.showDividerButtons && this.renderMoveArrows()}
 			<div className='divider' onPointerDown={this.handleDown} >
 				<div className='dots'>
 					<i className='fas fa-circle' />

From dcc7a22272888e8af7b7ded624403ea13e033c54 Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 19:47:16 -0500
Subject: [PATCH 06/20] First pass at code fixes.

Move functions out of function
Use querySelector instead of querySelectorAll
Flip skip and reset counter order.
---
 .../V3/5ePHB/snippets/tableOfContents.gen.js  | 82 ++++++++++---------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index dbd0794d5..7017ac7dc 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -1,55 +1,59 @@
 const _ = require('lodash');
 const dedent = require('dedent-tabs').default;
 
-const getTOC = ()=>{
+const iframe = document.getElementById('BrewRenderer');
+const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
+const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
 
-	const iframe = document.getElementById('BrewRenderer');
-	const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
-	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
-	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
+const res = [];
 
-	const res = [];
+const pageMap = [];
 
-	const pageMap = [];
+const walkPages = ()=>{
+	let current = 0;
+	let skip = 0;
+	let reset = 0;
+	const pages = iframeDocument.querySelectorAll('.page');
+	_.each(pages, (page)=>{
+		current++;
+		const doSkip = (page.querySelector('.skipCounting').length > 0);
+		const doReset = (page.querySelector('.resetCounting').length > 0);
+		if(doReset) {
+			reset = current - 1;
+			skip = 0;
+		} else if(doSkip){
+			skip += 1;
+		}
+		pageMap[current] = current - reset - skip;
+	});
+};
 
-	const walkPages = ()=>{
-		let current = 0;
-		let skip = 0;
-		let reset = 0;
-		const pages = iframeDocument.querySelectorAll('.page');
-		_.each(pages, (page)=>{
-			current++;
-			if(page.querySelectorAll('.skipCounting').length > 0) {
-				skip += 1;
-			} else if(page.querySelectorAll('.resetCounting').length > 0) {
-				reset = current - 1;
-				skip = 0;
-			}
-			pageMap[current] = current - reset - skip;
+const recursiveAdd = (title, page, actualPage, targetDepth, child, curDepth=0)=>{
+	const anchor = `p${actualPage}`;
+	if(curDepth > 5) return; // Something went wrong.
+	if(curDepth == targetDepth) {
+		child.push({
+			title    : title,
+			page     : page,
+			anchor   : anchor,
+			children : []
 		});
-	};
-
-	const recursiveAdd = (title, page, anchor, targetDepth, child, curDepth=0)=>{
-		if(curDepth > 5) return; // Something went wrong.
-		if(curDepth == targetDepth) {
+	} else {
+		if(child.length == 0) {
 			child.push({
-				title    : title,
+				title    : null,
 				page     : page,
 				anchor   : anchor,
 				children : []
 			});
-		} else {
-			if(child.length == 0) {
-				child.push({
-					title    : null,
-					page     : page,
-					anchor   : anchor,
-					children : []
-				});
-			}
-			recursiveAdd(title, page, anchor, targetDepth, _.last(child).children, curDepth+1,);
 		}
-	};
+		recursiveAdd(title, page, anchor, targetDepth, _.last(child).children, curDepth+1,);
+	}
+};
+
+
+const getTOC = ()=>{
 
 	walkPages();
 
@@ -59,7 +63,7 @@ const getTOC = ()=>{
 		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
 
 		if(ToCExclude != 'exclude') {
-			recursiveAdd(heading.textContent.trim(), pageMap[onPage], pageAnchor, headerDepth.indexOf(heading.tagName), res);
+			recursiveAdd(heading.textContent.trim(), pageMap[onPage], onPage, headerDepth.indexOf(heading.tagName), res);
 		}
 	});
 	return res;

From 049b64cd41eac394341e4f81547d3c7f8134a669 Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 19:54:52 -0500
Subject: [PATCH 07/20] Remove unneeded variable

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 7017ac7dc..2c0f5e222 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -58,7 +58,6 @@ const getTOC = ()=>{
 	walkPages();
 
 	_.each(headings, (heading)=>{
-		const pageAnchor = heading.closest('.page').id;
 		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
 		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
 

From 3b0028da69a398df11a6f992f031ce356c4db9a7 Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 20:12:05 -0500
Subject: [PATCH 08/20] Move some of thos variables back.

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 2c0f5e222..2c8c3cfa4 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -1,16 +1,11 @@
 const _ = require('lodash');
 const dedent = require('dedent-tabs').default;
 
-const iframe = document.getElementById('BrewRenderer');
-const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
-const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
-const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
-
 const res = [];
 
 const pageMap = [];
 
-const walkPages = ()=>{
+const walkPages = (iframeDocument)=>{
 	let current = 0;
 	let skip = 0;
 	let reset = 0;
@@ -54,8 +49,12 @@ const recursiveAdd = (title, page, actualPage, targetDepth, child, curDepth=0)=>
 
 
 const getTOC = ()=>{
+	const iframe = document.getElementById('BrewRenderer');
+	const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
+	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
 
-	walkPages();
+	walkPages(iframeDocument);
 
 	_.each(headings, (heading)=>{
 		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));

From 0f8461ced6e313657232a46a6f823c9a533d6a5a Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 20:16:16 -0500
Subject: [PATCH 09/20] Not a collection.

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 2c8c3cfa4..2c1c931f8 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -12,8 +12,8 @@ const walkPages = (iframeDocument)=>{
 	const pages = iframeDocument.querySelectorAll('.page');
 	_.each(pages, (page)=>{
 		current++;
-		const doSkip = (page.querySelector('.skipCounting').length > 0);
-		const doReset = (page.querySelector('.resetCounting').length > 0);
+		const doSkip = (page.querySelector('.skipCounting') > 0);
+		const doReset = (page.querySelector('.resetCounting') > 0);
 		if(doReset) {
 			reset = current - 1;
 			skip = 0;

From b58688bd62c88e68011fc0d56ca9746dcec5b3fb Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 20:19:56 -0500
Subject: [PATCH 10/20] Stop comparing lengths, dude.

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 2c1c931f8..2d88c04db 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -12,8 +12,8 @@ const walkPages = (iframeDocument)=>{
 	const pages = iframeDocument.querySelectorAll('.page');
 	_.each(pages, (page)=>{
 		current++;
-		const doSkip = (page.querySelector('.skipCounting') > 0);
-		const doReset = (page.querySelector('.resetCounting') > 0);
+		const doSkip = (page.querySelector('.skipCounting'));
+		const doReset = (page.querySelector('.resetCounting'));
 		if(doReset) {
 			reset = current - 1;
 			skip = 0;

From 6ea724bb1642fca73d6352d33508ccfa665d14fe Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 20:30:16 -0500
Subject: [PATCH 11/20] Start skipping .skipCount in ToC

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 2d88c04db..c9faff553 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -11,6 +11,7 @@ const walkPages = (iframeDocument)=>{
 	let reset = 0;
 	const pages = iframeDocument.querySelectorAll('.page');
 	_.each(pages, (page)=>{
+		let showPage = true;
 		current++;
 		const doSkip = (page.querySelector('.skipCounting'));
 		const doReset = (page.querySelector('.resetCounting'));
@@ -19,8 +20,12 @@ const walkPages = (iframeDocument)=>{
 			skip = 0;
 		} else if(doSkip){
 			skip += 1;
+			showPage = false;
 		}
-		pageMap[current] = current - reset - skip;
+		pageMap[current] = {
+			pageNumber : current - reset - skip,
+			showPage   : showPage
+		};
 	});
 };
 
@@ -72,7 +77,7 @@ const ToCIterate = (entries, curDepth=0)=>{
 	const levelPad = ['- ###', '  - ####', '    - ', '      - ', '        - ', '          - '];
 	const toc = [];
 	if(entries.title !== null){
-		toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page}}}](#${entries.anchor})`);
+		if(entries.page.showPage) toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page.pageNumber}}}](#${entries.anchor})`);
 	}
 	if(entries.children.length) {
 		_.each(entries.children, (entry, idx)=>{

From b0dffc6df15abd105ff320ed3ec84805bd491caa Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 20:35:43 -0500
Subject: [PATCH 12/20] Drop empty entries

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index c9faff553..614bb1cfb 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -87,7 +87,7 @@ const ToCIterate = (entries, curDepth=0)=>{
 			}
 		});
 	}
-	return toc;
+	return toc.length > 0 ? toc : null;
 };
 
 module.exports = function(props){

From 758c2799a1cf12aec4c38f32e3e7796d4d73c5d5 Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 20:40:29 -0500
Subject: [PATCH 13/20] That was the wrong way. Lets try this ugly fix.

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 614bb1cfb..92cf6f8e3 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -87,7 +87,7 @@ const ToCIterate = (entries, curDepth=0)=>{
 			}
 		});
 	}
-	return toc.length > 0 ? toc : null;
+	return toc;
 };
 
 module.exports = function(props){
@@ -95,7 +95,7 @@ module.exports = function(props){
 	const markdown = _.reduce(TOC, (r, g1, idx1)=>{
 		r.push(ToCIterate(g1).join('\n'));
 		return r;
-	}, []).join('\n');
+	}, []).join('\n').replace('\n\n', '\n');
 
 	return dedent`
 		{{toc,wide

From be70b9e67de091b026fe0639b9e791dff9b7ca24 Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sat, 7 Sep 2024 20:50:18 -0500
Subject: [PATCH 14/20] Regroup page numbering snippets, update icons

---
 themes/V3/Blank/snippets.js | 42 +++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js
index 934739dac..464fccc23 100644
--- a/themes/V3/Blank/snippets.js
+++ b/themes/V3/Blank/snippets.js
@@ -23,24 +23,30 @@ module.exports = [
 				gen  : '\n\\page\n'
 			},
 			{
-				name : 'Page Number',
-				icon : 'fas fa-bookmark',
-				gen  : '{{pageNumber 1}}\n'
-			},
-			{
-				name : 'Auto-incrementing Page Number',
-				icon : 'fas fa-sort-numeric-down',
-				gen  : '{{pageNumber,auto}}\n'
-			},
-			{
-				name : 'Skip Page Number Increment this Page',
-				icon : 'fas fa-forward',
-				gen  : '{{skipCounting}}\n'
-			},
-			{
-				name : 'Restart Numbering',
-				icon : 'fas fa-fast-backward',
-				gen  : '{{resetCounting}}\n'
+				name        : 'Page Numbering',
+				icon        : 'fas fa-bookmark',
+				subsnippets : [
+					{
+						name : 'Page Number',
+						icon : 'fas fa-bookmark',
+						gen  : '{{pageNumber 1}}\n'
+					},
+					{
+						name : 'Auto-incrementing Page Number',
+						icon : 'fas fa-sort-numeric-down',
+						gen  : '{{pageNumber,auto}}\n'
+					},
+					{
+						name : 'Skip Page Number Increment this Page',
+						icon : 'fas fa-xmark',
+						gen  : '{{skipCounting}}\n'
+					},
+					{
+						name : 'Restart Numbering',
+						icon : 'fas fa-arrow-rotate-left',
+						gen  : '{{resetCounting}}\n'
+					},
+				]
 			},
 			{
 				name        : 'Footer',

From 7881d4b4a2e22e591561fa4ca9080f5b024d93cb Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sun, 8 Sep 2024 16:22:58 -0400
Subject: [PATCH 15/20] Small logic cleanup and renaming

---
 .../V3/5ePHB/snippets/tableOfContents.gen.js  | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 92cf6f8e3..97143cf5c 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -5,26 +5,23 @@ const res = [];
 
 const pageMap = [];
 
-const walkPages = (iframeDocument)=>{
-	let current = 0;
-	let skip = 0;
-	let reset = 0;
+const mapPages = (iframeDocument)=>{
+	let actualPage = 0;
+	let mappedPage = 0;
 	const pages = iframeDocument.querySelectorAll('.page');
 	_.each(pages, (page)=>{
-		let showPage = true;
-		current++;
-		const doSkip = (page.querySelector('.skipCounting'));
-		const doReset = (page.querySelector('.resetCounting'));
-		if(doReset) {
-			reset = current - 1;
-			skip = 0;
-		} else if(doSkip){
-			skip += 1;
-			showPage = false;
-		}
-		pageMap[current] = {
-			pageNumber : current - reset - skip,
-			showPage   : showPage
+		actualPage++;
+		const doSkip  = page.querySelector('.skipCounting');
+		const doReset = page.querySelector('.resetCounting');
+
+		if(doReset)
+			mappedPage = 1;
+		if(!doSkip && !doReset)
+			mappedPage++;
+
+		pageMap[actualPage] = {
+			mappedPage : mappedPage,
+			showPage   : !doSkip
 		};
 	});
 };
@@ -59,7 +56,7 @@ const getTOC = ()=>{
 	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
 	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
 
-	walkPages(iframeDocument);
+	mapPages(iframeDocument);
 
 	_.each(headings, (heading)=>{
 		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
@@ -77,7 +74,7 @@ const ToCIterate = (entries, curDepth=0)=>{
 	const levelPad = ['- ###', '  - ####', '    - ', '      - ', '        - ', '          - '];
 	const toc = [];
 	if(entries.title !== null){
-		if(entries.page.showPage) toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page.pageNumber}}}](#${entries.anchor})`);
+		if(entries.page.showPage) toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page.mappedPage}}}](#${entries.anchor})`);
 	}
 	if(entries.children.length) {
 		_.each(entries.children, (entry, idx)=>{

From 4bc957159dbf3db2481b6cd23ca32f81c8b1fadb Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Sun, 8 Sep 2024 15:23:03 -0500
Subject: [PATCH 16/20] Move a couple of variables back out of the global space
 because that was bad.

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 92cf6f8e3..e10cb50d7 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -1,11 +1,7 @@
 const _ = require('lodash');
 const dedent = require('dedent-tabs').default;
 
-const res = [];
-
-const pageMap = [];
-
-const walkPages = (iframeDocument)=>{
+const walkPages = (iframeDocument, pageMap)=>{
 	let current = 0;
 	let skip = 0;
 	let reset = 0;
@@ -54,12 +50,15 @@ const recursiveAdd = (title, page, actualPage, targetDepth, child, curDepth=0)=>
 
 
 const getTOC = ()=>{
+	const pageMap = [];
+	const res = [];
+
 	const iframe = document.getElementById('BrewRenderer');
 	const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
 	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
 	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
 
-	walkPages(iframeDocument);
+	walkPages(iframeDocument, pageMap);
 
 	_.each(headings, (heading)=>{
 		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));

From f3bc8f91cc0bbe5b94e202f03a2f3e7dd2e3d60f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 03:41:08 +0000
Subject: [PATCH 17/20] Bump eslint from 9.9.1 to 9.10.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.9.1 to 9.10.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.9.1...v9.10.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 30 +++++++++++++++++++++---------
 package.json      |  2 +-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed0cbf1f1..473ea3834 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,7 @@
       },
       "devDependencies": {
         "@stylistic/stylelint-plugin": "^3.0.1",
-        "eslint": "^9.9.1",
+        "eslint": "^9.10.0",
         "eslint-plugin-jest": "^28.8.3",
         "eslint-plugin-react": "^7.35.2",
         "globals": "^15.9.0",
@@ -2073,9 +2073,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz",
-      "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==",
+      "version": "9.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz",
+      "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2090,6 +2090,18 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz",
+      "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==",
+      "dev": true,
+      "dependencies": {
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@googleapis/drive": {
       "version": "8.14.0",
       "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.14.0.tgz",
@@ -5819,16 +5831,17 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz",
-      "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==",
+      "version": "9.10.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz",
+      "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.11.0",
         "@eslint/config-array": "^0.18.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.9.1",
+        "@eslint/js": "9.10.0",
+        "@eslint/plugin-kit": "^0.1.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
@@ -5851,7 +5864,6 @@
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
diff --git a/package.json b/package.json
index 8248f4304..67a9e542f 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
   },
   "devDependencies": {
     "@stylistic/stylelint-plugin": "^3.0.1",
-    "eslint": "^9.9.1",
+    "eslint": "^9.10.0",
     "eslint-plugin-jest": "^28.8.3",
     "eslint-plugin-react": "^7.35.2",
     "globals": "^15.9.0",

From 58a2993fe18bc44f926d8092f729cedfe80723c9 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 9 Sep 2024 11:00:45 -0400
Subject: [PATCH 18/20] use `className` for react classes

Avoid warning of conflict with JS "class" keyword.
---
 client/homebrew/brewRenderer/toolBar/toolBar.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/homebrew/brewRenderer/toolBar/toolBar.jsx b/client/homebrew/brewRenderer/toolBar/toolBar.jsx
index 5c0a0c2ba..d83fa78f9 100644
--- a/client/homebrew/brewRenderer/toolBar/toolBar.jsx
+++ b/client/homebrew/brewRenderer/toolBar/toolBar.jsx
@@ -69,7 +69,7 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
 
 	return (		
 		<div className={`toolBar ${toolsVisible ? 'visible' : 'hidden'}`}>
-			<button class='toggleButton' title={`${toolsVisible ? 'Hide' : 'Show'} Preview Toolbar`} onClick={()=>{setToolsVisible(!toolsVisible)}}><i className='fas fa-glasses' /></button>
+			<button className='toggleButton' title={`${toolsVisible ? 'Hide' : 'Show'} Preview Toolbar`} onClick={()=>{setToolsVisible(!toolsVisible)}}><i className='fas fa-glasses' /></button>
 			{/*v=====----------------------< Zoom Controls >---------------------=====v*/}
 			<div className='group'>
 				<button

From 2284f15876bcf60518d66f9331ab69af82b196ca Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 9 Sep 2024 11:11:40 -0400
Subject: [PATCH 19/20] Update tableOfContents.gen.js

---
 themes/V3/5ePHB/snippets/tableOfContents.gen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 0fb871ffb..44655c625 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -45,6 +45,7 @@ const recursiveAdd = (title, page, actualPage, targetDepth, child, curDepth=0)=>
 	}
 };
 
+
 const getTOC = ()=>{
 	const pageMap = [];
 	const entries = [];
@@ -57,7 +58,6 @@ const getTOC = ()=>{
 	mapPages(iframeDocument, pageMap);
 
 	_.each(headings, (heading)=>{
-		const pageAnchor = heading.closest('.page').id;
 		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
 		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
 

From 5c906ee7229534f263a8dfdc7880aca36a988f76 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 9 Sep 2024 23:16:56 -0400
Subject: [PATCH 20/20] Logic rewrite

Realized we don't need to build a whole descendency tree of all the headers. We can just track the current indendation level and what headers are at each indent. This removes about 1/4 of the code, and lets us put all of the exit conditions (no title, no showPage, ToCExclude) in one place to easily see what is being excluded and what not.
---
 .../V3/5ePHB/snippets/tableOfContents.gen.js  | 105 +++++++-----------
 1 file changed, 40 insertions(+), 65 deletions(-)

diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
index 44655c625..49a8c168a 100644
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -1,11 +1,12 @@
-const _ = require('lodash');
 const dedent = require('dedent-tabs').default;
 
-const mapPages = (iframeDocument, pageMap)=>{
+// Map each actual page to its footer label, accounting for skips or numbering resets
+const mapPages = (pages)=>{
 	let actualPage = 0;
-	let mappedPage = 0;
-	const pages = iframeDocument.querySelectorAll('.page');
-	_.each(pages, (page)=>{
+	let mappedPage = 0; // Number displayed in footer
+	let pageMap    = [];
+
+	pages.forEach(page => {
 		actualPage++;
 		const doSkip  = page.querySelector('.skipCounting');
 		const doReset = page.querySelector('.resetCounting');
@@ -20,84 +21,58 @@ const mapPages = (iframeDocument, pageMap)=>{
 			showPage   : !doSkip
 		};
 	});
+	return pageMap;
 };
 
-const recursiveAdd = (title, page, actualPage, targetDepth, child, curDepth=0)=>{
-	const anchor = `p${actualPage}`;
-	if(curDepth > 5) return; // Something went wrong.
-	if(curDepth == targetDepth) {
-		child.push({
-			title    : title,
-			page     : page,
-			anchor   : anchor,
-			children : []
-		});
-	} else {
-		if(child.length == 0) {
-			child.push({
-				title    : null,
-				page     : page,
-				anchor   : anchor,
-				children : []
-			});
+const getMarkdown = (headings, pageMap) => {
+	const levelPad    = ['- ###', '  - ####', '    -', '      -', '        -', '          -'];
+	
+	let allMarkdown = [];
+	let depthChain  = [0];
+
+	headings.forEach(heading => {
+		const page       = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
+		const mappedPage = pageMap[page].mappedPage;
+		const showPage   = pageMap[page].showPage;
+		const title      = heading.textContent.trim();
+		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
+		const depth      = parseInt(heading.tagName.substring(1));
+
+		if(!title || !showPage || ToCExclude == 'exclude')
+			return;
+
+		//If different header depth than last, remove indents until nearest higher-level header, then indent once
+		if (depth !== depthChain[depthChain.length -1]) {
+			while (depth <= depthChain[depthChain.length - 1]) {
+				depthChain.pop();
+			}
+			depthChain.push(depth);
 		}
-		recursiveAdd(title, page, anchor, targetDepth, _.last(child).children, curDepth+1,);
-	}
-};
 
+		let markdown = `${levelPad[depthChain.length - 2]} [{{ ${title}}}{{ ${mappedPage}}}](#p${page})`;
+		allMarkdown.push(markdown);
+	});
+	return allMarkdown.join('\n');
+};
 
 const getTOC = ()=>{
-	const pageMap = [];
-	const entries = [];
-
 	const iframe = document.getElementById('BrewRenderer');
 	const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
 	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
-	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
+	const pages    = iframeDocument.querySelectorAll('.page');
 
-	mapPages(iframeDocument, pageMap);
-
-	_.each(headings, (heading)=>{
-		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
-		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
-
-		if(ToCExclude != 'exclude') {
-			recursiveAdd(heading.textContent.trim(), pageMap[onPage], onPage, headerDepth.indexOf(heading.tagName), entries);
-		}
-	});
-	return entries;
-};
-
-
-const ToCIterate = (entries, curDepth=0)=>{
-	const levelPad = ['- ###', '  - ####', '    - ', '      - ', '        - ', '          - '];
-	const toc = [];
-	if(entries.title !== null){
-		if(entries.page.showPage) toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page.mappedPage}}}](#${entries.anchor})`);
-	}
-	if(entries.children.length) {
-		_.each(entries.children, (entry, idx)=>{
-			const children = ToCIterate(entry, entry.title == null ? curDepth : curDepth+1);
-			if(children.length) {
-				toc.push(...children);
-			}
-		});
-	}
-	return toc;
+	const pageMap = mapPages(pages);
+	return getMarkdown(headings, pageMap);
 };
 
 module.exports = function(props){
 	const TOC = getTOC();
-	const markdown = _.reduce(TOC, (r, g1, idx1)=>{
-		r.push(ToCIterate(g1).join('\n'));
-		return r;
-	}, []).join('\n').replace('\n\n', '\n');
 
 	return dedent`
 		{{toc,wide
 		# Contents
 
-		${markdown}
+		${TOC}
 		}}
 		\n`;
-};
+};
\ No newline at end of file