Support for li/@value override.

Author: naimdjon

.gitignore

@@ -5,3 +5,7 @@
 
 /bin-testOutput/
 /openhtmltopdf_2021.txt
+
+#IntelliJ IDEA files
+.idea
+*.iml

src/main/java/org/docx4j/convert/in/xhtml/ListHelper.java

@@ -72,6 +72,9 @@
 import org.w3c.dom.css.CSSPrimitiveValue;
 import org.w3c.dom.css.CSSValue;
 
+
+import static org.docx4j.com.google.common.base.Strings.isNullOrEmpty;
+
 public class ListHelper {
 
 	public static Logger log = LoggerFactory.getLogger(ListHelper.class);
@@ -548,10 +551,11 @@ void addNumbering(P p, Element e, Map<String, PropertyValue> cssMap) {
 
 			NumberFormat specified = getNumberFormatFromCSSListStyleType(
 					cssMap.get("list-style-type" ).getCssText());
-			
+			final String valueAttribute = e.getAttribute("value");
 			if (peekListItemStateStack().isFirstItem // and level already exists,
 					|| numfmtExisting ==null
-					|| numfmtExisting.getVal()!=specified  ) {
+					|| numfmtExisting.getVal()!=specified
+					|| !isNullOrEmpty(valueAttribute)) {
 
 				// can't re-use..
 
@@ -600,7 +604,7 @@ void addNumbering(P p, Element e, Map<String, PropertyValue> cssMap) {
 				int ilvl = lvl.getIlvl().intValue();
 				log.debug("concrete list points at abstract " + getConcreteList().getAbstractNumId().getVal().longValue());
 				long newNumId = ndp.restart(getConcreteList().getNumId().longValue(), ilvl,
-			    		/* restart at */ 1);
+			    		/* restart at */ isNullOrEmpty(valueAttribute)?1:Integer.parseInt(valueAttribute));
 				// retrieve it
 				ListNumberingDefinition listDef = ndp.getInstanceListDefinitions().get(""+newNumId);
 

src/test/java/org/docx4j/convert/in/xhtml/NumberingTest.java

@@ -58,6 +58,9 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+
+import static org.junit.Assert.assertEquals;
+
 public class NumberingTest {
 
 	private WordprocessingMLPackage wordMLPackage;
@@ -475,7 +478,32 @@ public void testUnorderedCssOnLiToIndent() throws Docx4JException {
     	assertTrue( p.getPPr().getInd()==null);
 
 	}
-	
+
+	@Test public void testListItemValueOverridden() throws Docx4JException {
+		this.addNumberingPart(wordMLPackage.getMainDocumentPart());
+		this.addStylesPart(wordMLPackage.getMainDocumentPart());
+		String xhtml= "<div>" +
+				"<ol>"
+				+"<li>Item 1</li>"
+				+"<li value=\"1\">Second item with 1 as number</li>"
+				+"<li>Item 2</li>"
+				+"<li value=\"2\">Second item with 2 as number</li>"
+				+"</ol>"+
+				"</div>";
+		List<Object> results = convert( xhtml, FormattingOption.CLASS_PLUS_OTHER);
+		wordMLPackage.getMainDocumentPart().getContent().addAll(results);
+		System.out.println(XmlUtils.marshaltoString(wordMLPackage.getMainDocumentPart().getJaxbElement(), true, true));
+		final P item1 = (P) results.get(0);
+		final P secondItem1 = (P) results.get(1);
+		final P item2 = (P) results.get(2);
+		final P secondItem2 = (P) results.get(3);
+		assertEquals(BigInteger.valueOf(2L),item1.getPPr().getNumPr().getNumId().getVal());
+		assertEquals(BigInteger.valueOf(3L),secondItem1.getPPr().getNumPr().getNumId().getVal());
+		assertEquals(BigInteger.valueOf(3L),item2.getPPr().getNumPr().getNumId().getVal());
+		assertEquals(BigInteger.valueOf(4L),secondItem2.getPPr().getNumPr().getNumId().getVal());
+	}
+
+
 	// ===============================================================================
 	// machinery / helpers
 
@@ -929,7 +957,6 @@ public Numbering getNumbering() {
 
 		return numbering;
 		}	
-	
 
 
 }