Skip to content

Commit

Permalink
fix for #396
Browse files Browse the repository at this point in the history
  • Loading branch information
vsch committed Apr 8, 2020
1 parent 9719ed1 commit 052a1f7
Show file tree
Hide file tree
Showing 73 changed files with 291 additions and 97 deletions.
1 change: 1 addition & 0 deletions .idea/markdown-navigator-enh.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion .idea/markdown-navigator.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions .idea/markdown-navigator/COPY_HTML_MIME.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions .idea/markdown-navigator/Comms.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions .idea/markdown-navigator/GitHub_Templates.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions .idea/markdown-navigator/OVERVIEW.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions .idea/markdown-navigator/Wiki.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions VERSION-TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- [Release 0.60.0](#release-0600)
- [API Refactoring](#api-refactoring)
- [Next 0.61.xx](#next-061xx)
- [0.61.2](#0612)
- [0.61.0](#0610)
- [0.60.2](#0602)
- [0.60.0](#0600)
Expand Down Expand Up @@ -214,6 +215,12 @@ Please give feedback on the upcoming changes if you have concerns about breaking
`|` for each line that was wrapped. Otherwise, it is impossible to tell where each line
ends and another begins.

## 0.61.2

* Fix: `ScopedDataSet.getAll()` and `ScopedDataSet.getKeys()` would not return keys from parent
scope.
* Fix: [#396, DocumentParser stops reading too early resulting in the document being cut off]

## 0.61.0

* Fix: enable original spec tests
Expand Down Expand Up @@ -2311,4 +2318,6 @@ Please give feedback on the upcoming changes if you have concerns about breaking
[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
<!-- @IGNORE PREVIOUS: link -->
[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
[#396, DocumentParser stops reading too early resulting in the document being cut off]: https://github.com/vsch/flexmark-java/issues/396


35 changes: 35 additions & 0 deletions VERSION.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

- [Release 0.60.0](#release-0600)
- [API Refactoring](#api-refactoring)
- [0.61.2](#0612)
- [0.61.0](#0610)
- [0.60.2](#0602)
- [0.60.0](#0600)
- [0.59.84](#05984)
Expand Down Expand Up @@ -155,6 +157,35 @@ Please give feedback on the upcoming changes if you have concerns about breaking
* `com.vladsch.flexmark.util.ast.NodeAdaptingVisitHandler`
* `com.vladsch.flexmark.util.ast.NodeAdaptingVisitor`

## 0.61.2

* Fix: `ScopedDataSet.getAll()` and `ScopedDataSet.getKeys()` would not return keys from parent
scope.
* Fix: [#396, DocumentParser stops reading too early resulting in the document being cut off]

## 0.61.0

* Fix: enable original spec tests
* Fix: merge [#391, PR: Fix: CRLF line separator in fenced code blocks produce redundant CR.]
* Fix: merge [#387, JUnit is in the compile scope]
* Add: ability to insert anchor ref targets to `HtmlIdGenerator` when scanning a document.
* Add: add `LinkResolverBasicContext` as base interface of `LinkResolverContext` to allow simple
context to pass to `LinkResolver` when resolving links without needing to implement all unused
methods of `LinkResolverContext`.
* Break: change argument to `LinkResolver` and `LinkResolverFactory` to
`LinkResolverBasicContext`. Except for `JekyllTagExtension`, the argument is still
`LinkResolverContext` and passed value can be cast to this if required.
* Add: support for `JekyllTagBlock` with `include` directive to `DocxRenderer`

Use `{% include includeFile %}` to include the file into the source document. `includeFile` is
resolved relative to `DocxRenderer.DOC_RELATIVE_URL` or `DocxRenderer.DOC_ROOT_URL`. The
latter is used if `includeFile` starts with `/`

Will only include files if `JekyllTagExtension.LINK_RESOLVER_FACTORIES` is not empty, in which
case the link resolvers will be used to resolve `includeFile` to full file path. Use singleton
list of `DocxLinkResolver.Factory` instance to resolve using doc relative and root url paths.
* Fix: `MergeLinkResolver` and `DocxLinkResolver`

## 0.60.2

* Fix: change formatter sub-context rendering node to nullable
Expand Down Expand Up @@ -1875,3 +1906,7 @@ Please give feedback on the upcoming changes if you have concerns about breaking
[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


[#391, PR: Fix: CRLF line separator in fenced code blocks produce redundant CR.]: https://github.com/vsch/flexmark-java/pull/391
[#387, JUnit is in the compile scope]: https://github.com/vsch/flexmark-java/pull/387
[#396, DocumentParser stops reading too early resulting in the document being cut off]: https://github.com/vsch/flexmark-java/issues/396
2 changes: 1 addition & 1 deletion flexmark-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-java</artifactId>
<version>0.61.0</version>
<version>0.61.2</version>
</parent>

<artifactId>flexmark-all</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flexmark-core-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-java</artifactId>
<version>0.61.0</version>
<version>0.61.2</version>
</parent>

<artifactId>flexmark-core-test</artifactId>
Expand Down
Loading

0 comments on commit 052a1f7

Please sign in to comment.