From 8c6e4a071ed95718f9b3a9b59e371b5fdbf578b2 Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Sat, 5 Oct 2019 19:08:45 +0100
Subject: [PATCH 1/3] deps: Upgrade to latest version of emoji dependency

To add support for new emojis in Hugo, we need to upgrade our internal
dependency on the emoji package.

Note that we also need to update our tests, as the underlying emoji that
is rendered has changed.

Follow-up to #6391. (170f18d9352d39213170dd9d5e947eb45854c84b and
2df5d202c6fc6eb18ee0b259c3dd1156094947c5)
---
 data/docs.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/docs.json b/data/docs.json
index 03bb03574..1f21646f9 100644
--- a/data/docs.json
+++ b/data/docs.json
@@ -4109,7 +4109,7 @@
           "Examples": [
             [
               "{{ \"I :heart: Hugo\" | emojify }}",
-              "I ❤️ Hugo"
+              "I ❤ Hugo"
             ]
           ]
         },

From ea316f4b28775806a84bc0278eb6ad1fac1d5e96 Mon Sep 17 00:00:00 2001
From: Zach Bayoff <30878344+zbayoff@users.noreply.github.com>
Date: Sat, 12 Oct 2019 12:10:14 -0400
Subject: [PATCH 2/3] tpl: Add optional "title" attribute to iframe in Vimeo
 shortcode

Add an optional "title" attribute to the iframe in the vimeo shortcode. If one is not given, the title attribute will default to "vimeo video". It is imperative for iframes to have a non-empty "title" attribute in order to meet WCAG2.0 accessibility guidelines https://www.w3.org/TR/WCAG20-TECHS/H64.
---
 content/en/content-management/shortcodes.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/en/content-management/shortcodes.md b/content/en/content-management/shortcodes.md
index 3be1c6f9e..94966343a 100644
--- a/content/en/content-management/shortcodes.md
+++ b/content/en/content-management/shortcodes.md
@@ -345,10 +345,10 @@ Using the preceding `vimeo` example, the following HTML will be added to your re
 {{< /output >}}
 
 {{% tip %}}
-If you want to further customize the visual styling of the YouTube or Vimeo output, add a `class` named parameter when calling the shortcode. The new `class` will be added to the `<div>` that wraps the `<iframe>` *and* will remove the inline styles. Note that you will need to call the `id` as a named parameter as well.
+If you want to further customize the visual styling of the YouTube or Vimeo output, add a `class` named parameter when calling the shortcode. The new `class` will be added to the `<div>` that wraps the `<iframe>` *and* will remove the inline styles. Note that you will need to call the `id` as a named parameter as well. You can also give the vimeo video a descriptive title with `title`. 
 
 ```
-{{</* vimeo id="146022717" class="my-vimeo-wrapper-class" */>}}
+{{</* vimeo id="146022717" class="my-vimeo-wrapper-class" title="My vimeo video" */>}}
 ```
 {{% /tip %}}
 

From b2665ca27f07775939d89c46ca9398b728668b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sun, 20 Oct 2019 10:39:00 +0200
Subject: [PATCH 3/3] resources/images: Allow to set background fill colour

Closes #6298
---
 .../image-processing/index.md                 | 45 +++++++++++++++----
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/content/en/content-management/image-processing/index.md b/content/en/content-management/image-processing/index.md
index b83a6c103..f03c5bee6 100644
--- a/content/en/content-management/image-processing/index.md
+++ b/content/en/content-management/image-processing/index.md
@@ -2,7 +2,6 @@
 title: "Image Processing"
 description: "Image Page resources can be resized and cropped."
 date: 2018-01-24T13:10:00-05:00
-lastmod: 2018-01-26T15:59:07-05:00
 linktitle: "Image Processing"
 categories: ["content management"]
 keywords: [bundle,content,resources,images]
@@ -72,31 +71,42 @@ Image operations in Hugo currently **do not preserve EXIF data** as this is not
 
 In addition to the dimensions (e.g. `600x400`), Hugo supports a set of additional image options.
 
+### Background Color
 
-JPEG Quality
-: Only relevant for JPEG images, values 1 to 100 inclusive, higher is better. Default is 75.
+The background color to fill into the transparency layer. This is mostly useful when converting to a format that does not support transparency, e.g. `JPEG`.
+
+You can set the background color to use with a 3 or 6 digit hex code starting with `#`.
+
+```go
+{{ $image.Resize "600x jpg #b31280" }}
+```
+
+For color codes, see https://www.google.com/search?q=color+picker
+
+### JPEG Quality
+Only relevant for JPEG images, values 1 to 100 inclusive, higher is better. Default is 75.
 
 ```go
 {{ $image.Resize "600x q50" }}
 ```
 
-Rotate
-: Rotates an image by the given angle counter-clockwise. The rotation will be performed first to get the dimensions correct. The main use of this is to be able to manually correct for [EXIF orientation](https://github.com/golang/go/issues/4341) of JPEG images.
+### Rotate
+Rotates an image by the given angle counter-clockwise. The rotation will be performed first to get the dimensions correct. The main use of this is to be able to manually correct for [EXIF orientation](https://github.com/golang/go/issues/4341) of JPEG images.
 
 ```go
 {{ $image.Resize "600x r90" }}
 ```
 
-Anchor
-: Only relevant for the `Fill` method. This is useful for thumbnail generation where the main motive is located in, say, the left corner. 
+###  Anchor
+Only relevant for the `Fill` method. This is useful for thumbnail generation where the main motive is located in, say, the left corner. 
 Valid are `Center`, `TopLeft`, `Top`, `TopRight`, `Left`, `Right`, `BottomLeft`, `Bottom`, `BottomRight`.
 
 ```go
 {{ $image.Fill "300x200 BottomLeft" }}
 ```
 
-Resample Filter
-: Filter used in resizing. Default is `Box`, a simple and fast resampling filter appropriate for downscaling. 
+### Resample Filter
+Filter used in resizing. Default is `Box`, a simple and fast resampling filter appropriate for downscaling. 
 
 Examples are: `Box`, `NearestNeighbor`, `Linear`, `Gaussian`.
 
@@ -106,6 +116,16 @@ See https://github.com/disintegration/imaging for more. If you want to trade qua
 {{ $image.Resize "600x400 Gaussian" }}
 ```
 
+### Target Format
+
+By default the images is encoded in the source format, but you can set the target format as an option.
+
+Valid values are `jpg`, `png`, `tif`, `bmp`, and `gif`.
+
+```go
+{{ $image.Resize "600x jpg" }}
+```
+
 ## Image Processing Examples
 
 _The photo of the sunset used in the examples below is Copyright [Bjørn Erik Pedersen](https://commons.wikimedia.org/wiki/User:Bep) (Creative Commons Attribution-Share Alike 4.0 International license)_
@@ -160,6 +180,13 @@ quality = 75
 # Valid values are Smart, Center, TopLeft, Top, TopRight, Left, Right, BottomLeft, Bottom, BottomRight
 anchor = "smart"
 
+# Default background color. 
+# Hugo will preserve transparency for target formats that supports it,
+# but will fall back to this color for JPEG.
+# Expects a standard HEX color string with 3 or 6 digits.
+# See https://www.google.com/search?q=color+picker
+bgColor = "#ffffff"
+
 ```
 
 All of the above settings can also be set per image procecssing.