diff --git a/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/doc/CfbReader.java b/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/doc/CfbReader.java index beb5266..886a739 100644 --- a/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/doc/CfbReader.java +++ b/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/doc/CfbReader.java @@ -68,6 +68,8 @@ final class CfbReader { private static final int SECTOR_SHIFT_V4 = 12; /** MiniSectorShift MUST быть 6 (64 Б) ([MS-CFB] §2.2). */ private static final int MINI_SECTOR_SHIFT_MUST = 6; + /** Mini Stream Cutoff MUST быть 0x1000 ([MS-CFB] §2.2). */ + private static final int MINI_STREAM_CUTOFF_MUST = 0x1000; private CfbReader() { } @@ -100,7 +102,7 @@ final class CfbReader { int miniSectorSize = 1 << miniSectorShift; long firstDir = u32(cfb, OFF_FIRST_DIR); long cutoff = u32(cfb, OFF_CUTOFF); - if (cutoff != 0x1000) { // §2.2: «MUST be set to 0x00001000» + if (cutoff != MINI_STREAM_CUTOFF_MUST) { // §2.2: «MUST be set to 0x00001000» throw new ConversionException("Неподдерживаемый Mini Stream Cutoff контейнера .doc"); } long firstMiniFat = u32(cfb, OFF_FIRST_MINI_FAT); diff --git a/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/TableIndentNormalizerTest.java b/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/TableIndentNormalizerTest.java index 58663bf..289aea4 100644 --- a/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/TableIndentNormalizerTest.java +++ b/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/TableIndentNormalizerTest.java @@ -61,6 +61,22 @@ class TableIndentNormalizerTest { assertTrue(fixed != null && fixed.contains("" + + "", GRID_6000)); + assertNull(TableIndentNormalizer.rewrite(xml)); + } + + /** tblInd без w:w — величина неизвестна, свёртку пропускаем. */ + @Test + void indentWithoutWidth_skipped() { + String xml = doc(table("" + + "", GRID_6000)); + assertNull(TableIndentNormalizer.rewrite(xml)); + } + /** right + tblInd 720: (9922−6000)+720 = 4642. */ @Test void rightWithIndent_rewritten() { diff --git a/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/ChpxIndexTest.java b/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/ChpxIndexTest.java index 659e773..ca4fcc7 100644 --- a/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/ChpxIndexTest.java +++ b/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/ChpxIndexTest.java @@ -62,6 +62,17 @@ class ChpxIndexTest { ex = assertThrows(ConversionException.class, () -> ChpxIndex.read(t, 0, t.length + 1, wd)); // за таблицей assertSame(ConversionException.class, ex.getClass()); + ex = assertThrows(ConversionException.class, + () -> ChpxIndex.read(t, -4, 12, wd)); // отрицательный fcBte + assertSame(ConversionException.class, ex.getClass()); + } + + /** fc раньше первого диапазона — свойства не найдены, граница = fcLimit. */ + @Test + void fcBeforeFirstRange_defaults() { + ChpxIndex idx = ChpxIndex.read(table(2), 0, 12, wordDocument(5, 3, GRPRL)); + assertArrayEquals(new byte[0], idx.grpprlFor(1024)); + assertEquals(999, idx.rangeEnd(1024, 999)); } @Test diff --git a/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/GrpprlTest.java b/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/GrpprlTest.java index d1d1cda..3a85536 100644 --- a/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/GrpprlTest.java +++ b/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/GrpprlTest.java @@ -135,9 +135,22 @@ class GrpprlTest { void underlineVal_mapping() { assertNull(Grpprl.underlineVal(0x00)); assertEquals("single", Grpprl.underlineVal(0x01)); + assertEquals("words", Grpprl.underlineVal(0x02)); assertEquals("double", Grpprl.underlineVal(0x03)); + assertEquals("dotted", Grpprl.underlineVal(0x04)); + assertEquals("thick", Grpprl.underlineVal(0x06)); + assertEquals("dash", Grpprl.underlineVal(0x07)); + assertEquals("dotDash", Grpprl.underlineVal(0x09)); + assertEquals("dotDotDash", Grpprl.underlineVal(0x0A)); assertEquals("wave", Grpprl.underlineVal(0x0B)); + assertEquals("dottedHeavy", Grpprl.underlineVal(0x14)); + assertEquals("dashedHeavy", Grpprl.underlineVal(0x17)); + assertEquals("dashDotHeavy", Grpprl.underlineVal(0x19)); + assertEquals("dashDotDotHeavy", Grpprl.underlineVal(0x1A)); + assertEquals("wavyHeavy", Grpprl.underlineVal(0x1B)); + assertEquals("dashLong", Grpprl.underlineVal(0x27)); assertEquals("wavyDouble", Grpprl.underlineVal(0x2B)); + assertEquals("dashLongHeavy", Grpprl.underlineVal(0x37)); assertEquals("single", Grpprl.underlineVal(0x77), "нераспознанный — single"); } diff --git a/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/PapxIndexTest.java b/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/PapxIndexTest.java index d2959d4..efb21d1 100644 --- a/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/PapxIndexTest.java +++ b/wordpdf-core/src/test/java/ru/pjandro/wordpdf/internal/doc/PapxIndexTest.java @@ -77,6 +77,19 @@ class PapxIndexTest { ex = assertThrows(ConversionException.class, () -> PapxIndex.read(t, 0, 13, wd)); assertSame(ConversionException.class, ex.getClass()); + ex = assertThrows(ConversionException.class, + () -> PapxIndex.read(t, -4, 12, wd)); // отрицательный fcBte + assertSame(ConversionException.class, ex.getClass()); + } + + /** Вырожденный rgfc (конец ≤ начало, §2.4.6.1) — запись пропускается. */ + @Test + void degenerateRgfc_skipped() { + byte[] wd = wordDocument(11, false, 3, GRPRL_PB); + put32(wd, 2 * 512 + 4, 2048); // rgfc[1] = rgfc[0] + PapxIndex idx = PapxIndex.read(table(2), 0, 12, wd); + assertArrayEquals(new byte[0], idx.grpprlFor(2048)); + assertEquals(0, idx.countPageBreakBefore()); } @Test