From d276e901b36d2576ef8350ed96b17f66254eac1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 26 Mar 2022 11:04:57 +0200 Subject: [PATCH] Squashed 'docs/' changes from a393f4cf4..63386081c 63386081c update cSpell config update 15c76494b Update cSpell custom dictionary (#1694) 34f3167b7 Update image processing (#1625) 7462cc798 fix: pipes in sample code break table creation (#1686) 48736447e Update anchorize.md 2ff0bd10b netlify: Hugo 0.95.0 0fc1d21b2 Update configuration.md 41855e372 Fix #1682 8c663433e Update related.md 7aa072eab netlify: Hugo 0.94.2 1682c7ee7 Update render-hooks.md ce1283cc4 Move the Render Hooks doc to its own page bbbbfbfc6 Update configuration-markup.md 92d91a316 Update configuration-markup.md 2e8068823 Update configuration-markup.md ff2dbca60 Update configuration-markup.md 89d8e5d65 Add code block documenation e993539f0 Update shortcodes.md c1b28dbfe netlify: Hugo 0.94.1 81b8c9b83 Merge branch 'tempv0.94.1' 4763b3d50 docs: Regenerate CLI docs b18463971 netlify: Bump to Hugo 0.94.0 4152ebc1d Merge branch 'tempv0.94.0' ba3a11ac2 docs: Regenerate docshelper e64016d13 docs: Regenerate docshelper 29180e4d2 add `.html` suffix to partial usage and references 3213e00f2 Docs tidy-up 6cfcae4b7 docs: Regenerate CLI docs 8a6cd0b4d docs: Regenerate docshelper b20ab262f Merge commit 'd706529720b3b2ccb99719ccd578062ca25a0cc2' git-subtree-dir: docs git-subtree-split: 63386081c55de6a7f97adde564a9cfc2ad326119 --- .cspell.json | 121 +++++ .../layouts/_default/baseof.html | 8 + content/en/about/security-model/index.md | 2 +- content/en/content-management/diagrams.md | 2 +- content/en/content-management/formats.md | 7 +- .../image-processing/index.md | 470 +++++++++++------- content/en/content-management/related.md | 6 +- content/en/content-management/urls.md | 1 + content/en/contribute/development.md | 2 +- content/en/functions/anchorize.md | 14 +- content/en/functions/append.md | 5 - content/en/functions/apply.md | 10 +- content/en/functions/group.md | 6 - content/en/functions/hugo.md | 7 +- content/en/functions/relurl.md | 5 +- content/en/functions/strings.Count.md | 8 +- .../getting-started/configuration-markup.md | 116 +---- content/en/getting-started/configuration.md | 16 + content/en/getting-started/installing.md | 2 +- .../deployment-with-rsync.md | 11 +- content/en/showcase/over/index.md | 2 +- content/en/templates/lists.md | 2 +- content/en/templates/partials.md | 4 +- content/en/templates/render-hooks.md | 172 +++++++ content/en/templates/template-debugging.md | 4 +- content/en/variables/shortcodes.md | 6 +- data/docs.json | 4 +- layouts/maintenance/list.html | 6 +- layouts/shortcodes/imgproc.html | 35 +- netlify.toml | 10 +- 30 files changed, 674 insertions(+), 390 deletions(-) create mode 100644 content/en/templates/render-hooks.md diff --git a/.cspell.json b/.cspell.json index 70811e515..2cac73c02 100644 --- a/.cspell.json +++ b/.cspell.json @@ -1,52 +1,89 @@ { "version": "0.2", "words": [ + "aaabaab", "aabb", "aabba", "aabbaa", "aabbaabb", "abourget", + "absurl", "adoc", "algolia", + "allowfullscreen", + "ananke", "anchorize", "anthonyfok", "asciidoctor", "attrlink", + "azblob", + "baseof", + "beevelop", + "bibtex", "Bjørn", "blackfriday", "blogue", "bogem", + "Bootcamp", + "brlink", "Brotli", + "Browsersync", "canonify", + "Catmull", "Catwoman", "Cheatsheet", + "choco", "chromastyles", "clockoon", "Cloudinary", "CNAME", "Codecademy's", "CODEOWNERS", + "Coen", "Commento", "Cond", "Contentful", + "copyrighthtml", + "corejs", "countrunes", "countwords", "crossreferences", + "datatable", + "DATOCMS", + "debugconfig", + "DELIM", + "dhersam", "digitalcraftsman", "Disqus", + "Dmdh", + "doas", "dokuwiki", + "dpkg", "DRING", "Emojify", "Enwrite", + "eopkg", "eparis", "errorf", + "erroridf", + "Evernote", + "exitwp", + "Feminella", "firstpost", + "Formspree", + "fpath", "Francia", "freenode", + "frontmatter", "funcs", "funcsig", "Garen", + "gcloud", "Getenv", + "getjson", + "getpage", + "Gmfc", + "Goel", "Gohugo", "gohugoio", "goldenbridge", @@ -58,67 +95,142 @@ "Grayscale", "Gruber", "gtag", + "hidecaption", "Hokus", + "hola", + "hügó", + "hugodeps", "hugodoc", + "Hugofy", "hugolang", "hugoversion", + "Hyas", "Hyvor", "iframes", + "ifttt", + "iife", "imgproc", + "importr", + "IMWQ", "indice", + "innershortcode", "Intelli", "interdoc", "IPTC", + "ismenucurrent", "Isset", "Isso", + "Jaco", + "johnpatitucci", "Joomla", + "JRBR", "jsonify", "katex", + "keycdn", + "KEYVALS", "kubernetes", + "Lanczos", + "langformatnumber", "lastmod", + "libwebp", "linktitle", + "Lipi", + "lrwxr", + "maingo", "markdownified", "markdownify", "mathjax", + "mdhender", + "mdshortcode", "mercredi", "Mittwoch", + "mkdir", "mmark", "monokai", "Morling", + "mspowerpoint", + "Multihost", "Muut", + "myclass", + "mydeployment", + "myindex", + "mylayout", + "mypage", "mypartials", "mypost", + "mysite", + "myspa", + "mystyle", + "mytheme", + "NDJSON", "needsexample", + "Netravali", + "newparam", + "Nikhil", + "Njjy", + "nlist", "nobr", "nocopy", "Norsk", + "nosniff", + "NOSQL", + "notoc", "novembre", + "NUMWORKERMULTIPLIER", + "Obhu", + "octohug", "Octopress", + "oldparam", + "onrender", "opengraph", "OWASP", "Pandoc", + "partialcached", + "Pastorius", + "Patitucci", + "PCRE", "peaceiris", "Pedersen", + "permalinkable", "plainify", + "POSIX", + "postprocess", "println", "publishdate", "Pygments", "querify", + "QVOMC", + "rdwatters", "readfile", + "rebinded", "REDIR", "reftext", "relatedfuncs", "relref", + "relurl", "remarkjs", "rgba", "rlimit", + "roboto", + "rssxml", + "rwxrwxrwx", + "safehtml", "safejs", "Samsa", + "Shekhar", "Shortcode", "Shortcodes", "Sindre", + "sitemapindex", + "sitemapxml", "Smartcrop", + "Sprintf", + "Startseite", + "strconv", + "stringifier", "struct", + "structs", + "subdir", "Talkyard", "taxo", "tbody", @@ -126,20 +238,29 @@ "testshortcodes", "thead", "Thinkful", + "TLDR", "TMPDIR", "tojson", "Torikian", "totoml", "toyaml", + "twitteruser", + "Unmarshal", "Unmarshal", "urlize", + "urlset", "vimrc", "wanghc", "Wappalyzer", "warnf", "webp", + "Wercker", "wibble", + "wordcount", "workson", + "xvzf", + "yoyoyo", + "Zgotmpl", "zzbbaabb" ], "language": "en,en-GB,en-US,de,fr", diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html index 04261a886..527547428 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html +++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html @@ -70,6 +70,14 @@ {{ partial "hooks/before-body-end" . }} + {{ if .Page.Store.Get "hasMermaid" }} + + +{{ end }} + + diff --git a/content/en/about/security-model/index.md b/content/en/about/security-model/index.md index c7e9d35c6..461c7fe77 100644 --- a/content/en/about/security-model/index.md +++ b/content/en/about/security-model/index.md @@ -42,7 +42,7 @@ The default configuration is listed below. Any build using features not in the a Note that these and other config settings in Hugo can be overridden by the OS environment. If you want to block all remote HTTP fetching of data: ``` -HUGO_SECURITY_HTTP_URLS=none hugo +HUGO_SECURITY_HTTP_URLS=none hugo ``` ## Dependency Security diff --git a/content/en/content-management/diagrams.md b/content/en/content-management/diagrams.md index cfc0b3644..243a70fd4 100644 --- a/content/en/content-management/diagrams.md +++ b/content/en/content-management/diagrams.md @@ -17,7 +17,7 @@ toc: true ## GoAT Diagrams (Ascii) -Hugo supports [GoAT](https://github.com/bep/goat) natively. This means that this code block: +Hugo! supports [GoAT](https://github.com/bep/goat) natively. This means that this code block: ```` ```goat diff --git a/content/en/content-management/formats.md b/content/en/content-management/formats.md index 1ae20ba58..3c3edfdd4 100644 --- a/content/en/content-management/formats.md +++ b/content/en/content-management/formats.md @@ -4,7 +4,6 @@ linktitle: Content Formats description: Both HTML and Markdown are supported content formats. date: 2017-01-10 publishdate: 2017-01-10 -lastmod: 2017-04-06 categories: [content management] keywords: [markdown,asciidoc,mmark,pandoc,content format] menu: @@ -27,20 +26,19 @@ You can put any file type into your `/content` directories, but Hugo uses the `m The current list of content formats in Hugo: -| Name | Markup identifiers | Comment | +| Name | Markup identifiers | Comment | | ------------- | ------------- |-------------| | Goldmark | md, markdown, goldmark |Note that you can set the default handler of `md` and `markdown` to something else, see [Configure Markup](/getting-started/configuration-markup/).{{< new-in "0.60.0" >}} | | Blackfriday | blackfriday |Blackfriday will eventually be deprecated.| |MMark|mmark|Mmark is deprecated and will be removed in a future release.| |Emacs Org-Mode|org|See [go-org](https://github.com/niklasfasching/go-org).| |AsciiDoc|asciidocext, adoc, ad|Needs [Asciidoctor][ascii] installed.| -|RST|rst|Needs [RST](http://docutils.sourceforge.net/rst.html) installed.| +|RST|rst|Needs [RST](https://docutils.sourceforge.net/rst.html) installed.| |Pandoc|pandoc, pdc|Needs [Pandoc](https://www.pandoc.org/) installed.| |HTML|html, htm|To be treated as a content file, with layout, shortcodes etc., it must have front matter. If not, it will be copied as-is.| The `markup identifier` is fetched from either the `markup` variable in front matter or from the file extension. For markup-related configuration, see [Configure Markup](/getting-started/configuration-markup/). - ## External Helpers Some of the formats in the table above need external helpers installed on your PC. For example, for AsciiDoc files, @@ -149,7 +147,6 @@ Markdown syntax is simple enough to learn in a single sitting. The following are [mdguide]: https://www.markdownguide.org/ [mdtutorial]: https://www.markdowntutorial.com/ [Miek Gieben's website]: https://miek.nl/2016/march/05/mmark-syntax-document/ -[mmark]: https://github.com/mmarkdown/mmark [org]: https://orgmode.org/ [pandoc]: https://www.pandoc.org/ [rest]: https://docutils.sourceforge.io/rst.html diff --git a/content/en/content-management/image-processing/index.md b/content/en/content-management/image-processing/index.md index 5b8293675..710c260ca 100644 --- a/content/en/content-management/image-processing/index.md +++ b/content/en/content-management/image-processing/index.md @@ -1,8 +1,7 @@ --- title: "Image Processing" -description: "Image Page resources can be resized and cropped." +description: "Resize, crop, rotate, filter, and convert images." date: 2018-01-24T13:10:00-05:00 -linktitle: "Image Processing" categories: ["content management"] keywords: [resources, images] weight: 4004 @@ -13,237 +12,334 @@ menu: parent: "content-management" weight: 32 --- +## Image Resources -## The Image Page Resource +To process an image, you must access the image as either a page resource or a global resource. -The `image` is a [Page Resource]({{< relref "/content-management/page-resources" >}}), and the processing methods listed below do not work on images inside your `/static` folder. +### Page Resources -To print all images paths in a [Page Bundle]({{< relref "/content-management/organization#page-bundles" >}}): - -```go-html-template -{{ with .Resources.ByType "image" }} -{{ range . }} -{{ .RelPermalink }} -{{ end }} -{{ end }} +A page resource is a file within a [page bundle]. A page bundle is a directory with an `index.md` or `_index.md` file at its root. +```text +content/ +└── posts/ + └── post-1/ <-- page bundle + ├── index.md + └── sunset.jpg <-- page resource ``` -## The Image Resource - -The `image` resource can also be retrieved from a [global resource]({{< relref "/hugo-pipes/introduction#from-file-to-resource" >}}) +To access an image as a page resource: ```go-html-template -{{- $image := resources.Get "images/logo.jpg" -}} +{{ $image := .Resources.GetMatch "sunset.jpg" }} +``` + +### Global Resources + +A global resource is a file: + +- Within the `assets` directory, or +- Within any directory [mounted] to the `assets` directory, or +- Located on a remote server accessible via `http` or `https` + +```text +assets/ +└── images/ + └── sunset.jpg <-- global resource +``` + +To access a local image as a global resource: + +```go-html-template +{{ $image := resources.Get "images/sunset.jpg" }} +``` + +To access a remote image as a global resource: + +```go-html-template +{{ $image := resources.GetRemote "https://gohugo.io/img/hugo-logo.png" }} +``` + +## Image Rendering + +Once you have accessed an image as either a page resource or a global resource, render it in your templates using the `Permalink`, `RelPermalink`, `Width`, and `Height` properties. + +Example 1: Throws an error if the resource is not found. + +```go-html-template +{{ $image := .Resources.GetMatch "sunset.jpg" }} + +``` + +Example 2: Skips image rendering if the resource is not found. + +```go-html-template +{{ $image := .Resources.GetMatch "sunset.jpg" }} +{{ with $image }} + +{{ end }} +``` + +Example 3: A more concise way to skip image rendering if the resource is not found. + +```go-html-template +{{ with .Resources.GetMatch "sunset.jpg" }} + +{{ end }} ``` ## Image Processing Methods -The `image` resource implements the `Resize`, `Fit`, `Fill`, `Crop`, and `Filter` methods, each returning a transformed image using the specified dimensions and processing options. +The `image` resource implements the `Resize`, `Fit`, `Fill`, `Crop`, `Filter`, and `Exif` methods. {{% note %}} -Metadata (EXIF, IPTC, XMP, etc.) is not preserved during image transformation. Use the [`Exif`](#exif) method with the _original_ image to extract EXIF metadata from JPEG or TIFF images. +Metadata (Exif, IPTC, XMP, etc.) is not preserved during image transformation. Use the`Exif` method with the _original_ image to extract Exif metadata from JPEG or TIFF images. {{% /note %}} ### Resize -Resizes the image to the specified width and height. +Resize an image to the specified width and/or height. -```go -// Resize to a width of 600px and preserve ratio -{{ $image := $resource.Resize "600x" }} +If you specify both width and height, the resulting image will be disproportionally scaled unless the original image has the same aspect ratio. -// Resize to a height of 400px and preserve ratio -{{ $image := $resource.Resize "x400" }} +```go-html-template +{{/* Resize to a width of 600px and preserve aspect ratio */}} +{{ $image := $image.Resize "600x" }} -// Resize to a width 600px and a height of 400px -{{ $image := $resource.Resize "600x400" }} +{{/* Resize to a height of 400px and preserve aspect ratio */}} +{{ $image := $image.Resize "x400" }} + +{{/* Resize to a width of 600px and a height of 400px */}} +{{ $image := $image.Resize "600x400" }} ``` ### Fit -Scale down the image to fit the given dimensions while maintaining aspect ratio. Both height and width are required. +Downscale an image to fit the given dimensions while maintaining aspect ratio. You must provide both width and height. -```go -{{ $image := $resource.Fit "600x400" }} +```go-html-template +{{ $image := $image.Fit "600x400" }} ``` ### Fill -Crop and resize the image to match the given dimensions. Both height and width are required. +Crop and resize an image to match the given dimensions. You must provide both width and height. Use the [`anchor`] option to change the crop box anchor point. -```go -{{ $image := $resource.Fill "600x400" }} +```go-html-template +{{ $image := $image.Fill "600x400" }} ``` ### Crop -Crop the image to match the given dimensions without resizing. Both height and width are required. +Crop an image to match the given dimensions without resizing. You must provide both width and height. Use the [`anchor`] option to change the crop box anchor point. -```go -{{ $image := $resource.Crop "400x400" }} +```go-html-template +{{ $image := $image.Crop "600x400" }} ``` ### Filter -Apply one or more filters to your image. See [Image Filters](/functions/images/#image-filters) for a full list. +Apply one or more [filters] to an image. ```go-html-template -{{ $img = $img.Filter (images.GaussianBlur 6) (images.Pixelate 8) }} +{{ $image := $image.Filter (images.GaussianBlur 6) (images.Pixelate 8) }} ``` -The above can also be written in a more functional style using pipes: +Write this in a more functional style using pipes. Hugo applies the filters in the order given. ```go-html-template -{{ $img = $img | images.Filter (images.GaussianBlur 6) (images.Pixelate 8) }} +{{ $image := $image | images.Filter (images.GaussianBlur 6) (images.Pixelate 8) }} ``` -The filters will be applied in the given order. - -Sometimes it can be useful to create the filter chain once and then reuse it: +Sometimes it can be useful to create the filter chain once and then reuse it. ```go-html-template {{ $filters := slice (images.GaussianBlur 6) (images.Pixelate 8) }} -{{ $img1 = $img1.Filter $filters }} -{{ $img2 = $img2.Filter $filters }} +{{ $image1 := $image1.Filter $filters }} +{{ $image2 := $image2.Filter $filters }} ``` ### Exif -Provides an [Exif](https://en.wikipedia.org/wiki/Exif) object with metadata about the image. +Provides an [Exif] object containing image metadata. -Note that this is only supported for JPEG and TIFF images, so it's recommended to wrap the access with a `with`, e.g.: +You may access Exif data in JPEG and TIFF images. To prevent errors when processing images without Exif data, wrap the access in a `with` statement. ```go-html-template -{{ with $img.Exif }} -Date: {{ .Date }} -Lat/Long: {{ .Lat}}/{{ .Long }} -Tags: -{{ range $k, $v := .Tags }} -TAG: {{ $k }}: {{ $v }} -{{ end }} +{{ with $image.Exif }} + Date: {{ .Date }} + Lat/Long: {{ .Lat }}/{{ .Long }} + Tags: + {{ range $k, $v := .Tags }} + TAG: {{ $k }}: {{ $v }} + {{ end }} {{ end }} ``` -Or individually access EXIF data with dot access, e.g.: +You may also access Exif fields individually, using the [`lang.FormatNumber`] function to format the fields as needed. ```go-html-template -{{ with $src.Exif }} +{{ with $image.Exif }} {{ end }} ``` -Some fields may need to be formatted with [`lang.FormatNumberCustom`]({{< relref "functions/lang" >}}) function to prevent display like `Aperture: 2.278934289` instead of `Aperture: 2.28`. +#### Exif Variables -#### Exif fields +.Date +: Image creation date/time. Format with the [time.Format] function. -Date -: "photo taken" date/time +.Lat +: GPS latitude in degrees. -Lat -: "photo taken where", GPS latitude +.Long +: GPS longitude in degrees. -Long -: "photo taken where", GPS longitude - -See [Image Processing Config](#image-processing-config) for how to configure what gets included in Exif. +.Tags +: A collection of the available Exif tags for this image. You may include or exclude specific tags from this collection in the [site configuration](#exif-data). ## Image Processing Options -In addition to the dimensions (e.g. `600x400`), Hugo supports a set of additional image options. +The `Resize`, `Fit`, `Fill`, and `Crop` methods accept a space-separated, case-insensitive list of options. The order of the options within the list is irrelevant. -### Background Color +### Dimensions -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`. +With the `Resize` method you must specify width, height, or both. The `Fit`, `Fill`, and `Crop` methods require both width and height. All dimensions are in pixels. -You can set the background color to use with a 3 or 6 digit hex code starting with `#`. - -```go -{{ $image.Resize "600x jpg #b31280" }} +```go-html-template +{{ $image := $image.Resize "600x" }} +{{ $image := $image.Resize "x400" }} +{{ $image := $image.Resize "600x400" }} +{{ $image := $image.Fit "600x400" }} +{{ $image := $image.Fill "600x400" }} +{{ $image := $image.Crop "600x400" }} ``` -For color codes, see https://www.google.com/search?q=color+picker +### Rotation -**Note** that you also set a default background color to use, see [Image Processing Config](#image-processing-config). +Rotates an image counter-clockwise by the given angle. Hugo performs rotation _before_ scaling. For example, if the original image is 600x400 and you wish to rotate the image 90 degrees counter-clockwise while scaling it by 50%: -### JPEG and WebP Quality - -Only relevant for JPEG and WebP images, values 1 to 100 inclusive, higher is better. Default is 75. - -```go -{{ $image.Resize "600x q50" }} +```go-html-template +{{ $image = $image.Resize "200x r90" }} ``` -{{< new-in "0.83.0" >}} WebP support was added in Hugo 0.83.0. +In the example above, the width represents the desired width _after_ rotation. -### Hint +To rotate an image without scaling, use the dimensions of the original image: - {{< new-in "0.83.0" >}} - - {{< new-in "0.83.0" >}} - -Hint about what type of image this is. Currently only used when encoding to WebP. - -Default value is `photo`. - -Valid values are `picture`, `photo`, `drawing`, `icon`, or `text`. - -```go -{{ $image.Resize "600x webp drawing" }} +```go-html-template +{{ with .Resources.GetMatch "sunset.jpg" }} + {{ with .Resize (printf "%dx%d r90" .Height .Width) }} + + {{ end }} +{{ end }} ``` -### 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" }} -``` +In the example above, on the second line, we have reversed width and height to reflect the desired dimensions _after_ rotation. ### Anchor -Only relevant for the `Crop` and `Fill` methods. This is useful for thumbnail generation where the main motive is located in, say, the left corner. +When using the `Crop` or `Fill` method, the _anchor_ determines the placement of the crop box. You may specify `TopLeft`, `Top`, `TopRight`, `Left`, `Center`,`Right`, `BottomLeft`, `Bottom`, `BottomRight`, or `Smart`. -Valid values are `Smart`, `Center`, `TopLeft`, `Top`, `TopRight`, `Left`, `Right`, `BottomLeft`, `Bottom`, `BottomRight`. +The default value is `Smart`, which uses [Smartcrop] image analysis to determine the optimal placement of the crop box. You may override the default value in the [site configuration](#processing-options). -Default value is `Smart`, which uses [Smartcrop](https://github.com/muesli/smartcrop) to determine the best crop. +For example, if you have a 400x200 image with a bird in the upper left quadrant, you can create a 200x100 thumbnail containing the bird: -```go -{{ $image.Fill "300x200 BottomLeft" }} +```go-html-template +{{ $image.Crop "200x100 TopLeft" }} ``` -### Resample Filter - -Filter used in resizing. Default is `Box`, a simple and fast resampling filter appropriate for downscaling. - -Examples are: `Box`, `NearestNeighbor`, `Linear`, `Gaussian`. - -See https://github.com/disintegration/imaging for more. If you want to trade quality for faster processing, this may be a option to test. - -```go -{{ $image.Resize "600x400 Gaussian" }} -``` +If you apply rotation when using the `Crop` or `Fill` method, specify the anchor relative to the rotated image. ### Target Format -By default the images is encoded in the source format, but you can set the target format as an option. +By default, Hugo encodes the image in the source format. You may convert the image to another format by specifying `bmp`, `gif`, `jpeg`, `jpg`, `png`, `tif`, `tiff`, or `webp`. -Valid values are `bmp`, `gif`, `jpeg`, `jpg`, `png`, `tif`, `tiff`, and `webp`. - -```go -{{ $image.Resize "600x jpg" }} +```go-html-template +{{ $image.Resize "600x webp" }} ``` -{{< new-in "0.83.0" >}} WebP support was added in Hugo 0.83.0. +To convert an image without scaling, use the dimensions of the original image: + +```go-html-template +{{ with .Resources.GetMatch "sunset.jpg" }} + {{ with .Resize (printf "%dx%d webp" .Width .Height) }} + + {{ end }} +{{ end }} +``` + +### Quality + +Applicable to JPEG and WebP images, the `q` value determines the quality of the converted image. Higher values produce better quality images, while lower values produce smaller files. Set this value to a whole number between 1 and 100, inclusive. + +The default value is 75. You may override the default value in the [site configuration](#processing-options). + +```go-html-template +{{ $image.Resize "600x webp q50" }} +``` + +### Hint + + + +Applicable to WebP images, this option corresponds to a set of pre-defined encoding parameters. + +Value|Example +:--|:-- +`drawing`|Hand or line drawing with high-contrast details +`icon`|Small colorful image +`photo`|Outdoor photograph with natural lighting +`picture`|Indoor photograph such as a portrait +`text`|Image that is primarily text + +The default value is `photo`. You may override the default value in the [site configuration](#processing-options). + +```go-html-template +{{ $image.Resize "600x webp picture" }} +``` + +### Background Color + +When converting an image from a format that supports transparency (e.g., PNG) to a format that does _not_ support transparency (e.g., JPEG), you may specify the background color of the resulting image. + +Use either a 3-digit or a 6-digit hexadecimal color code (e.g., `#00f` or `#0000ff`). + +The default value is `#ffffff` (white). You may override the default value in the [site configuration](#processing-options). + +```go-html-template +{{ $image.Resize "600x jpg #b31280" }} +``` + +### Resampling Filter + +You may specify the resampling filter used when resizing an image. Commonly used resampling filters include: + +Filter|Description +:--|:-- +`Box`|Simple and fast averaging filter appropriate for downscaling +`Lanczos`|High-quality resampling filter for photographic images yielding sharp results +`CatmullRom`|Sharp cubic filter that is faster than the Lanczos filter while providing similar results +`MitchellNetravali`|Cubic filter that produces smoother results with less ringing artifacts than CatmullRom +`Linear`|Bilinear resampling filter, produces smooth output, faster than cubic filters +`NearestNeighbor`|Fastest resampling filter, no antialiasing + +The default value is `Box`. You may override the default value in the [site configuration](#processing-options). + +```go-html-template +{{ $image.Resize "600x400 Lanczos" }} +``` + +See [github.com/disintegration/imaging] for the complete list of resampling filters. If you wish to improve image quality at the expense of performance, you may wish to experiment with the alternative filters. ## Image Processing Examples @@ -261,79 +357,83 @@ _The photo of the sunset used in the examples below is Copyright [Bjørn Erik Pe {{< imgproc sunset Resize "300x q10" />}} -This is the shortcode used in the examples above: +This is the shortcode used to generate the examples above: {{< code file="layouts/shortcodes/imgproc.html" >}} {{< readfile file="layouts/shortcodes/imgproc.html" >}} {{< /code >}} -And it is used like this: +Call the shortcode from your markdown like this: ```go-html-template {{}} ``` {{% note %}} -**Tip:** Note the self-closing shortcode syntax above. The `imgproc` shortcode can be called both with and without **inner content**. +Note the self-closing shortcode syntax above. You may call the `imgproc` shortcode with or without **inner content**. {{% /note %}} -## Image Processing Config +## Imaging Configuration -You can configure an `imaging` section in `config.toml` with default image processing options: +### Processing Options -```toml +Define an `imaging` section in your site configuration to set the default [image processing options](#image-processing-options). + +{{< code-toggle file="config" copy=true >}} [imaging] -# Default resample filter used for resizing. Default is Box, -# a simple and fast averaging filter appropriate for downscaling. -# See https://github.com/disintegration/imaging -resampleFilter = "box" - -# Default JPEG or WebP quality setting. Default is 75. +resampleFilter = "Box" quality = 75 - -# Default hint about what type of image. Currently only used for WebP encoding. -# Default is "photo". -# Valid values are "picture", "photo", "drawing", "icon", or "text". hint = "photo" - -# Anchor used when cropping pictures with either .Fill or .Crop -# Default is "smart" which does Smart Cropping, using https://github.com/muesli/smartcrop -# Smart Cropping is content aware and tries to find the best crop for each image. -# 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 +anchor = "Smart" bgColor = "#ffffff" +{{< /code-toggle >}} +anchor +: See image processing options: [anchor](#anchor). + +bgColor +: See image processing options: [background color](#background-color). + +hint +: See image processing options: [hint](#hint). + +quality +: See image processing options: [quality](#quality). + +resampleFilter +: See image processing options: [resampling filter](#resampling-filter). + +### Exif Data + +Define an `imaging.exif` section in your site configuration to control the availability of Exif data. + +{{< code-toggle file="config" copy=true >}} [imaging.exif] - # Regexp matching the fields you want to Exclude from the (massive) set of Exif info -# available. As we cache this info to disk, this is for performance and -# disk space reasons more than anything. -# If you want it all, put ".*" in this config setting. -# Note that if neither this or ExcludeFields is set, Hugo will return a small -# default set: GPS|Exif|Exposure[M|P|B]|Contrast|Resolution|Sharp|JPEG|Metering|Sensing|Saturation|ColorSpace|Flash|WhiteBalance includeFields = "" - -# Regexp matching the Exif fields you want to exclude. This may be easier to use -# than IncludeFields above, depending on what you want. excludeFields = "" - -# Hugo extracts the "photo taken" date/time into .Date by default. -# Set this to true to turn it off. disableDate = false - -# Hugo extracts the "photo taken where" (GPS latitude and longitude) into -# .Long and .Lat. Set this to true to turn it off. disableLatLong = false -``` +{{< /code-toggle >}} + +disableDate +: Hugo extracts the image creation date/time into `.Date`. Set this to `true` to disable. Default is `false`. + +disableLatLong +: Hugo extracts the GPS latitude and longitude into `.Lat` and `.Long`. Set this to `true` to disable. Default is `false`. + +excludeFields +: Regular expression matching the Exif tags to exclude from the `.Tags` collection. Default is `""`. + +includeFields +: Regular expression matching the Exif tags to include in the `.Tags` collection. Default is `""`. To include all available tags, set this value to `".*"`. + +{{% note %}} +To improve performance and decrease cache size, if you set neither `excludeFields` nor `includeFields`, Hugo excludes the following tags: `ColorSpace`, `Contrast`, `Exif`, `Exposure[M|P|B]`, `Flash`, `GPS`, `JPEG`, `Metering`, `Resolution`, `Saturation`, `Sensing`, `Sharp`, and `WhiteBalance`. +{{% /note %}} ## Smart Cropping of Images -By default, Hugo will use [Smartcrop](https://github.com/muesli/smartcrop), a library created by [muesli](https://github.com/muesli), when cropping images with `.Fill` or `.Crop`. You can set the anchor point manually, but in most cases the smart option will make a good choice. And we will work with the library author to improve this in the future. +By default, Hugo uses the [Smartcrop] library when cropping images with the `Crop` or`Fill` methods. You can set the anchor point manually, but in most cases the `Smart` option will make a good choice. Examples using the sunset image from above: @@ -343,16 +443,20 @@ Examples using the sunset image from above: ## Image Processing Performance Consideration -Processed images are stored below `/resources` (can be set with `resourceDir` config setting). This folder is deliberately placed in the project, as it is recommended to check these into source control as part of the project. These images are not "Hugo fast" to generate, but once generated they can be reused. +Hugo caches processed images in the `resources` directory. If you include this directory in source control, Hugo will not have to regenerate the images in a CI/CD workflow (e.g., GitHub Pages, GitLab Pages, Netlify, etc.). This results in faster builds. -If you change your image settings (e.g. size), remove or rename images etc., you will end up with unused images taking up space and cluttering your project. - -To clean up, run: +If you change image processing methods or options, or if you rename or remove images, the `resources` directory will contain unused images. To remove the unused images, perform garbage collection with: ```bash hugo --gc ``` -{{% note %}} -**GC** is short for **Garbage Collection**. -{{% /note %}} +[`anchor`]: {{< relref "content-management/image-processing#anchor" >}} +[`lang.FormatNumber`]: {{< relref "functions/lang#langformatnumber" >}} +[Exif]: +[filters]: {{< relref "functions/images" >}} +[github.com/disintegration/imaging]: +[mounted]: {{< relref "hugo-modules/configuration#module-config-mounts">}} +[page bundle]: {{< relref "content-management/page-bundles" >}} +[Smartcrop]: +[time.Format]: {{< relref "functions/dateformat" >}} diff --git a/content/en/content-management/related.md b/content/en/content-management/related.md index a42cec32e..9ede15252 100644 --- a/content/en/content-management/related.md +++ b/content/en/content-management/related.md @@ -42,14 +42,14 @@ Here is the list of "Related" methods available on a page collection such `.Regu Returns a collection of pages related the given one. ``` -{{ $related := .Site.RegularPages.Related . }} +{{ $related := site.RegularPages.Related . }} ``` #### .RelatedIndices PAGE INDICE1 [INDICE2 ...] Returns a collection of pages related to a given one restricted to a list of indices. ``` -{{ $related := .Site.RegularPages.RelatedIndices . "tags" "date" }} +{{ $related := site.RegularPages.RelatedIndices . "tags" "date" }} ``` #### .RelatedTo KEYVALS [KEYVALS2 ...] @@ -58,7 +58,7 @@ Returns a collection of pages related together by a set of indices and their mat In order to build those set and pass them as argument, one must use the `keyVals` function where the first argument would be the `indice` and the consecutive ones its potential `matches`. ``` -{{ $related := .Site.RegularPages.RelatedTo ( keyVals "tags" "hugo" "rocks") ( keyVals "date" .Date ) }} +{{ $related := site.RegularPages.RelatedTo ( keyVals "tags" "hugo" "rocks") ( keyVals "date" .Date ) }} ``` {{% note %}} diff --git a/content/en/content-management/urls.md b/content/en/content-management/urls.md index c0eb59d6d..25d0f5d7a 100644 --- a/content/en/content-management/urls.md +++ b/content/en/content-management/urls.md @@ -178,6 +178,7 @@ Assuming a `baseURL` of `example.com`, the contents of the auto-generated alias The `http-equiv="refresh"` line is what performs the redirect, in 0 seconds in this case. If an end user of your website goes to `https://example.com/posts/my-old-url`, they will now be automatically redirected to the newer, correct URL. The addition of `` lets search engine bots know that they should not crawl and index your new alias page. ### Customize + You may customize this alias page by creating an `alias.html` template in the layouts folder of your site (i.e., `layouts/alias.html`). In this case, the data passed to the template is diff --git a/content/en/contribute/development.md b/content/en/contribute/development.md index 27df5c6f7..dd92ec0a7 100644 --- a/content/en/contribute/development.md +++ b/content/en/contribute/development.md @@ -424,7 +424,7 @@ Feel free to [open an issue][newissue] if you think you found a bug or you have [docscontrib]: /contribute/documentation/ [forums]: https://discourse.gohugo.io [gitbook]: https://git-scm.com/ -[gobootcamp]: http://www.golangbootcamp.com/book/get_setup +[gobootcamp]: https://www.golangbootcamp.com/book/get_setup [godl]: https://golang.org/dl/ [goinstall]: https://golang.org/doc/install [gvm]: https://github.com/moovweb/gvm diff --git a/content/en/functions/anchorize.md b/content/en/functions/anchorize.md index 87aea2354..b5bd22e07 100644 --- a/content/en/functions/anchorize.md +++ b/content/en/functions/anchorize.md @@ -17,11 +17,11 @@ If [Goldmark](https://gohugo.io/getting-started/configuration-markup#goldmark) i Since the `defaultMarkdownHandler` and this template function use the same sanitizing logic, you can use the latter to determine the ID of a header for linking with anchor tags. -``` -{{anchorize "This is a header"}} → "this-is-a-header" -{{anchorize "This is also a header"}} → "this-is-also-a-header" -{{anchorize "main.go"}} → "main-go" -{{anchorize "Article 123"}} → "article-123" -{{anchorize "<- Let's try this, shall we?"}} → "let-s-try-this-shall-we" -{{anchorize "Hello, 世界"}} → "hello-世界" +```go-html-template +{{ anchorize "This is a header" }} --> "this-is-a-header" +{{ anchorize "This is also a header" }} --> "this-is-also----a-header" +{{ anchorize "main.go" }} --> "maingo" +{{ anchorize "Article 123" }} --> "article-123" +{{ anchorize "<- Let's try this, shall we?" }} --> "--lets-try-this-shall-we" +{{ anchorize "Hello, 世界" }} --> "hello-世界" ``` diff --git a/content/en/functions/append.md b/content/en/functions/append.md index 732ffeadd..3e2fc13cc 100644 --- a/content/en/functions/append.md +++ b/content/en/functions/append.md @@ -25,14 +25,9 @@ An example appending single values: The same example appending a slice to a slice: - ```go-html-template {{ $s := slice "a" "b" "c" }} {{ $s = $s | append (slice "d" "e") }} ``` The `append` function works for all types, including `Pages`. - - - - diff --git a/content/en/functions/apply.md b/content/en/functions/apply.md index 3a507c7f9..7550069a5 100644 --- a/content/en/functions/apply.md +++ b/content/en/functions/apply.md @@ -64,13 +64,13 @@ If you have `post-tag-list.html` and `post-tag-link.html` as [partials][], you * Tags: {{ $len := len . }} {{ if eq $len 1 }} - {{ partial "post-tag-link" (index . 0) }} + {{ partial "post-tag-link.html" (index . 0) }} {{ else }} {{ $last := sub $len 1 }} {{ range first $last . }} - {{ partial "post-tag-link" . }}, + {{ partial "post-tag-link.html" . }}, {{ end }} - {{ partial "post-tag-link" (index . $last) }} + {{ partial "post-tag-link.html" (index . $last) }} {{ end }} {{ end }} @@ -89,7 +89,7 @@ This first version of `layouts/partials/post-tag-list.html` separates all of the
Tags: {{ $sort := sort . }} - {{ $links := apply $sort "partial" "post-tag-link" "." }} + {{ $links := apply $sort "partial" "post-tag-link.html" "." }} {{ $clean := apply $links "chomp" "." }} {{ delimit $clean ", " }}
@@ -102,7 +102,7 @@ Now in the completed version, you can sort the tags, convert the tags to links w {{ with .Params.tags }}
Tags: - {{ delimit (apply (apply (sort .) "partial" "post-tag-link" ".") "chomp" ".") ", " }} + {{ delimit (apply (apply (sort .) "partial" "post-tag-link.html" ".") "chomp" ".") ", " }}
{{ end }} {{< /code >}} diff --git a/content/en/functions/group.md b/content/en/functions/group.md index e1a22ef5d..203498cb1 100644 --- a/content/en/functions/group.md +++ b/content/en/functions/group.md @@ -28,10 +28,4 @@ hugoversion: "0.49" {{ end }} {{< /code >}} - - The page group you get from `group` is of the same type you get from the built-in [group methods](/templates/lists#group-content) in Hugo. The above example can even be [paginated](/templates/pagination/#list-paginator-pages). - - - - diff --git a/content/en/functions/hugo.md b/content/en/functions/hugo.md index 7602a2e34..a495eae0a 100644 --- a/content/en/functions/hugo.md +++ b/content/en/functions/hugo.md @@ -4,7 +4,6 @@ linktitle: hugo description: The `hugo` function provides easy access to Hugo-related data. date: 2019-01-31 publishdate: 2019-01-31 -lastmod: 2019-01-31 keywords: [] categories: [functions] menu: @@ -60,17 +59,17 @@ hugo.Deps `hugo.Deps` returns a list of dependencies for a project (either Hugo Modules or local theme components). -Eeach dependency contains: +Each dependency contains: Path (string) : Returns the path to this module. This will either be the module path, e.g. "github.com/gohugoio/myshortcodes", or the path below your /theme folder, e.g. "mytheme". Version (string) : The module version. - + Vendor (bool) : Whether this dependency is vendored. - + Time (time.Time) : Time version was created. diff --git a/content/en/functions/relurl.md b/content/en/functions/relurl.md index 71eefb013..af98c44f4 100644 --- a/content/en/functions/relurl.md +++ b/content/en/functions/relurl.md @@ -3,7 +3,6 @@ title: relURL description: Creates a baseURL-relative URL. date: 2017-02-01 publishdate: 2017-02-01 -lastmod: 2017-02-01 categories: [functions] menu: docs: @@ -31,7 +30,7 @@ The last two examples may look strange but can be very useful. For example, the {{< code file="layouts/partials/schemaorg-metadata.html" download="schemaorg-metadata.html" >}}