fix vsch#53

vsch · vsch · commit a744653d41ca · 2017-01-31T23:27:55.000-05:00
diff --git a/README.md b/README.md
@@ -20,24 +20,24 @@ than ideal and for pathological input either hangs or practically hangs during p
 
 ### Latest Additions
 
-* [XWiki Macros Extension Module](../../wiki/Extensions#xwiki-macro-extension)
-* [Jekyll tags Extension Module](../../wiki/Extensions#jekyll-tags)
-* [HTML to Markdown Converter Module](../../wiki/Extensions#html-to-markdown)
+* [XWiki Macros Extension Module](https://github.com/vsch/flexmark-java/wiki/Extensions#xwiki-macro-extension)
+* [Jekyll tags Extension Module](https://github.com/vsch/flexmark-java/wiki/Extensions#jekyll-tags)
+* [HTML to Markdown Converter Module](https://github.com/vsch/flexmark-java/wiki/Extensions#html-to-markdown)
 * [Maven Markdown Page Generator Plugin](https://github.com/vsch/markdown-page-generator-plugin)
-* [Markdown Formatter](../../wiki/Markdown-Formatter) module to output AST as markdown with
+* [Markdown Formatter](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter) module to output AST as markdown with
   formatting options.
-* [Table Extension](../../wiki/Extensions#tables) for
-  [Markdown Formatter](../../wiki/Markdown-Formatter) with column width and alignment of
+* [Table Extension](https://github.com/vsch/flexmark-java/wiki/Extensions#tables) for
+  [Markdown Formatter](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter) with column width and alignment of
   markdown tables:
 
   <table>
   <thead> <tr><th>Input</th> <th>Output</th> </tr> </thead>
   <tr><td>
   <pre><code class="language-markdown">day|time|spent
   :---|:---:|--:
-  nov. 2. tue|10:00|4h 40m 
+  nov. 2. tue|10:00|4h 40m
   nov. 3. thu|11:00|4h
-  nov. 7. mon|10:20|4h 20m 
+  nov. 7. mon|10:20|4h 20m
   total:|| **13h**
   </code></pre>
   </td><td>
diff --git a/VERSION.md b/VERSION.md
@@ -6,6 +6,7 @@ flexmark-java
 [TOC]: # " "
 
 - [To Do](#to-do)
+- [0.13.3](#0133)
 - [0.13.2](#0132)
 - [0.13.1](#0131)
 - [0.13.0](#0130)
@@ -116,6 +117,11 @@ flexmark-java
 
 &nbsp;</details>
 
+0.13.3
+------
+
+* Fix: #53, HTML to Markdown converter does handle pre wrapped text properly
+
 0.13.2
 ------
 
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.13.2</version>
+        <version>0.13.3</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.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-anchorlink</artifactId>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-jira-converter</artifactId>
-            <version>0.13.2</version>
+            <version>0.13.3</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.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-aside</artifactId>
diff --git a/flexmark-ext-autolink/pom.xml b/flexmark-ext-autolink/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-autolink</artifactId>
diff --git a/flexmark-ext-definition/pom.xml b/flexmark-ext-definition/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-definition</artifactId>
diff --git a/flexmark-ext-emoji/pom.xml b/flexmark-ext-emoji/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-emoji</artifactId>
diff --git a/flexmark-ext-escaped-character/pom.xml b/flexmark-ext-escaped-character/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-escaped-character</artifactId>
diff --git a/flexmark-ext-footnotes/pom.xml b/flexmark-ext-footnotes/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-footnotes</artifactId>
diff --git a/flexmark-ext-gfm-strikethrough/pom.xml b/flexmark-ext-gfm-strikethrough/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-gfm-strikethrough</artifactId>
diff --git a/flexmark-ext-gfm-tables/pom.xml b/flexmark-ext-gfm-tables/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-gfm-tables</artifactId>
diff --git a/flexmark-ext-gfm-tasklist/pom.xml b/flexmark-ext-gfm-tasklist/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-gfm-tasklist</artifactId>
diff --git a/flexmark-ext-ins/pom.xml b/flexmark-ext-ins/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-ins</artifactId>
diff --git a/flexmark-ext-jekyll-front-matter/pom.xml b/flexmark-ext-jekyll-front-matter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-jekyll-front-matter</artifactId>
diff --git a/flexmark-ext-jekyll-tag/pom.xml b/flexmark-ext-jekyll-tag/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-jekyll-tag</artifactId>
diff --git a/flexmark-ext-spec-example/pom.xml b/flexmark-ext-spec-example/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-spec-example</artifactId>
diff --git a/flexmark-ext-superscript/pom.xml b/flexmark-ext-superscript/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-superscript</artifactId>
diff --git a/flexmark-ext-tables/pom.xml b/flexmark-ext-tables/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-tables</artifactId>
diff --git a/flexmark-ext-toc/pom.xml b/flexmark-ext-toc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-toc</artifactId>
diff --git a/flexmark-ext-typographic/pom.xml b/flexmark-ext-typographic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-typographic</artifactId>
diff --git a/flexmark-ext-wikilink/pom.xml b/flexmark-ext-wikilink/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-wikilink</artifactId>
diff --git a/flexmark-ext-xwiki-macros/pom.xml b/flexmark-ext-xwiki-macros/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-xwiki-macros</artifactId>
diff --git a/flexmark-ext-yaml-front-matter/pom.xml b/flexmark-ext-yaml-front-matter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>flexmark-java</artifactId>
         <groupId>com.vladsch.flexmark</groupId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-yaml-front-matter</artifactId>
diff --git a/flexmark-ext-zzzzzz/pom.xml b/flexmark-ext-zzzzzz/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-ext-zzzzzz</artifactId>
diff --git a/flexmark-formatter/pom.xml b/flexmark-formatter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-formatter</artifactId>
diff --git a/flexmark-html-parser/pom.xml b/flexmark-html-parser/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
     </parent>
 
     <artifactId>flexmark-html-parser</artifactId>
diff --git a/flexmark-html-parser/src/main/java/com/vladsch/flexmark/convert/html/FlexmarkHtmlParser.java b/flexmark-html-parser/src/main/java/com/vladsch/flexmark/convert/html/FlexmarkHtmlParser.java
@@ -303,7 +303,11 @@ private String prepareText(String text) {
 
     private boolean processText(FormattingAppendable out, TextNode node) {
         skip();
-        out.append(prepareText(node.text()));
+        if (out.isPreFormatted()) {
+            out.append(prepareText(node.getWholeText()));
+        } else {
+            out.append(prepareText(node.text()));
+        }
         return true;
     }
 
@@ -442,10 +446,14 @@ private boolean processA(FormattingAppendable out, Element element) {
 
     private boolean processBr(FormattingAppendable out, Element element) {
         skip();
-        int options = out.getOptions();
-        out.setOptions(options & ~(FormattingAppendable.SUPPRESS_TRAILING_WHITESPACE | FormattingAppendable.COLLAPSE_WHITESPACE));
-        out.repeat(' ', 2).line();
-        out.setOptions(options);
+        if (out.isPreFormatted()) {
+            out.append('\n');
+        } else {
+            int options = out.getOptions();
+            out.setOptions(options & ~(FormattingAppendable.SUPPRESS_TRAILING_WHITESPACE | FormattingAppendable.COLLAPSE_WHITESPACE));
+            out.repeat(' ', 2).line();
+            out.setOptions(options);
+        }
         return true;
     }
 
@@ -657,17 +665,26 @@ private boolean processPre(FormattingAppendable out, Element element) {
         if (next != null && next.nodeName().equalsIgnoreCase("code")) {
             hadCode = true;
             Element code = (Element) next;
-            text = code.toString();
+            //text = code.toString();
+            FormattingAppendable preText = new FormattingAppendableImpl(out.getOptions() & ~(FormattingAppendable.COLLAPSE_WHITESPACE | FormattingAppendable.SUPPRESS_TRAILING_WHITESPACE));
+            preText.openPreFormatted(false);
+            processHtmlTree(preText, code);
+            preText.closePreFormatted();
+            text = preText.getText(2);
             skip(1);
             className = Utils.removeStart(code.className(), "language-");
         } else {
-            text = element.toString();
+            FormattingAppendable preText = new FormattingAppendableImpl(out.getOptions() & ~(FormattingAppendable.COLLAPSE_WHITESPACE | FormattingAppendable.SUPPRESS_TRAILING_WHITESPACE));
+            preText.openPreFormatted(false);
+            processHtmlTree(preText, element);
+            preText.closePreFormatted();
+            text = preText.getText(2);
         }
 
-        int start = text.indexOf('>');
-        int end = text.lastIndexOf('<');
-        text = text.substring(start + 1, end);
-        text = Escaping.unescapeHtml(text);
+        //int start = text.indexOf('>');
+        //int end = text.lastIndexOf('<');
+        //text = text.substring(start + 1, end);
+        //text = Escaping.unescapeHtml(text);
 
         int backTickCount = getMaxRepeatedChars(text, '`', 3);
         CharSequence backTicks = RepeatedCharSequence.of("`", backTickCount);
diff --git a/flexmark-html-parser/src/test/resources/flexmark_html_parser_spec.md b/flexmark-html-parser/src/test/resources/flexmark_html_parser_spec.md
diff --git a/flexmark-integration-test/pom.xml b/flexmark-integration-test/pom.xml
diff --git a/flexmark-jira-converter/pom.xml b/flexmark-jira-converter/pom.xml
diff --git a/flexmark-profile-pegdown/pom.xml b/flexmark-profile-pegdown/pom.xml
diff --git a/flexmark-test-util/pom.xml b/flexmark-test-util/pom.xml
diff --git a/flexmark-util/pom.xml b/flexmark-util/pom.xml
diff --git a/flexmark-youtrack-converter/pom.xml b/flexmark-youtrack-converter/pom.xml
diff --git a/flexmark/pom.xml b/flexmark/pom.xml
diff --git a/pom.xml b/pom.xml
