Skip to content

Commit 304bec9

Browse files
authored
Merge branch 'master' into Issue5
2 parents cb8eb3e + d6bf815 commit 304bec9

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

config/spellcheck/wordlist

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
personal_ws-1.1 en 14
1+
personal_ws-1.1 en 18
2+
ABI
3+
boolean
4+
computable
25
destructors
6+
IDEs
37
invariants
8+
lawyering
49
metaprogramming
510
namespace
611
namespaces
12+
ODR
713
preprocessor
814
redeclarations
9-
toolchains
15+
SFINAE
1016
toolchain
11-
boolean
12-
lawyering
13-
computable
17+
toolchains
1418
UDL
1519
UDLs
16-
IDEs
17-
SFINAE

sources/Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ contributors.md:
121121
# Establish Pandoc settings.
122122
################################################################################
123123

124+
PANDOC_OPTIONS += --verbose
124125
PANDOC_OPTIONS += --toc --toc-depth 3
125126
PANDOC_OPTIONS += --number-sections
126127
PANDOC_OPTIONS += --standalone
@@ -136,6 +137,12 @@ EPUB_CSS_FILE = css/default-pandoc.css
136137
#HTML_TEMPLATE = templates/bootstrap_menu.html
137138
HTML_TEMPLATE = $(TOP_DIR)/config/pandoc_templates/uikit.html
138139

140+
#MAKEINFO_OPTIONS += --no-warn
141+
MAKEINFO_OPTIONS += --error-limit 1000000000000
142+
#MAKEINFO_OPTIONS += --verbose
143+
MAKEINFO_OPTIONS += --no-validate
144+
MAKEINFO_OPTIONS += --force
145+
139146
################################################################################
140147
# Rules for generating the document in various formats.
141148
################################################################################
@@ -156,7 +163,7 @@ guidelines.docbook: $(GENERATED_MARKDOWN)
156163
pandoc $(PANDOC_OPTIONS) --from $(INPUT_FORMAT) -o $@ main.gen.md
157164

158165
guidelines_html: guidelines.texi
159-
makeinfo --no-validate --force --html -o guidelines_html guidelines.texi
166+
makeinfo $(MAKEINFO_OPTIONS) --html -o guidelines_html guidelines.texi
160167

161168
guidelines.tex:
162169
pandoc $(PANDOC_OPTIONS) --from $(INPUT_FORMAT) --to latex -o $@ main.gen.md

0 commit comments

Comments
 (0)