@kensio/pinyinjs 1.10.3 → 1.10.5

package/dist/orthography/punctuation.js

@@ -20,6 +20,25 @@ const LATIN_PUNCTUATION = new Map([
  * Marks that take a space after them but not before.
  */
 const SPACE_AFTER = new Set([".", ",", ";", ":", "?", "!"]);
+/**
+ * Marks that close something, which take the space of a mark just inside them.
+ *
+ * 你好。” ends with the full stop inside the quotation, so `nǐ hǎo.”` keeps
+ * the two together, and whatever follows is spaced from the closing mark
+ * instead: “我会回来，”汤姆说 is `“Wǒ huì huílai,” Tāngmǔ shuō`.
+ */
+const CLOSING = new Set([
+    "”",
+    "’",
+    "」",
+    "』",
+    "）",
+    ")",
+    "》",
+    "〉",
+    "】",
+    "]",
+]);
 /**
  * Rewrite Chinese punctuation in the Latin script.
  *
@@ -41,17 +60,39 @@ export function toLatinPunctuation(text) {
 export function toLatinPunctuationParts(parts) {
     return rewriteParts(parts, latinCharacters);
 }
+/**
+ * Whether a space belongs after the character at a position, given what
+ * follows it.
+ */
+function isSpacedBefore(next) {
+    return next !== undefined && next !== " " && !CLOSING.has(next);
+}
+/**
+ * Whether the closing marks ending at a position close straight after a
+ * full-width mark that takes a space.
+ */
+function closesSpacedMark(characters, at) {
+    let before = at - 1;
+    while (CLOSING.has(characters[before] ?? "")) {
+        before--;
+    }
+    const latin = LATIN_PUNCTUATION.get(characters[before] ?? "");
+    return latin !== undefined && SPACE_AFTER.has(latin);
+}
 /**
  * Rewrite each Chinese mark in the Latin script, character by character.
  */
 const latinCharacters = (characters) => characters.map((character, at) => {
+    const next = characters[at + 1];
+    if (CLOSING.has(character)) {
+        return closesSpacedMark(characters, at) && isSpacedBefore(next)
+            ? `${character} `
+            : character;
+    }
     const latin = LATIN_PUNCTUATION.get(character);
     if (latin === undefined) {
         return character;
     }
-    const next = characters[at + 1];
-    return SPACE_AFTER.has(latin) && next !== undefined && next !== " "
-        ? `${latin} `
-        : latin;
+    return SPACE_AFTER.has(latin) && isSpacedBefore(next) ? `${latin} ` : latin;
 });
 //# sourceMappingURL=punctuation.js.map

package/dist/orthography/punctuation.js.map

@@ -1 +1 @@
-{"version":3,"file":"punctuation.js","sourceRoot":"","sources":["../../src/orthography/punctuation.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,YAAY,EAAE,MAAM,YAAY,CAAC;AAWlE;;;;;;;GAOG;AACH,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAiB;IAChD,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;CACX,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,2EAA2E;IAC3E,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AAC1D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAAwB;IAExB,OAAO,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,MAAM,eAAe,GAAsB,CAAC,UAAU,EAAE,EAAE,CACxD,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE;IAC/B,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAChC,OAAO,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,GAAG;QACjE,CAAC,CAAC,GAAG,KAAK,GAAG;QACb,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"punctuation.js","sourceRoot":"","sources":["../../src/orthography/punctuation.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,YAAY,EAAE,MAAM,YAAY,CAAC;AAWlE;;;;;;;GAOG;AACH,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAiB;IAChD,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,GAAG,CAAC;CACX,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAE5D;;;;;;GAMG;AACH,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;IACtB,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;IACH,GAAG;CACJ,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,2EAA2E;IAC3E,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AAC1D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAAwB;IAExB,OAAO,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,IAAwB;IAC9C,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAClE,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,UAA6B,EAAE,EAAU;IACjE,IAAI,MAAM,GAAG,EAAE,GAAG,CAAC,CAAC;IACpB,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAC7C,MAAM,EAAE,CAAC;IACX,CAAC;IACD,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9D,OAAO,KAAK,KAAK,SAAS,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,MAAM,eAAe,GAAsB,CAAC,UAAU,EAAE,EAAE,CACxD,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE;IAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAChC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,OAAO,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC;YAC7D,CAAC,CAAC,GAAG,SAAS,GAAG;YACjB,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IACD,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AAC9E,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kensio/pinyinjs",
-  "version": "1.10.3",
+  "version": "1.10.5",
   "description": "Chinese hanzi to pinyin conversion",
   "repository": "https://github.com/KensioSoftware/pinyinjs",
   "homepage": "https://pinyinjs.dev",