Fixed first space removal in M2DocHTMLParser.

ObeoNetwork · Dec 10, 2021 · a7f0529 · a7f0529
1 parent db5840c
commit a7f0529
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 2 deletions.
diff --git a/...s/org.obeonetwork.m2doc.html/src/org/obeonetwork/m2doc/html/services/M2DocHTMLParser.java b/...s/org.obeonetwork.m2doc.html/src/org/obeonetwork/m2doc/html/services/M2DocHTMLParser.java
@@ -588,7 +588,7 @@ private void insertText(MList parent, final Context context, TextNode node, bool
             final String textToInsert;
             if (needNewParagraph) {
                 createMParagraph(context, parent, null, null, null);
-                textToInsert = text.replaceFirst("\\s", "");
+                textToInsert = trimFirst(text);
             } else {
                 textToInsert = text;
             }
@@ -604,6 +604,30 @@ private void insertText(MList parent, final Context context, TextNode node, bool
         }
     }
 
+    /**
+     * Trims the begining of the given {@link String}.
+     * 
+     * @param text
+     *            the {@link String}
+     * @return the trimed {@link String}
+     */
+    private String trimFirst(String text) {
+        final String res;
+
+        if (text != null && !text.isEmpty()) {
+            int subStringStart = 0;
+            final int textLength = text.length();
+            while (subStringStart < textLength && Character.isWhitespace(text.charAt(subStringStart))) {
+                subStringStart++;
+            }
+            res = text.substring(subStringStart);
+        } else {
+            res = text;
+        }
+
+        return res;
+    }
+
     /**
      * Starts the given {@link Element}.
      * 
@@ -625,7 +649,7 @@ private MList startElement(MList parent, Context context, Element element) {
         } else if (BLOCKQUOTE_TAG.equals(nodeName)) {
             if (element.childNodeSize() > 0 && element.childNode(0) instanceof TextNode) {
                 TextNode textNode = (TextNode) element.childNode(0);
-                String newText = textNode.text().replaceFirst("\\s", "");
+                String newText = trimFirst(textNode.text());
                 textNode.text(newText);
                 if (!newText.isEmpty()) {
                     res = createMParagraph(context, parent, element, null, null);

diff --git a/...eonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2-expected-ast.txt b/...eonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2-expected-ast.txt
@@ -0,0 +1,11 @@
+
+=== HEADER ===
+
+=== BODY ===
+
+  A simple demonstration of a query :
+  [query: .fromHTMLURI('doc.html')]
+  End of demonstration.
+=== FOOTER ===
+
+=== TEMPLATES ===
diff --git a/.../bug449_1/bug449-expected-validation.docx → ...bug449_2-expected-generation-messages.txt b/.../bug449_1/bug449-expected-validation.docx → ...bug449_2-expected-generation-messages.txt
diff --git a/...k.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2-expected-generation.docx b/...k.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2-expected-generation.docx
diff --git a/...k.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2-expected-validation.docx b/...k.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2-expected-validation.docx
diff --git a/....obeonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2-template.docx b/....obeonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2-template.docx
diff --git a/tests/org.obeonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2.genconf b/tests/org.obeonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/bug449_2.genconf
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genconf:Generation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genconf="http://www.obeonetwork.org/m2doc/genconf/1.0" name="a" templateFileName="a-template.docx" resultFileName="a-actual-generation.docx" validationFileName="a-actual-validation.docx"/>
diff --git a/tests/org.obeonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/doc.html b/tests/org.obeonetwork.m2doc.html.tests/resources/m2DocHtmlServices/bug449_2/doc.html
@@ -0,0 +1,16 @@
+<html>
+<header>
+</header>
+<body>
+<p>Some text at the begin:<br/><blockquote>
+    <div><blockquote>
+        <div><ul>
+            <li>&lt;WOW&gt; and the text continue here,</li>
+            <li>&lt;WAW&gt; and a bit more here,</li>
+         </ul></div>
+      </blockquote></div>
+  </blockquote>Then it's time for &lt;THE&gt; last paragraph.</p>
+</body>
+</html>
+
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8"?>
		<genconf:Generation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genconf="http://www.obeonetwork.org/m2doc/genconf/1.0" name="a" templateFileName="a-template.docx" resultFileName="a-actual-generation.docx" validationFileName="a-actual-validation.docx"/>