X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=index.php;h=53c652913cae1b0804bbac55e7dd177fb257acfa;hb=c814ac9fbd7245879173e1abf0c30c9a9d186b78;hp=93454eceddd5abfb2dd306e4bb90420805fb4cc7;hpb=46d9b15be0fb214993462c7fa1187896b949d00a;p=mdref%2Fmdref

diff --git a/index.php b/index.php
index 93454ec..53c6529 100644
--- a/index.php
+++ b/index.php
@@ -62,7 +62,25 @@ function head($file, $lines = 1) {
 	return $ld;
 }
 
-function ns($file) {
+function ns($path) {
+	$ns = "";
+	$parts = explode("/", $path);
+	$upper = ctype_upper($path[0]);
+	for ($i = 0; $i < count($parts); ++$i) {
+		if (!strlen($parts[$i]) || $parts[$i] === ".") {
+			continue;
+		}
+		if (strlen($ns)) {
+			if ($upper && !ctype_upper($parts[$i][0])) {
+				$ns .= "::";
+			} else {
+				$ns .= "\\";
+			}
+		}
+		$ns .= $parts[$i];
+		$upper = ctype_upper($parts[$i][0]);
+	}
+	return $ns;
 	return str_replace("/", "\\", str_replace("//", "/", trim($file, "/.")));
 }
 
@@ -98,12 +116,13 @@ function ls($dir) {
 				if (!isset($pi["extension"]) || $pi["extension"] != "md") {
 					continue;
 				}
-				if (!is_dir("$dir/".$pi["filename"])) {
+				/* ignore files where an accompanying directory exists */
+				if (is_dir("$dir/".$pi["filename"])) {
 					continue;
 				}
 			} else {
-				/* ignore directories where an companying file exists */
-				if (is_file("$path.md")) {
+				/* ignore directories where no accompanying file exists */
+				if (!is_file("$path.md")) {
 					continue;
 				}
 			}
@@ -130,28 +149,47 @@ function ml($file) {
 		return;
 	}
 	if (!ctype_upper($pi["filename"][0])) {
-		return;
-	}
-	$dir = $pi["dirname"] . "/" . $pi["filename"];
-	if (is_dir($dir)) {
-		printf("<h2>Methods:</h2>\n");
-		printf("<ul>\n");
-		foreach (scandir($dir) as $file) {
-			if (!is_file("$dir/$file") || ctype_upper($file{0})) {
-				continue;
+		// namespaced functions
+		$dir = $pi["dirname"] . "/" . $pi["filename"];
+		if (is_dir($dir)) {
+			printf("<h2>Functions:</h2>\n");
+			printf("<ul>\n");
+			foreach (scandir($dir) as $file) {
+				if ($file{0} === "." || !is_file("$dir/$file") || ctype_upper($file{0})) {
+					continue;
+				}
+				printf("<li><h3><a href=\"/%s\">%s</a></h3><p>%s</p><p>%s</p></li>\n",
+					urlpath($dir, $file),
+					basename($file, ".md"),
+					@end(head("$dir/$file", 3)),
+					join(" ", cut(head("$dir/$file"), ["f"=>"1-"]))
+				);
 			}
-			printf("<li><h3><a href=\"/%s\">%s</a></h3><p>%s</p><p>%s</p></li>\n",
-				urlpath($dir, $file),
-				basename($file, ".md"),
-				@end(head("$dir/$file", 3)),
-				join(" ", cut(head("$dir/$file"), ["f"=>"1-"]))
-			);
+			printf("</ul>\n");
+		}
+	} else {
+		// methods
+		$dir = $pi["dirname"] . "/" . $pi["filename"];
+		if (is_dir($dir)) {
+			printf("<h2>Methods:</h2>\n");
+			printf("<ul>\n");
+			foreach (scandir($dir) as $file) {
+				if ($file{0} === "." || !is_file("$dir/$file") || ctype_upper($file{0})) {
+					continue;
+				}
+				printf("<li><h3><a href=\"/%s\">%s</a></h3><p>%s</p><p>%s</p></li>\n",
+					urlpath($dir, $file),
+					basename($file, ".md"),
+					@end(head("$dir/$file", 3)),
+					join(" ", cut(head("$dir/$file"), ["f"=>"1-"]))
+				);
+			}
+			printf("</ul>\n");
 		}
-		printf("</ul>\n");
 	}
 }
 
-function md($file) {
+function md($file, $res) {
 	$file = rtrim($file, "/");
 	if (is_file($file) || is_file($file .= ".md")) {
 		$pi = pathinfo($file);
@@ -160,7 +198,7 @@ function md($file) {
 		case "md":
 			$r = fopen($file, "r");
 			$md = MarkdownDocument::createFromStream($r);
-			$md->compile(MarkdownDocument::AUTOLINK);
+			$md->compile(MarkdownDocument::AUTOLINK|MarkdownDocument::TOC);
 			print str_replace("<br/>","<br />",$md->getHtml());
 			fclose($r);
 			ml($file);
@@ -171,17 +209,12 @@ function md($file) {
 			break;
 		}
 	} else {
-		http\Env::setResponseCode(404);
+		$res->setResponseCode(404);
 		printf("<h1>Not Found</h1>\n");
 		printf("<blockquote><p>Sorry, I could not find <code>%s/%s</code>.</p></blockquote>", dirname($file), basename($file, ".md"));
 	}
 }
 
-function index($pn) {
-	?>
-	<?php
-}
-
 chdir($_SERVER["DOCUMENT_ROOT"]);
 $t = ["css"=>"text/css", "js"=>"application/javascript"];
 $r = new http\Env\Request;
@@ -229,7 +262,7 @@ ob_start($s);
 			ob_end_flush();
 		?></pre>
 	<?php else: ?>
-		<?php if (!md($p)): ?>
+		<?php if (!md($p, $s)): ?>
 		<?php endif; ?>
 	<?php endif; ?>
 	<footer>