Merge pull request #4 from toaq/little-n-little-a

little 𝘯, little 𝘢

package.json

@@ -18,6 +18,7 @@
 	"description": "Tools for parsing Toaq Delta",
 	"main": "index.js",
 	"scripts": {
+		"postinstall": "npm run codegen",
 		"test": "echo \"Error: no tests configured\" && exit 1",
 		"prettier:check": "npx -p prettier prettier -c .",
 		"prettier:format": "npx -p prettier prettier -w .",

src/grammar.ts

@@ -108,8 +108,8 @@ const grammar: Grammar = {
     {"name": "DP", "symbols": [(lexer.has("pronoun") ? {type: "pronoun"} : pronoun)], "postprocess": makeLeaf('DP')},
     {"name": "DP", "symbols": ["D", "nP"], "postprocess": makeBranch('DP')},
     {"name": "DP", "symbols": ["Focus", "DP"], "postprocess": makeBranch('FocusP')},
-    {"name": "nP", "symbols": ["nP", "CPrel"], "postprocess": makeBranch('nP')},
-    {"name": "nP", "symbols": ["CPdet"], "postprocess": makeBranchCovertLeft('nP', 'n')},
+    {"name": "nP", "symbols": ["nP", "CPrel"], "postprocess": makeBranch('𝘯P')},
+    {"name": "nP", "symbols": ["CPdet"], "postprocess": makeBranchCovertLeft('𝘯P', '𝘯')},
     {"name": "Clause", "symbols": ["term", "Bi", "Clause"], "postprocess": make3L('TopicP', "Topic'")},
     {"name": "Clause", "symbols": ["MTP"], "postprocess": id},
     {"name": "Clause", "symbols": ["DP", "Na", "CPrelna"], "postprocess": make3L('𝘷P', "𝘷'")},

src/latex.ts

@@ -58,6 +58,8 @@ export function toDocument(trees: (Tree | DTree)[]): string {
 %\\newunicodechar{ꝡ}{w\\hspace{-5pt}\\clipbox{0pt 0pt 0pt 4.3pt}{y}}
 \\newunicodechar{Ꝡ}{W\\hspace{-4.9pt}\\clipbox{0pt 0pt 0pt 4pt}{y}}
 \\newunicodechar{ꝡ}{w\\hspace{-4.2pt}\\clipbox{0pt 0pt 0pt 4pt}{y}}
+\\newunicodechar{𝘢}{$a$}
+\\newunicodechar{𝘯}{$n$}
 \\newunicodechar{𝘷}{$v$}
 \\usetikzlibrary{arrows.meta}
 \\tikzset{>={Stealth[width=2mm,length=2mm]}}

src/semantics/denote.ts

@@ -523,7 +523,7 @@ function denoteLeaf(leaf: Leaf, cCommand: StrictTree | null): DTree {
 	} else if (leaf.label === 'D') {
 		denotation = boundThe;
 		bindings = boundTheBindings;
-	} else if (leaf.label === 'n') {
+	} else if (leaf.label === '𝘯') {
 		if (cCommand === null)
 			throw new Impossible("Can't denote an n in isolation");
 		const vp = findVp(cCommand);
@@ -815,7 +815,7 @@ function getCompositionRule(left: DTree, right: DTree): CompositionRule {
 	switch (left.label) {
 		case 'V':
 		case 'Asp':
-		case 'n':
+		case '𝘯':
 		case 'Q':
 			return functionalApplication;
 		case 'T':

src/serial.ts

@@ -133,8 +133,8 @@ function attachAdjective(VP: Tree, vP: Tree): Tree {
 		label: 'VP',
 		left: VP,
 		right: {
-			label: 'aP',
-			left: makeNull('a'), // TODO ki-
+			label: '𝘢P',
+			left: makeNull('𝘢'), // TODO ki-
 			right: {
 				// TODO: oh god, adjectives can have T and Asp?
 				// needs rework in nearley grammar

src/toaq.ne

@@ -58,9 +58,9 @@ DP -> D nP {% makeBranch('DP') %}
 # kú jí
 DP -> Focus DP {% makeBranch('FocusP') %}
 # (sá) ꝡë hao
-nP -> nP CPrel {% makeBranch('nP') %}
+nP -> nP CPrel {% makeBranch('𝘯P') %}
 # (sá) ∅ hao
-nP -> CPdet {% makeBranchCovertLeft('nP', 'n') %}
+nP -> CPdet {% makeBranchCovertLeft('𝘯P', '𝘯') %}
 
 # ní bï pu hao
 Clause -> term Bi Clause {% make3L('TopicP', "Topic'") %}

src/tree.ts

@@ -34,8 +34,8 @@ export type Label =
 	| '&'
 	| "&'"
 	| '&P'
-	| 'a'
-	| 'aP'
+	| '𝘢'
+	| '𝘢P'
 	| 'Adjunct'
 	| 'AdjunctP'
 	| 'Asp'
@@ -66,8 +66,8 @@ export type Label =
 	| 'ModalP'
 	| 'mu'
 	| 'muP'
-	| 'n'
-	| 'nP'
+	| '𝘯'
+	| '𝘯P'
 	| 'Q'
 	| 'QP'
 	| 'SA'