honkit 6.0.0 → 6.0.2

package/lib/output/modifiers/annotateText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotateText.d.ts","sourceRoot":"","sources":["../../../src/output/modifiers/annotateText.ts"],"names":[],"mappings":"AAwDA;;;;;;GAMG;AACH,iBAAS,YAAY,CAAC,OAAO,KAAA,EAAE,gBAAgB,KAAA,EAAE,CAAC,KAAA,QAqBjD;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"annotateText.d.ts","sourceRoot":"","sources":["../../../src/output/modifiers/annotateText.ts"],"names":[],"mappings":"AAyDA;;;;;;GAMG;AACH,iBAAS,YAAY,CAAC,OAAO,KAAA,EAAE,gBAAgB,KAAA,EAAE,CAAC,KAAA,QA4BjD;AAED,eAAe,YAAY,CAAC"}

package/lib/output/modifiers/annotateText.js

@@ -20,14 +20,15 @@ function replaceText($, el, search, replace, text_only) {
             // Loop over all childNodes.
             while (node) {
                 // Only process text nodes.
-                if (node.nodeType === 3) {
+                if (node.nodeType === 3 && node.nodeValue) {
                     // The original node value.
                     val = node.nodeValue;
                     new_val = val.replace(search, replace);
                     // Only replace text if the new value is actually different!
                     if (new_val !== val) {
                         if (!text_only && /</.test(new_val)) {
-                            // The new value contains HTML, set it in a slower but far more                              // robust way.
+                            // The new value contains HTML, set it in a slower but far more
+                            // robust way.
                             // Don't remove the node yet, or the loop will lose its place.
                             const currentTextNode = $(node);
                             const newHTML = val.replace(val, new_val);
@@ -64,16 +65,21 @@ function annotateText(entries, glossaryFilePath, $) {
     entries.forEach((entry) => {
         const entryId = entry.getID();
         const name = entry.getName();
+        const nameLowerCase = `${name}`.toLowerCase();
+        const quotedName = pregQuote(nameLowerCase);
+        const nameCleaned = nameLowerCase.replace(/[^\w\s]/, "");
+        const searchRegex = nameLowerCase === nameCleaned
+            ? new RegExp(`\\b(${quotedName})\\b`, "gi")
+            : new RegExp(`(?:\\s*)(${quotedName})(?:\\s*)`, "gi");
         const description = entry.getDescription();
-        const searchRegex = new RegExp(`\\b(${pregQuote(name.toLowerCase())})\\b`, "gi");
         $("*").each(function () {
             const $this = $(this);
             if ($this.is(ANNOTATION_IGNORE) || $this.parents(ANNOTATION_IGNORE).length > 0)
                 return;
             // @ts-expect-error ts-migrate(2554) FIXME: Expected 5 arguments, but got 4.
-            replaceText($, this, searchRegex, (match) => {
+            replaceText($, this, searchRegex, (match, matchedTerm) => {
                 return (`<a href="/${glossaryFilePath}#${entryId}" ` +
-                    `class="glossary-term" title="${(0, escape_html_1.default)(description)}">${match}</a>`);
+                    `class="glossary-term" title="${(0, escape_html_1.default)(description)}">${matchedTerm}</a>`);
             });
         });
     });

package/lib/plugins/PluginResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginResolver.d.ts","sourceRoot":"","sources":["../../src/plugins/PluginResolver.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;;GAYG;AAEH,qBAAa,cAAc;IACvB,aAAa,EAAE,MAAM,CAAC;gBAEV,MAAM,GAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAO;IAOnD;;;;OAIG;IACH,wBAAwB,CAAC,WAAW,KAAA;CAyBvC"}
+{"version":3,"file":"PluginResolver.d.ts","sourceRoot":"","sources":["../../src/plugins/PluginResolver.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;GAYG;AAEH,qBAAa,cAAc;IACvB,aAAa,EAAE,MAAM,CAAC;gBAEV,MAAM,GAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAO;IAOnD;;;;OAIG;IACH,wBAAwB,CAAC,WAAW,KAAA;CAyBvC"}

package/lib/plugins/PluginResolver.js

@@ -32,6 +32,7 @@ const path_1 = __importDefault(require("path"));
 const util = __importStar(require("./package-name-util"));
 const try_resolve_1 = __importDefault(require("try-resolve"));
 const SPECIAL_PACKAGE_NAME = [
+    "fontsettings", // → @honkit/honkit-plugin-fontsettings
     "highlight", // → @honkit/honkit-plugin-highlight
     "theme-default" // → @honkit/honkit-plugin-theme-default
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "honkit",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "HonKit is building beautiful books using Markdown.",
   "keywords": [
     "git",
@@ -37,11 +37,12 @@
     "updateSnapshot": "jest src -u"
   },
   "dependencies": {
-    "@honkit/asciidoc": "6.0.0",
-    "@honkit/honkit-plugin-highlight": "6.0.0",
-    "@honkit/honkit-plugin-theme-default": "6.0.0",
-    "@honkit/html": "6.0.0",
-    "@honkit/markdown-legacy": "6.0.0",
+    "@honkit/asciidoc": "6.0.2",
+    "@honkit/honkit-plugin-fontsettings": "6.0.2",
+    "@honkit/honkit-plugin-highlight": "6.0.2",
+    "@honkit/honkit-plugin-theme-default": "6.0.2",
+    "@honkit/html": "6.0.2",
+    "@honkit/markdown-legacy": "6.0.2",
     "bash-color": "^0.0.4",
     "cheerio": "^1.0.0",
     "chokidar": "^3.6.0",
@@ -58,7 +59,6 @@
     "extend": "^3.0.2",
     "flat-cache": "^2.0.1",
     "front-matter": "^2.3.0",
-    "gitbook-plugin-fontsettings": "^2.0.0",
     "gitbook-plugin-livereload": "^0.0.1",
     "gitbook-plugin-lunr": "^1.2.0",
     "gitbook-plugin-search": "^2.2.1",
@@ -90,7 +90,7 @@
     "urijs": "^1.19.11"
   },
   "devDependencies": {
-    "@honkit/internal-test-utils": "6.0.0",
+    "@honkit/internal-test-utils": "6.0.2",
     "@relmify/jest-serializer-strip-ansi": "^1.0.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^22.7.4",
@@ -101,5 +101,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^5.6.2"
   },
-  "gitHead": "367fe659a4a33c656ae51a1ec75fff0447365f9f"
+  "gitHead": "9dcd51c588177ee3a684788c633a67b82dea82a5"
 }