lines = applyItemLineGap(para);
if (numId != null) {
para.setNumID(numId);
para.setNumILvl(BigInteger.valueOf(depth));
indentListItemInside(para, depth, numId);
+ if (depth == 0 && prefixColumns.contains(numId)) {
+ measureTheItemAtWordsSize(para, style, lines, measuredColumns.get(numId));
+ }
}
XWPFRun run = para.createRun();
applyStyle(run, style);
@@ -3014,6 +3068,53 @@ private void writeListLine(XWPFDocument document, DocumentTextStyle style,
styleTheMark(para, style);
}
+ /**
+ * Sets a list item's lines in a measure as much wider or narrower than the page's as Word
+ * sets its text, as {@link #measureAtWordsSize} does a paragraph's.
+ *
+ * An item in the page's prefix column has exactly the page's measure, and Word sets a
+ * size the page gives to the tenth at the half point: measured in that column alone,
+ * {@code TerracottaRail}'s 8.6pt items, set at 8.5, took onto a line a word the page breaks
+ * onto the next, and everything under them stood 11.5pt high. Held a point short, as a
+ * paragraph's is, and never short of
+ * its widest line as Word sets it and a point more, which would take a word off a line the
+ * page fills to the point; an item of one line broke no word, and is given room and never
+ * narrowed, and so is one whose lines are not known.
+ *
+ * @param lines the lines the page set the item in, or {@code null} unknown
+ * @param column the item's column, in twips
+ */
+ private void measureTheItemAtWordsSize(XWPFParagraph para, DocumentTextStyle style,
+ List lines,
+ long column) {
+ double room = availableWidth() - column / POINT_TO_TWIP;
+ if (style == null || !(style.size() > 0) || !Double.isFinite(room) || !(room > 0)) {
+ return;
+ }
+ double share = wordsSize(style.size()) / style.size();
+ if (Math.abs(share - 1) < 1e-9) {
+ return;
+ }
+ // Each line as Word sets it, from the column: the page's line holds the prefix the
+ // column stands for, the marker and its space or the spaces covering them.
+ double fits = 0;
+ for (com.demcha.compose.document.layout.payloads.ParagraphLine line : lines == null ? List.of() : lines) {
+ fits = Math.max(fits, widthAtWordsSize(line) - column / POINT_TO_TWIP);
+ }
+ double more = lines == null || lines.size() <= 1
+ ? Math.max(0, Math.max(room * (share - 1), fits * (1 + ONE_LINE_FACE_SLACK) - room))
+ : Math.max(room * (share - 1) - WORDS_MEASURE_CLEARANCE, fits + WORDS_MEASURE_CLEARANCE - room);
+ if (Math.abs(more) < 0.05) {
+ return;
+ }
+ CTPPr properties = para.getCTP().isSetPPr() ? para.getCTP().getPPr() : para.getCTP().addNewPPr();
+ // The right side alone: Word and LibreOffice take each side of w:ind on its own, so the
+ // item keeps its level's column and follows the level when an editor changes it.
+ CTInd indent = properties.isSetInd() ? properties.getInd() : properties.addNewInd();
+ long right = twipsOf(indent.isSetRight() ? indent.getRight() : null);
+ indent.setRight(BigInteger.valueOf(right - Math.round(more * POINT_TO_TWIP)));
+ }
+
/**
* Keeps a numbered item's own indent when it sits inside a padded container.
*
diff --git a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxHangingLeftTest.java b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxHangingLeftTest.java
index f65acbbe7..ecac824ff 100644
--- a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxHangingLeftTest.java
+++ b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxHangingLeftTest.java
@@ -117,7 +117,8 @@ void aListInACellOfAHangingRowMovesLeftWithTheTextBesideIt() throws Exception {
assertThat(firstColumn + title / 20.0).as("the title where the page starts it, less the hang")
.isCloseTo(DASH + TITLE_PADDING - HANG, offset(0.1));
- assertThat(item - title).as("the level's own indent, and nothing else between them").isEqualTo(180L);
+ assertThat(item - title).as("the level's own indent, and nothing else between them")
+ .isEqualTo(DocxListLevels.column(document));
}
}
diff --git a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListHangingIndentTest.java b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListHangingIndentTest.java
index 8ff5ab046..4cec09e9b 100644
--- a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListHangingIndentTest.java
+++ b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListHangingIndentTest.java
@@ -169,7 +169,10 @@ void theFlagChangesTheLevelsColumnAndNothingOnTheParagraph() throws Exception {
assertThat(properties.isSetTabs()).as("no tab stops").isFalse();
assertThat(paragraph.getRuns()).as("one run, as before").hasSize(1);
}
- assertThat(indentsOf(without)).as("the stated column").containsExactly(180, 180);
+ List prefix = indentsOf(without);
+ assertThat(prefix.get(0)).as("the page's prefix of spaces, the marker a space ahead")
+ .isEqualTo(prefix.get(1)).isNotEqualTo(180);
+ assertThat(DocxListLevels.markerFollowedByASpace(without)).isTrue();
List measured = indentsOf(withFlag);
assertThat(measured.get(0)).as("the column the layout set the bullet in, the 16pt gap and the bullet")
.isEqualTo(measured.get(1)).isGreaterThan(16 * 20);
diff --git a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListLevels.java b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListLevels.java
new file mode 100644
index 000000000..ab75fd5a9
--- /dev/null
+++ b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListLevels.java
@@ -0,0 +1,42 @@
+package com.demcha.compose.document.backend.semantic.docx;
+
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLvl;
+
+import java.math.BigInteger;
+
+/**
+ * Reads a list definition's top level back from an exported document: the first one written,
+ * which is the first list the export made a Word list.
+ */
+final class DocxListLevels {
+
+ private DocxListLevels() {
+ }
+
+ /** The top level of the document's first list definition. */
+ static CTLvl levelZero(XWPFDocument document) {
+ return document.getNumbering().getAbstractNum(BigInteger.ZERO).getAbstractNum().getLvlArray(0);
+ }
+
+ /** The column the document's first list sets its top level in, its left indent, in twips. */
+ static long column(XWPFDocument document) {
+ return DocxTwips.of(levelZero(document).getPPr().getInd().getLeft());
+ }
+
+ /** Whether the document's first list follows its top level's marker with a space, not a tab. */
+ static boolean markerFollowedByASpace(XWPFDocument document) {
+ try (org.apache.xmlbeans.XmlCursor cursor = levelZero(document).newCursor()) {
+ if (!cursor.toFirstChild()) {
+ return false;
+ }
+ do {
+ if ("suff".equals(cursor.getName().getLocalPart())) {
+ return "space".equals(cursor.getAttributeText(new javax.xml.namespace.QName(
+ "http://schemas.openxmlformats.org/wordprocessingml/2006/main", "val")));
+ }
+ } while (cursor.toNextSibling());
+ return false;
+ }
+ }
+}
diff --git a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListMarkerGapTest.java b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListMarkerGapTest.java
index 0caab904e..bff5cdb41 100644
--- a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListMarkerGapTest.java
+++ b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListMarkerGapTest.java
@@ -54,8 +54,11 @@ void aWordListOfATextMarkerTakesTheColumnTheLayoutSetsIt() throws Exception {
assertThat(column[0]).as("the column, as wide as it hangs").isEqualTo(column[1]);
assertThat(column[0]).as("the bullet's width and the gap").isGreaterThan(Math.round(GAP * 20));
- assertThat(levelZero(stated)).as("a list the layout set no column for keeps the stated one")
- .containsExactly(180, 180);
+ long[] prefix = levelZero(stated);
+ assertThat(prefix[0]).as("a list without the flag takes the page's prefix of spaces")
+ .isEqualTo(prefix[1]).isNotEqualTo(column[0]).isNotEqualTo(180);
+ assertThat(DocxListLevels.markerFollowedByASpace(stated)).as("its marker a space ahead").isTrue();
+ assertThat(DocxListLevels.markerFollowedByASpace(wide)).as("a column's marker a tab ahead").isFalse();
}
}
diff --git a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListNumberingTest.java b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListNumberingTest.java
index 63a416deb..1b378bc17 100644
--- a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListNumberingTest.java
+++ b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxListNumberingTest.java
@@ -255,8 +255,8 @@ void aListsOwnSidesHoldItsItemsIn() throws Exception {
var indent = item.getCTP().getPPr().getInd();
assertThat(DocxTwips.of(indent.getLeft())).as("the margin, then the level's own indent")
- .isEqualTo(30 * 20L + 180);
- assertThat(DocxTwips.of(indent.getHanging())).isEqualTo(180L);
+ .isEqualTo(30 * 20L + DocxListLevels.column(document));
+ assertThat(DocxTwips.of(indent.getHanging())).isEqualTo(DocxListLevels.column(document));
assertThat(DocxTwips.of(indent.getRight())).isEqualTo(20 * 20L);
}
}
@@ -300,7 +300,85 @@ void aListInACellKeepsAllOfItsLeftMargin() throws Exception {
.filter(p -> p.getText().equals("alpha"))
.findFirst().orElseThrow();
- assertThat(DocxTwips.of(item.getCTP().getPPr().getInd().getLeft())).isEqualTo(30 * 20L + 180);
+ assertThat(DocxTwips.of(item.getCTP().getPPr().getInd().getLeft()))
+ .isEqualTo(30 * 20L + DocxListLevels.column(document));
+ }
+ }
+
+ @Test
+ void aListWithoutTheFlagWrapsItsItemsWhereThePageDoes() throws Exception {
+ // The page sets the marker, a space and the text, and every wrapped line after the
+ // spaces covering the marker: ModernInvoice's notes wrapped at a stated 9pt in Word,
+ // 2.7pt left of the page's.
+ long[] columns = new long[2];
+ for (int i = 0; i < 2; i++) {
+ DocumentTextStyle style = DocumentTextStyle.DEFAULT.withSize(i == 0 ? 10 : 20);
+ try (XWPFDocument document = export(flow -> flow.addList(list -> list.bullet().textStyle(style)
+ .items("Alpha", "Beta")))) {
+ var level = DocxListLevels.levelZero(document);
+ columns[i] = DocxListLevels.column(document);
+
+ assertThat(DocxTwips.of(level.getPPr().getInd().getHanging())).as("hung as far as it starts")
+ .isEqualTo(columns[i]);
+ assertThat(DocxListLevels.markerFollowedByASpace(document)).as("the marker a space ahead").isTrue();
+ assertThat(level.getRPr().getSzArray(0).getVal().toString())
+ .as("the marker and its space in the list's size").isEqualTo(String.valueOf(i == 0 ? 20 : 40));
+ }
+ }
+ assertThat(columns[1]).as("spaces twice the size, twice as wide").isCloseTo(2 * columns[0],
+ org.assertj.core.data.Offset.offset(2L));
+ assertThat(columns[0]).as("not the stated 9pt").isNotEqualTo(180L);
+ }
+
+ @Test
+ void aListThatNestsKeepsTheStatedColumnsWithoutTheFlag() throws Exception {
+ // A nested level's prefix is not measured: kept stated, a top level at the page's would
+ // stand right of the text of the items under it.
+ try (XWPFDocument document = export(flow -> flow.add(nested(2)))) {
+ assertThat(DocxListLevels.column(document)).isEqualTo(180L);
+ assertThat(DocxListLevels.markerFollowedByASpace(document)).isFalse();
+ }
+ // A tree of leaves is laid out flattened too, its marker in its text, no prefix before
+ // a wrapped line.
+ try (XWPFDocument document = export(flow -> flow.addList(list -> list.bullet()
+ .addItem("Leaf", leaf -> { }).addItem("Another", leaf -> { })))) {
+ assertThat(DocxListLevels.column(document)).isEqualTo(180L);
+ assertThat(DocxListLevels.markerFollowedByASpace(document)).isFalse();
+ }
+ }
+
+ @Test
+ void anItemInThePagesPrefixColumnIsMeasuredAtWordsSize() throws Exception {
+ // In the page's column alone, TerracottaRail's 8.6pt items, set at 8.5, took onto a line a
+ // word the page breaks onto the next. Narrowed as much as Word sets them narrower, and a
+ // point; widened where Word sets them wider; an item of one line is never narrowed. Only
+ // the right side is the item's own: its column stays the level's.
+ String wrapping = "Coordinated with contractors and consultants to maintain programme, budget and design "
+ + "intent across every stage of the work, from the first sketch to the last handover.";
+ for (double size : new double[] {8.6, 8.4}) {
+ try (XWPFDocument document = export(flow -> flow.addList(list -> list.bullet()
+ .textStyle(DocumentTextStyle.DEFAULT.withSize(size)).items(wrapping, "One line")))) {
+ List items = items(document);
+ double room = 523 - DocxListLevels.column(document) / 20.0;
+ double proportional = -(room * (8.5 / size - 1) - 1);
+ var long_ = items.get(0).getCTP().getPPr().getInd();
+ var short_ = items.get(1).getCTP().getPPr().getInd();
+ double right = DocxTwips.of(long_.getRight()) / 20.0;
+
+ assertThat(long_.isSetLeft() || long_.isSetHanging() || long_.isSetFirstLine())
+ .as("no column of its own at %spt, so it follows its level", size).isFalse();
+ if (size < 8.5) {
+ assertThat(right).as("widened at least as Word sets it wider, less a point")
+ .isLessThanOrEqualTo(proportional + 0.05);
+ } else {
+ // Its widest line fills its measure to within the point held short: narrowed
+ // in proportion, that line would lose its last word in Word.
+ assertThat(right).as("narrowed, but not past its widest line and a point")
+ .isPositive().isLessThan(proportional - 1);
+ }
+ assertThat(short_ == null || !short_.isSetRight() || DocxTwips.of(short_.getRight()) <= 0)
+ .as("the item of one line at %spt is not narrowed", size).isTrue();
+ }
}
}
diff --git a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxPanelInsetTest.java b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxPanelInsetTest.java
index b55f17a93..75954497d 100644
--- a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxPanelInsetTest.java
+++ b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxPanelInsetTest.java
@@ -98,8 +98,8 @@ void aListInAPaddedSectionKeepsItsHangingIndent() throws Exception {
assertThat(DocxTwips.of(properties.getInd().getLeft()))
.as("the section's inset plus the level's own indent")
- .isEqualTo(14 * 20L + 180L);
- assertThat(DocxTwips.of(properties.getInd().getHanging())).isEqualTo(180L);
+ .isEqualTo(14 * 20L + DocxListLevels.column(document));
+ assertThat(DocxTwips.of(properties.getInd().getHanging())).isEqualTo(DocxListLevels.column(document));
}
}
diff --git a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxParagraphSidesTest.java b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxParagraphSidesTest.java
index 6ff752d52..c3c425c6e 100644
--- a/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxParagraphSidesTest.java
+++ b/render-docx/src/test/java/com/demcha/compose/document/backend/semantic/docx/DocxParagraphSidesTest.java
@@ -135,7 +135,8 @@ void aListIsHeldInByAllOfItsLeftSideInACellAndOnALayer() throws Exception {
assertThat(indent).as("the item carries the padding past its level, layered %s", layered).isNotNull();
assertThat(DocxTwips.of(indent.getLeft()))
- .as("the level's 9pt and all 10pt of the padding, layered %s", layered).isEqualTo(180 + 200);
+ .as("the level's column and all 10pt of the padding, layered %s", layered)
+ .isEqualTo(DocxListLevels.column(document) + 200);
assertThat(DocxTwips.of(indent.getRight()))
.as("30pt, less the editor's 2pt in a cell, layered %s", layered)
.isEqualTo(layered ? 30 * 20L : 28 * 20L);