From a673ad0606dfd24a7346cb9fbc92c9f4a901c528 Mon Sep 17 00:00:00 2001 From: Vladimir Schneider Date: Thu, 17 Oct 2019 07:49:33 -0400 Subject: [PATCH 01/13] update ide settings --- .idea/codeStyles/Project.xml | 6 ++- .idea/codeStyles/codeStyleConfig.xml | 1 + .idea/compiler.xml | 16 +++--- .idea/encodings.xml | 50 +++++++++++++++++++ .idea/fileColors.xml | 8 +-- .idea/markdown-navigator-enh.xml | 18 +++---- .idea/markdown-navigator/COPY_HTML_MIME.xml | 5 ++ .idea/markdown-navigator/Comms.xml | 5 ++ .idea/markdown-navigator/GitHub_Templates.xml | 5 ++ .idea/markdown-navigator/OVERVIEW.xml | 5 ++ .idea/modules.xml | 1 + 11 files changed, 101 insertions(+), 19 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index df95a271ca..86f6ff24e1 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -31,7 +31,6 @@ - \ No newline at end of file diff --git a/.idea/markdown-navigator/OVERVIEW.xml b/.idea/markdown-navigator/OVERVIEW.xml index d2a644d9dc..ae9a0b3d5b 100644 --- a/.idea/markdown-navigator/OVERVIEW.xml +++ b/.idea/markdown-navigator/OVERVIEW.xml @@ -117,7 +117,13 @@ code { - + + + + \ No newline at end of file diff --git a/.idea/statistic.xml b/.idea/statistic.xml index b972a3708d..27edf9c7d1 100644 --- a/.idea/statistic.xml +++ b/.idea/statistic.xml @@ -2,5 +2,10 @@ \ No newline at end of file diff --git a/README.md b/README.md index 492eef65dc..b46f3fbd16 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ than ideal and for pathological input either hangs or practically hangs during p ### master [![Build status](https://travis-ci.org/vsch/flexmark-java.svg?branch=master)](https://travis-ci.org/vsch/flexmark-java) -### latest [![Maven Central status](https://img.shields.io/maven-central/v/com.vladsch.flexmark/flexmark.svg)](https://search.maven.org/search?q=g:com.vladsch.flexmark) [![Build status](https://travis-ci.org/vsch/flexmark-java.svg?branch=0.50.42)](https://travis-ci.org/vsch/flexmark-java) [![Javadocs](https://www.javadoc.io/badge/com.vladsch.flexmark/flexmark.svg)](https://www.javadoc.io/doc/com.vladsch.flexmark/flexmark) +### latest [![Maven Central status](https://img.shields.io/maven-central/v/com.vladsch.flexmark/flexmark.svg)](https://search.maven.org/search?q=g:com.vladsch.flexmark) [![Build status](https://travis-ci.org/vsch/flexmark-java.svg?branch=0.50.44)](https://travis-ci.org/vsch/flexmark-java) [![Javadocs](https://www.javadoc.io/badge/com.vladsch.flexmark/flexmark.svg)](https://www.javadoc.io/doc/com.vladsch.flexmark/flexmark) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/vsch/flexmark-java) @@ -48,12 +48,12 @@ following sample: com.vladsch.flexmark flexmark-all - 0.50.42 + 0.50.44 ``` Source: -[BasicSample.java](flexmark-java-samples/src/com/vladsch/flexmark/samples/BasicSample.java) +[BasicSample.java](flexmark-java-samples/src/com/vladsch/flexmark/java/samples/BasicSample.java) ```java package com.vladsch.flexmark.samples; @@ -87,7 +87,7 @@ public class BasicSample { #### Building via Gradle ```shell -compile 'com.vladsch.flexmark:flexmark-all:0.50.42' +compile 'com.vladsch.flexmark:flexmark-all:0.50.44' ``` #### Building with Android Studio @@ -167,7 +167,7 @@ public class PegdownOptions { ``` A sample with a -[custom link resolver](https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/PegdownCustomLinkResolverOptions.java) +[custom link resolver](https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/PegdownCustomLinkResolverOptions.java) is also available, which includes link resolver for changing URLs or attributes of links and a custom node renderer if you need to override the generated link HTML. @@ -223,7 +223,7 @@ custom node renderer if you need to override the generated link HTML. * Custom node rendering API with ability to invoke standard rendering for an overridden node, allowing custom node renders that only handle special cases and let the rest be rendered as usual. - [PegdownCustomLinkResolverOptions](https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/PegdownCustomLinkResolverOptions.java) + [PegdownCustomLinkResolverOptions](https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/PegdownCustomLinkResolverOptions.java) * [Gfm Issues](https://github.com/vsch/flexmark-java/wiki/Extensions#gfm-issues) and [Gfm Users](https://github.com/vsch/flexmark-java/wiki/Extensions#gfm-users) extensions for parsing and rendering `#123` and `@user-name` respectively. @@ -617,14 +617,14 @@ BSD (2-clause) licensed, see [LICENSE.txt] file. [commonmark-java]: https://github.com/atlassian/commonmark-java [commonMarkSpec.md]: https://github.com/vsch/idea-multimarkdown/blob/master/test/data/performance/commonMarkSpec.md [docx4j]: https://www.docx4java.org/trac/docx4j -[DocxConverter Sample]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/DocxConverterCommonMark.java +[DocxConverter Sample]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/DocxConverterCommonMark.java [Extensions.java]: flexmark-profile-pegdown/src/main/java/com/vladsch/flexmark/profiles/pegdown/Extensions.java [flexmark-java]: https://github.com/vsch/flexmark-java [GitHub]: https://github.com/vsch/laravel-translation-manager [GitHub Issues page]: ../../issues [hang-pegdown.md]: https://github.com/vsch/idea-multimarkdown/blob/master/test/data/performance/hang-pegdown.md [hang-pegdown2.md]: https://github.com/vsch/idea-multimarkdown/blob/master/test/data/performance/hang-pegdown2.md -[HtmlToMarkdownCustomizedSample.java]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/HtmlToMarkdownCustomizedSample.java +[HtmlToMarkdownCustomizedSample.java]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/HtmlToMarkdownCustomizedSample.java [Include Markdown and HTML File Content]: ../../wiki/Usage#include-markdown-and-html-file-content [intellij-markdown]: https://github.com/valich/intellij-markdown [Jekyll]: https://jekyllrb.com diff --git a/VERSION.md b/VERSION.md index 8b67c94aff..ae92c4a7d4 100644 --- a/VERSION.md +++ b/VERSION.md @@ -6,6 +6,7 @@ flexmark-java [TOC]: # " " - [To Do](#to-do) +- [0.50.44](#05044) - [0.50.42](#05042) - [0.50.40](#05040) - [0.50.38](#05038) @@ -110,6 +111,11 @@ flexmark-java * [ ] Add: `flexmark-ext-attributes` formatting of individual attributes instead of dumping the attributes node text. +0.50.44 +------- + +* Fix: [#376, convert markdown to html], delimiters are not allowed to span table cells. + 0.50.42 ------- @@ -1307,7 +1313,7 @@ flexmark-java * Add: translation formatting awareness to: abbreviation, admonition, attributes, emoji, enumerated reference footnotes and tables extensions * Add: translation API sample: - [TranslationSample.java](https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/TranslationSample.java) + [TranslationSample.java](https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/TranslationSample.java) * Fix: `AttributesExtension` incorrectly parsed consecutive attributes as a single element * Add: `TranslationHandlerFactory` to allow format options to be passed for custom handler creation. @@ -1386,7 +1392,7 @@ flexmark-java * Fix: change all javadoc/overview.html to be generated from javadoc/overview.md files. * Fix: admonition.css remove non-existent `horiz-align` property. * Add: - [HtmlToMarkdownSample.java](https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/HtmlToMarkdownSample.java) + [HtmlToMarkdownSample.java](https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/HtmlToMarkdownSample.java) * Add: `HtmlRenderer.HEADER_ID_GENERATOR_NON_DASH_CHARS`, default `""`. Any characters in the string will be preserved and passed through to the heading ID. * Fix: `ParserEmulationProfile.GITHUB_DOC` now sets @@ -1700,14 +1706,16 @@ setting either will affect both keys. For information on these keys see [#362, ArrayIndexOutOfBoundsException in BasedSequence.indexOfAll]: https://github.com/vsch/flexmark-java/issues/362 [Admonition Extension, Material for MkDocs]: https://squidfunk.github.io/mkdocs-material/extensions/admonition/ [Awesome Console]: https://plugins.jetbrains.com/plugin/7677-awesome-console "Awesome Console" -[HtmlToMarkdownCustomizedSample.java]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/HtmlToMarkdownCustomizedSample.java +[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 [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 -[NodeInsertingPostProcessorSample.java]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/NodeInsertingPostProcessorSample.java -[PdfLandscapeConverter.java]: https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/PdfLandscapeConverter.java +[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 [YouTrack: IDEA-207453]: https://youtrack.jetbrains.com/issue/IDEA-207453 "Add Conversion of ref anchor to UrlFilter for file line navigation" [#372, \[Regression?\] Attributes extension not applied to \`code\` tag of code blocks]: https://github.com/vsch/flexmark-java/issues/372 + +[#376, convert markdown to html]: https://github.com/vsch/flexmark-java/issues/376 diff --git a/flexmark-all/pom.xml b/flexmark-all/pom.xml index 707b5f6602..12b5a3efd5 100644 --- a/flexmark-all/pom.xml +++ b/flexmark-all/pom.xml @@ -7,7 +7,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-all @@ -21,197 +21,197 @@ com.vladsch.flexmark flexmark - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-abbreviation - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-admonition - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-anchorlink - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-aside - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-attributes - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-autolink - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-definition - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-emoji - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-enumerated-reference - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-escaped-character - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-footnotes - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-issues - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-strikethrough - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-tables - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-tasklist - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-users - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gitlab - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-jekyll-front-matter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-jekyll-tag - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-media-tags - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-macros - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-ins - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-xwiki-macros - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-superscript - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-tables - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-toc - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-typographic - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-wikilink - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-yaml-front-matter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-youtube-embedded - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-formatter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-html-parser - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-html2md-converter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-jira-converter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-pdf-converter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-profile-pegdown - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-util - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-youtrack-converter - 0.50.42 + 0.50.44 diff --git a/flexmark-docx-converter/pom.xml b/flexmark-docx-converter/pom.xml index df2fcc5eb5..4c99ac41c4 100644 --- a/flexmark-docx-converter/pom.xml +++ b/flexmark-docx-converter/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-docx-converter diff --git a/flexmark-ext-abbreviation/pom.xml b/flexmark-ext-abbreviation/pom.xml index 55ec1de9c8..7322aa227d 100644 --- a/flexmark-ext-abbreviation/pom.xml +++ b/flexmark-ext-abbreviation/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-abbreviation diff --git a/flexmark-ext-admonition/pom.xml b/flexmark-ext-admonition/pom.xml index 1dfed60394..3e7118be4f 100644 --- a/flexmark-ext-admonition/pom.xml +++ b/flexmark-ext-admonition/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-admonition diff --git a/flexmark-ext-anchorlink/pom.xml b/flexmark-ext-anchorlink/pom.xml index 089a75bece..7450a91062 100644 --- a/flexmark-ext-anchorlink/pom.xml +++ b/flexmark-ext-anchorlink/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-anchorlink @@ -28,7 +28,7 @@ com.vladsch.flexmark flexmark-jira-converter - 0.50.42 + 0.50.44 test diff --git a/flexmark-ext-aside/pom.xml b/flexmark-ext-aside/pom.xml index 3fecf4e760..61b594d934 100644 --- a/flexmark-ext-aside/pom.xml +++ b/flexmark-ext-aside/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-aside diff --git a/flexmark-ext-attributes/pom.xml b/flexmark-ext-attributes/pom.xml index ec5d9b55b8..b9f6ab224b 100644 --- a/flexmark-ext-attributes/pom.xml +++ b/flexmark-ext-attributes/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-attributes diff --git a/flexmark-ext-autolink/pom.xml b/flexmark-ext-autolink/pom.xml index 8fca5e8cb2..a4c9c7d1a2 100644 --- a/flexmark-ext-autolink/pom.xml +++ b/flexmark-ext-autolink/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-autolink diff --git a/flexmark-ext-definition/pom.xml b/flexmark-ext-definition/pom.xml index 64d57dd62f..629aa71d7c 100644 --- a/flexmark-ext-definition/pom.xml +++ b/flexmark-ext-definition/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-definition diff --git a/flexmark-ext-emoji/pom.xml b/flexmark-ext-emoji/pom.xml index 9ac5af4e45..d099f7ffb0 100644 --- a/flexmark-ext-emoji/pom.xml +++ b/flexmark-ext-emoji/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-emoji diff --git a/flexmark-ext-enumerated-reference/pom.xml b/flexmark-ext-enumerated-reference/pom.xml index f428d02fb8..8bab2a7405 100644 --- a/flexmark-ext-enumerated-reference/pom.xml +++ b/flexmark-ext-enumerated-reference/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-enumerated-reference diff --git a/flexmark-ext-escaped-character/pom.xml b/flexmark-ext-escaped-character/pom.xml index fe7f1b172b..7af3a6a410 100644 --- a/flexmark-ext-escaped-character/pom.xml +++ b/flexmark-ext-escaped-character/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-escaped-character diff --git a/flexmark-ext-footnotes/pom.xml b/flexmark-ext-footnotes/pom.xml index f6b94acd84..4e19d02266 100644 --- a/flexmark-ext-footnotes/pom.xml +++ b/flexmark-ext-footnotes/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-footnotes diff --git a/flexmark-ext-gfm-issues/pom.xml b/flexmark-ext-gfm-issues/pom.xml index 7e0c3b67cd..c8e12075db 100644 --- a/flexmark-ext-gfm-issues/pom.xml +++ b/flexmark-ext-gfm-issues/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-gfm-issues diff --git a/flexmark-ext-gfm-strikethrough/pom.xml b/flexmark-ext-gfm-strikethrough/pom.xml index 3f2f2e33c3..de6dde8cb4 100644 --- a/flexmark-ext-gfm-strikethrough/pom.xml +++ b/flexmark-ext-gfm-strikethrough/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-gfm-strikethrough diff --git a/flexmark-ext-gfm-tables/pom.xml b/flexmark-ext-gfm-tables/pom.xml index 890810a4fb..30e6cd2469 100644 --- a/flexmark-ext-gfm-tables/pom.xml +++ b/flexmark-ext-gfm-tables/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-gfm-tables diff --git a/flexmark-ext-gfm-tasklist/pom.xml b/flexmark-ext-gfm-tasklist/pom.xml index f8909dec30..593ddec8bb 100644 --- a/flexmark-ext-gfm-tasklist/pom.xml +++ b/flexmark-ext-gfm-tasklist/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-gfm-tasklist diff --git a/flexmark-ext-gfm-users/pom.xml b/flexmark-ext-gfm-users/pom.xml index 4ed7c4cc4e..b3a5b4d2c0 100644 --- a/flexmark-ext-gfm-users/pom.xml +++ b/flexmark-ext-gfm-users/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-gfm-users diff --git a/flexmark-ext-gitlab/pom.xml b/flexmark-ext-gitlab/pom.xml index ba11f96e2d..32c53ac859 100644 --- a/flexmark-ext-gitlab/pom.xml +++ b/flexmark-ext-gitlab/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-gitlab diff --git a/flexmark-ext-ins/pom.xml b/flexmark-ext-ins/pom.xml index cb5d8ec7e4..04873f9e77 100644 --- a/flexmark-ext-ins/pom.xml +++ b/flexmark-ext-ins/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-ins diff --git a/flexmark-ext-jekyll-front-matter/pom.xml b/flexmark-ext-jekyll-front-matter/pom.xml index 3df44fbbe4..124dd56c59 100644 --- a/flexmark-ext-jekyll-front-matter/pom.xml +++ b/flexmark-ext-jekyll-front-matter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-jekyll-front-matter diff --git a/flexmark-ext-jekyll-tag/pom.xml b/flexmark-ext-jekyll-tag/pom.xml index 10cccbeae0..b4c26fc2fd 100644 --- a/flexmark-ext-jekyll-tag/pom.xml +++ b/flexmark-ext-jekyll-tag/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-jekyll-tag diff --git a/flexmark-ext-macros/pom.xml b/flexmark-ext-macros/pom.xml index 0449a6551d..e2a9721d0c 100644 --- a/flexmark-ext-macros/pom.xml +++ b/flexmark-ext-macros/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-macros diff --git a/flexmark-ext-media-tags/pom.xml b/flexmark-ext-media-tags/pom.xml index 490cbe5256..ebc91ab926 100644 --- a/flexmark-ext-media-tags/pom.xml +++ b/flexmark-ext-media-tags/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-media-tags diff --git a/flexmark-ext-spec-example/pom.xml b/flexmark-ext-spec-example/pom.xml index 0eb63db9f0..0f847f22f5 100644 --- a/flexmark-ext-spec-example/pom.xml +++ b/flexmark-ext-spec-example/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-spec-example diff --git a/flexmark-ext-superscript/pom.xml b/flexmark-ext-superscript/pom.xml index 79de11d977..e894a4ab5f 100644 --- a/flexmark-ext-superscript/pom.xml +++ b/flexmark-ext-superscript/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-superscript diff --git a/flexmark-ext-tables/pom.xml b/flexmark-ext-tables/pom.xml index 42e5042343..1af84ab249 100644 --- a/flexmark-ext-tables/pom.xml +++ b/flexmark-ext-tables/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-tables diff --git a/flexmark-ext-tables/src/test/java/com/vladsch/flexmark/ext/tables/MarkdownTableTest.java b/flexmark-ext-tables/src/test/java/com/vladsch/flexmark/ext/tables/MarkdownTableTest.java index 66837db77b..a0ce52e74b 100644 --- a/flexmark-ext-tables/src/test/java/com/vladsch/flexmark/ext/tables/MarkdownTableTest.java +++ b/flexmark-ext-tables/src/test/java/com/vladsch/flexmark/ext/tables/MarkdownTableTest.java @@ -2521,14 +2521,14 @@ public void test_EmbeddedPipe() { assertEquals("" + "| c | d |\n" + "|:----------------------|:---|\n" + - "| *a | b* | |\n" + + "| *a | b* |\n" + "| `e | f` | |\n" + "| [g | h](http://a.com) | |\n" + "", formattedTable); assertEquals("" + "| c | d |\n" + "|:----------------------|:---|\n" + - "| ^*a | b* | |\n" + + "| ^*a | b* |\n" + "| `e | f` | |\n" + "| [g | h](http://a.com) | |\n" + "", formattedTable.substring(0, offset) + "^" + formattedTable.substring(offset)); @@ -2560,14 +2560,14 @@ public void test_indentPrefix() { assertEquals("" + " | c | d |\n" + " |:----------------------|:---|\n" + - " | *a | b* | |\n" + + " | *a | b* |\n" + " | `e | f` | |\n" + " | [g | h](http://a.com) | |\n" + "", formattedTable); assertEquals("" + " | c | d |\n" + " |:----------------------|:---|\n" + - " | ^*a | b* | |\n" + + " | ^*a | b* |\n" + " | `e | f` | |\n" + " | [g | h](http://a.com) | |\n" + "", formattedTable.substring(0, offset) + "^" + formattedTable.substring(offset)); diff --git a/flexmark-ext-tables/src/test/resources/ext_tables_ast_spec.md b/flexmark-ext-tables/src/test/resources/ext_tables_ast_spec.md index ded25d8195..1456de44ca 100644 --- a/flexmark-ext-tables/src/test/resources/ext_tables_ast_spec.md +++ b/flexmark-ext-tables/src/test/resources/ext_tables_ast_spec.md @@ -1791,7 +1791,7 @@ Document[0, 204] cd - a | b + *ab* e | f g | h @@ -1813,10 +1813,10 @@ Document[0, 74] Text[18, 21] chars:[18, 21, "---"] TableBody[24, 73] TableRow[24, 35] rowNumber=1 - TableCell[24, 35] textOpen:[24, 25, "|"] text:[26, 33, "*a | b*"] textClose:[34, 35, "|"] - Emphasis[26, 33] textOpen:[26, 27, "*"] text:[27, 32, "a | b"] textClose:[32, 33, "*"] - Text[27, 32] chars:[27, 32, "a | b"] - Text[33, 33] + TableCell[24, 30] textOpen:[24, 25, "|"] text:[26, 28, "*a"] textClose:[29, 30, "|"] + Text[26, 28] chars:[26, 28, "*a"] + TableCell[30, 35] text:[31, 33, "b*"] textClose:[34, 35, "|"] + Text[31, 33] chars:[31, 33, "b*"] TableRow[36, 47] rowNumber=2 TableCell[36, 47] textOpen:[36, 37, "|"] text:[38, 45, "`e | f`"] textClose:[46, 47, "|"] Code[38, 45] textOpen:[38, 39, "`"] text:[39, 44, "e | f"] textClose:[44, 45, "`"] @@ -4195,3 +4195,50 @@ Document[0, 27] ```````````````````````````````` +### 376 + +Issue [#376, convert markdown to html], inline delimiters ignore custom chars + +```````````````````````````````` example 376: 1 +| header1 | header2 | header3 | +|---------|---------|---------| +| 1*2 | 2*1 | | +. + + + + + + + +
header1header2header3
1*22*1
+. +Document[0, 96] + TableBlock[0, 96] + TableHead[0, 31] + TableRow[0, 31] rowNumber=1 + TableCell[0, 11] header textOpen:[0, 1, "|"] text:[2, 9, "header1"] textClose:[10, 11, "|"] + Text[2, 9] chars:[2, 9, "header1"] + TableCell[11, 21] header text:[12, 19, "header2"] textClose:[20, 21, "|"] + Text[12, 19] chars:[12, 19, "header2"] + TableCell[21, 31] header text:[22, 29, "header3"] textClose:[30, 31, "|"] + Text[22, 29] chars:[22, 29, "header3"] + TableSeparator[32, 63] + TableRow[32, 63] + TableCell[32, 43] textOpen:[32, 33, "|"] text:[33, 42, "---------"] textClose:[42, 43, "|"] + Text[33, 42] chars:[33, 42, "---------"] + TableCell[43, 53] text:[43, 52, "---------"] textClose:[52, 53, "|"] + Text[43, 52] chars:[43, 52, "---------"] + TableCell[53, 63] text:[53, 62, "---------"] textClose:[62, 63, "|"] + Text[53, 62] chars:[53, 62, "---------"] + TableBody[64, 95] + TableRow[64, 95] rowNumber=1 + TableCell[64, 75] textOpen:[64, 65, "|"] text:[66, 69, "1*2"] textClose:[74, 75, "|"] + Text[66, 69] chars:[66, 69, "1*2"] + TableCell[75, 85] text:[76, 79, "2*1"] textClose:[84, 85, "|"] + Text[76, 79] chars:[76, 79, "2*1"] + TableCell[85, 95] text:[85, 86, " "] textClose:[94, 95, "|"] + Text[85, 86] chars:[85, 86, " "] +```````````````````````````````` + +[#376, convert markdown to html]: https://github.com/vsch/flexmark-java/issues/376 diff --git a/flexmark-ext-toc/pom.xml b/flexmark-ext-toc/pom.xml index c40097f802..4ac3bcad62 100644 --- a/flexmark-ext-toc/pom.xml +++ b/flexmark-ext-toc/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-toc diff --git a/flexmark-ext-typographic/pom.xml b/flexmark-ext-typographic/pom.xml index fc6b19a38f..f52ab82e7e 100644 --- a/flexmark-ext-typographic/pom.xml +++ b/flexmark-ext-typographic/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-typographic diff --git a/flexmark-ext-wikilink/pom.xml b/flexmark-ext-wikilink/pom.xml index 2559ca41aa..4de9942d6e 100644 --- a/flexmark-ext-wikilink/pom.xml +++ b/flexmark-ext-wikilink/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-wikilink diff --git a/flexmark-ext-xwiki-macros/pom.xml b/flexmark-ext-xwiki-macros/pom.xml index fb7201b733..08f4441622 100644 --- a/flexmark-ext-xwiki-macros/pom.xml +++ b/flexmark-ext-xwiki-macros/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-xwiki-macros diff --git a/flexmark-ext-yaml-front-matter/pom.xml b/flexmark-ext-yaml-front-matter/pom.xml index 6e226fb2c4..70598b8d56 100644 --- a/flexmark-ext-yaml-front-matter/pom.xml +++ b/flexmark-ext-yaml-front-matter/pom.xml @@ -4,7 +4,7 @@ flexmark-java com.vladsch.flexmark - 0.50.42 + 0.50.44 flexmark-ext-yaml-front-matter diff --git a/flexmark-ext-youtube-embedded/pom.xml b/flexmark-ext-youtube-embedded/pom.xml index 61a7432549..dbcf3ae8d6 100644 --- a/flexmark-ext-youtube-embedded/pom.xml +++ b/flexmark-ext-youtube-embedded/pom.xml @@ -4,7 +4,7 @@ flexmark-java com.vladsch.flexmark - 0.50.42 + 0.50.44 4.0.0 diff --git a/flexmark-ext-zzzzzz/pom.xml b/flexmark-ext-zzzzzz/pom.xml index f53bcccbc4..92948dc265 100644 --- a/flexmark-ext-zzzzzz/pom.xml +++ b/flexmark-ext-zzzzzz/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-ext-zzzzzz diff --git a/flexmark-formatter/pom.xml b/flexmark-formatter/pom.xml index 540b81cb28..204661bbc3 100644 --- a/flexmark-formatter/pom.xml +++ b/flexmark-formatter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-formatter diff --git a/flexmark-html-parser/pom.xml b/flexmark-html-parser/pom.xml index 5ee6ce0f23..cb87040cea 100644 --- a/flexmark-html-parser/pom.xml +++ b/flexmark-html-parser/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-html-parser diff --git a/flexmark-html2md-converter/pom.xml b/flexmark-html2md-converter/pom.xml index 02e1d5186e..d004b36cfa 100644 --- a/flexmark-html2md-converter/pom.xml +++ b/flexmark-html2md-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-html2md-converter diff --git a/flexmark-integration-test/pom.xml b/flexmark-integration-test/pom.xml index 36d59a91c8..03de4ce593 100644 --- a/flexmark-integration-test/pom.xml +++ b/flexmark-integration-test/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-integration-test diff --git a/flexmark-jira-converter/pom.xml b/flexmark-jira-converter/pom.xml index 637218a5ad..414d4225d3 100644 --- a/flexmark-jira-converter/pom.xml +++ b/flexmark-jira-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-jira-converter diff --git a/flexmark-osgi/pom.xml b/flexmark-osgi/pom.xml index 2f1d24164b..af0f06553b 100644 --- a/flexmark-osgi/pom.xml +++ b/flexmark-osgi/pom.xml @@ -7,7 +7,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-osgi diff --git a/flexmark-pdf-converter/pom.xml b/flexmark-pdf-converter/pom.xml index 4cf7028d21..3940af294c 100644 --- a/flexmark-pdf-converter/pom.xml +++ b/flexmark-pdf-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-pdf-converter diff --git a/flexmark-profile-pegdown/pom.xml b/flexmark-profile-pegdown/pom.xml index dd801ef82c..89635cd4e6 100644 --- a/flexmark-profile-pegdown/pom.xml +++ b/flexmark-profile-pegdown/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-profile-pegdown diff --git a/flexmark-test-util/pom.xml b/flexmark-test-util/pom.xml index 25d9efe5ec..002bed79f3 100644 --- a/flexmark-test-util/pom.xml +++ b/flexmark-test-util/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-test-util diff --git a/flexmark-util/pom.xml b/flexmark-util/pom.xml index 8ce49bde13..57e3b7ffe2 100644 --- a/flexmark-util/pom.xml +++ b/flexmark-util/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-util diff --git a/flexmark-youtrack-converter/pom.xml b/flexmark-youtrack-converter/pom.xml index 1eac520f23..a4150e66da 100644 --- a/flexmark-youtrack-converter/pom.xml +++ b/flexmark-youtrack-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-youtrack-converter diff --git a/flexmark/pom.xml b/flexmark/pom.xml index a816b002cc..ba7a86b4f7 100644 --- a/flexmark/pom.xml +++ b/flexmark/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/InlineParserImpl.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/InlineParserImpl.java index 36a15ba5bf..d7cf239a05 100644 --- a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/InlineParserImpl.java +++ b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/InlineParserImpl.java @@ -376,6 +376,10 @@ protected boolean parseInline(boolean customOnly) { // When we get here, it's only for a single special character that turned out to not have a special meaning. // So we shouldn't have a single surrogate here, hence it should be ok to turn it into a String. appendText(input.subSequence(index - 1, index)); + } else { + // Issue: #376, need to clear any delimiter stack since whatever is not used is not a delimiter + processDelimiters(null); + this.lastDelimiter = null; } return true; diff --git a/pom.xml b/pom.xml index dd0a81aa1b..3888e81f54 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.vladsch.flexmark flexmark-java - 0.50.42 + 0.50.44 flexmark-java Java re-implementation of commonmark-java based parser, with AST reflecting source elements, full source position tracking, greater parser extensibility. @@ -218,222 +218,222 @@ com.vladsch.flexmark flexmark - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-docx-converter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-abbreviation - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-anchorlink - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-admonition - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-aside - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-attributes - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-autolink - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-definition - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-emoji - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-enumerated-reference - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-escaped-character - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-footnotes - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-issues - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-strikethrough - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-tables - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-tasklist - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gfm-users - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-gitlab - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-ins - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-jekyll-front-matter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-jekyll-tag - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-macros - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-media-tags - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-xwiki-macros - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-spec-example - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-superscript - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-tables - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-toc - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-typographic - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-wikilink - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-yaml-front-matter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-youtube-embedded - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-ext-zzzzzz - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-formatter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-html-parser - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-html2md-converter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-jira-converter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-pdf-converter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-profile-pegdown - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-test-util - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-util - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-youtrack-converter - 0.50.42 + 0.50.44 com.vladsch.flexmark flexmark-all - 0.50.42 + 0.50.44 From db2a52d37bf8bc197716edc7773ac222357dfd19 Mon Sep 17 00:00:00 2001 From: Vladimir Schneider Date: Fri, 20 Dec 2019 12:44:17 -0500 Subject: [PATCH 04/13] fix docx rendering of e-mail links --- .idea/codeStyles/Project.xml | 2 +- .idea/compiler.xml | 5 ++- .idea/markdown-navigator/COPY_HTML_MIME.xml | 3 +- .idea/markdown-navigator/Comms.xml | 3 +- .idea/markdown-navigator/GitHub_Templates.xml | 3 +- .idea/markdown-navigator/OVERVIEW.xml | 3 +- .idea/misc.xml | 8 +++++ VERSION.md | 6 ++++ .../internal/CoreNodeDocxRenderer.java | 3 +- .../test/resources/docx_converter_ast_spec.md | 34 ++++++++++++++++++- 10 files changed, 60 insertions(+), 10 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 08fb2f6541..7c3781e8bb 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -31,6 +31,7 @@ +