Added ignore some <br> in HTML parser.

- see #534
ObeoNetwork · Nov 5, 2024 · b0df89d · b0df89d
1 parent 554b53f
commit b0df89d
Show file tree

Hide file tree

Showing 10 changed files with 364 additions and 88 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
diff --git a/tests/org.obeonetwork.m2doc.html.tests/resources/html/br/br-expected-generation.OK.docx b/tests/org.obeonetwork.m2doc.html.tests/resources/html/br/br-expected-generation.OK.docx
diff --git a/tests/org.obeonetwork.m2doc.html.tests/resources/html/br/br-expected-generation.docx b/tests/org.obeonetwork.m2doc.html.tests/resources/html/br/br-expected-generation.docx
diff --git a/tests/org.obeonetwork.m2doc.html.tests/resources/html/br/doc.html b/tests/org.obeonetwork.m2doc.html.tests/resources/html/br/doc.html
@@ -2,9 +2,69 @@
 <head>
 </head>
 <body>
-<p>
-To break lines<br>in a text,<br>use the br element.
-</p>
+	To break lines<br>in a text,<br>use the br element.
+	<p>********************</p>
+	<br>
+	<p>********************</p>
+	<br>
+	<br>
+	<p>********************</p>
+	<br>
+	<br>
+	<br>
+	<p>********************</p>
+	A Line<br>
+	<p>********************</p>
+	<br>A Line
+	<p>********************</p>
+	<br>A Line<br>
+	<p>********************</p>
+	A Line<br>
+	<ul>
+		<li>Item1</li>
+		<li>Item2</li>
+		<li>Item3</li>
+	</ul>
+	<p>********************</p>
+	<p>
+		To break lines<br>in a text,<br>use the br element.
+	</p>
+	<p>********************</p>
+	<p style="background-color:Tomato;">
+		<br>
+	</p>
+	<p>********************</p>
+	<p style="background-color:Tomato;">
+		<br>
+		<br>
+	</p>
+	<p>********************</p>
+	<p style="background-color:Tomato;">
+		<br>
+		<br>
+		<br>
+	</p>
+	<p>********************</p>
+	<p style="background-color:Tomato;">
+		A Line<br>
+	</p>
+	<p>********************</p>
+	<p style="background-color:Tomato;">
+		<br>A Line
+	</p>
+	<p>********************</p>
+	<p style="background-color:Tomato;">
+		<br>A Line<br>
+	</p>
+	<p>********************</p>
+	<p style="background-color:Tomato;">
+		A Line<br>
+		<ul>
+			<li>Item1</li>
+			<li>Item2</li>
+			<li>Item3</li>
+		</ul>
+	</p>
 </body>
 </html>
 

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/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug486/bug486-expected-generation.docx b/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug486/bug486-expected-generation.docx
diff --git a/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug487/bug487-expected-generation.docx b/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug487/bug487-expected-generation.docx
diff --git a/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug499/bug499-expected-generation.docx b/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug499/bug499-expected-generation.docx
diff --git a/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug514/bug514-expected-generation.docx b/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug514/bug514-expected-generation.docx
diff --git a/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug515/bug515-expected-generation.docx b/...twork.m2doc.html.tests/resources/m2DocHtmlServices/bug515/bug515-expected-generation.docx