Merge branch 'main' into extend_wayland_support

Makefile

@@ -23,6 +23,10 @@ doc html:
 htmlview:
 	$(MAKE) -C docs htmlview
 
+.PHONY: htmllive
+htmllive:
+	$(MAKE) -C docs htmllive
+
 .PHONY: doccheck
 doccheck:
 	$(MAKE) doc
@@ -43,6 +47,7 @@ help:
 	@echo "  docserve           run an HTTP server on the docs directory"
 	@echo "  html               make HTML docs"
 	@echo "  htmlview           open the index page built by the html target in your browser"
+	@echo "  htmllive           rebuild and reload HTML files in your browser"
 	@echo "  install            make and install"
 	@echo "  install-coverage   make and install with C coverage"
 	@echo "  lint               run the lint checks"

docs/Guardfile

@@ -1,10 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import annotations
-
-from livereload.compiler import shell
-from livereload.task import Task
-
-Task.add("*.rst", shell("make html"))
-Task.add("*/*.rst", shell("make html"))
-Task.add("Makefile", shell("make html"))
-Task.add("conf.py", shell("make html"))

docs/Makefile

@@ -20,8 +20,8 @@ help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html       to make standalone HTML files"
 	@echo "  htmlview   to open the index page built by the html target in your browser"
+	@echo "  htmllive   to rebuild and reload HTML files in your browser"
 	@echo "  serve      to start a local server for viewing docs"
-	@echo "  livehtml   to start a local server for viewing docs and auto-reload on change"
 	@echo "  dirhtml    to make HTML files named index.html in directories"
 	@echo "  singlehtml to make a single large HTML file"
 	@echo "  pickle     to make pickle files"
@@ -201,9 +201,10 @@ doctest:
 htmlview: html
 	$(PYTHON) -c "import os, webbrowser; webbrowser.open('file://' + os.path.realpath('$(BUILDDIR)/html/index.html'))"
 
-.PHONY: livehtml
-livehtml: html
-	livereload $(BUILDDIR)/html -p 33233
+.PHONY: htmllive
+htmllive: SPHINXBUILD = $(PYTHON) -m sphinx_autobuild
+htmllive: SPHINXOPTS = --open-browser --delay 0
+htmllive: html
 
 .PHONY: serve
 serve:

docs/handbook/concepts.rst

@@ -30,35 +30,35 @@ image. Each pixel uses the full range of the bit depth. So a 1-bit pixel has a r
 INT32 and a 32-bit floating point pixel has the range of FLOAT32. The current release
 supports the following standard modes:
 
-    * ``1`` (1-bit pixels, black and white, stored with one pixel per byte)
-    * ``L`` (8-bit pixels, grayscale)
-    * ``P`` (8-bit pixels, mapped to any other mode using a color palette)
-    * ``RGB`` (3x8-bit pixels, true color)
-    * ``RGBA`` (4x8-bit pixels, true color with transparency mask)
-    * ``CMYK`` (4x8-bit pixels, color separation)
-    * ``YCbCr`` (3x8-bit pixels, color video format)
+* ``1`` (1-bit pixels, black and white, stored with one pixel per byte)
+* ``L`` (8-bit pixels, grayscale)
+* ``P`` (8-bit pixels, mapped to any other mode using a color palette)
+* ``RGB`` (3x8-bit pixels, true color)
+* ``RGBA`` (4x8-bit pixels, true color with transparency mask)
+* ``CMYK`` (4x8-bit pixels, color separation)
+* ``YCbCr`` (3x8-bit pixels, color video format)
 
-      * Note that this refers to the JPEG, and not the ITU-R BT.2020, standard
+  * Note that this refers to the JPEG, and not the ITU-R BT.2020, standard
 
-    * ``LAB`` (3x8-bit pixels, the L*a*b color space)
-    * ``HSV`` (3x8-bit pixels, Hue, Saturation, Value color space)
+* ``LAB`` (3x8-bit pixels, the L*a*b color space)
+* ``HSV`` (3x8-bit pixels, Hue, Saturation, Value color space)
 
-      * Hue's range of 0-255 is a scaled version of 0 degrees <= Hue < 360 degrees
+  * Hue's range of 0-255 is a scaled version of 0 degrees <= Hue < 360 degrees
 
-    * ``I`` (32-bit signed integer pixels)
-    * ``F`` (32-bit floating point pixels)
+* ``I`` (32-bit signed integer pixels)
+* ``F`` (32-bit floating point pixels)
 
 Pillow also provides limited support for a few additional modes, including:
 
-    * ``LA`` (L with alpha)
-    * ``PA`` (P with alpha)
-    * ``RGBX`` (true color with padding)
-    * ``RGBa`` (true color with premultiplied alpha)
-    * ``La`` (L with premultiplied alpha)
-    * ``I;16`` (16-bit unsigned integer pixels)
-    * ``I;16L`` (16-bit little endian unsigned integer pixels)
-    * ``I;16B`` (16-bit big endian unsigned integer pixels)
-    * ``I;16N`` (16-bit native endian unsigned integer pixels)
+* ``LA`` (L with alpha)
+* ``PA`` (P with alpha)
+* ``RGBX`` (true color with padding)
+* ``RGBa`` (true color with premultiplied alpha)
+* ``La`` (L with premultiplied alpha)
+* ``I;16`` (16-bit unsigned integer pixels)
+* ``I;16L`` (16-bit little endian unsigned integer pixels)
+* ``I;16B`` (16-bit big endian unsigned integer pixels)
+* ``I;16N`` (16-bit native endian unsigned integer pixels)
 
 Premultiplied alpha is where the values for each other channel have been
 multiplied by the alpha. For example, an RGBA pixel of ``(10, 20, 30, 127)``

docs/reference/block_allocator.rst

@@ -37,14 +37,14 @@ fresh allocation. This caching of free blocks is currently disabled by
 default, but can be enabled and tweaked using three environment
 variables:
 
-  * ``PILLOW_ALIGNMENT``, in bytes. Specifies the alignment of memory
-    allocations. Valid values are powers of 2 between 1 and
-    128, inclusive. Defaults to 1.
+* ``PILLOW_ALIGNMENT``, in bytes. Specifies the alignment of memory
+  allocations. Valid values are powers of 2 between 1 and
+  128, inclusive. Defaults to 1.
 
-  * ``PILLOW_BLOCK_SIZE``, in bytes, K, or M.  Specifies the maximum
-    block size for ``ImagingAllocateArray``. Valid values are
-    integers, with an optional ``k`` or ``m`` suffix. Defaults to 16M.
+* ``PILLOW_BLOCK_SIZE``, in bytes, K, or M.  Specifies the maximum
+  block size for ``ImagingAllocateArray``. Valid values are
+  integers, with an optional ``k`` or ``m`` suffix. Defaults to 16M.
 
-  * ``PILLOW_BLOCKS_MAX`` Specifies the number of freed blocks to
-    retain to fill future memory requests. Any freed blocks over this
-    threshold will be returned to the OS immediately. Defaults to 0.
+* ``PILLOW_BLOCKS_MAX`` Specifies the number of freed blocks to
+  retain to fill future memory requests. Any freed blocks over this
+  threshold will be returned to the OS immediately. Defaults to 0.

pyproject.toml

@@ -44,6 +44,7 @@ optional-dependencies.docs = [
   "furo",
   "olefile",
   "sphinx>=8.2",
+  "sphinx-autobuild",
   "sphinx-copybutton",
   "sphinx-inline-tabs",
   "sphinxext-opengraph",