From cc35c355813b65b7dfcbc973a70982f6ee6900b2 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Wed, 26 Feb 2020 17:29:49 +0300 Subject: [PATCH] Update CHANGELOG for upcoming 4.3.0 version --- CHANGELOG.md | 11 ++++++++ .../ext/latex/JLatexMathBlockParser.java | 2 +- .../latex/JLatexMathBlockParserLegacy.java | 2 +- .../ext/latex/JLatexMathInlineProcessor.java | 2 +- .../markwon/sample/latex/LatexActivity.java | 28 +++++++++---------- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4982ffd4..95c04c1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,18 @@ # Changelog # 4.3.0-SNAPSHOT +* add `MarkwonInlineParserPlugin` in `inline-parser` module +* `JLatexMathPlugin` now supports both inline and block structures + this comes with a breaking change: `JLatexMathPlugin` now depends on `inline-parser` module and `MarkwonInlineParserPlugin` must be explicitly added to a `Markwon` instance: + ```java + final Markwon markwon = Markwon.builder(this) + .usePlugin(MarkwonInlineParserPlugin.create()) + .usePlugin(JLatexMathPlugin.create(textSize)) + .build(); + ``` +* `JLatexMathPlugin`: add `theme` (to customize both inlines and blocks) +* `JLatexMathPlugin`: add `renderMode` to use previous (pre `4.3.0`) LaTeX rendering # 4.2.2 * Fixed `AsyncDrawable` display when it has placeholder with empty bounds ([#189]) diff --git a/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParser.java b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParser.java index ef65bb15..8d4b4d37 100644 --- a/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParser.java +++ b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParser.java @@ -15,7 +15,7 @@ import org.commonmark.parser.block.ParserState; * @since 4.3.0-SNAPSHOT (although there was a class with the same name, * which is renamed now to {@link JLatexMathBlockParserLegacy}) */ -public class JLatexMathBlockParser extends AbstractBlockParser { +class JLatexMathBlockParser extends AbstractBlockParser { private static final char DOLLAR = '$'; private static final char SPACE = ' '; diff --git a/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParserLegacy.java b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParserLegacy.java index 1a5ce282..2506ca21 100644 --- a/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParserLegacy.java +++ b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParserLegacy.java @@ -11,7 +11,7 @@ import org.commonmark.parser.block.ParserState; /** * @since 4.3.0-SNAPSHOT (although it is just renamed parser from previous versions) */ -public class JLatexMathBlockParserLegacy extends AbstractBlockParser { +class JLatexMathBlockParserLegacy extends AbstractBlockParser { private final JLatexMathBlock block = new JLatexMathBlock(); diff --git a/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathInlineProcessor.java b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathInlineProcessor.java index 84c26b4f..364e8d54 100644 --- a/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathInlineProcessor.java +++ b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathInlineProcessor.java @@ -11,7 +11,7 @@ import io.noties.markwon.inlineparser.InlineProcessor; /** * @since 4.3.0-SNAPSHOT */ -public class JLatexMathInlineProcessor extends InlineProcessor { +class JLatexMathInlineProcessor extends InlineProcessor { private static final Pattern RE = Pattern.compile("(\\${2})([\\s\\S]+?)\\1"); diff --git a/sample/src/main/java/io/noties/markwon/sample/latex/LatexActivity.java b/sample/src/main/java/io/noties/markwon/sample/latex/LatexActivity.java index 8dcdcd11..48f052c2 100644 --- a/sample/src/main/java/io/noties/markwon/sample/latex/LatexActivity.java +++ b/sample/src/main/java/io/noties/markwon/sample/latex/LatexActivity.java @@ -127,22 +127,22 @@ public class LatexActivity extends ActivityWithMenuOptions { final float textSize = textView.getTextSize(); final Resources r = getResources(); - final Markwon markwon = Markwon.builder(this) - // NB! `MarkwonInlineParserPlugin` is required in order to parse inlines - .usePlugin(MarkwonInlineParserPlugin.create()) - .usePlugin(JLatexMathPlugin.create(textSize, textSize * 1.25F, builder -> { - builder.theme() - .inlineBackgroundProvider(() -> new ColorDrawable(0x1000ff00)) - .blockBackgroundProvider(() -> new ColorDrawable(0x10ff0000)) - .blockPadding(JLatexMathTheme.Padding.symmetric( - r.getDimensionPixelSize(R.dimen.latex_block_padding_vertical), - r.getDimensionPixelSize(R.dimen.latex_block_padding_horizontal) - )); +final Markwon markwon = Markwon.builder(this) + // NB! `MarkwonInlineParserPlugin` is required in order to parse inlines + .usePlugin(MarkwonInlineParserPlugin.create()) + .usePlugin(JLatexMathPlugin.create(textSize, textSize * 1.25F, builder -> { + builder.theme() + .inlineBackgroundProvider(() -> new ColorDrawable(0x1000ff00)) + .blockBackgroundProvider(() -> new ColorDrawable(0x10ff0000)) + .blockPadding(JLatexMathTheme.Padding.symmetric( + r.getDimensionPixelSize(R.dimen.latex_block_padding_vertical), + r.getDimensionPixelSize(R.dimen.latex_block_padding_horizontal) + )); - // explicitly request LEGACY rendering mode + // explicitly request LEGACY rendering mode // builder.renderMode(JLatexMathPlugin.RenderMode.LEGACY); - })) - .build(); + })) + .build(); markwon.setMarkdown(textView, markdown); }