From d6bf815b2df79e5bceebe0b4cf1f1950cfe21835 Mon Sep 17 00:00:00 2001
From: Michael Adams <mdadams@ece.uvic.ca>
Date: Thu, 30 Jun 2022 11:06:28 -0700
Subject: [PATCH] When building the teaching-guidelines document in multipage
 HTML format, numerous multiply-defined labels arise due to apparent
 limitations in the GNU Texinfo format, which is used as an intermediary in
 the build process.  This commit adds a trivial workaround to prevent this
 issue from causing the build to fail due to this issue.

In addition, this commit also fixes some spellchecking failures
for the "definitions" topic.
---
 config/spellcheck/wordlist | 16 +++++++++-------
 sources/Makefile           |  9 ++++++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/config/spellcheck/wordlist b/config/spellcheck/wordlist
index a36f99f..4bcf96a 100644
--- a/config/spellcheck/wordlist
+++ b/config/spellcheck/wordlist
@@ -1,17 +1,19 @@
-personal_ws-1.1 en 14
+personal_ws-1.1 en 18
+ABI
+boolean
+computable
 destructors
+IDEs
 invariants
+lawyering
 metaprogramming
 namespace
 namespaces
+ODR
 preprocessor
 redeclarations
-toolchains
+SFINAE
 toolchain
-boolean
-lawyering
-computable
+toolchains
 UDL
 UDLs
-IDEs
-SFINAE
diff --git a/sources/Makefile b/sources/Makefile
index 40b59ea..e9ddd99 100644
--- a/sources/Makefile
+++ b/sources/Makefile
@@ -121,6 +121,7 @@ contributors.md:
 # Establish Pandoc settings.
 ################################################################################
 
+PANDOC_OPTIONS += --verbose
 PANDOC_OPTIONS += --toc --toc-depth 3
 PANDOC_OPTIONS += --number-sections
 PANDOC_OPTIONS += --standalone
@@ -136,6 +137,12 @@ EPUB_CSS_FILE = css/default-pandoc.css
 #HTML_TEMPLATE = templates/bootstrap_menu.html
 HTML_TEMPLATE = $(TOP_DIR)/config/pandoc_templates/uikit.html
 
+#MAKEINFO_OPTIONS += --no-warn
+MAKEINFO_OPTIONS += --error-limit 1000000000000
+#MAKEINFO_OPTIONS += --verbose
+MAKEINFO_OPTIONS += --no-validate
+MAKEINFO_OPTIONS += --force
+
 ################################################################################
 # Rules for generating the document in various formats.
 ################################################################################
@@ -156,7 +163,7 @@ guidelines.docbook: $(GENERATED_MARKDOWN)
 	pandoc $(PANDOC_OPTIONS) --from $(INPUT_FORMAT) -o $@ main.gen.md
 
 guidelines_html: guidelines.texi
-	makeinfo --no-validate --force --html -o guidelines_html guidelines.texi
+	makeinfo $(MAKEINFO_OPTIONS) --html -o guidelines_html guidelines.texi
 
 guidelines.tex:
 	pandoc $(PANDOC_OPTIONS) --from $(INPUT_FORMAT) --to latex -o $@ main.gen.md