**Version History**
-[TOC]: # " " +[TOC]: # "" -- [To Do](#to-do) +- [0.50.50](#05050) +- [0.50.48](#05048) +- [0.50.46](#05046) +- [0.50.44](#05044) - [0.50.42](#05042) - [0.50.40](#05040) - [0.50.38](#05038) @@ -99,20 +101,40 @@ flexmark-java - [0.32.0](#0320) - [0.30.0](#0300) -` tag adds 2 x `
` after paragraph.
* Fix: extension auto links would not be processed if paragraph had inline parser processed auto
links before.
-0.34.49
--------
+## 0.34.49
* Change: revert docx4j to 3.3.6 in docx4j-3 branch
-0.34.48
--------
+## 0.34.48
* Add: `Macros` extension handling to docx converter. Macros allow nesting of block elements
inside tables.
-0.34.46
--------
+## 0.34.46
* Add: `flexmark-ext-macros` extension to allow macro definition and inclusion in inline
contexts. [Extensions: Macros](../../wiki/Extensions#macros)
* Fix: `Link.setTextChars(BasedSequence)` was trimming the string before setting `Link.text`.
Now the full untrimmed text is used.
-0.34.44
--------
+## 0.34.44
* Fix: [#271, Regression? Comments are preserved in 0.26.4 but removed in 0.34.40]
* Fix: formatter HTML comments in non-translating mode did not output comment markers
* Fix: treat protocol prefix at the end of line as a valid link.
-0.34.42
--------
+## 0.34.42
* Add: url parsing to `AutoLink` to set other link parts of the node like: pageref, anchor
marker and anchor
-0.34.40
--------
+## 0.34.40
* Fix: add `HtmlRenderer.HEADER_ID_GENERATOR_NON_ASCII_TO_LOWERCASE`, default `true`. When set
to `false` changes the default header id generator to not convert non-ascii alphabetic
@@ -1101,26 +1035,22 @@ flexmark-java
* Fix: add `HtmlRenderer.HEADER_ID_GENERATOR_NON_ASCII_TO_LOWERCASE` set to `false` to `GitHub`
and `GitHubDoc` parser profiles.
-0.34.38
--------
+## 0.34.38
* Fix: docx conversion of hyperlinks did not take relationship part into account when optimizing
rel references causing invalid rel ids to be used if the same link was included in multiple
contexts.
-0.34.36
--------
+## 0.34.36
* Fix: docx conversion of footnote refs in tables to footnotes which contained links generated
invalid docx.
-0.34.34
--------
+## 0.34.34
* Change: docx4j library version to 6.0.1
-0.34.32
--------
+## 0.34.32
* Fix: change anonymous classes to static classes in `CoreNodeDocxRenderer`
* Add: test case for `Parser.SPACE_IN_LINK_URLS` to validate allowing spaces in URLs
@@ -1129,8 +1059,7 @@ flexmark-java
* Fix: Docx Converter remove hardcoded "CENTER" alignment for table headings overriding the
`Table Heading` style provided alignment.
-0.34.30
--------
+## 0.34.30
* Fix: [#268, Pipe characters are not escaped in Table (FlexmarkHtmlParser)]
* Fix: escape pipe characters in text (to avoid accidental use as table or other markup) when
@@ -1147,8 +1076,7 @@ flexmark-java
are output for formatting/rendering with respect to blank line before/after control.
* Fix: `GitLab` block quote parser bug for terminating sequence.
-0.34.28
--------
+## 0.34.28
* Add: html parser options to specify how to generate some markdown formatting elements, default
for all is `ExtensionConversion.MARKDOWN`:
@@ -1159,18 +1087,14 @@ flexmark-java
* `EXT_INLINE_INS` - ins
* `EXT_INLINE_SUB` - sub
* `EXT_INLINE_SUP` - sup
-
* Available settings:
-
* `ExtensionConversion.MARKDOWN` - convert to markdown
* `ExtensionConversion.TEXT` - convert to inner text
* `ExtensionConversion.HTML` - leave HTML as is
-
* Corresponding `SKIP_` options have been deprecated since their function is duplicated by new
options.
-0.34.26
--------
+## 0.34.26
* Fix: Add `DoNotLinkDecorate` to `Code` for preventing AutoLink extension from decorating
inline code with autolinks.
@@ -1178,8 +1102,7 @@ flexmark-java
`BasedSequenceImpl.lastIndexOfAnyNot(CharSequence)` were using `indexOf...` instead of
`lastIndexOf...`
-0.34.24
--------
+## 0.34.24
* Fix: `BasedSequenceImpl.countCharsReversed(char, int, int)` and
`BasedSequenceImpl.countNotCharsReversed(char, int, int)` to not return -1, should return 0
@@ -1187,13 +1110,11 @@ flexmark-java
* Add: `GitLabExtension`, Documented in
[Extensions: Gitlab Flavoured Markdown](../../wiki/Extensions#gitlab-flavoured-markdown)
-0.34.22
--------
+## 0.34.22
* Add: OSGi module support thanks to [@klcodanr](https://github.com/klcodanr)
-0.34.20
--------
+## 0.34.20
* Add: renderer type equivalences for allowing new renderer types which override existing ones.
Now "YOUTRACK" is defined as an override of "JIRA" by `YouTrackConverterExtension`
@@ -1206,8 +1127,7 @@ flexmark-java
* `HtmlRenderer.addRenderTypeEquivalence(MutableDataHolder, String, String)` add new to old
renderer type mapping.
-0.34.18
--------
+## 0.34.18
* Add: html parser options to suppress generating some markdown formatting elements, default for
all is false:
@@ -1229,25 +1149,21 @@ flexmark-java
generated markdown text.
* Fix: html parser did not add a blank line before first list item of the first list
-0.34.16
--------
+## 0.34.16
* Fix: [#254, customized HTML\_BLOCK\_TAGS Parser option seems not taken into account]
-0.34.14
--------
+## 0.34.14
* Fix:
[#252, GfmUser and GfmIssue are not recognized if immediately followed by non-space character]
character, change regex to allow word break after user and issue
-0.34.12
--------
+## 0.34.12
* Fix: merge [#249, support Jira links titles] thanks to @qwazer
-0.34.10
--------
+## 0.34.10
* Fix: [#247, Admonition Expression may lack a part of the text.]
* Add: `TocExtension.TOC_CONTENT`, `TocExtension.TOC_LIST`, `SimTocExtension.TOC_CONTENT`,
@@ -1261,31 +1177,27 @@ flexmark-java
* Add: `TocExtension.LIST_CLASS` default `""`, class attribute to use on table of content `ul`
or `ol` element, duplicated as `SimTocExtension.LIST_CLASS`
-0.34.8
-------
+## 0.34.8
* Fix: [#220, Jekyll Tag "include"]
* Fix: [#245, Markdown output of multiple Definition Lists has a problem that list items merge.]
Blank lines were removed if `Parser.BLANK_LINES_IN_AST` is `false`
-0.34.6
-------
+## 0.34.6
* Fix: [#243, Markdown output of ImageRef syntax referencing ID is incorrect]
* Fix: [#244, Duplicate footnotes have the problem of HTML ID collision conflict.] Now each
footnote reference adds a back references and the id of the back reference has `-#` suffix
added except for the first back-reference, where `#` is an integer from 1..N
-0.34.4
-------
+## 0.34.4
* Add: media tags extension thanks to Cornelia Schultz (GitHub @CorneliaXaos)
* Change: convert class methods to static when possible
* Fix: [#239, flexmark-ext-youtube-embedded missing test case for '@' usage.]
* Fix: add ability to escape `@` for youtube links.
-0.34.2
-------
+## 0.34.2
* Fix: update nexus staging plugin to 1.6.7
* Fix: move nexus-staging plugin to deploy profile so it is not needed for ci test build
@@ -1293,15 +1205,14 @@ flexmark-java
* Fix: for matched parenthesis destination link parsing, only treat backslash as escape if
followed by characters which can be escaped.
-0.34.0
-------
+## 0.34.0
* Fix: table formatter for translations to insert a space if the translated text is empty.
* Add: changed regex for parsing unquoted HTML attribute value to exclude `{}`.
* 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.
@@ -1315,8 +1226,7 @@ flexmark-java
* Add: to html parser recognition that `` is an emoji
shortcut generated by flexmark-java emoji extension and convert it to such.
-0.32.24
--------
+## 0.32.24
* Fix: [#232, List continuation], add `Formatter.LIST_REMOVE_EMPTY_ITEMS`, default `false`. If
`true` then empty list items or list items which only contain a `BlankLine` node are removed
@@ -1324,8 +1234,7 @@ flexmark-java
* Fix: formatter output of empty list items
* Fix: formatter output of empty loose task list items
-0.32.22
--------
+## 0.32.22
* Fix: [#229, gfm-tasklist extension - add state class to list item]
* Add: `TaskListExtension.ITEM_DONE_CLASS` and `TaskListExtension.ITEM_NOT_DONE_CLASS` `li`
@@ -1335,52 +1244,41 @@ flexmark-java
`TaskListExtension.ITEM_CLASS`
* Add: depreciation of `TaskListExtension.ITEM_CLASS` in favour of
`TaskListExtension.TIGHT_ITEM_CLASS`
-
* Fix: merge [#231, PR: Fix two small bugs in ext-toc]
[@BlueBoxWare](https://github.com/BlueBoxWare)
-
* Add: `TaskListAttributeProviderSample` to `flexmark-java-samples` module.
-
* Add: `GitHubParsingSample` to `flexmark-java-samples` module to show GitHub compatible parser
setup.
-
* Add: `ParserEmulationProfile.GITHUB` to reflect current GitHub profile, effectively it is
`ParserEmulationProfile.COMMONMARK_0_28` with GitHub compatible id generator settings.
-
* Fix: [#221, XSS: Javascript execution through links], add `HtmlRenderer.SUPPRESSED_LINKS`
default `"javascript:.*"`, a regular expression to suppress any links that match. The test
occurs before the link is resolved using a link resolver. Therefore any link matching will be
suppressed before it is resolved. Likewise, a link resolver returning a suppressed link will
not be suppressed since this is up to the custom link resolver to handle.
-
* Suppressed links will render only the child nodes, effectively `[Something
New](javascript:alert(1))` will render as if it was `Something New`.
-
* Link suppression based on URL prefixes does not apply to HTML inline or block elements. Use
HTML suppression options for this.
-
* Add: `AutolinkExtension.IGNORE_LINKS` default `""`, a regex expression to match link text
which should not be auto-linked. This can include full urls like `www.google.com` or parts by
including wildcard match patterns. Any recognized auto-link which matches the expression will
be rendered as text.
-0.32.20
--------
+## 0.32.20
* Fix: [#225, BlankLine nodes within IndentedCodeBlock]
-0.32.18
--------
+## 0.32.18
* Fix: [#216, Wrong source positions for Tables with empty TableHead/TableBody]
-0.32.16
--------
+## 0.32.16
* 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
@@ -1388,8 +1286,7 @@ flexmark-java
`HtmlRenderer.HEADER_ID_GENERATOR_NON_DASH_CHARS` to `"_"` to match current GitHub heading id
generation rules.
-0.32.14
--------
+## 0.32.14
* Change: `AdmonitionExtension.WITH_LEAD_SPACES_INTERRUPTS_ITEM_PARAGRAPH` to
`AdmonitionExtension.WITH_SPACES_INTERRUPTS_ITEM_PARAGRAPH`
@@ -1399,8 +1296,7 @@ flexmark-java
* Fix: [#213, Attributes element does not allow spaces before closing }]
* Fix: update to open html to pdf 0.0.1-RC12
-0.32.12
--------
+## 0.32.12
* Add: `DocxRenderer.TABLE_PREFERRED_WIDTH_PCT` default `0`, if `0` then table width is `auto`,
otherwise specifies percent of page width.
@@ -1408,8 +1304,7 @@ flexmark-java
* Add: `DocxRenderer.TABLE_STYLE` default `""`, if not empty then table then table style will be
set to this value and default cell borders will not be generated.
-0.32.10
--------
+## 0.32.10
* Add: `AdmonitionBlock` getters/setters for `titleOpeningMarker`, `title`, `titleClosingMarker`
* Fix: `AdmonitionNodeRenderer` remove erroneous, extra ``
@@ -1420,45 +1315,36 @@ flexmark-java
* ADMONITION_TITLE_PART - heading title span
* ADMONITION_BODY_PART - admonition body div
-0.32.8
-------
+## 0.32.8
* Add: [Admonition Extension](https://github.com/vsch/flexmark-java/wiki/Extensions#admonition)
To create block-styled side content. For complete documentation please see the
[Admonition Extension, Material for MkDocs] documentation.
-0.32.6
-------
+## 0.32.6
* Add: `DocxRenderer.PREFIX_WWW_LINKS`, default `true`, when true adds `http://` to link
addresses which start with `www.`
-
* Fix: `DocxRenderer` some images would not be embedded and generate a CRC Error when loaded via
URL vs file.
-0.32.4
-------
+## 0.32.4
* Fix: [#207, Issue extension doesn't support windows new lines], same for Gfm User extension.
-0.32.2
-------
+## 0.32.2
* Add: `EmojiExtension.ATTR_IMAGE_CLASS`, default `""`, if not empty will set the image tag
class attribute to this value.
-
* Fix: when image type was set to unicode then unicode char would be used for a shortcut even
when that shortcut was not defined for requested shortcut type: github or ecs.
-
* Fix: update to docx4j version 3.3.6
-0.32.0
-------
+## 0.32.0
* **API Change**: removed `EmojiCheatSheet` class to replace with `EmojiShortcuts` which has
better referencing for GitHub shortcuts and unicode chars for all emojis from
[emoji-cross-reference](https://github.com/vsch/emoji-cross-reference)
-
* Removed: `EmojiExtension.USE_IMAGE_URL`
* Add: `EmojiExtension.USE_SHORTCUT_TYPE`, default `EmojiShortcutType.EMOJI_CHEAT_SHEET`,
select type of shortcuts:
@@ -1476,14 +1362,11 @@ flexmark-java
* `EmojiImageType.UNICODE_ONLY` convert to unicode and if there is no unicode treat as
invalid emoji shortcut
* `EmojiImageType.UNICODE_FALLBACK_TO_IMAGE` convert to unicode and if no unicode use image.
-
* **API Change**: removed `HtmlRenderer.WRAP_TIGHT_ITEM_PARAGRAPH_IN_SPAN`, it was only needed
to have somewhere to set attributes for tight item text for `Attributes` which now implement
intelligent span wrapping of text.
-
* **Change**: `AttributesExtension.ASSIGN_TEXT_ATTRIBUTES`, default `true`. Set to `false` for
backward compatibility.
-
* When `true` attribute assignment rules to nodes are changed to allow text elements to get
attributes. If an attribute element is spaced from the previous plain text element `some text
{attributes}` then attributes are for the parent of the text. If they are attached to the text
@@ -1491,20 +1374,15 @@ flexmark-java
span. Within an inline element same rules apply: `**bold text {attr}**` are for the strong
emphasis span, while `**bold text{attr}**` will wrap the text between the strong emphasis
tags, in a span with given attributes.
-
* If a plain text span is interrupted by an HTML comment then it is considered as two separate
plain text spans. ie. `some text{attr}` will result in `some text` rendering.
-
* Full spec:
[ext_attributes_ast_spec](flexmark-ext-attributes/src/test/resources/ext_attributes_ast_spec.md)
-
* Fix: Attributes, when they are first child then delete leading spaces of following node first
rendered child will have leading spaces.
-
* Add: Attribute syntax option allows `Attributes` on reference definition so that all elements
referencing it, inherit the attributes.
-
* To assign attributes to a reference definition you need to leave a blank line between the
reference definition and the attributes element, placed by itself and followed by a blank
line.
@@ -1527,7 +1405,6 @@ flexmark-java
output attributes extension syntax for attribute names that are matched by the regex.
* did not output a line end at start of `
`, this tended to splice text in div to previous
element.
-
* Add: Emoji Extension support to DocxRenderer.
* Add: Emoji Cheat Sheet images to resources in DocxRender jar, default configuration will
resolve emoji image files to the files in the jar.
@@ -1537,81 +1414,62 @@ flexmark-java
* Add: `DocxRenderer.DOC_EMOJI_IMAGE_VERT_SIZE`, default `1.05`, size of emoji image as a
factor of line height at point of insertion.
-0.30.0
-------
+## 0.30.0
* Fix: [#198, StringIndexOutOfBoundsException] in `AbbreviationExtension` if abbreviation
definition had an empty abbreviation.
-
* API Change: Refactoring of Interfaces to allow extensions only providing link resolver,
attribute provider and html id generator to be re-used by the `DocxRenderer` and
`HtmlRenderer` without modifications other than changing the `implemented` extension from
`HtmlRenderer.HtmlRendererExtension` to `RendererExtension`
-
* `AttributesProviderFactory` pass only `LinkResolverContext` instead of
`NodeRenderingContext` to allow for attribute provider extensions to be re-used with
`DocxRender`
-
* `HeadIdGenerator` pass only `LinkResolverContext` instead of `NodeRenderingContext` to allow
for header id generator provider extensions to be re-used with `DocxRender`
-
* new `RendererExtension` with only ability to register html id generator, link resolver and
attribute provider. Such an extension can be used as is with `HtmlRenderer` and
`DocxRenderer`
-
* `RendererExtension.extend(RendererBuilder, String)` method of these gets passed
`RendererBuilder` instead of `HtmlRenderer.Builder`
-
* extensions that implement both `RendererExtension` and `HtmlRendererExtension` will have
only have the html renderer extension `extend` method called.
-
* Add: `flexmark-ext-aside` handling to DocxConverter
-
* Fix: DocxConverter formatting around footnote reference would be applied to footnote text
-
* Add: `DocxRenderer.LOCAL_HYPERLINK_MISSING_HIGHLIGHT`, default `"red"` to highlight in
document hyperlinks with missing targets. Set to `""` to disable this. NOTE: must be one of
the 8 named colors used by Word or it might complain.
-
* Add: `DocxRenderer.LOCAL_HYPERLINK_MISSING_FORMAT`, default `"Missing target id: #%s"` to
change the tooltip text of the missing hyperlink. `%s` will be replaced with the reference id
of the link.
-
* Fix: DocxConverter self referencing ref anchors should be converted to bookmark references in
the docx
-
* Add: DocxConverter now supports `AttributesExtension` and `EnumeratedReferenceExtension` by
converting id attributes to bookmarks and enumerated reference links to hyperlinks to
bookmarks.
-
* Change: Enumerated references which are missing the definition for their type now default to
`type #` where # is the reference ordinal instead of just `#`.
-
* Add: Enumerated links now have title set to the text value of the reference.
-
* Add: DocxConverter options to control heading id generation to resolve anchor refs to document
anchors
* `DocxRenderer.HTML_ID_GENERATOR`, default `HtmlIdGenerator instance`, the id generator to
use for generating heading ids.
-
* `DocxRenderer.LOCAL_HYPERLINK_SUFFIX`, default `""`, used to add a suffix to hyperlink
bookmark names, except ones linking to first heading in a document. Only needed if you have
some post processor on the docx adding suffixes to bookmark names.
+* `DocxRenderer.FIRST_HEADING_ID_SUFFIX`, default `""`, used to add a suffix to the id of the
+first heading of the document and any hyperlinks to it.
+-->
+
For convenience these `HtmlRenderer` keys are aliased through `DocxRenderer`, keep in mind that
setting either will affect both keys. For information on these keys see
[`HtmlRenderer` options](https://github.com/vsch/flexmark-java/wiki/Extensions#renderer)
* `DocxRenderer.HEADER_ID_GENERATOR_RESOLVE_DUPES`, default `true`,
-
* `DocxRenderer.HEADER_ID_GENERATOR_TO_DASH_CHARS`, default `" -_"`
-
* `DocxRenderer.HEADER_ID_GENERATOR_NO_DUPED_DASHES`, default `false`
-
* Add: DocxConverter options to re-map standard style names to user defined ones.
* `DocxRenderer.DEFAULT_STYLE`, default "Normal"
* `DocxRenderer.LOOSE_PARAGRAPH_STYLE`, default "ParagraphTextBody"
@@ -1626,11 +1484,11 @@ setting either will affect both keys. For information on these keys see
* `DocxRenderer.FOOTNOTE_STYLE`, default "Footnote"
+* `DocxRenderer.BULLET_LIST_STYLE`, default "BulletList"
+* `DocxRenderer.BLOCK_QUOTE_BULLET_LIST_STYLE`, default "QuotationsBulletList"
+* `DocxRenderer.NUMBERED_LIST_STYLE`, default "NumberedList"
+* `DocxRenderer.BLOCK_QUOTE_NUMBERED_LIST_STYLE`, default "QuotationsNumberedList"
+-->
* `DocxRenderer.BOLD_STYLE`, default "StrongEmphasis"
* `DocxRenderer.ITALIC_STYLE`, default "Emphasis"
* `DocxRenderer.STRIKE_THROUGH_STYLE`, default "Strikethrough"
@@ -1692,14 +1550,20 @@ setting either will affect both keys. For information on these keys see
[#351, Is there any special format requirement for processing html data to markdown]: https://github.com/vsch/flexmark-java/issues/351
[#357, HTML to markdown and removed nested list]: https://github.com/vsch/flexmark-java/issues/357
[#362, ArrayIndexOutOfBoundsException in BasedSequence.indexOfAll]: https://github.com/vsch/flexmark-java/issues/362
+[#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
+[#381, StackOverflowError with long base64 image and LINKS\_ALLOW\_MATCHED\_PARENTHESES disabled]: https://github.com/vsch/flexmark-java/issues/381
+[#382, Is there an option for number of whitespaces needed to create sub-lists?]: https://github.com/vsch/flexmark-java/issues/382
[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
+[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"
[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
-[YouTrack: IDEA-207453]: https://youtrack.jetbrains.com/issue/IDEA-207453 "Add Conversion of ref anchor to UrlFilter for file line navigation"
+[#384, Markdown parser produces invalid HTML]: https://github.com/vsch/flexmark-java/issues/384
+
diff --git a/flexmark-all/pom.xml b/flexmark-all/pom.xml
index 707b5f660..20d26873b 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.50
flexmark-all
@@ -21,197 +21,197 @@
com.vladsch.flexmark
flexmark
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-abbreviation
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-admonition
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-anchorlink
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-aside
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-attributes
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-autolink
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-definition
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-emoji
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-enumerated-reference
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-escaped-character
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-footnotes
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-issues
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-strikethrough
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-tables
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-tasklist
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-users
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gitlab
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-jekyll-front-matter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-jekyll-tag
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-media-tags
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-macros
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-ins
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-xwiki-macros
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-superscript
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-tables
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-toc
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-typographic
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-wikilink
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-yaml-front-matter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-youtube-embedded
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-formatter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-html-parser
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-html2md-converter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-jira-converter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-pdf-converter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-profile-pegdown
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-util
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-youtrack-converter
- 0.50.42
+ 0.50.50
diff --git a/flexmark-docx-converter/pom.xml b/flexmark-docx-converter/pom.xml
index df2fcc5eb..0f1bbf195 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.50
flexmark-docx-converter
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 946af1229..f3ad2ced1 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
@@ -901,14 +901,15 @@ private void renderURL(BasedSequence urlSrc, DocxRendererContext docx, String li
}
private void render(AutoLink node, DocxRendererContext docx) {
- String url = node.getChars().unescape();
+ String url = node.getText().unescape();
addRunAttributeFormatting(node, docx);
renderURL(node.getChars(), docx, url);
}
private void render(MailLink node, DocxRendererContext docx) {
addRunAttributeFormatting(node, docx);
- renderURL(node.getChars(), docx, "mailto:" + node.getChars().unescape());
+ String text = node.getText().unescape();
+ renderURL(node.getChars(), docx, "mailto:" + text, text);
}
private void render(Link node, DocxRendererContext docx) {
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 d32ad2156..0773a1863 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
@@ -8,7 +8,7 @@ license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
---
-## DocxConverter
+# DocxConverter
Converts markdown to docx
@@ -1148,7 +1148,7 @@ with some text
- <http://example.com>
+ http://example.com
@@ -2091,6 +2091,38 @@ with some text
````````````````````````````````
+### Mail
+
+Mail link
+
+```````````````````````````````` example Mail: 1
+prefix vladimir@vladsch.com suffix
+
+.
+
+
+
+
+
+ prefix
+
+
+
+
+
+ vladimir@vladsch.com
+
+
+
+ suffix
+
+
+
+````````````````````````````````
+
+
## Images
Web URL
diff --git a/flexmark-ext-abbreviation/pom.xml b/flexmark-ext-abbreviation/pom.xml
index 55ec1de9c..1730630c6 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.50
flexmark-ext-abbreviation
diff --git a/flexmark-ext-admonition/pom.xml b/flexmark-ext-admonition/pom.xml
index 1dfed6039..c59de33e5 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.50
flexmark-ext-admonition
diff --git a/flexmark-ext-anchorlink/pom.xml b/flexmark-ext-anchorlink/pom.xml
index 089a75bec..bdb05dd84 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.50
flexmark-ext-anchorlink
@@ -28,7 +28,7 @@
com.vladsch.flexmark
flexmark-jira-converter
- 0.50.42
+ 0.50.50
test
diff --git a/flexmark-ext-aside/pom.xml b/flexmark-ext-aside/pom.xml
index 3fecf4e76..c343a1b72 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.50
flexmark-ext-aside
diff --git a/flexmark-ext-attributes/pom.xml b/flexmark-ext-attributes/pom.xml
index ec5d9b55b..50a11da79 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.50
flexmark-ext-attributes
diff --git a/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/AttributesExtension.java b/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/AttributesExtension.java
index adc41eb1f..8d5d9af6e 100644
--- a/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/AttributesExtension.java
+++ b/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/AttributesExtension.java
@@ -7,7 +7,6 @@
import com.vladsch.flexmark.html.RendererExtension;
import com.vladsch.flexmark.parser.Parser;
import com.vladsch.flexmark.util.ast.KeepType;
-import com.vladsch.flexmark.util.builder.Extension;
import com.vladsch.flexmark.util.data.DataKey;
import com.vladsch.flexmark.util.data.MutableDataHolder;
@@ -27,7 +26,8 @@ public class AttributesExtension implements Parser.ParserExtension
public static final DataKey NODE_ATTRIBUTES = new DataKey<>("NODE_ATTRIBUTES", NodeAttributeRepository::new);
public static final DataKey ATTRIBUTES_KEEP = new DataKey<>("ATTRIBUTES_KEEP", KeepType.FIRST); // standard option to allow control over how to handle duplicates
public static final DataKey ASSIGN_TEXT_ATTRIBUTES = new DataKey<>("ASSIGN_TEXT_ATTRIBUTES", true); // assign attributes to text if previous is not a space
- public static final DataKey FENCED_CODE_INFO_ATTRIBUTES = new DataKey<>("FENCED_CODE_INFO_ATTRIBUTES", true); // assign attributes found at end of fenced code info strings
+ public static final DataKey FENCED_CODE_INFO_ATTRIBUTES = new DataKey<>("FENCED_CODE_INFO_ATTRIBUTES", false); // assign attributes found at end of fenced code info strings
+ public static final DataKey FENCED_CODE_ADD_ATTRIBUTES = new DataKey<>("FENCED_CODE_ADD_ATTRIBUTES", FencedCodeAddType.ADD_TO_PRE_CODE); // assign attributes to pre/code tag
public static final DataKey WRAP_NON_ATTRIBUTE_TEXT = new DataKey<>("WRAP_NON_ATTRIBUTE_TEXT", true);
public static final DataKey USE_EMPTY_IMPLICIT_AS_SPAN_DELIMITER = new DataKey<>("USE_EMPTY_IMPLICIT_AS_SPAN_DELIMITER", false);
@@ -40,7 +40,10 @@ public static AttributesExtension create() {
@Override
public void parserOptions(MutableDataHolder options) {
-
+ if (options.contains(FENCED_CODE_INFO_ATTRIBUTES) && options.get(FENCED_CODE_INFO_ATTRIBUTES) && !options.contains(FENCED_CODE_ADD_ATTRIBUTES)) {
+ // change default to pre only, to add to code use attributes after info
+ options.set(FENCED_CODE_ADD_ATTRIBUTES, FencedCodeAddType.ADD_TO_PRE);
+ }
}
@Override
diff --git a/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/FencedCodeAddType.java b/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/FencedCodeAddType.java
new file mode 100644
index 000000000..5d48ebd89
--- /dev/null
+++ b/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/FencedCodeAddType.java
@@ -0,0 +1,16 @@
+package com.vladsch.flexmark.ext.attributes;
+
+public enum FencedCodeAddType {
+ ADD_TO_PRE_CODE(true, true),
+ ADD_TO_PRE(true, false),
+ ADD_TO_CODE(false, true),
+ ;
+
+ public final boolean addToPre;
+ public final boolean addToCode;
+
+ FencedCodeAddType(boolean isEmojiCheatSheet, boolean addToCode) {
+ this.addToPre = isEmojiCheatSheet;
+ this.addToCode = addToCode;
+ }
+}
diff --git a/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/internal/AttributesAttributeProvider.java b/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/internal/AttributesAttributeProvider.java
index 5a481e688..461089474 100644
--- a/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/internal/AttributesAttributeProvider.java
+++ b/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/internal/AttributesAttributeProvider.java
@@ -21,15 +21,18 @@
public class AttributesAttributeProvider implements AttributeProvider {
private final NodeAttributeRepository nodeAttributeRepository;
+ private final AttributesOptions attributeOptions;
public AttributesAttributeProvider(LinkResolverContext context) {
DataHolder options = context.getOptions();
+ attributeOptions = new AttributesOptions(options);
nodeAttributeRepository = AttributesExtension.NODE_ATTRIBUTES.getFrom(options);
}
@Override
public void setAttributes(Node node, AttributablePart part, Attributes attributes) {
- if (part != CoreNodeRenderer.CODE_CONTENT) {
+ // regression bug, issue #372, add option, default to both as before
+ if (part == CoreNodeRenderer.CODE_CONTENT ? attributeOptions.fencedCodeAddAttributes.addToCode : attributeOptions.fencedCodeAddAttributes.addToPre) {
ArrayList nodeAttributesList = nodeAttributeRepository.get(node);
if (nodeAttributesList != null) {
// add these as attributes
diff --git a/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/internal/AttributesOptions.java b/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/internal/AttributesOptions.java
index 8f96c94e2..c3d2f3f98 100644
--- a/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/internal/AttributesOptions.java
+++ b/flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/internal/AttributesOptions.java
@@ -1,6 +1,7 @@
package com.vladsch.flexmark.ext.attributes.internal;
import com.vladsch.flexmark.ext.attributes.AttributesExtension;
+import com.vladsch.flexmark.ext.attributes.FencedCodeAddType;
import com.vladsch.flexmark.util.data.DataHolder;
import com.vladsch.flexmark.util.data.MutableDataHolder;
import com.vladsch.flexmark.util.data.MutableDataSetter;
@@ -10,12 +11,14 @@ class AttributesOptions implements MutableDataSetter {
public final boolean wrapNonAttributeText;
public final boolean useEmptyImplicitAsSpanDelimiter;
public final boolean fencedCodeInfoAttributes;
+ public final FencedCodeAddType fencedCodeAddAttributes;
public AttributesOptions(DataHolder options) {
assignTextAttributes = AttributesExtension.ASSIGN_TEXT_ATTRIBUTES.getFrom(options);
wrapNonAttributeText = AttributesExtension.WRAP_NON_ATTRIBUTE_TEXT.getFrom(options);
useEmptyImplicitAsSpanDelimiter = AttributesExtension.USE_EMPTY_IMPLICIT_AS_SPAN_DELIMITER.getFrom(options);
fencedCodeInfoAttributes = AttributesExtension.FENCED_CODE_INFO_ATTRIBUTES.getFrom(options);
+ fencedCodeAddAttributes = AttributesExtension.FENCED_CODE_ADD_ATTRIBUTES.getFrom(options);
}
@Override
@@ -24,6 +27,7 @@ public MutableDataHolder setIn(MutableDataHolder dataHolder) {
dataHolder.set(AttributesExtension.WRAP_NON_ATTRIBUTE_TEXT, wrapNonAttributeText);
dataHolder.set(AttributesExtension.USE_EMPTY_IMPLICIT_AS_SPAN_DELIMITER, useEmptyImplicitAsSpanDelimiter);
dataHolder.set(AttributesExtension.FENCED_CODE_INFO_ATTRIBUTES, fencedCodeInfoAttributes);
+ dataHolder.set(AttributesExtension.FENCED_CODE_ADD_ATTRIBUTES, fencedCodeAddAttributes);
return dataHolder;
}
}
diff --git a/flexmark-ext-attributes/src/test/java/com/vladsch/flexmark/ext/attributes/ComboExtAttributesSpecTest.java b/flexmark-ext-attributes/src/test/java/com/vladsch/flexmark/ext/attributes/ComboExtAttributesSpecTest.java
index 3003e3e37..6ed88c479 100644
--- a/flexmark-ext-attributes/src/test/java/com/vladsch/flexmark/ext/attributes/ComboExtAttributesSpecTest.java
+++ b/flexmark-ext-attributes/src/test/java/com/vladsch/flexmark/ext/attributes/ComboExtAttributesSpecTest.java
@@ -35,7 +35,7 @@ public class ComboExtAttributesSpecTest extends ComboSpecTestCase {
TablesExtension.create()
));
- private static final Map optionsMap = new HashMap();
+ private static final Map optionsMap = new HashMap<>();
static {
optionsMap.put("anchors", new MutableDataSet()
.set(Parser.EXTENSIONS, Arrays.asList(AnchorLinkExtension.create(), AttributesExtension.create(), TocExtension.create(), EmojiExtension.create()))
@@ -47,6 +47,10 @@ public class ComboExtAttributesSpecTest extends ComboSpecTestCase {
optionsMap.put("dont-wrap-non-attributes", new MutableDataSet().set(AttributesExtension.WRAP_NON_ATTRIBUTE_TEXT, false));
optionsMap.put("empty-implicit-delimiters", new MutableDataSet().set(AttributesExtension.USE_EMPTY_IMPLICIT_AS_SPAN_DELIMITER, true));
optionsMap.put("no-info-attributes", new MutableDataSet().set(AttributesExtension.FENCED_CODE_INFO_ATTRIBUTES, false));
+ optionsMap.put("info-attributes", new MutableDataSet().set(AttributesExtension.FENCED_CODE_INFO_ATTRIBUTES, true));
+ optionsMap.put("fenced-code-to-both", new MutableDataSet().set(AttributesExtension.FENCED_CODE_ADD_ATTRIBUTES, FencedCodeAddType.ADD_TO_PRE_CODE));
+ optionsMap.put("fenced-code-to-pre", new MutableDataSet().set(AttributesExtension.FENCED_CODE_ADD_ATTRIBUTES, FencedCodeAddType.ADD_TO_PRE));
+ optionsMap.put("fenced-code-to-code", new MutableDataSet().set(AttributesExtension.FENCED_CODE_ADD_ATTRIBUTES, FencedCodeAddType.ADD_TO_CODE));
optionsMap.put("src-pos", new MutableDataSet().set(HtmlRenderer.SOURCE_POSITION_ATTRIBUTE, "md-pos"));
}
diff --git a/flexmark-ext-attributes/src/test/resources/ext_attributes_ast_spec.md b/flexmark-ext-attributes/src/test/resources/ext_attributes_ast_spec.md
index b3d130afd..8d584b105 100644
--- a/flexmark-ext-attributes/src/test/resources/ext_attributes_ast_spec.md
+++ b/flexmark-ext-attributes/src/test/resources/ext_attributes_ast_spec.md
@@ -2557,20 +2557,20 @@ Document[0, 128]
Fenced code info attributes
-```````````````````````````````` example Fenced Code: 1
+```````````````````````````````` example(Fenced Code: 1) options(info-attributes)
```plantuml {caption="Caption"}
```
.
com.vladsch.flexmark
flexmark-java
- 0.50.42
+ 0.50.50
flexmark-ext-autolink
diff --git a/flexmark-ext-definition/pom.xml b/flexmark-ext-definition/pom.xml
index 64d57dd62..11b1843b3 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.50
flexmark-ext-definition
diff --git a/flexmark-ext-emoji/pom.xml b/flexmark-ext-emoji/pom.xml
index 9ac5af4e4..ef568dcd3 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.50
flexmark-ext-emoji
diff --git a/flexmark-ext-enumerated-reference/pom.xml b/flexmark-ext-enumerated-reference/pom.xml
index f428d02fb..bba4b09c0 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.50
flexmark-ext-enumerated-reference
diff --git a/flexmark-ext-escaped-character/pom.xml b/flexmark-ext-escaped-character/pom.xml
index fe7f1b172..238c5eff9 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.50
flexmark-ext-escaped-character
diff --git a/flexmark-ext-footnotes/pom.xml b/flexmark-ext-footnotes/pom.xml
index f6b94acd8..45a657881 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.50
flexmark-ext-footnotes
diff --git a/flexmark-ext-gfm-issues/pom.xml b/flexmark-ext-gfm-issues/pom.xml
index 7e0c3b67c..e0e3ffbfc 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.50
flexmark-ext-gfm-issues
diff --git a/flexmark-ext-gfm-strikethrough/pom.xml b/flexmark-ext-gfm-strikethrough/pom.xml
index 3f2f2e33c..9a7d936b0 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.50
flexmark-ext-gfm-strikethrough
diff --git a/flexmark-ext-gfm-tables/pom.xml b/flexmark-ext-gfm-tables/pom.xml
index 890810a4f..07cd07b99 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.50
flexmark-ext-gfm-tables
diff --git a/flexmark-ext-gfm-tasklist/pom.xml b/flexmark-ext-gfm-tasklist/pom.xml
index f8909dec3..58d12eb0b 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.50
flexmark-ext-gfm-tasklist
diff --git a/flexmark-ext-gfm-tasklist/src/test/resources/ext_gfm_tasklist_ast_spec.md b/flexmark-ext-gfm-tasklist/src/test/resources/ext_gfm_tasklist_ast_spec.md
index 6f33acdd2..a51b0252d 100644
--- a/flexmark-ext-gfm-tasklist/src/test/resources/ext_gfm_tasklist_ast_spec.md
+++ b/flexmark-ext-gfm-tasklist/src/test/resources/ext_gfm_tasklist_ast_spec.md
@@ -1361,3 +1361,45 @@ Document[0, 43]
````````````````````````````````
+## Issues
+
+### 382
+
+Issue [#382, Is there an option for number of whitespaces needed to create sub-lists?]
+
+```````````````````````````````` example 382: 1
+* [ ] First item
+* [ ] Second item
+
+
+* [ ] Third item separated by 2 newlines
+
+.
+
com.vladsch.flexmark
flexmark-java
- 0.50.42
+ 0.50.50
flexmark-ext-gfm-users
diff --git a/flexmark-ext-gitlab/pom.xml b/flexmark-ext-gitlab/pom.xml
index ba11f96e2..9bc273d58 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.50
flexmark-ext-gitlab
diff --git a/flexmark-ext-ins/pom.xml b/flexmark-ext-ins/pom.xml
index cb5d8ec7e..e36b9829b 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.50
flexmark-ext-ins
diff --git a/flexmark-ext-jekyll-front-matter/pom.xml b/flexmark-ext-jekyll-front-matter/pom.xml
index 3df44fbbe..aec3d3057 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.50
flexmark-ext-jekyll-front-matter
diff --git a/flexmark-ext-jekyll-tag/pom.xml b/flexmark-ext-jekyll-tag/pom.xml
index 10cccbeae..f1ef7e992 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.50
flexmark-ext-jekyll-tag
diff --git a/flexmark-ext-macros/pom.xml b/flexmark-ext-macros/pom.xml
index 0449a6551..5b137e284 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.50
flexmark-ext-macros
diff --git a/flexmark-ext-media-tags/pom.xml b/flexmark-ext-media-tags/pom.xml
index 490cbe525..38371baee 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.50
flexmark-ext-media-tags
diff --git a/flexmark-ext-spec-example/pom.xml b/flexmark-ext-spec-example/pom.xml
index 0eb63db9f..6a1062559 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.50
flexmark-ext-spec-example
diff --git a/flexmark-ext-superscript/pom.xml b/flexmark-ext-superscript/pom.xml
index 79de11d97..57540d9ae 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.50
flexmark-ext-superscript
diff --git a/flexmark-ext-tables/pom.xml b/flexmark-ext-tables/pom.xml
index 42e504234..7127a6611 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.50
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 66837db77..a0ce52e74 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 ded25d819..1456de44c 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]
c d a | b *a b* g | h
+
+
+.
+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 c40097f80..d6788e9ec 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.50
flexmark-ext-toc
diff --git a/flexmark-ext-typographic/pom.xml b/flexmark-ext-typographic/pom.xml
index fc6b19a38..f01fcaf18 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.50
flexmark-ext-typographic
diff --git a/flexmark-ext-wikilink/pom.xml b/flexmark-ext-wikilink/pom.xml
index 2559ca41a..392224197 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.50
flexmark-ext-wikilink
diff --git a/flexmark-ext-xwiki-macros/pom.xml b/flexmark-ext-xwiki-macros/pom.xml
index fb7201b73..aaae0c9db 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.50
flexmark-ext-xwiki-macros
diff --git a/flexmark-ext-yaml-front-matter/pom.xml b/flexmark-ext-yaml-front-matter/pom.xml
index 6e226fb2c..f325f23f4 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.50
flexmark-ext-yaml-front-matter
diff --git a/flexmark-ext-youtube-embedded/pom.xml b/flexmark-ext-youtube-embedded/pom.xml
index 61a743254..3486979ab 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.50
4.0.0
diff --git a/flexmark-ext-zzzzzz/pom.xml b/flexmark-ext-zzzzzz/pom.xml
index f53bcccbc..7685bfe5d 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.50
flexmark-ext-zzzzzz
diff --git a/flexmark-formatter/pom.xml b/flexmark-formatter/pom.xml
index 540b81cb2..c7123532e 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.50
flexmark-formatter
diff --git a/flexmark-formatter/src/test/java/com/vladsch/flexmark/formatter/ComboCoreFormatterNoBlankLinesSpecTest.java b/flexmark-formatter/src/test/java/com/vladsch/flexmark/formatter/ComboCoreFormatterNoBlankLinesSpecTest.java
index 33e4f6174..8980143c6 100644
--- a/flexmark-formatter/src/test/java/com/vladsch/flexmark/formatter/ComboCoreFormatterNoBlankLinesSpecTest.java
+++ b/flexmark-formatter/src/test/java/com/vladsch/flexmark/formatter/ComboCoreFormatterNoBlankLinesSpecTest.java
@@ -25,12 +25,15 @@ public class ComboCoreFormatterNoBlankLinesSpecTest extends ComboSpecTestCase {
.set(Parser.BLANK_LINES_IN_AST, false)
.set(Parser.HEADING_NO_ATX_SPACE, true);
+ private static final DataHolder FIXED_INDENT_OPTIONS = new MutableDataSet().setFrom(ParserEmulationProfile.FIXED_INDENT)
+ .toMutable();
+
private static final Map optionsMap = new HashMap();
static {
//optionsMap.put("src-pos", new MutableDataSet().set(HtmlRenderer.SOURCE_POSITION_ATTRIBUTE, "md-pos"));
//optionsMap.put("option1", new MutableDataSet().set(FormatterExtension.FORMATTER_OPTION1, true));
optionsMap.put("format-fixed-indent", new MutableDataSet().set(Formatter.FORMATTER_EMULATION_PROFILE, ParserEmulationProfile.FIXED_INDENT));
- optionsMap.put("parse-fixed-indent", new MutableDataSet().set(Parser.PARSER_EMULATION_PROFILE, ParserEmulationProfile.FIXED_INDENT));
+ optionsMap.put("parse-fixed-indent", FIXED_INDENT_OPTIONS);
optionsMap.put("format-github", new MutableDataSet().set(Formatter.FORMATTER_EMULATION_PROFILE, ParserEmulationProfile.GITHUB_DOC));
optionsMap.put("parse-github", new MutableDataSet().set(Parser.PARSER_EMULATION_PROFILE, ParserEmulationProfile.GITHUB_DOC));
optionsMap.put("max-blank-lines-1", new MutableDataSet().set(Formatter.MAX_BLANK_LINES, 1));
diff --git a/flexmark-formatter/src/test/java/com/vladsch/flexmark/formatter/ComboCoreFormatterSpecTest.java b/flexmark-formatter/src/test/java/com/vladsch/flexmark/formatter/ComboCoreFormatterSpecTest.java
index 35b060863..0d521ef73 100644
--- a/flexmark-formatter/src/test/java/com/vladsch/flexmark/formatter/ComboCoreFormatterSpecTest.java
+++ b/flexmark-formatter/src/test/java/com/vladsch/flexmark/formatter/ComboCoreFormatterSpecTest.java
@@ -25,12 +25,15 @@ public class ComboCoreFormatterSpecTest extends ComboSpecTestCase {
.set(Parser.BLANK_LINES_IN_AST, true)
.set(Parser.HEADING_NO_ATX_SPACE, true);
+ private static final DataHolder FIXED_INDENT_OPTIONS = new MutableDataSet().setFrom(ParserEmulationProfile.FIXED_INDENT)
+ .toMutable();
+
private static final Map optionsMap = new HashMap();
static {
//optionsMap.put("src-pos", new MutableDataSet().set(HtmlRenderer.SOURCE_POSITION_ATTRIBUTE, "md-pos"));
//optionsMap.put("option1", new MutableDataSet().set(FormatterExtension.FORMATTER_OPTION1, true));
optionsMap.put("format-fixed-indent", new MutableDataSet().set(Formatter.FORMATTER_EMULATION_PROFILE, ParserEmulationProfile.FIXED_INDENT));
- optionsMap.put("parse-fixed-indent", new MutableDataSet().set(Parser.PARSER_EMULATION_PROFILE, ParserEmulationProfile.FIXED_INDENT));
+ optionsMap.put("parse-fixed-indent", FIXED_INDENT_OPTIONS);
optionsMap.put("format-github", new MutableDataSet().set(Formatter.FORMATTER_EMULATION_PROFILE, ParserEmulationProfile.GITHUB_DOC));
optionsMap.put("parse-github", new MutableDataSet().set(Parser.PARSER_EMULATION_PROFILE, ParserEmulationProfile.GITHUB_DOC));
optionsMap.put("max-blank-lines-1", new MutableDataSet().set(Formatter.MAX_BLANK_LINES, 1));
diff --git a/flexmark-formatter/src/test/resources/core_formatter_no_blankline_spec.md b/flexmark-formatter/src/test/resources/core_formatter_no_blankline_spec.md
index fb90cfb2c..deb8d06ab 100644
--- a/flexmark-formatter/src/test/resources/core_formatter_no_blankline_spec.md
+++ b/flexmark-formatter/src/test/resources/core_formatter_no_blankline_spec.md
@@ -1769,7 +1769,6 @@ Adds missing editor actions for end of word navigation but that is just the begi
* Enable Auto Indent Lines after move line/selection up or down actions to have them indented
automatically.
-
* Use Smart Paste to eliminate case change and prefix edits when pasting identifiers. MIA will
match case and style of identifier at destination when you paste, undo to get results before
MIA adjusted them. Copy `myColumnData` and paste it over `DEFAULT_VALUE` to get `COLUMN_DATA`,
@@ -1786,15 +1785,11 @@ Adds missing editor actions for end of word navigation but that is just the begi
moving the caret to the start of line when selecting or pasting. **Choose** whether you want
to **paste full line** selections: **above** or **below** the current line regardless of the
caret's column.
-
* Toggle between selection and multiple carets on selected lines to save time re-selecting the
same text again.
-
* Filter multiple carets saves you time when creating multiple carets by removing carets on
blank or comment lines so you can edit only code lines.
-
* Enhanced Paste from History dialog:
-
* **combine**, **arrange** and **reverse** the order of content entries
* **combine multiple** clipboard contents **with caret information intact**
* **paste and re-create multiple carets** from information already stored on the clipboard
diff --git a/flexmark-formatter/src/test/resources/core_formatter_spec.md b/flexmark-formatter/src/test/resources/core_formatter_spec.md
index eb1d1c3fe..5fa6b2586 100644
--- a/flexmark-formatter/src/test/resources/core_formatter_spec.md
+++ b/flexmark-formatter/src/test/resources/core_formatter_spec.md
@@ -1882,7 +1882,6 @@ Adds missing editor actions for end of word navigation but that is just the begi
* Enable Auto Indent Lines after move line/selection up or down actions to have them indented
automatically.
-
* Use Smart Paste to eliminate case change and prefix edits when pasting identifiers. MIA will
match case and style of identifier at destination when you paste, undo to get results before
MIA adjusted them. Copy `myColumnData` and paste it over `DEFAULT_VALUE` to get `COLUMN_DATA`,
@@ -1899,15 +1898,11 @@ Adds missing editor actions for end of word navigation but that is just the begi
moving the caret to the start of line when selecting or pasting. **Choose** whether you want
to **paste full line** selections: **above** or **below** the current line regardless of the
caret's column.
-
* Toggle between selection and multiple carets on selected lines to save time re-selecting the
same text again.
-
* Filter multiple carets saves you time when creating multiple carets by removing carets on
blank or comment lines so you can edit only code lines.
-
* Enhanced Paste from History dialog:
-
* **combine**, **arrange** and **reverse** the order of content entries
* **combine multiple** clipboard contents **with caret information intact**
* **paste and re-create multiple carets** from information already stored on the clipboard
diff --git a/flexmark-html-parser/pom.xml b/flexmark-html-parser/pom.xml
index 5ee6ce0f2..19e552080 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.50
flexmark-html-parser
diff --git a/flexmark-html2md-converter/pom.xml b/flexmark-html2md-converter/pom.xml
index 02e1d5186..2aef2679c 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.50
flexmark-html2md-converter
diff --git a/flexmark-integration-test/pom.xml b/flexmark-integration-test/pom.xml
index 36d59a91c..ea4a5ab5f 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.50
flexmark-integration-test
diff --git a/flexmark-java.iml b/flexmark-java.iml
index 8042fab0d..46eb70fd2 100644
--- a/flexmark-java.iml
+++ b/flexmark-java.iml
@@ -1,13 +1,5 @@
-
-
-
-
-
-
com.vladsch.flexmark
flexmark-java
- 0.50.42
+ 0.50.50
flexmark-jira-converter
diff --git a/flexmark-osgi/pom.xml b/flexmark-osgi/pom.xml
index 2f1d24164..ba856afee 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.50
flexmark-osgi
diff --git a/flexmark-pdf-converter/pom.xml b/flexmark-pdf-converter/pom.xml
index 4cf7028d2..9ef856163 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.50
flexmark-pdf-converter
diff --git a/flexmark-profile-pegdown/pom.xml b/flexmark-profile-pegdown/pom.xml
index dd801ef82..35d8fdb77 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.50
flexmark-profile-pegdown
diff --git a/flexmark-profile-pegdown/src/test/java/com/vladsch/flexmark/profiles/pegdown/ComboPegdownDoxiaCompatibilitySpecTest.java b/flexmark-profile-pegdown/src/test/java/com/vladsch/flexmark/profiles/pegdown/ComboPegdownDoxiaCompatibilitySpecTest.java
new file mode 100644
index 000000000..6f22c8205
--- /dev/null
+++ b/flexmark-profile-pegdown/src/test/java/com/vladsch/flexmark/profiles/pegdown/ComboPegdownDoxiaCompatibilitySpecTest.java
@@ -0,0 +1,78 @@
+package com.vladsch.flexmark.profiles.pegdown;
+
+import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.spec.SpecExample;
+import com.vladsch.flexmark.spec.SpecReader;
+import com.vladsch.flexmark.test.ComboSpecTestCase;
+import com.vladsch.flexmark.util.data.DataHolder;
+import com.vladsch.flexmark.util.data.MutableDataSet;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.vladsch.flexmark.parser.PegdownExtensions.*;
+
+public class ComboPegdownDoxiaCompatibilitySpecTest extends ComboSpecTestCase {
+ private static final String SPEC_RESOURCE = "/pegdown_doxia_compatibility_spec.md";
+ static final DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(ALL & ~( HARDWRAPS | ANCHORLINKS )).toMutable()
+ .set(HtmlRenderer.INDENT_SIZE, 2)
+ .set(HtmlRenderer.FENCED_CODE_LANGUAGE_CLASS_PREFIX, "")
+ .set(HtmlRenderer.OBFUSCATE_EMAIL_RANDOM, false)
+ .set(HtmlRenderer.PERCENT_ENCODE_URLS, true)
+ ;
+
+ private static final Map optionsMap = new HashMap();
+ static {
+ optionsMap.put("no-deep-parser", new MutableDataSet().set(Parser.HTML_BLOCK_DEEP_PARSER,false ));
+ }
+
+ private static final Parser PARSER = Parser.builder(OPTIONS).build();
+ // The spec says URL-escaping is optional, but the examples assume that it's enabled.
+ private static final HtmlRenderer RENDERER = HtmlRenderer.builder(OPTIONS).build();
+
+ private static DataHolder optionsSet(String optionSet) {
+ return optionsMap.get(optionSet);
+ }
+
+ public ComboPegdownDoxiaCompatibilitySpecTest(SpecExample example) {
+ super(example);
+ }
+
+ @Parameterized.Parameters(name = "{0}")
+ public static List data() {
+ List examples = SpecReader.readExamples(SPEC_RESOURCE);
+ List data = new ArrayList();
+
+ // NULL example runs full spec test
+ data.add(new Object[] { SpecExample.getNull() });
+
+ for (SpecExample example : examples) {
+ data.add(new Object[] { example });
+ }
+ return data;
+ }
+
+ @Override
+ public DataHolder options(String optionSet) {
+ return optionsSet(optionSet);
+ }
+
+ @Override
+ public String getSpecResourceName() {
+ return SPEC_RESOURCE;
+ }
+
+ @Override
+ public Parser parser() {
+ return PARSER;
+ }
+
+ @Override
+ public HtmlRenderer renderer() {
+ return RENDERER;
+ }
+}
diff --git a/flexmark-profile-pegdown/src/test/java/com/vladsch/flexmark/profiles/pegdown/PegdownProfileTestSuite.java b/flexmark-profile-pegdown/src/test/java/com/vladsch/flexmark/profiles/pegdown/PegdownProfileTestSuite.java
index ec5744b8c..d38c1b42a 100644
--- a/flexmark-profile-pegdown/src/test/java/com/vladsch/flexmark/profiles/pegdown/PegdownProfileTestSuite.java
+++ b/flexmark-profile-pegdown/src/test/java/com/vladsch/flexmark/profiles/pegdown/PegdownProfileTestSuite.java
@@ -7,6 +7,7 @@
ComboPegdownSpecTest.class,
ComboPegdownCompatibilitySpecTest.class,
ComboPegdownExtensionCompatibilitySpecTest.class,
+ ComboPegdownDoxiaCompatibilitySpecTest.class,
ComboStackOverflowSpecTest.class,
ComboIssueMn236ExceptionSpecTest.class,
})
diff --git a/flexmark-profile-pegdown/src/test/resources/pegdown_doxia_compatibility_spec.md b/flexmark-profile-pegdown/src/test/resources/pegdown_doxia_compatibility_spec.md
new file mode 100644
index 000000000..0a0366d78
--- /dev/null
+++ b/flexmark-profile-pegdown/src/test/resources/pegdown_doxia_compatibility_spec.md
@@ -0,0 +1,99 @@
+---
+title: Pegdown with Doxia Compatibility Spec
+author: Vladimir Schneider
+version: 0.2
+date: '2017-01-07'
+license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
+...
+
+---
+
+## Issue 384
+
+Issue #384,
+
+```````````````````````````````` example Issue 384: 1
+Install Kurento Media server
+>
.
>⏎
.
>⏎
.
>
.
@@ -3215,11 +3215,11 @@ Document[0, 10]
````````````````````````````````
-## Issue 136
+## Issues - 136
Issue #136, Tasklist display issue
-```````````````````````````````` example(Issue 136: 1) options(no-anchor-links)
+```````````````````````````````` example(Issues - 136: 1) options(no-anchor-links)
Task List
- [x] Task 1
@@ -3249,7 +3249,7 @@ Document[0, 49]
````````````````````````````````
-```````````````````````````````` example(Issue 136: 2) options(no-anchor-links)
+```````````````````````````````` example(Issues - 136: 2) options(no-anchor-links)
# Task List
- [x] Task 1
- [ ] Task 2
@@ -3278,12 +3278,189 @@ Document[0, 50]
````````````````````````````````
-## Issue
+## Issues - 376
+
+```````````````````````````````` example Issues - 376: 1
+test1|test2|test3|test4|test5|test6
+:------:|:------:|:------:|:------:|:------:|:------:|:------:
+1*1 | 1*1|1 |3.8%|40.6|523|78
+1*10|1*10|24 |82.7%|72.3|360|1134.1
+.
+
+
+
+.
+Document[0, 165]
+ TableBlock[0, 165]
+ TableHead[0, 35]
+ TableRow[0, 35] rowNumber=1
+ TableCell[0, 6] CENTER header text:[0, 5, "test1"] textClose:[5, 6, "|"]
+ Text[0, 5] chars:[0, 5, "test1"]
+ TableCell[6, 12] CENTER header text:[6, 11, "test2"] textClose:[11, 12, "|"]
+ Text[6, 11] chars:[6, 11, "test2"]
+ TableCell[12, 18] CENTER header text:[12, 17, "test3"] textClose:[17, 18, "|"]
+ Text[12, 17] chars:[12, 17, "test3"]
+ TableCell[18, 24] CENTER header text:[18, 23, "test4"] textClose:[23, 24, "|"]
+ Text[18, 23] chars:[18, 23, "test4"]
+ TableCell[24, 30] CENTER header text:[24, 29, "test5"] textClose:[29, 30, "|"]
+ Text[24, 29] chars:[24, 29, "test5"]
+ TableCell[30, 35] CENTER header text:[30, 35, "test6"]
+ Text[30, 35] chars:[30, 35, "test6"]
+ TableSeparator[36, 98]
+ TableRow[36, 98]
+ TableCell[36, 45] CENTER text:[36, 44, ":------:"] textClose:[44, 45, "|"]
+ Text[36, 44] chars:[36, 44, ":------:"]
+ TableCell[45, 54] CENTER text:[45, 53, ":------:"] textClose:[53, 54, "|"]
+ Text[45, 53] chars:[45, 53, ":------:"]
+ TableCell[54, 63] CENTER text:[54, 62, ":------:"] textClose:[62, 63, "|"]
+ Text[54, 62] chars:[54, 62, ":------:"]
+ TableCell[63, 72] CENTER text:[63, 71, ":------:"] textClose:[71, 72, "|"]
+ Text[63, 71] chars:[63, 71, ":------:"]
+ TableCell[72, 81] CENTER text:[72, 80, ":------:"] textClose:[80, 81, "|"]
+ Text[72, 80] chars:[72, 80, ":------:"]
+ TableCell[81, 90] CENTER text:[81, 89, ":------:"] textClose:[89, 90, "|"]
+ Text[81, 89] chars:[81, 89, ":------:"]
+ TableCell[90, 98] CENTER text:[90, 98, ":------:"]
+ Text[90, 98] chars:[90, 98, ":------:"]
+ TableBody[99, 164]
+ TableRow[99, 128] rowNumber=1
+ TableCell[99, 104] CENTER text:[99, 103, "1*1 "] textClose:[103, 104, "|"]
+ Text[99, 103] chars:[99, 103, "1*1 "]
+ TableCell[104, 109] CENTER text:[104, 108, " 1*1"] textClose:[108, 109, "|"]
+ Text[104, 108] chars:[104, 108, " 1*1"]
+ TableCell[109, 112] CENTER text:[109, 111, "1 "] textClose:[111, 112, "|"]
+ Text[109, 111] chars:[109, 111, "1 "]
+ TableCell[112, 117] CENTER text:[112, 116, "3.8%"] textClose:[116, 117, "|"]
+ Text[112, 116] chars:[112, 116, "3.8%"]
+ TableCell[117, 122] CENTER text:[117, 121, "40.6"] textClose:[121, 122, "|"]
+ Text[117, 121] chars:[117, 121, "40.6"]
+ TableCell[122, 126] CENTER text:[122, 125, "523"] textClose:[125, 126, "|"]
+ Text[122, 125] chars:[122, 125, "523"]
+ TableCell[126, 128] CENTER text:[126, 128, "78"]
+ Text[126, 128] chars:[126, 128, "78"]
+ TableRow[129, 164] rowNumber=2
+ TableCell[129, 134] CENTER text:[129, 133, "1*10"] textClose:[133, 134, "|"]
+ Text[129, 133] chars:[129, 133, "1*10"]
+ TableCell[134, 139] CENTER text:[134, 138, "1*10"] textClose:[138, 139, "|"]
+ Text[134, 138] chars:[134, 138, "1*10"]
+ TableCell[139, 143] CENTER text:[139, 142, "24 "] textClose:[142, 143, "|"]
+ Text[139, 142] chars:[139, 142, "24 "]
+ TableCell[143, 149] CENTER text:[143, 148, "82.7%"] textClose:[148, 149, "|"]
+ Text[143, 148] chars:[143, 148, "82.7%"]
+ TableCell[149, 154] CENTER text:[149, 153, "72.3"] textClose:[153, 154, "|"]
+ Text[149, 153] chars:[149, 153, "72.3"]
+ TableCell[154, 158] CENTER text:[154, 157, "360"] textClose:[157, 158, "|"]
+ Text[154, 157] chars:[154, 157, "360"]
+ TableCell[158, 164] CENTER text:[158, 164, "1134.1"]
+ Text[158, 164] chars:[158, 164, "1134.1"]
+````````````````````````````````
+
+
+## Issues - 382
+
+Issue [#382, Is there an option for number of whitespaces needed to create sub-lists?]
+
+```````````````````````````````` example Issues - 382: 1
+* [ ] First item
+* [ ] Second item
+
+
+* [ ] Third item separated by 2 newlines
+
+.
+hello
@@ -3299,3 +3476,6 @@ Document[0, 32]
Text[24, 30] chars:[24, 30, ""]
````````````````````````````````
+
+[#382, Is there an option for number of whitespaces needed to create sub-lists?]: https://github.com/vsch/flexmark-java/issues/382
+
diff --git a/flexmark-test-util/pom.xml b/flexmark-test-util/pom.xml
index 25d9efe5e..d75883a86 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.50
flexmark-test-util
diff --git a/flexmark-util/pom.xml b/flexmark-util/pom.xml
index 8ce49bde1..9e83b6f86 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.50
flexmark-util
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/Pair.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/Pair.java
index 7600a6cf0..3e72932d5 100644
--- a/flexmark-util/src/main/java/com/vladsch/flexmark/util/Pair.java
+++ b/flexmark-util/src/main/java/com/vladsch/flexmark/util/Pair.java
@@ -30,13 +30,13 @@ public String toString() {
if (myFirst == null) out.append("null");
else
- out.append(myFirst.getClass().getName().substring(myFirst.getClass().getPackage().getName().length() + 1)).append(' ').append(myFirst);
+ out.append(myFirst.getClass().getSimpleName()).append(' ').append(myFirst);
out.append(", ");
if (mySecond == null) out.append("null");
else
- out.append(mySecond.getClass().getName().substring(mySecond.getClass().getPackage().getName().length() + 1)).append(' ').append(mySecond);
+ out.append(mySecond.getClass().getSimpleName()).append(' ').append(mySecond);
out.append(')');
return out.toString();
diff --git a/flexmark-youtrack-converter/pom.xml b/flexmark-youtrack-converter/pom.xml
index 1eac520f2..6b22f9750 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.50
flexmark-youtrack-converter
diff --git a/flexmark/pom.xml b/flexmark/pom.xml
index a816b002c..c67cdc560 100644
--- a/flexmark/pom.xml
+++ b/flexmark/pom.xml
@@ -4,7 +4,7 @@
com.vladsch.flexmark
flexmark-java
- 0.50.42
+ 0.50.50
flexmark
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/ast/util/Parsing.java b/flexmark/src/main/java/com/vladsch/flexmark/ast/util/Parsing.java
index cfb7930bd..16b0c124a 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/ast/util/Parsing.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/ast/util/Parsing.java
@@ -142,8 +142,8 @@ public Parsing(DataHolder options) {
(Parser.SPACE_IN_LINK_URLS.getFrom(options) ? "(?:" + REG_CHAR_SP + ")|" : REG_CHAR + "|") +
ESCAPED_CHAR + "|\\\\|" + (Parser.SPACE_IN_LINK_URLS.getFrom(options) ? IN_PARENS_W_SP : IN_PARENS_NOSP) + ")*");
this.LINK_DESTINATION_MATCHED_PARENS = Pattern.compile(
- "^(?:" + (Parser.PARSE_JEKYLL_MACROS_IN_URLS.getFrom(options) ? IN_BRACES_W_SP + "|" : "")
- + (Parser.SPACE_IN_LINK_URLS.getFrom(options) ? "(?:" + REG_CHAR_SP + ")|" : REG_CHAR + "|") +
+ "^(?:" + (Parser.PARSE_JEKYLL_MACROS_IN_URLS.getFrom(options) ? IN_BRACES_W_SP + "|" : "") +
+ (Parser.SPACE_IN_LINK_URLS.getFrom(options) ? "(?:" + REG_CHAR_SP + ")|" : REG_CHAR + "|") +
ESCAPED_CHAR + "|\\\\|\\(|\\))*");
this.LINK_DESTINATION_MATCHED_PARENS_NOSP = Pattern.compile(
"^(?:" + (Parser.PARSE_JEKYLL_MACROS_IN_URLS.getFrom(options) ? IN_BRACES_W_SP + "|" : "")
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/core/HtmlBlockParser.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/core/HtmlBlockParser.java
index d4a2e228e..779d97262 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/parser/core/HtmlBlockParser.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/parser/core/HtmlBlockParser.java
@@ -306,7 +306,8 @@ public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockPar
deepParser.parseHtmlChunk(line.subSequence(nextNonSpace, line.length()), myHtmlBlockStartOnlyOnBlockTags, myHtmlBlockDeepParseNonBlock, myHtmlBlockDeepParseFirstOpenTagOnOneLine);
if (deepParser.hadHtml()) {
// have our html block start
- if (((deepParser.getHtmlMatch() == OPEN_TAG || (!myHtmlCommentBlocksInterruptParagraph && deepParser.getHtmlMatch() == COMMENT)) && matchedBlockParser.getBlockParser().getBlock() instanceof Paragraph)) {
+ if ((deepParser.getHtmlMatch() == OPEN_TAG || (!myHtmlCommentBlocksInterruptParagraph && deepParser.getHtmlMatch() == COMMENT))
+ && (!deepParser.isFirstBlockTag() && matchedBlockParser.getBlockParser().getBlock() instanceof Paragraph)) {
} else {
// not paragraph or can interrupt paragraph
return BlockStart.of(new HtmlBlockParser(state.getProperties(), null, deepParser.getHtmlMatch() == COMMENT, deepParser)).atIndex(state.getIndex());
@@ -314,7 +315,7 @@ public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockPar
}
} else {
for (int blockType = 1; blockType <= 7; blockType++) {
- // Type 7 can not interrupt a paragraph or may not start a block altogether
+ // Type 7 cannot interrupt a paragraph or may not start a block altogether
if (blockType == 7 && (myHtmlBlockStartOnlyOnBlockTags || matchedBlockParser.getBlockParser().getBlock() instanceof Paragraph)) {
continue;
}
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/core/ListBlockParser.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/core/ListBlockParser.java
index 10382ba00..096a89454 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/parser/core/ListBlockParser.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/parser/core/ListBlockParser.java
@@ -240,16 +240,14 @@ private void finalizeListTight(ParserState parserState) {
if (subItem instanceof ListBlock) {
haveNestedList = true;
if (!thisItemLoose && myOptions.isLooseWhenHasLooseSubItem()) {
- if (subItem instanceof ListBlock) {
- ReversiblePeekingIterator iterator = subItem.getChildIterator();
- while (iterator.hasNext()) {
- ListItem item1 = (ListItem) iterator.next();
- if (!item1.isTight()) {
- thisItemLoose = true;
- isTight = false;
- ((ListItem) item).setLoose(true);
- break;
- }
+ ReversiblePeekingIterator iterator = subItem.getChildIterator();
+ while (iterator.hasNext()) {
+ ListItem item1 = (ListItem) iterator.next();
+ if (!item1.isTight()) {
+ thisItemLoose = true;
+ isTight = false;
+ ((ListItem) item).setLoose(true);
+ break;
}
}
}
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/core/ListItemParser.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/core/ListItemParser.java
index 61cdf8d6c..93a720ab9 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/parser/core/ListItemParser.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/parser/core/ListItemParser.java
@@ -208,7 +208,16 @@ public BlockContinue tryContinue(ParserState state) {
int newColumn = state.getColumn() + itemIndent;
if (currentIndent >= myOptions.getCodeIndent()) {
- // our indented code child
+ // our indented code child but if it starts with an item prefix and parsing this list's paragraph item then this is a lazy continuation
+ if (myBlock.getFirstChild() != null && myBlock.getFirstChild() == myBlock.getLastChild()) {
+ BlockParser matched = state.getActiveBlockParser();
+ if (matched.isParagraphParser() && matched.getBlock() == myBlock.getFirstChild()) {
+ // just a lazy continuation of this item paragraph
+ listBlockParser.setItemHandledLineSkipActive(state.getLine());
+ return continueAtColumn(newColumn);
+ }
+ }
+
listBlockParser.setItemHandledLine(state.getLine());
return continueAtColumn(newColumn);
} else {
@@ -220,8 +229,7 @@ public BlockContinue tryContinue(ParserState state) {
boolean inParagraph = matched.isParagraphParser();
boolean inParagraphListItem = inParagraph && matched.getBlock().getParent() instanceof ListItem && matched.getBlock() == matched.getBlock().getParent().getFirstChild();
- if (inParagraphListItem
- && (!myOptions.canInterrupt(listData.listBlock, listData.isEmpty, true)
+ if (inParagraphListItem && (!myOptions.canInterrupt(listData.listBlock, listData.isEmpty, true)
|| !myOptions.canStartSubList(listData.listBlock, listData.isEmpty))) {
// just a lazy continuation of us
listBlockParser.setItemHandledLineSkipActive(state.getLine());
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/HtmlDeepParser.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/HtmlDeepParser.java
index 693a9102c..92fc0c6f8 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/HtmlDeepParser.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/HtmlDeepParser.java
@@ -34,8 +34,8 @@ public enum HtmlMatch {
public static final Pattern START_PATTERN;
private static final HtmlMatch[] PATTERN_MAP;
static {
- BLOCK_TAGS = new HashSet();
- VOID_TAGS = new HashSet();
+ BLOCK_TAGS = new HashSet<>();
+ VOID_TAGS = new HashSet<>();
String[] blockTags = ("address|article|aside|" +
"base|basefont|blockquote|body|" +
@@ -57,22 +57,22 @@ public enum HtmlMatch {
String[] voidTags = ("area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr").split("\\|");
VOID_TAGS.addAll(Arrays.asList(voidTags));
- OPTIONAL_TAGS = new HashMap>();
- OPTIONAL_TAGS.put("li", new HashSet(Arrays.asList(new String[] { "li" })));
- OPTIONAL_TAGS.put("dt", new HashSet(Arrays.asList(new String[] { "dt", "dd" })));
- OPTIONAL_TAGS.put("dd", new HashSet(Arrays.asList(new String[] { "dd", "dt" })));
- OPTIONAL_TAGS.put("p", new HashSet(Arrays.asList(new String[] { "address", "article", "aside", "blockquote", "details", "div", "dl", "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6", "header", "hr", "main", "menu", "nav", "ol", "p", "pre", "section", "table", "ul" })));
- OPTIONAL_TAGS.put("rt", new HashSet(Arrays.asList(new String[] { "rt", "rp" })));
- OPTIONAL_TAGS.put("rp", new HashSet(Arrays.asList(new String[] { "rt", "rp" })));
- OPTIONAL_TAGS.put("optgroup", new HashSet(Arrays.asList(new String[] { "optgroup" })));
- OPTIONAL_TAGS.put("option", new HashSet(Arrays.asList(new String[] { "option", "optgroup" })));
- OPTIONAL_TAGS.put("colgroup", new HashSet(Arrays.asList(new String[] { "colgroup" })));
- OPTIONAL_TAGS.put("thead", new HashSet(Arrays.asList(new String[] { "tbody", "tfoot" })));
- OPTIONAL_TAGS.put("tbody", new HashSet(Arrays.asList(new String[] { "tbody", "tfoot" })));
- OPTIONAL_TAGS.put("tfoot", new HashSet(Arrays.asList(new String[] { "tbody" })));
- OPTIONAL_TAGS.put("tr", new HashSet(Arrays.asList(new String[] { "tr" })));
- OPTIONAL_TAGS.put("td", new HashSet(Arrays.asList(new String[] { "td", "th" })));
- OPTIONAL_TAGS.put("th", new HashSet(Arrays.asList(new String[] { "td", "th" })));
+ OPTIONAL_TAGS = new HashMap<>();
+ OPTIONAL_TAGS.put("li", new HashSet<>(Arrays.asList("li")));
+ OPTIONAL_TAGS.put("dt", new HashSet<>(Arrays.asList("dt", "dd")));
+ OPTIONAL_TAGS.put("dd", new HashSet<>(Arrays.asList("dd", "dt")));
+ OPTIONAL_TAGS.put("p", new HashSet<>(Arrays.asList("address", "article", "aside", "blockquote", "details", "div", "dl", "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6", "header", "hr", "main", "menu", "nav", "ol", "p", "pre", "section", "table", "ul")));
+ OPTIONAL_TAGS.put("rt", new HashSet<>(Arrays.asList("rt", "rp")));
+ OPTIONAL_TAGS.put("rp", new HashSet<>(Arrays.asList("rt", "rp")));
+ OPTIONAL_TAGS.put("optgroup", new HashSet<>(Arrays.asList("optgroup")));
+ OPTIONAL_TAGS.put("option", new HashSet<>(Arrays.asList("option", "optgroup")));
+ OPTIONAL_TAGS.put("colgroup", new HashSet<>(Arrays.asList("colgroup")));
+ OPTIONAL_TAGS.put("thead", new HashSet<>(Arrays.asList("tbody", "tfoot")));
+ OPTIONAL_TAGS.put("tbody", new HashSet<>(Arrays.asList("tbody", "tfoot")));
+ OPTIONAL_TAGS.put("tfoot", new HashSet<>(Arrays.asList("tbody")));
+ OPTIONAL_TAGS.put("tr", new HashSet<>(Arrays.asList("tr")));
+ OPTIONAL_TAGS.put("td", new HashSet<>(Arrays.asList("td", "th")));
+ OPTIONAL_TAGS.put("th", new HashSet<>(Arrays.asList("td", "th")));
// combine all patterns and create map by pattern number
PATTERN_MAP = new HtmlMatch[HtmlMatch.values().length];
@@ -101,16 +101,18 @@ public enum HtmlMatch {
private HtmlMatch myHtmlMatch;
private int myHtmlCount;
final private HashSet myBlockTags;
+ private boolean myFirstBlockTag;
public HtmlDeepParser() {
- this(Collections.emptyList());
+ this(Collections.emptyList());
}
public HtmlDeepParser(List customTags) {
- myOpenTags = new ArrayList();
+ myOpenTags = new ArrayList<>();
myClosingPattern = null;
myHtmlMatch = null;
myHtmlCount = 0;
+ myFirstBlockTag = false;
myBlockTags = new HashSet<>(BLOCK_TAGS);
myBlockTags.addAll(customTags);
@@ -132,6 +134,10 @@ public int getHtmlCount() {
return myHtmlCount;
}
+ public boolean isFirstBlockTag() {
+ return myFirstBlockTag;
+ }
+
public boolean isHtmlClosed() {
return myClosingPattern == null && myOpenTags.isEmpty();
}
@@ -144,6 +150,17 @@ public boolean haveOpenRawTag() {
return myClosingPattern != null && myHtmlMatch != HtmlMatch.OPEN_TAG;
}
+ public boolean haveOpenBlockTag() {
+ if (!myOpenTags.isEmpty()) {
+ for (String openTag : myOpenTags) {
+ if (myBlockTags.contains(openTag)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
public boolean hadHtml() {
return myHtmlCount > 0 || !isHtmlClosed();
}
@@ -161,6 +178,7 @@ private void openTag(String tagName) {
}
}
myOpenTags.add(tagName);
+ myFirstBlockTag = myBlockTags.contains(tagName);
}
public void parseHtmlChunk(CharSequence html, boolean blockTagsOnly, boolean parseNonBlock, boolean firstOpenTagOnOneLine) {
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 36a15ba5b..b15929973 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
@@ -75,7 +75,7 @@ public InlineParserImpl(
this.inlineParserExtensionFactories = !inlineParserExtensionFactories.isEmpty() ? inlineParserExtensionFactories : null;
if (this.options.useHardcodedLinkAddressParser && true) {
- this.linkDestinationParser = new LinkDestinationParser(this.options.spaceInLinkUrls, this.options.parseJekyllMacrosInUrls, this.options.intellijDummyIdentifier);
+ this.linkDestinationParser = new LinkDestinationParser(this.options.linksAllowMatchedParentheses, this.options.spaceInLinkUrls, this.options.parseJekyllMacrosInUrls, this.options.intellijDummyIdentifier);
}
}
@@ -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;
@@ -1160,15 +1164,15 @@ public BasedSequence parseLinkDestination() {
if (res != null) {
return res;
} else {
- boolean spaceInUrls = options.spaceInLinkUrls;
- if (options.linksAllowMatchedParentheses) {
- // allow matched parenthesis
- // fix for issue of stack overflow when parsing long input lines, by implementing non-recursive scan
- if (linkDestinationParser != null) {
- BasedSequence match = linkDestinationParser.parseLinkDestination(input, index);
- index += match.length();
- return match;
- } else {
+ if (linkDestinationParser != null) {
+ BasedSequence match = linkDestinationParser.parseLinkDestination(input, index);
+ index += match.length();
+ return match;
+ } else {
+ boolean spaceInUrls = options.spaceInLinkUrls;
+ if (options.linksAllowMatchedParentheses) {
+ // allow matched parenthesis
+ // fix for issue of stack overflow when parsing long input lines, by implementing non-recursive scan
BasedSequence matched = match(myParsing.LINK_DESTINATION_MATCHED_PARENS);
if (matched != null) {
int openCount = 0;
@@ -1195,13 +1199,13 @@ public BasedSequence parseLinkDestination() {
return spaceInUrls ? matched.trimEnd(BasedSequence.SPACE) : matched;
}
- }
- return null;
- } else {
- // spec 0.27 compatibility
- BasedSequence matched = match(myParsing.LINK_DESTINATION);
- return matched != null && spaceInUrls ? matched.trimEnd(BasedSequence.SPACE) : matched;
+ return null;
+ } else {
+ // spec 0.27 compatibility
+ BasedSequence matched = match(myParsing.LINK_DESTINATION);
+ return matched != null && spaceInUrls ? matched.trimEnd(BasedSequence.SPACE) : matched;
+ }
}
}
}
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/LinkDestinationParser.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/LinkDestinationParser.java
index 8117020c5..297bd4282 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/LinkDestinationParser.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/LinkDestinationParser.java
@@ -63,11 +63,21 @@ public class LinkDestinationParser {
public final BitSet PAREN_EXCLUDED_CHARS;
public final BitSet PAREN_ESCAPABLE_CHARS;
public final BitSet PAREN_QUOTE_CHARS;
+ public final boolean allowMatchedParentheses;
public final boolean spaceInUrls;
public final boolean parseJekyllMacrosInUrls;
public final boolean intellijDummyIdentifier;
- public LinkDestinationParser(boolean spaceInUrls, boolean parseJekyllMacrosInUrls, boolean intellijDummyIdentifier) {
+ /**
+ * Parse Link Destination
+ *
+ * @param allowMatchedParentheses allow matched parentheses in link address. NOTE: if jekyll macros option is enabled, them matched parentheses will be enabled even if not selected.
+ * @param spaceInUrls allow space in address
+ * @param parseJekyllMacrosInUrls allow jekyll macros, matched {{ and }}
+ * @param intellijDummyIdentifier allow intellij dummy identifier character
+ */
+ public LinkDestinationParser(boolean allowMatchedParentheses, boolean spaceInUrls, boolean parseJekyllMacrosInUrls, boolean intellijDummyIdentifier) {
+ this.allowMatchedParentheses = allowMatchedParentheses || parseJekyllMacrosInUrls;
this.spaceInUrls = spaceInUrls;
this.parseJekyllMacrosInUrls = parseJekyllMacrosInUrls;
this.intellijDummyIdentifier = intellijDummyIdentifier;
@@ -199,7 +209,20 @@ public BasedSequence parseLinkDestination(BasedSequence input, int startIndex) {
lastMatch = nextIndex;
break;
} else if (c == '(') {
- if (openJekyllState != 2) openParenCount++;
+ if (openJekyllState != 2) {
+ if (allowMatchedParentheses) {
+ openParenCount++;
+ } else {
+ if (openParenCount == 0) {
+ openParenCount++;
+ } else {
+ // invalid, parentheses need escaping beyond 1
+ lastMatch = startIndex;
+ openParenState = -1;
+ break;
+ }
+ }
+ }
lastMatch = nextIndex;
break;
} else if (c == ')') {
@@ -211,6 +234,9 @@ public BasedSequence parseLinkDestination(BasedSequence input, int startIndex) {
openParenCount--;
lastMatch = nextIndex;
break;
+ } else if (!allowMatchedParentheses) {
+ openParenState = -1;
+ break;
}
} else {
if (c == ' ') {
diff --git a/flexmark/src/test/java/com/vladsch/flexmark/parser/internal/LinkDestinationParserTest.java b/flexmark/src/test/java/com/vladsch/flexmark/parser/internal/LinkDestinationParserTest.java
index b3eb8956e..99e55eb34 100644
--- a/flexmark/src/test/java/com/vladsch/flexmark/parser/internal/LinkDestinationParserTest.java
+++ b/flexmark/src/test/java/com/vladsch/flexmark/parser/internal/LinkDestinationParserTest.java
@@ -1,13 +1,13 @@
package com.vladsch.flexmark.parser.internal;
-import com.vladsch.flexmark.parser.internal.LinkDestinationParser;
import com.vladsch.flexmark.util.sequence.CharSubSequence;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
public class LinkDestinationParserTest {
+ LinkDestinationParser noParenParser;
LinkDestinationParser normalParser;
LinkDestinationParser spacesParser;
LinkDestinationParser jekyllParser;
@@ -15,10 +15,11 @@ public class LinkDestinationParserTest {
@Before
public void setUp() throws Exception {
- normalParser = new LinkDestinationParser(false, false, false);
- spacesParser = new LinkDestinationParser(true, false, false);
- jekyllParser = new LinkDestinationParser(false, true, false);
- jekyllSpacesParser = new LinkDestinationParser(true, true, false);
+ normalParser = new LinkDestinationParser(true, false, false, false);
+ noParenParser = new LinkDestinationParser(false, false, false, false);
+ spacesParser = new LinkDestinationParser(true, true, false, false);
+ jekyllParser = new LinkDestinationParser(true, false, true, false);
+ jekyllSpacesParser = new LinkDestinationParser(true, true, true, false);
}
// @formatter:off
@@ -31,6 +32,20 @@ public void setUp() throws Exception {
@Test public void test_Normal7() { assertEquals("(abc)", normalParser.parseLinkDestination(CharSubSequence.of("(abc)"), 0).toString()); }
@Test public void test_Normal8() { assertEquals("\\(abc", normalParser.parseLinkDestination(CharSubSequence.of("\\(abc)"), 0).toString()); }
@Test public void test_Normal9() { assertEquals("abc\\", normalParser.parseLinkDestination(CharSubSequence.of("abc\\ "), 0).toString()); }
+ @Test public void test_Normal10() { assertEquals("((abc))", normalParser.parseLinkDestination(CharSubSequence.of("((abc))"), 0).toString()); }
+
+ @Test public void test_NoParen1() { assertEquals("", noParenParser.parseLinkDestination(CharSubSequence.of(""), 0).toString()); }
+ @Test public void test_NoParen2() { assertEquals("abc", noParenParser.parseLinkDestination(CharSubSequence.of("abc"), 0).toString()); }
+ @Test public void test_NoParen3() { assertEquals("bc", noParenParser.parseLinkDestination(CharSubSequence.of("abc"), 1).toString()); }
+ @Test public void test_NoParen4() { assertEquals("bc", noParenParser.parseLinkDestination(CharSubSequence.of("abc \""), 1).toString()); }
+ @Test public void test_NoParen5() { assertEquals("bc", noParenParser.parseLinkDestination(CharSubSequence.of("abc '"), 1).toString()); }
+ @Test public void test_NoParen6() { assertEquals("abc", noParenParser.parseLinkDestination(CharSubSequence.of("abc)"), 0).toString()); }
+ @Test public void test_NoParen7() { assertEquals("(abc)", noParenParser.parseLinkDestination(CharSubSequence.of("(abc)"), 0).toString()); }
+ @Test public void test_NoParen8() { assertEquals("\\(abc", noParenParser.parseLinkDestination(CharSubSequence.of("\\(abc)"), 0).toString()); }
+ @Test public void test_NoParen9() { assertEquals("abc\\", noParenParser.parseLinkDestination(CharSubSequence.of("abc\\ "), 0).toString()); }
+ @Test public void test_NoParen10() {assertEquals("", noParenParser.parseLinkDestination(CharSubSequence.of("((abc))"), 0).toString()); }
+ @Test public void test_NoParen11() { assertEquals("", noParenParser.parseLinkDestination(CharSubSequence.of("(abc()"), 0).toString()); }
+ @Test public void test_NoParen12() { assertEquals("", noParenParser.parseLinkDestination(CharSubSequence.of("(abc(())"), 0).toString()); }
@Test public void test_Spaces1() { assertEquals("ab c", spacesParser.parseLinkDestination(CharSubSequence.of("ab c"), 0).toString()); }
@Test public void test_Spaces2() { assertEquals("b c", spacesParser.parseLinkDestination(CharSubSequence.of("ab c"), 1).toString()); }
diff --git a/flexmark/src/test/resources/issues_ast_spec.md b/flexmark/src/test/resources/issues_ast_spec.md
index 6a9b35bb1..e355a8b1a 100644
--- a/flexmark/src/test/resources/issues_ast_spec.md
+++ b/flexmark/src/test/resources/issues_ast_spec.md
@@ -1397,6 +1397,60 @@ Document[0, 128]
````````````````````````````````
+## Issue 384
+
+Issue #384,
+
+```````````````````````````````` example(Issue 384: 1) options(keep-blank-lines)
+
+
+# Media Server Installation
+
+## Install Kurento Media server
+
+Install Kurento Media server
+com.vladsch.flexmark
flexmark-java
- 0.50.42
+ 0.50.50
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.50
com.vladsch.flexmark
flexmark-docx-converter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-abbreviation
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-anchorlink
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-admonition
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-aside
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-attributes
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-autolink
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-definition
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-emoji
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-enumerated-reference
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-escaped-character
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-footnotes
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-issues
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-strikethrough
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-tables
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-tasklist
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gfm-users
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-gitlab
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-ins
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-jekyll-front-matter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-jekyll-tag
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-macros
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-media-tags
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-xwiki-macros
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-spec-example
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-superscript
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-tables
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-toc
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-typographic
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-wikilink
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-yaml-front-matter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-youtube-embedded
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-ext-zzzzzz
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-formatter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-html-parser
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-html2md-converter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-jira-converter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-pdf-converter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-profile-pegdown
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-test-util
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-util
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-youtrack-converter
- 0.50.42
+ 0.50.50
com.vladsch.flexmark
flexmark-all
- 0.50.42
+ 0.50.50
PlatUML Code
PlatUML Code
PlatUML Code
PlatUML Code
-
+
-
+
First item
+
+ -
+
Second item
+
+ -
+
Third item separated by 2 newlines
+
+
-
+
- First item + * [ ] Second item +
e | f| header1 | header2 | header3 |
|---|---|---|
| 1*2 | 2*1 |
+→It should be run under same user as OM
+
+.
+
+
+→It should be run under same user as OM
+
+.
+Document[0, 201]
+ Paragraph[0, 111]
+ HtmlInline[0, 78] chars:[0, 78, ""]
+ Text[78, 106] chars:[78, 106, "Insta … erver"]
+ HtmlInline[106, 110] chars:[106, 110, ""]
+ HtmlBlock[111, 201]
+````````````````````````````````
+
+
+```````````````````````````````` example(Issue 384: 2) options(no-deep-parser)
+Install Kurento Media server
+
+→It should be run under same user as OM
+
+.
+
+
+→It should be run under same user as OM
+
+.
+Document[0, 200]
+ Paragraph[0, 111]
+ HtmlInline[0, 78] chars:[0, 78, ""]
+ Text[78, 106] chars:[78, 106, "Insta … erver"]
+ HtmlInline[106, 110] chars:[106, 110, ""]
+ HtmlBlock[111, 200]
+````````````````````````````````
+
+
+```````````````````````````````` example Issue 384: 3
+
+
+# Media Server Installation
+
+## Install Kurento Media server
+
+Install Kurento Media server
+
+→It should be run under same user as OM
+
+
+## Specify/Install Turn server
+
+Optional step
+.
+
+Media Server Installation
+Install Kurento Media server
+ +
+→It should be run under same user as OM
+
+Specify/Install Turn server
+Optional step
+.
+Document[0, 475]
+ HtmlCommentBlock[0, 118]
+ Heading[119, 146] textOpen:[119, 120, "#"] text:[121, 146, "Media Server Installation"]
+ Text[121, 146] chars:[121, 146, "Media … ation"]
+ Heading[148, 179] textOpen:[148, 150, "##"] text:[151, 179, "Install Kurento Media server"]
+ Text[151, 179] chars:[151, 179, "Insta … erver"]
+ Paragraph[181, 292]
+ HtmlInline[181, 259] chars:[181, 259, ""]
+ Text[259, 287] chars:[259, 287, "Insta … erver"]
+ HtmlInline[287, 291] chars:[287, 291, ""]
+ HtmlBlock[292, 382]
+ Heading[383, 413] textOpen:[383, 385, "##"] text:[386, 413, "Specify/Install Turn server"]
+ Text[386, 413] chars:[386, 413, "Speci … erver"]
+ HtmlBlock[415, 475]
+````````````````````````````````
+
+
diff --git a/flexmark-profile-pegdown/src/test/resources/pegdown_extension_compatibility_spec.md b/flexmark-profile-pegdown/src/test/resources/pegdown_extension_compatibility_spec.md
index bc73b4aff..69db3b7d7 100644
--- a/flexmark-profile-pegdown/src/test/resources/pegdown_extension_compatibility_spec.md
+++ b/flexmark-profile-pegdown/src/test/resources/pegdown_extension_compatibility_spec.md
@@ -8,7 +8,7 @@ license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
---
-## Markdown elements
+# Markdown elements
### Markdown elements - empty text
@@ -3023,11 +3023,11 @@ option
````````````````````````````````
-## Issues
+## Issues - xxx
options for plain text rendering
-```````````````````````````````` example Issues: 1
+```````````````````````````````` example Issues - xxx: 1
* Enable Auto Indent Lines after move line/selection up or down actions to have them indented
automatically.
* Use Smart Paste to eliminate case change and prefix edits when pasting identifiers. MIA will
@@ -3161,12 +3161,12 @@ Document[0, 1097]
````````````````````````````````
-## Issue #70
+## Issues - 70
Issue #70, parse failed for angle quotes if the end angle quote follows with a line feed or a
carriage return
-```````````````````````````````` example(Issue #70: 1) options(FILE_EOL)
+```````````````````````````````` example(Issues - 70: 1) options(FILE_EOL)
<«test»
@@ -3178,7 +3178,7 @@ Document[0, 9] ```````````````````````````````` -```````````````````````````````` example(Issue #70: 2) options(NO_FILE_EOL) +```````````````````````````````` example(Issues - 70: 2) options(NO_FILE_EOL) <«test»
@@ -3190,7 +3190,7 @@ Document[0, 9] ```````````````````````````````` -```````````````````````````````` example(Issue #70: 3) options(FILE_EOL) +```````````````````````````````` example(Issues - 70: 3) options(FILE_EOL) <«test»
@@ -3202,7 +3202,7 @@ Document[0, 10] ```````````````````````````````` -```````````````````````````````` example(Issue #70: 4) options(FILE_EOL) +```````````````````````````````` example(Issues - 70: 4) options(FILE_EOL) <| test1 | test2 | test3 | test4 | test5 | test6 | |
|---|---|---|---|---|---|---|
| 1*1 | 1*1 | 1 | 3.8% | 40.6 | 523 | 78 |
| 1*10 | 1*10 | 24 | 82.7% | 72.3 | 360 | 1134.1 |
-
+
- First item +
- Second item +
-
+
Third item separated by 2 newlines
+
+
-
+
- First item * [ ] Second item +
-
+
- First item * [ ] Second item +
-
+
- First item
+
-
+
- Second item +
+
-
+
- First item
+
-
+
- Second item +
+
-
+
- First item
+
+* [ ] Second item +
+
hello <html> and <body>
@@ -3299,3 +3476,6 @@ Document[0, 32]
Text[24, 30] chars:[24, 30, ""]
````````````````````````````````
+
+[#382, Is there an option for number of whitespaces needed to create sub-lists?]: https://github.com/vsch/flexmark-java/issues/382
+
diff --git a/flexmark-test-util/pom.xml b/flexmark-test-util/pom.xml
index 25d9efe5e..d75883a86 100644
--- a/flexmark-test-util/pom.xml
+++ b/flexmark-test-util/pom.xml
@@ -4,7 +4,7 @@
+→It should be run under same user as OM
+
+
+## Specify/Install Turn server
+
+Optional step
+.
+
+Media Server Installation
+Install Kurento Media server
+ +
+→It should be run under same user as OM
+
+Specify/Install Turn server
+Optional step
+.
+Document[0, 474]
+ HtmlCommentBlock[0, 118]
+ BlankLine[118, 119]
+ Heading[119, 146] textOpen:[119, 120, "#"] text:[121, 146, "Media Server Installation"]
+ Text[121, 146] chars:[121, 146, "Media … ation"]
+ BlankLine[147, 148]
+ Heading[148, 179] textOpen:[148, 150, "##"] text:[151, 179, "Install Kurento Media server"]
+ Text[151, 179] chars:[151, 179, "Insta … erver"]
+ BlankLine[180, 181]
+ Paragraph[181, 292]
+ HtmlInline[181, 259] chars:[181, 259, ""]
+ Text[259, 287] chars:[259, 287, "Insta … erver"]
+ HtmlInline[287, 291] chars:[287, 291, ""]
+ HtmlBlock[292, 382]
+ BlankLine[382, 383]
+ Heading[383, 413] textOpen:[383, 385, "##"] text:[386, 413, "Specify/Install Turn server"]
+ Text[386, 413] chars:[386, 413, "Speci … erver"]
+ BlankLine[414, 415]
+ HtmlBlock[415, 474]
+````````````````````````````````
+
+
## Issue xxx-2
Issue xxx-2, leading spaces tab not part of indented code, which is correct
diff --git a/pom.xml b/pom.xml
index dd0a81aa1..59b00efae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@