Merge branch 'develop' into 'master'

Small maintainance update

See merge request Dandellion/matrix-wug!15
This commit is contained in:
Daniel Løvbrøtte Olsen 2020-07-16 17:31:46 +00:00
commit dfbe938b68
4 changed files with 372 additions and 512 deletions

View File

@ -10,14 +10,8 @@ p[x2"owis x1"ek'wo:s-kve] gives *h₂ówis h₁é"kwōs-kʷe
Guides to these systems can be found here: Guides to these systems can be found here:
X-sampa: https://en.wikipedia.org/wiki/X-SAMPA X-sampa: https://en.wikipedia.org/wiki/X-SAMPA
Z-sampa: http://www.kneequickie.com/kq/Z-SAMPA Z-sampa: https://web.archive.org/web/20191116002807/http://kneequickie.com/kq/Z-SAMPA
For the PIE notation: APIE: https://gist.github.com/xsduan/8ebd580be71214c57aa554ec9050916c
* a preceding " is acute accent
* a following : is the macron
* a following . is the syllabicity marker
* h always becomes superscript and v is superscript w.
* Palato-velars are marked with a following ' and x1, x2, x3 etc. yields the laryngeals, with x@ for the subscript a laryngeal, and xx for an unknown laryngeal.
This is best learned by experimenting. This is best learned by experimenting.

View File

@ -1,4 +1,4 @@
const version = "2.3.1"; const version = "2.3.2";
import x2i from "./x2i"; import x2i from "./x2i";
import { existsSync } from "fs"; import { existsSync } from "fs";
@ -24,6 +24,7 @@ async function handle(roomId, event) {
if (event.unsigned.age > 1000 * 60) { console.log("Message was old!"); return; }; if (event.unsigned.age > 1000 * 60) { console.log("Message was old!"); return; };
if (event.sender === await myself) { console.log("Wait a minute... That's me!"); return;}; if (event.sender === await myself) { console.log("Wait a minute... That's me!"); return;};
if (event.content.msgtype === "m.notice") { return; };
if (event.content.body === "!xhelp" || event.content.body === (await client.getUserProfile(await myself)).displayname + ": help") {help(roomId); return;}; if (event.content.body === "!xhelp" || event.content.body === (await client.getUserProfile(await myself)).displayname + ": help") {help(roomId); return;};
if (event.content.body === "!xik") {xik(roomId); return;}; if (event.content.body === "!xik") {xik(roomId); return;};
@ -46,8 +47,8 @@ function help(roomId) {
To use me, type a key together with either / or [] as delimeters To use me, type a key together with either / or [] as delimeters
x - X-SAMPA - https://en.wikipedia.org/wiki/X-SAMPA x - X-SAMPA - https://en.wikipedia.org/wiki/X-SAMPA
z - Z-SAMPA - http://www.kneequickie.com/kq/Z-SAMPA z - Z-SAMPA - https://web.archive.org/web/20191116002807/http://kneequickie.com/kq/Z-SAMPA
p - Proto-Indo-European Notation (see !xpie) p - Proto-Indo-European Notation - https://gist.github.com/xsduan/8ebd580be71214c57aa554ec9050916c
i - Inuktitut Syllabics - https://en.wikipedia.org/wiki/Inuktitut_syllabics i - Inuktitut Syllabics - https://en.wikipedia.org/wiki/Inuktitut_syllabics
ik - Iñupiatun Orthographies (see !xik) ik - Iñupiatun Orthographies (see !xik)
chr - Cherokee (see !xchr) - https://en.wikipedia.org/wiki/Cherokee_syllabary chr - Cherokee (see !xchr) - https://en.wikipedia.org/wiki/Cherokee_syllabary
@ -72,7 +73,7 @@ a following . is the syllabicity marker
h always becomes superscript and v is superscript w. h always becomes superscript and v is superscript w.
Palato-velars are marked with a following ' and x1, x2, x3 etc. yields the laryngeals, with x@ for the subscript a laryngeal, and xx for an unknown laryngeal. Palato-velars are marked with a following ' and x1, x2, x3 etc. yields the laryngeals, with x@ for the subscript a laryngeal, and xx for an unknown laryngeal.
There's probably more, but this is best learned by experimenting (or reading https://github.com/dali99/matrix-wug/blob/master/x2i/apie-keys.yaml) There's probably more, but this is best learned by experimenting (or reading https://gist.github.com/xsduan/8ebd580be71214c57aa554ec9050916c)
Thanks to conniebot (xsduan) for the encoding`; Thanks to conniebot (xsduan) for the encoding`;

864
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -77,8 +77,9 @@ const matchType: { [key: string]: IMatchInstructions } = {
* @returns Compiled keys. * @returns Compiled keys.
*/ */
function readKeys(fpath: string) { function readKeys(fpath: string) {
return yaml var keys: any = yaml
.safeLoad(fs.readFileSync(fpath, "utf8")) .safeLoad(fs.readFileSync(fpath, "utf8"))
return keys
.map(compileKey) .map(compileKey)
.filter(Boolean) as CompiledReplacer[]; .filter(Boolean) as CompiledReplacer[];
} }