nadesiko3 3.3.83 → 3.4.1

package/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3core",
-  "version": "3.3.82",
+  "version": "3.4.1",
   "description": "Japanese Programming Language Nadesiko v3 core",
   "main": "index.mjs",
   "type": "module",

package/core/src/nako_core_version.mjs

@@ -1,8 +1,8 @@
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const coreVersion = {
-    version: '3.3.82',
+    version: '3.4.1',
     major: 3,
-    minor: 3,
-    patch: 82
+    minor: 4,
+    patch: 1
 };
 export default coreVersion;

package/core/src/nako_core_version.mts

@@ -11,9 +11,9 @@ export interface NakoCoreVersion {
 }
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const coreVersion: NakoCoreVersion = {
-  version: '3.3.82',
+  version: '3.4.1',
   major: 3,
-  minor: 3,
-  patch: 82
+  minor: 4,
+  patch: 1
 }
 export default coreVersion

package/core/src/nako_lex_rules.mjs

@@ -6,6 +6,7 @@ const kanakanji = /^[\u3005\u4E00-\u9FCF_a-zA-Z0-9ァ-ヶー\u2460-\u24FF\u2776-
 const hira = /^[ぁ-ん]/;
 const allHiragana = /^[ぁ-ん]+$/;
 const wordHasIjoIka = /^.+(以上|以下|超|未満)$/;
+const wordSpecial = /^(かつ|または)/;
 const errorRead = (ch) => {
     return function () { throw new Error('突然の『' + ch + '』があります。'); };
 };
@@ -148,12 +149,18 @@ function cbWordParser(src, isTrimOkurigana = true) {
     let res = '';
     let josi = '';
     while (src !== '') {
+        // 1文字以上のとき
         if (res.length > 0) {
+            // 「かつ」「または」なら分割する
+            const jsw = wordSpecial.exec(src);
+            if (jsw) {
+                break;
+            }
             // 助詞の判定
             const j = josiRE.exec(src);
             if (j) {
                 josi = j[0].replace(/^\s+/, '');
-                src = src.substr(j[0].length);
+                src = src.substring(j[0].length);
                 // 助詞の直後にある「,」を飛ばす #877
                 if (src.charAt(0) === ',') {
                     src = src.substr(1);
@@ -165,18 +172,19 @@ function cbWordParser(src, isTrimOkurigana = true) {
         const m = kanakanji.exec(src);
         if (m) {
             res += m[0];
-            src = src.substr(m[0].length);
+            src = src.substring(m[0].length);
             continue;
         }
         // ひらがな？
         const h = hira.test(src);
         if (h) {
             res += src.charAt(0);
-            src = src.substr(1);
+            src = src.substring(1);
             continue;
         }
         break; // other chars
     }
+    // --- 単語分割における特殊ルール ---
     // 「間」の特殊ルール (#831)
     // 「等しい間」や「一致する間」なら「間」をsrcに戻す。ただし「システム時間」はそのままにする。
     if (/[ぁ-ん]間$/.test(res)) {
@@ -188,12 +196,13 @@ function cbWordParser(src, isTrimOkurigana = true) {
     if (ii) {
         src = ii[1] + josi + src;
         josi = '';
-        res = res.substr(0, res.length - ii[1].length);
+        res = res.substring(0, res.length - ii[1].length);
     }
     // 助詞「こと」「である」「です」などは「＊＊すること」のように使うので削除 #936 #939 #974
     if (removeJosiMap[josi]) {
         josi = '';
     }
+    // 送り仮名の省略ルール
     // 漢字カタカナ英語から始まる語句 --- 送り仮名を省略
     if (isTrimOkurigana) {
         res = trimOkurigana(res);

package/core/src/nako_lex_rules.mts

@@ -8,6 +8,7 @@ const kanakanji = /^[\u3005\u4E00-\u9FCF_a-zA-Z0-9ァ-ヶー\u2460-\u24FF\u2776-
 const hira = /^[ぁ-ん]/
 const allHiragana = /^[ぁ-ん]+$/
 const wordHasIjoIka = /^.+(以上|以下|超|未満)$/
+const wordSpecial = /^(かつ|または)/
 const errorRead = (ch: string): any => {
   return function () { throw new Error('突然の『' + ch + '』があります。') }
 }
@@ -164,12 +165,16 @@ function cbWordParser (src: string, isTrimOkurigana = true): NakoLexParseResult
   let res = ''
   let josi = ''
   while (src !== '') {
+    // 1文字以上のとき
     if (res.length > 0) {
+      // 「かつ」「または」なら分割する
+      const jsw = wordSpecial.exec(src)
+      if (jsw) { break }
       // 助詞の判定
       const j = josiRE.exec(src)
       if (j) {
         josi = j[0].replace(/^\s+/, '')
-        src = src.substr(j[0].length)
+        src = src.substring(j[0].length)
         // 助詞の直後にある「,」を飛ばす #877
         if (src.charAt(0) === ',') { src = src.substr(1) }
         break
@@ -179,18 +184,19 @@ function cbWordParser (src: string, isTrimOkurigana = true): NakoLexParseResult
     const m = kanakanji.exec(src)
     if (m) {
       res += m[0]
-      src = src.substr(m[0].length)
+      src = src.substring(m[0].length)
       continue
     }
     // ひらがな？
     const h = hira.test(src)
     if (h) {
       res += src.charAt(0)
-      src = src.substr(1)
+      src = src.substring(1)
       continue
     }
     break // other chars
   }
+  // --- 単語分割における特殊ルール ---
   // 「間」の特殊ルール (#831)
   // 「等しい間」や「一致する間」なら「間」をsrcに戻す。ただし「システム時間」はそのままにする。
   if (/[ぁ-ん]間$/.test(res)) {
@@ -202,11 +208,12 @@ function cbWordParser (src: string, isTrimOkurigana = true): NakoLexParseResult
   if (ii) {
     src = ii[1] + josi + src
     josi = ''
-    res = res.substr(0, res.length - ii[1].length)
+    res = res.substring(0, res.length - ii[1].length)
   }
   // 助詞「こと」「である」「です」などは「＊＊すること」のように使うので削除 #936 #939 #974
   if (removeJosiMap[josi]) { josi = '' }
 
+  // 送り仮名の省略ルール
   // 漢字カタカナ英語から始まる語句 --- 送り仮名を省略
   if (isTrimOkurigana) {
     res = trimOkurigana(res)

package/core/src/plugin_system.mts

@@ -463,7 +463,7 @@ export default {
   },
   '範囲内': { // @VがAからBの範囲内か // @はんいない
     type: 'func',
-    josi: [['が'], ['から'], ['の','までの']],
+    josi: [['が'], ['から'], ['の', 'までの']],
     pure: true,
     fn: function (v: any, a: any, b: any) {
       return (a <= v) && (v <= b)

package/core/test/andor_test.mjs

@@ -0,0 +1,26 @@
+/* eslint-disable no-undef */
+import assert from 'assert'
+import { NakoCompiler } from '../src/nako3.mjs'
+
+describe('or_test.js', async () => {
+  const cmp = async (/** @type {string} */ code, /** @type {string} */ res) => {
+    const nako = new NakoCompiler()
+    assert.strictEqual((await nako.runAsync(code)).log, res)
+  }
+  it('『または』がうまく動いてない #1379', async () => {
+    await cmp('(0||0)を表示', '0')
+    await cmp('(0または0)を表示', '0')
+    await cmp('(0または1)を表示', '1')
+    await cmp('ゼロ=0;(ゼロ||ゼロ)を表示', '0')
+    await cmp('ゼロ=0;(ゼロまたはゼロ)を表示', '0')
+    await cmp('ゼロ=0;イチ=1;(ゼロまたはイチ)を表示', '1')
+  })
+  it('『かつ』がうまく動いてない #1379', async () => {
+    await cmp('(0かつ0)を表示', '0')
+    await cmp('(1かつ1)を表示', '1')
+    await cmp('ゼロ=0;イチ=1;(ゼロかつゼロ)を表示', '0')
+    await cmp('ゼロ=0;イチ=1;(ゼロかつイチ)を表示', '0')
+    await cmp('ゼロ=0;イチ=1;(ゼロかつゼロ)を表示', '0')
+    await cmp('ゼロ=0;イチ=1;(イチかつイチ)を表示', '1')
+  })
+})

package/core/test/or_test.mjs

@@ -0,0 +1,30 @@
+/* eslint-disable no-undef */
+import assert from 'assert'
+import { NakoCompiler } from '../src/nako3.mjs'
+
+describe('or_test.js', async () => {
+  const cmp = async (/** @type {string} */ code, /** @type {string} */ res) => {
+    const nako = new NakoCompiler()
+    assert.strictEqual((await nako.runAsync(code)).log, res)
+  }
+  it('『または』がうまく動いてない #1379', async () => {
+    await cmp('(0||0)を表示', '0')
+    await cmp('(0または0)を表示', '0')
+    await cmp('(0または1)を表示', '1')
+    await cmp('ゼロ=0;(ゼロ||ゼロ)を表示', '0')
+    await cmp('ゼロ=0;(ゼロまたはゼロ)を表示', '0')
+    await cmp('ゼロ=0;イチ=1;(ゼロまたはイチ)を表示', '1')
+  })
+  it('『かつ』がうまく動いてない #1379', async () => {
+    await cmp('(0かつ0)を表示', '0')
+    await cmp('(1かつ1)を表示', '1')
+    await cmp('ゼロ=0;イチ=1;(ゼロかつゼロ)を表示', '0')
+    await cmp('ゼロ=0;イチ=1;(ゼロかつイチ)を表示', '0')
+    await cmp('ゼロ=0;イチ=1;(ゼロかつゼロ)を表示', '0')
+    await cmp('ゼロ=0;イチ=1;(イチかつイチ)を表示', '1')
+  })
+  it('『または』が動かない #1379', async () => {
+    await cmp('条件イははい。条件ロはいいえ。もし、条件イまたは条件ロならば「AAA」と表示。', 'AAA')
+    await cmp('条件イははい。条件ロははい。もし、条件イかつ条件ロならば「BBB」と表示。', 'BBB')
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3",
-  "version": "3.3.83",
+  "version": "3.4.1",
   "description": "Japanese Programming Language",
   "type": "module",
   "main": "src/index.mjs",

package/release/_hash.txt

@@ -9,10 +9,10 @@ editor.js:
   sha256(base64): AKs71TgblihDpp84UJZwzLbQRH4uHuwj7ZJMfMPZK8k=
   sha512(base64): K9Hp76NUQnMlUeuV++HHrbnhlJpUH0lOXb6kewFf4VWqA7Cs7udcyiXAYZBZDDGZHEGfyHhU4TjPoivEKsikVQ==
 nako_gen_async.js:
-  md5(hex): 54370beeb81641625d56b9c6eb790f3e
-  sha256(hex): c96a0f126c6c4e1e6ae17923304a123b2b4c967983f6979c855d9ff49c924cc3
-  sha256(base64): yWoPEmxsTh5q4XkjMEoSOytMlnmD9pechV2f9JySTMM=
-  sha512(base64): m+SmnCg2ooA9zro2tIx4ZEyVISiw6oK7DZvTvCbQYEhNxIZHpUoe4cOdOWhueA6nrPahbSP0S0eRo70dUBNOPg==
+  md5(hex): fe5a301a302834cf168ea1b52ea1114a
+  sha256(hex): 3934d0e8c6fd8241f175640a895a07eec122c52bd579882f3770de518c4bf638
+  sha256(base64): OTTQ6Mb9gkHxdWQKiVoH7sEixSvVeYgvN3DeUYxL9jg=
+  sha512(base64): DZsoBWxek3lqI3AWSHDHDh8roGBwkjUxNFBYfMw/9P9pBDZle12XW64UHCY9Bs9ToDV9aMqn92oI57n1j2J6rA==
 plugin_caniuse.js:
   md5(hex): 95a7a5c98a92a46b6435e577daba3241
   sha256(hex): 57638b3979be70b45ab8085861f6b2ece43200bd6aa92765d73caf76b9e6fea9
@@ -54,17 +54,17 @@ plugin_weykturtle3d.js:
   sha256(base64): ND/1JqYrFVGTIPYsbBk+tScnF8RVzgYPM0/E2aE8GRw=
   sha512(base64): T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==
 version.js:
-  md5(hex): 0a41f5aa2a24979cd2b4f52265542820
-  sha256(hex): 83b482248402b5dbb04bf71365b4433c07c4a305983697ca7fc3f70593172402
-  sha256(base64): g7SCJIQCtduwS/cTZbRDPAfEowWYNpfKf8P3BZMXJAI=
-  sha512(base64): LnBDfrfkwPssYPKsKUeEu+ChdHDe8vSyMKcxIgY1DnCYFWcq4OMLns2Cpvrd3TRpV6LNd7Zvsk5ovgsTVGCK0A==
+  md5(hex): 8593908cb66e37f89a5c653b5baea398
+  sha256(hex): 61520bc06672ab62082211f93bc8ba87908e22a8e294c33677a25002e0206403
+  sha256(base64): YVILwGZyq2IIIhH5O8i6h5COIqjilMM2d6JQAuAgZAM=
+  sha512(base64): 6HnPJpnGj+vucUs4ktOTQL0sw5yL23IgOT9LJMruPOmF7mKcLE+xDA4D/fDVeY9szTt1PB2mlMc/+Q6MVG7pwg==
 wnako3.js:
-  md5(hex): baeb8f4966df6246262c0dc4c2f5673d
-  sha256(hex): f480846ebd693a77133b18c47100f7cc48641b6fc9b46e1e57c2bd44f14afcab
-  sha256(base64): 9ICEbr1pOncTOxjEcQD3zEhkG2/JtG4eV8K9RPFK/Ks=
-  sha512(base64): 66dB501XPBEj4uhGaoaIWLv1NhmBOK8tQqTXeOwoOz0VvfFtihHUIQASfxZHK7qNglTIxsMderf8gkAjXSXVLw==
+  md5(hex): 67df3591c0c30d500e576e6a6feba498
+  sha256(hex): 593374d615993d322871308aa6f437f7db83a8883049e212706dd9568bac2d1a
+  sha256(base64): WTN01hWZPTIocTCKpvQ399uDqIgwSeIScG3ZVousLRo=
+  sha512(base64): ZsWFnKhQ7uXqi7Bv9kdeAKznuLIu9Il3F9J+BYq2OubEaJCPIyY0aL0seYjX1jLIqtpgJMzLo1gBLxyDb9YJVw==
 wnako3webworker.js:
-  md5(hex): a804b0849cc1b2f2b86c33339ad0bd61
-  sha256(hex): 593b6414fb14b476bb23161c99c0a9c04be092e6eb2c3585f1d995f14c56211d
-  sha256(base64): WTtkFPsUtHa7IxYcmcCpwEvgkubrLDWF8dmV8UxWIR0=
-  sha512(base64): /CxzB9m+bP0E4XeRGIx5DQ5qvHFtCZbWe0pP/SXu4RGd4kWEI+RkuZlztozjVAyzvlvoh4F1ffiaoS6rfuoIyA==
+  md5(hex): 090c10d08907019b43e0730d462d7960
+  sha256(hex): f2fd033e345e8ade4ca8c6bc648099e34605667ee7f2969c69c8943d73a1271a
+  sha256(base64): 8v0DPjReit5MqMa8ZICZ40YFZn7n8pacaciUPXOhJxo=
+  sha512(base64): OLJg7uNBJWVntCWlebkTG5JB7HQnXQBNbbuHK41vgdS3mMO8YzfPLJ3HMbqqtJwZzk0xLwa5U6k5g3gvhxT6XA==

package/release/_script-tags.txt

@@ -1,14 +1,14 @@
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/command.json.js" integrity="sha512-SJzO+9IGCegE/L5x7MinvtrYbFHNZO2qt+bYsscZN0FKL6ADBXZp4GzFD0D7Xd7jNcw8vr4X4TkEsuyYGHLBrQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/editor.js" integrity="sha512-K9Hp76NUQnMlUeuV++HHrbnhlJpUH0lOXb6kewFf4VWqA7Cs7udcyiXAYZBZDDGZHEGfyHhU4TjPoivEKsikVQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/nako_gen_async.js" integrity="sha512-m+SmnCg2ooA9zro2tIx4ZEyVISiw6oK7DZvTvCbQYEhNxIZHpUoe4cOdOWhueA6nrPahbSP0S0eRo70dUBNOPg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/plugin_caniuse.js" integrity="sha512-NbX6BKUNq1J8xwtv5CThQC54Lb/KxaPlimRpsF745nxqjYeuGD7S70j4yOgNm4Uwd7AN5FgezS6NDyhlvoJF2w==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/plugin_csv.js" integrity="sha512-mQvmj25L2Nc2L7gN1rTjayHVMMPhc7TCSiBsuKS4JKOQqN+91uj9qpLAOejzR1ib5jIOBdtrhN+secNTU9BJtw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/plugin_datetime.js" integrity="sha512-1ADTZFkcfU6vpEEJZEYmIbqS6G2XViooDFD4198P61n7VKZ0PhEVj9l8ULFGrW7woSbDqfSPZmkZ7yvcRqPKYA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/plugin_kansuji.js" integrity="sha512-tXC9Q6LejwYG+HUbXcwBHFmhwTsqiMHOBohLNcSx8b02hxk3waPUEQRWeNP7QxAFMv5BOAY+Grruf+XKmmU26g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/plugin_markup.js" integrity="sha512-pvb+QYO9LMUH055nPJJ5QaWyEYR3wDkHHilV5LLNyxObs7enlHGiF7Jt3Csd93JTdJ3n9hxFbTqWa1QuzVmTfQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/plugin_turtle.js" integrity="sha512-ADtegZGlBz0Uk7DKn2zzkVUaA7cdVCRbyc4iOGwEFmXdx0KtzYKumgKIHQiniH3AdGMBhgGf6WZI3y7xcLoFmw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/plugin_webworker.js" integrity="sha512-JLlIg9cW9UgM2AT+qMgEuKvea3t8R+1jihhlN/QGDQe7iCaGEfXfKG5gpvRb0IUyisNfzncUN8AfLn9wyxGGiw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/plugin_weykturtle3d.js" integrity="sha512-T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/version.js" integrity="sha512-LnBDfrfkwPssYPKsKUeEu+ChdHDe8vSyMKcxIgY1DnCYFWcq4OMLns2Cpvrd3TRpV6LNd7Zvsk5ovgsTVGCK0A==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/wnako3.js" integrity="sha512-66dB501XPBEj4uhGaoaIWLv1NhmBOK8tQqTXeOwoOz0VvfFtihHUIQASfxZHK7qNglTIxsMderf8gkAjXSXVLw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.83&f=release/wnako3webworker.js" integrity="sha512-/CxzB9m+bP0E4XeRGIx5DQ5qvHFtCZbWe0pP/SXu4RGd4kWEI+RkuZlztozjVAyzvlvoh4F1ffiaoS6rfuoIyA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/command.json.js" integrity="sha512-SJzO+9IGCegE/L5x7MinvtrYbFHNZO2qt+bYsscZN0FKL6ADBXZp4GzFD0D7Xd7jNcw8vr4X4TkEsuyYGHLBrQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/editor.js" integrity="sha512-K9Hp76NUQnMlUeuV++HHrbnhlJpUH0lOXb6kewFf4VWqA7Cs7udcyiXAYZBZDDGZHEGfyHhU4TjPoivEKsikVQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/nako_gen_async.js" integrity="sha512-DZsoBWxek3lqI3AWSHDHDh8roGBwkjUxNFBYfMw/9P9pBDZle12XW64UHCY9Bs9ToDV9aMqn92oI57n1j2J6rA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/plugin_caniuse.js" integrity="sha512-NbX6BKUNq1J8xwtv5CThQC54Lb/KxaPlimRpsF745nxqjYeuGD7S70j4yOgNm4Uwd7AN5FgezS6NDyhlvoJF2w==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/plugin_csv.js" integrity="sha512-mQvmj25L2Nc2L7gN1rTjayHVMMPhc7TCSiBsuKS4JKOQqN+91uj9qpLAOejzR1ib5jIOBdtrhN+secNTU9BJtw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/plugin_datetime.js" integrity="sha512-1ADTZFkcfU6vpEEJZEYmIbqS6G2XViooDFD4198P61n7VKZ0PhEVj9l8ULFGrW7woSbDqfSPZmkZ7yvcRqPKYA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/plugin_kansuji.js" integrity="sha512-tXC9Q6LejwYG+HUbXcwBHFmhwTsqiMHOBohLNcSx8b02hxk3waPUEQRWeNP7QxAFMv5BOAY+Grruf+XKmmU26g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/plugin_markup.js" integrity="sha512-pvb+QYO9LMUH055nPJJ5QaWyEYR3wDkHHilV5LLNyxObs7enlHGiF7Jt3Csd93JTdJ3n9hxFbTqWa1QuzVmTfQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/plugin_turtle.js" integrity="sha512-ADtegZGlBz0Uk7DKn2zzkVUaA7cdVCRbyc4iOGwEFmXdx0KtzYKumgKIHQiniH3AdGMBhgGf6WZI3y7xcLoFmw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/plugin_webworker.js" integrity="sha512-JLlIg9cW9UgM2AT+qMgEuKvea3t8R+1jihhlN/QGDQe7iCaGEfXfKG5gpvRb0IUyisNfzncUN8AfLn9wyxGGiw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/plugin_weykturtle3d.js" integrity="sha512-T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/version.js" integrity="sha512-6HnPJpnGj+vucUs4ktOTQL0sw5yL23IgOT9LJMruPOmF7mKcLE+xDA4D/fDVeY9szTt1PB2mlMc/+Q6MVG7pwg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/wnako3.js" integrity="sha512-ZsWFnKhQ7uXqi7Bv9kdeAKznuLIu9Il3F9J+BYq2OubEaJCPIyY0aL0seYjX1jLIqtpgJMzLo1gBLxyDb9YJVw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.4.1&f=release/wnako3webworker.js" integrity="sha512-OLJg7uNBJWVntCWlebkTG5JB7HQnXQBNbbuHK41vgdS3mMO8YzfPLJ3HMbqqtJwZzk0xLwa5U6k5g3gvhxT6XA==" crossorigin="anonymous"></script>