From 61b0b7b113d7fdae8f3494e8420c221c0ea5ba18 Mon Sep 17 00:00:00 2001 From: Turiiya Date: Mon, 15 Apr 2024 10:32:46 +0200 Subject: [PATCH] be more pedantic about numbered lists --- cmd/tools/vdoc/html.v | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cmd/tools/vdoc/html.v b/cmd/tools/vdoc/html.v index 688896de990c6e..5725e8edb1171f 100644 --- a/cmd/tools/vdoc/html.v +++ b/cmd/tools/vdoc/html.v @@ -521,13 +521,10 @@ fn doc_node_html(dn doc.DocNode, link string, head bool, include_examples bool, if l_trimmed.starts_with('```') { is_codeblock = !is_codeblock } - is_list := if l_trimmed.len > 1 { - list := l_trimmed[0] in [`*`, `-`] && l_trimmed[1] == ` ` - num_list := l_trimmed[0].is_digit() && l_trimmed[1] == `.` - list || num_list - } else { - false - } + // -> if l_trimmed.len > 1 && (is_ul || is_ol) + is_list := l_trimmed.len > 1 && ((l_trimmed[1] == ` ` && l_trimmed[0] in [`*`, `-`]) + || (l.len > 2 && l_trimmed[2] == ` ` && l_trimmed[1] == `.` + && l_trimmed[0].is_digit())) if !is_codeblock && l != '' && nl != '' && !is_list && !nl.trim_left('\x01').trim_space().starts_with('```') { merged_lines << '${l} ${nl}'