X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=index.php;h=5c4b909b5057fe201b23b09978d73c0a785222dd;hb=4199b3fd65d963057c82c1541df6e2f786e6bd9d;hp=5fad47b69cd296f12b7e689d526e9575b9b5830e;hpb=c75ff9a1300881b556bedb4fe48022e49e42c46a;p=mdref%2Fmdref

diff --git a/index.php b/index.php
index 5fad47b..5c4b909 100644
--- a/index.php
+++ b/index.php
@@ -101,37 +101,15 @@ function ls($dir) {
 		if ($dir !== ".") {
 			printf("<ul>\n<li>&nbsp; %s</li>\n", ns($dir));
 		}
-		printf("<ul>\n");
-		foreach (scandir($dir) as $file) {
-			/* ignore dot-files */
-			if ($file{0} === ".") {
-				continue;
-			}
-			
-			$path = "$dir/$file";
-			
-			if (is_file($path)) {
-				$pi = pathinfo($path);
-				/* ignore files not ending in .md */
-				if (!isset($pi["extension"]) || $pi["extension"] != "md") {
-					continue;
-				}
-				/* ignore files where an accompanying directory exists */
-				if (is_dir("$dir/".$pi["filename"])) {
-					continue;
-				}
-			} else {
-				/* ignore directories where no accompanying file exists */
-				if (!is_file("$path.md")) {
-					continue;
-				}
+		if (($glob = glob("$dir/[_a-zA-Z]*.md"))) {
+			printf("<ul>\n");
+			foreach ($glob as $file) {
+				printf("<li>&rArr; <a href=\"%s\">%s</a></li>\n", 
+					urlpath($dir, $file),
+					ns("$dir/".basename($file, ".md")));
 			}
-			
-			printf("<li>&rArr; <a href=\"%s\">%s</a></li>\n", 
-				urlpath($dir, $file),
-				ns("$dir/".basename($file, ".md")));
+			printf("</ul>\n");
 		}
-		printf("</ul>\n");
 		if ($dir !== ".") {
 			printf("</ul>\n");
 		}
@@ -148,44 +126,20 @@ function ml($file) {
 	if ($pi["extension"] !== "md") {
 		return;
 	}
-	if (!ctype_upper($pi["filename"][0])) {
-		// 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("</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");
+	$dir = $pi["dirname"] . "/" . $pi["filename"];
+	if (($glob = glob("$dir/[_a-z]*.md"))) {
+	printf("<h2>%s:</h2>\n", !ctype_upper($pi["filename"][0]) ?
+		"Functions" : "Methods");
+		printf("<ul>\n");
+		foreach ($glob as $file) {
+			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($file, 3)),
+				join(" ", cut(head($file), ["f"=>"1-"]))
+			);
 		}
+		printf("</ul>\n");
 	}
 }
 
@@ -199,7 +153,7 @@ function md($file, $res) {
 			$r = fopen($file, "r");
 			$md = MarkdownDocument::createFromStream($r);
 			$md->compile(MarkdownDocument::AUTOLINK|MarkdownDocument::TOC);
-			print str_replace("<br/>","<br />",$md->getHtml());
+			print $md->getHtml();
 			fclose($r);
 			ml($file);
 			break;