Merge pull request #7 from tomoemon/naginatashiki

薙刀式のサポート（同時押し系配列の一般的なサポート）

Author: tomoemon

examples/react-simple/src/App.tsx

@@ -27,14 +27,14 @@ function Typing(props: { layout: KeyboardLayout }) {
     return activate(window, (e) => {
       setLastInputKey(e.input);
       const result = automatons[wordIndex].input(e);
+      console.log(e.input.key.toString(), e.input.type, result);
       if (result.isFinished) {
         automatons[wordIndex].reset();
         setWordIndex((current) => (current + 1) % words.length);
       }
     });
   }, [wordIndex, automatons]);
   const automaton = automatons[wordIndex];
-  console.log(automaton);
   return (
     <>
       <h1>

examples/react-stroke-graph/src/App.tsx

@@ -1,6 +1,6 @@
 import cytoscape from "cytoscape";
 import dagre from "cytoscape-dagre";
-import { Automaton, detectKeyboardLayout, KeyboardLayout, loadPresetRuleJisKana, loadPresetRuleNicola, loadPresetRuleRoman } from "emiel";
+import { Automaton, detectKeyboardLayout, KeyboardLayout, loadPresetRuleJisKana, loadPresetRuleNaginatashikiV15, loadPresetRuleNicola, loadPresetRuleRoman } from "emiel";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import "./App.css";
 import { TypingGraph } from "./typingGraph";
@@ -21,6 +21,7 @@ function Typing(props: { layout: KeyboardLayout }) {
     { name: "ローマ字", rule: loadPresetRuleRoman(props.layout) },
     { name: "JISかな", rule: loadPresetRuleJisKana(props.layout) },
     { name: "NICOLA", rule: loadPresetRuleNicola(props.layout) },
+    { name: "薙刀式", rule: loadPresetRuleNaginatashikiV15(props.layout) },
   ], [props.layout]);
   const [automaton, setAutomaton] = useState<Automaton | undefined>(
     undefined
@@ -29,7 +30,7 @@ function Typing(props: { layout: KeyboardLayout }) {
   const [wordIndex, setWordIndex] = useState(0);
   const [ruleIndex, setRuleIndex] = useState(0);
   const onFinished = useCallback(() => {
-    const words = ["おをひく", "こんとん", "がっこう", "aから@"];
+    const words = ["じょをひく", "しるため", "しょうがっこう"];
     const automaton = rules[ruleIndex].rule.build(words[wordIndex]);
     setAutomaton(automaton);
     setRuleName(rules[ruleIndex].name);

examples/react-stroke-graph/src/graphData.ts

@@ -52,13 +52,13 @@ function strokeToString(stroke: emiel.StrokeEdge): string {
             v === emiel.VirtualKeys.ShiftLeft ||
             v === emiel.VirtualKeys.ShiftRight
           ) {
-            return "Sft";
+            return "⇧";
           }
           return keyToString(v);
         })
     )
-  ).join(",");
-  return keyToString(key) + (modStr.length > 0 ? `/${modStr}` : "");
+  ).join("|");
+  return (modStr.length > 0 ? `${modStr}|` : "") + keyToString(key);
 }
 
 function keyToString(key: emiel.VirtualKey): string {

examples/react-stroke-graph/src/typingGraph.tsx

@@ -1,9 +1,9 @@
+import cytoscape from "cytoscape";
+import dagre from "cytoscape-dagre";
+import * as emiel from "emiel";
 import { useEffect, useRef, useState } from "react";
 import { buildGraphData } from "./graphData";
-import dagre from "cytoscape-dagre";
-import cytoscape from "cytoscape";
 import { cyStylesheet } from "./grpahStyle";
-import * as emiel from "emiel";
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 cytoscape.use(dagre);
@@ -33,6 +33,7 @@ export function TypingGraph(props: {
     return emiel.activate(window, (e) => {
       setLastInputKey(e.input);
       const result = automaton.input(e);
+      console.log(e.input.key.toString(), e.input.type, result);
       if (result.isFinished) {
         props.onFinished();
       } else if (result.isSucceeded) {

src/assets/rules/jis_kana.json

@@ -1,6 +1,5 @@
 {
   "extendCommonPrefixEntry": false,
-  "modifiers": ["ShiftLeft", "ShiftRight"],
   "entries": [
     {
       "input": [