Add support for ol/type attribute

pull/194/merge
M66B 4 years ago
parent 24f3142144
commit 08fefb8510

@ -3092,13 +3092,17 @@ public class HtmlHelper {
int level = 0; int level = 0;
Element list = null; Element list = null;
String ltype = element.attr("x-list-style"); String ltype = element.attr("type");
if (TextUtils.isEmpty(ltype))
ltype = element.attr("x-list-style");
Element parent = element.parent(); Element parent = element.parent();
while (parent != null) { while (parent != null) {
if ("ol".equals(parent.tagName()) || "ul".equals(parent.tagName())) { if ("ol".equals(parent.tagName()) || "ul".equals(parent.tagName())) {
level++; level++;
if (list == null) if (list == null)
list = parent; list = parent;
if (TextUtils.isEmpty(ltype))
ltype = parent.attr("type");
if (TextUtils.isEmpty(ltype)) if (TextUtils.isEmpty(ltype))
ltype = parent.attr("x-list-style"); ltype = parent.attr("x-list-style");
} }

@ -79,17 +79,21 @@ public class NumberSpan extends BulletSpan {
number = index + "."; number = index + ".";
else { else {
switch (type) { switch (type) {
case "a":
case "lower-alpha": case "lower-alpha":
case "lower-latin": case "lower-latin":
number = Character.toString((char) ((int) 'a' + index)); number = Character.toString((char) ((int) 'a' + index));
break; break;
case "A":
case "upper-alpha": case "upper-alpha":
case "upper-latin": case "upper-latin":
number = Character.toString((char) ((int) 'A' + index)); number = Character.toString((char) ((int) 'A' + index));
break; break;
case "i":
case "lower-roman": case "lower-roman":
number = Helper.toRoman(index).toLowerCase(Locale.ROOT); number = Helper.toRoman(index).toLowerCase(Locale.ROOT);
break; break;
case "I":
case "upper-roman": case "upper-roman":
number = Helper.toRoman(index); number = Helper.toRoman(index);
break; break;

Loading…
Cancel
Save