From 88bb2906aa097efc359d5ff5d0061871ded1eece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gra=C3=9Fl?= Date: Fri, 30 Oct 2026 17:32:21 +0100 Subject: [PATCH 1/4] The pins move with the releases --- composer.json | 8 ++++---- composer.lock | 34 ++++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 9b904ed..6c38b17 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "ext-zip": "*", "league/commonmark": "^2.10", "markdown-office/commonmark-generic-directives": "0.3.1", - "markdown-office/markdown-word": "0.3.0", - "markdown-office/markdown-presentation": "0.3.0" + "markdown-office/markdown-word": "0.3.1", + "markdown-office/markdown-presentation": "0.3.1" }, "repositories": [ { @@ -37,7 +37,7 @@ "options": { "symlink": true, "versions": { - "markdown-office/markdown-word": "0.3.0" + "markdown-office/markdown-word": "0.3.1" } } }, @@ -47,7 +47,7 @@ "options": { "symlink": true, "versions": { - "markdown-office/markdown-presentation": "0.3.0" + "markdown-office/markdown-presentation": "0.3.1" } } } diff --git a/composer.lock b/composer.lock index 1034750..fad3d79 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f02be1a581d0a05697fef81b470d57b1", + "content-hash": "adb5e3086be1ecc28f97f00dcdab3ed0", "packages": [ { "name": "composer/pcre", @@ -736,11 +736,11 @@ }, { "name": "markdown-office/markdown-presentation", - "version": "0.3.0", + "version": "0.3.1", "dist": { "type": "path", "url": "../markdown-presentation", - "reference": "18a7004a5d7f364047dd3659e6edf5af5bbbeb0e" + "reference": "f15fa69c0d9671581d8cb5bd31747db15b99557c" }, "require": { "cweagans/composer-patches": "^2.0", @@ -765,9 +765,9 @@ "patches": { "phpoffice/phppresentation": [ { - "description": "PHPPresentation 1.2.0 brought up to upstream's master, with the fixes that give a picture the path, the bytes and the name it was read from, and that find the folder of a part of a package with the slashes of the package", - "url": "https://raw.githubusercontent.com/markdown-office/PHPPresentation/9aa3f4624f1cab54fc5d275397c2fc59cf6f276d/patches/phpoffice-phppresentation-1.2.0-to-master.patch", - "sha256": "0b8f7c150f7ba5d12671fb9e211c9f1a4db549d7609239f49c0cea707a190551" + "description": "PHPPresentation 1.2.0 brought up to upstream's master, with the fixes that give a picture the path, the bytes and the name it was read from, that find the folder of a part of a package with the slashes of the package, and that write a chart series in the order the schema names it", + "url": "https://raw.githubusercontent.com/markdown-office/PHPPresentation/92c2c64ca20a6b3febf6512e892b21a3c0ae4b56/patches/phpoffice-phppresentation-1.2.0-to-master.patch", + "sha256": "67ce1a44e76e4dc23639fefee365ec811ef7a763331343bde468ae781bf5427a" } ] } @@ -789,6 +789,9 @@ "test:unit": [ "pest --testsuite=unit" ], + "test:conformance": [ + "pest --testsuite=conformance" + ], "test:readme": [ "pest --testsuite=readme" ], @@ -832,13 +835,14 @@ }, { "name": "markdown-office/markdown-word", - "version": "0.3.0", + "version": "0.3.1", "dist": { "type": "path", "url": "../markdown-word", - "reference": "4ce60b53dbc253b3b5f1af1e7b2b39b240b370ee" + "reference": "dc130b733bf446863d9bd2398911e5b718e34007" }, "require": { + "cweagans/composer-patches": "^2.0", "ext-dom": "*", "ext-gd": "*", "ext-mbstring": "*", @@ -856,6 +860,17 @@ "ext-imagick": "Embeds SVG as a vector. Word holds an SVG only beside a raster of it, so something has to draw the raster; without this an SVG raises instead of going in." }, "type": "library", + "extra": { + "patches": { + "phpoffice/phpword": [ + { + "description": "PHPWord 1.4.0 writes the children of `w:rPr`, of `w:pPr`, of `w:tblPr`, of `w:sectPr` and of `w:style` in an order of its own, and writes a few elements the format does not allow there. The patch puts them where ECMA-376 names them.", + "url": "https://raw.githubusercontent.com/markdown-office/PHPWord/051ec089fd5f90c55d3b2f5075073337706a0bfc/patches/phpoffice-phpword-1.4.0-ooxml.patch", + "sha256": "e72862a34778f5c1e6e85ea7b006c0e297a1c178c9fa30afb1a4c27320ef2f3c" + } + ] + } + }, "autoload": { "psr-4": { "MarkdownWord\\": "src/" @@ -882,6 +897,9 @@ "test:readme": [ "pest --testsuite=readme" ], + "test:ooxml": [ + "pest --testsuite=ooxml" + ], "test:coverage": [ "pest --coverage --min=91 --coverage-clover=build/coverage/clover.xml --coverage-html=build/coverage/html" ], From 52babdfe144e8d1baf6f425a39b6cf232ad55c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gra=C3=9Fl?= Date: Fri, 30 Oct 2026 19:45:49 +0100 Subject: [PATCH 2/4] The transcript moves with the releases --- content/command-line/basic.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/command-line/basic.md b/content/command-line/basic.md index 0854892..da41944 100644 --- a/content/command-line/basic.md +++ b/content/command-line/basic.md @@ -181,8 +181,8 @@ An installed copy answers with its own version and the two libraries it holds: ```bash $ mdoffice --version mdoffice 0.1.2 - markdown-office/markdown-word v0.3.0 - markdown-office/markdown-presentation v0.3.0 + markdown-office/markdown-word v0.3.1 + markdown-office/markdown-presentation v0.3.1 ``` The tool versions itself separately from the libraries it holds, because it is neither of them: a @@ -195,5 +195,5 @@ answers with the branch it resolved rather than with a release, because that is ```bash $ mdoffice word --version -mdoffice word v0.3.0 +mdoffice word v0.3.1 ``` From 51bb2b9ca7fa9cc13d25bfdf4f76cc8e090cb4d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gra=C3=9Fl?= Date: Fri, 30 Oct 2026 22:38:22 +0100 Subject: [PATCH 3/4] The lock file names the patch the libraries carry --- composer.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.lock b/composer.lock index fad3d79..c90109e 100644 --- a/composer.lock +++ b/composer.lock @@ -765,9 +765,9 @@ "patches": { "phpoffice/phppresentation": [ { - "description": "PHPPresentation 1.2.0 brought up to upstream's master, with the fixes that give a picture the path, the bytes and the name it was read from, that find the folder of a part of a package with the slashes of the package, and that write a chart series in the order the schema names it", - "url": "https://raw.githubusercontent.com/markdown-office/PHPPresentation/92c2c64ca20a6b3febf6512e892b21a3c0ae4b56/patches/phpoffice-phppresentation-1.2.0-to-master.patch", - "sha256": "67ce1a44e76e4dc23639fefee365ec811ef7a763331343bde468ae781bf5427a" + "description": "PHPPresentation 1.2.0 brought up to upstream's master, with the fixes that give a picture the path, the bytes and the name it was read from, that find the folder of a part of a package with the slashes of the package, that write a chart series in the order the schema names it, that write the data points of a series and the fill of the series itself, and that give a category axis a tick label skip of its own", + "url": "https://raw.githubusercontent.com/markdown-office/PHPPresentation/605bc7c9724ac4a0781cc1692ff7ae279a33bb8a/patches/phpoffice-phppresentation-1.2.0-to-master.patch", + "sha256": "46862cef4470ae8e755a03f1f8afd94c7e772cc1ee4ab0a39441c2cb392d5146" } ] } From 0dca1b3cc684897b256e2b179310cb31fe3410e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gra=C3=9Fl?= Date: Fri, 30 Oct 2026 22:46:11 +0100 Subject: [PATCH 4/4] The lock file names the patch the libraries carry, and the version the patch was made against --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index c90109e..00df4fd 100644 --- a/composer.lock +++ b/composer.lock @@ -740,7 +740,7 @@ "dist": { "type": "path", "url": "../markdown-presentation", - "reference": "f15fa69c0d9671581d8cb5bd31747db15b99557c" + "reference": "ea0926185c80eef6305eebb75ca2a762bbe3a00c" }, "require": { "cweagans/composer-patches": "^2.0", @@ -839,7 +839,7 @@ "dist": { "type": "path", "url": "../markdown-word", - "reference": "dc130b733bf446863d9bd2398911e5b718e34007" + "reference": "9a0c7ab08a66c89cc70ba4cf6788cff328027e71" }, "require": { "cweagans/composer-patches": "^2.0", @@ -850,7 +850,7 @@ "league/commonmark": "^2.10", "markdown-office/commonmark-generic-directives": "^0.3.0", "php": "^8.2", - "phpoffice/phpword": "^1.4", + "phpoffice/phpword": "~1.4.0", "symfony/yaml": "^7.4 || ^8.1" }, "require-dev": { @@ -864,9 +864,9 @@ "patches": { "phpoffice/phpword": [ { - "description": "PHPWord 1.4.0 writes the children of `w:rPr`, of `w:pPr`, of `w:tblPr`, of `w:sectPr` and of `w:style` in an order of its own, and writes a few elements the format does not allow there. The patch puts them where ECMA-376 names them.", - "url": "https://raw.githubusercontent.com/markdown-office/PHPWord/051ec089fd5f90c55d3b2f5075073337706a0bfc/patches/phpoffice-phpword-1.4.0-ooxml.patch", - "sha256": "e72862a34778f5c1e6e85ea7b006c0e297a1c178c9fa30afb1a4c27320ef2f3c" + "description": "PHPWord 1.4.0 writes the children of `w:rPr`, of `w:pPr`, of `w:tblPr`, of `w:sectPr` and of `w:style` in an order of its own, and writes a few elements the format does not allow there. The patch puts them where ECMA-376 names them. The version is held to the 1.4 line rather than the 1 series: the patch is against 1.4.0, and a later release of the line would carry a different writer.", + "url": "https://raw.githubusercontent.com/markdown-office/PHPWord/62f68049d287e5a52575f2ae694c2e76f4a2002a/patches/phpoffice-phpword-1.4.0-ooxml.patch", + "sha256": "193163898e7690b6eaf51086d415809616b7e25ec4090b58ce7966f66ae1203a" } ] }