Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for proofs #609

Merged
merged 20 commits into from
Oct 14, 2023
Merged
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
8 changes: 8 additions & 0 deletions .changeset/quiet-taxis-grab.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'myst-transforms': patch
'myst-ext-proof': patch
'jats-to-myst': patch
'myst-to-tex': patch
---

Add support for proofs in LaTeX
4 changes: 3 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/jats-to-myst/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,8 @@
"unist-util-remove": "^3.1.0",
"vfile": "^5.0.0",
"vfile-reporter": "^7.0.4"
},
"devDependencies": {
"myst-to-tex": "^1.0.7"
andry-tino marked this conversation as resolved.
Show resolved Hide resolved
}
}
1 change: 1 addition & 0 deletions packages/myst-ext-proof/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"url": "https://github.com/executablebooks/mystmd/issues"
},
"dependencies": {
"myst-spec": "^0.0.4",
"myst-common": "^1.1.7"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/myst-ext-proof/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { proofDirective } from './proof.js';
export { ProofKind } from './types.js';
export type { ProofKind, ProofContainer } from './types.js';
43 changes: 26 additions & 17 deletions packages/myst-ext-proof/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
export enum ProofKind {
proof = 'proof',
axiom = 'axiom',
lemma = 'lemma',
definition = 'definition',
criterion = 'criterion',
remark = 'remark',
conjecture = 'conjecture',
corollary = 'corollary',
algorithm = 'algorithm',
example = 'example',
property = 'property',
observation = 'observation',
proposition = 'proposition',
assumption = 'assumption',
theorem = 'theorem',
}
import type { Container } from 'myst-spec';

const PROOF_KINDS = [
'proof',
'axiom',
'lemma',
'definition',
'criterion',
'remark',
'conjecture',
'corollary',
'algorithm',
'example',
'property',
'observation',
'proposition',
'assumption',
'theorem',
] as const;
type ProofKinds = typeof PROOF_KINDS;

export type ProofKind = ProofKinds[number];

export type ProofContainer = Omit<Container, 'kind'> & {
kind: ProofKind;
};
1 change: 1 addition & 0 deletions packages/myst-to-tex/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"myst-common": "^1.1.8",
"myst-frontmatter": "^1.1.8",
"myst-spec-ext": "^1.1.8",
"myst-ext-proof": "^1.0.3",
"unist-util-remove": "^3.1.0",
"unist-util-select": "^4.0.3",
"vfile-reporter": "^7.0.4"
Expand Down
14 changes: 11 additions & 3 deletions packages/myst-to-tex/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import MATH_HANDLERS, { withRecursiveCommands } from './math.js';
import { selectAll } from 'unist-util-select';
import type { FootnoteDefinition } from 'myst-spec-ext';
import { transformLegends } from './legends.js';
import { TexProofSerializer, proofHandler } from './proof.js';

export type { LatexResult } from './types.js';

Expand Down Expand Up @@ -332,6 +333,7 @@ const handlers: Record<string, Handler> = {
state.closeBlock(node);
},
container: containerHandler,
proof: proofHandler,
caption: captionHandler,
captionNumber: () => undefined,
crossReference(node, state, parent) {
Expand Down Expand Up @@ -598,14 +600,20 @@ const plugin: Plugin<[Options?], Root, VFile> = function (opts) {
transformLegends(node);

const state = new TexSerializer(file, node, opts ?? { handlers });
let tex = (file.result as string).trim();

const glossaryState = new TexGlossaryAndAcronymSerializer(state.glossary, state.abbreviations);

const preamble: string[] = [];
if (state.data.hasProofs) {
preamble.push(new TexProofSerializer().preamble);
}
preamble.push(opts?.printGlossaries ? glossaryState.preamble : '');

let tex = (file.result as string).trim();
tex += opts?.printGlossaries ? '\n' + glossaryState.printedDefinitions : '';

const result: LatexResult = {
imports: [...state.data.imports],
preamble: opts?.printGlossaries ? glossaryState.preamble : '',
preamble: preamble.join('\n\n'),
commands: withRecursiveCommands(state),
value: tex,
};
Expand Down
108 changes: 108 additions & 0 deletions packages/myst-to-tex/src/proof.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
import { fileError, writeTexLabelledComment, RuleId } from 'myst-common';
import type { GenericNode } from 'myst-common';
fwkoch marked this conversation as resolved.
Show resolved Hide resolved
import type { Text } from 'myst-spec';
import type { ProofContainer, ProofKind } from 'myst-ext-proof';
import { select } from 'unist-util-select';
import { remove } from 'unist-util-remove';
import type { Handler } from './types.js';

function kindToEnvironment(kind: ProofKind): string {
switch (kind) {
case 'theorem':
return 'theorem';
case 'proof':
return 'proof';
case 'proposition':
return 'proposition';
case 'definition':
return 'definition';
case 'example':
return 'example';
case 'remark':
return 'remark';
case 'axiom':
return 'axiom';
case 'conjecture':
return 'conjecture';
case 'lemma':
return 'lemma';
case 'observation':
return 'observation';
default:
return '';
}
}

export const proofHandler: Handler = (node, state) => {
state.usePackages('amsthm');

const p = node as ProofContainer;
const env = kindToEnvironment(p.kind);
if (!env) {
fileError(state.file, `Unhandled LaTeX proof environment "${p.kind}"`, {
node,
source: 'myst-to-tex',
fwkoch marked this conversation as resolved.
Show resolved Hide resolved
ruleId: RuleId.texRenders,
});
return;
}

const t = select('admonitionTitle > text', node);
if (t) {
// Do not render the title twice
t.type = '__delete__';
}
const newNode = remove(node, '__delete__') as GenericNode;

state.write('\\begin{');
state.write(env);
state.write('}');
if (t) {
state.write('[');
state.write((t as Text).value);
state.write(']');
}
if (newNode.identifier && newNode.identifier.length > 0) {
state.write('\\label{');
state.write(newNode.identifier);
state.write('}');
}
state.renderChildren(newNode, true);
state.write('\\end{');
state.write(env);
state.write('}');

state.data.hasProofs = true;
};

export class TexProofSerializer {
static COMMENT_LENGTH = 50;

preamble: string;

constructor() {
this.preamble = this.renderThmDefinitions();
}

private renderThmDefinitions(): string {
const definitions = [
'\\newtheorem{theorem}{Theorem}[section]',
andry-tino marked this conversation as resolved.
Show resolved Hide resolved
'\\newtheorem{corollary}{Corollary}[theorem]',
'\\newtheorem{lemma}[theorem]{Lemma}',
'\\newtheorem{proposition}{Proposition}[section]',
'\\newtheorem{definition}{Definition}[section]',
'\\newtheorem{example}{Example}[section]',
'\\newtheorem{remark}{Remark}[section]',
'\\newtheorem{axiom}{Axiom}[section]',
'\\newtheorem{conjecture}{Conjecture}[section]',
'\\newtheorem{observation}{Observation}[section]',
];
const block = writeTexLabelledComment(
'theorem',
definitions,
TexProofSerializer.COMMENT_LENGTH,
);
const percents = ''.padEnd(TexProofSerializer.COMMENT_LENGTH, '%');
return `${percents}\n${block}${percents}`;
}
}
1 change: 1 addition & 0 deletions packages/myst-to-tex/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export type StateData = {
nextCaptionNumbered?: boolean;
nextHeadingIsFrameTitle?: boolean;
nextCaptionId?: string;
hasProofs?: boolean;
mathPlugins: Required<PageFrontmatter>['math'];
imports: Set<string>;
};
Expand Down
Loading
Loading