Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion spec/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ <h1>Options</h1>
<tr><td>`--assets-dir`</td><td>`assetsDir`</td><td>Directory in which to place assets when using `--assets=external`. Defaults to "assets".</td></tr>
<tr><td>`--lint-spec`</td><td>`lintSpec`</td><td>Enforce some style and correctness checks.</td></tr>
<tr><td>`--error-formatter`</td><td></td><td>The <a href="https://eslint.org/docs/user-guide/formatters/">eslint formatter</a> to be used for printing warnings and errors when using `--verbose`. Either the name of a built-in eslint formatter or the package name of an installed eslint compatible formatter.</td></tr>
<tr><td>`--max-clause-depth N`</td><td></td><td>Warn when clauses exceed a nesting depth of N, and cause those clauses to be numbered by incrementing their parent clause's number rather than by nesting a new number within their parent clause.</td></tr>
<tr><td>`--max-clause-depth N`</td><td>`maxClauseDepth`</td><td>Warn when clauses exceed a nesting depth of N, and cause those clauses to be numbered by incrementing their parent clause's number rather than by nesting a new number within their parent clause. Default 5.</td></tr>
<tr><td>`--printed-toc-depth N`</td><td>`printedTocDepth`</td><td>Maximum level of subclause to be emitted in printed table of contents. Default 3. (ignored if `--printable` option omitted)</td></tr>
<tr><td>`--strict`</td><td></td><td>Exit with an error if there are warnings. Cannot be used with `--watch`.</td></tr>
<tr><td>`--multipage`</td><td></td><td>Emit a distinct page for each top-level clause.</td></tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion src/Spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ export default class Spec {

if (this.opts.printable) {
// Ecma guidance directs three levels of clause in ToC
new Toc(this).build(3);
new Toc(this).build(this.opts.tocDepth ?? 3);
} else {
({ js: tocJs, eles: commonEles } = makeMenu(this));
}
Expand Down
8 changes: 7 additions & 1 deletion src/args.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,13 @@ export const options = [
name: 'max-clause-depth',
type: Number,
description:
'The maximum nesting depth for clauses; exceeding this will cause a warning. Defaults to no limit.',
'The maximum nesting depth for clauses; exceeding this will cause a warning. Defaults to five (per Ecma house style.)',
},
{
name: 'printed-toc-depth',
type: Number,
description:
'Maximum level of subclause to be emitted in printed table of contents. Default 3. (ignored if `--printable` option omitted)',
},
{
name: 'multipage',
Expand Down
7 changes: 4 additions & 3 deletions src/clauseNums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export default function iterator(spec: Spec): ClauseNumberIterator {
let inAnnex = false;
let currentLevel = 0;
let hasWarnedForExcessNesting = false;
const MAX_LEVELS = spec.opts.maxClauseDepth ?? Infinity;
// Ecma house style calls for a maximum of 5 clause levels
const MAX_LEVELS = spec.opts.maxClauseDepth ? spec.opts.maxClauseDepth || Infinity : 5;

return {
next(clauseStack: Clause[], node: HTMLElement) {
Expand All @@ -32,12 +33,12 @@ export default function iterator(spec: Spec): ClauseNumberIterator {
message: 'clause is being numbered without numbering its parent clause',
});
}
if (!hasWarnedForExcessNesting && level + 1 > (spec.opts.maxClauseDepth ?? Infinity)) {
if (!hasWarnedForExcessNesting && level + 1 > MAX_LEVELS) {
spec.warn({
type: 'node',
node,
ruleId: 'max-clause-depth',
message: `clause exceeds maximum nesting depth of ${spec.opts.maxClauseDepth}`,
message: `clause exceeds maximum nesting depth of ${MAX_LEVELS}`,
});
hasWarnedForExcessNesting = true;
}
Expand Down
3 changes: 3 additions & 0 deletions src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ const build = debounce(async function build() {
if (args['max-clause-depth']) {
opts.maxClauseDepth = args['max-clause-depth'];
}
if (args['printed-toc-depth']) {
opts.tocDepth = args['printed-toc-depth'];
}
if (args['no-toc'] != null) {
opts.toc = !args['no-toc'];
}
Expand Down
1 change: 1 addition & 0 deletions src/ecmarkup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export interface Options {
date?: Date;
location?: string;
maxClauseDepth?: number;
tocDepth?: number;
multipage?: boolean;
extraBiblios?: ExportedBiblio[];
contributors?: string;
Expand Down