Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@

/bin-testOutput/
/openhtmltopdf_2021.txt

#IntelliJ IDEA files
.idea
*.iml
10 changes: 7 additions & 3 deletions src/main/java/org/docx4j/convert/in/xhtml/ListHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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..

Expand Down Expand Up @@ -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);

Expand Down
30 changes: 28 additions & 2 deletions src/test/java/org/docx4j/convert/in/xhtml/NumberingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
import org.junit.Ignore;
import org.junit.Test;


import static org.junit.Assert.assertEquals;

public class NumberingTest {

private WordprocessingMLPackage wordMLPackage;
Expand Down Expand Up @@ -475,7 +478,31 @@ 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);
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

Expand Down Expand Up @@ -929,7 +956,6 @@ public Numbering getNumbering() {

return numbering;
}



}