Skip to content

wkhtmltox : sync EN, remplacement des fichiers XML invalides par des XIncludes #2853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lacatoire merged 1 commit into from
May 13, 2026
Merged

wkhtmltox : sync EN, remplacement des fichiers XML invalides par des XIncludes #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 0 additions & 102 deletions reference/wkhtmltox/wkhtmltox/bits/load.xml
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions reference/wkhtmltox/wkhtmltox/bits/web.xml
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions reference/wkhtmltox/wkhtmltox/image/converter/construct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 18f9cbcbc404fa3161104e4f3969531f686457af Maintainer: yannick Status: ready -->
<!-- EN-Revision: 71e7f31df31da40b847201a1585836d2c72014b8 Maintainer: lacatoire Status: ready -->
<!-- Reviewed: no -->

<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>Crée un nouveau convertisseur d'image</refpurpose>
Expand Down Expand Up @@ -150,8 +150,9 @@
<entry>/tmp/cookies.txt</entry>
<entry>&gt;= 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>
Expand Down
156 changes: 153 additions & 3 deletions reference/wkhtmltox/wkhtmltox/pdf/object/construct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 6d9dd2c79f2acfda54aedb5d53e9ce96aa759544 Maintainer: yannick Status: ready -->
<!-- EN-Revision: 71e7f31df31da40b847201a1585836d2c72014b8 Maintainer: lacatoire Status: ready -->
<!-- Reviewed: no -->

<refentry xml:id="wkhtmltox-pdf-object.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
Expand Down Expand Up @@ -245,8 +245,158 @@
<entry></entry>
<entry>&gt;= 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>nom d'utilisateur à utiliser lors de la connexion à un site web</entry>
<entry>bart</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.password</entry>
<entry>mot de passe à utiliser lors de la connexion à un site web</entry>
<entry>elbarto</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.jsdelay</entry>
<entry>le temps en millisecondes à attendre après le chargement d'une page avant de la capturer</entry>
<entry>1200</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.zoomFactor</entry>
<entry>combien de zoom doit être appliqué au contenu</entry>
<entry>2.2</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.customHeaders</entry>
<entry>en-têtes personnalisés à envoyer lors de la demande de la page web principale</entry>
<entry></entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.repertCustomHeaders</entry>
<entry>définit à true pour envoyer avec toutes les demandes</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.cookies</entry>
<entry>cookie à envoyer lors de la demande de la page web principale</entry>
<entry></entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.post</entry>
<entry>chaîne à envoyer lors de la demande de la page web principale</entry>
<entry></entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.blockLocalFileAccess</entry>
<entry>empêche les fichiers locaux et les fichiers pipés d'accéder à d'autres fichiers locaux</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.stopSlowScript</entry>
<entry>arrête les scripts lents javascript</entry>
<entry>boolean</entry>
<entry></entry>
</row>
<row>
<entry>load.debugJavascript</entry>
<entry>autorise javascript à lancer des avertissements</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.loadErrorHandling</entry>
<entry>définit la stratégie de gestion des erreurs</entry>
<entry>
<table>
<title></title>
<tgroup cols="2">
<tbody>
<row>
<entry>abort</entry>
<entry>annule le processus de conversion</entry>
</row>
<row>
<entry>skip</entry>
<entry>n'ajoute pas l'objet à la sortie finale</entry>
</row>
<row>
<entry>ignore</entry>
<entry>essaie d'ajouter l'objet à la sortie finale</entry>
</row>
</tbody>
</tgroup>
</table>
</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>load.proxy</entry>
<entry></entry>
<entry></entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.background</entry>
<entry>inclut une image de fond dans la sortie</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.loadImages</entry>
<entry>inclut des images dans la sortie</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.enableJavascript</entry>
<entry>active ou désactive javascript</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.enableIntelligentShrinking</entry>
<entry>active l'essai de mettre plus de contenu sur la page, s'applique uniquement à la sortie PDF</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.minimumFontSize</entry>
<entry>la taille de police minimale autorisée</entry>
<entry>9</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.printMediaType</entry>
<entry>affiche le contenu en utilisant le type de média d'impression au lieu du type de média d'écran</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.defaultEncoding</entry>
<entry>le contenu à utiliser lorsqu'aucun encodage n'est spécifié</entry>
<entry>utf-8</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.userStyleSheet</entry>
<entry>URL ou chemin vers une feuille de style utilisateur spécifiée</entry>
<entry>/path/to/style.css</entry>
<entry>&gt;= 0.1.0</entry>
</row>
<row>
<entry>web.enablePlugins</entry>
<entry>active ou désactive les plugins NS</entry>
<entry>boolean</entry>
<entry>&gt;= 0.1.0</entry>
</row>
</tbody>
</tgroup>
</table>
Expand Down
Loading