Merge branch 'jow-:master' into improve_test_on_macos

jow- · Oct 20, 2023 · 7f9e809 · 7f9e809
2 parents ea756fd + 07c0317
commit 7f9e809
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 139 deletions.
diff --git a/docs/ucode.css b/docs/ucode.css
diff --git a/docs/ucode.js b/docs/ucode.js
diff --git a/jsdoc/c-transpiler.js b/jsdoc/c-transpiler.js
@@ -18,6 +18,20 @@
 
 'use strict';
 
+function isCommentStart(source, offset) {
+	if (source[offset++] != '\n')
+		return false;
+
+	while (source[offset] == ' ' || source[offset] == '\t')
+		offset++;
+
+	return (
+		source[offset++] == '/' &&
+		source[offset++] == '*' &&
+		source[offset++] == '*'
+	);
+}
+
 exports.handlers = {
   beforeParse: function(e) {
 	if (!e.filename.match(/\.(c|h)$/))
@@ -28,7 +42,7 @@ exports.handlers = {
 	let i = 0;
 
 	for (i = 0; i < e.source.length; i++) {
-		if (!chunk.comment && e.source[i] == '\n' && e.source[i+1] == '/' && e.source[i+2] == '*' && e.source[i+3] == '*') {
+		if (!chunk.comment && isCommentStart(e.source, i)) {
 			chunk.end = i;
 			chunk = { start: i, end: -1, comment: true };
 			chunks.push(chunk);

diff --git a/jsdoc/conf.json b/jsdoc/conf.json
@@ -26,7 +26,7 @@
 		"idInHeadings": true
 	},
 	"opts": {
-		"template": "node_modules/clean-jsdoc-theme",
+		"template": "node_modules/ucode-jsdoc-theme",
 		"destination": "docs",
 		"recurse": true,
 		"readme": "docs/README.md",
@@ -41,9 +41,6 @@
 			"include_css": [
 				"docs/ucode.css"
 			],
-			"include_js": [
-				"docs/ucode.js"
-			],
 			"menu": [
 				{
 					"title": "GitHub Project Page",

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
 		"doc": "LC_ALL=C jsdoc -c jsdoc/conf.json"
 	},
 	"devDependencies": {
-		"clean-jsdoc-theme": "^4.2.9",
+		"ucode-jsdoc-theme": "https://github.com/jow-/ucode-jsdoc-theme.git",
 		"jsdoc": "^4.0.2"
 	}
 }