` taking refId string and integer
+ index and returning a string for the "uniquified" ref id to use for a reference link.
+
+## 0.64.6
+
+* Merge:
+ [TextCollectingVisitor works better with code blocks by roxspring · Pull Request #575 · vsch/flexmark-java · GitHub]
+* Add: gradle build resource url resolver, mapping `/build/resources/test/` to
+ `/src/test/resources/`
+* Add: a bit more documentation to `ResourceResolverManager`
+
+## 0.64.4
+
+* Change: update to `org.docx4j:docx4j-JAXB-ReferenceImpl:11.4.9`, if you have code using
+ `javax.xml.bind` package from the dependency, you will need to change it to
+ `jakarta.xml.bind`. Global search/replace across the project will do it.
+* Add: `ResizableImageExtension` documentation that it does not play with the rest of the
+ library renderers and is an unsupported extension.
+* Fix: update `log4j:log4j:1.2.17` to `org.apache.logging.log4j:log4j-xxx:2.20.0`
+* Fix: exclude `com.ibm.icu:icu4j:59.1` dependency, replace with `com.ibm.icu:icu4j:72.1`
+* Fix: exclude `commons-io:commons-io:1.3.1` dependency, replace with
+ `commons-io:commons-io:2.11.0`
+
+## 0.64.2
+
+* Add: `containsSomeIn(CharPredicate)`, `containsSomeNotIn(CharPredicate)`,
+ `containsOnlyIn(CharPredicate)`, `containsOnlyNotIn(CharPredicate)` methods to `BasedSequence`
+* Change: bump jsoup version to 1.15.4
+* Change: bump jetbrains.annotations version to 24.0.1
+* Change: remove `openhtmltopdf-jsoup-dom-converter` dependency from `flexmark-pdf-converter`.
+* Merge: outstanding PRs.
+ * [Add OSGi metadata to Manifest to enable deployment to OSGi environments by benfortuna · Pull Request #521 · vsch/flexmark-java · GitHub]
+ * [fix issue #448 by protogenes · Pull Request #510 · vsch/flexmark-java · GitHub]
+ * [update plugins and configure for Reproducible Builds by hboutemy · Pull Request #507 · vsch/flexmark-java · GitHub]
+ * [Prevent StringIndexOutOfBounds in ext-resizable-image by MiniDigger · Pull Request #503 · vsch/flexmark-java · GitHub]
+ * [Fix typo in issue template by MiniDigger · Pull Request #502 · vsch/flexmark-java · GitHub]
+ * [test parsing long sequence of underscores by niklasf · Pull Request #495 · vsch/flexmark-java · GitHub]
+ * [Update to latest maven bundle plugin. Fix for #529 by cziegeler · Pull Request #530 · vsch/flexmark-java · GitHub]
+ * [ext-resizable-image: fix images inside links by e-im · Pull Request #543 · vsch/flexmark-java · GitHub]
+ * [Dependency update for jsoup by viglu · Pull Request #544 · vsch/flexmark-java · GitHub]
+ * [Fix vsch#545, do not escape special characters in `` block by MekhailS · Pull Request #546 · vsch/flexmark-java · GitHub]
+ * [Fix #548: Converting html images fails if the image refers to an emoji without a shortcut by DamnedElric · Pull Request #562 · vsch/flexmark-java · GitHub]
+ * [Fix generation of header IDs by travkin79 · Pull Request #566 · vsch/flexmark-java · GitHub]
+
+## 0.64.0
+
+* Break: Change minimum Java requirement to 11.
+* Fix: update OpenHtmlToPDF to 1.0.10
+* Fix: update jsoup to 1.14.3
+* Fix: update junit to 4.13.2
+* Fix: update Docx4j to 11.3.2
+* Fix: Remove deprecated `of()` sequence methods.
+* Fix: [#452, JiraConverter: Mixed lists rendered incorrectly], thanks to
+ **[znerd](https://github.com/znerd)**
+* Fix: merge [#489, add flexmark-ext-resizable-image] thanks to
+ **[sparksparrow](https://github.com/sparksparrow)**
+* Fix: [#482, Namespaces in embedded HTML blocks not supported?]
+ * Add `Parser.HTML_ALLOW_NAME_SPACE`, default `false` to allow recognizing HTML elements with
+ namespace prefix. :exclamation: HTML deep parser always allows namespaces and ignores this
+ option.
+
+## 0.62.4
+
+* Fix: allow exceptions in `ExceptionMatcher` to have null cause, then use object.toString() for
+ text.
## 0.62.2
@@ -201,7 +228,7 @@ Please give feedback on the upcoming changes if you have concerns about breaking
## 0.61.30
-* Fix: [#402, When using PegdownOptionsAdapter indented code blocks does not work for lists]
+* Fix: [#452, JiraConverter: Mixed lists rendered incorrectly]
## 0.61.28
@@ -1208,6 +1235,7 @@ Please give feedback on the upcoming changes if you have concerns about breaking
* `flexmark-ext-jekyll-tag/src/test/resources/com.vladsch.flexmark.ext.jekyll.tag.txt`
* `flexmark-ext-macros/src/test/resources/com.vladsch.flexmark.ext.macros.txt`
* `flexmark-ext-media-tags/src/test/resources/com.vladsch.flexmark.ext.media.tags.txt`
+ * `flexmark-ext-resizable-image/src/test/resources/com.vladsch.flexmark.ext.resizable.image.txt`
* `flexmark-ext-spec-example/src/test/resources/com.vladsch.flexmark.ext.spec.example.txt`
* `flexmark-ext-superscript/src/test/resources/com.vladsch.flexmark.ext.superscript.txt`
* `flexmark-ext-tables/src/test/resources/com.vladsch.flexmark.ext.tables.txt`
@@ -2140,16 +2168,38 @@ Please give feedback on the upcoming changes if you have concerns about breaking
[#397, PR: Add base64 image support with docx rendering]: https://github.com/vsch/flexmark-java/pull/397
[#398, Autolinks get cut off if they contain \`&\` (escaped query params)]: https://github.com/vsch/flexmark-java/issues/398
[#407, Link text inline content fails to parse image references]: https://github.com/vsch/flexmark-java/issues/407
+[#452, JiraConverter: Mixed lists rendered incorrectly]: https://github.com/vsch/flexmark-java/issues/452
+[#482, Namespaces in embedded HTML blocks not supported?]: https://github.com/vsch/flexmark-java/issues/482
+[#489, add flexmark-ext-resizable-image]: https://github.com/vsch/flexmark-java/issues/489
[@Xaelis]: https://github.com/Xaelis
+[Add OSGi metadata to Manifest to enable deployment to OSGi environments by benfortuna · Pull Request #521 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/521 "Add OSGi metadata to Manifest to enable deployment to OSGi environments by benfortuna · Pull Request #521 · vsch/flexmark-java · GitHub"
[Awesome Console]: https://plugins.jetbrains.com/plugin/7677-awesome-console "Awesome Console"
+[Dependency update for jsoup by viglu · Pull Request #544 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/544 "Dependency update for jsoup by viglu · Pull Request #544 · vsch/flexmark-java · GitHub"
+[Emoji-Cheat-Sheet.com]: https://github.com/WebpageFX/emoji-cheat-sheet.com
+[Fix #548: Converting html images fails if the image refers to an emoji without a shortcut by DamnedElric · Pull Request #562 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/562 "Fix #548: Converting html images fails if the image refers to an emoji without a shortcut by DamnedElric · Pull Request #562 · vsch/flexmark-java · GitHub"
+[Fix generation of header IDs by travkin79 · Pull Request #566 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/566 "Fix generation of header IDs by travkin79 · Pull Request #566 · vsch/flexmark-java · GitHub"
+[Fix typo in issue template by MiniDigger · Pull Request #502 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/502 "Fix typo in issue template by MiniDigger · Pull Request #502 · vsch/flexmark-java · GitHub"
+[GitHub Emoji API]: https://api.github.com/emojis
[HtmlToMarkdownCustomizedSample.java]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/HtmlToMarkdownCustomizedSample.java
[Kijimuna]: https://github.com/Kijimuna
[NodeInsertingPostProcessorSample.java]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/NodeInsertingPostProcessorSample.java
[PdfLandscapeConverter.java]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/PdfLandscapeConverter.java
+[Prevent StringIndexOutOfBounds in ext-resizable-image by MiniDigger · Pull Request #503 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/503 "Prevent StringIndexOutOfBounds in ext-resizable-image by MiniDigger · Pull Request #503 · vsch/flexmark-java · GitHub"
+[TextCollectingVisitor works better with code blocks by roxspring · Pull Request #575 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/575 "TextCollectingVisitor works better with code blocks by roxspring · Pull Request #575 · vsch/flexmark-java · GitHub"
+[`emoji-cheat-sheet.com/public/graphics/emojis/`]: https://github.com/WebpageFX/emoji-cheat-sheet.com/tree/master/public/graphics/emojis
+[Unicode Emoji List, v15.0]: https://unicode.org/emoji/charts/emoji-list.html
+
+[Unicode Emoji Modifiers List, v15.0]: https://unicode.org/emoji/charts/full-emoji-modifiers.html
+
+[Update to latest maven bundle plugin. Fix for #529 by cziegeler · Pull Request #530 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/530 "Update to latest maven bundle plugin. Fix for #529 by cziegeler · Pull Request #530 · vsch/flexmark-java · GitHub"
[YouTrack: IDEA-207453]: https://youtrack.jetbrains.com/issue/IDEA-207453 "Add Conversion of ref anchor to UrlFilter for file line navigation"
+[emoji-cross-reference]: https://github.com/vsch/emoji-cross-reference
+[ext-resizable-image: fix images inside links by e-im · Pull Request #543 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/543 "ext-resizable-image: fix images inside links by e-im · Pull Request #543 · vsch/flexmark-java · GitHub"
+[fix issue #448 by protogenes · Pull Request #510 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/510 "fix issue #448 by protogenes · Pull Request #510 · vsch/flexmark-java · GitHub"
+[Fix vsch#545, do not escape special characters in `` block by MekhailS · Pull Request #546 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/546 "Fix vsch#545, do not escape special characters in `` block by MekhailS · Pull Request #546 · vsch/flexmark-java · GitHub"
[migrate 0_35_x to 0_40_0.xml]: /assets/migrations/migrate%20flexmark-java%200_35_x%20to%200_40_0.xml
[migrate flexmark-java 0_40_x to 0_42_0]: https://github.com/vsch/flexmark-java/blob/master/assets/migrations/migrate%20flexmark-java%200_40_x%20to%200_42_0.xml
[migrate flexmark-java 0_42_x to 0_50_0.xml]: https://github.com/vsch/flexmark-java/blob/master/assets/migrations/migrate%20flexmark-java%200_42_x%20to%200_50_0.xml
+[test parsing long sequence of underscores by niklasf · Pull Request #495 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/495 "test parsing long sequence of underscores by niklasf · Pull Request #495 · vsch/flexmark-java · GitHub"
+[update plugins and configure for Reproducible Builds by hboutemy · Pull Request #507 · vsch/flexmark-java · GitHub]: https://github.com/vsch/flexmark-java/pull/507 "update plugins and configure for Reproducible Builds by hboutemy · Pull Request #507 · vsch/flexmark-java · GitHub"
-
-[#402, When using PegdownOptionsAdapter indented code blocks does not work for lists]: https://github.com/vsch/flexmark-java/issues/402
diff --git a/assets/samples/sample-doc.html b/assets/samples/sample-doc.html
index 2905a4a120..f53c3f3508 100644
--- a/assets/samples/sample-doc.html
+++ b/assets/samples/sample-doc.html
@@ -20,7 +20,7 @@ Heading 6
-
list 1
- 
+ 
with some text
-
diff --git a/flexmark-all/flexmark-all.iml b/flexmark-all/flexmark-all.iml
index 34522859ba..444791f12f 100644
--- a/flexmark-all/flexmark-all.iml
+++ b/flexmark-all/flexmark-all.iml
@@ -72,5 +72,6 @@
+
diff --git a/flexmark-all/pom.xml b/flexmark-all/pom.xml
index acb53f2ac4..68d0ad5499 100644
--- a/flexmark-all/pom.xml
+++ b/flexmark-all/pom.xml
@@ -7,7 +7,7 @@
com.vladsch.flexmark
flexmark-java
- 0.62.2
+ 0.64.8
flexmark-all
@@ -118,6 +118,11 @@
flexmark-ext-media-tags
${project.version}
+
+ com.vladsch.flexmark
+ flexmark-ext-resizable-image
+ ${project.version}
+
com.vladsch.flexmark
flexmark-ext-macros
diff --git a/flexmark-all/src/assembly/bin.xml b/flexmark-all/src/assembly/bin.xml
index daf60f6060..b9b9407aff 100644
--- a/flexmark-all/src/assembly/bin.xml
+++ b/flexmark-all/src/assembly/bin.xml
@@ -33,6 +33,7 @@
com.vladsch.flexmark:flexmark-ext-ins
com.vladsch.flexmark:flexmark-ext-macros
com.vladsch.flexmark:flexmark-ext-media-tags
+ com.vladsch.flexmark:flexmark-ext-resizable-image
com.vladsch.flexmark:flexmark-ext-xwiki-macros
com.vladsch.flexmark:flexmark-ext-superscript
com.vladsch.flexmark:flexmark-ext-tables
diff --git a/flexmark-core-test/flexmark-core-test.iml b/flexmark-core-test/flexmark-core-test.iml
index 1f06196616..353b4b4feb 100644
--- a/flexmark-core-test/flexmark-core-test.iml
+++ b/flexmark-core-test/flexmark-core-test.iml
@@ -45,9 +45,11 @@
-
+
-
+
+
+
\ No newline at end of file
diff --git a/flexmark-core-test/pom.xml b/flexmark-core-test/pom.xml
index 5edb97fd78..828ab6edfc 100644
--- a/flexmark-core-test/pom.xml
+++ b/flexmark-core-test/pom.xml
@@ -4,7 +4,7 @@
com.vladsch.flexmark
flexmark-java
- 0.62.2
+ 0.64.8
flexmark-core-test
diff --git a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/ParserTest.java b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/ParserTest.java
index b978ae2a26..e37da066bd 100644
--- a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/ParserTest.java
+++ b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/ParserTest.java
@@ -30,6 +30,7 @@
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
final public class ParserTest {
diff --git a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/SpecialInputTest.java b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/SpecialInputTest.java
index d83a18ddc5..5119cf8e2f 100644
--- a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/SpecialInputTest.java
+++ b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/SpecialInputTest.java
@@ -119,6 +119,11 @@ public void linkLabelLength() {
"[foo][12" + label2 + "]\n\n[12" + label2 + "]: /", "
[foo][12" + label2 + "]
\n[12" + label2 + "]: /
\n");
}
+ @Test
+ public void manyUnderscores() {
+ assertRendering(Strings.repeat("_", 1000), "
");
+ }
+
@Nullable
@Override
public DataHolder options(@NotNull String option) {
diff --git a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/ast/TextCollectingVisitorTest.java b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/ast/TextCollectingVisitorTest.java
index 83edc4c39e..bc447c7523 100644
--- a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/ast/TextCollectingVisitorTest.java
+++ b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/parser/ast/TextCollectingVisitorTest.java
@@ -67,4 +67,48 @@ public void test_pararaphs() {
"with more text" +
"", text);
}
+
+ @Test
+ public void test_paragraph_and_fenced_code_block() {
+ Parser parser = Parser.builder().build();
+ Node document = parser.parse("" +
+ "before\n" +
+ "\n" +
+ "```\n" +
+ "fenced code\n" +
+ "block\n" +
+ "```\n" +
+ "\n" +
+ "after");
+ TextCollectingVisitor collectingVisitor = new TextCollectingVisitor();
+ final String text = collectingVisitor.collectAndGetText(document);
+ assertEquals("" +
+ "before\n" +
+ "\n"+
+ "fenced code\n" +
+ "block\n" +
+ "\n"+
+ "after" +
+ "", text);
+ }
+
+ @Test
+ public void test_paragraph_and_indented_code_block() {
+ Parser parser = Parser.builder().build();
+ Node document = parser.parse("" +
+ "before\n" +
+ "\n" +
+ " indented code block\n" +
+ "\n" +
+ "after");
+ TextCollectingVisitor collectingVisitor = new TextCollectingVisitor();
+ final String text = collectingVisitor.collectAndGetText(document);
+ assertEquals("" +
+ "before\n" +
+ "\n"+
+ "indented code block\n" +
+ "\n"+
+ "after" +
+ "", text);
+ }
}
diff --git a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/renderer/CoreRendererSpecTest.java b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/renderer/CoreRendererSpecTest.java
index 741f54d11e..9ad3e4586a 100644
--- a/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/renderer/CoreRendererSpecTest.java
+++ b/flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/renderer/CoreRendererSpecTest.java
@@ -98,6 +98,7 @@ public abstract class CoreRendererSpecTest extends RendererSpecTest {
optionsMap.put("block-quote-extend", new MutableDataSet().set(Parser.BLOCK_QUOTE_EXTEND_TO_BLANK_LINE, true));
optionsMap.put("block-ignore-blank", new MutableDataSet().set(Parser.BLOCK_QUOTE_IGNORE_BLANK_LINE, true));
optionsMap.put("html-block-start-only-on-block-tags", new MutableDataSet().set(Parser.HTML_BLOCK_START_ONLY_ON_BLOCK_TAGS, true));
+ optionsMap.put("no-html-block-start-only-on-block-tags", new MutableDataSet().set(Parser.HTML_BLOCK_START_ONLY_ON_BLOCK_TAGS, false));
optionsMap.put("setext-marker-length", new MutableDataSet().set(Parser.HEADING_SETEXT_MARKER_LENGTH, 3));
optionsMap.put("src-pos-lines", new MutableDataSet().set(HtmlRenderer.SOURCE_POSITION_PARAGRAPH_LINES, true).set(Parser.CODE_SOFT_LINE_BREAKS, true));
optionsMap.put("src-pos-lines-splice", new MutableDataSet().set(HtmlRenderer.SOURCE_POSITION_PARAGRAPH_LINES, true).set(Parser.CODE_SOFT_LINE_BREAKS, true).set(HtmlRenderer.INLINE_CODE_SPLICE_CLASS, "line-spliced"));
@@ -121,6 +122,7 @@ public abstract class CoreRendererSpecTest extends RendererSpecTest {
optionsMap.put("spec-027", new MutableDataSet().set(Parser.STRONG_WRAPS_EMPHASIS, true));
optionsMap.put("custom-list-marker", new MutableDataSet().set(Parser.LISTS_ITEM_PREFIX_CHARS, "*/"));
optionsMap.put("no-p-tags", new MutableDataSet().set(HtmlRenderer.NO_P_TAGS_USE_BR, true));
+ optionsMap.put("allow-name-space", new MutableDataSet().set(Parser.HTML_ALLOW_NAME_SPACE, true));
optionsMap.put("list-markdown-navigator", new MutableDataSet()
.set(Parser.LISTS_AUTO_LOOSE, false)
.set(Parser.LISTS_AUTO_LOOSE, false)
diff --git a/flexmark-core-test/src/test/resources/core_extra_ast_spec.md b/flexmark-core-test/src/test/resources/core_extra_ast_spec.md
index 38c52bb978..c1fd663892 100644
--- a/flexmark-core-test/src/test/resources/core_extra_ast_spec.md
+++ b/flexmark-core-test/src/test/resources/core_extra_ast_spec.md
@@ -3943,6 +3943,104 @@ Document[0, 38]
````````````````````````````````
+Use info upto space
+
+```````````````````````````````` example Fenced Code Options: 14
+```java test
+proper unmatched fenced code
+```
+
+.
+proper unmatched fenced code
+
+.
+Document[0, 47]
+ FencedCodeBlock[0, 45] open:[0, 3, "```"] info:[3, 12, "java test"] content:[13, 42] lines[1] close:[42, 45, "```"]
+ Text[13, 42] chars:[13, 42, "prope … code\n"]
+````````````````````````````````
+
+
+Use info upto tab
+
+```````````````````````````````` example Fenced Code Options: 15
+```java→test
+proper unmatched fenced code
+```
+
+.
+proper unmatched fenced code
+
+.
+Document[0, 47]
+ FencedCodeBlock[0, 45] open:[0, 3, "```"] info:[3, 12, "java\ttest"] content:[13, 42] lines[1] close:[42, 45, "```"]
+ Text[13, 42] chars:[13, 42, "prope … code\n"]
+````````````````````````````````
+
+
+Use info up to space
+
+```````````````````````````````` example Fenced Code Options: 16
+```java test
+proper unmatched fenced code
+```
+
+.
+proper unmatched fenced code
+
+.
+Document[0, 47]
+ FencedCodeBlock[0, 45] open:[0, 3, "```"] info:[3, 12, "java test"] content:[13, 42] lines[1] close:[42, 45, "```"]
+ Text[13, 42] chars:[13, 42, "prope … code\n"]
+````````````````````````````````
+
+
+```````````````````````````````` example Fenced Code Options: 17
+``` java test
+proper unmatched fenced code
+```
+
+.
+proper unmatched fenced code
+
+.
+Document[0, 48]
+ FencedCodeBlock[0, 46] open:[0, 3, "```"] info:[4, 13, "java test"] content:[14, 43] lines[1] close:[43, 46, "```"]
+ Text[14, 43] chars:[14, 43, "prope … code\n"]
+````````````````````````````````
+
+
+Use info upto tab
+
+```````````````````````````````` example Fenced Code Options: 18
+```java→test
+proper unmatched fenced code
+```
+
+.
+proper unmatched fenced code
+
+.
+Document[0, 47]
+ FencedCodeBlock[0, 45] open:[0, 3, "```"] info:[3, 12, "java\ttest"] content:[13, 42] lines[1] close:[42, 45, "```"]
+ Text[13, 42] chars:[13, 42, "prope … code\n"]
+````````````````````````````````
+
+
+```````````````````````````````` example Fenced Code Options: 19
+```→java→test
+proper unmatched fenced code
+```
+
+.
+proper unmatched fenced code
+
+.
+Document[0, 48]
+ FencedCodeBlock[0, 46] open:[0, 3, "```"] info:[4, 13, "java\ttest"] content:[14, 43] lines[1] close:[43, 46, "```"]
+ Text[14, 43] chars:[14, 43, "prope … code\n"]
+````````````````````````````````
+
+
## Anchor links option
Change language class prefix
diff --git a/flexmark-core-test/src/test/resources/core_extra_ast_spec2.md b/flexmark-core-test/src/test/resources/core_extra_ast_spec2.md
index 09042ac30d..247ec16b7f 100644
--- a/flexmark-core-test/src/test/resources/core_extra_ast_spec2.md
+++ b/flexmark-core-test/src/test/resources/core_extra_ast_spec2.md
@@ -634,3 +634,154 @@ Document[0, 114]
````````````````````````````````
+## HTML Allow Name Space
+
+```````````````````````````````` example(HTML Allow Name Space: 1) options(allow-name-space)
+
+
+
+.
+
+
+.
+Document[0, 22]
+ HtmlBlock[0, 21]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 2) options(deep-html-parsing, allow-name-space)
+
+
+
+.
+ns:strong
+</ns:strong>
+.
+Document[0, 26]
+ Paragraph[0, 25] isTrailingBlankLine
+ AutoLink[0, 11] open:[0, 1, "<"] text:[1, 10, "ns:strong"] pageRef:[1, 10, "ns:strong"] close:[10, 11, ">"]
+ SoftLineBreak[11, 12]
+ Text[12, 24] chars:[12, 24, ""]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 3) options(deep-html-parsing, allow-name-space, no-html-block-start-only-on-block-tags)
+
+
+
+.
+
+
+.
+Document[0, 26]
+ HtmlBlock[0, 25]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 4) options(deep-html-parsing)
+
+
+
+.
+
+
+.
+Document[0, 24]
+ HtmlBlock[0, 23]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 5) options(deep-html-parsing, allow-name-space)
+
+
+
+.
+
+
+.
+Document[0, 24]
+ HtmlBlock[0, 23]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 6) options(deep-html-parsing, allow-name-space, no-html-block-start-only-on-block-tags)
+
+
+
+.
+
+
+.
+Document[0, 24]
+ HtmlBlock[0, 23]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 7) options(allow-name-space)
+
+
+
+.
+
+
+.
+Document[0, 24]
+ HtmlBlock[0, 23]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 8) options(allow-name-space)
+
+
+
+.
+
+
+.
+Document[0, 24]
+ HtmlBlock[0, 23]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 9) options(allow-name-space, html-block-start-only-on-block-tags)
+
+
+
+.
+
+
+.
+Document[0, 24]
+ HtmlBlock[0, 23]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 10) options(allow-name-space, html-block-start-only-on-block-tags)
+
+
+
+.
+ns:strong
+</ns:strong>
+.
+Document[0, 26]
+ Paragraph[0, 25] isTrailingBlankLine
+ AutoLink[0, 11] open:[0, 1, "<"] text:[1, 10, "ns:strong"] pageRef:[1, 10, "ns:strong"] close:[10, 11, ">"]
+ SoftLineBreak[11, 12]
+ Text[12, 24] chars:[12, 24, ""]
+````````````````````````````````
+
+
+```````````````````````````````` example(HTML Allow Name Space: 11) options(allow-name-space, no-html-block-start-only-on-block-tags)
+
+
+
+.
+
+
+.
+Document[0, 26]
+ HtmlBlock[0, 25]
+````````````````````````````````
+
+
diff --git a/flexmark-docx-converter/flexmark-docx-converter.iml b/flexmark-docx-converter/flexmark-docx-converter.iml
index 067f144761..5af30aac21 100644
--- a/flexmark-docx-converter/flexmark-docx-converter.iml
+++ b/flexmark-docx-converter/flexmark-docx-converter.iml
@@ -51,13 +51,19 @@
-
+
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/flexmark-docx-converter/pom.xml b/flexmark-docx-converter/pom.xml
index 2dafc2f6b4..eb24ed444b 100644
--- a/flexmark-docx-converter/pom.xml
+++ b/flexmark-docx-converter/pom.xml
@@ -5,7 +5,7 @@
com.vladsch.flexmark
flexmark-java
- 0.62.2
+ 0.64.8
flexmark-docx-converter
@@ -96,15 +96,41 @@
flexmark-ext-autolink
test
+
+ org.apache.xmlgraphics
+ xmlgraphics-commons
+ 2.7
+
+
+ commons-io
+ commons-io
+
+
+
+
+ commons-io
+ commons-io
+ 2.11.0
+
org.docx4j
- docx4j-JAXB-Internal
- 8.1.6
+ docx4j-JAXB-ReferenceImpl
+ 11.4.9
+
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.20.0
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.20.0
- log4j
- log4j
- 1.2.17
+ org.apache.logging.log4j
+ log4j-1.2-api
+ 2.20.0
diff --git a/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java b/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java
index d0cb866acc..a661121d6f 100644
--- a/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java
+++ b/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java
@@ -68,7 +68,7 @@
import org.docx4j.wml.*;
import org.jetbrains.annotations.NotNull;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import java.awt.image.BufferedImage;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
diff --git a/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/BinaryPartAbstractImage.java b/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/BinaryPartAbstractImage.java
index 6230f8cba6..0ca3eab315 100644
--- a/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/BinaryPartAbstractImage.java
+++ b/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/BinaryPartAbstractImage.java
@@ -24,7 +24,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import java.awt.geom.Dimension2D;
import java.io.File;
import java.io.IOException;
diff --git a/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/DocxContextImpl.java b/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/DocxContextImpl.java
index 783a824071..21e3d2664c 100644
--- a/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/DocxContextImpl.java
+++ b/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/DocxContextImpl.java
@@ -22,7 +22,7 @@
import org.docx4j.wml.R.FootnoteRef;
import org.docx4j.wml.R.Separator;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import java.math.BigInteger;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/flexmark-docx-converter/src/main/resources/emoji/1f98d.png b/flexmark-docx-converter/src/main/resources/emoji/1f98d.png
new file mode 100644
index 0000000000..443f42deba
Binary files /dev/null and b/flexmark-docx-converter/src/main/resources/emoji/1f98d.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/aerial_tramway.png b/flexmark-docx-converter/src/main/resources/emoji/aerial_tramway.png
index 81cb472baf..38f6dfe233 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/aerial_tramway.png and b/flexmark-docx-converter/src/main/resources/emoji/aerial_tramway.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/alarm_clock.png b/flexmark-docx-converter/src/main/resources/emoji/alarm_clock.png
index 5a38b0a5bd..86ca8c8ed4 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/alarm_clock.png and b/flexmark-docx-converter/src/main/resources/emoji/alarm_clock.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/all_the_things.png b/flexmark-docx-converter/src/main/resources/emoji/all_the_things.png
new file mode 100644
index 0000000000..5805a76091
Binary files /dev/null and b/flexmark-docx-converter/src/main/resources/emoji/all_the_things.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/arrows_clockwise.png b/flexmark-docx-converter/src/main/resources/emoji/arrows_clockwise.png
index 5f84d7e72b..b08c09e2ee 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/arrows_clockwise.png and b/flexmark-docx-converter/src/main/resources/emoji/arrows_clockwise.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/bar_chart.png b/flexmark-docx-converter/src/main/resources/emoji/bar_chart.png
index 09d7301c4d..8aac88cba1 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/bar_chart.png and b/flexmark-docx-converter/src/main/resources/emoji/bar_chart.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/black_large_square.png b/flexmark-docx-converter/src/main/resources/emoji/black_large_square.png
new file mode 100644
index 0000000000..d25965f9e6
Binary files /dev/null and b/flexmark-docx-converter/src/main/resources/emoji/black_large_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/black_medium_small_square.png b/flexmark-docx-converter/src/main/resources/emoji/black_medium_small_square.png
index 782305dd1a..2729e8af8f 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/black_medium_small_square.png and b/flexmark-docx-converter/src/main/resources/emoji/black_medium_small_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/black_medium_square.png b/flexmark-docx-converter/src/main/resources/emoji/black_medium_square.png
index 97f5ad3f2a..ed8e35dc5e 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/black_medium_square.png and b/flexmark-docx-converter/src/main/resources/emoji/black_medium_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/black_nib.png b/flexmark-docx-converter/src/main/resources/emoji/black_nib.png
index 29f6994c11..f3c07fcc84 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/black_nib.png and b/flexmark-docx-converter/src/main/resources/emoji/black_nib.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/black_small_square.png b/flexmark-docx-converter/src/main/resources/emoji/black_small_square.png
index bd264afe00..4a1436a6c0 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/black_small_square.png and b/flexmark-docx-converter/src/main/resources/emoji/black_small_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/black_square.png b/flexmark-docx-converter/src/main/resources/emoji/black_square.png
index 71da10de81..0bdbe17a21 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/black_square.png and b/flexmark-docx-converter/src/main/resources/emoji/black_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/black_square_button.png b/flexmark-docx-converter/src/main/resources/emoji/black_square_button.png
index f2597e9566..bb9fdc78e3 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/black_square_button.png and b/flexmark-docx-converter/src/main/resources/emoji/black_square_button.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/chart_with_downwards_trend.png b/flexmark-docx-converter/src/main/resources/emoji/chart_with_downwards_trend.png
index cb0d2a113c..0184b87c5d 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/chart_with_downwards_trend.png and b/flexmark-docx-converter/src/main/resources/emoji/chart_with_downwards_trend.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/chart_with_upwards_trend.png b/flexmark-docx-converter/src/main/resources/emoji/chart_with_upwards_trend.png
index 7c66745c98..22426316d2 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/chart_with_upwards_trend.png and b/flexmark-docx-converter/src/main/resources/emoji/chart_with_upwards_trend.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/checkered_flag.png b/flexmark-docx-converter/src/main/resources/emoji/checkered_flag.png
index ead4a68dd3..b12fbef541 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/checkered_flag.png and b/flexmark-docx-converter/src/main/resources/emoji/checkered_flag.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/clock130.png b/flexmark-docx-converter/src/main/resources/emoji/clock130.png
index 90ea5b9144..a5657b101e 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/clock130.png and b/flexmark-docx-converter/src/main/resources/emoji/clock130.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/clock230.png b/flexmark-docx-converter/src/main/resources/emoji/clock230.png
index f12c6912af..cb2db58e52 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/clock230.png and b/flexmark-docx-converter/src/main/resources/emoji/clock230.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/clock330.png b/flexmark-docx-converter/src/main/resources/emoji/clock330.png
index 1dc9628ea2..2c48e4fd38 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/clock330.png and b/flexmark-docx-converter/src/main/resources/emoji/clock330.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/clock530.png b/flexmark-docx-converter/src/main/resources/emoji/clock530.png
index e08d4ad2ba..fc6ba197d7 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/clock530.png and b/flexmark-docx-converter/src/main/resources/emoji/clock530.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/clock630.png b/flexmark-docx-converter/src/main/resources/emoji/clock630.png
index 46f0681f1c..756f6a32b5 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/clock630.png and b/flexmark-docx-converter/src/main/resources/emoji/clock630.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/clock930.png b/flexmark-docx-converter/src/main/resources/emoji/clock930.png
index fd35221428..2709fec2f7 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/clock930.png and b/flexmark-docx-converter/src/main/resources/emoji/clock930.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/clubs.png b/flexmark-docx-converter/src/main/resources/emoji/clubs.png
index bfab536569..1471ffd4d2 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/clubs.png and b/flexmark-docx-converter/src/main/resources/emoji/clubs.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/end.png b/flexmark-docx-converter/src/main/resources/emoji/end.png
index 61a4399ad8..a4ee6c3aad 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/end.png and b/flexmark-docx-converter/src/main/resources/emoji/end.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/exclamation.png b/flexmark-docx-converter/src/main/resources/emoji/exclamation.png
index 77bbdeabcf..cac59b38d1 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/exclamation.png and b/flexmark-docx-converter/src/main/resources/emoji/exclamation.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/feelsgood.png b/flexmark-docx-converter/src/main/resources/emoji/feelsgood.png
index 361f969bc1..4fe16cf7ec 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/feelsgood.png and b/flexmark-docx-converter/src/main/resources/emoji/feelsgood.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/finnadie.png b/flexmark-docx-converter/src/main/resources/emoji/finnadie.png
index bfc5a0d93d..43f88fe8c6 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/finnadie.png and b/flexmark-docx-converter/src/main/resources/emoji/finnadie.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/goberserk.png b/flexmark-docx-converter/src/main/resources/emoji/goberserk.png
index 59a742aaaa..3742ada000 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/goberserk.png and b/flexmark-docx-converter/src/main/resources/emoji/goberserk.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/godmode.png b/flexmark-docx-converter/src/main/resources/emoji/godmode.png
index 7e75ab2081..884b996513 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/godmode.png and b/flexmark-docx-converter/src/main/resources/emoji/godmode.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/grey_exclamation.png b/flexmark-docx-converter/src/main/resources/emoji/grey_exclamation.png
index cf027dda5d..971c47be13 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/grey_exclamation.png and b/flexmark-docx-converter/src/main/resources/emoji/grey_exclamation.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/headphones.png b/flexmark-docx-converter/src/main/resources/emoji/headphones.png
index ad83000e68..055a2599fd 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/headphones.png and b/flexmark-docx-converter/src/main/resources/emoji/headphones.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/heavy_division_sign.png b/flexmark-docx-converter/src/main/resources/emoji/heavy_division_sign.png
index e193fd252f..658c6df8f5 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/heavy_division_sign.png and b/flexmark-docx-converter/src/main/resources/emoji/heavy_division_sign.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/heavy_dollar_sign.png b/flexmark-docx-converter/src/main/resources/emoji/heavy_dollar_sign.png
index 5eddfc52b2..4f435da7f0 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/heavy_dollar_sign.png and b/flexmark-docx-converter/src/main/resources/emoji/heavy_dollar_sign.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/heavy_plus_sign.png b/flexmark-docx-converter/src/main/resources/emoji/heavy_plus_sign.png
index ade3c3a858..16ec5c3fbd 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/heavy_plus_sign.png and b/flexmark-docx-converter/src/main/resources/emoji/heavy_plus_sign.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/hurtrealbad.png b/flexmark-docx-converter/src/main/resources/emoji/hurtrealbad.png
index 146ef1a6a8..6cc43377c5 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/hurtrealbad.png and b/flexmark-docx-converter/src/main/resources/emoji/hurtrealbad.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/incoming_envelope.png b/flexmark-docx-converter/src/main/resources/emoji/incoming_envelope.png
index afc8271251..d90b540037 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/incoming_envelope.png and b/flexmark-docx-converter/src/main/resources/emoji/incoming_envelope.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/mag.png b/flexmark-docx-converter/src/main/resources/emoji/mag.png
index aa5b1d7c46..da2273059b 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/mag.png and b/flexmark-docx-converter/src/main/resources/emoji/mag.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/musical_score.png b/flexmark-docx-converter/src/main/resources/emoji/musical_score.png
index c99e3381f1..92efedf348 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/musical_score.png and b/flexmark-docx-converter/src/main/resources/emoji/musical_score.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/notes.png b/flexmark-docx-converter/src/main/resources/emoji/notes.png
index 0956d6ab2a..f94a083afb 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/notes.png and b/flexmark-docx-converter/src/main/resources/emoji/notes.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/on.png b/flexmark-docx-converter/src/main/resources/emoji/on.png
index 4cd69a15de..a4a66a46ab 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/on.png and b/flexmark-docx-converter/src/main/resources/emoji/on.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/rage1.png b/flexmark-docx-converter/src/main/resources/emoji/rage1.png
index 1506ba4032..e23dd5b249 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/rage1.png and b/flexmark-docx-converter/src/main/resources/emoji/rage1.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/rage2.png b/flexmark-docx-converter/src/main/resources/emoji/rage2.png
index f792e063b4..1348b925c9 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/rage2.png and b/flexmark-docx-converter/src/main/resources/emoji/rage2.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/rage3.png b/flexmark-docx-converter/src/main/resources/emoji/rage3.png
index 58764cbcb3..34a931aa4b 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/rage3.png and b/flexmark-docx-converter/src/main/resources/emoji/rage3.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/rage4.png b/flexmark-docx-converter/src/main/resources/emoji/rage4.png
index c726c94a29..2e5b80effd 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/rage4.png and b/flexmark-docx-converter/src/main/resources/emoji/rage4.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/roll_eyes.png b/flexmark-docx-converter/src/main/resources/emoji/roll_eyes.png
new file mode 100644
index 0000000000..317560c3cc
Binary files /dev/null and b/flexmark-docx-converter/src/main/resources/emoji/roll_eyes.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/soon.png b/flexmark-docx-converter/src/main/resources/emoji/soon.png
index 2cf46df254..ba129b9927 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/soon.png and b/flexmark-docx-converter/src/main/resources/emoji/soon.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/spades.png b/flexmark-docx-converter/src/main/resources/emoji/spades.png
index 133a1aba8a..09279749a6 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/spades.png and b/flexmark-docx-converter/src/main/resources/emoji/spades.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/suspect.png b/flexmark-docx-converter/src/main/resources/emoji/suspect.png
index 58e8921c0a..64f56dce78 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/suspect.png and b/flexmark-docx-converter/src/main/resources/emoji/suspect.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/thinking_face.png b/flexmark-docx-converter/src/main/resources/emoji/thinking_face.png
new file mode 100644
index 0000000000..fc8001aedb
Binary files /dev/null and b/flexmark-docx-converter/src/main/resources/emoji/thinking_face.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/thought_balloon.png b/flexmark-docx-converter/src/main/resources/emoji/thought_balloon.png
index febe30d059..56076e2c9c 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/thought_balloon.png and b/flexmark-docx-converter/src/main/resources/emoji/thought_balloon.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/tm.png b/flexmark-docx-converter/src/main/resources/emoji/tm.png
index c7dec75a33..603f79d897 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/tm.png and b/flexmark-docx-converter/src/main/resources/emoji/tm.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/traffic_light.png b/flexmark-docx-converter/src/main/resources/emoji/traffic_light.png
index 1facb276c4..b5f3dbe39e 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/traffic_light.png and b/flexmark-docx-converter/src/main/resources/emoji/traffic_light.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/wavy_dash.png b/flexmark-docx-converter/src/main/resources/emoji/wavy_dash.png
index 5a74e5c7ae..b71a8c7b2e 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/wavy_dash.png and b/flexmark-docx-converter/src/main/resources/emoji/wavy_dash.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/white_circle.png b/flexmark-docx-converter/src/main/resources/emoji/white_circle.png
index 3f648d1bd1..c88b511a10 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/white_circle.png and b/flexmark-docx-converter/src/main/resources/emoji/white_circle.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/white_large_square.png b/flexmark-docx-converter/src/main/resources/emoji/white_large_square.png
index 60cb19a137..782de0cd66 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/white_large_square.png and b/flexmark-docx-converter/src/main/resources/emoji/white_large_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/white_medium_small_square.png b/flexmark-docx-converter/src/main/resources/emoji/white_medium_small_square.png
index cdd5a392d6..574daa4fbd 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/white_medium_small_square.png and b/flexmark-docx-converter/src/main/resources/emoji/white_medium_small_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/white_medium_square.png b/flexmark-docx-converter/src/main/resources/emoji/white_medium_square.png
index bb5b28a3d2..8779a40810 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/white_medium_square.png and b/flexmark-docx-converter/src/main/resources/emoji/white_medium_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/white_small_square.png b/flexmark-docx-converter/src/main/resources/emoji/white_small_square.png
index 2b58fea846..4771c330b6 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/white_small_square.png and b/flexmark-docx-converter/src/main/resources/emoji/white_small_square.png differ
diff --git a/flexmark-docx-converter/src/main/resources/emoji/white_square_button.png b/flexmark-docx-converter/src/main/resources/emoji/white_square_button.png
index ad54d55c0c..e64987a6db 100644
Binary files a/flexmark-docx-converter/src/main/resources/emoji/white_square_button.png and b/flexmark-docx-converter/src/main/resources/emoji/white_square_button.png differ
diff --git a/flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboDocxConverterSpecTestBase.java b/flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboDocxConverterSpecTestBase.java
index 2b655a6e34..0cc3f59659 100644
--- a/flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboDocxConverterSpecTestBase.java
+++ b/flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboDocxConverterSpecTestBase.java
@@ -36,8 +36,6 @@
import com.vladsch.flexmark.util.data.SharedDataKeys;
import com.vladsch.flexmark.util.html.Attributes;
import com.vladsch.flexmark.util.html.MutableAttributes;
-import org.apache.log4j.Logger;
-import org.apache.log4j.varia.NullAppender;
import org.docx4j.Docx4J;
import org.docx4j.openpackaging.exceptions.Docx4JException;
import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
@@ -63,11 +61,6 @@ public abstract class ComboDocxConverterSpecTestBase extends ComboSpecTestCase {
static final String PROJECT_ROOT_DIRECTORY = TestUtils.getRootDirectoryForModule(ComboDocxConverterSpecTestBase.class, "flexmark-docx-converter");
static final String TEST_ROOT_DIRECTORY = TestUtils.getTestResourceRootDirectoryForModule(ComboDocxConverterSpecTestBase.class, "com.vladsch.flexmark.docx.converter");
final public static String[] EMPTY_STRINGS = new String[0];
- static {
- // Set up a simple configuration that logs on the console.
- Logger root = Logger.getRootLogger();
- root.addAppender(new NullAppender());
- }
// standard options
final private static DataHolder OPTIONS = new MutableDataSet()
@@ -120,10 +113,10 @@ public abstract class ComboDocxConverterSpecTestBase extends ComboSpecTestCase {
optionsMap.put("page-a4", new MutableDataSet().set(DocxRenderer.PAGE_SIZE, "a4"));
optionsMap.put("page-letter", new MutableDataSet().set(DocxRenderer.PAGE_SIZE, "letter"));
optionsMap.put("page-landscape", new MutableDataSet().set(DocxRenderer.PAGE_LANDSCAPE, true));
-
+
HashMap props = new HashMap<>();
- props.put("File Name", "TestFile");
- props.put("Company", "Test Company Name");
+ props.put("File Name", "TestFile");
+ props.put("Company", "Test Company Name");
optionsMap.put("properties", new MutableDataSet().set(DocxRenderer.CUSTOM_PROPERTIES, props));
}
private static String removeFileUri(String uri) {
diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_ast_alt_styles_spec.md b/flexmark-docx-converter/src/test/resources/docx_converter_ast_alt_styles_spec.md
index 5855631ba9..c3daa47f27 100644
--- a/flexmark-docx-converter/src/test/resources/docx_converter_ast_alt_styles_spec.md
+++ b/flexmark-docx-converter/src/test/resources/docx_converter_ast_alt_styles_spec.md
@@ -27,8 +27,7 @@ All headings
.
-
+
@@ -37,8 +36,7 @@ All headings
-
+
@@ -50,23 +48,17 @@ All headings
-
+
- 2019-08-29T17:05:00Z
+ 2019-08-29T17:05:00Z
Vladimir Schneider
- 2019-08-29T20:18:00Z
+ 2019-08-29T20:18:00Z
6
-
+
16.0000
@@ -88,16 +80,9 @@ All headings
-
+
-
+
@@ -161,9 +146,7 @@ All headings
-
+
@@ -172,15 +155,9 @@ All headings
-
+
-
+
@@ -188,11 +165,8 @@ All headings
-
-
+
+
@@ -220,12 +194,7 @@ All headings
-
+
@@ -233,26 +202,18 @@ All headings
-
+
-
+
-
+
-
+
@@ -264,8 +225,7 @@ All headings
-
+
@@ -281,8 +241,7 @@ All headings
-
+
@@ -308,8 +267,7 @@ All headings
-
+
@@ -419,8 +377,7 @@ All headings
-
+
@@ -523,12 +480,9 @@ All headings
-
+
-
+
@@ -536,12 +490,10 @@ All headings
-
+
-
+
@@ -573,8 +525,7 @@ All headings
-
+
@@ -589,8 +540,7 @@ All headings
-
+
@@ -605,36 +555,29 @@ All headings
-
+
-
+
-
-
-
+
+
+
-
+
@@ -671,8 +614,7 @@ All headings
-
+
@@ -760,24 +702,16 @@ All headings
-
+
-
+
-
+
@@ -1888,8 +1822,7 @@ All headings
-
+
@@ -1897,18 +1830,14 @@ All headings
-
+
-
+
@@ -1932,36 +1861,28 @@ All headings
-
+
-
+
-
+
-
+
@@ -1977,18 +1898,14 @@ All headings
-
+
-
+
@@ -1996,15 +1913,12 @@ All headings
-
+
-
+
@@ -2160,25 +2074,25 @@ All headings
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -2186,25 +2100,25 @@ All headings
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -2242,12 +2156,10 @@ All headings
-
-
-
-
+
+
+
+
@@ -2265,26 +2177,26 @@ All headings
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -2296,10 +2208,7 @@ All headings
-
+
@@ -2314,8 +2223,7 @@ All headings
.
-
+
@@ -2324,8 +2232,7 @@ All headings
-
+
@@ -2337,23 +2244,17 @@ All headings
-
+
- 2019-08-29T17:05:00Z
+ 2019-08-29T17:05:00Z
Vladimir Schneider
- 2019-08-29T20:18:00Z
+ 2019-08-29T20:18:00Z
6
-
+
16.0000
@@ -2375,16 +2276,9 @@ All headings
-
+
-
+
@@ -2398,9 +2292,7 @@ All headings
-
+
@@ -2409,15 +2301,9 @@ All headings
-
+
-
+
@@ -2425,11 +2311,8 @@ All headings
-
-
+
+
@@ -2457,12 +2340,7 @@ All headings
-
+
@@ -2470,26 +2348,18 @@ All headings
-
+
-
+
-
+
-
+
@@ -2501,8 +2371,7 @@ All headings
-
+
@@ -2518,8 +2387,7 @@ All headings
-
+
@@ -2545,8 +2413,7 @@ All headings
-
+
@@ -2656,8 +2523,7 @@ All headings
-
+
@@ -2760,12 +2626,9 @@ All headings
-
+
-
+
@@ -2773,12 +2636,10 @@ All headings
-
+
-
+
@@ -2810,8 +2671,7 @@ All headings
-
+
@@ -2826,8 +2686,7 @@ All headings
-
+
@@ -2842,36 +2701,29 @@ All headings
-
+
-
+
-
-
-
+
+
+
-
+
@@ -2908,8 +2760,7 @@ All headings
-
+
@@ -2997,24 +2848,16 @@ All headings
-
+
-
+
-
+
@@ -4125,8 +3968,7 @@ All headings
-
+
@@ -4134,18 +3976,14 @@ All headings
-
+
-
+
@@ -4169,36 +4007,28 @@ All headings
-
+
-
+
-
+
-
+
@@ -4214,18 +4044,14 @@ All headings
-
+
-
+
@@ -4233,15 +4059,12 @@ All headings
-
+
-
+
@@ -4397,25 +4220,25 @@ All headings
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -4423,25 +4246,25 @@ All headings
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -4479,12 +4302,10 @@ All headings
-
-
-
-
+
+
+
+
@@ -4502,26 +4323,26 @@ All headings
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -4533,10 +4354,7 @@ All headings
-
+
diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec.md b/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec.md
index 642c9a2f25..141b985cad 100644
--- a/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec.md
+++ b/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec.md
@@ -292,8 +292,7 @@ plain `inline code` highlight text
-
+
@@ -321,8 +320,7 @@ plain `inline code` highlight text
-
+
@@ -453,7 +451,7 @@ plain **Bold ~~Bold-strike-through~~** text
- 𝛑
+ 𝛑
= -1
@@ -1117,27 +1115,23 @@ with some text
.
-
+
-
+
-
+
-
+
@@ -1157,28 +1151,23 @@ with some text
-
+
-
+
-
+
-
+
@@ -1200,8 +1189,7 @@ with some text
-
+
@@ -1239,8 +1227,7 @@ with some text
-
+
@@ -1264,8 +1251,7 @@ with some text
-
+
@@ -1426,12 +1412,9 @@ with some text
-
+
-
+
@@ -1439,8 +1422,7 @@ with some text
-
+
@@ -1458,8 +1440,7 @@ with some text
-
+
@@ -1515,8 +1496,7 @@ with some text
-
+
@@ -1533,8 +1513,7 @@ with some text
-
+
@@ -1551,8 +1530,7 @@ with some text
-
+
@@ -1568,12 +1546,9 @@ with some text
-
-
-
+
+
+
@@ -1582,9 +1557,7 @@ with some text
-
+
@@ -1712,15 +1685,13 @@ with some text
-
+
-
+
@@ -2392,8 +2363,7 @@ with some text
-
+
@@ -2407,16 +2377,16 @@ with some text
-
+
-
-
+
+
-
+
@@ -6172,8 +6142,7 @@ Block Quote
-
+
@@ -6215,8 +6184,7 @@ Nested Block Quote
-
+
@@ -6293,8 +6261,7 @@ All the fixings
-
+
@@ -6727,8 +6694,7 @@ With breaks
-
+
@@ -6969,8 +6935,7 @@ With breaks and caption before
-
+
@@ -7193,8 +7158,7 @@ With spanning columns
-
+
@@ -7308,8 +7272,7 @@ With spanning columns turned off
-
+
@@ -7428,8 +7391,7 @@ With embedded links
-
+
@@ -7543,8 +7505,7 @@ block quote with bullet list
-
+
@@ -7563,8 +7524,7 @@ block quote with bullet list
-
+
@@ -7617,8 +7577,7 @@ block quote with bullet nested list
-
+
@@ -7637,8 +7596,7 @@ block quote with bullet nested list
-
+
@@ -7694,8 +7652,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -7714,8 +7671,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -7734,8 +7690,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -7754,8 +7709,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -7774,8 +7728,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -8644,8 +8597,7 @@ aside block with bullet list
-
+
@@ -8661,8 +8613,7 @@ aside block with bullet list
-
+
@@ -8712,8 +8663,7 @@ aside block with bullet nested list
-
+
@@ -8729,8 +8679,7 @@ aside block with bullet nested list
-
+
@@ -8783,8 +8732,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -8800,8 +8748,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -8817,8 +8764,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -8834,8 +8780,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -8851,8 +8796,7 @@ aside block with bullet list nested beyond border space limit
-
+
diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec2.md b/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec2.md
index d326087897..8aaea7a14e 100644
--- a/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec2.md
+++ b/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec2.md
@@ -195,8 +195,7 @@ Paragraph text[^1]
-
+
@@ -497,8 +496,7 @@ Paragraph text, repeated footnote[^1]
-
+
@@ -618,8 +616,7 @@ Der Hersteller[^C1-04]
-
+
@@ -745,8 +742,7 @@ Der Hersteller[^C1-04]
-
+
@@ -4774,8 +4770,7 @@ See [@fig:abc]
-
+
@@ -6139,8 +6134,7 @@ Plain Text <<>>
-
+
@@ -6210,8 +6204,7 @@ Plain Text <<>>
-
+
@@ -6322,8 +6315,7 @@ Plain Text <<>>
-
+
@@ -6440,8 +6432,7 @@ Plain Text <<>>
-
+
@@ -6499,16 +6490,11 @@ Plain Text <<>>
-
-
-
-
-
+
+
+
+
+
@@ -6516,9 +6502,7 @@ Plain Text <<>>
-
+
@@ -6553,7 +6537,7 @@ Plain Text <<>>
-
+
data
@@ -6577,7 +6561,7 @@ Plain Text <<>>
-
+
data
@@ -6702,8 +6686,7 @@ Plain text <<>>
-
+
@@ -6771,16 +6754,11 @@ Plain text <<>>
-
-
-
-
-
+
+
+
+
+
@@ -6788,9 +6766,7 @@ Plain text <<>>
-
+
diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec3.md b/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec3.md
index 85b93b90db..766df82f34 100644
--- a/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec3.md
+++ b/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec3.md
@@ -248,8 +248,7 @@ Paragraph text[^1]
-
+
@@ -3894,16 +3893,16 @@ See [@tbl:test]
-
+
-
-
+
+
-
+
@@ -3950,16 +3949,16 @@ See [@tbl:test]
-
+
-
-
+
+
-
+
@@ -4003,8 +4002,7 @@ See [@tbl:test]
-
+
@@ -4213,16 +4211,16 @@ See [@tbl:test]
-
+
-
-
+
+
-
+
@@ -4269,16 +4267,16 @@ See [@tbl:test]
-
+
-
-
+
+
-
+
@@ -4322,8 +4320,7 @@ See [@tbl:test]
-
+
@@ -4924,8 +4921,7 @@ Plain text <<>>
-
+
@@ -4993,16 +4989,11 @@ Plain text <<>>
-
-
-
-
-
+
+
+
+
+
@@ -5010,9 +5001,7 @@ Plain text <<>>
-
+
@@ -5184,16 +5173,14 @@ Plain text <<>>
.
-
+
-
+
@@ -5201,8 +5188,7 @@ Plain text <<>>
-
+
@@ -5219,28 +5205,23 @@ Plain text <<>>
-
+
-
+
-
+
-
+
@@ -5262,8 +5243,7 @@ Plain text <<>>
-
+
@@ -5301,8 +5281,7 @@ Plain text <<>>
-
+
@@ -5326,8 +5305,7 @@ Plain text <<>>
-
+
@@ -5488,12 +5466,9 @@ Plain text <<>>
-
+
-
+
@@ -5501,8 +5476,7 @@ Plain text <<>>
-
+
@@ -5520,8 +5494,7 @@ Plain text <<>>
-
+
@@ -5577,8 +5550,7 @@ Plain text <<>>
-
+
@@ -5595,8 +5567,7 @@ Plain text <<>>
-
+
@@ -5613,8 +5584,7 @@ Plain text <<>>
-
+
@@ -5630,12 +5600,9 @@ Plain text <<>>
-
-
-
+
+
+
@@ -5644,9 +5611,7 @@ Plain text <<>>
-
+
@@ -5774,15 +5739,13 @@ Plain text <<>>
-
+
-
+
@@ -6160,8 +6123,7 @@ Plain text <<>>
.
-
+
@@ -6169,8 +6131,7 @@ Plain text <<>>
-
+
@@ -6178,8 +6139,7 @@ Plain text <<>>
-
+
@@ -6196,28 +6156,23 @@ Plain text <<>>
-
+
-
+
-
+
-
+
@@ -6239,8 +6194,7 @@ Plain text <<>>
-
+
@@ -6278,8 +6232,7 @@ Plain text <<>>
-
+
@@ -6303,8 +6256,7 @@ Plain text <<>>
-
+
@@ -6465,12 +6417,9 @@ Plain text <<>>
-
+
-
+
@@ -6478,8 +6427,7 @@ Plain text <<>>
-
+
@@ -6497,8 +6445,7 @@ Plain text <<>>
-
+
@@ -6554,8 +6501,7 @@ Plain text <<>>
-
+
@@ -6572,8 +6518,7 @@ Plain text <<>>
-
+
@@ -6590,8 +6535,7 @@ Plain text <<>>
-
+
@@ -6607,12 +6551,9 @@ Plain text <<>>
-
-
-
+
+
+
@@ -6621,9 +6562,7 @@ Plain text <<>>
-
+
@@ -6751,15 +6690,13 @@ Plain text <<>>
-
+
-
+
@@ -7128,18 +7065,13 @@ Plain text <<>>
-
+
-
+
Test Company Name
-
+
TestFile
@@ -7156,16 +7088,14 @@ Plain text <<>>
.
-
+
-
+
@@ -7173,8 +7103,7 @@ Plain text <<>>
-
+
@@ -7191,28 +7120,23 @@ Plain text <<>>
-
+
-
+
-
+
-
+
@@ -7234,8 +7158,7 @@ Plain text <<>>
-
+
@@ -7273,8 +7196,7 @@ Plain text <<>>
-
+
@@ -7298,8 +7220,7 @@ Plain text <<>>
-
+
@@ -7460,12 +7381,9 @@ Plain text <<>>
-
+
-
+
@@ -7473,8 +7391,7 @@ Plain text <<>>
-
+
@@ -7492,8 +7409,7 @@ Plain text <<>>
-
+
@@ -7549,8 +7465,7 @@ Plain text <<>>
-
+
@@ -7567,8 +7482,7 @@ Plain text <<>>
-
+
@@ -7585,8 +7499,7 @@ Plain text <<>>
-
+
@@ -7602,12 +7515,9 @@ Plain text <<>>
-
-
-
+
+
+
@@ -7616,9 +7526,7 @@ Plain text <<>>
-
+
@@ -7746,15 +7654,13 @@ Plain text <<>>
-
+
-
+
@@ -8132,16 +8038,14 @@ Plain text <<>>
.
-
+
-
+
@@ -8149,8 +8053,7 @@ Plain text <<>>
-
+
@@ -8166,30 +8069,24 @@ Plain text <<>>
-
-
+
+
-
+
-
+
-
+
@@ -8211,8 +8108,7 @@ Plain text <<>>
-
+
@@ -8250,8 +8146,7 @@ Plain text <<>>
-
+
@@ -8275,8 +8170,7 @@ Plain text <<>>
-
+
@@ -8437,12 +8331,9 @@ Plain text <<>>
-
+
-
+
@@ -8450,8 +8341,7 @@ Plain text <<>>
-
+
@@ -8469,8 +8359,7 @@ Plain text <<>>
-
+
@@ -8526,8 +8415,7 @@ Plain text <<>>
-
+
@@ -8544,8 +8432,7 @@ Plain text <<>>
-
+
@@ -8562,8 +8449,7 @@ Plain text <<>>
-
+
@@ -8579,12 +8465,9 @@ Plain text <<>>
-
-
-
+
+
+
@@ -8593,9 +8476,7 @@ Plain text <<>>
-
+
@@ -8723,15 +8604,13 @@ Plain text <<>>
-
+
-
+
@@ -9109,16 +8988,14 @@ Plain text <<>>
.
-
+
-
+
@@ -9126,8 +9003,7 @@ Plain text <<>>
-
+
@@ -9144,28 +9020,23 @@ Plain text <<>>
-
+
-
+
-
+
-
+
@@ -9187,8 +9058,7 @@ Plain text <<>>
-
+
@@ -9226,8 +9096,7 @@ Plain text <<>>
-
+
@@ -9251,8 +9120,7 @@ Plain text <<>>
-
+
@@ -9413,12 +9281,9 @@ Plain text <<>>
-
+
-
+
@@ -9426,8 +9291,7 @@ Plain text <<>>
-
+
@@ -9445,8 +9309,7 @@ Plain text <<>>
-
+
@@ -9502,8 +9365,7 @@ Plain text <<>>
-
+
@@ -9520,8 +9382,7 @@ Plain text <<>>
-
+
@@ -9538,8 +9399,7 @@ Plain text <<>>
-
+
@@ -9555,12 +9415,9 @@ Plain text <<>>
-
-
-
+
+
+
@@ -9569,9 +9426,7 @@ Plain text <<>>
-
+
@@ -9699,15 +9554,13 @@ Plain text <<>>
-
+
-
+
@@ -10085,16 +9938,14 @@ Plain text <<>>
.
-
+
-
+
@@ -10102,8 +9953,7 @@ Plain text <<>>
-
+
@@ -10119,30 +9969,24 @@ Plain text <<>>
-
-
+
+
-
+
-
+
-
+
@@ -10164,8 +10008,7 @@ Plain text <<>>
-
+
@@ -10203,8 +10046,7 @@ Plain text <<>>
-
+
@@ -10228,8 +10070,7 @@ Plain text <<>>
-
+
@@ -10390,12 +10231,9 @@ Plain text <<>>
-
+
-
+
@@ -10403,8 +10241,7 @@ Plain text <<>>
-
+
@@ -10422,8 +10259,7 @@ Plain text <<>>
-
+
@@ -10479,8 +10315,7 @@ Plain text <<>>
-
+
@@ -10497,8 +10332,7 @@ Plain text <<>>
-
+
@@ -10515,8 +10349,7 @@ Plain text <<>>
-
+
@@ -10532,12 +10365,9 @@ Plain text <<>>
-
-
-
+
+
+
@@ -10546,9 +10376,7 @@ Plain text <<>>
-
+
@@ -10676,15 +10504,13 @@ Plain text <<>>
-
+
-
+
diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_attribute_ast_spec.md b/flexmark-docx-converter/src/test/resources/docx_converter_attribute_ast_spec.md
index 036b609e40..5fd9f8f13f 100644
--- a/flexmark-docx-converter/src/test/resources/docx_converter_attribute_ast_spec.md
+++ b/flexmark-docx-converter/src/test/resources/docx_converter_attribute_ast_spec.md
@@ -369,8 +369,7 @@ Document[0, 57]
-
+
@@ -404,8 +403,7 @@ Document[0, 57]
-
+
@@ -670,7 +668,7 @@ permutations of formatting
- 𝛑
+ 𝛑
@@ -1048,8 +1046,7 @@ plain `inline code`{style="color:blue"} highlight text
-
+
@@ -1080,8 +1077,7 @@ plain `inline code`{style="color:blue"} highlight text
-
+
@@ -1223,7 +1219,7 @@ plain **Bold ~~Bold-strike-through~~**{style="color:blue"} text
- 𝛑
+ 𝛑
= -1
@@ -1649,8 +1645,7 @@ Document[0, 77]
-
+
@@ -1684,8 +1679,7 @@ Document[0, 77]
-
+
@@ -1862,7 +1856,7 @@ permutations of formatting
- 𝛑
+ 𝛑
diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_de_ast_spec.md b/flexmark-docx-converter/src/test/resources/docx_converter_de_ast_spec.md
index b09a98b8e7..ab172f0c1a 100644
--- a/flexmark-docx-converter/src/test/resources/docx_converter_de_ast_spec.md
+++ b/flexmark-docx-converter/src/test/resources/docx_converter_de_ast_spec.md
@@ -20,8 +20,7 @@ basic text
plain text
.
-
+
@@ -35,8 +34,7 @@ plain text
-
+
@@ -46,8 +44,7 @@ plain text
-
+
@@ -65,8 +62,7 @@ plain text
plain **Bold** text
.
-
+
@@ -89,8 +85,7 @@ plain **Bold** text
-
+
@@ -100,8 +95,7 @@ plain **Bold** text
-
+
@@ -119,8 +113,7 @@ plain **Bold** text
plain *Italic* text
.
-
+
@@ -143,8 +136,7 @@ plain *Italic* text
-
+
@@ -154,8 +146,7 @@ plain *Italic* text
-
+
@@ -173,8 +164,7 @@ plain *Italic* text
plain ~~strike-through~~ text
.
-
+
@@ -197,8 +187,7 @@ plain ~~strike-through~~ text
-
+
@@ -208,8 +197,7 @@ plain ~~strike-through~~ text
-
+
@@ -227,8 +215,7 @@ plain ~~strike-through~~ text
plain ~subscript~ text H~2~O
.
-
+
@@ -260,8 +247,7 @@ plain ~subscript~ text H~2~O
-
+
@@ -271,8 +257,7 @@ plain ~subscript~ text H~2~O
-
+
@@ -290,8 +275,7 @@ plain ~subscript~ text H~2~O
plain ^superscript^ text e^*i*pi^ = -1
.
-
+
@@ -331,8 +315,7 @@ plain ^superscript^ text e^*i*pi^ = -1
-
+
@@ -342,8 +325,7 @@ plain ^superscript^ text e^*i*pi^ = -1
-
+
@@ -373,8 +355,7 @@ Document[0, 38]
plain ^superscript^ text e^ipi^ = -1
.
-
+
@@ -406,8 +387,7 @@ plain ^superscript^ text e^ipi^ = -1
-
+
@@ -417,8 +397,7 @@ plain ^superscript^ text e^ipi^ = -1
-
+
@@ -436,8 +415,7 @@ plain ^superscript^ text e^ipi^ = -1
plain ++underline++ text
.
-
+
@@ -460,8 +438,7 @@ plain ++underline++ text
-
+
@@ -471,8 +448,7 @@ plain ++underline++ text
-
+
@@ -490,8 +466,7 @@ plain ++underline++ text
plain `inline code` text
.
-
+
@@ -514,8 +489,7 @@ plain `inline code` text
-
+
@@ -525,8 +499,7 @@ plain `inline code` text
-
+
@@ -544,8 +517,7 @@ plain `inline code` text
plain `inline code` highlight text
.
-
+
@@ -570,8 +542,7 @@ plain `inline code` highlight text
-
+
@@ -581,8 +552,7 @@ plain `inline code` highlight text
-
+
@@ -600,8 +570,7 @@ plain `inline code` highlight text
plain `inline code` highlight text
.
-
+
@@ -626,8 +595,7 @@ plain `inline code` highlight text
-
+
@@ -637,8 +605,7 @@ plain `inline code` highlight text
-
+
@@ -663,8 +630,7 @@ plain **Bold ~Bold-Subscript~** text H~2~O
plain **Bold ~~Bold-strike-through~~** text
.
-
+
@@ -773,7 +739,7 @@ plain **Bold ~~Bold-strike-through~~** text
- 𝛑
+ 𝛑
= -1
@@ -836,8 +802,7 @@ plain **Bold ~~Bold-strike-through~~** text
-
+
@@ -847,8 +812,7 @@ plain **Bold ~~Bold-strike-through~~** text
-
+
@@ -875,8 +839,7 @@ plain **Bold ~~Bold-strike-through~~** text
.
-
+
@@ -926,8 +889,7 @@ plain **Bold ~~Bold-strike-through~~** text
-
+
@@ -937,8 +899,7 @@ plain **Bold ~~Bold-strike-through~~** text
-
+
@@ -1053,8 +1014,7 @@ tight lists
* list 2.2
.
-
+
@@ -1138,8 +1098,7 @@ tight lists
-
+
@@ -1149,8 +1108,7 @@ tight lists
-
+
@@ -1177,8 +1135,7 @@ loose lists
.
-
+
@@ -1262,8 +1219,7 @@ loose lists
-
+
@@ -1273,8 +1229,7 @@ loose lists
-
+
@@ -1303,8 +1258,7 @@ loose lists
.
-
+
@@ -1388,8 +1342,7 @@ loose lists
-
+
@@ -1399,8 +1352,7 @@ loose lists
-
+
@@ -1424,8 +1376,7 @@ full list items
* list 5
.
-
+
@@ -1496,8 +1447,7 @@ full list items
-
+
@@ -1507,8 +1457,7 @@ full list items
-
+
@@ -1532,8 +1481,7 @@ full list items
1. list 5
.
-
+
@@ -1604,8 +1552,7 @@ full list items
-
+
@@ -1615,8 +1562,7 @@ full list items
-
+
@@ -1640,8 +1586,7 @@ Web URL
with some text
.
-
+
@@ -1680,8 +1625,7 @@ with some text
-
+
@@ -1691,8 +1635,7 @@ with some text
-
+
@@ -2082,8 +2025,7 @@ lazy continuation
lazy continuation
.
-
+
@@ -2129,8 +2071,7 @@ lazy continuation
-
+
@@ -2140,8 +2081,7 @@ lazy continuation
-
+
@@ -2161,8 +2101,7 @@ with hyperlink
> [flexmark-icon-logo](https://raw.githubusercontent.com/vsch/flexmark-java/master/assets/images/flexmark-icon-logo%402x.png "Title: flexmark-java logo")
.
-
+
@@ -2205,8 +2144,7 @@ with hyperlink
-
+
@@ -2216,8 +2154,7 @@ with hyperlink
-
+
@@ -2238,8 +2175,7 @@ with hard break
> with a link [flexmark-icon-logo](https://raw.githubusercontent.com/vsch/flexmark-java/master/assets/images/flexmark-icon-logo%402x.png "Title: flexmark-java logo")
.
-
+
@@ -2291,8 +2227,7 @@ with hard break
-
+
@@ -2302,8 +2237,7 @@ with hard break
-
+
@@ -2325,8 +2259,7 @@ with child paragraphs
> with a link [flexmark-icon-logo](https://raw.githubusercontent.com/vsch/flexmark-java/master/assets/images/flexmark-icon-logo%402x.png "Title: flexmark-java logo")
.
-
+
@@ -2380,8 +2313,7 @@ with child paragraphs
-
+
@@ -2391,8 +2323,7 @@ with child paragraphs
-
+
@@ -2414,8 +2345,7 @@ with child block quote
>> another block quote
.
-
+
@@ -2462,8 +2392,7 @@ with child block quote
-
+
@@ -2473,8 +2402,7 @@ with child block quote
-
+
@@ -2497,8 +2425,7 @@ with child paragraphs
>> another block quote
.
-
+
@@ -2573,8 +2500,7 @@ with child paragraphs
-
+
@@ -2584,8 +2510,7 @@ with child paragraphs
-
+
@@ -2609,8 +2534,7 @@ code
.
-
+
@@ -2643,8 +2567,7 @@ code
-
+
@@ -2654,8 +2577,7 @@ code
-
+
@@ -2680,8 +2602,7 @@ code
text after
.
-
+
@@ -2730,8 +2651,7 @@ text after
-
+
@@ -2741,8 +2661,7 @@ text after
-
+
@@ -2764,15 +2683,13 @@ text after
.
-
+
-
+
@@ -2782,8 +2699,7 @@ text after
-
+
@@ -6218,8 +6134,7 @@ plain [-del-] [+ins+]
plain {-del-} {+ins+}
.
-
+
@@ -6269,8 +6184,7 @@ plain {-del-} {+ins+}
-
+
@@ -6280,8 +6194,7 @@ plain {-del-} {+ins+}
-
+
@@ -6303,8 +6216,7 @@ Block Quote
>>>
.
-
+
@@ -6318,8 +6230,7 @@ Block Quote
-
+
@@ -6339,8 +6250,7 @@ Block Quote
-
+
@@ -6350,8 +6260,7 @@ Block Quote
-
+
@@ -6376,8 +6285,7 @@ Nested Block Quote
>>>
.
-
+
@@ -6391,8 +6299,7 @@ Nested Block Quote
-
+
@@ -6432,8 +6339,7 @@ Nested Block Quote
-
+
@@ -6443,8 +6349,7 @@ Nested Block Quote
-
+
@@ -6475,8 +6380,7 @@ All the fixings
[Table Caption]
.
-
+
@@ -6499,8 +6403,7 @@ All the fixings
-
+
@@ -6937,8 +6840,7 @@ All the fixings
-
+
@@ -6948,8 +6850,7 @@ All the fixings
-
+
@@ -6976,8 +6877,7 @@ With breaks
.
-
+
@@ -7000,8 +6900,7 @@ With breaks
-
+
@@ -7208,8 +7107,7 @@ With breaks
-
+
@@ -7219,8 +7117,7 @@ With breaks
-
+
@@ -7247,8 +7144,7 @@ With breaks and caption before
.
-
+
@@ -7279,8 +7175,7 @@ With breaks and caption before
-
+
@@ -7479,8 +7374,7 @@ With breaks and caption before
-
+
@@ -7490,8 +7384,7 @@ With breaks and caption before
-
+
@@ -7516,8 +7409,7 @@ With spanning columns
.
-
+
@@ -7540,8 +7432,7 @@ With spanning columns
-
+
@@ -7631,8 +7522,7 @@ With spanning columns
-
+
@@ -7642,8 +7532,7 @@ With spanning columns
-
+
@@ -7668,8 +7557,7 @@ With spanning columns turned off
.
-
+
@@ -7692,8 +7580,7 @@ With spanning columns turned off
-
+
@@ -7789,8 +7676,7 @@ With spanning columns turned off
-
+
@@ -7800,8 +7686,7 @@ With spanning columns turned off
-
+
@@ -7825,8 +7710,7 @@ With embedded links
.
-
+
@@ -7849,8 +7733,7 @@ With embedded links
-
+
@@ -7934,8 +7817,7 @@ With embedded links
-
+
@@ -7945,8 +7827,7 @@ With embedded links
-
+
@@ -7974,8 +7855,7 @@ block quote with bullet list
>
.
-
+
@@ -8001,8 +7881,7 @@ block quote with bullet list
-
+
@@ -8025,8 +7904,7 @@ block quote with bullet list
-
+
@@ -8049,8 +7927,7 @@ block quote with bullet list
-
+
@@ -8060,8 +7937,7 @@ block quote with bullet list
-
+
@@ -8085,8 +7961,7 @@ block quote with bullet nested list
>
.
-
+
@@ -8112,8 +7987,7 @@ block quote with bullet nested list
-
+
@@ -8136,8 +8010,7 @@ block quote with bullet nested list
-
+
@@ -8160,8 +8033,7 @@ block quote with bullet nested list
-
+
@@ -8171,8 +8043,7 @@ block quote with bullet nested list
-
+
@@ -8199,8 +8070,7 @@ block quote with bullet list nested beyond border space limit
>
.
-
+
@@ -8226,8 +8096,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -8250,8 +8119,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -8274,8 +8142,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -8298,8 +8165,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -8322,8 +8188,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -8346,8 +8211,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -8357,8 +8221,7 @@ block quote with bullet list nested beyond border space limit
-
+
@@ -9447,8 +9310,7 @@ aside block with bullet list
|
.
-
+
@@ -9474,8 +9336,7 @@ aside block with bullet list
-
+
@@ -9498,8 +9359,7 @@ aside block with bullet list
-
+
@@ -9522,8 +9382,7 @@ aside block with bullet list
-
+
@@ -9533,8 +9392,7 @@ aside block with bullet list
-
+
@@ -9558,8 +9416,7 @@ aside block with bullet nested list
|
.
-
+
@@ -9585,8 +9442,7 @@ aside block with bullet nested list
-
+
@@ -9609,8 +9465,7 @@ aside block with bullet nested list
-
+
@@ -9633,8 +9488,7 @@ aside block with bullet nested list
-
+
@@ -9644,8 +9498,7 @@ aside block with bullet nested list
-
+
@@ -9672,8 +9525,7 @@ aside block with bullet list nested beyond border space limit
|
.
-
+
@@ -9699,8 +9551,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -9723,8 +9574,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -9747,8 +9597,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -9771,8 +9620,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -9795,8 +9643,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -9819,8 +9666,7 @@ aside block with bullet list nested beyond border space limit
-
+
@@ -9830,8 +9676,7 @@ aside block with bullet list nested beyond border space limit
-
+
diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_de_ast_spec2.md b/flexmark-docx-converter/src/test/resources/docx_converter_de_ast_spec2.md
index d1ede85609..d68b7a73be 100644
--- a/flexmark-docx-converter/src/test/resources/docx_converter_de_ast_spec2.md
+++ b/flexmark-docx-converter/src/test/resources/docx_converter_de_ast_spec2.md
@@ -21,8 +21,7 @@ Paragraph text[^1]
.
-
+
@@ -42,8 +41,7 @@ Paragraph text[^1]
-
+
@@ -53,8 +51,7 @@ Paragraph text[^1]
-
+
@@ -102,8 +99,7 @@ Paragraph text[^1]
.
-
+
@@ -123,8 +119,7 @@ Paragraph text[^1]
-
+
@@ -134,8 +129,7 @@ Paragraph text[^1]
-
+
@@ -213,8 +207,7 @@ Paragraph text[^1]
-
+
@@ -269,8 +262,7 @@ Paragraph text, repeated footnote[^1]
.
-
+
@@ -304,8 +296,7 @@ Paragraph text, repeated footnote[^1]
-
+
@@ -315,8 +306,7 @@ Paragraph text, repeated footnote[^1]
-
+
@@ -390,8 +380,7 @@ Paragraph text, repeated footnote[^1]
.
-
+
@@ -425,8 +414,7 @@ Paragraph text, repeated footnote[^1]
-
+
@@ -436,8 +424,7 @@ Paragraph text, repeated footnote[^1]
-
+
@@ -526,8 +513,7 @@ Paragraph text, repeated footnote[^1]
.
-
+
@@ -550,8 +536,7 @@ Paragraph text, repeated footnote[^1]
-
+
@@ -600,8 +585,7 @@ Paragraph text, repeated footnote[^1]
-
+
@@ -611,8 +595,7 @@ Paragraph text, repeated footnote[^1]
-
+
@@ -664,8 +647,7 @@ Der Hersteller[^C1-04]
.
-
+
@@ -688,8 +670,7 @@ Der Hersteller[^C1-04]
-
+
@@ -746,8 +727,7 @@ Der Hersteller[^C1-04]
-
+
@@ -757,8 +737,7 @@ Der Hersteller[^C1-04]
-
+
@@ -808,8 +787,7 @@ Der Hersteller[^C1-04]
.
-
+
@@ -832,8 +810,7 @@ Der Hersteller[^C1-04]
-
+
@@ -882,8 +859,7 @@ Der Hersteller[^C1-04]
-
+
@@ -893,8 +869,7 @@ Der Hersteller[^C1-04]
-
+
@@ -935,8 +910,7 @@ Text [^id] with link [link](http://example.com)
[^id]: [link](http://example.com)
.
-
+
@@ -967,8 +941,7 @@ Text [^id] with link [link](http://example.com)
-
+