Skip to content

Commit

Permalink
When building the teaching-guidelines document in multipage HTML
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mdadams authored and vulder committed Jun 30, 2022
1 parent cfe4a20 commit d6bf815
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
16 changes: 9 additions & 7 deletions config/spellcheck/wordlist
Original file line number Diff line number Diff line change
@@ -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
9 changes: 8 additions & 1 deletion sources/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
################################################################################
Expand All @@ -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
Expand Down

0 comments on commit d6bf815

Please sign in to comment.