Explorar el Código

Version 0.10.0_beta4

Antialize hace 15 años
padre
commit
8f8b3dca50
Se han modificado 3 ficheros con 23 adiciones y 24 borrados
  1. 11 18
      README_WKHTMLTOIMAGE
  2. 11 5
      README_WKHTMLTOPDF
  3. 1 1
      version.pri

+ 11 - 18
README_WKHTMLTOIMAGE

@@ -1,4 +1,4 @@
-=====================> wkhtmltoimage 0.10.0 beta3 Manual <======================
+=====================> wkhtmltoimage 0.10.0 beta4 Manual <======================
 This file documents wkhtmltoimage, a program capable of converting HTML
 documents into images.
 
@@ -26,15 +26,13 @@ wkhtmltoimage [OPTIONS]... <input file> <output file>
 ==============================> General Options <===============================
     --allow <path>                    Allow the file or files from the specified
                                       folder to be loaded (repeatable)
-    --background                      Do print background (default)
-    --no-background                   Do not print background
     --cookie <name> <value>           Set an additional cookie (repeatable)
     --cookie-jar <path>               Read and write cookies from and to the
                                       supplied cookie jar file
     --crop-h <int>                    Set height for croping
     --crop-w <int>                    Set width for croping
-    --crop-x <int>                    Set x coordinate for croping (default 0)
-    --crop-y <int>                    Set y coordinate for croping (default 0)
+    --crop-x <int>                    Set x coordinate for croping
+    --crop-y <int>                    Set y coordinate for croping
     --custom-header <name> <value>    Set an additional HTTP header (repeatable)
     --custom-header-propagation       Add HTTP headers specified by
                                       --custom-header for each resource request.
@@ -46,7 +44,7 @@ wkhtmltoimage [OPTIONS]... <input file> <output file>
     --encoding <encoding>             Set the default text encoding, for input
 -H, --extended-help                   Display more extensive help, detailing
                                       less common command switches
--f, --format <format>                 Output format
+-f, --format <format>                 Output file format (default is jpg)
 -h, --help                            Display help
     --htmldoc                         Output program html help
     --images                          Do load or print images (default)
@@ -72,29 +70,24 @@ wkhtmltoimage [OPTIONS]... <input file> <output file>
                                       likely not work)
     --post <name> <value>             Add an additional post field (repeatable)
     --post-file <name> <path>         Post an additional file (repeatable)
-    --print-media-type                Use print media-type instead of screen
-    --no-print-media-type             Do not use print media-type instead of
-                                      screen (default)
 -p, --proxy <proxy>                   Use a proxy
+    --quality <int>                   Output image quality (between 0 and 100)
+                                      (default 94)
     --readme                          Output program readme
-    --scale-h <int>                   Set height for resizing
-    --scale-w <int>                   Set width for resizing
-    --disable-smart-shrinking         Disable the intelligent shrinking strategy
-                                      used by WebKit that makes the pixel/dpi
-                                      ratio none constant
-    --enable-smart-shrinking          Enable the intelligent shrinking strategy
-                                      used by WebKit that makes the pixel/dpi
-                                      ratio none constant (default)
+-0, --disable-smart-width *           Use the specified width even if it is not
+                                      large enough for the content
     --stop-slow-scripts               Stop slow running javascripts (default)
     --no-stop-slow-scripts            Do not Stop slow running javascripts
                                       (default)
-    --transparent *                   Make the background transparrent in pngs
+    --transparent *                   Make the background transparent in pngs
     --use-xserver *                   Use the X server (some plugins and other
                                       stuff might not work without X11)
     --user-style-sheet <url>          Specify a user style sheet, to load with
                                       every page
     --username <username>             HTTP Authentication username
 -V, --version                         Output version information an exit
+    --width <int>                     Set screen width (default is 1024)
+                                      (default 1024)
     --zoom <float>                    Use this zoom factor (default 1)
 
 Items marked * are only available using patched QT.

+ 11 - 5
README_WKHTMLTOPDF

@@ -1,4 +1,4 @@
-======================> wkhtmltopdf 0.10.0 beta3 Manual <=======================
+======================> wkhtmltopdf 0.10.0 beta4 Manual <=======================
 This file documents wkhtmltopdf, a program capable of converting html documents
 into PDF documents.
 
@@ -92,6 +92,10 @@ section.
 -g, --grayscale                       PDF will be generated in grayscale
 -h, --help                            Display help
     --htmldoc                         Output program html help
+    --image-dpi * <integer>           When embedding images scale them down to
+                                      this dpi (default 600)
+    --image-quality * <integer>       When jpeg compressing images use this
+                                      quality (default 94)
 -l, --lowquality                      Generates lower quality pdf/ps. Useful to
                                       shrink the result document space
     --manpage                         Output program man page
@@ -182,14 +186,14 @@ Items marked * are only available using patched QT.
                                       likely not work)
     --post <name> <value>             Add an additional post field (repeatable)
     --post-file <name> <path>         Post an additional file (repeatable)
-    --print-media-type                Use print media-type instead of screen
-    --no-print-media-type             Do not use print media-type instead of
+    --print-media-type *              Use print media-type instead of screen
+    --no-print-media-type *           Do not use print media-type instead of
                                       screen (default)
 -p, --proxy <proxy>                   Use a proxy
-    --disable-smart-shrinking         Disable the intelligent shrinking strategy
+    --disable-smart-shrinking *       Disable the intelligent shrinking strategy
                                       used by WebKit that makes the pixel/dpi
                                       ratio none constant
-    --enable-smart-shrinking          Enable the intelligent shrinking strategy
+    --enable-smart-shrinking *        Enable the intelligent shrinking strategy
                                       used by WebKit that makes the pixel/dpi
                                       ratio none constant (default)
     --stop-slow-scripts               Stop slow running javascripts (default)
@@ -272,6 +276,8 @@ arguments respectfully.  In header and footer text string supplied to e.g.
  * [subsection] Replaced by the name of the current subsection
  * [date]       Replaced by the current date in system local format
  * [time]       Replaced by the current time in system local format
+ * [title]      Replaced by the title of the of the current page object
+ * [doctitle]   Replaced by the title of the output document
 
 
 As an example specifying --header-right "Page [page] of [toPage]", will result

+ 1 - 1
version.pri

@@ -1 +1 @@
-DEFINES += MAJOR_VERSION=0 MINOR_VERSION=10 PATCH_VERSION=0 BUILD="beta3"
+DEFINES += MAJOR_VERSION=0 MINOR_VERSION=10 PATCH_VERSION=0 BUILD="beta4"