prep 0.28.36

diffbot · Jan 29, 2018 · 9141672 · 9141672
1 parent 6bbc2ee
commit 9141672
Show file tree

Hide file tree

Showing 46 changed files with 138 additions and 173 deletions.
diff --git a/.idea/markdown-navigator/COPY_HTML_MIME.xml b/.idea/markdown-navigator/COPY_HTML_MIME.xml
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,7 @@
 Copyright (c) 2015-2016, Atlassian Pty Ltd
 All rights reserved.
 
-Copyright (c) 2016, Vladimir Schneider,
+Copyright (c) 2016-2018, Vladimir Schneider,
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ following sample:
 <dependency>
     <groupId>com.vladsch.flexmark</groupId>
     <artifactId>flexmark-all</artifactId>
-    <version>0.28.34</version>
+    <version>0.28.36</version>
 </dependency>
 ```
 
@@ -85,7 +85,7 @@ public class BasicSample {
 #### Building via Gradle
 
 ```shell
-compile 'com.vladsch.flexmark:flexmark-all:0.28.34'
+compile 'com.vladsch.flexmark:flexmark-all:0.28.36'
 ```
 
 #### Building with Android Studio

diff --git a/VERSION.md b/VERSION.md
@@ -7,6 +7,8 @@ flexmark-java
 
 - [To Do](#to-do)
     - [Docx Converter](#docx-converter)
+- [0.28.38](#02838)
+- [0.28.36](#02836)
 - [0.28.34](#02834)
 - [0.28.32](#02832)
 - [0.28.30](#02830)
@@ -235,6 +237,22 @@ flexmark-java
 
 &nbsp;</details>
 
+0.28.38
+-------
+
+* [ ] Add option to HTML Generator to convert resolved image links base64 encoded image data.
+
+  **NOTE:** this requires that your link resolver resolves image links so that the link is
+  either an absolute URI (`file://`, `http://` or `https://`) or a relative link which is the
+  relative path from current working directory to a valid image file.
+
+0.28.36
+-------
+
+* Fix: NPE in docx converter block quotes if `Quotations` style is missing from templates.
+
+* Fix: do not render empty table tbody/thead tags.
+
 0.28.34
 -------
 

diff --git a/flexmark-all/pom.xml b/flexmark-all/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.28.34</version>
+        <version>0.28.36</version>
     </parent>
 
     <artifactId>flexmark-all</artifactId>
@@ -21,172 +21,172 @@
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-abbreviation</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-anchorlink</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-aside</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-attributes</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-autolink</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-definition</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-emoji</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-enumerated-reference</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-escaped-character</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-footnotes</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-gfm-issues</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-gfm-strikethrough</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-gfm-tables</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-gfm-tasklist</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-gfm-users</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-jekyll-front-matter</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-jekyll-tag</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-ins</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-xwiki-macros</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-superscript</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-tables</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-toc</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-typographic</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-wikilink</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-yaml-front-matter</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-youtube-embedded</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-formatter</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-html-parser</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-jira-converter</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-pdf-converter</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-profile-pegdown</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-util</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-youtrack-converter</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
         </dependency>
     </dependencies>
 

diff --git a/flexmark-docx-converter/pom.xml b/flexmark-docx-converter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.28.34</version>
+        <version>0.28.36</version>
     </parent>
 
     <artifactId>flexmark-docx-converter</artifactId>

diff --git a/...rter/src/main/java/com/vladsch/flexmark/docx/converter/util/QuoteBlockFormatProvider.java b/...rter/src/main/java/com/vladsch/flexmark/docx/converter/util/QuoteBlockFormatProvider.java
@@ -59,7 +59,7 @@ public void adjustPPrForFormatting(PPr pPr) {
         // here we need to adjust for inherited left margin
         final BigInteger newLeftInd = myDocx.getHelper().safeIndLeft(pPr);
         final PPr styledPPr = myDocx.getHelper().getExplicitPPr(pPr);
-        if (styledPPr.getPBdr() != null && newLeftInd.compareTo(myLeftInd) > 0) {
+        if (styledPPr.getPBdr() != null && newLeftInd != null && newLeftInd.compareTo(myLeftInd) > 0) {
             // it grew, word has the border hanging and we want the we shift it by our left border spacing
             CTBorder leftBorder = styledPPr.getPBdr().getLeft();
             if (leftBorder.getSpace() != null && leftBorder.getSpace().compareTo(BigInteger.ZERO) > 0) {

diff --git a/flexmark-ext-abbreviation/pom.xml b/flexmark-ext-abbreviation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.28.34</version>
+        <version>0.28.36</version>
     </parent>
 
     <artifactId>flexmark-ext-abbreviation</artifactId>

diff --git a/flexmark-ext-anchorlink/pom.xml b/flexmark-ext-anchorlink/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.28.34</version>
+        <version>0.28.36</version>
     </parent>
 
     <artifactId>flexmark-ext-anchorlink</artifactId>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-jira-converter</artifactId>
-            <version>0.28.34</version>
+            <version>0.28.36</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/flexmark-ext-aside/pom.xml b/flexmark-ext-aside/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.28.34</version>
+        <version>0.28.36</version>
     </parent>
 
     <artifactId>flexmark-ext-aside</artifactId>

diff --git a/flexmark-ext-attributes/pom.xml b/flexmark-ext-attributes/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.28.34</version>
+        <version>0.28.36</version>
     </parent>
 
     <artifactId>flexmark-ext-attributes</artifactId>