Merge pull request #31 from thecodingmachine/merge-alt

adding PDFtk for merging PDF files < 1.7

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Hi! Thank your for considering contributing to Gotenberg. You'll
+Hi! Thank you for considering contributing to Gotenberg. You'll
 find below useful information about how to contribute to the Gotenberg project.
 
 ## Contributing code
@@ -8,8 +8,9 @@ find below useful information about how to contribute to the Gotenberg project.
 ### Install from sources
 
 1. Install and run the latest version of Docker
-2. Fork this repository
-3. Clone it to your local Go environment (requires *Go* >= 1.11)
+2. Verify your Go version (>= 1.11)
+3. Fork this repository
+4. Clone it outside of your `GOPATH` (we're using Go modules)
 
 ### Working with git
 

.travis.yml

@@ -22,4 +22,4 @@ jobs:
       script: make tests
     - stage: publish
       if: tag IS present
-      script: ./scripts/publish.sh $TRAVIS_TAG $DOCKER_USER $DOCKER_PASS
+      script: make publish VERSION=$TRAVIS_TAG DOCKER_USER=$DOCKER_USER DOCKER_PASSWORD=$DOCKER_PASS

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 TheCodingMachine
+Copyright (c) 2019 TheCodingMachine
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,9 +1,12 @@
-VERSION=snapshot
 GOLANG_VERSION=1.11.2
+VERSION=snapshot
+DOCKER_USER=
+DOCKER_PASSWORD=
 
 # generate documentation.
 doc:
-	static-docs --in build/docs --out docs --theme gotenberg --title Gotenberg --subtitle "A Docker-powered stateless API for converting HTML, Markdown and Office documents to PDF."
+	docker build --build-arg GOLANG_VERSION=$(GOLANG_VERSION) -t thecodingmachine/gotenberg:docs -f build/docs/Dockerfile . 
+	docker run --rm -it -v "$(PWD):/docs" thecodingmachine/gotenberg:docs
 
 # gofmt and goimports all go files.
 fmt:
@@ -27,4 +30,8 @@ image:
 
 # start the API using previously built Docker image.
 gotenberg:
-	docker run -it --rm -p "3000:3000" thecodingmachine/gotenberg:$(VERSION)
+	docker run -it --rm -p "3000:3000" thecodingmachine/gotenberg:$(VERSION)
+
+# publish Gotenberg images according to version.
+publish:
+	./scripts/publish.sh $(GOLANG_VERSION) $(VERSION) $(DOCKER_USER) $(DOCKER_PASSWORD)

README.md

@@ -1,8 +1,9 @@
 <p align="center">
-    <img src="https://user-images.githubusercontent.com/8983173/49701110-4c8b9280-fbe8-11e8-895c-a4b9c7d2515b.png" alt="Gotenberg logo" width="250" height="250" />
+    <img src="https://user-images.githubusercontent.com/8983173/50009948-84b01e00-ffb8-11e8-850b-fc240382c626.png" alt="Gotenberg logo" width="250" height="250" />
 </p>
 <h3 align="center">Gotenberg</h3>
 <p align="center">A Docker-powered stateless API for converting HTML, Markdown and Office documents to PDF.</p>
+<p align="center"><a href="https://thecodingmachine.github.io/gotenberg">Documentation</a> &#183; <a href="/.github/CONTRIBUTING.md">Contributing</a></p>
 
 ---
 
@@ -11,7 +12,7 @@ At TheCodingMachine, we build a lot of web applications (intranets, extranets an
 ## Features
 
 * HTML and Markdown conversions using Google Chrome headless
-* Office conversions (.docx, .doc, .odt, .pptx, .ppt, .odp and so on) using [unoconv](https://github.com/dagwieers/unoconv)
+* Office conversions (.txt, .rtf, .docx, .doc, .odt, .pptx, .ppt, .odp and so on) using [unoconv](https://github.com/dagwieers/unoconv)
 * Performance :zap:: Google Chrome and Libreoffice (unoconv) started once in the background thanks to PM2
 * Failure prevention :broken_heart:: PM2 automatically restarts previous processes if they fail
 * Assets :package:: send your header, footer, images, fonts, stylesheets and so on for converting your HTML and Markdown to beaufitul PDFs!

build/base/Dockerfile

@@ -1,6 +1,4 @@
-FROM debian:stretch-slim
-
-LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>"
+FROM debian:9.5-slim
 
 # |--------------------------------------------------------------------------
 # | Common libraries
@@ -11,7 +9,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>"
 
 RUN echo "deb http://httpredir.debian.org/debian/ stretch main contrib non-free" > /etc/apt/sources.list &&\
     apt-get update &&\
-    apt-get install -y curl wget
+    apt-get install -y curl wget python3-pip
 
 # |--------------------------------------------------------------------------
 # | PM2
@@ -39,7 +37,20 @@ RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add
 # | Unoconv
 # |--------------------------------------------------------------------------
 # |
-# | Installs MS fonts and unoconv for Office documents conversions.
+# | Installs unoconv and LibreOffice for Office documents conversions.
 # |
 
-RUN apt-get -y install ttf-mscorefonts-installer unoconv
+RUN pip3 install unoconv &&\
+    # https://github.com/nextcloud/docker/issues/380
+    mkdir -p /usr/share/man/man1mkdir -p /usr/share/man/man1 &&\
+    apt-get -y install libreoffice
+
+# |--------------------------------------------------------------------------
+# | PDFtk
+# |--------------------------------------------------------------------------
+# |
+# | Installs PDFtk as an alternative to pdfcpu for merging PDFs.
+# | https://github.com/thecodingmachine/gotenberg/issues/29
+# |
+
+RUN apt-get -y install pdftk

build/docs/Dockerfile

@@ -0,0 +1,24 @@
+ARG GOLANG_VERSION
+
+FROM golang:${GOLANG_VERSION}-stretch
+
+# |--------------------------------------------------------------------------
+# | static
+# |--------------------------------------------------------------------------
+# |
+# | Installs the static site anti-framework – general-purpose library, 
+# | purpose-built commands for various domains.
+# |
+
+RUN go get github.com/apex/static/cmd/static-docs
+
+# |--------------------------------------------------------------------------
+# | Final touch
+# |--------------------------------------------------------------------------
+# |
+# | Last instructions of this build.
+# |
+
+WORKDIR /docs
+
+CMD [ "static-docs", "--in", "build/docs/content", "--out", "docs", "--theme", "gotenberg", "--title", "Gotenberg", "--subtitle", "A Docker-powered stateless API for converting HTML, Markdown and Office documents to PDF." ]

build/docs/content/00-introduction.md

@@ -5,7 +5,7 @@ title: Introduction
 [Gotenberg](https://github.com/thecodingmachine/gotenberg/) is a Docker-powered stateless API for converting HTML, Markdown and Office documents to PDF.
 
 * HTML and Markdown conversions using Google Chrome headless
-* Office conversions (.docx, .doc, .odt, .pptx, .ppt, .odp and so on) using [unoconv](https://github.com/dagwieers/unoconv)
+* Office conversions (.txt, .rtf, .docx, .doc, .odt, .pptx, .ppt, .odp and so on) using [unoconv](https://github.com/dagwieers/unoconv)
 * Performance: Google Chrome and Libreoffice (unoconv) started once in the background thanks to PM2
 * Failure prevention: PM2 automatically restarts previous processes if they fail
 * Assets: send your header, footer, images, fonts, stylesheets and so on for converting your HTML and Markdown to beaufitul PDFs!

build/docs/content/02-html.md

@@ -33,7 +33,7 @@ $ curl --request POST \
     --url http://localhost:3000/convert/html \
     --header 'Content-Type: multipart/form-data' \
     --form files=@index.html \
-    > result.pdf
+    -o result.pdf
 ```
 
 ### Go
@@ -43,9 +43,7 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 
 func main() {
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.HTMLRequest{
-        IndexFilePath: "index.html",
-    }
+    req, _ := gotenberg.NewHTMLRequest("index.html")
     dest := "result.pdf"
     c.Store(req, dest)
 }
@@ -109,7 +107,7 @@ $ curl --request POST \
     --form files=@index.html \
     --form files=@header.html \
     --form files=@footer.html \
-    > result.pdf
+    -o result.pdf
 ```
 
 ### Go
@@ -119,13 +117,9 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 
 func main() {
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.HTMLRequest{
-        IndexFilePath: "index.html",
-        Options: &gotenberg.HTMLOptions{
-            HeaderFilePath: "header.html",
-            FooterFilePath: "footer.html",
-        },
-    }
+    req, _ := gotenberg.NewHTMLRequest("index.html")
+    req.SetHeader("header.html")
+    req.SetFooter("footer.html")
     dest := "result.pdf"
     c.Store(req, dest)
 }
@@ -203,7 +197,7 @@ $ curl --request POST \
     --form files=@style.css \
     --form files=@img.png \
     --form files=@font.woff \
-    > result.pdf
+    -o result.pdf
 ```
 
 ### Go
@@ -213,14 +207,12 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 
 func main() {
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.HTMLRequest{
-        IndexFilePath: "index.html",
-        AssetFilePaths: []string{
-            "style.css",
-            "img.png",
-            "font.woff",
-        },
-    }
+    req, _ := gotenberg.NewHTMLRequest("index.html")
+    req.SetAssets([]string{
+        "font.woff",
+        "img.gif",
+        "style.css",
+    })
     dest := "result.pdf"
     c.Store(req, dest)
 }
@@ -269,7 +261,7 @@ $ curl --request POST \
     --form marginLeft=0 \
     --form marginRight=0 \
     --form landscape=true \
-    > result.pdf
+    -o result.pdf
 ```
 
 ### Go
@@ -279,14 +271,10 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 
 func main() {
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.HTMLRequest{
-        IndexFilePath: "index.html",
-        Options: &gotenberg.HTMLOptions{
-            PaperSize:      gotenberg.A4,
-            PaperMargins:   gotenberg.NoMargins,
-            Landscape:      true
-        },
-    }
+    req, _ := gotenberg.NewHTMLRequest("index.html")
+    req.SetPaperSize(gotenberg.A4)
+    req.SetMargins(gotenberg.NoMargins)
+    req.SetLandscape(true)
     dest := "result.pdf"
     c.Store(req, dest)
 }

build/docs/content/03-markdown.md

@@ -36,7 +36,7 @@ $ curl --request POST \
     --header 'Content-Type: multipart/form-data' \
     --form files=@index.html \
     --form files=@file.md \
-    > result.pdf
+    -o result.pdf
 ```
 
 ### Go
@@ -46,12 +46,7 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 
 func main() {
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.MarkdownRequest{
-        IndexFilePath: "index.html",
-        MarkdownFilePaths: []string{
-            "file.md",
-        },
-    }
+    req, _ := gotenberg.NewMarkdownRequest("index.html", []string{"file.md"})
     dest := "result.pdf"
     c.Store(req, dest)
 }

build/docs/content/04-office.md

@@ -10,6 +10,8 @@ It accepts `POST` requests with a `multipart/form-data` Content-Type.
 
 You may send one or more Office documents. Following file extensions are accepted:
 
+* `.txt`
+* `.rtf`
 * `.doc`
 * `.docx`
 * `.odt`
@@ -34,7 +36,7 @@ $ curl --request POST \
     --header 'Content-Type: multipart/form-data' \
     --form files=@document.docx \
     --form files=@document2.docx \
-    > result.pdf
+    -o result.pdf
 ```
 
 ### Go
@@ -44,12 +46,7 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 
 func main() {
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.OfficeRequest{
-        FilePaths: []string{
-            "document.docx",
-            "document2.docx",
-        },
-    }
+    req, _ := gotenberg.NewOfficeRequest([]string{"document.docx", "document2.docx"})
     dest := "result.pdf"
     c.Store(req, dest)
 }
@@ -72,6 +69,61 @@ $dirPath = "/foo";
 $filename = $client->store($request, $dirPath);
 ```
 
+## Paper size and orientation
+
+You may also customize the resulting PDF format.
+
+By default, it will be rendered with `A4` size and `portrait` orientation.
+
+> Paper size has to be provided in `inches`.
+> Also, you have to set both `paperWidth` and `paperHeight`.
+
+### cURL
+
+```bash
+$ curl --request POST \
+    --url http://localhost:3000/convert/office \
+    --header 'Content-Type: multipart/form-data' \
+    --form files=@document.docx \
+    --form paperWidth=8.27 \
+    --form paperHeight=11.27 \
+    --form landscape=true \
+    -o result.pdf
+```
+
+### Go
+
+```golang
+import "github.com/thecodingmachine/gotenberg/pkg"
+
+func main() {
+    c := &gotenberg.Client{Hostname: "http://localhost:3000"}
+    req, _ := gotenberg.NewOfficeRequest([]string{"document.docx"})
+    req.SetPaperSize(gotenberg.A4)
+    req.SetLandscape(true)
+    dest := "result.pdf"
+    c.Store(req, dest)
+}
+```
+
+### PHP
+
+```php
+use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\OfficeRequest;
+
+$client = new Client('http://localhost:3000', new \Http\Adapter\Guzzle6\Client());
+$files = [
+    DocumentFactory::makeFromPath('document.docx', 'document.docx'),
+];
+$request = new OfficeRequest($files);
+$request->setPaperSize(Request::A4);
+$request->setLandscape(true);
+$dirPath = "/foo";
+$filename = $client->store($request, $dirPath);
+```
+
 ## Fonts
 
 By default, only `ttf-mscorefonts` fonts are installed.

build/docs/content/05-merge.md

@@ -19,7 +19,7 @@ $ curl --request POST \
     --header 'Content-Type: multipart/form-data' \
     --form files=@file.pdf \
     --form files=@file2.pdf \
-    > result.pdf
+    -o result.pdf
 ```
 
 ### Go
@@ -29,12 +29,7 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 
 func main() {
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.MergeRequest{
-        FilePaths: []string{
-            "file.pdf",
-            "file2.pdf",
-        },
-    }
+    req, _ := gotenberg.NewMergeRequest([]string{"file.pdf", "file2.pdf"})
     dest := "result.pdf"
     c.Store(req, dest)
 }

build/docs/content/06-webhook.md

@@ -28,14 +28,10 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 
 func main() {
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.HTMLRequest{
-        IndexFilePath: "index.html",
-        Options: &gotenberg.HTMLOptions{
-            WebHookURL: "http://myapp.com/webhook/",
-        },
-    }
+    req, _ := gotenberg.NewHTMLRequest("index.html")
+    req.SetWebhookURL("http://myapp.com/webhook/")
     dest := "result.pdf"
-    resp, err := c.Post(req)
+    resp, _ := c.Post(req)
 }
 ```
 

build/lint/Dockerfile

@@ -2,8 +2,6 @@ ARG GOLANG_VERSION
 
 FROM golang:${GOLANG_VERSION}-stretch
 
-LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>"
-
 # |--------------------------------------------------------------------------
 # | GolangCI-Lint
 # |--------------------------------------------------------------------------

build/tests/Dockerfile

@@ -4,8 +4,6 @@ FROM golang:${GOLANG_VERSION}-stretch AS golang
 
 FROM thecodingmachine/gotenberg:base
 
-LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>"
-
 # |--------------------------------------------------------------------------
 # | Common libraries
 # |--------------------------------------------------------------------------

build/tests/docker-entrypoint.sh

@@ -21,4 +21,5 @@ go test github.com/thecodingmachine/gotenberg/internal/pkg/pm2 -run TestUnoconvS
 go build -o /usr/local/bin/gotenberg cmd/gotenberg/main.go
 gotenberg &
 sleep 10
-go test -race -cover -covermode=atomic github.com/thecodingmachine/gotenberg/pkg
+go test -race -cover -covermode=atomic github.com/thecodingmachine/gotenberg/pkg
+sleep 5 # allows Gotenberg to remove generated files (concurrent requests).

docs/index.html

@@ -12,7 +12,7 @@
       <div class="Container">
         <div class="Header">
           <div class="Title center">
-            <img src="https://user-images.githubusercontent.com/8983173/49701110-4c8b9280-fbe8-11e8-895c-a4b9c7d2515b.png" alt="Gotenberg logo" width="250" height="250"/>
+            <img src="https://user-images.githubusercontent.com/8983173/50009948-84b01e00-ffb8-11e8-850b-fc240382c626.png" alt="Gotenberg logo" width="250" height="250"/>
             <span class="text">Gotenberg</span>
             <span class="subtext">A Docker-powered stateless API for converting HTML, Markdown and Office documents to PDF.</span>
           </div>
@@ -71,7 +71,7 @@
 
 <ul>
 <li>HTML and Markdown conversions using Google Chrome headless</li>
-<li>Office conversions (.docx, .doc, .odt, .pptx, .ppt, .odp and so on) using <a href="https://github.com/dagwieers/unoconv">unoconv</a></li>
+<li>Office conversions (.txt, .rtf, .docx, .doc, .odt, .pptx, .ppt, .odp and so on) using <a href="https://github.com/dagwieers/unoconv">unoconv</a></li>
 <li>Performance: Google Chrome and Libreoffice (unoconv) started once in the background thanks to PM2</li>
 <li>Failure prevention: PM2 automatically restarts previous processes if they fail</li>
 <li>Assets: send your header, footer, images, fonts, stylesheets and so on for converting your HTML and Markdown to beaufitul PDFs!</li>
@@ -157,15 +157,15 @@ which will be converted to PDF.</p>
 <p>For instance:</p>
 
 <pre class="chroma"><span class="cp">&lt;!doctype html&gt;</span>
-<span class="p">&lt;</span><span class="nt">html</span> <span class="na">lang</span><span class="o">=</span><span class="s">&#34;en&#34;</span><span class="p"></span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">head</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">meta</span> <span class="na">charset</span><span class="o">=</span><span class="s">&#34;utf-8&#34;</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">title</span><span class="p"></span><span class="p">&gt;</span>My PDF<span class="p">&lt;</span><span class="p">/</span><span class="nt">title</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="p">/</span><span class="nt">head</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">body</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">h1</span><span class="p"></span><span class="p">&gt;</span>Hello world!<span class="p">&lt;</span><span class="p">/</span><span class="nt">h1</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="p">/</span><span class="nt">body</span><span class="p">&gt;</span>
-<span class="p">&lt;</span><span class="p">/</span><span class="nt">html</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">html</span> <span class="na">lang</span><span class="o">=</span><span class="s">&#34;en&#34;</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">head</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">meta</span> <span class="na">charset</span><span class="o">=</span><span class="s">&#34;utf-8&#34;</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;</span>My PDF<span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
+  <span class="p">&lt;/</span><span class="nt">head</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">body</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">h1</span><span class="p">&gt;</span>Hello world!<span class="p">&lt;/</span><span class="nt">h1</span><span class="p">&gt;</span>
+  <span class="p">&lt;/</span><span class="nt">body</span><span class="p">&gt;</span>
+<span class="p">&lt;/</span><span class="nt">html</span><span class="p">&gt;</span>
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="html.basic.c_url" href="#html.basic.c_url">
@@ -176,7 +176,7 @@ which will be converted to PDF.</p>
 </span><span class="se"></span>    --url http://localhost:3000/convert/html <span class="se">\
 </span><span class="se"></span>    --header <span class="s1">&#39;Content-Type: multipart/form-data&#39;</span> <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@index.html <span class="se">\
-</span><span class="se"></span>    &gt; result.pdf
+</span><span class="se"></span>    -o result.pdf
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="html.basic.go" href="#html.basic.go">
@@ -185,13 +185,11 @@ which will be converted to PDF.</p>
 
 <pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
 
-<span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
-    <span class="nx">req</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">HTMLRequest</span><span class="p">{</span>
-        <span class="nx">IndexFilePath</span><span class="p">:</span> <span class="s">&#34;index.html&#34;</span><span class="p">,</span>
-    <span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewHTMLRequest</span><span class="p">(</span><span class="s">&#34;index.html&#34;</span><span class="p">)</span>
     <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
-    <span class="nx">c</span><span class="p">.</span><span class="nx">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
+    <span class="nx">c</span><span class="p">.</span><span class="nf">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
 <span class="p">}</span>
 </pre>
 
@@ -199,16 +197,16 @@ which will be converted to PDF.</p>
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>PHP</h3>
 
-<pre class="chroma"><span class="x">use TheCodingMachine\Gotenberg\Client;
-</span><span class="x">use TheCodingMachine\Gotenberg\DocumentFactory;
-</span><span class="x">use TheCodingMachine\Gotenberg\HTMLRequest;
-</span><span class="x">
-</span><span class="x">$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
-</span><span class="x">$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
-</span><span class="x">$request = new HTMLRequest($index);
-</span><span class="x">$dirPath = &#34;/foo&#34;;
-</span><span class="x">$filename = $client-&gt;store($request, $dirPath);
-</span><span class="x"></span></pre>
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\HTMLRequest;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
+$request = new HTMLRequest($index);
+$dirPath = &#34;/foo&#34;;
+$filename = $client-&gt;store($request, $dirPath);
+</pre>
 
 <h2 class="Heading"><a class="Anchor" aria-hidden="true" id="html.header_and_footer" href="#html.header_and_footer">
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
@@ -219,21 +217,21 @@ Respectively, a file named <code>header.html</code> and <code>footer.html</code>
 
 <p>Each of them <strong>has to be a complete HTML document</strong>:</p>
 
-<pre class="chroma"><span class="p">&lt;</span><span class="nt">html</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">head</span><span class="p"></span><span class="p">&gt;</span>
-        <span class="p">&lt;</span><span class="nt">style</span><span class="p"></span><span class="p">&gt;</span>
+<pre class="chroma"><span class="p">&lt;</span><span class="nt">html</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">head</span><span class="p">&gt;</span>
+        <span class="p">&lt;</span><span class="nt">style</span><span class="p">&gt;</span>
             <span class="nt">body</span> <span class="p">{</span>
                 <span class="k">font-size</span><span class="p">:</span> <span class="mi">8</span><span class="kt">rem</span><span class="p">;</span>
                 <span class="k">margin</span><span class="p">:</span> <span class="mi">4</span><span class="kt">rem</span> <span class="kc">auto</span><span class="p">;</span>
             <span class="p">}</span>
-        <span class="p">&lt;</span><span class="p">/</span><span class="nt">style</span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="p">/</span><span class="nt">head</span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">body</span><span class="p"></span><span class="p">&gt;</span>
-        <span class="p">&lt;</span><span class="nt">p</span><span class="p"></span><span class="p">&gt;</span>
-            <span class="p">&lt;</span><span class="nt">span</span> <span class="na">class</span><span class="o">=</span><span class="s">&#34;pageNumber&#34;</span><span class="p"></span><span class="p">&gt;&lt;</span><span class="p">/</span><span class="nt">span</span><span class="p">&gt;</span> of <span class="p">&lt;</span><span class="nt">span</span> <span class="na">class</span><span class="o">=</span><span class="s">&#34;totalPages&#34;</span><span class="p"></span><span class="p">&gt;&lt;</span><span class="p">/</span><span class="nt">span</span><span class="p">&gt;</span>
-        <span class="p">&lt;</span><span class="p">/</span><span class="nt">p</span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="p">/</span><span class="nt">body</span><span class="p">&gt;</span>
-<span class="p">&lt;</span><span class="p">/</span><span class="nt">html</span><span class="p">&gt;</span>
+        <span class="p">&lt;/</span><span class="nt">style</span><span class="p">&gt;</span>
+    <span class="p">&lt;/</span><span class="nt">head</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">body</span><span class="p">&gt;</span>
+        <span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+            <span class="p">&lt;</span><span class="nt">span</span> <span class="na">class</span><span class="o">=</span><span class="s">&#34;pageNumber&#34;</span><span class="p">&gt;&lt;/</span><span class="nt">span</span><span class="p">&gt;</span> of <span class="p">&lt;</span><span class="nt">span</span> <span class="na">class</span><span class="o">=</span><span class="s">&#34;totalPages&#34;</span><span class="p">&gt;&lt;/</span><span class="nt">span</span><span class="p">&gt;</span>
+        <span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+    <span class="p">&lt;/</span><span class="nt">body</span><span class="p">&gt;</span>
+<span class="p">&lt;/</span><span class="nt">html</span><span class="p">&gt;</span>
 </pre>
 
 <p>The following classes allow you to inject printing values:</p>
@@ -260,7 +258,7 @@ Also, <code>footer.html</code> CSS properties override the ones from <code>heade
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@index.html <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@header.html <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@footer.html <span class="se">\
-</span><span class="se"></span>    &gt; result.pdf
+</span><span class="se"></span>    -o result.pdf
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="html.header_and_footer.go" href="#html.header_and_footer.go">
@@ -269,17 +267,13 @@ Also, <code>footer.html</code> CSS properties override the ones from <code>heade
 
 <pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
 
-<span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
-    <span class="nx">req</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">HTMLRequest</span><span class="p">{</span>
-        <span class="nx">IndexFilePath</span><span class="p">:</span> <span class="s">&#34;index.html&#34;</span><span class="p">,</span>
-        <span class="nx">Options</span><span class="p">:</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">HTMLOptions</span><span class="p">{</span>
-            <span class="nx">HeaderFilePath</span><span class="p">:</span> <span class="s">&#34;header.html&#34;</span><span class="p">,</span>
-            <span class="nx">FooterFilePath</span><span class="p">:</span> <span class="s">&#34;footer.html&#34;</span><span class="p">,</span>
-        <span class="p">},</span>
-    <span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewHTMLRequest</span><span class="p">(</span><span class="s">&#34;index.html&#34;</span><span class="p">)</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetHeader</span><span class="p">(</span><span class="s">&#34;header.html&#34;</span><span class="p">)</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetFooter</span><span class="p">(</span><span class="s">&#34;footer.html&#34;</span><span class="p">)</span>
     <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
-    <span class="nx">c</span><span class="p">.</span><span class="nx">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
+    <span class="nx">c</span><span class="p">.</span><span class="nf">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
 <span class="p">}</span>
 </pre>
 
@@ -287,20 +281,20 @@ Also, <code>footer.html</code> CSS properties override the ones from <code>heade
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>PHP</h3>
 
-<pre class="chroma"><span class="x">use TheCodingMachine\Gotenberg\Client;
-</span><span class="x">use TheCodingMachine\Gotenberg\DocumentFactory;
-</span><span class="x">use TheCodingMachine\Gotenberg\HTMLRequest;
-</span><span class="x">
-</span><span class="x">$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
-</span><span class="x">$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
-</span><span class="x">$header = DocumentFactory::makeFromPath(&#39;header.html&#39;, &#39;header.html&#39;);
-</span><span class="x">$footer = DocumentFactory::makeFromPath(&#39;footer.html&#39;, &#39;footer.html&#39;);
-</span><span class="x">$request = new HTMLRequest($index);
-</span><span class="x">$request-&gt;setHeader($header);
-</span><span class="x">$request-&gt;setFooter($footer);
-</span><span class="x">$dirPath = &#34;/foo&#34;;
-</span><span class="x">$filename = $client-&gt;store($request, $dirPath);
-</span><span class="x"></span></pre>
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\HTMLRequest;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
+$header = DocumentFactory::makeFromPath(&#39;header.html&#39;, &#39;header.html&#39;);
+$footer = DocumentFactory::makeFromPath(&#39;footer.html&#39;, &#39;footer.html&#39;);
+$request = new HTMLRequest($index);
+$request-&gt;setHeader($header);
+$request-&gt;setFooter($footer);
+$dirPath = &#34;/foo&#34;;
+$filename = $client-&gt;store($request, $dirPath);
+</pre>
 
 <h2 class="Heading"><a class="Anchor" aria-hidden="true" id="html.assets" href="#html.assets">
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
@@ -314,31 +308,31 @@ are on the same level as the <code>index.html</code> file.</p>
 <p>In others words, this will work:</p>
 
 <pre class="chroma"><span class="cp">&lt;!doctype html&gt;</span>
-<span class="p">&lt;</span><span class="nt">html</span> <span class="na">lang</span><span class="o">=</span><span class="s">&#34;en&#34;</span><span class="p"></span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">head</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">meta</span> <span class="na">charset</span><span class="o">=</span><span class="s">&#34;utf-8&#34;</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">title</span><span class="p"></span><span class="p">&gt;</span>My PDF<span class="p">&lt;</span><span class="p">/</span><span class="nt">title</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="p">/</span><span class="nt">head</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">body</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">h1</span><span class="p"></span><span class="p">&gt;</span>Hello world!<span class="p">&lt;</span><span class="p">/</span><span class="nt">h1</span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">img</span> <span class="na">src</span><span class="o">=</span><span class="s">&#34;img.png&#34;</span><span class="p"></span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="p">/</span><span class="nt">body</span><span class="p">&gt;</span>
-<span class="p">&lt;</span><span class="p">/</span><span class="nt">html</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">html</span> <span class="na">lang</span><span class="o">=</span><span class="s">&#34;en&#34;</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">head</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">meta</span> <span class="na">charset</span><span class="o">=</span><span class="s">&#34;utf-8&#34;</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;</span>My PDF<span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
+  <span class="p">&lt;/</span><span class="nt">head</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">body</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">h1</span><span class="p">&gt;</span>Hello world!<span class="p">&lt;/</span><span class="nt">h1</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">img</span> <span class="na">src</span><span class="o">=</span><span class="s">&#34;img.png&#34;</span><span class="p">&gt;</span>
+  <span class="p">&lt;/</span><span class="nt">body</span><span class="p">&gt;</span>
+<span class="p">&lt;/</span><span class="nt">html</span><span class="p">&gt;</span>
 </pre>
 
 <p>But this won’t:</p>
 
 <pre class="chroma"><span class="cp">&lt;!doctype html&gt;</span>
-<span class="p">&lt;</span><span class="nt">html</span> <span class="na">lang</span><span class="o">=</span><span class="s">&#34;en&#34;</span><span class="p"></span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">head</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">meta</span> <span class="na">charset</span><span class="o">=</span><span class="s">&#34;utf-8&#34;</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">title</span><span class="p"></span><span class="p">&gt;</span>My PDF<span class="p">&lt;</span><span class="p">/</span><span class="nt">title</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="p">/</span><span class="nt">head</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">body</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">h1</span><span class="p"></span><span class="p">&gt;</span>Hello world!<span class="p">&lt;</span><span class="p">/</span><span class="nt">h1</span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">img</span> <span class="na">src</span><span class="o">=</span><span class="s">&#34;/foo/img.png&#34;</span><span class="p"></span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="p">/</span><span class="nt">body</span><span class="p">&gt;</span>
-<span class="p">&lt;</span><span class="p">/</span><span class="nt">html</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">html</span> <span class="na">lang</span><span class="o">=</span><span class="s">&#34;en&#34;</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">head</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">meta</span> <span class="na">charset</span><span class="o">=</span><span class="s">&#34;utf-8&#34;</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;</span>My PDF<span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
+  <span class="p">&lt;/</span><span class="nt">head</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">body</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">h1</span><span class="p">&gt;</span>Hello world!<span class="p">&lt;/</span><span class="nt">h1</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">img</span> <span class="na">src</span><span class="o">=</span><span class="s">&#34;/foo/img.png&#34;</span><span class="p">&gt;</span>
+  <span class="p">&lt;/</span><span class="nt">body</span><span class="p">&gt;</span>
+<span class="p">&lt;/</span><span class="nt">html</span><span class="p">&gt;</span>
 </pre>
 
 <p>You may also use <em>remote</em> paths for Google fonts, images and so on.</p>
@@ -359,7 +353,7 @@ see to the <a href="#office.fonts">fonts section</a>.</p>
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@style.css <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@img.png <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@font.woff <span class="se">\
-</span><span class="se"></span>    &gt; result.pdf
+</span><span class="se"></span>    -o result.pdf
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="html.assets.go" href="#html.assets.go">
@@ -368,18 +362,16 @@ see to the <a href="#office.fonts">fonts section</a>.</p>
 
 <pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
 
-<span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
-    <span class="nx">req</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">HTMLRequest</span><span class="p">{</span>
-        <span class="nx">IndexFilePath</span><span class="p">:</span> <span class="s">&#34;index.html&#34;</span><span class="p">,</span>
-        <span class="nx">AssetFilePaths</span><span class="p">:</span> <span class="p">[]</span><span class="kt">string</span><span class="p">{</span>
-            <span class="s">&#34;style.css&#34;</span><span class="p">,</span>
-            <span class="s">&#34;img.png&#34;</span><span class="p">,</span>
-            <span class="s">&#34;font.woff&#34;</span><span class="p">,</span>
-        <span class="p">},</span>
-    <span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewHTMLRequest</span><span class="p">(</span><span class="s">&#34;index.html&#34;</span><span class="p">)</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetAssets</span><span class="p">([]</span><span class="kt">string</span><span class="p">{</span>
+        <span class="s">&#34;font.woff&#34;</span><span class="p">,</span>
+        <span class="s">&#34;img.gif&#34;</span><span class="p">,</span>
+        <span class="s">&#34;style.css&#34;</span><span class="p">,</span>
+    <span class="p">})</span>
     <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
-    <span class="nx">c</span><span class="p">.</span><span class="nx">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
+    <span class="nx">c</span><span class="p">.</span><span class="nf">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
 <span class="p">}</span>
 </pre>
 
@@ -387,22 +379,22 @@ see to the <a href="#office.fonts">fonts section</a>.</p>
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>PHP</h3>
 
-<pre class="chroma"><span class="x">use TheCodingMachine\Gotenberg\Client;
-</span><span class="x">use TheCodingMachine\Gotenberg\DocumentFactory;
-</span><span class="x">use TheCodingMachine\Gotenberg\HTMLRequest;
-</span><span class="x">
-</span><span class="x">$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
-</span><span class="x">$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
-</span><span class="x">$assets = [
-</span><span class="x">    DocumentFactory::makeFromPath(&#39;style.css&#39;, &#39;style.css&#39;),
-</span><span class="x">    DocumentFactory::makeFromPath(&#39;img.png&#39;, &#39;img.png&#39;),
-</span><span class="x">    DocumentFactory::makeFromPath(&#39;font.woff&#39;, &#39;font.woff&#39;),
-</span><span class="x">];
-</span><span class="x">$request = new HTMLRequest($index);
-</span><span class="x">$request-&gt;setAssets($assets);
-</span><span class="x">$dirPath = &#34;/foo&#34;;
-</span><span class="x">$filename = $client-&gt;store($request, $dirPath);
-</span><span class="x"></span></pre>
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\HTMLRequest;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
+$assets = [
+    DocumentFactory::makeFromPath(&#39;style.css&#39;, &#39;style.css&#39;),
+    DocumentFactory::makeFromPath(&#39;img.png&#39;, &#39;img.png&#39;),
+    DocumentFactory::makeFromPath(&#39;font.woff&#39;, &#39;font.woff&#39;),
+];
+$request = new HTMLRequest($index);
+$request-&gt;setAssets($assets);
+$dirPath = &#34;/foo&#34;;
+$filename = $client-&gt;store($request, $dirPath);
+</pre>
 
 <h2 class="Heading"><a class="Anchor" aria-hidden="true" id="html.paper_size_margins_orientation" href="#html.paper_size_margins_orientation">
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
@@ -432,7 +424,7 @@ Also, you have to set both <code>paperWidth</code> and <code>paperHeight</code>.
 </span><span class="se"></span>    --form <span class="nv">marginLeft</span><span class="o">=</span><span class="m">0</span> <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">marginRight</span><span class="o">=</span><span class="m">0</span> <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">landscape</span><span class="o">=</span><span class="nb">true</span> <span class="se">\
-</span><span class="se"></span>    &gt; result.pdf
+</span><span class="se"></span>    -o result.pdf
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="html.paper_size_margins_orientation.go" href="#html.paper_size_margins_orientation.go">
@@ -441,18 +433,14 @@ Also, you have to set both <code>paperWidth</code> and <code>paperHeight</code>.
 
 <pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
 
-<span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
-    <span class="nx">req</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">HTMLRequest</span><span class="p">{</span>
-        <span class="nx">IndexFilePath</span><span class="p">:</span> <span class="s">&#34;index.html&#34;</span><span class="p">,</span>
-        <span class="nx">Options</span><span class="p">:</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">HTMLOptions</span><span class="p">{</span>
-            <span class="nx">PaperSize</span><span class="p">:</span>      <span class="nx">gotenberg</span><span class="p">.</span><span class="nx">A4</span><span class="p">,</span>
-            <span class="nx">PaperMargins</span><span class="p">:</span>   <span class="nx">gotenberg</span><span class="p">.</span><span class="nx">NoMargins</span><span class="p">,</span>
-            <span class="nx">Landscape</span><span class="p">:</span>      <span class="kc">true</span>
-        <span class="p">},</span>
-    <span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewHTMLRequest</span><span class="p">(</span><span class="s">&#34;index.html&#34;</span><span class="p">)</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetPaperSize</span><span class="p">(</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">A4</span><span class="p">)</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetMargins</span><span class="p">(</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">NoMargins</span><span class="p">)</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetLandscape</span><span class="p">(</span><span class="kc">true</span><span class="p">)</span>
     <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
-    <span class="nx">c</span><span class="p">.</span><span class="nx">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
+    <span class="nx">c</span><span class="p">.</span><span class="nf">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
 <span class="p">}</span>
 </pre>
 
@@ -460,20 +448,20 @@ Also, you have to set both <code>paperWidth</code> and <code>paperHeight</code>.
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>PHP</h3>
 
-<pre class="chroma"><span class="x">use TheCodingMachine\Gotenberg\Client;
-</span><span class="x">use TheCodingMachine\Gotenberg\DocumentFactory;
-</span><span class="x">use TheCodingMachine\Gotenberg\HTMLRequest;
-</span><span class="x">use TheCodingMachine\Gotenberg\Request;
-</span><span class="x">
-</span><span class="x">$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
-</span><span class="x">$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
-</span><span class="x">$request = new HTMLRequest($index);
-</span><span class="x">$request-&gt;setPaperSize(Request::A4);
-</span><span class="x">$request-&gt;setMargins(Request::NO_MARGINS);
-</span><span class="x">$request-&gt;setLandscape(true);
-</span><span class="x">$dirPath = &#34;/foo&#34;;
-</span><span class="x">$filename = $client-&gt;store($request, $dirPath);
-</span><span class="x"></span></pre>
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\HTMLRequest;
+use TheCodingMachine\Gotenberg\Request;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
+$request = new HTMLRequest($index);
+$request-&gt;setPaperSize(Request::A4);
+$request-&gt;setMargins(Request::NO_MARGINS);
+$request-&gt;setLandscape(true);
+$dirPath = &#34;/foo&#34;;
+$filename = $client-&gt;store($request, $dirPath);
+</pre>
 
               </div>
             
@@ -497,15 +485,15 @@ in the file <code>index.html</code>. This function will convert a given markdown
 <p>For instance:</p>
 
 <pre class="chroma"><span class="cp">&lt;!doctype html&gt;</span>
-<span class="p">&lt;</span><span class="nt">html</span> <span class="na">lang</span><span class="o">=</span><span class="s">&#34;en&#34;</span><span class="p"></span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">head</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">meta</span> <span class="na">charset</span><span class="o">=</span><span class="s">&#34;utf-8&#34;</span><span class="p"></span><span class="p">&gt;</span>
-    <span class="p">&lt;</span><span class="nt">title</span><span class="p"></span><span class="p">&gt;</span>My PDF<span class="p">&lt;</span><span class="p">/</span><span class="nt">title</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="p">/</span><span class="nt">head</span><span class="p">&gt;</span>
-  <span class="p">&lt;</span><span class="nt">body</span><span class="p"></span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">html</span> <span class="na">lang</span><span class="o">=</span><span class="s">&#34;en&#34;</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">head</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">meta</span> <span class="na">charset</span><span class="o">=</span><span class="s">&#34;utf-8&#34;</span><span class="p">&gt;</span>
+    <span class="p">&lt;</span><span class="nt">title</span><span class="p">&gt;</span>My PDF<span class="p">&lt;/</span><span class="nt">title</span><span class="p">&gt;</span>
+  <span class="p">&lt;/</span><span class="nt">head</span><span class="p">&gt;</span>
+  <span class="p">&lt;</span><span class="nt">body</span><span class="p">&gt;</span>
     {{ toHTML .DirPath &#34;file.md&#34; }}
-  <span class="p">&lt;</span><span class="p">/</span><span class="nt">body</span><span class="p">&gt;</span>
-<span class="p">&lt;</span><span class="p">/</span><span class="nt">html</span><span class="p">&gt;</span>
+  <span class="p">&lt;/</span><span class="nt">body</span><span class="p">&gt;</span>
+<span class="p">&lt;/</span><span class="nt">html</span><span class="p">&gt;</span>
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="markdown.basic.c_url" href="#markdown.basic.c_url">
@@ -517,7 +505,7 @@ in the file <code>index.html</code>. This function will convert a given markdown
 </span><span class="se"></span>    --header <span class="s1">&#39;Content-Type: multipart/form-data&#39;</span> <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@index.html <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@file.md <span class="se">\
-</span><span class="se"></span>    &gt; result.pdf
+</span><span class="se"></span>    -o result.pdf
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="markdown.basic.go" href="#markdown.basic.go">
@@ -526,16 +514,11 @@ in the file <code>index.html</code>. This function will convert a given markdown
 
 <pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
 
-<span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
-    <span class="nx">req</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">MarkdownRequest</span><span class="p">{</span>
-        <span class="nx">IndexFilePath</span><span class="p">:</span> <span class="s">&#34;index.html&#34;</span><span class="p">,</span>
-        <span class="nx">MarkdownFilePaths</span><span class="p">:</span> <span class="p">[]</span><span class="kt">string</span><span class="p">{</span>
-            <span class="s">&#34;file.md&#34;</span><span class="p">,</span>
-        <span class="p">},</span>
-    <span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewMarkdownRequest</span><span class="p">(</span><span class="s">&#34;index.html&#34;</span><span class="p">,</span> <span class="p">[]</span><span class="kt">string</span><span class="p">{</span><span class="s">&#34;file.md&#34;</span><span class="p">})</span>
     <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
-    <span class="nx">c</span><span class="p">.</span><span class="nx">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
+    <span class="nx">c</span><span class="p">.</span><span class="nf">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
 <span class="p">}</span>
 </pre>
 
@@ -543,19 +526,19 @@ in the file <code>index.html</code>. This function will convert a given markdown
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>PHP</h3>
 
-<pre class="chroma"><span class="x">use TheCodingMachine\Gotenberg\Client;
-</span><span class="x">use TheCodingMachine\Gotenberg\DocumentFactory;
-</span><span class="x">use TheCodingMachine\Gotenberg\MarkdownRequest;
-</span><span class="x">
-</span><span class="x">$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
-</span><span class="x">$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
-</span><span class="x">$markdowns = [
-</span><span class="x">    DocumentFactory::makeFromPath(&#39;file.md&#39;, &#39;file.md&#39;),
-</span><span class="x">];
-</span><span class="x">$request = new MarkdownRequest($index, $markdowns);
-</span><span class="x">$dirPath = &#34;/foo&#34;;
-</span><span class="x">$filename = $client-&gt;store($request, $dirPath);
-</span><span class="x"></span></pre>
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\MarkdownRequest;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
+$markdowns = [
+    DocumentFactory::makeFromPath(&#39;file.md&#39;, &#39;file.md&#39;),
+];
+$request = new MarkdownRequest($index, $markdowns);
+$dirPath = &#34;/foo&#34;;
+$filename = $client-&gt;store($request, $dirPath);
+</pre>
 
               </div>
             
@@ -574,6 +557,8 @@ in the file <code>index.html</code>. This function will convert a given markdown
 <p>You may send one or more Office documents. Following file extensions are accepted:</p>
 
 <ul>
+<li><code>.txt</code></li>
+<li><code>.rtf</code></li>
 <li><code>.doc</code></li>
 <li><code>.docx</code></li>
 <li><code>.odt</code></li>
@@ -602,7 +587,7 @@ See the <a href="#scalability">scalability section</a> to find how to mitigate t
 </span><span class="se"></span>    --header <span class="s1">&#39;Content-Type: multipart/form-data&#39;</span> <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@document.docx <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@document2.docx <span class="se">\
-</span><span class="se"></span>    &gt; result.pdf
+</span><span class="se"></span>    -o result.pdf
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="office.basic.go" href="#office.basic.go">
@@ -611,16 +596,11 @@ See the <a href="#scalability">scalability section</a> to find how to mitigate t
 
 <pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
 
-<span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
-    <span class="nx">req</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">OfficeRequest</span><span class="p">{</span>
-        <span class="nx">FilePaths</span><span class="p">:</span> <span class="p">[]</span><span class="kt">string</span><span class="p">{</span>
-            <span class="s">&#34;document.docx&#34;</span><span class="p">,</span>
-            <span class="s">&#34;document2.docx&#34;</span><span class="p">,</span>
-        <span class="p">},</span>
-    <span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewOfficeRequest</span><span class="p">([]</span><span class="kt">string</span><span class="p">{</span><span class="s">&#34;document.docx&#34;</span><span class="p">,</span> <span class="s">&#34;document2.docx&#34;</span><span class="p">})</span>
     <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
-    <span class="nx">c</span><span class="p">.</span><span class="nx">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
+    <span class="nx">c</span><span class="p">.</span><span class="nf">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
 <span class="p">}</span>
 </pre>
 
@@ -628,19 +608,81 @@ See the <a href="#scalability">scalability section</a> to find how to mitigate t
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>PHP</h3>
 
-<pre class="chroma"><span class="x">use TheCodingMachine\Gotenberg\Client;
-</span><span class="x">use TheCodingMachine\Gotenberg\DocumentFactory;
-</span><span class="x">use TheCodingMachine\Gotenberg\OfficeRequest;
-</span><span class="x">
-</span><span class="x">$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
-</span><span class="x">$files = [
-</span><span class="x">    DocumentFactory::makeFromPath(&#39;document.docx&#39;, &#39;document.docx&#39;),
-</span><span class="x">    DocumentFactory::makeFromPath(&#39;document2.docx&#39;, &#39;document2.docx&#39;),
-</span><span class="x">];
-</span><span class="x">$request = new OfficeRequest($files);
-</span><span class="x">$dirPath = &#34;/foo&#34;;
-</span><span class="x">$filename = $client-&gt;store($request, $dirPath);
-</span><span class="x"></span></pre>
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\OfficeRequest;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$files = [
+    DocumentFactory::makeFromPath(&#39;document.docx&#39;, &#39;document.docx&#39;),
+    DocumentFactory::makeFromPath(&#39;document2.docx&#39;, &#39;document2.docx&#39;),
+];
+$request = new OfficeRequest($files);
+$dirPath = &#34;/foo&#34;;
+$filename = $client-&gt;store($request, $dirPath);
+</pre>
+
+<h2 class="Heading"><a class="Anchor" aria-hidden="true" id="office.paper_size_and_orientation" href="#office.paper_size_and_orientation">
+	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
+</a>Paper size and orientation</h2>
+
+<p>You may also customize the resulting PDF format.</p>
+
+<p>By default, it will be rendered with <code>A4</code> size and <code>portrait</code> orientation.</p>
+
+<blockquote>
+<p>Paper size has to be provided in <code>inches</code>.
+Also, you have to set both <code>paperWidth</code> and <code>paperHeight</code>.</p>
+</blockquote>
+
+<h3 class="Heading"><a class="Anchor" aria-hidden="true" id="office.paper_size_and_orientation.c_url" href="#office.paper_size_and_orientation.c_url">
+	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
+</a>cURL</h3>
+
+<pre class="chroma">$ curl --request POST <span class="se">\
+</span><span class="se"></span>    --url http://localhost:3000/convert/office <span class="se">\
+</span><span class="se"></span>    --header <span class="s1">&#39;Content-Type: multipart/form-data&#39;</span> <span class="se">\
+</span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@document.docx <span class="se">\
+</span><span class="se"></span>    --form <span class="nv">paperWidth</span><span class="o">=</span><span class="m">8</span>.27 <span class="se">\
+</span><span class="se"></span>    --form <span class="nv">paperHeight</span><span class="o">=</span><span class="m">11</span>.27 <span class="se">\
+</span><span class="se"></span>    --form <span class="nv">landscape</span><span class="o">=</span><span class="nb">true</span> <span class="se">\
+</span><span class="se"></span>    -o result.pdf
+</pre>
+
+<h3 class="Heading"><a class="Anchor" aria-hidden="true" id="office.paper_size_and_orientation.go" href="#office.paper_size_and_orientation.go">
+	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
+</a>Go</h3>
+
+<pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
+
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
+    <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewOfficeRequest</span><span class="p">([]</span><span class="kt">string</span><span class="p">{</span><span class="s">&#34;document.docx&#34;</span><span class="p">})</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetPaperSize</span><span class="p">(</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">A4</span><span class="p">)</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetLandscape</span><span class="p">(</span><span class="kc">true</span><span class="p">)</span>
+    <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
+    <span class="nx">c</span><span class="p">.</span><span class="nf">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
+<span class="p">}</span>
+</pre>
+
+<h3 class="Heading"><a class="Anchor" aria-hidden="true" id="office.paper_size_and_orientation.php" href="#office.paper_size_and_orientation.php">
+	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
+</a>PHP</h3>
+
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\OfficeRequest;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$files = [
+    DocumentFactory::makeFromPath(&#39;document.docx&#39;, &#39;document.docx&#39;),
+];
+$request = new OfficeRequest($files);
+$request-&gt;setPaperSize(Request::A4);
+$request-&gt;setLandscape(true);
+$dirPath = &#34;/foo&#34;;
+$filename = $client-&gt;store($request, $dirPath);
+</pre>
 
 <h2 class="Heading"><a class="Anchor" aria-hidden="true" id="office.fonts" href="#office.fonts">
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
@@ -681,7 +723,7 @@ will merge them and return the resulting PDF file.</p>
 </span><span class="se"></span>    --header <span class="s1">&#39;Content-Type: multipart/form-data&#39;</span> <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@file.pdf <span class="se">\
 </span><span class="se"></span>    --form <span class="nv">files</span><span class="o">=</span>@file2.pdf <span class="se">\
-</span><span class="se"></span>    &gt; result.pdf
+</span><span class="se"></span>    -o result.pdf
 </pre>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="merge.basic.go" href="#merge.basic.go">
@@ -690,16 +732,11 @@ will merge them and return the resulting PDF file.</p>
 
 <pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
 
-<span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
-    <span class="nx">req</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">MergeRequest</span><span class="p">{</span>
-        <span class="nx">FilePaths</span><span class="p">:</span> <span class="p">[]</span><span class="kt">string</span><span class="p">{</span>
-            <span class="s">&#34;file.pdf&#34;</span><span class="p">,</span>
-            <span class="s">&#34;file2.pdf&#34;</span><span class="p">,</span>
-        <span class="p">},</span>
-    <span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewMergeRequest</span><span class="p">([]</span><span class="kt">string</span><span class="p">{</span><span class="s">&#34;file.pdf&#34;</span><span class="p">,</span> <span class="s">&#34;file2.pdf&#34;</span><span class="p">})</span>
     <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
-    <span class="nx">c</span><span class="p">.</span><span class="nx">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
+    <span class="nx">c</span><span class="p">.</span><span class="nf">Store</span><span class="p">(</span><span class="nx">req</span><span class="p">,</span> <span class="nx">dest</span><span class="p">)</span>
 <span class="p">}</span>
 </pre>
 
@@ -707,19 +744,19 @@ will merge them and return the resulting PDF file.</p>
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>PHP</h3>
 
-<pre class="chroma"><span class="x">use TheCodingMachine\Gotenberg\Client;
-</span><span class="x">use TheCodingMachine\Gotenberg\DocumentFactory;
-</span><span class="x">use TheCodingMachine\Gotenberg\MergeRequest;
-</span><span class="x">
-</span><span class="x">$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
-</span><span class="x">$files = [
-</span><span class="x">    DocumentFactory::makeFromPath(&#39;file.pdf&#39;, &#39;file.pdf&#39;),
-</span><span class="x">    DocumentFactory::makeFromPath(&#39;file2.pdf&#39;, &#39;file2.pdf&#39;),
-</span><span class="x">];
-</span><span class="x">$request = new MergeRequest($files);
-</span><span class="x">$dirPath = &#34;/foo&#34;;
-</span><span class="x">$filename = $client-&gt;store($request, $dirPath);
-</span><span class="x"></span></pre>
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\MergeRequest;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$files = [
+    DocumentFactory::makeFromPath(&#39;file.pdf&#39;, &#39;file.pdf&#39;),
+    DocumentFactory::makeFromPath(&#39;file2.pdf&#39;, &#39;file2.pdf&#39;),
+];
+$request = new MergeRequest($files);
+$dirPath = &#34;/foo&#34;;
+$filename = $client-&gt;store($request, $dirPath);
+</pre>
 
               </div>
             
@@ -755,16 +792,12 @@ to given URL.</p>
 
 <pre class="chroma"><span class="kn">import</span> <span class="s">&#34;github.com/thecodingmachine/gotenberg/pkg&#34;</span>
 
-<span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
+<span class="kd">func</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">c</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">Client</span><span class="p">{</span><span class="nx">Hostname</span><span class="p">:</span> <span class="s">&#34;http://localhost:3000&#34;</span><span class="p">}</span>
-    <span class="nx">req</span> <span class="o">:=</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">HTMLRequest</span><span class="p">{</span>
-        <span class="nx">IndexFilePath</span><span class="p">:</span> <span class="s">&#34;index.html&#34;</span><span class="p">,</span>
-        <span class="nx">Options</span><span class="p">:</span> <span class="o">&amp;</span><span class="nx">gotenberg</span><span class="p">.</span><span class="nx">HTMLOptions</span><span class="p">{</span>
-            <span class="nx">WebHookURL</span><span class="p">:</span> <span class="s">&#34;http://myapp.com/webhook/&#34;</span><span class="p">,</span>
-        <span class="p">},</span>
-    <span class="p">}</span>
+    <span class="nx">req</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">gotenberg</span><span class="p">.</span><span class="nf">NewHTMLRequest</span><span class="p">(</span><span class="s">&#34;index.html&#34;</span><span class="p">)</span>
+    <span class="nx">req</span><span class="p">.</span><span class="nf">SetWebhookURL</span><span class="p">(</span><span class="s">&#34;http://myapp.com/webhook/&#34;</span><span class="p">)</span>
     <span class="nx">dest</span> <span class="o">:=</span> <span class="s">&#34;result.pdf&#34;</span>
-    <span class="nx">resp</span><span class="p">,</span> <span class="nx">err</span> <span class="o">:=</span> <span class="nx">c</span><span class="p">.</span><span class="nx">Post</span><span class="p">(</span><span class="nx">req</span><span class="p">)</span>
+    <span class="nx">resp</span><span class="p">,</span> <span class="nx">_</span> <span class="o">:=</span> <span class="nx">c</span><span class="p">.</span><span class="nf">Post</span><span class="p">(</span><span class="nx">req</span><span class="p">)</span>
 <span class="p">}</span>
 </pre>
 
@@ -772,16 +805,16 @@ to given URL.</p>
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>PHP</h3>
 
-<pre class="chroma"><span class="x">use TheCodingMachine\Gotenberg\Client;
-</span><span class="x">use TheCodingMachine\Gotenberg\DocumentFactory;
-</span><span class="x">use TheCodingMachine\Gotenberg\HTMLRequest;
-</span><span class="x">
-</span><span class="x">$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
-</span><span class="x">$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
-</span><span class="x">$request = new HTMLRequest($index);
-</span><span class="x">$request-&gt;setWebhookURL(&#39;http://myapp.com/webhook/&#39;);
-</span><span class="x">$resp = $client-&gt;post($request);
-</span><span class="x"></span></pre>
+<pre class="chroma">use TheCodingMachine\Gotenberg\Client;
+use TheCodingMachine\Gotenberg\DocumentFactory;
+use TheCodingMachine\Gotenberg\HTMLRequest;
+
+$client = new Client(&#39;http://localhost:3000&#39;, new \Http\Adapter\Guzzle6\Client());
+$index = DocumentFactory::makeFromPath(&#39;index.html&#39;, &#39;index.html&#39;);
+$request = new HTMLRequest($index);
+$request-&gt;setWebhookURL(&#39;http://myapp.com/webhook/&#39;);
+$resp = $client-&gt;post($request);
+</pre>
 
               </div>
             

docs/theme/gotenberg/views/index.html

@@ -14,7 +14,7 @@
       <div class="Container">
         <div class="Header">
           <div class="Title center">
-            <img src="https://user-images.githubusercontent.com/8983173/49701110-4c8b9280-fbe8-11e8-895c-a4b9c7d2515b.png" alt="Gotenberg logo" width="250" height="250" />
+            <img src="https://user-images.githubusercontent.com/8983173/50009948-84b01e00-ffb8-11e8-850b-fc240382c626.png" alt="Gotenberg logo" width="250" height="250" />
             <span class="text">{{.Title}}</span>
             <span class="subtext">{{.Subtitle}}</span>
           </div>

go.mod

@@ -4,7 +4,7 @@ require (
 	github.com/derekparker/delve v1.1.0
 	github.com/google/go-cmp v0.2.0 // indirect
 	github.com/gorilla/websocket v1.4.0 // indirect
-	github.com/hhrutter/pdfcpu v0.1.18
+	github.com/hhrutter/pdfcpu v0.1.19
 	github.com/labstack/echo v0.0.0-20181123063703-c7eb8da9ec73
 	github.com/labstack/gommon v0.2.8
 	github.com/mafredri/cdp v0.20.0

go.sum

@@ -10,6 +10,8 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/hhrutter/pdfcpu v0.1.18 h1:GX3d6tZxmQlmB5X9VUyOtx7+HZZpR+8ISLqBineP6dc=
 github.com/hhrutter/pdfcpu v0.1.18/go.mod h1:iaCmXGnOXPIvoGLELZZc4m/GpIopVsvLQ00thrbu8LU=
+github.com/hhrutter/pdfcpu v0.1.19 h1:J6GjNFDPjurQWallPW9gmz3CcNqBfvgB7Dad9T3e8Hc=
+github.com/hhrutter/pdfcpu v0.1.19/go.mod h1:iaCmXGnOXPIvoGLELZZc4m/GpIopVsvLQ00thrbu8LU=
 github.com/labstack/echo v0.0.0-20181123063703-c7eb8da9ec73 h1:oQvA3Xy8274W5Ldgo6Nogy4lX8XO5AaIBsjF5Ggk0IU=
 github.com/labstack/echo v0.0.0-20181123063703-c7eb8da9ec73/go.mod h1:rS0D1UPvC8/3sXjhSwEq+K1olh7ipbDhjDWATN2KSgA=
 github.com/labstack/echo v3.3.5+incompatible h1:9PfxPUmasKzeJor9uQTaXLT6WUG/r+vSTmvXxvv3JO4=

internal/app/api/api.go

@@ -87,14 +87,15 @@ func newContext(r *resource) (context.Context, context.CancelFunc) {
 func print(c echo.Context, p printer.Printer, r *resource) error {
 	baseFilename, err := rand.Get()
 	if err != nil {
-		return fmt.Errorf("getting result file name: %v", err)
+		return hijackErr(fmt.Errorf("getting result file name: %v", err), r)
 	}
 	filename := fmt.Sprintf("%s.pdf", baseFilename)
 	fpath := fmt.Sprintf("%s/%s", r.dirPath, filename)
 	if r.webhookURL() == "" {
+		defer r.removeAll()
 		// if no webhook URL given, run conversion
 		// and directly return the resulting PDF file
-		// or and error.
+		// or an error.
 		if err := p.Print(fpath); err != nil {
 			return err
 		}
@@ -104,6 +105,7 @@ func print(c echo.Context, p printer.Printer, r *resource) error {
 	// run the following lines in a goroutine so that
 	// it doesn't block.
 	go func() {
+		defer r.removeAll()
 		if err := p.Print(fpath); err != nil {
 			c.Logger().Errorf("%v", err)
 			return
@@ -123,3 +125,10 @@ func print(c echo.Context, p printer.Printer, r *resource) error {
 	}()
 	return nil
 }
+
+func hijackErr(err error, r *resource) error {
+	if r != nil {
+		defer r.removeAll()
+	}
+	return err
+}

internal/app/api/html.go

@@ -8,9 +8,8 @@ import (
 func convertHTML(c echo.Context) error {
 	r, err := newResource(c)
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
-	defer r.removeAll()
 	ctx, cancel := newContext(r)
 	if cancel != nil {
 		defer cancel()
@@ -18,26 +17,26 @@ func convertHTML(c echo.Context) error {
 	p := &printer.HTML{Context: ctx}
 	indexPath, err := r.filePath("index.html")
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	p.WithLocalURL(indexPath)
 	headerPath, _ := r.filePath("header.html")
 	if err := p.WithHeaderFile(headerPath); err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	footerPath, _ := r.filePath("footer.html")
 	if err := p.WithFooterFile(footerPath); err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	paperSize, err := r.paperSize()
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	p.PaperWidth = paperSize[0]
 	p.PaperHeight = paperSize[1]
 	paperMargins, err := r.paperMargins()
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	p.MarginTop = paperMargins[0]
 	p.MarginBottom = paperMargins[1]
@@ -45,7 +44,7 @@ func convertHTML(c echo.Context) error {
 	p.MarginRight = paperMargins[3]
 	landscape, err := r.landscape()
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	p.Landscape = landscape
 	return print(c, p, r)

internal/app/api/markdown.go

@@ -8,35 +8,34 @@ import (
 func convertMarkdown(c echo.Context) error {
 	r, err := newResource(c)
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
-	defer r.removeAll()
 	ctx, cancel := newContext(r)
 	if cancel != nil {
 		defer cancel()
 	}
 	indexPath, err := r.filePath("index.html")
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	p := &printer.Markdown{Context: ctx, TemplatePath: indexPath}
 	headerPath, _ := r.filePath("header.html")
 	if err := p.WithHeaderFile(headerPath); err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	footerPath, _ := r.filePath("footer.html")
 	if err := p.WithFooterFile(footerPath); err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	paperSize, err := r.paperSize()
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	p.PaperWidth = paperSize[0]
 	p.PaperHeight = paperSize[1]
 	paperMargins, err := r.paperMargins()
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	p.MarginTop = paperMargins[0]
 	p.MarginBottom = paperMargins[1]
@@ -44,7 +43,7 @@ func convertMarkdown(c echo.Context) error {
 	p.MarginRight = paperMargins[3]
 	landscape, err := r.landscape()
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	p.Landscape = landscape
 	return print(c, p, r)

internal/app/api/merge.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -13,23 +14,26 @@ import (
 func merge(c echo.Context) error {
 	r, err := newResource(c)
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
-	defer r.removeAll()
 	fpaths, err := r.filePaths([]string{".pdf"})
 	if err != nil {
-		return err
+		return hijackErr(err, r)
+	}
+	if len(fpaths) == 0 {
+		return hijackErr(errors.New("no suitable PDF files to merge"), r)
 	}
 	baseFilename, err := rand.Get()
 	if err != nil {
-		return fmt.Errorf("getting result file name: %v", err)
+		return hijackErr(fmt.Errorf("getting result file name: %v", err), r)
 	}
 	filename := fmt.Sprintf("%s.pdf", baseFilename)
 	fpath := fmt.Sprintf("%s/%s", r.dirPath, filename)
 	if r.webhookURL() == "" {
+		defer r.removeAll()
 		// if no webhook URL given, run merge
 		// and directly return the resulting PDF file
-		// or and error.
+		// or an error.
 		if err := printer.Merge(fpaths, fpath); err != nil {
 			return err
 		}
@@ -39,6 +43,7 @@ func merge(c echo.Context) error {
 	// run the following lines in a goroutine so that
 	// it doesn't block.
 	go func() {
+		defer r.removeAll()
 		if err := printer.Merge(fpaths, fpath); err != nil {
 			c.Logger().Errorf("%v", err)
 			return

internal/app/api/office.go

@@ -8,6 +8,8 @@ import (
 )
 
 var officeExts = []string{
+	".txt",
+	".rtf",
 	".doc",
 	".docx",
 	".odt",
@@ -22,20 +24,30 @@ var officeExts = []string{
 func convertOffice(c echo.Context) error {
 	r, err := newResource(c)
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
-	defer r.removeAll()
 	ctx, cancel := newContext(r)
 	if cancel != nil {
 		defer cancel()
 	}
 	fpaths, err := r.filePaths(officeExts)
 	if err != nil {
-		return err
+		return hijackErr(err, r)
 	}
 	if len(fpaths) == 0 {
-		return errors.New("no suitable office documents to convert")
+		return hijackErr(errors.New("no suitable office documents to convert"), r)
 	}
 	p := &printer.Office{Context: ctx, FilePaths: fpaths}
+	paperSize, err := r.paperSize()
+	if err != nil {
+		return hijackErr(err, r)
+	}
+	p.PaperWidth = paperSize[0]
+	p.PaperHeight = paperSize[1]
+	landscape, err := r.landscape()
+	if err != nil {
+		return hijackErr(err, r)
+	}
+	p.Landscape = landscape
 	return print(c, p, r)
 }

internal/app/api/resource.go

@@ -49,17 +49,17 @@ func newResource(c echo.Context) (*resource, error) {
 	r := &resource{values: v, dirPath: dirPath}
 	form, err := c.MultipartForm()
 	if err != nil {
-		return nil, fmt.Errorf("getting multipart form: %v", err)
+		return r, fmt.Errorf("getting multipart form: %v", err)
 	}
 	for _, files := range form.File {
 		for _, fh := range files {
 			in, err := fh.Open()
 			if err != nil {
-				return nil, fmt.Errorf("%s: opening file: %v", fh.Filename, err)
+				return r, fmt.Errorf("%s: opening file: %v", fh.Filename, err)
 			}
 			defer in.Close()
 			if err := r.writeFile(fh.Filename, in); err != nil {
-				return nil, err
+				return r, err
 			}
 		}
 	}

internal/pkg/printer/doc.go

@@ -1,52 +1,7 @@
 /*
 Package printer contains structs which convert
-a specific file type to PDF:
+a specific file type to PDF.
 
- // converting HTML to PDF.
- p := &printer.HTML{
-	 Context: context.Background(),
-	 PaperWidth: 8.27,
-	 PaperHeight: 11.7,
-	 Landscape: false,
- }
- p.WithLocalURL("index.html")
- if err := p.Print("result.pdf"); err != nil {
-	 return err
- }
-
- // converting Markdown to PDF:
- // it assumes here that our template "index.html"
- // will call toHTML method to convert
- // markdown files to HTML.
- p := &printer.Markdown{
-	 Context: context.Background(),
-	 TemplatePath: "index.html",
-	 PaperWidth: 8.27,
-	 PaperHeight: 11.7,
-	 Landscape: false,
- }
- if err := p.Print("result.pdf"); err != nil {
-	 return err
- }
-
- // converting Office documents to PDF:
- // it converts each files independently and
- // then merge them.
- //
- // Also, as unoconv cannot perform
- // concurrent conversions, a lock is applied.
- p := &printer.Office{
-	 Context: ctx,
-	 FilePaths: []string{"document.docx", "presentation.pptx"}
- }
- if err := p.Print("result.pdf"); err != nil {
-	 return err
- }
-
-It is also able to merge a list of PDF files:
-
- if err := printer.Merge([]string{"foo.pdf", "bar.pdf"}, "result.pdf"); err != nil {
-	 return err
- }
+It is also able to merge a list of PDF files.
 */
 package printer

internal/pkg/printer/office.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 	"sync"
 
 	"github.com/thecodingmachine/gotenberg/internal/pkg/rand"
@@ -16,8 +17,11 @@ var mu sync.Mutex
 
 // Office facilitates Office documents to PDF conversion.
 type Office struct {
-	Context   context.Context
-	FilePaths []string
+	Context     context.Context
+	FilePaths   []string
+	PaperWidth  float64
+	PaperHeight float64
+	Landscape   bool
 }
 
 // Print converts Office documents to PDF.
@@ -32,14 +36,24 @@ func (o *Office) Print(destination string) error {
 			return err
 		}
 		tmpDest := fmt.Sprintf("%s/%s.pdf", dirPath, baseFilename)
+		paperSize, err := unoconvPaperSize(o.PaperWidth, o.PaperHeight)
+		if err != nil {
+			return err
+		}
+		cmdArgs := []string{
+			"--format",
+			"pdf",
+			"--printer",
+			paperSize,
+		}
+		if o.Landscape {
+			cmdArgs = append(cmdArgs, "--printer", "PaperOrientation=landscape")
+		}
+		cmdArgs = append(cmdArgs, "--output", tmpDest, fpath)
 		cmd := exec.CommandContext(
 			o.Context,
 			"unoconv",
-			"--format",
-			"pdf",
-			"--output",
-			tmpDest,
-			fpath,
+			cmdArgs...,
 		)
 		_, err = cmd.Output()
 		if o.Context.Err() == context.DeadlineExceeded {
@@ -56,6 +70,18 @@ func (o *Office) Print(destination string) error {
 	return Merge(fpaths, destination)
 }
 
+func unoconvPaperSize(paperWidth, paperHeight float64) (string, error) {
+	width, err := strconv.Atoi(fmt.Sprintf("%.0f", paperWidth*25.4))
+	if err != nil {
+		return "", fmt.Errorf("%0.f: converting width to millimiter: %v", paperWidth, err)
+	}
+	height, err := strconv.Atoi(fmt.Sprintf("%.0f", paperHeight*25.4))
+	if err != nil {
+		return "", fmt.Errorf("%0.f: converting height to millimiter: %v", paperHeight, err)
+	}
+	return fmt.Sprintf("PaperSize=%dx%d", width, height), nil
+}
+
 // Compile-time checks to ensure type implements desired interfaces.
 var (
 	_ = Printer(new(Office))

internal/pkg/printer/office_test.go

@@ -20,6 +20,8 @@ func TestOffice(t *testing.T) {
 		Context: ctx,
 		FilePaths: []string{
 			fmt.Sprintf("%s/%s", dirPath, "document.docx"),
+			fmt.Sprintf("%s/%s", dirPath, "document.txt"),
+			fmt.Sprintf("%s/%s", dirPath, "document.rtf"),
 		},
 	}
 	dst := fmt.Sprintf("%s/%s", dirPath, "foo.pdf")

internal/pkg/printer/printer.go

@@ -3,11 +3,19 @@ package printer
 import (
 	"fmt"
 	"io/ioutil"
+	"os/exec"
 
 	pdfcpuAPI "github.com/hhrutter/pdfcpu/pkg/api"
+	pdfcpuLog "github.com/hhrutter/pdfcpu/pkg/log"
 	pdfcpuConfig "github.com/hhrutter/pdfcpu/pkg/pdfcpu"
 )
 
+func init() {
+	// disable loggers when merging
+	// PDFs.
+	pdfcpuLog.DisableLoggers()
+}
+
 // Printer is a type that can create a PDF file from a source.
 // The source is defined in the underlying implementation.
 type Printer interface {
@@ -16,9 +24,18 @@ type Printer interface {
 
 // Merge merges PDF files.
 func Merge(fpaths []string, destination string) error {
-	cmd := pdfcpuAPI.MergeCommand(fpaths, destination, pdfcpuConfig.NewDefaultConfiguration())
-	_, err := pdfcpuAPI.Merge(cmd)
-	return err
+	cmdcpu := pdfcpuAPI.MergeCommand(fpaths, destination, pdfcpuConfig.NewDefaultConfiguration())
+	_, err := pdfcpuAPI.Merge(cmdcpu)
+	if err == nil {
+		return nil
+	}
+	// if pdfcpu failed to merge PDF files...
+	// https://github.com/thecodingmachine/gotenberg/issues/29
+	var cmdArgs []string
+	cmdArgs = append(cmdArgs, fpaths...)
+	cmdArgs = append(cmdArgs, "cat", "output", destination)
+	cmd := exec.Command("pdftk", cmdArgs...)
+	return cmd.Run()
 }
 
 func writeBytesToFile(dst string, b []byte) error {

internal/pkg/printer/printer_test.go

@@ -16,7 +16,7 @@ func TestMerge(t *testing.T) {
 	err := Merge(
 		[]string{
 			fmt.Sprintf("%s/%s", dirPath, "gotenberg.pdf"),
-			fmt.Sprintf("%s/%s", dirPath, "gotenberg.pdf"),
+			fmt.Sprintf("%s/%s", dirPath, "gotenberg_bis.pdf"),
 		},
 		dst,
 	)

pkg/README.md

@@ -16,19 +16,17 @@ import "github.com/thecodingmachine/gotenberg/pkg"
 func main() {
     // HTML conversion example.
     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-    req := &gotenberg.HTMLRequest{
-        IndexFilePath: "index.html",
-        AssetFilePaths: []string{
-            "style.css",
-            "img.png",
-        },
-        Options: &gotenberg.HTMLOptions{
-            HeaderFilePath: "header.html",
-            FooterFilePath: "footer.html",
-            PaperSize:      gotenberg.A4,
-            PaperMargins:   gotenberg.NormalMargins,  
-        },
-    }
+    req, _ := gotenberg.NewHTMLRequest("index.html")
+    req.SetHeader("header.html")
+    req.SetFooter("footer.html")
+    req.SetAssets([]string{
+        "font.woff",
+        "img.gif",
+        "style.css",
+    })
+    req.SetPaperSize(gotenberg.A4)
+    req.SetMargins(gotenberg.NormalMargins)
+    req.SetLandscape(false)
     dest := "foo.pdf"
     c.Store(req, dest)
 }

pkg/client.go

@@ -59,18 +59,35 @@ type Client struct {
 // form values and form files to
 // the Gotenberg API.
 type Request interface {
-	validate() error
+	SetWebhookURL(webhookURL string)
 	getPostURL() string
 	getFormValues() map[string]string
 	getFormFiles() map[string]string
 }
 
+// ChromeRequest is a type for sending
+// conversion requests which will be
+// handle by Google Chrome.
+type ChromeRequest interface {
+	SetHeader(fpath string) error
+	SetFooter(fpath string) error
+	SetAssets(fpaths []string) error
+	SetPaperSize(size [2]float64)
+	SetMargins(margins [4]float64)
+	SetLandscape(isLandscape bool)
+}
+
+// UnoconvRequest is a type for sending
+// conversion requests which will be
+// handle by unoconv.
+type UnoconvRequest interface {
+	SetPaperSize(size [2]float64)
+	SetLandscape(landscape bool)
+}
+
 // Post sends a request to the Gotenberg API
 // and returns the response.
 func (c *Client) Post(req Request) (*http.Response, error) {
-	if err := req.validate(); err != nil {
-		return nil, err
-	}
 	body, contentType, err := multipartForm(req)
 	if err != nil {
 		return nil, err

pkg/doc.go

@@ -2,30 +2,7 @@
 Package gotenberg is a Go client for
 interacting with a Gotenberg API.
 
-For instance, if you want to convert HTML:
-
- import "github.com/thecodingmachine/gotenberg/pkg"
-
- func main() {
-     // HTML conversion example.
-     c := &gotenberg.Client{Hostname: "http://localhost:3000"}
-     req := &gotenberg.HTMLRequest{
-         IndexFilePath: "index.html",
-         AssetFilePaths: []string{
-             "style.css",
-             "img.png",
-         },
-         Options: &gotenberg.HTMLOptions{
-             HeaderFilePath: "header.html",
-             FooterFilePath: "footer.html",
-             PaperSize:      gotenberg.A4,
-             PaperMargins:   gotenberg.NormalMargins,
-         },
-     }
-     dest := "foo.pdf"
-     c.Store(req, dest)
- }
-
-For more complete usages, head to the https://thecodingmachine.gotenberg.github.io.
+For more complete usages, head to the documentation:
+https://thecodingmachine.gotenberg.github.io.
 */
 package gotenberg

pkg/html.go

@@ -9,64 +9,89 @@ import (
 // HTMLRequest facilitates HTML conversion
 // with the Gotenberg API.
 type HTMLRequest struct {
-	IndexFilePath  string
-	AssetFilePaths []string
-	Options        *HTMLOptions
+	indexFilePath  string
+	headerFilePath string
+	footerFilePath string
+	assetFilePaths []string
+	values         map[string]string
 }
 
-// HTMLOptions gathers all options
-// for HTML conversion with the Gotenberg API.
-type HTMLOptions struct {
-	WebHookURL     string
-	HeaderFilePath string
-	FooterFilePath string
-	PaperSize      [2]float64
-	PaperMargins   [4]float64
-	Landscape      bool
+// NewHTMLRequest create HTMLRequest.
+func NewHTMLRequest(indexFilePath string) (*HTMLRequest, error) {
+	if !fileExists(indexFilePath) {
+		return nil, fmt.Errorf("%s: index file does not exist", indexFilePath)
+	}
+	return &HTMLRequest{indexFilePath: indexFilePath, values: make(map[string]string)}, nil
 }
 
-func (html *HTMLRequest) validate() error {
-	if !fileExists(html.IndexFilePath) {
-		return fmt.Errorf("%s: index file does not exist", html.IndexFilePath)
-	}
-	if html.Options.HeaderFilePath != "" && !fileExists(html.Options.HeaderFilePath) {
-		return fmt.Errorf("%s: header file does not exist", html.Options.HeaderFilePath)
-	}
-	if html.Options.FooterFilePath != "" && !fileExists(html.Options.FooterFilePath) {
-		return fmt.Errorf("%s: footer file does not exist", html.Options.FooterFilePath)
+// SetWebhookURL sets webhookURL form field.
+func (html *HTMLRequest) SetWebhookURL(webhookURL string) {
+	html.values[webhookURL] = webhookURL
+}
+
+// SetHeader sets header form file.
+func (html *HTMLRequest) SetHeader(fpath string) error {
+	if !fileExists(fpath) {
+		return fmt.Errorf("%s: header file does not exist", fpath)
 	}
+	html.headerFilePath = fpath
 	return nil
 }
 
+// SetFooter sets footer form file.
+func (html *HTMLRequest) SetFooter(fpath string) error {
+	if !fileExists(fpath) {
+		return fmt.Errorf("%s: footer file does not exist", fpath)
+	}
+	html.footerFilePath = fpath
+	return nil
+}
+
+// SetAssets sets assets form files.
+func (html *HTMLRequest) SetAssets(fpaths []string) error {
+	for _, fpath := range fpaths {
+		if !fileExists(fpath) {
+			return fmt.Errorf("%s: file does not exist", fpath)
+		}
+	}
+	html.assetFilePaths = fpaths
+	return nil
+}
+
+// SetPaperSize sets paperWidth and paperHeight form fields.
+func (html *HTMLRequest) SetPaperSize(size [2]float64) {
+	html.values[paperWidth] = fmt.Sprintf("%f", size[0])
+	html.values[paperHeight] = fmt.Sprintf("%f", size[1])
+}
+
+// SetMargins sets marginTop, marginBottom,
+// marginLeft and marginRight form fields.
+func (html *HTMLRequest) SetMargins(margins [4]float64) {
+	html.values[marginTop] = fmt.Sprintf("%f", margins[0])
+	html.values[marginBottom] = fmt.Sprintf("%f", margins[1])
+	html.values[marginLeft] = fmt.Sprintf("%f", margins[2])
+	html.values[marginRight] = fmt.Sprintf("%f", margins[3])
+}
+
+// SetLandscape sets landscape form field.
+func (html *HTMLRequest) SetLandscape(isLandscape bool) {
+	html.values[landscape] = strconv.FormatBool(isLandscape)
+}
+
 func (html *HTMLRequest) getPostURL() string {
 	return "/convert/html"
 }
 
 func (html *HTMLRequest) getFormValues() map[string]string {
-	if html.Options == nil {
-		html.Options = &HTMLOptions{}
-	}
-	values := make(map[string]string)
-	values[webhookURL] = html.Options.WebHookURL
-	values[paperWidth] = fmt.Sprintf("%f", html.Options.PaperSize[0])
-	values[paperHeight] = fmt.Sprintf("%f", html.Options.PaperSize[1])
-	values[marginTop] = fmt.Sprintf("%f", html.Options.PaperMargins[0])
-	values[marginBottom] = fmt.Sprintf("%f", html.Options.PaperMargins[1])
-	values[marginLeft] = fmt.Sprintf("%f", html.Options.PaperMargins[2])
-	values[marginRight] = fmt.Sprintf("%f", html.Options.PaperMargins[3])
-	values[landscape] = strconv.FormatBool(html.Options.Landscape)
-	return values
+	return html.values
 }
 
 func (html *HTMLRequest) getFormFiles() map[string]string {
-	if html.Options == nil {
-		html.Options = &HTMLOptions{}
-	}
 	files := make(map[string]string)
-	files["index.html"] = html.IndexFilePath
-	files["header.html"] = html.Options.HeaderFilePath
-	files["footer.html"] = html.Options.FooterFilePath
-	for _, fpath := range html.AssetFilePaths {
+	files["index.html"] = html.indexFilePath
+	files["header.html"] = html.headerFilePath
+	files["footer.html"] = html.footerFilePath
+	for _, fpath := range html.assetFilePaths {
 		files[filepath.Base(fpath)] = fpath
 	}
 	return files
@@ -75,4 +100,5 @@ func (html *HTMLRequest) getFormFiles() map[string]string {
 // Compile-time checks to ensure type implements desired interfaces.
 var (
 	_ = Request(new(HTMLRequest))
+	_ = ChromeRequest(new(HTMLRequest))
 )

pkg/html_test.go

@@ -13,20 +13,21 @@ import (
 
 func TestHTML(t *testing.T) {
 	c := &Client{Hostname: "http://localhost:3000"}
-	req := &HTMLRequest{
-		IndexFilePath: test.HTMLTestFilePath(t, "index.html"),
-		AssetFilePaths: []string{
-			test.HTMLTestFilePath(t, "font.woff"),
-			test.HTMLTestFilePath(t, "img.gif"),
-			test.HTMLTestFilePath(t, "style.css"),
-		},
-		Options: &HTMLOptions{
-			HeaderFilePath: test.HTMLTestFilePath(t, "header.html"),
-			FooterFilePath: test.HTMLTestFilePath(t, "footer.html"),
-			PaperSize:      A4,
-			PaperMargins:   NormalMargins,
-		},
-	}
+	req, err := NewHTMLRequest(test.HTMLTestFilePath(t, "index.html"))
+	require.Nil(t, err)
+	err = req.SetHeader(test.HTMLTestFilePath(t, "header.html"))
+	require.Nil(t, err)
+	err = req.SetFooter(test.HTMLTestFilePath(t, "footer.html"))
+	require.Nil(t, err)
+	err = req.SetAssets([]string{
+		test.HTMLTestFilePath(t, "font.woff"),
+		test.HTMLTestFilePath(t, "img.gif"),
+		test.HTMLTestFilePath(t, "style.css"),
+	})
+	require.Nil(t, err)
+	req.SetPaperSize(A4)
+	req.SetMargins(NormalMargins)
+	req.SetLandscape(false)
 	dirPath, err := rand.Get()
 	require.Nil(t, err)
 	dest := fmt.Sprintf("%s/foo.pdf", dirPath)
@@ -36,3 +37,11 @@ func TestHTML(t *testing.T) {
 	err = os.RemoveAll(dirPath)
 	assert.Nil(t, err)
 }
+
+func TestConcurrentHTML(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		go func() {
+			TestHTML(t)
+		}()
+	}
+}

pkg/markdown.go

@@ -9,73 +9,102 @@ import (
 // MarkdownRequest facilitates Markdown conversion
 // with the Gotenberg API.
 type MarkdownRequest struct {
-	IndexFilePath     string
-	MarkdownFilePaths []string
-	AssetFilePaths    []string
-	Options           *MarkdownOptions
+	indexFilePath     string
+	markdownFilePaths []string
+	headerFilePath    string
+	footerFilePath    string
+	assetFilePaths    []string
+	values            map[string]string
 }
 
-// MarkdownOptions gathers all options
-// for Markdown conversion with the Gotenberg API.
-type MarkdownOptions struct {
-	WebHookURL     string
-	HeaderFilePath string
-	FooterFilePath string
-	PaperSize      [2]float64
-	PaperMargins   [4]float64
-	Landscape      bool
-}
-
-func (markdown *MarkdownRequest) validate() error {
-	if !fileExists(markdown.IndexFilePath) {
-		return fmt.Errorf("%s: index file does not exist", markdown.IndexFilePath)
+// NewMarkdownRequest create MarkdownRequest.
+func NewMarkdownRequest(indexFilePath string, markdownFilePaths []string) (*MarkdownRequest, error) {
+	if !fileExists(indexFilePath) {
+		return nil, fmt.Errorf("%s: index file does not exist", indexFilePath)
 	}
-	if markdown.Options.HeaderFilePath != "" && !fileExists(markdown.Options.HeaderFilePath) {
-		return fmt.Errorf("%s: header file does not exist", markdown.Options.HeaderFilePath)
-	}
-	if markdown.Options.FooterFilePath != "" && !fileExists(markdown.Options.FooterFilePath) {
-		return fmt.Errorf("%s: footer file does not exist", markdown.Options.FooterFilePath)
-	}
-	for _, fpath := range markdown.MarkdownFilePaths {
+	for _, fpath := range markdownFilePaths {
 		if !fileExists(fpath) {
-			return fmt.Errorf("%s: markdown file does not exist", fpath)
+			return nil, fmt.Errorf("%s: markdown file does not exist", fpath)
 		}
 	}
+	return &MarkdownRequest{
+		indexFilePath:     indexFilePath,
+		markdownFilePaths: markdownFilePaths,
+		values:            make(map[string]string),
+	}, nil
+}
+
+// SetWebhookURL sets webhookURL form field.
+func (markdown *MarkdownRequest) SetWebhookURL(webhookURL string) {
+	markdown.values[webhookURL] = webhookURL
+}
+
+// SetHeader sets header form file.
+func (markdown *MarkdownRequest) SetHeader(fpath string) error {
+	if !fileExists(fpath) {
+		return fmt.Errorf("%s: header file does not exist", fpath)
+	}
+	markdown.headerFilePath = fpath
 	return nil
 }
 
+// SetFooter sets footer form file.
+func (markdown *MarkdownRequest) SetFooter(fpath string) error {
+	if !fileExists(fpath) {
+		return fmt.Errorf("%s: footer file does not exist", fpath)
+	}
+	markdown.footerFilePath = fpath
+	return nil
+}
+
+// SetAssets sets assets form files.
+func (markdown *MarkdownRequest) SetAssets(fpaths []string) error {
+	for _, fpath := range fpaths {
+		if !fileExists(fpath) {
+			return fmt.Errorf("%s: file does not exist", fpath)
+		}
+	}
+	markdown.assetFilePaths = fpaths
+	return nil
+}
+
+// SetPaperSize sets paperWidth and paperHeight form fields.
+func (markdown *MarkdownRequest) SetPaperSize(size [2]float64) {
+	markdown.values[paperWidth] = fmt.Sprintf("%f", size[0])
+	markdown.values[paperHeight] = fmt.Sprintf("%f", size[1])
+}
+
+// SetMargins sets marginTop, marginBottom,
+// marginLeft and marginRight form fields.
+func (markdown *MarkdownRequest) SetMargins(margins [4]float64) {
+	markdown.values[marginTop] = fmt.Sprintf("%f", margins[0])
+	markdown.values[marginBottom] = fmt.Sprintf("%f", margins[1])
+	markdown.values[marginLeft] = fmt.Sprintf("%f", margins[2])
+	markdown.values[marginRight] = fmt.Sprintf("%f", margins[3])
+}
+
+// SetLandscape sets landscape form field.
+func (markdown *MarkdownRequest) SetLandscape(isLandscape bool) {
+	markdown.values[landscape] = strconv.FormatBool(isLandscape)
+}
+
 func (markdown *MarkdownRequest) getPostURL() string {
 	return "/convert/markdown"
 }
 
 func (markdown *MarkdownRequest) getFormValues() map[string]string {
-	if markdown.Options == nil {
-		markdown.Options = &MarkdownOptions{}
-	}
-	values := make(map[string]string)
-	values[webhookURL] = markdown.Options.WebHookURL
-	values[paperWidth] = fmt.Sprintf("%f", markdown.Options.PaperSize[0])
-	values[paperHeight] = fmt.Sprintf("%f", markdown.Options.PaperSize[1])
-	values[marginTop] = fmt.Sprintf("%f", markdown.Options.PaperMargins[0])
-	values[marginBottom] = fmt.Sprintf("%f", markdown.Options.PaperMargins[1])
-	values[marginLeft] = fmt.Sprintf("%f", markdown.Options.PaperMargins[2])
-	values[marginRight] = fmt.Sprintf("%f", markdown.Options.PaperMargins[3])
-	values[landscape] = strconv.FormatBool(markdown.Options.Landscape)
-	return values
+	return markdown.values
 }
 
 func (markdown *MarkdownRequest) getFormFiles() map[string]string {
-	if markdown.Options == nil {
-		markdown.Options = &MarkdownOptions{}
-	}
 	files := make(map[string]string)
-	files["index.html"] = markdown.IndexFilePath
-	files["header.html"] = markdown.Options.HeaderFilePath
-	files["footer.html"] = markdown.Options.FooterFilePath
-	for _, fpath := range markdown.MarkdownFilePaths {
+	files["index.html"] = markdown.indexFilePath
+	files["header.html"] = markdown.headerFilePath
+	files["footer.html"] = markdown.footerFilePath
+	for _, fpath := range markdown.markdownFilePaths {
 		files[filepath.Base(fpath)] = fpath
 	}
-	for _, fpath := range markdown.AssetFilePaths {
+	for _, fpath := range markdown.assetFilePaths {
 		files[filepath.Base(fpath)] = fpath
 	}
 	return files
@@ -84,4 +113,5 @@ func (markdown *MarkdownRequest) getFormFiles() map[string]string {
 // Compile-time checks to ensure type implements desired interfaces.
 var (
 	_ = Request(new(MarkdownRequest))
+	_ = ChromeRequest(new(MarkdownRequest))
 )

pkg/markdown_test.go

@@ -13,25 +13,28 @@ import (
 
 func TestMarkdown(t *testing.T) {
 	c := &Client{Hostname: "http://localhost:3000"}
-	req := &MarkdownRequest{
-		IndexFilePath: test.MarkdownTestFilePath(t, "index.html"),
-		MarkdownFilePaths: []string{
+	req, err := NewMarkdownRequest(
+		test.MarkdownTestFilePath(t, "index.html"),
+		[]string{
 			test.MarkdownTestFilePath(t, "paragraph1.md"),
 			test.MarkdownTestFilePath(t, "paragraph2.md"),
 			test.MarkdownTestFilePath(t, "paragraph3.md"),
 		},
-		AssetFilePaths: []string{
-			test.HTMLTestFilePath(t, "font.woff"),
-			test.HTMLTestFilePath(t, "img.gif"),
-			test.HTMLTestFilePath(t, "style.css"),
-		},
-		Options: &MarkdownOptions{
-			HeaderFilePath: test.MarkdownTestFilePath(t, "header.html"),
-			FooterFilePath: test.MarkdownTestFilePath(t, "footer.html"),
-			PaperSize:      A4,
-			PaperMargins:   NormalMargins,
-		},
-	}
+	)
+	require.Nil(t, err)
+	err = req.SetHeader(test.MarkdownTestFilePath(t, "header.html"))
+	require.Nil(t, err)
+	err = req.SetFooter(test.MarkdownTestFilePath(t, "footer.html"))
+	require.Nil(t, err)
+	err = req.SetAssets([]string{
+		test.MarkdownTestFilePath(t, "font.woff"),
+		test.MarkdownTestFilePath(t, "img.gif"),
+		test.MarkdownTestFilePath(t, "style.css"),
+	})
+	require.Nil(t, err)
+	req.SetPaperSize(A4)
+	req.SetMargins(NormalMargins)
+	req.SetLandscape(false)
 	dirPath, err := rand.Get()
 	require.Nil(t, err)
 	dest := fmt.Sprintf("%s/foo.pdf", dirPath)
@@ -41,3 +44,11 @@ func TestMarkdown(t *testing.T) {
 	err = os.RemoveAll(dirPath)
 	assert.Nil(t, err)
 }
+
+func TestConcurrentMarkdown(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		go func() {
+			TestMarkdown(t)
+		}()
+	}
+}

pkg/merge.go

@@ -8,24 +8,23 @@ import (
 // MergeRequest facilitates merging PDF
 // with the Gotenberg API.
 type MergeRequest struct {
-	FilePaths []string
-	Options   *MergeOptions
+	filePaths []string
+	values    map[string]string
 }
 
-// MergeOptions gathers all options
-// for merging PDF
-// with the Gotenberg API.
-type MergeOptions struct {
-	WebHookURL string
-}
-
-func (merge *MergeRequest) validate() error {
-	for _, fpath := range merge.FilePaths {
+// NewMergeRequest create MergeRequest.
+func NewMergeRequest(fpaths []string) (*MergeRequest, error) {
+	for _, fpath := range fpaths {
 		if !fileExists(fpath) {
-			return fmt.Errorf("%s: PDF file does not exist", fpath)
+			return nil, fmt.Errorf("%s: file does not exist", fpath)
 		}
 	}
-	return nil
+	return &MergeRequest{filePaths: fpaths, values: make(map[string]string)}, nil
+}
+
+// SetWebhookURL sets webhookURL form field.
+func (merge *MergeRequest) SetWebhookURL(webhookURL string) {
+	merge.values[webhookURL] = webhookURL
 }
 
 func (merge *MergeRequest) getPostURL() string {
@@ -33,17 +32,12 @@ func (merge *MergeRequest) getPostURL() string {
 }
 
 func (merge *MergeRequest) getFormValues() map[string]string {
-	if merge.Options == nil {
-		merge.Options = &MergeOptions{}
-	}
-	values := make(map[string]string)
-	values[webhookURL] = merge.Options.WebHookURL
-	return values
+	return merge.values
 }
 
 func (merge *MergeRequest) getFormFiles() map[string]string {
 	files := make(map[string]string)
-	for _, fpath := range merge.FilePaths {
+	for _, fpath := range merge.filePaths {
 		files[filepath.Base(fpath)] = fpath
 	}
 	return files

pkg/merge_test.go

@@ -13,12 +13,11 @@ import (
 
 func TestMerge(t *testing.T) {
 	c := &Client{Hostname: "http://localhost:3000"}
-	req := &MergeRequest{
-		FilePaths: []string{
-			test.PDFTestFilePath(t, "gotenberg.pdf"),
-			test.PDFTestFilePath(t, "gotenberg.pdf"),
-		},
-	}
+	req, err := NewMergeRequest([]string{
+		test.PDFTestFilePath(t, "gotenberg.pdf"),
+		test.PDFTestFilePath(t, "gotenberg.pdf"),
+	})
+	require.Nil(t, err)
 	dirPath, err := rand.Get()
 	require.Nil(t, err)
 	dest := fmt.Sprintf("%s/foo.pdf", dirPath)
@@ -28,3 +27,11 @@ func TestMerge(t *testing.T) {
 	err = os.RemoveAll(dirPath)
 	assert.Nil(t, err)
 }
+
+func TestConcurrentMerge(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		go func() {
+			TestMerge(t)
+		}()
+	}
+}

pkg/office.go

@@ -3,29 +3,40 @@ package gotenberg
 import (
 	"fmt"
 	"path/filepath"
+	"strconv"
 )
 
 // OfficeRequest facilitates Office documents
 // conversion with the Gotenberg API.
 type OfficeRequest struct {
-	FilePaths []string
-	Options   *OfficeOptions
+	filePaths []string
+	values    map[string]string
 }
 
-// OfficeOptions gathers all options
-// for Office documents conversion
-// with the Gotenberg API.
-type OfficeOptions struct {
-	WebHookURL string
-}
-
-func (office *OfficeRequest) validate() error {
-	for _, fpath := range office.FilePaths {
+// NewOfficeRequest create OfficeRequest.
+func NewOfficeRequest(fpaths []string) (*OfficeRequest, error) {
+	for _, fpath := range fpaths {
 		if !fileExists(fpath) {
-			return fmt.Errorf("%s: office file does not exist", fpath)
+			return nil, fmt.Errorf("%s: file does not exist", fpath)
 		}
 	}
-	return nil
+	return &OfficeRequest{filePaths: fpaths, values: make(map[string]string)}, nil
+}
+
+// SetWebhookURL sets webhookURL form field.
+func (office *OfficeRequest) SetWebhookURL(webhookURL string) {
+	office.values[webhookURL] = webhookURL
+}
+
+// SetPaperSize sets paperWidth and paperHeight form fields.
+func (office *OfficeRequest) SetPaperSize(size [2]float64) {
+	office.values[paperWidth] = fmt.Sprintf("%f", size[0])
+	office.values[paperHeight] = fmt.Sprintf("%f", size[1])
+}
+
+// SetLandscape sets landscape form field.
+func (office *OfficeRequest) SetLandscape(isLandscape bool) {
+	office.values[landscape] = strconv.FormatBool(isLandscape)
 }
 
 func (office *OfficeRequest) getPostURL() string {
@@ -33,17 +44,12 @@ func (office *OfficeRequest) getPostURL() string {
 }
 
 func (office *OfficeRequest) getFormValues() map[string]string {
-	if office.Options == nil {
-		office.Options = &OfficeOptions{}
-	}
-	values := make(map[string]string)
-	values[webhookURL] = office.Options.WebHookURL
-	return values
+	return office.values
 }
 
 func (office *OfficeRequest) getFormFiles() map[string]string {
 	files := make(map[string]string)
-	for _, fpath := range office.FilePaths {
+	for _, fpath := range office.filePaths {
 		files[filepath.Base(fpath)] = fpath
 	}
 	return files
@@ -52,4 +58,5 @@ func (office *OfficeRequest) getFormFiles() map[string]string {
 // Compile-time checks to ensure type implements desired interfaces.
 var (
 	_ = Request(new(OfficeRequest))
+	_ = UnoconvRequest(new(OfficeRequest))
 )

pkg/office_test.go

@@ -13,11 +13,12 @@ import (
 
 func TestOffice(t *testing.T) {
 	c := &Client{Hostname: "http://localhost:3000"}
-	req := &OfficeRequest{
-		FilePaths: []string{
-			test.OfficeTestFilePath(t, "document.docx"),
-		},
-	}
+	req, err := NewOfficeRequest([]string{
+		test.OfficeTestFilePath(t, "document.docx"),
+	})
+	require.Nil(t, err)
+	req.SetPaperSize(A4)
+	req.SetLandscape(false)
 	dirPath, err := rand.Get()
 	require.Nil(t, err)
 	dest := fmt.Sprintf("%s/foo.pdf", dirPath)
@@ -27,3 +28,11 @@ func TestOffice(t *testing.T) {
 	err = os.RemoveAll(dirPath)
 	assert.Nil(t, err)
 }
+
+func TestConcurrentOffice(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		go func() {
+			TestOffice(t)
+		}()
+	}
+}

scripts/publish.sh

@@ -2,10 +2,10 @@
 
 set -e
 
-GOLANG_VERSION=1.11.2
-VERSION="$1"
-DOCKER_USER="$2"
-DOCKER_PASSWORD="$3"
+GOLANG_VERSION="$1"
+VERSION="$2"
+DOCKER_USER="$3"
+DOCKER_PASSWORD="$4"
 
 docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
 

test/testdata/office/document.txt

@@ -0,0 +1,3 @@
+Gutenberg
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.