(single) Implemented ordered lists

1 files changed, 17 insertions, 10 deletions

diff --git a/single.awk b/single.awk
index 0262a1a..eadb7d1 100644
--- a/single.awk
+++ b/single.awk
@@ -6,7 +6,7 @@
 #     [x] Line break
 #     [.] Headers (atx and setex)
 #     [x] Blockquotes
-#     [ ] Lists
+#     [x] Lists
 #     [ ] Code blocks
 #     [x] Horizontal rules
 # [ ] Span elements
@@ -98,20 +98,26 @@ BEGIN {
 }
 
 # Unordered lists
+function abs(x) { return ((x < 0) ? -x : x) }
 !blankline && lengthStack("list-level") > 0 {
 	match($0, /^ */)
+	indent = RLENGTH
 	# Compensating factor for list items
-	li_offset = 2 * (substr($0, RSTART + RLENGTH, 2) ~ /(\*|\+|-) /)
-	while (RLENGTH + li_offset < topStack("list-level")) {
-		print "</ul>"
+	match($0, /(\*|\+|-|[[:digit:]]+\.) /)
+	if (RLENGTH == -1) RLENGTH = 0
+	while (indent + RLENGTH < abs(topStack("list-level"))) {
+		if (topStack("list-level") < 0) print "</ol>"
+		else                            print "</ul>"
 		popStack("list-level")
 	}
 }
-/^[[:blank:]]*(\*|\+|-) / {
-	match($0, /(\*|\+|-) /)
-	if (topStack("list-level") < RSTART) {
-		print "<ul><li>"
-		pushStack("list-level", RSTART + 1)
+/^[[:blank:]]*(\*|\+|-|[[:digit:]]+\.) / {
+	match($0, /(\*|\+|-|[[:digit:]]+\.) /)
+	if (abs(topStack("list-level")) < RSTART) {
+		if (RLENGTH > 2) { xl = "<ol>"; mult = -1 }
+		else             { xl = "<ul>"; mult =  1 }
+		print xl "<li>"
+		pushStack("list-level", mult * (RSTART + RLENGTH - 1))
 	}
 	else {
 		print "</li><li>"
@@ -182,7 +188,8 @@ END {
 		popStack("bq-level")
 	}
 	while (lengthStack("list-level") > 0) {
-		print "</ul>"
+		if (topStack("list-level") < 0) print "</ol>"
+		else                            print "</ul>"
 		popStack("list-level")
 	}
 }