[DOC-CVS] [doc-en] master: wkhtmltox: Remove invalid XML files in favor of XIncludes.
[email protected] (Jakub Vrána via GitHub) Wed, 13 May 2026 18:02:06 +0000
| Newsgroups | php.doc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Jakub Vrána (vrana)
Committer: GitHub (web-flow)
Pusher: jordikroon
Date: 2026-05-13T20:02:03+02:00
Commit: https://github.com/php/doc-en/commit/71e7f31df31da40b847201a1585836d2c72014b8
Raw diff: https://github.com/php/doc-en/commit/71e7f31df31da40b847201a1585836d2c72014b8.diff
wkhtmltox: Remove invalid XML files in favor of XIncludes.
Changed paths:
D reference/wkhtmltox/wkhtmltox/bits/.xmlfragmentdir
D reference/wkhtmltox/wkhtmltox/bits/load.xml
D reference/wkhtmltox/wkhtmltox/bits/web.xml
M reference/wkhtmltox/wkhtmltox/image/converter/construct.xml
M reference/wkhtmltox/wkhtmltox/pdf/object/construct.xml
Diff:
diff --git a/reference/wkhtmltox/wkhtmltox/bits/.xmlfragmentdir b/reference/wkhtmltox/wkhtmltox/bits/.xmlfragmentdir
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/reference/wkhtmltox/wkhtmltox/bits/load.xml b/reference/wkhtmltox/wkhtmltox/bits/load.xml
deleted file mode 100644
index 807306914c98..000000000000
--- a/reference/wkhtmltox/wkhtmltox/bits/load.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<row>
- <entry>load.username</entry>
- <entry>user name to use when loging into a website</entry>
- <entry>bart</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.password</entry>
- <entry>the password to used when logging into a website</entry>
- <entry>elbarto</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.jsdelay</entry>
- <entry>the amount of time in milliseconds to wait after a page is loaded until it is captured</entry>
- <entry>1200</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.zoomFactor</entry>
- <entry>how much zoom should be applied to the content</entry>
- <entry>2.2</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.customHeaders</entry>
- <entry>custom headers to send when requesting the main web page</entry>
- <entry></entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.repertCustomHeaders</entry>
- <entry>set true to send with all requests</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.cookies</entry>
- <entry>cookie string to send when requesting the main web page</entry>
- <entry></entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.post</entry>
- <entry>post string to send when requesting the main web page</entry>
- <entry></entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.blockLocalFileAccess</entry>
- <entry>disallow local and piped files to access other local files</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.stopSlowScript</entry>
- <entry>stop slow running javascript</entry>
- <entry>boolean</entry>
- <entry></entry>
-</row>
-<row>
- <entry>load.debugJavascript</entry>
- <entry>allow javascript to raise warnings</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.loadErrorHandling</entry>
- <entry>set error handling strategy</entry>
- <entry>
- <table>
- <title></title>
- <tgroup cols="2">
- <tbody>
- <row>
- <entry>abort</entry>
- <entry>abort the convertion process</entry>
- </row>
- <row>
- <entry>skip</entry>
- <entry>do not add the object to the final output</entry>
- </row>
- <row>
- <entry>ignore</entry>
- <entry>try to add the object to the final output</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>load.proxy</entry>
- <entry></entry>
- <entry></entry>
- <entry>>= 0.1.0</entry>
-</row>
diff --git a/reference/wkhtmltox/wkhtmltox/bits/web.xml b/reference/wkhtmltox/wkhtmltox/bits/web.xml
deleted file mode 100644
index 427bf971ce95..000000000000
--- a/reference/wkhtmltox/wkhtmltox/bits/web.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<row>
- <entry>web.background</entry>
- <entry>include background image in output</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>web.loadImages</entry>
- <entry>include images in output</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>web.enableJavascript</entry>
- <entry>enable or disable javascript</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>web.enableIntelligentShrinking</entry>
- <entry>enable to attempt to fit more content on page, only applies to PDF output</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>web.minimumFontSize</entry>
- <entry>the minimum font size allowed</entry>
- <entry>9</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>web.printMediaType</entry>
- <entry>print content using print media type instead of screen media type</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>web.defaultEncoding</entry>
- <entry>content to use where no encoding is specified</entry>
- <entry>utf-8</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>web.userStyleSheet</entry>
- <entry>URL or path to a user specified style sheet</entry>
- <entry>/path/to/style.css</entry>
- <entry>>= 0.1.0</entry>
-</row>
-<row>
- <entry>web.enablePlugins</entry>
- <entry>enable or disable NS plugins</entry>
- <entry>boolean</entry>
- <entry>>= 0.1.0</entry>
-</row>
diff --git a/reference/wkhtmltox/wkhtmltox/image/converter/construct.xml b/reference/wkhtmltox/wkhtmltox/image/converter/construct.xml
index 405b1497e07a..13766995314a 100644
--- a/reference/wkhtmltox/wkhtmltox/image/converter/construct.xml
+++ b/reference/wkhtmltox/wkhtmltox/image/converter/construct.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="wkhtmltox-image-converter.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="wkhtmltox-image-converter.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
<refnamediv>
<refname>wkhtmltox\Image\Converter::__construct</refname>
<refpurpose>Create a new Image converter</refpurpose>
@@ -146,8 +146,9 @@
<entry>/tmp/cookies.txt</entry>
<entry>>= 0.1.0</entry>
</row>
- &reference.wkhtmltox.wkhtmltox.bits.load;
- &reference.wkhtmltox.wkhtmltox.bits.web;
+ <xi:include xpointer="xpointer(
+ id('wkhtmltox-pdf-object.construct..settings.load.username') |
+ id('wkhtmltox-pdf-object.construct..settings.load.username')/following-sibling::*)"><xi:fallback/></xi:include>
</tbody>
</tgroup>
</table>
diff --git a/reference/wkhtmltox/wkhtmltox/pdf/object/construct.xml b/reference/wkhtmltox/wkhtmltox/pdf/object/construct.xml
index 37b69946f340..a2e01b4aefbd 100644
--- a/reference/wkhtmltox/wkhtmltox/pdf/object/construct.xml
+++ b/reference/wkhtmltox/wkhtmltox/pdf/object/construct.xml
@@ -227,8 +227,158 @@
<entry></entry>
<entry>>= 0.1.0</entry>
</row>
- &reference.wkhtmltox.wkhtmltox.bits.load;
- &reference.wkhtmltox.wkhtmltox.bits.web;
+ <row xml:id="wkhtmltox-pdf-object.construct..settings.load.username">
+ <entry>load.username</entry>
+ <entry>user name to use when loging into a website</entry>
+ <entry>bart</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.password</entry>
+ <entry>the password to used when logging into a website</entry>
+ <entry>elbarto</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.jsdelay</entry>
+ <entry>the amount of time in milliseconds to wait after a page is loaded until it is captured</entry>
+ <entry>1200</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.zoomFactor</entry>
+ <entry>how much zoom should be applied to the content</entry>
+ <entry>2.2</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.customHeaders</entry>
+ <entry>custom headers to send when requesting the main web page</entry>
+ <entry></entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.repertCustomHeaders</entry>
+ <entry>set true to send with all requests</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.cookies</entry>
+ <entry>cookie string to send when requesting the main web page</entry>
+ <entry></entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.post</entry>
+ <entry>post string to send when requesting the main web page</entry>
+ <entry></entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.blockLocalFileAccess</entry>
+ <entry>disallow local and piped files to access other local files</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.stopSlowScript</entry>
+ <entry>stop slow running javascript</entry>
+ <entry>boolean</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>load.debugJavascript</entry>
+ <entry>allow javascript to raise warnings</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.loadErrorHandling</entry>
+ <entry>set error handling strategy</entry>
+ <entry>
+ <table>
+ <title></title>
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>abort</entry>
+ <entry>abort the convertion process</entry>
+ </row>
+ <row>
+ <entry>skip</entry>
+ <entry>do not add the object to the final output</entry>
+ </row>
+ <row>
+ <entry>ignore</entry>
+ <entry>try to add the object to the final output</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>load.proxy</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.background</entry>
+ <entry>include background image in output</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.loadImages</entry>
+ <entry>include images in output</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.enableJavascript</entry>
+ <entry>enable or disable javascript</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.enableIntelligentShrinking</entry>
+ <entry>enable to attempt to fit more content on page, only applies to PDF output</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.minimumFontSize</entry>
+ <entry>the minimum font size allowed</entry>
+ <entry>9</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.printMediaType</entry>
+ <entry>print content using print media type instead of screen media type</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.defaultEncoding</entry>
+ <entry>content to use where no encoding is specified</entry>
+ <entry>utf-8</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.userStyleSheet</entry>
+ <entry>URL or path to a user specified style sheet</entry>
+ <entry>/path/to/style.css</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
+ <row>
+ <entry>web.enablePlugins</entry>
+ <entry>enable or disable NS plugins</entry>
+ <entry>boolean</entry>
+ <entry>>= 0.1.0</entry>
+ </row>
</tbody>
</tgroup>
</table>