diff --git a/app/src/main/assets/test.md b/app/src/main/assets/test.md index 9957a19f..b39d8911 100644 --- a/app/src/main/assets/test.md +++ b/app/src/main/assets/test.md @@ -74,7 +74,7 @@ ddffdg 30. And it goes on and on 31. And it goes on and on 32. And it goes on and on - 33. And it goes on and on + 333333333. And it goes on and on ### Quoted list diff --git a/library-renderer/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java b/library-renderer/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java index dea44e6f..fbce784c 100644 --- a/library-renderer/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java +++ b/library-renderer/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java @@ -33,7 +33,6 @@ import ru.noties.markwon.spans.CodeSpan; import ru.noties.markwon.spans.EmphasisSpan; import ru.noties.markwon.spans.HeadingSpan; import ru.noties.markwon.spans.OrderedListItemSpan; -import ru.noties.markwon.spans.SimpleLeadingMarginSpan; import ru.noties.markwon.spans.StrongEmphasisSpan; import ru.noties.markwon.spans.ThematicBreakSpan; @@ -192,23 +191,6 @@ public class SpannableMarkdownVisitor extends AbstractVisitor { final Node parent = listItem.getParent(); if (parent instanceof OrderedList) { -// // let's build ordered number -// final StringBuilder lead = new StringBuilder(); -// Node p = parent; -// while (p != null && p instanceof OrderedList) { -// lead.insert(0, ((OrderedList) p).getDelimiter()); -// lead.insert(0, ((OrderedList) p).getStartNumber()); -// p = p.getParent(); -// if (p instanceof ListItem) { -// p = p.getParent(); -// } -// } -// -// builder.append(lead) -// .append('\u00a0'); -// -// blockQuoteIndent -= 1; - final int start = ((OrderedList) parent).getStartNumber(); visitChildren(listItem); @@ -220,12 +202,6 @@ public class SpannableMarkdownVisitor extends AbstractVisitor { length )); -// blockQuoteIndent += 1; - -// if (listLevel != 1) { -// setSpan(length, new SimpleLeadingMarginSpan(32)); -// } - // after we have visited the children increment start number final OrderedList orderedList = (OrderedList) parent; orderedList.setStartNumber(orderedList.getStartNumber() + 1); @@ -234,8 +210,6 @@ public class SpannableMarkdownVisitor extends AbstractVisitor { visitChildren(listItem); - // if we are inside orderedList increase the margin? - setSpan(length, new BulletListItemSpan( configuration.getBulletListConfig(), blockQuoteIndent, @@ -364,22 +338,22 @@ public class SpannableMarkdownVisitor extends AbstractVisitor { return false; } - private static String dump(Node node) { - final StringBuilder builder = new StringBuilder(); - node.accept(new DumpVisitor(builder)); - return builder.toString(); - } - - private static class DumpVisitor extends AbstractVisitor { - private final StringBuilder builder; - - DumpVisitor(StringBuilder builder) { - this.builder = builder; - } - - @Override - public void visit(Text text) { - builder.append(text.getLiteral()); - } - } +// private static String dump(Node node) { +// final StringBuilder builder = new StringBuilder(); +// node.accept(new DumpVisitor(builder)); +// return builder.toString(); +// } +// +// private static class DumpVisitor extends AbstractVisitor { +// private final StringBuilder builder; +// +// DumpVisitor(StringBuilder builder) { +// this.builder = builder; +// } +// +// @Override +// public void visit(Text text) { +// builder.append(text.getLiteral()); +// } +// } } diff --git a/library-spans/src/main/java/ru/noties/markwon/spans/SimpleLeadingMarginSpan.java b/library-spans/src/main/java/ru/noties/markwon/spans/SimpleLeadingMarginSpan.java deleted file mode 100644 index b442adba..00000000 --- a/library-spans/src/main/java/ru/noties/markwon/spans/SimpleLeadingMarginSpan.java +++ /dev/null @@ -1,25 +0,0 @@ -package ru.noties.markwon.spans; - -import android.graphics.Canvas; -import android.graphics.Paint; -import android.text.Layout; -import android.text.style.LeadingMarginSpan; - -public class SimpleLeadingMarginSpan implements LeadingMarginSpan { - - private final int margin; - - public SimpleLeadingMarginSpan(int margin) { - this.margin = margin; - } - - @Override - public int getLeadingMargin(boolean first) { - return margin; - } - - @Override - public void drawLeadingMargin(Canvas c, Paint p, int x, int dir, int top, int baseline, int bottom, CharSequence text, int start, int end, boolean first, Layout layout) { - // no op - } -}