the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Dimitry Ivanov 2019-03-15 15:20:02 +03:00
commit 2845fc70ce
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/CHANGELOG.md
View File

@ -12,7 +12,6 @@
* Fix DataUri scheme handler in image-loader (<GithubIssue id="74" />) * Fix DataUri scheme handler in image-loader (<GithubIssue id="74" />)
* Introduced a "copy" builder for SpannableThem <br>Thanks <GithubUser name="c-b-h" /> * Introduced a "copy" builder for SpannableThem <br>Thanks <GithubUser name="c-b-h" />
## 2.0.0 ## 2.0.0
* Add `html-parser-api` and `html-parser-impl` modules * Add `html-parser-api` and `html-parser-impl` modules
* Add `HtmlEmptyTagReplacement` * Add `HtmlEmptyTagReplacement`

4
markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java
View File

@ -208,7 +208,11 @@ public class SpannableBuilder implements Appendable, CharSequence {
/** /**
* This method will return all {@link Span} spans that <em>overlap</em> specified range, * This method will return all {@link Span} spans that <em>overlap</em> specified range,
* so if for example a 1..9 range is specified some spans might have 0..6 or 0..10 start/end ranges. * so if for example a 1..9 range is specified some spans might have 0..6 or 0..10 start/end ranges.
* <<<<<<< HEAD:markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java
* NB spans are returned in reversed order (not in order that we store them internally) * NB spans are returned in reversed order (not in order that we store them internally)
* =======
* NB spans are returned in reversed order (no in order that we store them internally)
* >>>>>>> master:markwon/src/main/java/ru/noties/markwon/SpannableBuilder.java
* *
* @since 2.0.1 * @since 2.0.1
*/ */