diff -Nru pygments-2.15.1+dfsg/.coveragerc pygments-2.17.2+dfsg/.coveragerc
--- pygments-2.15.1+dfsg/.coveragerc	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/.coveragerc	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,3 @@
+[run]
+include =
+	pygments/*
diff -Nru pygments-2.15.1+dfsg/.dockerignore pygments-2.17.2+dfsg/.dockerignore
--- pygments-2.15.1+dfsg/.dockerignore	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/.dockerignore	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,13 @@
+doc
+tests
+TAGS
+build
+dist
+htmlcov
+venv
+**/__pycache__
+.*
+*.pyo
+.*.sw[op]
+
+!/doc/pyodide/meta.yaml
diff -Nru pygments-2.15.1+dfsg/.gitattributes pygments-2.17.2+dfsg/.gitattributes
--- pygments-2.15.1+dfsg/.gitattributes	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/.gitattributes	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1 @@
+tests/examplefiles/*/*.output linguist-generated
diff -Nru pygments-2.15.1+dfsg/.github/workflows/build.yaml pygments-2.17.2+dfsg/.github/workflows/build.yaml
--- pygments-2.15.1+dfsg/.github/workflows/build.yaml	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/.github/workflows/build.yaml	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,77 @@
+name: Pygments
+
+on: [push, pull_request]
+
+env:
+  FORCE_COLOR: 1
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, ubuntu-latest]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+        cache: 'pip'
+    - name: Install tox
+      run: pip install -r requirements.txt
+    - name: Test package
+      run: tox -- -W error
+
+  check:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Install tox
+      run: pip install -r requirements.txt
+    - name: Perform basic checks
+      run: tox -e check
+      if: runner.os == 'Linux'
+
+  check-mapfiles:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Install tox
+      run: pip install -r requirements.txt
+    - name: Regenerate mapfiles
+      run: tox -e mapfiles
+    - name: Fail if mapfiles changed
+      run: |
+        if git ls-files -m | grep mapping; then
+          echo 'Please run "tox -e mapfiles" and add the changes to a commit.'
+          exit 1
+        fi
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Install tox
+      run: pip install -r requirements.txt
+    - name: Run regexlint
+      run: tox -e regexlint
diff -Nru pygments-2.15.1+dfsg/.github/workflows/docs.yaml pygments-2.17.2+dfsg/.github/workflows/docs.yaml
--- pygments-2.15.1+dfsg/.github/workflows/docs.yaml	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/.github/workflows/docs.yaml	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,41 @@
+name: Docs
+
+on:
+  push:
+    branches:
+      - master
+
+
+env:
+  FORCE_COLOR: 1
+
+permissions: {}
+jobs:
+  build:
+    permissions:
+      contents: write # to push pages branch (peaceiris/actions-gh-pages)
+
+    runs-on: ubuntu-latest
+    steps:
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Checkout Pygments
+      uses: actions/checkout@v4
+    - name: Install tox
+      run: pip install -r requirements.txt
+    - name: Sphinx build
+      run: |
+        tox -e web-doc -- dirhtml
+        touch doc/_build/dirhtml/.nojekyll
+        echo -e 'pygments.org\nwww.pygments.org' > doc/_build/dirhtml/CNAME
+        echo 'Automated deployment of docs for GitHub pages.' > doc/_build/dirhtml/README
+    - name: Deploy to repo
+      if: github.repository_owner == 'pygments'
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+        external_repository: pygments/pygments.github.io
+        publish_branch: master
+        publish_dir: ./doc/_build/dirhtml
diff -Nru pygments-2.15.1+dfsg/.gitignore pygments-2.17.2+dfsg/.gitignore
--- pygments-2.15.1+dfsg/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/.gitignore	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,19 @@
+*.pyc
+*.pyo
+.*.sw[op]
+/.pytest_cache/
+/.idea/
+/.project
+/.tags
+/.tox/
+/.cache/
+/TAGS
+/build/*
+/dist/*
+/doc/_build
+/.coverage
+/htmlcov
+/.vscode
+venv/
+.venv/
+.DS_Store
diff -Nru pygments-2.15.1+dfsg/AUTHORS pygments-2.17.2+dfsg/AUTHORS
--- pygments-2.15.1+dfsg/AUTHORS	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/AUTHORS	2020-02-02 00:00:00.000000000 +0000
@@ -13,6 +13,7 @@
   lexers
 * Maxence Ahlouche -- PostgreSQL Explain lexer
 * Muthiah Annamalai -- Ezhil lexer
+* Nikolay Antipov -- OpenSCAD lexer
 * Kumar Appaiah -- Debian control lexer
 * Andreas Amann -- AppleScript lexer
 * Timothy Armstrong -- Dart lexer fixes
@@ -30,6 +31,7 @@
 * Michael Bayer -- Myghty lexers
 * Thomas Beale -- Archetype lexers
 * John Benediktsson -- Factor lexer
+* David Benjamin, Google LLC -- TLS lexer
 * Trevor Bergeron -- mIRC formatter
 * Vincent Bernat -- LessCSS lexer
 * Christopher Bertels -- Fancy lexer
@@ -47,6 +49,7 @@
 * Ian Cooper -- VGL lexer
 * David Corbett -- Inform, Jasmin, JSGF, Snowball, and TADS 3 lexers
 * Leaf Corcoran -- MoonScript lexer
+* Gabriel Corona -- ASN.1 lexer
 * Christopher Creutzig -- MuPAD lexer
 * Daniël W. Crompton -- Pike lexer
 * Pete Curry -- bugfixes
@@ -137,6 +140,7 @@
 * Sylvestre Ledru -- Scilab lexer
 * Chee Sing Lee -- Flatline lexer
 * Mark Lee -- Vala lexer
+* Thomas Linder Puls -- Visual Prolog lexer
 * Pete Lomax -- Phix lexer
 * Valentin Lorentz -- C++ lexer improvements
 * Ben Mabey -- Gherkin lexer
@@ -237,6 +241,7 @@
 * Erick Tryzelaar -- Felix lexer
 * Alexander Udalov -- Kotlin lexer improvements
 * Thomas Van Doren -- Chapel lexer
+* Dave Van Ee -- Uxntal lexer updates
 * Daniele Varrazzo -- PostgreSQL lexers
 * Abe Voelker -- OpenEdge ABL lexer
 * Pepijn de Vos -- HTML formatter CTags support
@@ -266,5 +271,9 @@
 * Marc Auberer -- Spice lexer
 * Amr Hesham -- Carbon lexer
 * diskdance -- Wikitext lexer
+* vanillajonathan -- PRQL lexer
+* Nikolay Antipov -- OpenSCAD lexer
+* Markus Meyer, Nextron Systems -- YARA lexer
+
 
 Many thanks for all contributions!
diff -Nru pygments-2.15.1+dfsg/CHANGES pygments-2.17.2+dfsg/CHANGES
--- pygments-2.15.1+dfsg/CHANGES	2023-04-18 18:42:42.000000000 +0000
+++ pygments-2.17.2+dfsg/CHANGES	2020-02-02 00:00:00.000000000 +0000
@@ -3,6 +3,137 @@
 
 Pull request numbers before 2.4.2 are not linked as they refer to the now defunct Bitbucket project.
 
+Version 2.18.0
+--------------
+(unreleased)
+
+Version 2.17.2
+--------------
+(released November 21, 2023)
+
+* Fix a packaging issue on macOS (#2593)
+
+Version 2.17.1
+--------------
+(released November 19, 2023)
+
+- Updated lexers:
+
+  * TOML: Fix bug making lexing of single-quoted strings too eager
+
+Version 2.17.0
+--------------
+(released November 18, 2023)
+
+- New lexers:
+
+  * JSX (#2524, #709)
+  * Kusto (#2552)
+  * ldaprc (#2532)
+  * LDIF (#2489)
+  * PRQL (#2507, #2523, #2559)
+  * Visual Prolog and Visual Prolog Grammar (#2480)
+  * Vyper (#2531, #2579)
+
+- Updated lexers:
+
+  * Cypher: fix comment matching, add missing keywords (#2504)
+  * Fortran: add ``elseif`` keyword (#2528)
+  * Lean: make it available as ``lean3``, in preparation for
+    a possible switch to ``lean`` highlighting as Lean 4 (#2546)
+  * JSON: add MIME types and file extensions for several line-delimited
+    JSON formats (#2490)
+  * Nix: many improvements (#2551, #1800)
+  * OCaml: Add ``and`` keyword, remove ``value`` from keywords (#2521)
+  * Python: add ``starlark`` and ``bazel`` aliases (#2517, #2516)
+  * Snowball: Treat ``len`` like ``size`` (#2508)
+  * Spice: add ``panic`` keyword and ``->`` operator (#2510)
+  * squid.conf: fix catastrophic backtracking (#2583)
+  * TOML: rewritten, with many fixes (#2576)
+  * Turtle: support blank nodes (#2581)
+  * Wikitext: fix erroneous highlighting of LanguageConverter markup
+    (#2493), add missing variant languages (#2494)
+  * CMake: support ``[=[ bracketed arguments ]=]``` (#2549)
+
+- Fix ctags support and tests (#2487)
+- Include ``Lexer.add_filter`` in the documentation (#2519)
+- Add a ``Lean3Lexer`` alias (#2546)
+- The ``pygments.styles`` module contains a new ``STYLES`` variable
+  with a dictionary of built-in styles.  The old ``STYLE_MAP`` variable,
+  which uses a different format, is kept for backwards compatibility.
+- On Windows, add a new installation extra (``windows-terminal``) which pulls in
+  dependencies for colored console output. See :doc:`cmdline` for more details.
+  (#2505)
+- Support more file types in ``autopygmentize`` script (#2513)
+- Change color of numbers in ``rrt`` style (#2526)
+- Fix error when trying to look up plugin formatters by file extension
+  of the output format (#2563)
+- Use Hatchling as a build backend instead of setuptools.
+  This change is transparent to most users. Distribution packagers
+  who build without build isolation need to add hatchling as a build
+  dependency and remove setuptools. People downloading source distributions
+  and wheels from PyPI directly should note that they now have ``pygments``
+  in their file names instead of ``Pygments``. (#2573)
+- Improve the test framework to also check for lost tokens when processing the
+  snippets and example files (#2582.)
+- Improve the *Dracula* style definition to make it easier to maintain (#2575)
+
+Version 2.16.1
+--------------
+(released August 6th, 2023)
+
+- Fix ``native`` style missing from style list (#2484)
+
+Version 2.16.0
+--------------
+(released August 6th, 2023)
+
+- New lexers:
+
+  * ASN.1 (#2462)
+  * Blueprint (#2434)
+  * BQN (#2472)
+  * DNS zone files (#2464)
+  * GraphQL (#2428)
+  * Linux desktop files (following the specification of the
+    Freedesktop group, formerly known as XDG) (#2470)
+  * NVIDIA PTX (#2432)
+  * OpenSCAD (#2449)
+  * systemd (#2470)
+  * TLS presentation language (#2455)
+  * Verifpal (#2430)
+  * YARA (#2453)
+
+- Updated lexers:
+
+  * ASC: Add ``application/pem-certificate-chain`` mimetype (#2471)
+  * C/C++: Refine keyword lists (#2421, #2422)
+  * Carbon: Fix long processing times on invalid input, fix number
+    lexing (#2454, #2456)
+  * Elpi: Handle quotations (#2419)
+  * Go: Support additional built-ins (#2481)
+  * HTTP: Support empty headers (#2461), support more general methods (#2460),
+    also recognize responses in ``analyse_text`` implementation (#2460), and
+    highlight URL encoded data (#2465, #1620)
+  * Igor Pro: Update to Igor Pro 9 (#2482)
+  * lean: Recognize expressions nested within attributes (#1817)
+  * Macaulay2: Update builtins (#2457)
+  * Markdown: Allow extra characters after language name
+    in code blocks (#2437)
+  * NestedText: Update to version 3 (#2459)
+  * scdoc: Improve language guessing implementation (#2402)
+  * Spice: Update to latest version (#2476)
+  * Transact SQL: Add Pre-sorted Group keyword (#2417)
+  * Uxntal: Update for current runes (#2424)
+  * Wikitext: Fix templates in wiki links; fix a language converter false
+    positive; add bold italic markup (#2447)
+
+- Add ``Generic.EmphStrong`` token for bold italic markup (#2444)
+- Add Lightbulb style (#2474)
+- Improve contrast in Monokai style (#2448)
+- Add documentation how to create terminal code highlighting commands (#2131, #2425)
+- Add support for loading TrueType fonts to the ``ImageFormatter`` (#1960)
+
 Version 2.15.1
 --------------
 (released April 18th, 2023)
diff -Nru pygments-2.15.1+dfsg/MANIFEST.in pygments-2.17.2+dfsg/MANIFEST.in
--- pygments-2.15.1+dfsg/MANIFEST.in	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/MANIFEST.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-include Makefile CHANGES LICENSE AUTHORS
-include external/*
-recursive-include tests *
-recursive-include doc *
-recursive-include scripts *
diff -Nru pygments-2.15.1+dfsg/PKG-INFO pygments-2.17.2+dfsg/PKG-INFO
--- pygments-2.15.1+dfsg/PKG-INFO	2023-04-18 18:45:02.000000000 +0000
+++ pygments-2.17.2+dfsg/PKG-INFO	2020-02-02 00:00:00.000000000 +0000
@@ -1,16 +1,18 @@
 Metadata-Version: 2.1
 Name: Pygments
-Version: 2.15.1
+Version: 2.17.2
 Summary: Pygments is a syntax highlighting package written in Python.
-Author-email: Georg Brandl <georg@python.org>
-Maintainer: Matthäus G. Chajdas
-Maintainer-email: Georg Brandl <georg@python.org>, Jean Abou Samra <jean@abou-samra.fr>
-License: BSD-2-Clause
 Project-URL: Homepage, https://pygments.org
 Project-URL: Documentation, https://pygments.org/docs
 Project-URL: Source, https://github.com/pygments/pygments
 Project-URL: Bug Tracker, https://github.com/pygments/pygments/issues
 Project-URL: Changelog, https://github.com/pygments/pygments/blob/master/CHANGES
+Author-email: Georg Brandl <georg@python.org>
+Maintainer: Matthäus G. Chajdas
+Maintainer-email: Georg Brandl <georg@python.org>, Jean Abou Samra <jean@abou-samra.fr>
+License: BSD-2-Clause
+License-File: AUTHORS
+License-File: LICENSE
 Keywords: syntax highlighting
 Classifier: Development Status :: 6 - Mature
 Classifier: Intended Audience :: Developers
@@ -25,15 +27,17 @@
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Text Processing :: Filters
 Classifier: Topic :: Utilities
 Requires-Python: >=3.7
-Description-Content-Type: text/x-rst
 Provides-Extra: plugins
-License-File: LICENSE
-License-File: AUTHORS
+Requires-Dist: importlib-metadata; python_version < '3.8' and extra == 'plugins'
+Provides-Extra: windows-terminal
+Requires-Dist: colorama>=0.4.6; extra == 'windows-terminal'
+Description-Content-Type: text/x-rst
 
 Pygments
 ~~~~~~~~
diff -Nru pygments-2.15.1+dfsg/debian/changelog pygments-2.17.2+dfsg/debian/changelog
--- pygments-2.15.1+dfsg/debian/changelog	2023-04-19 08:06:40.000000000 +0000
+++ pygments-2.17.2+dfsg/debian/changelog	2024-02-02 13:26:20.000000000 +0000
@@ -1,3 +1,14 @@
+pygments (2.17.2+dfsg-1) unstable; urgency=medium
+
+  [ Stefano Rivera ]
+  * New upstream release.
+  * Find lower-cased sdists in watch file, upstream switched to hatchling.
+  * Migrate build from setuptools to hatchling.
+  * Disable lexer example inclusion in the documentation, as it isn't
+    available.
+
+ -- Piotr Ożarowski <piotr@debian.org>  Fri, 02 Feb 2024 14:26:20 +0100
+
 pygments (2.15.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru pygments-2.15.1+dfsg/debian/control pygments-2.17.2+dfsg/debian/control
--- pygments-2.15.1+dfsg/debian/control	2023-04-15 13:07:19.000000000 +0000
+++ pygments-2.17.2+dfsg/debian/control	2024-02-02 13:26:20.000000000 +0000
@@ -8,10 +8,10 @@
  pybuild-plugin-pyproject,
  python3-all,
  python3-docutils,
+ python3-hatchling,
  python3-jinja2,
  python3-lxml,
  python3-pytest (>= 7) <!nocheck>,
- python3-setuptools,
  python3-sphinx,
  python3-wcag-contrast-ratio,
 Standards-Version: 4.6.2
diff -Nru pygments-2.15.1+dfsg/debian/patches/0003-Disable-lexer-examples-in-documentation.patch pygments-2.17.2+dfsg/debian/patches/0003-Disable-lexer-examples-in-documentation.patch
--- pygments-2.15.1+dfsg/debian/patches/0003-Disable-lexer-examples-in-documentation.patch	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/debian/patches/0003-Disable-lexer-examples-in-documentation.patch	2024-02-02 13:26:20.000000000 +0000
@@ -0,0 +1,23 @@
+From: Stefano Rivera <stefanor@debian.org>
+Date: Sun, 21 Jan 2024 10:21:07 -0400
+Subject: Disable lexer examples in documentation
+
+We strip tests/examplefiles from the source for licensing reasons.
+Disable the code that attempts to include these in documentation.
+---
+ pygments/sphinxext.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py
+index f935688..5076eb8 100644
+--- a/pygments/sphinxext.py
++++ b/pygments/sphinxext.py
+@@ -165,7 +165,7 @@ class PygmentsDoc(Directive):
+             if isinstance(docstring, bytes):
+                 docstring = docstring.decode('utf8')
+ 
+-            example_file = getattr(cls, '_example', None)
++            example_file = None  # getattr(cls, '_example', None)
+             if example_file:
+                 p = pathlib.Path(inspect.getabsfile(pygments)).parent.parent /\
+                     'tests' / 'examplefiles' / example_file
diff -Nru pygments-2.15.1+dfsg/debian/patches/series pygments-2.17.2+dfsg/debian/patches/series
--- pygments-2.15.1+dfsg/debian/patches/series	2023-04-19 08:06:39.000000000 +0000
+++ pygments-2.17.2+dfsg/debian/patches/series	2024-02-02 13:26:20.000000000 +0000
@@ -1,2 +1,3 @@
 0001-docs-moved-to-python-pygments-doc-binary-package.patch
 0002-pygments.bashcomp-Remove-hashbang-within-bash-comple.patch
+0003-Disable-lexer-examples-in-documentation.patch
diff -Nru pygments-2.15.1+dfsg/debian/watch pygments-2.17.2+dfsg/debian/watch
--- pygments-2.15.1+dfsg/debian/watch	2023-04-15 13:01:21.000000000 +0000
+++ pygments-2.17.2+dfsg/debian/watch	2024-02-02 13:26:20.000000000 +0000
@@ -3,4 +3,4 @@
 dversionmangle=s/\+dfsg//,\
 uversionmangle=s/(beta|rc|a|b|c)/~$1/,\
 repacksuffix=+dfsg \
-https://pypi.debian.net/Pygments/Pygments-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+https://pypi.debian.net/Pygments/[Pp]ygments-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff -Nru pygments-2.15.1+dfsg/doc/Makefile pygments-2.17.2+dfsg/doc/Makefile
--- pygments-2.15.1+dfsg/doc/Makefile	2023-02-25 10:36:04.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/Makefile	2020-02-02 00:00:00.000000000 +0000
@@ -14,7 +14,7 @@
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean pyodide html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
diff -Nru pygments-2.15.1+dfsg/doc/_themes/pygments14/layout.html pygments-2.17.2+dfsg/doc/_themes/pygments14/layout.html
--- pygments-2.15.1+dfsg/doc/_themes/pygments14/layout.html	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/_themes/pygments14/layout.html	2020-02-02 00:00:00.000000000 +0000
@@ -85,8 +85,8 @@
 {% block footer %}
     </div> {# closes "flexwrapper" div #}
     <div class="footer" role="contentinfo">
-      &copy; Copyright 2006-2022, Georg Brandl and Pygments contributors.
-      Created using <a href="https://sphinx-doc.org/">Sphinx</a> {{
+      &copy; Copyright 2006-2023, Georg Brandl and Pygments contributors.
+      Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> {{
       sphinx_version }}. <br/>
       Pygments logo created by <a href="https://joelunger.com">Joel Unger</a>.
       Backgrounds from <a href="https://subtlepatterns.com">subtlepatterns.com</a>.
diff -Nru pygments-2.15.1+dfsg/doc/_themes/pygments14/static/pygments14.css_t pygments-2.17.2+dfsg/doc/_themes/pygments14/static/pygments14.css_t
--- pygments-2.15.1+dfsg/doc/_themes/pygments14/static/pygments14.css_t	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/_themes/pygments14/static/pygments14.css_t	2020-02-02 00:00:00.000000000 +0000
@@ -382,6 +382,19 @@
     padding-bottom: 0.5rem;
 }
 
+/*
+If we have a code highlight box inside an admonition, we hide the background
+color of the highlight box so it doesn't interfere with the admonition
+background color set above.
+*/
+div.admonition .highlight {
+    background-color: unset;
+}
+
+div.admonition div[class*="highlight-"] {
+    margin: 0;
+}
+
 div.admonition p, div.warning p {
     margin: 0.5em 1em 0.5em 1em;
     padding: 0;
diff -Nru pygments-2.15.1+dfsg/doc/docs/api.rst pygments-2.17.2+dfsg/doc/docs/api.rst
--- pygments-2.15.1+dfsg/doc/docs/api.rst	2023-04-15 11:31:49.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/api.rst	2020-02-02 00:00:00.000000000 +0000
@@ -56,7 +56,7 @@
 The base lexer class from which all lexers are derived is:
 
 .. autoclass:: Lexer
-   :members: __init__, get_tokens, get_tokens_unprocessed, analyse_text
+   :members: __init__, add_filter, get_tokens, get_tokens_unprocessed, analyse_text
 
 There are several base class derived from ``Lexer`` you can use to build your lexer from:
 
diff -Nru pygments-2.15.1+dfsg/doc/docs/cmdline.rst pygments-2.17.2+dfsg/doc/docs/cmdline.rst
--- pygments-2.15.1+dfsg/doc/docs/cmdline.rst	2023-02-25 10:36:04.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/cmdline.rst	2020-02-02 00:00:00.000000000 +0000
@@ -13,6 +13,14 @@
 will print the file test.py to standard output, using the Python lexer
 (inferred from the file name extension) and the terminal formatter (because
 you didn't give an explicit formatter name).
+
+.. note::
+
+   If you are on Windows, an extra tool may be needed for colored output to
+   work in the terminal. You can make sure Pygments is installed with
+   Windows console coloring support by installing Pygments with the ``windows-terminal``
+   extra (e.g., ``pip install pygments[windows-terminal]``).
+
 :program:`pygmentize` attempts to
 detect the maximum number of colors that the terminal supports. The difference
 between color formatters for 16 and 256 colors is immense, but there is a less
@@ -135,7 +143,7 @@
 ----------------------------
 
 The ``-s`` option processes lines one at a time until EOF, rather than waiting
-to process the entire file. This only works for stdin, only for lexers with no 
+to process the entire file. This only works for stdin, only for lexers with no
 line-spanning constructs, and is intended for streaming input such as you get
 from `tail -f`. Usage is as follows::
 
diff -Nru pygments-2.15.1+dfsg/doc/docs/contributing.rst pygments-2.17.2+dfsg/doc/docs/contributing.rst
--- pygments-2.15.1+dfsg/doc/docs/contributing.rst	2023-02-25 10:36:04.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/contributing.rst	2020-02-02 00:00:00.000000000 +0000
@@ -28,67 +28,10 @@
 * Run the test suite with ``tox``, and ensure it passes.
 
 * Make sure to add a test for your new functionality, and where applicable,
-  write documentation. See below on how to test lexers.
+  write documentation.
 
 * Use the standard importing convention: ``from token import Punctuation``
 
-
-How to add a lexer
-==================
-
-To add a lexer, you have to perform the following steps:
-
-* Select a matching module under ``pygments/lexers``, or create a new
-  module for your lexer class.
-
-  .. note::
-
-     We encourage you to put your lexer class into its own module, unless it's a
-     very small derivative of an already existing lexer.
-
-* Next, make sure the lexer is known from outside the module. All modules
-  in the ``pygments.lexers`` package specify ``__all__``. For example,
-  ``esoteric.py`` sets::
-
-     __all__ = ['BrainfuckLexer', 'BefungeLexer', ...]
-
-  Add the name of your lexer class to this list (or create the list if your lexer
-  is the only class in the module).
-
-* Finally the lexer can be made publicly known by rebuilding the lexer mapping.
-
-  .. code-block:: console
-
-     $ tox -e mapfiles
-
-
-How lexers are tested
-=====================
-
-To add a new lexer test, create a file with just your code snippet
-under ``tests/snippets/<lexer_alias>/``. Then run
-``tox -- --update-goldens <filename.txt>`` to auto-populate the
-currently expected tokens. Check that they look good and check in the
-file.
-
-Lexer tests are run with ``tox``, like all other tests. While
-working on a lexer, you can also run only the tests for that lexer
-with ``tox -- tests/snippets/language-name/`` and/or
-``tox -- tests/examplefiles/language-name/``.
-
-Running the test suite with ``tox`` will run lexers on the test
-inputs, and check that the output matches the expected tokens. If you
-are improving a lexer, it is normal that the token output changes. To
-update the expected token output for the tests, again use
-``tox -- --update-goldens <filename.txt>``.  Review the changes and
-check that they are as intended, then commit them along with your
-proposed code change.
-
-Large test files should go in ``tests/examplefiles``.  This works
-similar to ``snippets``, but the token output is stored in a separate
-file.  Output can also be regenerated with ``--update-goldens``.
-
-
 Goals & non-goals of Pygments
 =============================
 
@@ -113,3 +56,14 @@
 C89, accepting `//` based comments would be fine because de-facto all
 compilers supported it, and having a separate lexer for it would not
 be worth it.
+
+Language support
+----------------
+
+While we strive for the broadest language support possible, we can't support
+every programming language on the planet. Our minimum bar is fairly low, but to
+avoid pet projects and other one-off languages, we expect any language that is
+proposed for inclusion to have a reasonably sized community around it. If you
+need a syntax highlighter for your in-house programming language or the brand
+new language project you kicked off, consider writing a :doc:`plugin <plugins>`
+until it gains enough popularity.
diff -Nru pygments-2.15.1+dfsg/doc/docs/index.rst pygments-2.17.2+dfsg/doc/docs/index.rst
--- pygments-2.15.1+dfsg/doc/docs/index.rst	2023-02-25 10:36:04.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/index.rst	2020-02-02 00:00:00.000000000 +0000
@@ -46,6 +46,7 @@
 .. toctree::
    :maxdepth: 1
 
+   terminaltips
    rstdirective
    moinmoin
    java
diff -Nru pygments-2.15.1+dfsg/doc/docs/lexerdevelopment.rst pygments-2.17.2+dfsg/doc/docs/lexerdevelopment.rst
--- pygments-2.15.1+dfsg/doc/docs/lexerdevelopment.rst	2023-02-25 10:36:04.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/lexerdevelopment.rst	2020-02-02 00:00:00.000000000 +0000
@@ -20,6 +20,65 @@
 need to do this since there are base lexers that do most of the work and that
 you can subclass.
 
+How to add a lexer
+==================
+
+To add a lexer, you have to perform the following steps:
+
+* Select a matching module under ``pygments/lexers``, or create a new
+  module for your lexer class.
+
+  .. note::
+
+     We encourage you to put your lexer class into its own module, unless it's a
+     very small derivative of an already existing lexer.
+
+* Next, make sure the lexer is known from outside the module. All modules
+  in the ``pygments.lexers`` package specify ``__all__``. For example,
+  ``automation.py`` sets::
+
+    __all__ = ['AutohotkeyLexer', 'AutoItLexer']
+
+  Add the name of your lexer class to this list (or create the list if your 
+  lexer   is the only class in the module).
+
+* Finally the lexer can be made publicly known by rebuilding the lexer mapping.
+
+  .. code-block:: console
+
+     $ tox -e mapfiles
+
+How to test your lexer
+======================
+
+To add a new lexer test, create a file with just your code snippet
+under ``tests/snippets/<lexer_alias>/``. Then run
+``tox -- --update-goldens <filename.txt>`` to auto-populate the
+currently expected tokens. Check that they look good and check in the
+file.
+
+Lexer tests are run with ``tox``, like all other tests. While
+working on a lexer, you can also run only the tests for that lexer
+with ``tox -- tests/snippets/language-name/`` and/or
+``tox -- tests/examplefiles/language-name/``.
+
+Running the test suite with ``tox`` will run lexers on the test
+inputs, and check that the output matches the expected tokens. If you
+are improving a lexer, it is normal that the token output changes. To
+update the expected token output for the tests, again use
+``tox -- --update-goldens <filename.txt>``.  Review the changes and
+check that they are as intended, then commit them along with your
+proposed code change.
+
+Large test files should go in ``tests/examplefiles``.  This works
+similar to ``snippets``, but the token output is stored in a separate
+file.  Output can also be regenerated with ``--update-goldens``.
+
+.. note::
+
+    When contributing a new lexer, you *must* provide an example file or test
+    snippet. Lexers which can't be tested will not be accepted.
+
 RegexLexer
 ==========
 
@@ -31,9 +90,23 @@
 string at the *current position*.  If one of these expressions matches, a
 corresponding action is performed (such as yielding a token with a specific
 type, or changing state), the current position is set to where the last match
-ended and the matching process continues with the first regex of the current
+ended and the matching process continues with the _first_ regex of the current
 state.
 
+.. note::
+
+    This means you're always jumping back to the first entry, i.e. you cannot match states in a particular order. For example, a state with the following rules won't work as intended:
+    
+    .. code:: python
+
+        'state': [
+            (r'\w+', Name,),
+            (r'\s+', Whitespace,),
+            (r'\w+', Keyword,)
+        ]
+
+    In the example above, ``Keyword`` will never be matched. To match certain token types in order, see below for the `bygroups` helper.
+
 Lexer states are kept on a stack: each time a new state is entered, the new
 state is pushed onto the stack.  The most basic lexers (like the `DiffLexer`)
 just need one state.
@@ -715,7 +788,7 @@
 
 * Be careful with ``.*``. This matches greedily as much as it can. For instance,
   a rule like ``@.*@`` will match the whole string ``@first@ second @third@``,
-  instead of matching ``@first@`` and ``@second@``. You can use ``@.*?@`` in
+  instead of matching ``@first@`` and ``@third@``. You can use ``@.*?@`` in
   this case to stop early. The ``?`` tries to match *as few times* as possible.
 
 * Beware of so-called "catastrophic backtracking".  As a first example, consider
diff -Nru pygments-2.15.1+dfsg/doc/docs/plugins.rst pygments-2.17.2+dfsg/doc/docs/plugins.rst
--- pygments-2.15.1+dfsg/doc/docs/plugins.rst	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/plugins.rst	2020-02-02 00:00:00.000000000 +0000
@@ -2,15 +2,19 @@
 Plugins
 =======
 
-If you want to extend Pygments without hacking the sources, but want to
-use the lexer/formatter/style/filter lookup functions (`lexers.get_lexer_by_name`
-et al.), you can use `setuptools`_ entrypoints to add new lexers, formatters
-or styles as if they were in the Pygments core.
-
-.. _setuptools: https://pypi.org/project/setuptools/
-
-That means you can use your highlighter modules with the `pygmentize` script,
-which relies on the mentioned functions.
+If you want to extend Pygments without hacking the sources, you can use
+package `entry points`_ to add new lexers, formatters, styles or filters
+as if they were in the Pygments core.
+
+.. _entry points: https://packaging.python.org/en/latest/guides/creating-and-discovering-plugins/
+
+The idea is to create a Python package, declare how extends Pygments,
+and install it.
+
+This will allow you to use your custom lexers/... with the
+``pygmentize`` command. They will also be found by the lookup functions
+(``lexers.get_lexer_by_name`` et al.), which makes them available to
+tools such as Sphinx, mkdocs, ...
 
 
 Plugin discovery
@@ -22,7 +26,7 @@
 `importlib_metadata`_ backport, if available. If not available, a
 fallback is attempted on the older `pkg_resources`_ module. Finally, if
 ``pkg_resources`` is not available, no plugins will be loaded at
-all. Note that ``pkg_resources`` is distributed with `setuptools`_, and
+all. Note that ``pkg_resources`` is distributed with setuptools, and
 thus available on most Python environments. However, ``pkg_resources``
 is considerably slower than ``importlib.metadata`` or its
 ``importlib_metadata`` backport. For this reason, if you run Pygments
@@ -42,76 +46,13 @@
 .. _pkg_resources: https://setuptools.pypa.io/en/latest/pkg_resources.html
 
 
-Defining plugins through entrypoints
-====================================
-
-Here is a list of setuptools entrypoints that Pygments understands:
-
-`pygments.lexers`
-
-    This entrypoint is used for adding new lexers to the Pygments core.
-    The name of the entrypoint values doesn't really matter, Pygments extracts
-    required metadata from the class definition:
-
-    .. sourcecode:: ini
-
-        [pygments.lexers]
-        yourlexer = yourmodule:YourLexer
-
-    Note that you have to define ``name``, ``aliases`` and ``filename``
-    attributes so that you can use the highlighter from the command line:
-
-    .. sourcecode:: python
-
-        class YourLexer(...):
-            name = 'Name Of Your Lexer'
-            aliases = ['alias']
-            filenames = ['*.ext']
-
-
-`pygments.formatters`
-
-    You can use this entrypoint to add new formatters to Pygments. The
-    name of an entrypoint item is the name of the formatter. If you
-    prefix the name with a slash it's used as a filename pattern:
-
-    .. sourcecode:: ini
-
-        [pygments.formatters]
-        yourformatter = yourmodule:YourFormatter
-        /.ext = yourmodule:YourFormatter
-
-
-`pygments.styles`
-
-    To add a new style you can use this entrypoint. The name of the entrypoint
-    is the name of the style:
-
-    .. sourcecode:: ini
-
-        [pygments.styles]
-        yourstyle = yourmodule:YourStyle
-
-
-`pygments.filters`
-
-    Use this entrypoint to register a new filter. The name of the
-    entrypoint is the name of the filter:
-
-    .. sourcecode:: ini
-
-        [pygments.filters]
-        yourfilter = yourmodule:YourFilter
-
-
-How To Use Entrypoints
-======================
+Defining plugins through entry points
+=====================================
 
-This documentation doesn't explain how to use those entrypoints because this is
-covered in the `setuptools documentation`_. That page should cover everything
-you need to write a plugin.
+We have created a repository with a project template for defining your
+own plugins.  It is available at
 
-.. _setuptools documentation: https://setuptools.readthedocs.io/en/latest/
+https://github.com/pygments/pygments-plugin-scaffolding
 
 
 Extending The Core
diff -Nru pygments-2.15.1+dfsg/doc/docs/styledevelopment.rst pygments-2.17.2+dfsg/doc/docs/styledevelopment.rst
--- pygments-2.15.1+dfsg/doc/docs/styledevelopment.rst	2023-02-25 10:36:04.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/styledevelopment.rst	2020-02-02 00:00:00.000000000 +0000
@@ -41,13 +41,7 @@
 * or update the ``pygments.styles`` subpackage directory. For example:
 
   * add ``your.py`` file
-  * register the new style by adding a line to the ``__init__.py`` file:
-
-  .. sourcecode:: python
-
-      STYLE_MAP = {
-          ...
-          'your':  'your::YourStyle',
+  * regenerate the mappings file using ``tox -e mapfiles``
 
 .. note::
 
diff -Nru pygments-2.15.1+dfsg/doc/docs/terminaltips.rst pygments-2.17.2+dfsg/doc/docs/terminaltips.rst
--- pygments-2.15.1+dfsg/doc/docs/terminaltips.rst	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/terminaltips.rst	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,105 @@
+.. -*- mode: rst -*-
+
+.. highlight:: shell
+
+=============
+Terminal Tips
+=============
+
+These are some tips how to get more out of Pygments on the terminal.
+
+
+How do I determine which shell I am using?
+------------------------------------------
+Run this command::
+
+    $ echo $SHELL
+
+Mine outputs  ``/usr/bin/fish``, which is the location of the executable.
+This means my computer is using the fish shell. ``neofetch`` (or a similar
+utility) can  also provide that information.
+
+Most shells are POSIX compliant.
+
+
+Aliases (POSIX)
+---------------
+
+POSIX compliant shells includes ``bash`` and ``zsh``, and most shells.
+
+Aliases allow you to call a function using a different name.  In this case it
+calls :program:`pygmentize` by using a different name.  The simplest is to make
+an alias called ``cath``::
+
+    $ alias cath="pygmentize"
+
+The only thing is that :program:`pygmentize` does not really work like ``cat``.
+It does allow you to use a command that is similar to one use for cat,
+displaying a file.
+
+Add additional flags can be added as desired.  The monokai style works well for
+a dark background, so this is how you would add that option::
+
+    $ alias cath="pygmentize -O style=monokai"
+
+
+Here is a version of ``less`` with syntax highlighting.  It is slightly more
+complicated, because it uses the environment variable ``LESSOPEN`` to preprocess
+the input file(s)::
+
+    $ alias lessh='LESSOPEN="| pygmentize -O style=monokai %s" less -M -R '
+
+These alias commands need to be added to your configuration in order to work
+when you open a new terminal (or restart the computer).
+
+Add above commands to your configuration file:
+
+* ``bash`` - edit either ``~/.bash_aliases`` (if it exists) or ``~/.bashrc`` file.
+* ``csh`` (C shell), edit  the ``~/.cshrc`` file
+* ``ksh`` (Korn shell), edit the ``~/.kshrc`` file.
+* ``tcsh``, edit the ``~/.tcshrc`` file.
+* ``zsh``, edit the ``~/.zshrc`` file.
+
+In order to apply the changes to the current shell environment systems: run ``source`` on the filename just edited::
+
+    $ source [~/.filenamerc]
+
+
+Aliases (fish shell)
+--------------------
+The above aliases for POSIX work just fine, but permanently saving an alias in
+fish shell is a little different.  Functions are used to make permanent aliases.
+``funced [command]`` is used to create the function, followed by
+``funcsave [command]`` saves the function to the environment.
+
+
+Running the ``funced cath``, brings up the default editor, and add the
+following code in the function::
+
+    function cath
+            # 'cath' alias will highlight source code as cat does.
+            alias cath="pygmentize"
+    end
+
+Here's what the ``cath`` function looks like with an additional argument::
+
+    function cath
+            alias cath="pygmentize -O style=monokai"
+    end
+
+Note: that just like the POSIX shell you may run ``alias cath="pygmentize -O style=monokai"``
+on the command line to test out the alias beforehand.
+
+Test the ``cath`` function. To save the function run ``funcsave cath``.
+This saves the function for future sessions.
+
+
+``funced lessh``, which is slightly more
+complicated, because it uses the environment variable ``LESSOPEN`` to preprocess
+the input file(s)::
+
+    function lessh
+            LESSOPEN="| pygmentize -O style=native %s" less -M -R $argv
+    end
+
+Test the ``lessh`` function. To save the function run ``funcsave lessh``.
diff -Nru pygments-2.15.1+dfsg/doc/docs/tokens.rst pygments-2.17.2+dfsg/doc/docs/tokens.rst
--- pygments-2.15.1+dfsg/doc/docs/tokens.rst	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/docs/tokens.rst	2020-02-02 00:00:00.000000000 +0000
@@ -369,6 +369,9 @@
 `Generic.Strong`
     Marks the token value as bold (e.g. for rst lexer).
 
+`Generic.EmphStrong`
+    Marks the token value as bold and emphasized.
+
 `Generic.Subheading`
     Marks the token value as subheadline.
 
diff -Nru pygments-2.15.1+dfsg/doc/download.rst pygments-2.17.2+dfsg/doc/download.rst
--- pygments-2.15.1+dfsg/doc/download.rst	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/download.rst	2020-02-02 00:00:00.000000000 +0000
@@ -8,7 +8,7 @@
 
 You can download it `from the Python Package Index
 <https://pypi.python.org/pypi/Pygments>`_.  For installation of packages from
-PyPI, we recommend `Pip <https://www.pip-installer.org>`_, which works on all
+PyPI, we recommend `Pip <https://pypi.org/project/pip/>`_, which works on all
 major platforms.
 
 Under Linux, most distributions include a package for Pygments, usually called
diff -Nru pygments-2.15.1+dfsg/doc/faq.rst pygments-2.17.2+dfsg/doc/faq.rst
--- pygments-2.15.1+dfsg/doc/faq.rst	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/faq.rst	2020-02-02 00:00:00.000000000 +0000
@@ -35,8 +35,7 @@
 What are the system requirements?
 ---------------------------------
 
-Pygments only needs a standard Python install, version 3.6 or higher. No
-additional libraries are needed.
+Pygments only needs a standard Python install. No additional libraries are needed.
 
 How can I use Pygments?
 -----------------------
diff -Nru pygments-2.15.1+dfsg/doc/index.rst pygments-2.17.2+dfsg/doc/index.rst
--- pygments-2.15.1+dfsg/doc/index.rst	2023-02-25 10:36:04.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/index.rst	2020-02-02 00:00:00.000000000 +0000
@@ -35,7 +35,7 @@
 Pygments is maintained by **Georg Brandl**, e-mail address *georg*\ *@*\ *python.org*, **Matthäus Chajdas** and **Jean Abou-Samra**.
 
 Many lexers and fixes have been contributed by **Armin Ronacher**, the rest of
-the `Pocoo <https://dev.pocoo.org/>`_ team and **Tim Hatch**.
+the `Pocoo <https://www.pocoo.org/>`_ team and **Tim Hatch**.
 
 .. toctree::
    :maxdepth: 1
diff -Nru pygments-2.15.1+dfsg/doc/pyodide/Dockerfile pygments-2.17.2+dfsg/doc/pyodide/Dockerfile
--- pygments-2.15.1+dfsg/doc/pyodide/Dockerfile	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/doc/pyodide/Dockerfile	2020-02-02 00:00:00.000000000 +0000
@@ -1,5 +1,5 @@
 # Dockerfile for building Pyodide with a Pygmenets version from the current checkout.
-# For an example of how to use this image, see the `pyodide` target in the documentation's Makefile.
+# This is used by the `pyodide` tox environment (see /tox.ini).
 FROM ghcr.io/pyodide/pyodide:0.20.0 AS build-stage
 
 WORKDIR pyodide
diff -Nru pygments-2.15.1+dfsg/external/autopygmentize pygments-2.17.2+dfsg/external/autopygmentize
--- pygments-2.15.1+dfsg/external/autopygmentize	2022-10-31 15:33:03.000000000 +0000
+++ pygments-2.17.2+dfsg/external/autopygmentize	2020-02-02 00:00:00.000000000 +0000
@@ -13,40 +13,46 @@
 
 file_common_opts="--brief --dereference"
 
-case $(file --mime-type --uncompress $file_common_opts "$file") in
+# Better command for XDG-compatible systems: xdg-mime query filetype "$file"
+case $(file --mime-type --uncompress $file_common_opts) in
     application/xml|image/svg+xml) lexer=xml;;
     application/javascript) lexer=javascript;;
     application/json) lexer=json;;
     text/html) lexer=html;;
     text/troff) lexer=nroff;;
     text/x-asm) lexer=nasm;;
-    text/x-awk) lexer=awk;;
-    text/x-c) lexer=c;;
-    text/x-c++) lexer=cpp;;
-    text/x-clojure) lexer=clojure;;
+    */x-awk) lexer=awk;;
+    text/x-c|text/x-csrc|text/x-chdr) lexer=c;;
+    text/x-c++|text/x-c++src) lexer=cpp;;
+    */x-clojure) lexer=clojure;;
     text/x-crystal) lexer=crystal;;
     text/x-diff) lexer=diff;;
-    text/x-execline) lexer=execline;;
+    */x-execline) lexer=execline;;
     text/x-forth) lexer=forth;;
     text/x-fortran) lexer=fortran;;
-    text/x-gawk) lexer=gawk;;
+    */x-gawk) lexer=gawk;;
     text/x-java) lexer=java;;
-    text/x-lisp) lexer=common-lisp;;
-    text/x-lua|text/x-luatex) lexer=lua;;
+    */x-lisp) lexer=common-lisp;;
+    */x-emacs-lisp) lexer=emacs-lisp;;
+    */x-lua|*/x-luatex) lexer=lua;;
     text/x-makefile) lexer=make;;
-    text/x-msdos-batch) lexer=bat;;
-    text/x-nawk) lexer=nawk;;
+    */x-msdos-batch) lexer=bat;;
+    */x-nawk) lexer=nawk;;
     text/x-objective-c) lexer=objective-c;;
-    text/x-pascal) lexer=pascal;;
-    text/x-perl) lexer=perl;;
-    text/x-php) lexer=php;;
-    text/x-po) lexer=po;;
-    text/x-python) lexer=python;;
-    text/x-ruby) lexer=ruby;;
-    text/x-script.python) lexer=python;;
-    text/x-shellscript) lexer=sh;;
-    text/x-tcl) lexer=tcl;;
+    */x-pascal) lexer=pascal;;
+    */x-perl) lexer=perl;;
+    */x-php) lexer=php;;
+    */x-po) lexer=po;;
+    */x-python*) lexer=python;;
+    */x-ruby) lexer=ruby;;
+    */x-script.python) lexer=python;;
+    */x-shellscript) lexer=sh;;
+    # Workaround for TypeScript: mimetype doesn't recognize it.
+    text/vnd.trolltech.linguist) lexer=typescript;;
+    */x-tcl) lexer=tcl;;
     text/x-tex|text/x-texinfo) lexer=latex;; # FIXME: texinfo really needs its own lexer
+    */x-ursa) lexer=ursa;;
+    */x-vala) lexer=vala;;
     text/xml) lexer=xml;;
     text/vnd.graphviz) lexer=graphviz;;
 
diff -Nru pygments-2.15.1+dfsg/pygments/__init__.py pygments-2.17.2+dfsg/pygments/__init__.py
--- pygments-2.15.1+dfsg/pygments/__init__.py	2023-04-18 18:44:38.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/__init__.py	2020-02-02 00:00:00.000000000 +0000
@@ -26,7 +26,7 @@
 """
 from io import StringIO, BytesIO
 
-__version__ = '2.15.1'
+__version__ = '2.17.2'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff -Nru pygments-2.15.1+dfsg/pygments/formatters/__init__.py pygments-2.17.2+dfsg/pygments/formatters/__init__.py
--- pygments-2.15.1+dfsg/pygments/formatters/__init__.py	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/formatters/__init__.py	2020-02-02 00:00:00.000000000 +0000
@@ -131,7 +131,7 @@
                 if name not in _formatter_cache:
                     _load_formatters(modname)
                 return _formatter_cache[name](**options)
-    for cls in find_plugin_formatters():
+    for _name, cls in find_plugin_formatters():
         for filename in cls.filenames:
             if _fn_matches(fn, filename):
                 return cls(**options)
diff -Nru pygments-2.15.1+dfsg/pygments/formatters/html.py pygments-2.17.2+dfsg/pygments/formatters/html.py
--- pygments-2.15.1+dfsg/pygments/formatters/html.py	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/formatters/html.py	2020-02-02 00:00:00.000000000 +0000
@@ -323,6 +323,7 @@
         If set to the path of a ctags file, wrap names in anchor tags that
         link to their definitions. `lineanchors` should be used, and the
         tags file should specify line numbers (see the `-n` option to ctags).
+        The tags file is assumed to be encoded in UTF-8.
 
         .. versionadded:: 1.6
 
@@ -908,7 +909,7 @@
     def _lookup_ctag(self, token):
         entry = ctags.TagEntry()
         if self._ctags.find(entry, token.encode(), 0):
-            return entry['file'], entry['lineNumber']
+            return entry['file'].decode(), entry['lineNumber']
         else:
             return None, None
 
diff -Nru pygments-2.15.1+dfsg/pygments/formatters/img.py pygments-2.17.2+dfsg/pygments/formatters/img.py
--- pygments-2.15.1+dfsg/pygments/formatters/img.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/formatters/img.py	2020-02-02 00:00:00.000000000 +0000
@@ -7,7 +7,6 @@
     :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-
 import os
 import sys
 
@@ -68,6 +67,15 @@
         self.font_size = font_size
         self.fonts = {}
         self.encoding = None
+        self.variable = False
+        if hasattr(font_name, 'read') or os.path.isfile(font_name):
+            font = ImageFont.truetype(font_name, self.font_size)
+            self.variable = True
+            for style in STYLES:
+                self.fonts[style] = font
+
+            return
+
         if sys.platform.startswith('win'):
             if not font_name:
                 self.font_name = DEFAULT_FONT_NAME_WIN
@@ -223,14 +231,43 @@
         Get the font based on bold and italic flags.
         """
         if bold and oblique:
+            if self.variable:
+                return self.get_style('BOLDITALIC')
+
             return self.fonts['BOLDITALIC']
         elif bold:
+            if self.variable:
+                return self.get_style('BOLD')
+
             return self.fonts['BOLD']
         elif oblique:
+            if self.variable:
+                return self.get_style('ITALIC')
+
             return self.fonts['ITALIC']
         else:
+            if self.variable:
+                return self.get_style('NORMAL')
+
             return self.fonts['NORMAL']
 
+    def get_style(self, style):
+        """
+        Get the specified style of the font if it is a variable font.
+        If not found, return the normal font.
+        """
+        font = self.fonts[style]
+        for style_name in STYLES[style]:
+            try:
+                font.set_variation_by_name(style_name)
+                return font
+            except ValueError:
+                pass
+            except OSError:
+                return font
+
+        return font
+
 
 class ImageFormatter(Formatter):
     """
@@ -258,6 +295,8 @@
         The font name to be used as the base font from which others, such as
         bold and italic fonts will be generated.  This really should be a
         monospace font to look sane.
+        If a filename or a file-like object is specified, the user must
+        provide different styles of the font.
 
         Default: "Courier New" on Windows, "Menlo" on Mac OS, and
                  "DejaVu Sans Mono" on \\*nix
diff -Nru pygments-2.15.1+dfsg/pygments/lexer.py pygments-2.17.2+dfsg/pygments/lexer.py
--- pygments-2.15.1+dfsg/pygments/lexer.py	2023-04-15 11:31:49.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexer.py	2020-02-02 00:00:00.000000000 +0000
@@ -72,6 +72,11 @@
     .. autoattribute:: url
        :no-value:
 
+    Lexers included in Pygments may have additional attributes:
+
+    .. autoattribute:: _example
+       :no-value:
+
     You can pass options to the constructor. The basic options recognized
     by all lexers and processed by the base `Lexer` class are:
 
@@ -128,6 +133,10 @@
     #: documentation.
     url = None
 
+    #: Example file name. Relative to the ``tests/examplefiles`` directory.
+    #: This is used by the documentation generator to show an example.
+    _example = None
+
     def __init__(self, **options):
         """
         This constructor takes arbitrary options as keyword arguments.
@@ -190,20 +199,9 @@
         it's the same as if the return values was ``0.0``.
         """
 
-    def get_tokens(self, text, unfiltered=False):
-        """
-        This method is the basic interface of a lexer. It is called by
-        the `highlight()` function. It must process the text and return an
-        iterable of ``(tokentype, value)`` pairs from `text`.
+    def _preprocess_lexer_input(self, text):
+        """Apply preprocessing such as decoding the input, removing BOM and normalizing newlines."""
 
-        Normally, you don't need to override this method. The default
-        implementation processes the options recognized by all lexers
-        (`stripnl`, `stripall` and so on), and then yields all tokens
-        from `get_tokens_unprocessed()`, with the ``index`` dropped.
-
-        If `unfiltered` is set to `True`, the filtering mechanism is
-        bypassed even if filters are defined.
-        """
         if not isinstance(text, str):
             if self.encoding == 'guess':
                 text, _ = guess_decode(text)
@@ -246,6 +244,24 @@
         if self.ensurenl and not text.endswith('\n'):
             text += '\n'
 
+        return text
+
+    def get_tokens(self, text, unfiltered=False):
+        """
+        This method is the basic interface of a lexer. It is called by
+        the `highlight()` function. It must process the text and return an
+        iterable of ``(tokentype, value)`` pairs from `text`.
+
+        Normally, you don't need to override this method. The default
+        implementation processes the options recognized by all lexers
+        (`stripnl`, `stripall` and so on), and then yields all tokens
+        from `get_tokens_unprocessed()`, with the ``index`` dropped.
+
+        If `unfiltered` is set to `True`, the filtering mechanism is
+        bypassed even if filters are defined.
+        """
+        text = self._preprocess_lexer_input(text)
+
         def streamer():
             for _, t, v in self.get_tokens_unprocessed(text):
                 yield t, v
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/__init__.py pygments-2.17.2+dfsg/pygments/lexers/__init__.py
--- pygments-2.15.1+dfsg/pygments/lexers/__init__.py	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/__init__.py	2020-02-02 00:00:00.000000000 +0000
@@ -22,6 +22,7 @@
 COMPAT = {
     'Python3Lexer': 'PythonLexer',
     'Python3TracebackLexer': 'PythonTracebackLexer',
+    'LeanLexer': 'Lean3Lexer',
 }
 
 __all__ = ['get_lexer_by_name', 'get_lexer_for_filename', 'find_lexer_class',
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/_mapping.py pygments-2.17.2+dfsg/pygments/lexers/_mapping.py
--- pygments-2.15.1+dfsg/pygments/lexers/_mapping.py	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/_mapping.py	2020-02-02 00:00:00.000000000 +0000
@@ -31,7 +31,8 @@
     'ArduinoLexer': ('pygments.lexers.c_like', 'Arduino', ('arduino',), ('*.ino',), ('text/x-arduino',)),
     'ArrowLexer': ('pygments.lexers.arrow', 'Arrow', ('arrow',), ('*.arw',), ()),
     'ArturoLexer': ('pygments.lexers.arturo', 'Arturo', ('arturo', 'art'), ('*.art',), ()),
-    'AscLexer': ('pygments.lexers.asc', 'ASCII armored', ('asc', 'pem'), ('*.asc', '*.pem', 'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk', 'id_rsa'), ('application/pgp-keys', 'application/pgp-encrypted', 'application/pgp-signature')),
+    'AscLexer': ('pygments.lexers.asc', 'ASCII armored', ('asc', 'pem'), ('*.asc', '*.pem', 'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk', 'id_rsa'), ('application/pgp-keys', 'application/pgp-encrypted', 'application/pgp-signature', 'application/pem-certificate-chain')),
+    'Asn1Lexer': ('pygments.lexers.asn1', 'ASN.1', ('asn1',), ('*.asn1',), ()),
     'AspectJLexer': ('pygments.lexers.jvm', 'AspectJ', ('aspectj',), ('*.aj',), ('text/x-aspectj',)),
     'AsymptoteLexer': ('pygments.lexers.graphics', 'Asymptote', ('asymptote', 'asy'), ('*.asy',), ('text/x-asymptote',)),
     'AugeasLexer': ('pygments.lexers.configs', 'Augeas', ('augeas',), ('*.aug',), ()),
@@ -41,6 +42,7 @@
     'BBCBasicLexer': ('pygments.lexers.basic', 'BBC Basic', ('bbcbasic',), ('*.bbc',), ()),
     'BBCodeLexer': ('pygments.lexers.markup', 'BBCode', ('bbcode',), (), ('text/x-bbcode',)),
     'BCLexer': ('pygments.lexers.algebra', 'BC', ('bc',), ('*.bc',), ()),
+    'BQNLexer': ('pygments.lexers.bqn', 'BQN', ('bqn',), ('*.bqn',), ()),
     'BSTLexer': ('pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
     'BareLexer': ('pygments.lexers.bare', 'BARE', ('bare',), ('*.bare',), ()),
     'BaseMakefileLexer': ('pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
@@ -53,6 +55,7 @@
     'BibTeXLexer': ('pygments.lexers.bibtex', 'BibTeX', ('bibtex', 'bib'), ('*.bib',), ('text/x-bibtex',)),
     'BlitzBasicLexer': ('pygments.lexers.basic', 'BlitzBasic', ('blitzbasic', 'b3d', 'bplus'), ('*.bb', '*.decls'), ('text/x-bb',)),
     'BlitzMaxLexer': ('pygments.lexers.basic', 'BlitzMax', ('blitzmax', 'bmax'), ('*.bmx',), ('text/x-bmx',)),
+    'BlueprintLexer': ('pygments.lexers.blueprint', 'Blueprint', ('blueprint',), ('*.blp',), ('text/x-blueprint',)),
     'BnfLexer': ('pygments.lexers.grammar_notation', 'BNF', ('bnf',), ('*.bnf',), ('text/x-bnf',)),
     'BoaLexer': ('pygments.lexers.boa', 'Boa', ('boa',), ('*.boa',), ()),
     'BooLexer': ('pygments.lexers.dotnet', 'Boo', ('boo',), ('*.boo',), ('text/x-boo',)),
@@ -125,10 +128,12 @@
     'DaxLexer': ('pygments.lexers.dax', 'Dax', ('dax',), ('*.dax',), ()),
     'DebianControlLexer': ('pygments.lexers.installers', 'Debian Control file', ('debcontrol', 'control'), ('control',), ()),
     'DelphiLexer': ('pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
+    'DesktopLexer': ('pygments.lexers.configs', 'Desktop file', ('desktop',), ('*.desktop',), ()),
     'DevicetreeLexer': ('pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
     'DgLexer': ('pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
     'DiffLexer': ('pygments.lexers.diff', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
     'DjangoLexer': ('pygments.lexers.templates', 'Django/Jinja', ('django', 'jinja'), (), ('application/x-django-templating', 'application/x-jinja')),
+    'DnsZoneLexer': ('pygments.lexers.dns', 'Zone', ('zone',), ('*.zone',), ('text/dns',)),
     'DockerLexer': ('pygments.lexers.configs', 'Docker', ('docker', 'dockerfile'), ('Dockerfile', '*.docker'), ('text/x-dockerfile-config',)),
     'DtdLexer': ('pygments.lexers.html', 'DTD', ('dtd',), ('*.dtd',), ('application/xml-dtd',)),
     'DuelLexer': ('pygments.lexers.webmisc', 'Duel', ('duel', 'jbst', 'jsonml+bst'), ('*.duel', '*.jbst'), ('text/x-duel', 'text/x-jbst')),
@@ -190,6 +195,7 @@
     'GoodDataCLLexer': ('pygments.lexers.business', 'GoodData-CL', ('gooddata-cl',), ('*.gdc',), ('text/x-gooddata-cl',)),
     'GosuLexer': ('pygments.lexers.jvm', 'Gosu', ('gosu',), ('*.gs', '*.gsx', '*.gsp', '*.vark'), ('text/x-gosu',)),
     'GosuTemplateLexer': ('pygments.lexers.jvm', 'Gosu Template', ('gst',), ('*.gst',), ('text/x-gosu-template',)),
+    'GraphQLLexer': ('pygments.lexers.graphql', 'GraphQL', ('graphql',), ('*.graphql',), ()),
     'GraphvizLexer': ('pygments.lexers.graphviz', 'Graphviz', ('graphviz', 'dot'), ('*.gv', '*.dot'), ('text/x-graphviz', 'text/vnd.graphviz')),
     'GroffLexer': ('pygments.lexers.markup', 'Groff', ('groff', 'nroff', 'man'), ('*.[1-9]', '*.man', '*.1p', '*.3pm'), ('application/x-troff', 'text/troff')),
     'GroovyLexer': ('pygments.lexers.jvm', 'Groovy', ('groovy',), ('*.groovy', '*.gradle'), ('text/x-groovy',)),
@@ -219,7 +225,7 @@
     'Inform6Lexer': ('pygments.lexers.int_fiction', 'Inform 6', ('inform6', 'i6'), ('*.inf',), ()),
     'Inform6TemplateLexer': ('pygments.lexers.int_fiction', 'Inform 6 template', ('i6t',), ('*.i6t',), ()),
     'Inform7Lexer': ('pygments.lexers.int_fiction', 'Inform 7', ('inform7', 'i7'), ('*.ni', '*.i7x'), ()),
-    'IniLexer': ('pygments.lexers.configs', 'INI', ('ini', 'cfg', 'dosini'), ('*.ini', '*.cfg', '*.inf', '.editorconfig', '*.service', '*.socket', '*.device', '*.mount', '*.automount', '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope'), ('text/x-ini', 'text/inf')),
+    'IniLexer': ('pygments.lexers.configs', 'INI', ('ini', 'cfg', 'dosini'), ('*.ini', '*.cfg', '*.inf', '.editorconfig'), ('text/x-ini', 'text/inf')),
     'IoLexer': ('pygments.lexers.iolang', 'Io', ('io',), ('*.io',), ('text/x-iosrc',)),
     'IokeLexer': ('pygments.lexers.jvm', 'Ioke', ('ioke', 'ik'), ('*.ik',), ('text/x-iokesrc',)),
     'IrcLogsLexer': ('pygments.lexers.textfmts', 'IRC logs', ('irc',), ('*.weechatlog',), ('text/x-irclog',)),
@@ -241,9 +247,10 @@
     'JsgfLexer': ('pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
     'JsonBareObjectLexer': ('pygments.lexers.data', 'JSONBareObject', (), (), ()),
     'JsonLdLexer': ('pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
-    'JsonLexer': ('pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', 'Pipfile.lock'), ('application/json', 'application/json-object')),
+    'JsonLexer': ('pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', '*.jsonl', '*.ndjson', 'Pipfile.lock'), ('application/json', 'application/json-object', 'application/x-ndjson', 'application/jsonl', 'application/json-seq')),
     'JsonnetLexer': ('pygments.lexers.jsonnet', 'Jsonnet', ('jsonnet',), ('*.jsonnet', '*.libsonnet'), ()),
     'JspLexer': ('pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)),
+    'JsxLexer': ('pygments.lexers.jsx', 'JSX', ('jsx', 'react'), ('*.jsx', '*.react'), ('text/jsx', 'text/typescript-jsx')),
     'JuliaConsoleLexer': ('pygments.lexers.julia', 'Julia console', ('jlcon', 'julia-repl'), (), ()),
     'JuliaLexer': ('pygments.lexers.julia', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')),
     'JuttleLexer': ('pygments.lexers.javascript', 'Juttle', ('juttle',), ('*.juttle',), ('application/juttle', 'application/x-juttle', 'text/x-juttle', 'text/juttle')),
@@ -254,13 +261,16 @@
     'KokaLexer': ('pygments.lexers.haskell', 'Koka', ('koka',), ('*.kk', '*.kki'), ('text/x-koka',)),
     'KotlinLexer': ('pygments.lexers.jvm', 'Kotlin', ('kotlin',), ('*.kt', '*.kts'), ('text/x-kotlin',)),
     'KuinLexer': ('pygments.lexers.kuin', 'Kuin', ('kuin',), ('*.kn',), ()),
+    'KustoLexer': ('pygments.lexers.kusto', 'Kusto', ('kql', 'kusto'), ('*.kql', '*.kusto', '.csl'), ()),
     'LSLLexer': ('pygments.lexers.scripting', 'LSL', ('lsl',), ('*.lsl',), ('text/x-lsl',)),
     'LassoCssLexer': ('pygments.lexers.templates', 'CSS+Lasso', ('css+lasso',), (), ('text/css+lasso',)),
     'LassoHtmlLexer': ('pygments.lexers.templates', 'HTML+Lasso', ('html+lasso',), (), ('text/html+lasso', 'application/x-httpd-lasso', 'application/x-httpd-lasso[89]')),
     'LassoJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Lasso', ('javascript+lasso', 'js+lasso'), (), ('application/x-javascript+lasso', 'text/x-javascript+lasso', 'text/javascript+lasso')),
     'LassoLexer': ('pygments.lexers.javascript', 'Lasso', ('lasso', 'lassoscript'), ('*.lasso', '*.lasso[89]'), ('text/x-lasso',)),
     'LassoXmlLexer': ('pygments.lexers.templates', 'XML+Lasso', ('xml+lasso',), (), ('application/xml+lasso',)),
-    'LeanLexer': ('pygments.lexers.theorem', 'Lean', ('lean',), ('*.lean',), ('text/x-lean',)),
+    'LdaprcLexer': ('pygments.lexers.ldap', 'LDAP configuration file', ('ldapconf', 'ldaprc'), ('.ldaprc', 'ldaprc', 'ldap.conf'), ('text/x-ldapconf',)),
+    'LdifLexer': ('pygments.lexers.ldap', 'LDIF', ('ldif',), ('*.ldif',), ('text/x-ldif',)),
+    'Lean3Lexer': ('pygments.lexers.lean', 'Lean', ('lean', 'lean3'), ('*.lean',), ('text/x-lean', 'text/x-lean3')),
     'LessCssLexer': ('pygments.lexers.css', 'LessCss', ('less',), ('*.less',), ('text/x-less-css',)),
     'LighttpdConfLexer': ('pygments.lexers.configs', 'Lighttpd configuration file', ('lighttpd', 'lighty'), ('lighttpd.conf',), ('text/x-lighttpd-conf',)),
     'LilyPondLexer': ('pygments.lexers.lilypond', 'LilyPond', ('lilypond',), ('*.ly',), ()),
@@ -351,6 +361,7 @@
     'OocLexer': ('pygments.lexers.ooc', 'Ooc', ('ooc',), ('*.ooc',), ('text/x-ooc',)),
     'OpaLexer': ('pygments.lexers.ml', 'Opa', ('opa',), ('*.opa',), ('text/x-opa',)),
     'OpenEdgeLexer': ('pygments.lexers.business', 'OpenEdge ABL', ('openedge', 'abl', 'progress'), ('*.p', '*.cls'), ('text/x-openedge', 'application/x-openedge')),
+    'OpenScadLexer': ('pygments.lexers.openscad', 'OpenSCAD', ('openscad',), ('*.scad',), ('application/x-openscad',)),
     'OutputLexer': ('pygments.lexers.special', 'Text output', ('output',), (), ()),
     'PacmanConfLexer': ('pygments.lexers.configs', 'PacmanConf', ('pacmanconf',), ('pacman.conf',), ()),
     'PanLexer': ('pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
@@ -381,14 +392,16 @@
     'PromQLLexer': ('pygments.lexers.promql', 'PromQL', ('promql',), ('*.promql',), ()),
     'PropertiesLexer': ('pygments.lexers.configs', 'Properties', ('properties', 'jproperties'), ('*.properties',), ('text/x-java-properties',)),
     'ProtoBufLexer': ('pygments.lexers.dsls', 'Protocol Buffer', ('protobuf', 'proto'), ('*.proto',), ()),
+    'PrqlLexer': ('pygments.lexers.prql', 'PRQL', ('prql',), ('*.prql',), ('application/prql', 'application/x-prql')),
     'PsyshConsoleLexer': ('pygments.lexers.php', 'PsySH console session for PHP', ('psysh',), (), ()),
+    'PtxLexer': ('pygments.lexers.ptx', 'PTX', ('ptx',), ('*.ptx',), ('text/x-ptx',)),
     'PugLexer': ('pygments.lexers.html', 'Pug', ('pug', 'jade'), ('*.pug', '*.jade'), ('text/x-pug', 'text/x-jade')),
     'PuppetLexer': ('pygments.lexers.dsls', 'Puppet', ('puppet',), ('*.pp',), ()),
     'PyPyLogLexer': ('pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
     'Python2Lexer': ('pygments.lexers.python', 'Python 2.x', ('python2', 'py2'), (), ('text/x-python2', 'application/x-python2')),
     'Python2TracebackLexer': ('pygments.lexers.python', 'Python 2.x Traceback', ('py2tb',), ('*.py2tb',), ('text/x-python2-traceback',)),
     'PythonConsoleLexer': ('pygments.lexers.python', 'Python console session', ('pycon',), (), ('text/x-python-doctest',)),
-    'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
+    'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
     'PythonTracebackLexer': ('pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     'PythonUL4Lexer': ('pygments.lexers.ul4', 'Python+UL4', ('py+ul4',), ('*.pyul4',), ()),
     'QBasicLexer': ('pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
@@ -477,9 +490,10 @@
     'SwiftLexer': ('pygments.lexers.objective', 'Swift', ('swift',), ('*.swift',), ('text/x-swift',)),
     'SwigLexer': ('pygments.lexers.c_like', 'SWIG', ('swig',), ('*.swg', '*.i'), ('text/swig',)),
     'SystemVerilogLexer': ('pygments.lexers.hdl', 'systemverilog', ('systemverilog', 'sv'), ('*.sv', '*.svh'), ('text/x-systemverilog',)),
+    'SystemdLexer': ('pygments.lexers.configs', 'Systemd', ('systemd',), ('*.service', '*.socket', '*.device', '*.mount', '*.automount', '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope'), ()),
     'TAPLexer': ('pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
     'TNTLexer': ('pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
-    'TOMLLexer': ('pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ()),
+    'TOMLLexer': ('pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ('application/toml',)),
     'Tads3Lexer': ('pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
     'TalLexer': ('pygments.lexers.tal', 'Tal', ('tal', 'uxntal'), ('*.tal',), ('text/x-uxntal',)),
     'TasmLexer': ('pygments.lexers.asm', 'TASM', ('tasm',), ('*.asm', '*.ASM', '*.tasm'), ('text/x-tasm',)),
@@ -498,6 +512,7 @@
     'ThriftLexer': ('pygments.lexers.dsls', 'Thrift', ('thrift',), ('*.thrift',), ('application/x-thrift',)),
     'TiddlyWiki5Lexer': ('pygments.lexers.markup', 'tiddler', ('tid',), ('*.tid',), ('text/vnd.tiddlywiki',)),
     'TlbLexer': ('pygments.lexers.tlb', 'Tl-b', ('tlb',), ('*.tlb',), ()),
+    'TlsLexer': ('pygments.lexers.tls', 'TLS Presentation Language', ('tls',), (), ()),
     'TodotxtLexer': ('pygments.lexers.textfmts', 'Todotxt', ('todotxt',), ('todo.txt', '*.todotxt'), ('text/x-todo',)),
     'TransactSqlLexer': ('pygments.lexers.sql', 'Transact-SQL', ('tsql', 't-sql'), ('*.sql',), ('text/x-tsql',)),
     'TreetopLexer': ('pygments.lexers.parsers', 'Treetop', ('treetop',), ('*.treetop', '*.tt'), ()),
@@ -513,6 +528,7 @@
     'UniconLexer': ('pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
     'UnixConfigLexer': ('pygments.lexers.configs', 'Unix/Linux config files', ('unixconfig', 'linuxconfig'), (), ()),
     'UrbiscriptLexer': ('pygments.lexers.urbi', 'UrbiScript', ('urbiscript',), ('*.u',), ('application/x-urbiscript',)),
+    'UrlEncodedLexer': ('pygments.lexers.html', 'urlencoded', ('urlencoded',), (), ('application/x-www-form-urlencoded',)),
     'UsdLexer': ('pygments.lexers.usd', 'USD', ('usd', 'usda'), ('*.usd', '*.usda'), ()),
     'VBScriptLexer': ('pygments.lexers.basic', 'VBScript', ('vbscript',), ('*.vbs', '*.VBS'), ()),
     'VCLLexer': ('pygments.lexers.varnish', 'VCL', ('vcl',), ('*.vcl',), ('text/x-vclsrc',)),
@@ -525,9 +541,13 @@
     'VelocityHtmlLexer': ('pygments.lexers.templates', 'HTML+Velocity', ('html+velocity',), (), ('text/html+velocity',)),
     'VelocityLexer': ('pygments.lexers.templates', 'Velocity', ('velocity',), ('*.vm', '*.fhtml'), ()),
     'VelocityXmlLexer': ('pygments.lexers.templates', 'XML+Velocity', ('xml+velocity',), (), ('application/xml+velocity',)),
+    'VerifpalLexer': ('pygments.lexers.verifpal', 'Verifpal', ('verifpal',), ('*.vp',), ('text/x-verifpal',)),
     'VerilogLexer': ('pygments.lexers.hdl', 'verilog', ('verilog', 'v'), ('*.v',), ('text/x-verilog',)),
     'VhdlLexer': ('pygments.lexers.hdl', 'vhdl', ('vhdl',), ('*.vhdl', '*.vhd'), ('text/x-vhdl',)),
     'VimLexer': ('pygments.lexers.textedit', 'VimL', ('vim',), ('*.vim', '.vimrc', '.exrc', '.gvimrc', '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc'), ('text/x-vim',)),
+    'VisualPrologGrammarLexer': ('pygments.lexers.vip', 'Visual Prolog Grammar', ('visualprologgrammar',), ('*.vipgrm',), ()),
+    'VisualPrologLexer': ('pygments.lexers.vip', 'Visual Prolog', ('visualprolog',), ('*.pro', '*.cl', '*.i', '*.pack', '*.ph'), ()),
+    'VyperLexer': ('pygments.lexers.vyper', 'Vyper', ('vyper',), ('*.vy',), ()),
     'WDiffLexer': ('pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
     'WatLexer': ('pygments.lexers.webassembly', 'WebAssembly', ('wast', 'wat'), ('*.wat', '*.wast'), ()),
     'WebIDLLexer': ('pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
@@ -552,6 +572,7 @@
     'YamlJinjaLexer': ('pygments.lexers.templates', 'YAML+Jinja', ('yaml+jinja', 'salt', 'sls'), ('*.sls', '*.yaml.j2', '*.yml.j2', '*.yaml.jinja2', '*.yml.jinja2'), ('text/x-yaml+jinja', 'text/x-sls')),
     'YamlLexer': ('pygments.lexers.data', 'YAML', ('yaml',), ('*.yaml', '*.yml'), ('text/x-yaml',)),
     'YangLexer': ('pygments.lexers.yang', 'YANG', ('yang',), ('*.yang',), ('application/yang',)),
+    'YaraLexer': ('pygments.lexers.yara', 'YARA', ('yara', 'yar'), ('*.yar',), ('text/x-yara',)),
     'ZeekLexer': ('pygments.lexers.dsls', 'Zeek', ('zeek', 'bro'), ('*.zeek', '*.bro'), ()),
     'ZephirLexer': ('pygments.lexers.php', 'Zephir', ('zephir',), ('*.zep',), ()),
     'ZigLexer': ('pygments.lexers.zig', 'Zig', ('zig',), ('*.zig',), ('text/zig',)),
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/algebra.py pygments-2.17.2+dfsg/pygments/lexers/algebra.py
--- pygments-2.15.1+dfsg/pygments/lexers/algebra.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/algebra.py	2020-02-02 00:00:00.000000000 +0000
@@ -25,7 +25,7 @@
     .. versionadded:: 2.0
     """
     name = 'GAP'
-    url = 'http://www.gap-system.org'
+    url = 'https://www.gap-system.org'
     aliases = ['gap']
     filenames = ['*.g', '*.gd', '*.gi', '*.gap']
 
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/asc.py pygments-2.17.2+dfsg/pygments/lexers/asc.py
--- pygments-2.15.1+dfsg/pygments/lexers/asc.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/asc.py	2020-02-02 00:00:00.000000000 +0000
@@ -31,7 +31,7 @@
         'id_rsa',  # SSH private keys
     ]
     mimetypes = ['application/pgp-keys', 'application/pgp-encrypted',
-                 'application/pgp-signature']
+                 'application/pgp-signature', 'application/pem-certificate-chain']
 
     flags = re.MULTILINE
 
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/asn1.py pygments-2.17.2+dfsg/pygments/lexers/asn1.py
--- pygments-2.15.1+dfsg/pygments/lexers/asn1.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/asn1.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,179 @@
+"""
+    pygments.lexers.asn1
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Pygments lexers for ASN.1.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.token import  Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace
+from pygments.lexer import RegexLexer, words, bygroups
+
+__all__ = ['Asn1Lexer']
+
+SINGLE_WORD_KEYWORDS = [
+    "ENCODED",
+    "ABSTRACT-SYNTAX",
+    "END",
+    "APPLICATION",
+    "EXPLICIT",
+    "IMPLICIT",
+    "AUTOMATIC",
+    "TAGS",
+    "BEGIN",
+    "EXTENSIBILITY",
+    "BY",
+    "FROM",
+    "COMPONENT",
+    "UNIVERSAL",
+    "COMPONENTS",
+    "CONSTRAINED",
+    "IMPLIED",
+    "DEFINITIONS",
+    "INCLUDES",
+    "PRIVATE",
+    "WITH",
+    "OF",
+]
+
+OPERATOR_WORDS = [
+    "EXCEPT",
+    "UNION",
+    "INTERSECTION",
+]
+
+SINGLE_WORD_NAMESPACE_KEYWORDS = [
+    "EXPORTS",
+    "IMPORTS",
+]
+
+MULTI_WORDS_DECLARATIONS = [
+    "SEQUENCE OF",
+    "SET OF",
+    "INSTANCE OF",
+    "WITH SYNTAX",
+]
+
+SINGLE_WORDS_DECLARATIONS = [
+    "SIZE",
+    "SEQUENCE",
+    "SET",
+    "CLASS",
+    "UNIQUE",
+    "DEFAULT",
+    "CHOICE",
+    "PATTERN",
+    "OPTIONAL",
+    "PRESENT",
+    "ABSENT",
+    "CONTAINING",
+    "ENUMERATED",
+    "ALL",
+]
+
+TWO_WORDS_TYPES = [
+    "OBJECT IDENTIFIER",
+    "BIT STRING",
+    "OCTET STRING",
+    "CHARACTER STRING",
+    "EMBEDDED PDV",
+]
+
+SINGLE_WORD_TYPES = [
+    "RELATIVE-OID",
+    "TYPE-IDENTIFIER",
+    "ObjectDescriptor",
+    "IA5String",
+    "INTEGER",
+    "ISO646String",
+    "T61String",
+    "BMPString",
+    "NumericString",
+    "TeletexString",
+    "GeneralizedTime",
+    "REAL",
+    "BOOLEAN",
+    "GeneralString",
+    "GraphicString",
+    "UniversalString",
+    "UTCTime",
+    "VisibleString",
+    "UTF8String",
+    "PrintableString",
+    "VideotexString",
+    "EXTERNAL",
+]
+
+
+def word_sequences(tokens):
+    return "(" + '|'.join(token.replace(' ', r'\s+') for token in tokens) + r')\b'
+
+
+class Asn1Lexer(RegexLexer):
+
+    """
+    Lexer for ASN.1 module definition
+
+    .. versionadded:: 2.16
+    """
+
+    flags = re.MULTILINE
+
+    name = 'ASN.1'
+    aliases = ['asn1']
+    filenames = ["*.asn1"]
+    url = "https://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf"
+
+    tokens = {
+       'root': [
+            # Whitespace:
+            (r'\s+', Whitespace),
+            # Comments:
+            (r'--.*$', Comment.Single),
+            (r'/\*', Comment.Multiline, 'comment'),
+            #  Numbers:
+            (r'\d+\.\d*([eE][-+]?\d+)?', Number.Float),
+            (r'\d+', Number.Integer),
+            # Identifier:
+            (r"&?[a-z][-a-zA-Z0-9]*[a-zA-Z0-9]\b", Name.Variable),
+            # Constants:
+            (words(("TRUE", "FALSE", "NULL", "MINUS-INFINITY", "PLUS-INFINITY", "MIN", "MAX"), suffix=r'\b'), Keyword.Constant),
+            # Builtin types:
+            (word_sequences(TWO_WORDS_TYPES), Keyword.Type),
+            (words(SINGLE_WORD_TYPES, suffix=r'\b'), Keyword.Type),
+            # Other keywords:
+            (r"EXPORTS\s+ALL\b", Keyword.Namespace),
+            (words(SINGLE_WORD_NAMESPACE_KEYWORDS, suffix=r'\b'), Operator.Namespace),
+            (word_sequences(MULTI_WORDS_DECLARATIONS), Keyword.Declaration),
+            (words(SINGLE_WORDS_DECLARATIONS, suffix=r'\b'), Keyword.Declaration),
+            (words(OPERATOR_WORDS, suffix=r'\b'), Operator.Word),
+            (words(SINGLE_WORD_KEYWORDS), Keyword),
+            # Type identifier:
+            (r"&?[A-Z][-a-zA-Z0-9]*[a-zA-Z0-9]\b", Name.Type),
+            # Operators:
+            (r"(::=|\.\.\.|\.\.|\[\[|\]\]|\||\^)", Operator),
+            # Punctuation:
+            (r"(\.|,|\{|\}|\(|\)|\[|\])", Punctuation),
+            # String:
+            (r'"', String, 'string'),
+            # Binary string:
+            (r"('[01 ]*')(B)\b", bygroups(String, String.Affix)),
+            (r"('[0-9A-F ]*')(H)\b",bygroups(String, String.Affix)),
+        ],
+        'comment': [
+            (r'[^*/]+', Comment.Multiline),
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[*/]', Comment.Multiline)
+        ],
+        'string': [
+            (r'""', String),
+            (r'"', String, "#pop"),
+            (r'[^"]', String),
+        ]
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/blueprint.py pygments-2.17.2+dfsg/pygments/lexers/blueprint.py
--- pygments-2.15.1+dfsg/pygments/lexers/blueprint.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/blueprint.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,174 @@
+"""
+    pygments.lexers.blueprint
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the Blueprint UI markup language.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, include, bygroups, words
+from pygments.token import (
+    Comment,
+    Operator,
+    Keyword,
+    Name,
+    String,
+    Number,
+    Punctuation,
+    Whitespace,
+)
+
+__all__ = ["BlueprintLexer"]
+
+
+class BlueprintLexer(RegexLexer):
+    """
+    For Blueprint UI markup.
+
+    .. versionadded:: 2.16
+    """
+
+    name = "Blueprint"
+    aliases = ["blueprint"]
+    filenames = ["*.blp"]
+    mimetypes = ["text/x-blueprint"]
+    url = "https://gitlab.gnome.org/jwestman/blueprint-compiler"
+
+    flags = re.IGNORECASE
+    tokens = {
+        "root": [
+            include("block-content"),
+        ],
+        "type": [
+            (r"\$\s*[a-z_][a-z0-9_\-]*", Name.Class),
+            (r"(?:([a-z_][a-z0-9_\-]*)(\s*)(\.)(\s*))?([a-z_][a-z0-9_\-]*)",
+             bygroups(Name.Namespace, Whitespace, Punctuation, Whitespace, Name.Class)),
+        ],
+        "whitespace": [
+            (r"\s+", Whitespace),
+            (r"//.*?\n", Comment.Single),
+            (r"/\*", Comment.Multiline, "comment-multiline"),
+        ],
+        "comment-multiline": [
+            (r"\*/", Comment.Multiline, "#pop"),
+            (r"[^*]+", Comment.Multiline),
+            (r"\*", Comment.Multiline),
+        ],
+        "value": [
+            (r"(typeof)(\s*)(<)", bygroups(Keyword, Whitespace, Punctuation), "typeof"),
+            (words(("true", "false", "null")), Keyword.Constant),
+            (r"[a-z_][a-z0-9_\-]*", Name.Variable),
+            (r"\|", Operator),
+            (r'".*?"', String.Double),
+            (r"\'.*?\'", String.Single),
+            (r"0x[\d_]*", Number.Hex),
+            (r"[0-9_]+", Number.Integer),
+            (r"\d[\d\.a-z_]*", Number),
+        ],
+        "typeof": [
+            include("whitespace"),
+            include("type"),
+            (r">", Punctuation, "#pop"),
+        ],
+        "content": [
+            include("whitespace"),
+            # Keywords
+            (words(("after", "bidirectional", "bind-property", "bind", "default",
+                    "destructive", "disabled", "inverted", "no-sync-create",
+                    "suggested", "swapped", "sync-create", "template")),
+             Keyword),
+            # Translated strings
+            (r"(C?_)(\s*)(\()",
+             bygroups(Name.Function.Builtin, Whitespace, Punctuation),
+             "paren-content"),
+            # Cast expressions
+            (r"(as)(\s*)(<)", bygroups(Keyword, Whitespace, Punctuation), "typeof"),
+            # Closures
+            (r"(\$?[a-z_][a-z0-9_\-]*)(\s*)(\()",
+             bygroups(Name.Function, Whitespace, Punctuation),
+             "paren-content"),
+            # Objects
+            (r"(?:(\$\s*[a-z_][a-z0-9_\-]+)|(?:([a-z_][a-z0-9_\-]*)(\s*)(\.)(\s*))?([a-z_][a-z0-9_\-]*))(?:(\s+)([a-z_][a-z0-9_\-]*))?(\s*)(\{)",
+             bygroups(Name.Class, Name.Namespace, Whitespace, Punctuation, Whitespace,
+                      Name.Class, Whitespace, Name.Variable, Whitespace, Punctuation),
+             "brace-block"),
+            # Misc
+            include("value"),
+            (r",|\.", Punctuation),
+        ],
+        "block-content": [
+            # Import statements
+            (r"(using)(\s+)([a-z_][a-z0-9_\-]*)(\s+)(\d[\d\.]*)(;)",
+             bygroups(Keyword, Whitespace, Name.Namespace, Whitespace,
+                      Name.Namespace, Punctuation)),
+            # Menus
+            (r"(menu|section|submenu)(?:(\s+)([a-z_][a-z0-9_\-]*))?(\s*)(\{)",
+             bygroups(Keyword, Whitespace, Name.Variable, Whitespace, Punctuation),
+             "brace-block"),
+            (r"(item)(\s*)(\{)",
+             bygroups(Keyword, Whitespace, Punctuation),
+             "brace-block"),
+            (r"(item)(\s*)(\()",
+             bygroups(Keyword, Whitespace, Punctuation),
+             "paren-block"),
+            # Templates
+            (r"template", Keyword.Declaration, "template"),
+            # Nested blocks. When extensions are added, this is where they go.
+            (r"(responses|items|mime-types|patterns|suffixes|marks|widgets|strings|styles)(\s*)(\[)",
+             bygroups(Keyword, Whitespace, Punctuation),
+             "bracket-block"),
+            (r"(accessibility|setters|layout|item)(\s*)(\{)",
+             bygroups(Keyword, Whitespace, Punctuation),
+             "brace-block"),
+            (r"(condition|mark|item)(\s*)(\()",
+             bygroups(Keyword, Whitespace, Punctuation),
+             "paren-content"),
+            (r"\[", Punctuation, "child-type"),
+            # Properties and signals
+            (r"([a-z_][a-z0-9_\-]*(?:::[a-z0-9_]+)?)(\s*)(:|=>)",
+             bygroups(Name.Property, Whitespace, Punctuation),
+             "statement"),
+            include("content"),
+        ],
+        "paren-block": [
+            include("block-content"),
+            (r"\)", Punctuation, "#pop"),
+        ],
+        "paren-content": [
+            include("content"),
+            (r"\)", Punctuation, "#pop"),
+        ],
+        "bracket-block": [
+            include("block-content"),
+            (r"\]", Punctuation, "#pop"),
+        ],
+        "brace-block": [
+            include("block-content"),
+            (r"\}", Punctuation, "#pop"),
+        ],
+        "statement": [
+            include("content"),
+            (r";", Punctuation, "#pop"),
+        ],
+        "child-type": [
+            include("whitespace"),
+            (r"(action)(\s+)(response)(\s*)(=)(\s*)",
+             bygroups(Keyword, Whitespace, Name.Attribute, Whitespace,
+                      Punctuation, Whitespace)),
+            (words(("default", "internal-child", "response")), Keyword),
+            (r"[a-z_][a-z0-9_\-]*", Name.Decorator),
+            include("value"),
+            (r"=", Punctuation),
+            (r"\]", Punctuation, "#pop"),
+        ],
+        "template": [
+            include("whitespace"),
+            include("type"),
+            (r":", Punctuation),
+            (r"\{", Punctuation, ("#pop", "brace-block")),
+        ],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/bqn.py pygments-2.17.2+dfsg/pygments/lexers/bqn.py
--- pygments-2.15.1+dfsg/pygments/lexers/bqn.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/bqn.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,110 @@
+"""
+    pygments.lexers.bqn
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexer for BQN.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace
+
+__all__ = ['BQNLexer']
+
+
+class BQNLexer(RegexLexer):
+    """
+    A simple BQN lexer.
+
+    .. versionadded:: 2.16
+    """
+    name = 'BQN'
+    url = 'https://mlochbaum.github.io/BQN/index.html'
+    aliases = ['bqn']
+    filenames = ['*.bqn']
+    mimetypes = []
+
+    tokens = {
+        'root': [
+            # Whitespace
+            # ==========
+            (r'\s+', Whitespace),
+            #
+            # Comment
+            # =======
+            # '#' is a comment that continues to the end of the line
+            (r'#.*$', Comment.Single),
+            #
+            # Strings
+            # =======
+            (r'\'((\'\')|[^\'])*\'', String.Single),
+            (r'"(("")|[^"])*"', String.Double),
+            #
+            # Null Character
+            # ==============
+            # Literal representation of the null character
+            (r'@', String.Symbol),
+            #
+            # Punctuation
+            # ===========
+            # This token type is used for diamond, commas
+            # and  array and list brackets and strand syntax
+            (r'[\.⋄,\[\]⟨⟩‿]', Punctuation),
+            #
+            # Expression Grouping
+            # ===================
+            # Since this token type is important in BQN, it is not included in
+            # the punctuation token type but rather in the following one
+            (r'[\(\)]', String.Regex), 
+            #
+            # Numbers
+            # =======
+            # Includes the numeric literals and the Nothing character
+            (r'¯?([0-9]+\.?[0-9]+|[0-9]+)([Ee][¯]?[0-9]+)?|¯|∞|π|·', Number),
+            #
+            # Variables
+            # =========
+            (r'\b[a-z]\w*\b', Name.Variable),
+            #
+            # 1-Modifiers
+            # ===========
+            (r'[˙˜˘¨⌜⁼´˝`𝕣]', Name.Attribute),
+            (r'\b_[a-zA-Z0-9]+\b', Name.Attribute),
+            #
+            # 2-Modifiers
+            # ===========
+            (r'[∘○⊸⟜⌾⊘◶⎉⚇⍟⎊]', Name.Property),
+            (r'\b_[a-zA-Z0-9]+_\b', Name.Property),
+            #
+            # Functions
+            # =========
+            # The monadic or dyadic function primitives and function
+            # operands and arguments, along with function self-reference
+            (r'[+\-×÷\*√⌊⌈∧∨¬|≤<>≥=≠≡≢⊣⊢⥊∾≍⋈↑↓↕«»⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔!𝕎𝕏𝔽𝔾𝕊]',
+             Operator),
+            (r'[A-Z]\w*|•\w+\b', Operator),
+            #
+            # Constant
+            # ========
+            (r'˙', Name.Constant),
+            #
+            # Define/Export/Change
+            # ====================
+            (r'[←↩⇐]', Keyword.Declaration),
+            #
+            # Blocks
+            # ======
+            (r'[{}]', Keyword.Type),
+            #
+            # Extra characters
+            # ================
+            (r'[;:?𝕨𝕩𝕗𝕘𝕤]', Name.Entity),
+            #
+            
+        ],
+    }
+
+    
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/c_cpp.py pygments-2.17.2+dfsg/pygments/lexers/c_cpp.py
--- pygments-2.15.1+dfsg/pygments/lexers/c_cpp.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/c_cpp.py	2020-02-02 00:00:00.000000000 +0000
@@ -107,7 +107,8 @@
             (words(('int8', 'int16', 'int32', 'int64', 'wchar_t'), prefix=r'__',
                     suffix=r'\b'), Keyword.Reserved),
             (words(('bool', 'int', 'long', 'float', 'short', 'double', 'char',
-                    'unsigned', 'signed', 'void'), suffix=r'\b'), Keyword.Type)
+                    'unsigned', 'signed', 'void', '_BitInt',
+                    '__int128'), suffix=r'\b'), Keyword.Type)
         ],
         'keywords': [
             (r'(struct|union)(\s+)', bygroups(Keyword, Whitespace), 'classname'),
@@ -380,11 +381,12 @@
                 'catch', 'const_cast', 'delete', 'dynamic_cast', 'explicit',
                 'export', 'friend', 'mutable', 'new', 'operator',
                 'private', 'protected', 'public', 'reinterpret_cast', 'class',
-                'restrict', 'static_cast', 'template', 'this', 'throw', 'throws',
+                '__restrict', 'static_cast', 'template', 'this', 'throw', 'throws',
                 'try', 'typeid', 'using', 'virtual', 'constexpr', 'nullptr', 'concept',
                 'decltype', 'noexcept', 'override', 'final', 'constinit', 'consteval',
                 'co_await', 'co_return', 'co_yield', 'requires', 'import', 'module',
-                'typename'),
+                'typename', 'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not',
+                'not_eq', 'or', 'or_eq', 'xor', 'xor_eq'),
                suffix=r'\b'), Keyword),
             (r'namespace\b', Keyword, 'namespace'),
             (r'(enum)(\s+)', bygroups(Keyword, Whitespace), 'enumname'),
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/carbon.py pygments-2.17.2+dfsg/pygments/lexers/carbon.py
--- pygments-2.15.1+dfsg/pygments/lexers/carbon.py	2023-04-10 12:39:44.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/carbon.py	2020-02-02 00:00:00.000000000 +0000
@@ -37,7 +37,7 @@
             (r'\\\n', Text),
             # comments
             (r'//(.*?)\n', Comment.Single),
-            (r'/(\\\n)?[*](.|\n)*?[*](\\\n)?/', Comment.Multiline),
+            (r'/(\\\n)?[*].*?[*](\\\n)?/', Comment.Multiline),
             # Declaration
             (r'(package|import|api|namespace|library)\b', Keyword.Namespace),
             (r'(abstract|alias|fn|class|interface|let|var|virtual|external|'
@@ -53,11 +53,11 @@
             (r'(auto|bool|string|i8|i16|i32|i64|u8|u16|u32|u64|'
              r'f8|f16|f32|f64)\b', Keyword.Type),
             # numeric literals
-            (r'[0-9]*[.][0-9]+?', Number.Double),
-            (r'0b[01]+?', Number.Bin),
-            (r'0o[0-7]+?', Number.Oct),
-            (r'0x[0-9a-fA-F]+?', Number.Hex),
-            (r'[0-9]+?', Number.Integer),
+            (r'[0-9]*[.][0-9]+', Number.Double),
+            (r'0b[01]+', Number.Bin),
+            (r'0o[0-7]+', Number.Oct),
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+            (r'[0-9]+', Number.Integer),
             # string literal
             (r'"(\\.|[^"\\])*"', String),
             # char literal
@@ -93,4 +93,4 @@
             result += 0.1
         if 'impl' in text:
             result += 0.1
-        return result
\ No newline at end of file
+        return result
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/configs.py pygments-2.17.2+dfsg/pygments/lexers/configs.py
--- pygments-2.15.1+dfsg/pygments/lexers/configs.py	2023-04-18 18:40:07.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/configs.py	2020-02-02 00:00:00.000000000 +0000
@@ -17,8 +17,8 @@
 from pygments.lexers.shell import BashLexer
 from pygments.lexers.data import JsonLexer
 
-__all__ = ['IniLexer', 'RegeditLexer', 'PropertiesLexer', 'KconfigLexer',
-           'Cfengine3Lexer', 'ApacheConfLexer', 'SquidConfLexer',
+__all__ = ['IniLexer', 'SystemdLexer', 'DesktopLexer', 'RegeditLexer', 'PropertiesLexer',
+           'KconfigLexer', 'Cfengine3Lexer', 'ApacheConfLexer', 'SquidConfLexer',
            'NginxConfLexer', 'LighttpdConfLexer', 'DockerLexer',
            'TerraformLexer', 'TermcapLexer', 'TerminfoLexer',
            'PkgConfigLexer', 'PacmanConfLexer', 'AugeasLexer', 'TOMLLexer',
@@ -34,10 +34,6 @@
     aliases = ['ini', 'cfg', 'dosini']
     filenames = [
         '*.ini', '*.cfg', '*.inf', '.editorconfig',
-        # systemd unit files
-        # https://www.freedesktop.org/software/systemd/man/systemd.unit.html
-        '*.service', '*.socket', '*.device', '*.mount', '*.automount',
-        '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope',
     ]
     mimetypes = ['text/x-ini', 'text/inf']
 
@@ -67,7 +63,84 @@
         npos = text.find('\n')
         if npos < 3:
             return False
-        return text[0] == '[' and text[npos-1] == ']'
+        if text[0] == '[' and text[npos-1] == ']':
+            return 0.8
+        return False
+
+
+class DesktopLexer(RegexLexer):
+    """
+    Lexer for .desktop files.
+
+    .. versionadded:: 2.16
+    """
+
+    name = 'Desktop file'
+    url = "https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html"
+    aliases = ['desktop']
+    filenames = ['*.desktop']
+
+    tokens = {
+        'root': [
+            (r'^[ \t]*\n', Whitespace),
+            (r'^(#.*)(\n)', bygroups(Comment.Single, Whitespace)),
+            (r'(\[[^\]\n]+\])(\n)', bygroups(Keyword, Whitespace)),
+            (r'([-A-Za-z0-9]+)(\[[^\] \t=]+\])?([ \t]*)(=)([ \t]*)([^\n]*)([ \t\n]*\n)',
+             bygroups(Name.Attribute, Name.Namespace, Whitespace, Operator, Whitespace, String, Whitespace)),
+        ],
+    }
+
+    def analyse_text(text):
+        if text.startswith("[Desktop Entry]"):
+            return 1.0
+        if re.search(r"^\[Desktop Entry\][ \t]*$", text[:500], re.MULTILINE) is not None:
+            return 0.9
+        return 0.0
+
+
+class SystemdLexer(RegexLexer):
+    """
+    Lexer for systemd unit files.
+
+    .. versionadded:: 2.16
+    """
+
+    name = 'Systemd'
+    url = "https://www.freedesktop.org/software/systemd/man/systemd.syntax.html"
+    aliases = ['systemd']
+    filenames = [
+        '*.service', '*.socket', '*.device', '*.mount', '*.automount',
+        '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope',
+    ]
+
+    tokens = {
+        'root': [
+            (r'^[ \t]*\n', Whitespace),
+            (r'^([;#].*)(\n)', bygroups(Comment.Single, Whitespace)),
+            (r'(\[[^\]\n]+\])(\n)', bygroups(Keyword, Whitespace)),
+            (r'([^=]+)([ \t]*)(=)([ \t]*)([^\n]*)(\\)(\n)',
+             bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String,
+                      Text, Whitespace),
+             "value"),
+            (r'([^=]+)([ \t]*)(=)([ \t]*)([^\n]*)(\n)',
+             bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String, Whitespace)),
+        ],
+        'value': [
+            # line continuation
+            (r'^([;#].*)(\n)', bygroups(Comment.Single, Whitespace)),
+            (r'([ \t]*)([^\n]*)(\\)(\n)',
+             bygroups(Whitespace, String, Text, Whitespace)),
+            (r'([ \t]*)([^\n]*)(\n)',
+             bygroups(Whitespace, String, Whitespace), "#pop"),
+        ],
+    }
+
+    def analyse_text(text):
+        if text.startswith("[Unit]"):
+            return 1.0
+        if re.search(r"^\[Unit\][ \t]*$", text[:500], re.MULTILINE) is not None:
+            return 0.9
+        return 0.0
 
 
 class RegeditLexer(RegexLexer):
@@ -469,15 +542,14 @@
         "dst", "time", "dstdomain", "ident", "snmp_community",
     )
 
-    ip_re = (
-        r'(?:(?:(?:[3-9]\d?|2(?:5[0-5]|[0-4]?\d)?|1\d{0,2}|0x0*[0-9a-f]{1,2}|'
-        r'0+[1-3]?[0-7]{0,2})(?:\.(?:[3-9]\d?|2(?:5[0-5]|[0-4]?\d)?|1\d{0,2}|'
-        r'0x0*[0-9a-f]{1,2}|0+[1-3]?[0-7]{0,2})){3})|(?!.*::.*::)(?:(?!:)|'
-        r':(?=:))(?:[0-9a-f]{0,4}(?:(?<=::)|(?<!::):)){6}(?:[0-9a-f]{0,4}'
-        r'(?:(?<=::)|(?<!::):)[0-9a-f]{0,4}(?:(?<=::)|(?<!:)|(?<=:)(?<!::):)|'
-        r'(?:25[0-4]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-4]|2[0-4]\d|1\d\d|'
-        r'[1-9]?\d)){3}))'
-    )
+    ipv4_group = r'(\d+|0x[0-9a-f]+)'
+    ipv4 = rf'({ipv4_group}(\.{ipv4_group}){{3}})'
+    ipv6_group = r'([0-9a-f]{0,4})'
+    ipv6 = rf'({ipv6_group}(:{ipv6_group}){{1,7}})'
+    bare_ip = rf'({ipv4}|{ipv6})'
+    # XXX: /integer is a subnet mark, but what is /IP ?
+    # There is no test where it is used.
+    ip = rf'{bare_ip}(/({bare_ip}|\d+))?'
 
     tokens = {
         'root': [
@@ -490,7 +562,7 @@
             (words(actions_stats, prefix=r'stats/', suffix=r'\b'), String),
             (words(actions_log, prefix=r'log/', suffix=r'='), String),
             (words(acls, prefix=r'\b', suffix=r'\b'), Keyword),
-            (ip_re + r'(?:/(?:' + ip_re + r'|\b\d+\b))?', Number.Float),
+            (ip, Number.Float),
             (r'(?:\b\d+\b(?:-\b\d+|%)?)', Number),
             (r'\S+', Text),
         ],
@@ -1041,62 +1113,181 @@
 
 class TOMLLexer(RegexLexer):
     """
-    Lexer for TOML, a simple language
-    for config files.
+    Lexer for TOML, a simple language for config files.
 
     .. versionadded:: 2.4
     """
 
     name = 'TOML'
-    url = 'https://github.com/toml-lang/toml'
     aliases = ['toml']
     filenames = ['*.toml', 'Pipfile', 'poetry.lock']
+    mimetypes = ['application/toml']
+    url = 'https://toml.io'
+
+    # Based on the TOML spec: https://toml.io/en/v1.0.0
+
+    # The following is adapted from CPython's tomllib:
+    _time = r"\d\d:\d\d:\d\d(\.\d+)?"
+    _datetime = rf"""(?x)
+                  \d\d\d\d-\d\d-\d\d # date, e.g., 1988-10-27
+                (
+                  [Tt ] {_time} # optional time
+                  (
+                    [Zz]|[+-]\d\d:\d\d # optional time offset
+                  )?
+                )?
+              """
 
     tokens = {
         'root': [
-            # Table
-            (r'^(\s*)(\[.*?\])$', bygroups(Whitespace, Keyword)),
+            # Note that we make an effort in order to distinguish
+            # moments at which we're parsing a key and moments at
+            # which we're parsing a value. In the TOML code
+            #
+            #   1234 = 1234
+            #
+            # the first "1234" should be Name, the second Integer.
 
-            # Basics, comments, strings
-            (r'[ \t]+', Whitespace),
-            (r'\n', Whitespace),
-            (r'#.*?$', Comment.Single),
-            # Basic string
-            (r'"(\\\\|\\[^\\]|[^"\\])*"', String),
-            # Literal string
-            (r'\'\'\'(.*)\'\'\'', String),
-            (r'\'[^\']*\'', String),
-            (r'(true|false)$', Keyword.Constant),
-            (r'[a-zA-Z_][\w\-]*', Name),
-
-            # Datetime
-            # TODO this needs to be expanded, as TOML is rather flexible:
-            # https://github.com/toml-lang/toml#offset-date-time
-            (r'\d{4}-\d{2}-\d{2}(?:T| )\d{2}:\d{2}:\d{2}(?:Z|[-+]\d{2}:\d{2})', Number.Integer),
-
-            # Numbers
-            (r'(\d+\.\d*|\d*\.\d+)([eE][+-]?[0-9]+)?j?', Number.Float),
-            (r'\d+[eE][+-]?[0-9]+j?', Number.Float),
-            # Handle +-inf, +-infinity, +-nan
-            (r'[+-]?(?:(inf(?:inity)?)|nan)', Number.Float),
-            (r'[+-]?\d+', Number.Integer),
+            # Whitespace
+            (r'\s+', Whitespace),
+
+            # Comment
+            (r'#.*', Comment.Single),
+
+            # Assignment keys
+            include('key'),
 
-            # Punctuation
-            (r'[]{}:(),;[]', Punctuation),
+            # After "=", find a value
+            (r'(=)(\s*)', bygroups(Operator, Whitespace), 'value'),
+
+            # Table header
+            (r'\[\[?', Keyword, 'table-key'),
+        ],
+        'key': [
+            # Start of bare key (only ASCII is allowed here).
+            (r'[A-Za-z0-9_-]+', Name),
+            # Quoted key
+            (r'"', String.Double, 'basic-string'),
+            (r"'", String.Single, 'literal-string'),
+            # Dots act as separators in keys
             (r'\.', Punctuation),
+        ],
+        'table-key': [
+            # This is like 'key', but highlights the name components
+            # and separating dots as Keyword because it looks better
+            # when the whole table header is Keyword. We do highlight
+            # strings as strings though.
+            # Start of bare key (only ASCII is allowed here).
+            (r'[A-Za-z0-9_-]+', Keyword),
+            (r'"', String.Double, 'basic-string'),
+            (r"'", String.Single, 'literal-string'),
+            (r'\.', Keyword),
+            (r'\]\]?', Keyword, '#pop'),
+
+            # Inline whitespace allowed
+            (r'[ \t]+', Whitespace),
+        ],
+        'value': [
+            # Datetime, baretime
+            (_datetime, Literal.Date, '#pop'),
+            (_time, Literal.Date, '#pop'),
+
+            # Recognize as float if there is a fractional part
+            # and/or an exponent.
+            (r'[+-]?\d[0-9_]*[eE][+-]?\d[0-9_]*', Number.Float, '#pop'),
+            (r'[+-]?\d[0-9_]*\.\d[0-9_]*([eE][+-]?\d[0-9_]*)?',
+             Number.Float, '#pop'),
+
+            # Infinities and NaN
+            (r'[+-]?(inf|nan)', Number.Float, '#pop'),
+
+            # Integers
+            (r'-?0b[01_]+', Number.Bin, '#pop'),
+            (r'-?0o[0-7_]+', Number.Oct, '#pop'),
+            (r'-?0x[0-9a-fA-F_]+', Number.Hex, '#pop'),
+            (r'[+-]?[0-9_]+', Number.Integer, '#pop'),
 
-            # Operators
-            (r'=', Operator)
+            # Strings
+            (r'"""', String.Double, ('#pop', 'multiline-basic-string')),
+            (r'"', String.Double, ('#pop', 'basic-string')),
+            (r"'''", String.Single, ('#pop', 'multiline-literal-string')),
+            (r"'", String.Single, ('#pop', 'literal-string')),
+
+            # Booleans
+            (r'true|false', Keyword.Constant, '#pop'),
+
+            # Start of array
+            (r'\[', Punctuation, ('#pop', 'array')),
+
+            # Start of inline table
+            (r'\{', Punctuation, ('#pop', 'inline-table')),
+        ],
+        'array': [
+            # Whitespace, including newlines, is ignored inside arrays,
+            # and comments are allowed.
+            (r'\s+', Whitespace),
+            (r'#.*', Comment.Single),
 
-        ]
+            # Delimiters
+            (r',', Punctuation),
+
+            # End of array
+            (r'\]', Punctuation, '#pop'),
+
+            # Parse a value and come back
+            default('value'),
+        ],
+        'inline-table': [
+            # Note that unlike inline arrays, inline tables do not
+            # allow newlines or comments.
+            (r'[ \t]+', Whitespace),
+
+            # Keys
+            include('key'),
+
+            # Values
+            (r'(=)(\s*)', bygroups(Punctuation, Whitespace), 'value'),
+
+            # Delimiters
+            (r',', Punctuation),
+
+            # End of inline table
+            (r'\}', Punctuation, '#pop'),
+        ],
+        'basic-string': [
+            (r'"', String.Double, '#pop'),
+            include('escapes'),
+            (r'[^"\\]+', String.Double),
+        ],
+        'literal-string': [
+            (r".*?'", String.Single, '#pop'),
+        ],
+        'multiline-basic-string': [
+            (r'"""', String.Double, '#pop'),
+            (r'(\\)(\n)', bygroups(String.Escape, Whitespace)),
+            include('escapes'),
+            (r'[^"\\]+', String.Double),
+            (r'"', String.Double),
+        ],
+        'multiline-literal-string': [
+            (r"'''", String.Single, '#pop'),
+            (r"[^']+", String.Single),
+            (r"'", String.Single),
+        ],
+        'escapes': [
+            (r'\\u[0-9a-fA-F]{4}|\\U[0-9a-fA-F]{8}', String.Escape),
+            (r'\\.', String.Escape),
+        ],
     }
 
 class NestedTextLexer(RegexLexer):
     """
-    Lexer for NextedText, a human-friendly data
-    format.
+    Lexer for *NextedText*, a human-friendly data format.
 
     .. versionadded:: 2.9
+
+    .. versionchanged:: 2.16
+        Added support for *NextedText* v3.0.
     """
 
     name = 'NestedText'
@@ -1104,16 +1295,70 @@
     aliases = ['nestedtext', 'nt']
     filenames = ['*.nt']
 
-    _quoted_dict_item = r'^(\s*)({0})(.*?)({0}: ?)(.*?)(\s*)$'
-
     tokens = {
         'root': [
-            (r'^(\s*)(#.*?)$', bygroups(Whitespace, Comment)),
-            (r'^(\s*)(>)( ?)(.*?)(\s*)$', bygroups(Whitespace, Punctuation, Whitespace, String, Whitespace)),
-            (r'^(\s*)(-)( ?)(.*?)(\s*)$', bygroups(Whitespace, Punctuation, Whitespace, String, Whitespace)),
-            (_quoted_dict_item.format("'"), bygroups(Whitespace, Punctuation, Name, Punctuation, String, Whitespace)),
-            (_quoted_dict_item.format('"'), bygroups(Whitespace, Punctuation, Name, Punctuation, String, Whitespace)),
-            (r'^(\s*)(.*?)(:)( ?)(.*?)(\s*)$', bygroups(Whitespace, Name, Punctuation, Whitespace, String, Whitespace)),
+            # Comment: # ...
+            (r'^([ ]*)(#.*)$', bygroups(Whitespace, Comment)),
+
+            # Inline dictionary: {...}
+            (r'^([ ]*)(\{)', bygroups(Whitespace, Punctuation), 'inline_dict'),
+
+            # Inline list: [...]
+            (r'^([ ]*)(\[)', bygroups(Whitespace, Punctuation), 'inline_list'),
+
+            # empty multiline string item: >
+            (r'^([ ]*)(>)$', bygroups(Whitespace, Punctuation)),
+
+            # multiline string item: > ...
+            (r'^([ ]*)(>)( )(.*?)([ \t]*)$', bygroups(Whitespace, Punctuation, Whitespace, Text, Whitespace)),
+
+            # empty list item: -
+            (r'^([ ]*)(-)$', bygroups(Whitespace, Punctuation)),
+
+            # list item: - ...
+            (r'^([ ]*)(-)( )(.*?)([ \t]*)$', bygroups(Whitespace, Punctuation, Whitespace, Text, Whitespace)),
+
+            # empty multiline key item: :
+            (r'^([ ]*)(:)$', bygroups(Whitespace, Punctuation)),
+
+            # multiline key item: : ...
+            (r'^([ ]*)(:)( )([^\n]*?)([ \t]*)$', bygroups(Whitespace, Punctuation, Whitespace, Name.Tag, Whitespace)),
+
+            # empty dict key item: ...:
+            (r'^([ ]*)([^\{\[\s].*?)(:)$', bygroups(Whitespace, Name.Tag, Punctuation)),
+
+            # dict key item: ...: ...
+            (r'^([ ]*)([^\{\[\s].*?)(:)( )(.*?)([ \t]*)$', bygroups(Whitespace, Name.Tag, Punctuation, Whitespace, Text, Whitespace)),
+        ],
+        'inline_list': [
+            include('whitespace'),
+            (r'[^\{\}\[\],\s]+', Text),
+            include('inline_value'),
+            (r',', Punctuation),
+            (r'\]', Punctuation, '#pop'),
+            (r'\n', Error, '#pop'),
+        ],
+        'inline_dict': [
+            include('whitespace'),
+            (r'[^\{\}\[\],:\s]+', Name.Tag),
+            (r':', Punctuation, 'inline_dict_value'),
+            (r'\}', Punctuation, '#pop'),
+            (r'\n', Error, '#pop'),
+        ],
+        'inline_dict_value': [
+            include('whitespace'),
+            (r'[^\{\}\[\],:\s]+', Text),
+            include('inline_value'),
+            (r',', Punctuation, '#pop'),
+            (r'\}', Punctuation, '#pop:2'),
+        ],
+        'inline_value': [
+            include('whitespace'),
+            (r'\{', Punctuation, 'inline_dict'),
+            (r'\[', Punctuation, 'inline_list'),
+        ],
+        'whitespace': [
+            (r'[ \t]+', Whitespace),
         ],
     }
 
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/crystal.py pygments-2.17.2+dfsg/pygments/lexers/crystal.py
--- pygments-2.15.1+dfsg/pygments/lexers/crystal.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/crystal.py	2020-02-02 00:00:00.000000000 +0000
@@ -32,7 +32,7 @@
     """
 
     name = 'Crystal'
-    url = 'http://crystal-lang.org'
+    url = 'https://crystal-lang.org'
     aliases = ['cr', 'crystal']
     filenames = ['*.cr']
     mimetypes = ['text/x-crystal']
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/data.py pygments-2.17.2+dfsg/pygments/lexers/data.py
--- pygments-2.15.1+dfsg/pygments/lexers/data.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/data.py	2020-02-02 00:00:00.000000000 +0000
@@ -450,8 +450,8 @@
     name = 'JSON'
     url = 'https://www.json.org'
     aliases = ['json', 'json-object']
-    filenames = ['*.json', 'Pipfile.lock']
-    mimetypes = ['application/json', 'application/json-object']
+    filenames = ['*.json', '*.jsonl', '*.ndjson', 'Pipfile.lock']
+    mimetypes = ['application/json', 'application/json-object', 'application/x-ndjson', 'application/jsonl', 'application/json-seq']
 
     # No validation of integers, floats, or constants is done.
     # As long as the characters are members of the following
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/dns.py pygments-2.17.2+dfsg/pygments/lexers/dns.py
--- pygments-2.15.1+dfsg/pygments/lexers/dns.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/dns.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,106 @@
+"""
+    pygments.lexers.dns
+    ~~~~~~~~~~~~~~~~~~~
+
+    Pygments lexers for DNS
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace, Literal
+from pygments.lexer import RegexLexer, bygroups, include
+
+__all__ = ['DnsZoneLexer']
+
+
+CLASSES = [
+    "IN",
+    "CS",
+    "CH",
+    "HS",
+]
+
+CLASSES_RE = "(" + "|".join(CLASSES) + ')'
+
+
+class DnsZoneLexer(RegexLexer):
+
+    """
+    Lexer for DNS zone file
+
+    .. versionadded:: 2.16
+    """
+
+    flags = re.MULTILINE
+
+    name = 'Zone'
+    aliases = ['zone']
+    filenames = [ "*.zone" ]
+    url = "https://datatracker.ietf.org/doc/html/rfc1035"
+    mimetypes = ['text/dns']
+
+    tokens = {
+       'root': [
+            # Empty/comment line:
+            (r'([ \t]*)(;.*)(\n)', bygroups(Whitespace, Comment.Single, Whitespace)),
+            # Special directives:
+            (r'^\$ORIGIN\b', Keyword, 'values'),
+            (r'^\$TTL\b', Keyword, 'values'),
+            (r'^\$INCLUDE\b', Comment.Preproc, 'include'),
+            # TODO, $GENERATE https://bind9.readthedocs.io/en/v9.18.14/chapter3.html#soa-rr
+            (r'^\$[A-Z]+\b', Keyword, 'values'),
+            # Records:
+            # <domain-name> [<TTL>] [<class>] <type> <RDATA> [<comment>]
+            (r'^(@)([ \t]+)(?:([0-9]+[smhdw]?)([ \t]+))?(?:' + CLASSES_RE + "([ \t]+))?([A-Z]+)([ \t]+)", 
+                bygroups(Operator, Whitespace, Number.Integer, Whitespace, Name.Class, Whitespace, Keyword.Type, Whitespace),
+                "values"),
+            (r'^([^ \t\n]*)([ \t]+)(?:([0-9]+[smhdw]?)([ \t]+))?(?:' + CLASSES_RE + "([ \t]+))?([A-Z]+)([ \t]+)", 
+                bygroups(Name, Whitespace, Number.Integer, Whitespace, Name.Class, Whitespace, Keyword.Type, Whitespace),
+                "values"),
+            # <domain-name> [<class>] [<TTL>] <type> <RDATA> [<comment>]
+            (r'^(Operator)([ \t]+)(?:' + CLASSES_RE + "([ \t]+))?(?:([0-9]+[smhdw]?)([ \t]+))?([A-Z]+)([ \t]+)", 
+                bygroups(Name, Whitespace, Number.Integer, Whitespace, Name.Class, Whitespace, Keyword.Type, Whitespace),
+                "values"),
+            (r'^([^ \t\n]*)([ \t]+)(?:' + CLASSES_RE + "([ \t]+))?(?:([0-9]+[smhdw]?)([ \t]+))?([A-Z]+)([ \t]+)", 
+                bygroups(Name, Whitespace, Number.Integer, Whitespace, Name.Class, Whitespace, Keyword.Type, Whitespace),
+                "values"),
+        ],
+        # Parsing values:
+        'values': [
+            (r'\n', Whitespace, "#pop"),
+            (r'\(', Punctuation, 'nested'),
+            include('simple-values'),
+        ],
+        # Parsing nested values (...):
+        'nested': [
+            (r'\)', Punctuation, "#pop"),
+            include('simple-values'),
+        ],
+        # Parsing values:
+        'simple-values': [
+            (r'(;.*)(\n)', bygroups(Comment.Single, Whitespace)),
+            (r'[ \t]+', Whitespace),
+            (r"@\b", Operator),
+            ('"', String, 'string'),
+            (r'[0-9]+[smhdw]?$', Number.Integer),
+            (r'([0-9]+[smhdw]?)([ \t]+)', bygroups(Number.Integer, Whitespace)),
+            (r'\S+', Literal),
+        ],
+        'include': [
+            (r'([ \t]+)([^ \t\n]+)([ \t]+)([-\._a-zA-Z]+)([ \t]+)(;.*)?$',
+             bygroups(Whitespace, Comment.PreprocFile, Whitespace, Name, Whitespace, Comment.Single), '#pop'),
+            (r'([ \t]+)([^ \t\n]+)([ \t\n]+)$', bygroups(Whitespace, Comment.PreprocFile, Whitespace), '#pop'),
+        ],
+        "string": [
+            (r'\\"', String),
+            (r'"', String, "#pop"),
+            (r'[^"]+', String),
+        ]
+    }
+
+    def analyse_text(text):
+        return text.startswith("$ORIGIN")
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/dsls.py pygments-2.17.2+dfsg/pygments/lexers/dsls.py
--- pygments-2.15.1+dfsg/pygments/lexers/dsls.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/dsls.py	2020-02-02 00:00:00.000000000 +0000
@@ -879,7 +879,7 @@
     """
 
     name = 'Snowball'
-    url = 'http://snowballstem.org/'
+    url = 'https://snowballstem.org/'
     aliases = ['snowball']
     filenames = ['*.sbl']
 
@@ -929,7 +929,8 @@
 
     tokens = {
         'root': [
-            (words(('len', 'lenof'), suffix=r'\b'), Operator.Word),
+            (r'len\b', Name.Builtin),
+            (r'lenof\b', Operator.Word),
             include('root1'),
         ],
         'root1': [
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/dylan.py pygments-2.17.2+dfsg/pygments/lexers/dylan.py
--- pygments-2.15.1+dfsg/pygments/lexers/dylan.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/dylan.py	2020-02-02 00:00:00.000000000 +0000
@@ -242,14 +242,7 @@
 
 class DylanConsoleLexer(Lexer):
     """
-    For Dylan interactive console output like:
-
-    .. sourcecode:: dylan-console
-
-        ? let a = 1;
-        => 1
-        ? a
-        => 1
+    For Dylan interactive console output.
 
     This is based on a copy of the RubyConsoleLexer.
 
@@ -259,6 +252,7 @@
     aliases = ['dylan-console', 'dylan-repl']
     filenames = ['*.dylan-console']
     mimetypes = ['text/x-dylan-console']
+    _example = 'dylan-console/console'
 
     _prompt_re = re.compile(r'\?| ')
 
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/eiffel.py pygments-2.17.2+dfsg/pygments/lexers/eiffel.py
--- pygments-2.15.1+dfsg/pygments/lexers/eiffel.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/eiffel.py	2020-02-02 00:00:00.000000000 +0000
@@ -22,7 +22,7 @@
     .. versionadded:: 2.0
     """
     name = 'Eiffel'
-    url = 'http://www.eiffel.com'
+    url = 'https://www.eiffel.com'
     aliases = ['eiffel']
     filenames = ['*.e']
     mimetypes = ['text/x-eiffel']
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/elm.py pygments-2.17.2+dfsg/pygments/lexers/elm.py
--- pygments-2.15.1+dfsg/pygments/lexers/elm.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/elm.py	2020-02-02 00:00:00.000000000 +0000
@@ -23,7 +23,7 @@
     """
 
     name = 'Elm'
-    url = 'http://elm-lang.org/'
+    url = 'https://elm-lang.org/'
     aliases = ['elm']
     filenames = ['*.elm']
     mimetypes = ['text/x-elm']
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/elpi.py pygments-2.17.2+dfsg/pygments/lexers/elpi.py
--- pygments-2.15.1+dfsg/pygments/lexers/elpi.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/elpi.py	2020-02-02 00:00:00.000000000 +0000
@@ -10,7 +10,7 @@
 
 from pygments.lexer import RegexLexer, bygroups, include
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number
+    Number, Punctuation
 
 __all__ = ['ElpiLexer']
 
@@ -88,6 +88,7 @@
             (r'"', String.Double, 'elpi-string'),
             (r'`', String.Double, 'elpi-btick'),
             (r'\'', String.Double, 'elpi-tick'),
+            (r'\{\{', Punctuation, 'elpi-quote'),
             (r'\{[^\{]', Text, 'elpi-spill'),
             (r"\(", Text, 'elpi-in-parens'),
             (r'\d[\d_]*', Number.Integer),
@@ -151,6 +152,13 @@
             (r'[^\"]+', String.Double),
             (r'"', String.Double, '#pop'),
         ],
+        'elpi-quote': [
+            (r'\{\{', Punctuation, '#push'),
+            (r'\}\}', Punctuation, '#pop'),
+            (r"(lp:)((?=[A-Z_]){})".format(constant_re), bygroups(Keyword, Name.Variable)),
+            (r"[^l\}]+", Text),
+            (r"l|\}", Text),
+        ],
         'elpi-spill': [
             (r'\{[^\{]', Text, '#push'),
             (r'\}[^\}]', Text, '#pop'),
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/fortran.py pygments-2.17.2+dfsg/pygments/lexers/fortran.py
--- pygments-2.15.1+dfsg/pygments/lexers/fortran.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/fortran.py	2020-02-02 00:00:00.000000000 +0000
@@ -59,8 +59,8 @@
                 'BLOCK', 'BLOCKDATA', 'BYTE', 'CALL', 'CASE', 'CLASS', 'CLOSE',
                 'CODIMENSION', 'COMMON', 'CONTIGUOUS', 'CONTAINS',
                 'CONTINUE', 'CRITICAL', 'CYCLE', 'DATA', 'DEALLOCATE', 'DECODE',
-                'DEFERRED', 'DIMENSION', 'DO', 'ELEMENTAL', 'ELSE', 'ENCODE', 'END',
-                'ENDASSOCIATE', 'ENDBLOCK', 'ENDDO', 'ENDENUM', 'ENDFORALL',
+                'DEFERRED', 'DIMENSION', 'DO', 'ELEMENTAL', 'ELSE', 'ELSEIF', 'ENCODE',
+                'END', 'ENDASSOCIATE', 'ENDBLOCK', 'ENDDO', 'ENDENUM', 'ENDFORALL',
                 'ENDFUNCTION',  'ENDIF', 'ENDINTERFACE', 'ENDMODULE', 'ENDPROGRAM',
                 'ENDSELECT', 'ENDSUBMODULE', 'ENDSUBROUTINE', 'ENDTYPE', 'ENDWHERE',
                 'ENTRY', 'ENUM', 'ENUMERATOR', 'EQUIVALENCE', 'ERROR STOP', 'EXIT',
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/go.py pygments-2.17.2+dfsg/pygments/lexers/go.py
--- pygments-2.15.1+dfsg/pygments/lexers/go.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/go.py	2020-02-02 00:00:00.000000000 +0000
@@ -53,7 +53,7 @@
                 'string', 'bool', 'error', 'uintptr', 'any', 'comparable',
                 'print', 'println', 'panic', 'recover', 'close', 'complex',
                 'real', 'imag', 'len', 'cap', 'append', 'copy', 'delete',
-                'new', 'make'), suffix=r'\b(\()'),
+                'new', 'make', 'min', 'max', 'clear'), suffix=r'\b(\()'),
              bygroups(Name.Builtin, Punctuation)),
             (words((
                 'uint', 'uint8', 'uint16', 'uint32', 'uint64',
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/graph.py pygments-2.17.2+dfsg/pygments/lexers/graph.py
--- pygments-2.15.1+dfsg/pygments/lexers/graph.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/graph.py	2020-02-02 00:00:00.000000000 +0000
@@ -35,16 +35,13 @@
 
     tokens = {
         'root': [
-            include('comment'),
             include('clauses'),
             include('keywords'),
             include('relations'),
             include('strings'),
             include('whitespace'),
             include('barewords'),
-        ],
-        'comment': [
-            (r'^.*//.*$', Comment.Single),
+            include('comment'),
         ],
         'keywords': [
             (r'(create|order|match|limit|set|skip|start|return|with|where|'
@@ -76,12 +73,16 @@
                 bygroups(Keyword, Whitespace, Keyword)),
             (r'(using)(\s+)(periodic)(\s+)(commit)\b',
                 bygroups(Keyword, Whitespace, Keyword, Whitespace, Keyword)),
+            (r'(using)(\s+)(index)\b',
+                bygroups(Keyword, Whitespace, Keyword)),
+            (r'(using)(\s+)(range|text|point)(\s+)(index)\b',
+                bygroups(Keyword, Whitespace, Name, Whitespace, Keyword)),
             (words((
                 'all', 'any', 'as', 'asc', 'ascending', 'assert', 'call', 'case', 'create',
                 'delete', 'desc', 'descending', 'distinct', 'end', 'fieldterminator',
                 'foreach', 'in', 'limit', 'match', 'merge', 'none', 'not', 'null',
                 'remove', 'return', 'set', 'skip', 'single', 'start', 'then', 'union',
-                'unwind', 'yield', 'where', 'when', 'with'), suffix=r'\b'), Keyword),
+                'unwind', 'yield', 'where', 'when', 'with', 'collect'), suffix=r'\b'), Keyword),
         ],
         'relations': [
             (r'(-\[)(.*?)(\]->)', bygroups(Operator, using(this), Operator)),
@@ -92,7 +93,7 @@
             (r'[.*{}]', Punctuation),
         ],
         'strings': [
-            (r'"(?:\\[tbnrf\'"\\]|[^\\"])*"', String),
+            (r'([\'"])(?:\\[tbnrf\'"\\]|[^\\])*?\1', String),
             (r'`(?:``|[^`])+`', Name.Variable),
         ],
         'whitespace': [
@@ -102,4 +103,7 @@
             (r'[a-z]\w*', Name),
             (r'\d+', Number),
         ],
+        'comment': [
+            (r'//.*$', Comment.Single),
+        ],
     }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/graphql.py pygments-2.17.2+dfsg/pygments/lexers/graphql.py
--- pygments-2.15.1+dfsg/pygments/lexers/graphql.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/graphql.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,177 @@
+"""
+    pygments.lexers.graphql
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for GraphQL, an open-source data query and manipulation
+    language for APIs.
+
+    More information:
+    https://graphql.org/
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words, include, bygroups, default
+from pygments.token import (Comment, Keyword, Name, Number, Punctuation, String,
+                            Whitespace)
+
+
+__all__ = ["GraphQLLexer"]
+
+OPERATION_TYPES = ("query", "mutation", "subscription")
+BUILTIN_TYPES = ("Int", "Float", "String", "Boolean", "ID")
+BOOLEAN_VALUES = ("true", "false", "null")
+KEYWORDS = (
+    "type",
+    "schema",
+    "extend",
+    "enum",
+    "scalar",
+    "implements",
+    "interface",
+    "union",
+    "input",
+    "directive",
+    "QUERY",
+    "MUTATION",
+    "SUBSCRIPTION",
+    "FIELD",
+    "FRAGMENT_DEFINITION",
+    "FRAGMENT_SPREAD",
+    "INLINE_FRAGMENT",
+    "SCHEMA",
+    "SCALAR",
+    "OBJECT",
+    "FIELD_DEFINITION",
+    "ARGUMENT_DEFINITION",
+    "INTERFACE",
+    "UNION",
+    "ENUM",
+    "ENUM_VALUE",
+    "INPUT_OBJECT",
+    "INPUT_FIELD_DEFINITION",
+)
+
+
+class GraphQLLexer(RegexLexer):
+    """
+    Lexer for GraphQL syntax
+
+    .. versionadded:: 2.16
+    """
+    name = "GraphQL"
+    aliases = ["graphql"]
+    filenames = ["*.graphql"]
+    url = "https://graphql.org"
+
+    tokens = {
+        "ignored_tokens": [
+            (r"\s+", Whitespace),  # Whitespaces
+            (r"#.*$", Comment),
+            (",", Punctuation),  # Insignificant commas
+        ],
+        "value": [
+            include("ignored_tokens"),
+            (r"-?\d+(?![.eE])", Number.Integer, "#pop"),
+            (
+                r"-?\d+(\.\d+)?([eE][+-]?\d+)?",
+                Number.Float,
+                "#pop",
+            ),
+            (r'"', String, ("#pop", "string")),
+            (words(BOOLEAN_VALUES, suffix=r"\b"), Name.Builtin, "#pop"),
+            (r"\$[a-zA-Z_]\w*", Name.Variable, "#pop"),
+            (r"[a-zA-Z_]\w*", Name.Constant, "#pop"),
+            (r"\[", Punctuation, ("#pop", "list_value")),
+            (r"\{", Punctuation, ("#pop", "object_value")),
+        ],
+        "list_value": [
+            include("ignored_tokens"),
+            ("]", Punctuation, "#pop"),
+            default("value"),
+        ],
+        "object_value": [
+            include("ignored_tokens"),
+            (r"[a-zA-Z_]\w*", Name),
+            (r":", Punctuation, "value"),
+            (r"\}", Punctuation, "#pop"),
+        ],
+        "string": [
+            (r'\\(["\\/bfnrt]|u[a-fA-F0-9]{4})', String.Escape),
+            (r'[^\\"\n]+', String),  # all other characters
+            (r'"', String, "#pop"),
+        ],
+        "root": [
+            include("ignored_tokens"),
+            (words(OPERATION_TYPES, suffix=r"\b"), Keyword, "operation"),
+            (words(KEYWORDS, suffix=r"\b"), Keyword),
+            (r"\{", Punctuation, "selection_set"),
+            (r"fragment\b", Keyword, "fragment_definition"),
+        ],
+        "operation": [
+            include("ignored_tokens"),
+            (r"[a-zA-Z_]\w*", Name.Function),
+            (r"\(", Punctuation, "variable_definition"),
+            (r"\{", Punctuation, ("#pop", "selection_set")),
+        ],
+        "variable_definition": [
+            include("ignored_tokens"),
+            (r"\$[a-zA-Z_]\w*", Name.Variable),
+            (r"[\]!]", Punctuation),
+            (r":", Punctuation, "type"),
+            (r"=", Punctuation, "value"),
+            (r"\)", Punctuation, "#pop"),
+        ],
+        "type": [
+            include("ignored_tokens"),
+            (r"\[", Punctuation),
+            (words(BUILTIN_TYPES, suffix=r"\b"), Name.Builtin, "#pop"),
+            (r"[a-zA-Z_]\w*", Name.Class, "#pop"),
+        ],
+        "selection_set": [
+            include("ignored_tokens"),
+            (r"([a-zA-Z_]\w*)(\s*)(:)", bygroups(Name.Label, Whitespace, Punctuation)),
+            (r"[a-zA-Z_]\w*", Name),  # Field
+            (
+                r"(\.\.\.)(\s+)(on)\b",
+                bygroups(Punctuation, Whitespace, Keyword),
+                "inline_fragment",
+            ),
+            (r"\.\.\.", Punctuation, "fragment_spread"),
+            (r"\(", Punctuation, "arguments"),
+            (r"@[a-zA-Z_]\w*", Name.Decorator, "directive"),
+            (r"\{", Punctuation, "selection_set"),
+            (r"\}", Punctuation, "#pop"),
+        ],
+        "directive": [
+            include("ignored_tokens"),
+            (r"\(", Punctuation, ("#pop", "arguments")),
+        ],
+        "arguments": [
+            include("ignored_tokens"),
+            (r"[a-zA-Z_]\w*", Name),
+            (r":", Punctuation, "value"),
+            (r"\)", Punctuation, "#pop"),
+        ],
+        # Fragments
+        "fragment_definition": [
+            include("ignored_tokens"),
+            (r"[\]!]", Punctuation),  # For NamedType
+            (r"on\b", Keyword, "type"),
+            (r"[a-zA-Z_]\w*", Name.Function),
+            (r"@[a-zA-Z_]\w*", Name.Decorator, "directive"),
+            (r"\{", Punctuation, ("#pop", "selection_set")),
+        ],
+        "fragment_spread": [
+            include("ignored_tokens"),
+            (r"@[a-zA-Z_]\w*", Name.Decorator, "directive"),
+            (r"[a-zA-Z_]\w*", Name, "#pop"),  # Fragment name
+        ],
+        "inline_fragment": [
+            include("ignored_tokens"),
+            (r"[a-zA-Z_]\w*", Name.Class),  # Type condition
+            (r"@[a-zA-Z_]\w*", Name.Decorator, "directive"),
+            (r"\{", Punctuation, ("#pop", "selection_set")),
+        ],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/html.py pygments-2.17.2+dfsg/pygments/lexers/html.py
--- pygments-2.15.1+dfsg/pygments/lexers/html.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/html.py	2020-02-02 00:00:00.000000000 +0000
@@ -22,7 +22,7 @@
 from pygments.lexers.ruby import RubyLexer
 
 __all__ = ['HtmlLexer', 'DtdLexer', 'XmlLexer', 'XsltLexer', 'HamlLexer',
-           'ScamlLexer', 'PugLexer']
+           'ScamlLexer', 'PugLexer', 'UrlEncodedLexer']
 
 
 class HtmlLexer(RegexLexer):
@@ -603,3 +603,21 @@
         ],
     }
 JadeLexer = PugLexer  # compat
+
+
+class UrlEncodedLexer(RegexLexer):
+    """
+    Lexer for urlencoded data
+
+    .. versionadded:: 2.16
+    """
+
+    name = 'urlencoded'
+    aliases = ['urlencoded']
+    mimetypes = ['application/x-www-form-urlencoded']
+
+    tokens = {
+        'root': [
+            ('([^&=]*)(=)([^=&]*)(&?)', bygroups(Name.Tag, Operator, String, Punctuation)),
+        ],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/igor.py pygments-2.17.2+dfsg/pygments/lexers/igor.py
--- pygments-2.15.1+dfsg/pygments/lexers/igor.py	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/igor.py	2020-02-02 00:00:00.000000000 +0000
@@ -50,212 +50,229 @@
         'Abort', 'AddFIFOData', 'AddFIFOVectData', 'AddMovieAudio', 'AddMovieFrame',
         'AddWavesToBoxPlot', 'AddWavesToViolinPlot', 'AdoptFiles', 'APMath', 'Append',
         'AppendBoxPlot', 'AppendImage', 'AppendLayoutObject', 'AppendMatrixContour',
-        'AppendText', 'AppendToGizmo', 'AppendToGraph', 'AppendToLayout', 'AppendToTable',
-        'AppendViolinPlot', 'AppendXYZContour', 'AutoPositionWindow',
-        'AxonTelegraphFindServers', 'BackgroundInfo', 'Beep', 'BoundingBall', 'BoxSmooth',
-        'BrowseURL', 'BuildMenu', 'Button', 'cd', 'Chart', 'CheckBox', 'CheckDisplayed',
-        'ChooseColor', 'Close', 'CloseHelp', 'CloseMovie', 'CloseProc', 'ColorScale',
-        'ColorTab2Wave', 'Concatenate', 'ControlBar', 'ControlInfo', 'ControlUpdate',
-        'ConvertGlobalStringTextEncoding', 'ConvexHull', 'Convolve', 'CopyDimLabels',
-        'CopyFile', 'CopyFolder', 'CopyScales', 'Correlate', 'CreateAliasShortcut',
-        'CreateBrowser', 'Cross', 'CtrlBackground', 'CtrlFIFO', 'CtrlNamedBackground',
-        'Cursor', 'CurveFit', 'CustomControl', 'CWT', 'DAQmx_AI_SetupReader',
-        'DAQmx_AO_SetOutputs', 'DAQmx_CTR_CountEdges', 'DAQmx_CTR_OutputPulse',
-        'DAQmx_CTR_Period', 'DAQmx_CTR_PulseWidth', 'DAQmx_DIO_Config',
-        'DAQmx_DIO_WriteNewData', 'DAQmx_Scan', 'DAQmx_WaveformGen', 'Debugger',
-        'DebuggerOptions', 'DefaultFont', 'DefaultGuiControls', 'DefaultGuiFont',
-        'DefaultTextEncoding', 'DefineGuide', 'DelayUpdate', 'DeleteAnnotations',
-        'DeleteFile', 'DeleteFolder', 'DeletePoints', 'Differentiate', 'dir', 'Display',
-        'DisplayHelpTopic', 'DisplayProcedure', 'DoAlert', 'DoIgorMenu', 'DoUpdate',
-        'DoWindow', 'DoXOPIdle', 'DPSS', 'DrawAction', 'DrawArc', 'DrawBezier',
-        'DrawLine', 'DrawOval', 'DrawPICT', 'DrawPoly', 'DrawRect', 'DrawRRect',
-        'DrawText', 'DrawUserShape', 'DSPDetrend', 'DSPPeriodogram', 'Duplicate',
-        'DuplicateDataFolder', 'DWT', 'EdgeStats', 'Edit', 'ErrorBars',
-        'EstimatePeakSizes', 'Execute', 'ExecuteScriptText', 'ExperimentInfo',
-        'ExperimentModified', 'ExportGizmo', 'Extract', 'FastGaussTransform', 'FastOp',
-        'FBinRead', 'FBinWrite', 'FFT', 'FGetPos', 'FIFOStatus', 'FIFO2Wave', 'FilterFIR',
-        'FilterIIR', 'FindAPeak', 'FindContour', 'FindDuplicates', 'FindLevel',
-        'FindLevels', 'FindPeak', 'FindPointsInPoly', 'FindRoots', 'FindSequence',
-        'FindValue', 'FMaxFlat', 'FPClustering', 'fprintf', 'FReadLine', 'FSetPos',
-        'FStatus', 'FTPCreateDirectory', 'FTPDelete', 'FTPDownload', 'FTPUpload',
-        'FuncFit', 'FuncFitMD', 'GBLoadWave', 'GetAxis', 'GetCamera', 'GetFileFolderInfo',
-        'GetGizmo', 'GetLastUserMenuInfo', 'GetMarquee', 'GetMouse', 'GetSelection',
-        'GetWindow', 'GISCreateVectorLayer', 'GISGetRasterInfo',
-        'GISGetRegisteredFileInfo', 'GISGetVectorLayerInfo', 'GISLoadRasterData',
-        'GISLoadVectorData', 'GISRasterizeVectorData', 'GISRegisterFile',
-        'GISTransformCoords', 'GISUnRegisterFile', 'GISWriteFieldData',
-        'GISWriteGeometryData', 'GISWriteRaster', 'GPIBReadBinaryWave2',
-        'GPIBReadBinary2', 'GPIBReadWave2', 'GPIBRead2', 'GPIBWriteBinaryWave2',
-        'GPIBWriteBinary2', 'GPIBWriteWave2', 'GPIBWrite2', 'GPIB2', 'GraphNormal',
-        'GraphWaveDraw', 'GraphWaveEdit', 'Grep', 'GroupBox', 'Hanning', 'HDFInfo',
-        'HDFReadImage', 'HDFReadSDS', 'HDFReadVset', 'HDF5CloseFile', 'HDF5CloseGroup',
-        'HDF5ConvertColors', 'HDF5CreateFile', 'HDF5CreateGroup', 'HDF5CreateLink',
-        'HDF5Dump', 'HDF5DumpErrors', 'HDF5DumpState', 'HDF5FlushFile',
-        'HDF5ListAttributes', 'HDF5ListGroup', 'HDF5LoadData', 'HDF5LoadGroup',
-        'HDF5LoadImage', 'HDF5OpenFile', 'HDF5OpenGroup', 'HDF5SaveData', 'HDF5SaveGroup',
-        'HDF5SaveImage', 'HDF5TestOperation', 'HDF5UnlinkObject', 'HideIgorMenus',
-        'HideInfo', 'HideProcedures', 'HideTools', 'HilbertTransform', 'Histogram', 'ICA',
-        'IFFT', 'ImageAnalyzeParticles', 'ImageBlend', 'ImageBoundaryToMask',
-        'ImageComposite', 'ImageEdgeDetection', 'ImageFileInfo', 'ImageFilter',
-        'ImageFocus', 'ImageFromXYZ', 'ImageGenerateROIMask', 'ImageGLCM',
-        'ImageHistModification', 'ImageHistogram', 'ImageInterpolate', 'ImageLineProfile',
-        'ImageLoad', 'ImageMorphology', 'ImageRegistration', 'ImageRemoveBackground',
-        'ImageRestore', 'ImageRotate', 'ImageSave', 'ImageSeedFill', 'ImageSkeleton3d',
-        'ImageSnake', 'ImageStats', 'ImageThreshold', 'ImageTransform',
-        'ImageUnwrapPhase', 'ImageWindow', 'IndexSort', 'InsertPoints', 'Integrate',
-        'IntegrateODE', 'Integrate2D', 'Interpolate2', 'Interpolate3D', 'Interp3DPath',
-        'ITCCloseAll2', 'ITCCloseDevice2', 'ITCConfigAllChannels2',
-        'ITCConfigChannelReset2', 'ITCConfigChannelUpload2', 'ITCConfigChannel2',
-        'ITCFIFOAvailableAll2', 'ITCFIFOAvailable2', 'ITCGetAllChannelsConfig2',
-        'ITCGetChannelConfig2', 'ITCGetCurrentDevice2', 'ITCGetDeviceInfo2',
-        'ITCGetDevices2', 'ITCGetErrorString2', 'ITCGetSerialNumber2', 'ITCGetState2',
-        'ITCGetVersions2', 'ITCInitialize2', 'ITCOpenDevice2', 'ITCReadADC2',
-        'ITCReadDigital2', 'ITCReadTimer2', 'ITCSelectDevice2', 'ITCSetDAC2',
-        'ITCSetGlobals2', 'ITCSetModes2', 'ITCSetState2', 'ITCStartAcq2', 'ITCStopAcq2',
-        'ITCUpdateFIFOPositionAll2', 'ITCUpdateFIFOPosition2', 'ITCWriteDigital2',
-        'JCAMPLoadWave', 'JointHistogram', 'KillBackground', 'KillControl',
-        'KillDataFolder', 'KillFIFO', 'KillFreeAxis', 'KillPath', 'KillPICTs',
-        'KillStrings', 'KillVariables', 'KillWaves', 'KillWindow', 'KMeans', 'Label',
-        'Layout', 'LayoutPageAction', 'LayoutSlideShow', 'Legend',
-        'LinearFeedbackShiftRegister', 'ListBox', 'LoadData', 'LoadPackagePreferences',
-        'LoadPICT', 'LoadWave', 'Loess', 'LombPeriodogram', 'Make', 'MakeIndex',
-        'MarkPerfTestTime', 'MatrixConvolve', 'MatrixCorr', 'MatrixEigenV',
-        'MatrixFilter', 'MatrixGaussJ', 'MatrixGLM', 'MatrixInverse', 'MatrixLinearSolve',
-        'MatrixLinearSolveTD', 'MatrixLLS', 'MatrixLUBkSub', 'MatrixLUD', 'MatrixLUDTD',
-        'MatrixMultiply', 'MatrixOP', 'MatrixSchur', 'MatrixSolve', 'MatrixSVBkSub',
-        'MatrixSVD', 'MatrixTranspose', 'MCC_FindServers', 'MeasureStyledText',
-        'MFR_CheckForNewBricklets',
-        'MFR_CloseResultFile', 'MFR_CreateOverviewTable', 'MFR_GetBrickletCount',
-        'MFR_GetBrickletData', 'MFR_GetBrickletDeployData', 'MFR_GetBrickletMetaData',
-        'MFR_GetBrickletRawData', 'MFR_GetReportTemplate', 'MFR_GetResultFileMetaData',
-        'MFR_GetResultFileName', 'MFR_GetVernissageVersion', 'MFR_GetVersion',
-        'MFR_GetXOPErrorMessage', 'MFR_OpenResultFile',
-        'MLLoadWave', 'Modify', 'ModifyBoxPlot', 'ModifyBrowser', 'ModifyCamera',
-        'ModifyContour', 'ModifyControl', 'ModifyControlList', 'ModifyFreeAxis',
-        'ModifyGizmo', 'ModifyGraph', 'ModifyImage', 'ModifyLayout', 'ModifyPanel',
-        'ModifyTable', 'ModifyViolinPlot', 'ModifyWaterfall', 'MoveDataFolder',
-        'MoveFile', 'MoveFolder', 'MoveString', 'MoveSubwindow', 'MoveVariable',
-        'MoveWave', 'MoveWindow', 'MultiTaperPSD', 'MultiThreadingControl',
-        'NC_CloseFile', 'NC_DumpErrors', 'NC_Inquire', 'NC_ListAttributes',
-        'NC_ListObjects', 'NC_LoadData', 'NC_OpenFile', 'NeuralNetworkRun',
-        'NeuralNetworkTrain', 'NewCamera', 'NewDataFolder', 'NewFIFO', 'NewFIFOChan',
-        'NewFreeAxis', 'NewGizmo', 'NewImage', 'NewLayout', 'NewMovie', 'NewNotebook',
-        'NewPanel', 'NewPath', 'NewWaterfall', 'NILoadWave', 'NI4882', 'Note', 'Notebook',
-        'NotebookAction', 'Open', 'OpenHelp', 'OpenNotebook', 'Optimize',
-        'ParseOperationTemplate', 'PathInfo', 'PauseForUser', 'PauseUpdate', 'PCA',
-        'PlayMovie', 'PlayMovieAction', 'PlaySound', 'PopupContextualMenu', 'PopupMenu',
-        'Preferences', 'PrimeFactors', 'Print', 'printf', 'PrintGraphs', 'PrintLayout',
-        'PrintNotebook', 'PrintSettings', 'PrintTable', 'Project', 'PulseStats',
-        'PutScrapText', 'pwd', 'Quit', 'RatioFromNumber', 'Redimension', 'Remez',
-        'Remove', 'RemoveContour', 'RemoveFromGizmo', 'RemoveFromGraph',
-        'RemoveFromLayout', 'RemoveFromTable', 'RemoveImage', 'RemoveLayoutObjects',
-        'RemovePath', 'Rename', 'RenameDataFolder', 'RenamePath', 'RenamePICT',
-        'RenameWindow', 'ReorderImages', 'ReorderTraces', 'ReplaceText', 'ReplaceWave',
-        'Resample', 'ResumeUpdate', 'Reverse', 'Rotate', 'Save', 'SaveData',
-        'SaveExperiment', 'SaveGizmoCopy', 'SaveGraphCopy', 'SaveNotebook',
-        'SavePackagePreferences', 'SavePICT', 'SaveTableCopy', 'SetActiveSubwindow',
-        'SetAxis', 'SetBackground', 'SetDashPattern', 'SetDataFolder', 'SetDimLabel',
-        'SetDrawEnv', 'SetDrawLayer', 'SetFileFolderInfo', 'SetFormula', 'SetIdlePeriod',
-        'SetIgorHook', 'SetIgorMenuMode', 'SetIgorOption', 'SetMarquee',
-        'SetProcessSleep', 'SetRandomSeed', 'SetScale', 'SetVariable', 'SetWaveLock',
-        'SetWaveTextEncoding', 'SetWindow', 'ShowIgorMenus', 'ShowInfo', 'ShowTools',
-        'Silent', 'Sleep', 'Slider', 'Smooth', 'SmoothCustom', 'Sort', 'SortColumns',
-        'SoundInRecord', 'SoundInSet', 'SoundInStartChart', 'SoundInStatus',
-        'SoundInStopChart', 'SoundLoadWave', 'SoundSaveWave', 'SphericalInterpolate',
-        'SphericalTriangulate', 'SplitString', 'SplitWave', 'sprintf', 'SQLHighLevelOp',
-        'sscanf', 'Stack', 'StackWindows', 'StatsAngularDistanceTest', 'StatsANOVA1Test',
-        'StatsANOVA2NRTest', 'StatsANOVA2RMTest', 'StatsANOVA2Test', 'StatsChiTest',
-        'StatsCircularCorrelationTest', 'StatsCircularMeans', 'StatsCircularMoments',
-        'StatsCircularTwoSampleTest', 'StatsCochranTest', 'StatsContingencyTable',
-        'StatsDIPTest', 'StatsDunnettTest', 'StatsFriedmanTest', 'StatsFTest',
-        'StatsHodgesAjneTest', 'StatsJBTest', 'StatsKDE', 'StatsKendallTauTest',
-        'StatsKSTest', 'StatsKWTest', 'StatsLinearCorrelationTest',
-        'StatsLinearRegression', 'StatsMultiCorrelationTest', 'StatsNPMCTest',
-        'StatsNPNominalSRTest', 'StatsQuantiles', 'StatsRankCorrelationTest',
-        'StatsResample', 'StatsSample', 'StatsScheffeTest', 'StatsShapiroWilkTest',
-        'StatsSignTest', 'StatsSRTest', 'StatsTTest', 'StatsTukeyTest',
-        'StatsVariancesTest', 'StatsWatsonUSquaredTest', 'StatsWatsonWilliamsTest',
-        'StatsWheelerWatsonTest', 'StatsWilcoxonRankTest', 'StatsWRCorrelationTest',
-        'STFT', 'String', 'StructFill', 'StructGet', 'StructPut', 'SumDimension',
-        'SumSeries', 'TabControl', 'Tag', 'TDMLoadData', 'TDMSaveData', 'TextBox',
-        'ThreadGroupPutDF', 'ThreadStart', 'TickWavesFromAxis', 'Tile', 'TileWindows',
-        'TitleBox', 'ToCommandLine', 'ToolsGrid', 'Triangulate3d', 'Unwrap', 'URLRequest',
-        'ValDisplay', 'Variable', 'VDTClosePort2', 'VDTGetPortList2', 'VDTGetStatus2',
-        'VDTOpenPort2', 'VDTOperationsPort2', 'VDTReadBinaryWave2', 'VDTReadBinary2',
-        'VDTReadHexWave2', 'VDTReadHex2', 'VDTReadWave2', 'VDTRead2', 'VDTTerminalPort2',
-        'VDTWriteBinaryWave2', 'VDTWriteBinary2', 'VDTWriteHexWave2', 'VDTWriteHex2',
-        'VDTWriteWave2', 'VDTWrite2', 'VDT2', 'VISAControl', 'VISARead', 'VISAReadBinary',
-        'VISAReadBinaryWave', 'VISAReadWave', 'VISAWrite', 'VISAWriteBinary',
-        'VISAWriteBinaryWave', 'VISAWriteWave', 'WaveMeanStdv', 'WaveStats',
-        'WaveTransform', 'wfprintf', 'WignerTransform', 'WindowFunction', 'XLLoadWave'
+        'AppendText', 'AppendToGizmo', 'AppendToGraph', 'AppendToLayout',
+        'AppendToTable', 'AppendViolinPlot', 'AppendXYZContour', 'AutoPositionWindow',
+        'AxonTelegraphFindServers', 'BackgroundInfo', 'Beep', 'BezierToPolygon',
+        'BoundingBall', 'BoxSmooth', 'BrowseURL', 'BuildMenu', 'Button', 'cd', 'Chart',
+        'CheckBox', 'CheckDisplayed', 'ChooseColor', 'Close', 'CloseHelp', 'CloseMovie',
+        'CloseProc', 'ColorScale', 'ColorTab2Wave', 'Concatenate', 'ControlBar',
+        'ControlInfo', 'ControlUpdate', 'ConvertGlobalStringTextEncoding', 'ConvexHull',
+        'Convolve', 'CopyDimLabels', 'CopyFile', 'CopyFolder', 'CopyScales', 'Correlate',
+        'CreateAliasShortcut', 'CreateBrowser', 'Cross', 'CtrlBackground', 'CtrlFIFO',
+        'CtrlNamedBackground', 'Cursor', 'CurveFit', 'CustomControl', 'CWT',
+        'DAQmx_AI_SetupReader', 'DAQmx_AO_SetOutputs', 'DAQmx_CTR_CountEdges',
+        'DAQmx_CTR_OutputPulse', 'DAQmx_CTR_Period', 'DAQmx_CTR_PulseWidth',
+        'DAQmx_DeviceInfo', 'DAQmx_DIO_Config', 'DAQmx_DIO_WriteNewData', 'DAQmx_Scan',
+        'DAQmx_WaveformGen', 'Debugger', 'DebuggerOptions', 'DefaultFont',
+        'DefaultGuiControls', 'DefaultGuiFont', 'DefaultTextEncoding', 'DefineGuide',
+        'DelayUpdate', 'DeleteAnnotations', 'DeleteFile', 'DeleteFolder', 'DeletePoints',
+        'Differentiate', 'dir', 'Display', 'DisplayHelpTopic', 'DisplayProcedure',
+        'DoAlert', 'DoIgorMenu', 'DoUpdate', 'DoWindow', 'DoXOPIdle', 'DPSS',
+        'DrawAction', 'DrawArc', 'DrawBezier', 'DrawLine', 'DrawOval', 'DrawPICT',
+        'DrawPoly', 'DrawRect', 'DrawRRect', 'DrawText', 'DrawUserShape', 'DSPDetrend',
+        'DSPPeriodogram', 'Duplicate', 'DuplicateDataFolder', 'DWT', 'EdgeStats', 'Edit',
+        'ErrorBars', 'EstimatePeakSizes', 'Execute', 'ExecuteScriptText',
+        'ExperimentInfo', 'ExperimentModified', 'ExportGizmo', 'Extract',
+        'FastGaussTransform', 'FastOp', 'FBinRead', 'FBinWrite', 'FCALL_CallFunction',
+        'FCALL_FreeLibrary', 'FCALL_GetFunctionList', 'FCALL_GetParamTypeList',
+        'FCALL_LoadLibrary', 'FCALL_Version', 'FFT', 'FGetPos', 'FIFOStatus',
+        'FIFO2Wave', 'FilterFIR', 'FilterIIR', 'FindAPeak', 'FindContour',
+        'FindDuplicates', 'FindLevel', 'FindLevels', 'FindPeak', 'FindPointsInPoly',
+        'FindRoots', 'FindSequence', 'FindValue', 'FMaxFlat', 'FPClustering', 'fprintf',
+        'FReadLine', 'FSetPos', 'FStatus', 'FTPCreateDirectory', 'FTPDelete',
+        'FTPDownload', 'FTPUpload', 'FuncFit', 'FuncFitMD', 'GBLoadWave', 'GetAxis',
+        'GetCamera', 'GetFileFolderInfo', 'GetGizmo', 'GetLastUserMenuInfo',
+        'GetMarquee', 'GetMouse', 'GetSelection', 'GetWindow', 'GISCreateVectorLayer',
+        'GISGetRasterInfo', 'GISGetRegisteredFileInfo', 'GISGetVectorLayerInfo',
+        'GISLoadRasterData', 'GISLoadVectorData', 'GISRasterizeVectorData',
+        'GISRegisterFile', 'GISTransformCoords', 'GISUnRegisterFile',
+        'GISWriteFieldData', 'GISWriteGeometryData', 'GISWriteRaster',
+        'GPIBReadBinaryWave2', 'GPIBReadBinary2', 'GPIBReadWave2', 'GPIBRead2',
+        'GPIBWriteBinaryWave2', 'GPIBWriteBinary2', 'GPIBWriteWave2', 'GPIBWrite2',
+        'GPIB2', 'GraphNormal', 'GraphWaveDraw', 'GraphWaveEdit', 'Grep', 'GroupBox',
+        'Hanning', 'HCluster', 'HDFInfo', 'HDFReadImage', 'HDFReadSDS', 'HDFReadVset',
+        'HDF5CloseFile', 'HDF5CloseGroup', 'HDF5Control', 'HDF5CreateFile',
+        'HDF5CreateGroup', 'HDF5CreateLink', 'HDF5DimensionScale', 'HDF5Dump',
+        'HDF5DumpErrors', 'HDF5FlushFile', 'HDF5ListAttributes', 'HDF5ListGroup',
+        'HDF5LoadData', 'HDF5LoadGroup', 'HDF5LoadImage', 'HDF5OpenFile',
+         'HDF5OpenGroup', 'HDF5SaveData', 'HDF5SaveGroup', 'HDF5SaveImage',
+         'HDF5UnlinkObject', 'HideIgorMenus', 'HideInfo', 'HideProcedures', 'HideTools',
+         'HilbertTransform', 'Histogram', 'ICA', 'IFFT', 'ImageAnalyzeParticles',
+         'ImageBlend', 'ImageBoundaryToMask', 'ImageComposite', 'ImageEdgeDetection',
+         'ImageFileInfo', 'ImageFilter', 'ImageFocus', 'ImageFromXYZ',
+         'ImageGenerateROIMask', 'ImageGLCM', 'ImageHistModification', 'ImageHistogram',
+         'ImageInterpolate', 'ImageLineProfile', 'ImageLoad', 'ImageMorphology',
+         'ImageRegistration', 'ImageRemoveBackground', 'ImageRestore', 'ImageRotate',
+         'ImageSave', 'ImageSeedFill', 'ImageSkeleton3d', 'ImageSnake', 'ImageStats',
+         'ImageThreshold', 'ImageTransform', 'ImageUnwrapPhase', 'ImageWindow',
+         'IndexSort', 'InsertPoints', 'InstantFrequency', 'Integrate', 'IntegrateODE',
+         'Integrate2D', 'Interpolate2', 'Interpolate3D', 'Interp3DPath', 'ITCCloseAll2',
+         'ITCCloseDevice2', 'ITCConfigAllChannels2', 'ITCConfigChannelReset2',
+         'ITCConfigChannelUpload2', 'ITCConfigChannel2', 'ITCFIFOAvailableAll2',
+         'ITCFIFOAvailable2', 'ITCGetAllChannelsConfig2', 'ITCGetChannelConfig2',
+         'ITCGetCurrentDevice2', 'ITCGetDeviceInfo2', 'ITCGetDevices2',
+         'ITCGetErrorString2', 'ITCGetSerialNumber2', 'ITCGetState2', 'ITCGetVersions2',
+         'ITCInitialize2', 'ITCOpenDevice2', 'ITCReadADC2', 'ITCReadDigital2',
+         'ITCReadTimer2', 'ITCSelectDevice2', 'ITCSetDAC2', 'ITCSetGlobals2',
+         'ITCSetModes2', 'ITCSetState2', 'ITCStartAcq2', 'ITCStopAcq2',
+         'ITCUpdateFIFOPositionAll2', 'ITCUpdateFIFOPosition2', 'ITCWriteDigital2',
+         'JCAMPLoadWave', 'JointHistogram', 'JSONXOP_AddTree', 'JSONXOP_AddValue',
+         'JSONXOP_Dump', 'JSONXOP_GetArraySize', 'JSONXOP_GetKeys',
+         'JSONXOP_GetMaxArraySize', 'JSONXOP_GetType', 'JSONXOP_GetValue', 'JSONXOP_New',
+         'JSONXOP_Parse', 'JSONXOP_Release', 'JSONXOP_Remove', 'JSONXOP_Version',
+         'KillBackground', 'KillControl', 'KillDataFolder', 'KillFIFO', 'KillFreeAxis',
+         'KillPath', 'KillPICTs', 'KillStrings', 'KillVariables', 'KillWaves',
+         'KillWindow', 'KMeans', 'Label', 'Layout', 'LayoutPageAction',
+         'LayoutSlideShow', 'Legend', 'LinearFeedbackShiftRegister', 'ListBox',
+         'LoadData', 'LoadPackagePreferences', 'LoadPICT', 'LoadWave', 'Loess',
+         'LombPeriodogram', 'Make', 'MakeIndex', 'MarkPerfTestTime', 'MatrixBalance',
+         'MatrixConvolve', 'MatrixCorr', 'MatrixEigenV', 'MatrixFactor', 'MatrixFilter',
+         'MatrixGaussJ', 'MatrixGLM', 'MatrixInverse', 'MatrixLinearSolve',
+         'MatrixLinearSolveTD', 'MatrixLLS', 'MatrixLUBkSub', 'MatrixLUD', 'MatrixLUDTD',
+         'MatrixMultiply', 'MatrixMultiplyAdd', 'MatrixOP', 'MatrixReverseBalance',
+         'MatrixSchur', 'MatrixSolve', 'MatrixSparse', 'MatrixSVBkSub', 'MatrixSVD',
+         'MatrixTranspose', 'MCC_FindServers', 'MeasureStyledText',
+         'MFR_CheckForNewBricklets', 'MFR_CloseResultFile', 'MFR_CreateOverviewTable',
+         'MFR_GetBrickletCount', 'MFR_GetBrickletData', 'MFR_GetBrickletDeployData',
+         'MFR_GetBrickletMetaData', 'MFR_GetBrickletRawData', 'MFR_GetReportTemplate',
+         'MFR_GetResultFileMetaData', 'MFR_GetResultFileName',
+         'MFR_GetVernissageVersion', 'MFR_GetVersion', 'MFR_GetXOPErrorMessage',
+         'MFR_OpenResultFile', 'MLLoadWave', 'Modify', 'ModifyBoxPlot', 'ModifyBrowser',
+         'ModifyCamera', 'ModifyContour', 'ModifyControl', 'ModifyControlList',
+         'ModifyFreeAxis', 'ModifyGizmo', 'ModifyGraph', 'ModifyImage', 'ModifyLayout',
+         'ModifyPanel', 'ModifyProcedure', 'ModifyTable', 'ModifyViolinPlot',
+         'ModifyWaterfall', 'MoveDataFolder', 'MoveFile', 'MoveFolder', 'MoveString',
+         'MoveSubwindow', 'MoveVariable', 'MoveWave', 'MoveWindow', 'MultiTaperPSD',
+         'MultiThreadingControl', 'NC_CloseFile', 'NC_DumpErrors', 'NC_Inquire',
+         'NC_ListAttributes', 'NC_ListObjects', 'NC_LoadData', 'NC_OpenFile',
+         'NeuralNetworkRun', 'NeuralNetworkTrain', 'NewCamera', 'NewDataFolder',
+         'NewFIFO', 'NewFIFOChan', 'NewFreeAxis', 'NewGizmo', 'NewImage', 'NewLayout',
+         'NewMovie', 'NewNotebook', 'NewPanel', 'NewPath', 'NewWaterfall', 'NILoadWave',
+         'NI4882', 'Note', 'Notebook', 'NotebookAction', 'Open', 'OpenHelp',
+         'OpenNotebook', 'Optimize', 'ParseOperationTemplate', 'PathInfo',
+         'PauseForUser', 'PauseUpdate', 'PCA', 'PlayMovie', 'PlayMovieAction',
+         'PlaySound', 'PolygonOp', 'PopupContextualMenu', 'PopupMenu', 'Preferences',
+         'PrimeFactors', 'Print', 'printf', 'PrintGraphs', 'PrintLayout',
+         'PrintNotebook', 'PrintSettings', 'PrintTable', 'Project', 'PulseStats',
+         'PutScrapText', 'pwd', 'Quit', 'RatioFromNumber', 'Redimension', 'Remez',
+         'Remove', 'RemoveContour', 'RemoveFromGizmo', 'RemoveFromGraph',
+         'RemoveFromLayout', 'RemoveFromTable', 'RemoveImage', 'RemoveLayoutObjects',
+         'RemovePath', 'Rename', 'RenameDataFolder', 'RenamePath', 'RenamePICT',
+         'RenameWindow', 'ReorderImages', 'ReorderTraces', 'ReplaceText', 'ReplaceWave',
+         'Resample', 'ResumeUpdate', 'Reverse', 'Rotate', 'Save', 'SaveData',
+         'SaveExperiment', 'SaveGizmoCopy', 'SaveGraphCopy', 'SaveNotebook',
+         'SavePackagePreferences', 'SavePICT', 'SaveTableCopy', 'SetActiveSubwindow',
+         'SetAxis', 'SetBackground', 'SetDashPattern', 'SetDataFolder', 'SetDimLabel',
+         'SetDrawEnv', 'SetDrawLayer', 'SetFileFolderInfo', 'SetFormula',
+         'SetIdlePeriod', 'SetIgorHook', 'SetIgorMenuMode', 'SetIgorOption',
+         'SetMarquee', 'SetProcessSleep', 'SetRandomSeed', 'SetScale', 'SetVariable',
+         'SetWaveLock', 'SetWaveTextEncoding', 'SetWindow', 'ShowIgorMenus', 'ShowInfo',
+         'ShowTools', 'Silent', 'Sleep', 'Slider', 'Smooth', 'SmoothCustom', 'Sort',
+         'SortColumns', 'SoundInRecord', 'SoundInSet', 'SoundInStartChart',
+         'SoundInStatus', 'SoundInStopChart', 'SoundLoadWave', 'SoundSaveWave',
+         'SphericalInterpolate', 'SphericalTriangulate', 'SplitString', 'SplitWave',
+         'sprintf', 'SQLHighLevelOp', 'sscanf', 'Stack', 'StackWindows',
+         'StatsAngularDistanceTest', 'StatsANOVA1Test', 'StatsANOVA2NRTest',
+         'StatsANOVA2RMTest', 'StatsANOVA2Test', 'StatsChiTest',
+         'StatsCircularCorrelationTest', 'StatsCircularMeans', 'StatsCircularMoments',
+         'StatsCircularTwoSampleTest', 'StatsCochranTest', 'StatsContingencyTable',
+         'StatsDIPTest', 'StatsDunnettTest', 'StatsFriedmanTest', 'StatsFTest',
+         'StatsHodgesAjneTest', 'StatsJBTest', 'StatsKDE', 'StatsKendallTauTest',
+         'StatsKSTest', 'StatsKWTest', 'StatsLinearCorrelationTest',
+         'StatsLinearRegression', 'StatsMultiCorrelationTest', 'StatsNPMCTest',
+         'StatsNPNominalSRTest', 'StatsQuantiles', 'StatsRankCorrelationTest',
+         'StatsResample', 'StatsSample', 'StatsScheffeTest', 'StatsShapiroWilkTest',
+         'StatsSignTest', 'StatsSRTest', 'StatsTTest', 'StatsTukeyTest',
+         'StatsVariancesTest', 'StatsWatsonUSquaredTest', 'StatsWatsonWilliamsTest',
+         'StatsWheelerWatsonTest', 'StatsWilcoxonRankTest', 'StatsWRCorrelationTest',
+         'STFT', 'StructFill', 'StructGet', 'StructPut', 'SumDimension', 'SumSeries',
+         'TabControl', 'Tag', 'TDMLoadData', 'TDMSaveData', 'TextBox', 'TextHistogram',
+         'Text2Bezier', 'ThreadGroupPutDF', 'ThreadStart', 'TickWavesFromAxis', 'Tile',
+         'TileWindows', 'TitleBox', 'ToCommandLine', 'ToolsGrid', 'Triangulate3d',
+         'TUFXOP_AcquireLock', 'TUFXOP_Clear', 'TUFXOP_GetStorage', 'TUFXOP_Init',
+         'TUFXOP_ReleaseLock', 'TUFXOP_RunningInMainThread', 'TUFXOP_Version', 'Unwrap',
+         'UnzipFile', 'URLRequest', 'ValDisplay', 'VDTClosePort2', 'VDTGetPortList2',
+         'VDTGetStatus2', 'VDTOpenPort2', 'VDTOperationsPort2', 'VDTReadBinaryWave2',
+         'VDTReadBinary2', 'VDTReadHexWave2', 'VDTReadHex2', 'VDTReadWave2', 'VDTRead2',
+         'VDTTerminalPort2', 'VDTWriteBinaryWave2', 'VDTWriteBinary2',
+         'VDTWriteHexWave2', 'VDTWriteHex2', 'VDTWriteWave2', 'VDTWrite2', 'VDT2',
+         'VISAControl', 'VISARead', 'VISAReadBinary', 'VISAReadBinaryWave',
+         'VISAReadWave', 'VISAWrite', 'VISAWriteBinary', 'VISAWriteBinaryWave',
+         'VISAWriteWave', 'WaveMeanStdv', 'WaveStats', 'WaveTracking', 'WaveTransform',
+         'wfprintf', 'WignerTransform', 'WindowFunction', 'XLLoadWave'
     )
     functions = (
         'abs', 'acos', 'acosh', 'AddListItem', 'AiryA', 'AiryAD', 'AiryB', 'AiryBD',
-        'alog', 'AnnotationInfo', 'AnnotationList', 'area', 'areaXY', 'asin', 'asinh',
-        'atan', 'atanh', 'atan2', 'AxisInfo', 'AxisList', 'AxisValFromPixel',
-        'AxonTelegraphAGetDataNum', 'AxonTelegraphAGetDataString',
-        'AxonTelegraphAGetDataStruct', 'AxonTelegraphGetDataNum',
-        'AxonTelegraphGetDataString', 'AxonTelegraphGetDataStruct',
-        'AxonTelegraphGetTimeoutMs', 'AxonTelegraphSetTimeoutMs', 'Base64Decode',
-        'Base64Encode', 'Besseli', 'Besselj', 'Besselk', 'Bessely', 'beta', 'betai',
-        'BinarySearch', 'BinarySearchInterp', 'binomial', 'binomialln', 'binomialNoise',
-        'cabs', 'CaptureHistory', 'CaptureHistoryStart', 'ceil', 'cequal', 'char2num',
-        'chebyshev', 'chebyshevU', 'CheckName', 'ChildWindowList', 'CleanupName', 'cmplx',
-        'cmpstr', 'conj', 'ContourInfo', 'ContourNameList', 'ContourNameToWaveRef',
-        'ContourZ', 'ControlNameList', 'ConvertTextEncoding', 'cos', 'cosh',
-        'cosIntegral', 'cot', 'coth', 'CountObjects', 'CountObjectsDFR', 'cpowi',
-        'CreationDate', 'csc', 'csch', 'CsrInfo', 'CsrWave', 'CsrWaveRef', 'CsrXWave',
-        'CsrXWaveRef', 'CTabList', 'DataFolderDir', 'DataFolderExists',
-        'DataFolderRefsEqual', 'DataFolderRefStatus', 'date', 'datetime', 'DateToJulian',
-        'date2secs', 'Dawson', 'defined', 'deltax', 'digamma', 'dilogarithm', 'DimDelta',
-        'DimOffset', 'DimSize', 'ei', 'enoise', 'equalWaves', 'erf', 'erfc', 'erfcw',
-        'exists', 'exp', 'expInt', 'expIntegralE1', 'expNoise', 'factorial', 'Faddeeva',
-        'fakedata', 'faverage', 'faverageXY', 'fDAQmx_AI_GetReader',
-        'fDAQmx_AO_UpdateOutputs', 'fDAQmx_ConnectTerminals', 'fDAQmx_CTR_Finished',
-        'fDAQmx_CTR_IsFinished', 'fDAQmx_CTR_IsPulseFinished', 'fDAQmx_CTR_ReadCounter',
-        'fDAQmx_CTR_ReadWithOptions', 'fDAQmx_CTR_SetPulseFrequency', 'fDAQmx_CTR_Start',
-        'fDAQmx_DeviceNames', 'fDAQmx_DIO_Finished', 'fDAQmx_DIO_PortWidth',
-        'fDAQmx_DIO_Read', 'fDAQmx_DIO_Write', 'fDAQmx_DisconnectTerminals',
-        'fDAQmx_ErrorString', 'fDAQmx_ExternalCalDate', 'fDAQmx_NumAnalogInputs',
-        'fDAQmx_NumAnalogOutputs', 'fDAQmx_NumCounters', 'fDAQmx_NumDIOPorts',
-        'fDAQmx_ReadChan', 'fDAQmx_ReadNamedChan', 'fDAQmx_ResetDevice',
-        'fDAQmx_ScanGetAvailable', 'fDAQmx_ScanGetNextIndex', 'fDAQmx_ScanStart',
-        'fDAQmx_ScanStop', 'fDAQmx_ScanWait', 'fDAQmx_ScanWaitWithTimeout',
-        'fDAQmx_SelfCalDate', 'fDAQmx_SelfCalibration', 'fDAQmx_WaveformStart',
-        'fDAQmx_WaveformStop', 'fDAQmx_WF_IsFinished', 'fDAQmx_WF_WaitUntilFinished',
-        'fDAQmx_WriteChan', 'FetchURL', 'FindDimLabel', 'FindListItem', 'floor',
-        'FontList', 'FontSizeHeight', 'FontSizeStringWidth', 'FresnelCos', 'FresnelSin',
-        'FuncRefInfo', 'FunctionInfo', 'FunctionList', 'FunctionPath', 'gamma',
-        'gammaEuler', 'gammaInc', 'gammaNoise', 'gammln', 'gammp', 'gammq', 'Gauss',
-        'Gauss1D', 'Gauss2D', 'gcd', 'GetBrowserLine', 'GetBrowserSelection',
-        'GetDataFolder', 'GetDataFolderDFR', 'GetDefaultFont', 'GetDefaultFontSize',
-        'GetDefaultFontStyle', 'GetDimLabel', 'GetEnvironmentVariable', 'GetErrMessage',
-        'GetFormula', 'GetIndependentModuleName', 'GetIndexedObjName',
-        'GetIndexedObjNameDFR', 'GetKeyState', 'GetRTErrMessage', 'GetRTError',
-        'GetRTLocation', 'GetRTLocInfo', 'GetRTStackInfo', 'GetScrapText', 'GetUserData',
-        'GetWavesDataFolder', 'GetWavesDataFolderDFR', 'GISGetAllFileFormats',
-        'GISSRefsAreEqual', 'GizmoInfo', 'GizmoScale', 'gnoise', 'GrepList', 'GrepString',
-        'GuideInfo', 'GuideNameList', 'Hash', 'hcsr', 'HDF5AttributeInfo',
-        'HDF5DatasetInfo', 'HDF5LibraryInfo', 'HDF5TypeInfo', 'hermite', 'hermiteGauss',
-        'HyperGNoise', 'HyperGPFQ', 'HyperG0F1', 'HyperG1F1', 'HyperG2F1', 'IgorInfo',
-        'IgorVersion', 'imag', 'ImageInfo', 'ImageNameList', 'ImageNameToWaveRef',
-        'IndependentModuleList', 'IndexedDir', 'IndexedFile', 'IndexToScale', 'Inf',
-        'Integrate1D', 'interp', 'Interp2D', 'Interp3D', 'inverseERF', 'inverseERFC',
-        'ItemsInList', 'JacobiCn', 'JacobiSn', 'JulianToDate', 'Laguerre', 'LaguerreA',
-        'LaguerreGauss', 'LambertW', 'LayoutInfo', 'leftx', 'LegendreA', 'limit',
-        'ListMatch', 'ListToTextWave', 'ListToWaveRefWave', 'ln', 'log', 'logNormalNoise',
-        'lorentzianNoise', 'LowerStr', 'MacroList', 'magsqr', 'MandelbrotPoint',
-        'MarcumQ', 'MatrixCondition', 'MatrixDet', 'MatrixDot', 'MatrixRank',
-        'MatrixTrace', 'max', 'MCC_AutoBridgeBal', 'MCC_AutoFastComp',
-        'MCC_AutoPipetteOffset', 'MCC_AutoSlowComp', 'MCC_AutoWholeCellComp',
-        'MCC_GetBridgeBalEnable', 'MCC_GetBridgeBalResist', 'MCC_GetFastCompCap',
-        'MCC_GetFastCompTau', 'MCC_GetHolding', 'MCC_GetHoldingEnable', 'MCC_GetMode',
-        'MCC_GetNeutralizationCap', 'MCC_GetNeutralizationEnable',
-        'MCC_GetOscKillerEnable', 'MCC_GetPipetteOffset', 'MCC_GetPrimarySignalGain',
-        'MCC_GetPrimarySignalHPF', 'MCC_GetPrimarySignalLPF', 'MCC_GetRsCompBandwidth',
-        'MCC_GetRsCompCorrection', 'MCC_GetRsCompEnable', 'MCC_GetRsCompPrediction',
-        'MCC_GetSecondarySignalGain', 'MCC_GetSecondarySignalLPF', 'MCC_GetSlowCompCap',
-        'MCC_GetSlowCompTau', 'MCC_GetSlowCompTauX20Enable',
+         'alog', 'AnnotationInfo', 'AnnotationList', 'area', 'areaXY', 'asin', 'asinh',
+         'atan', 'atanh', 'atan2', 'AxisInfo', 'AxisLabel', 'AxisList',
+         'AxisValFromPixel', 'AxonTelegraphAGetDataNum', 'AxonTelegraphAGetDataString',
+         'AxonTelegraphAGetDataStruct', 'AxonTelegraphGetDataNum',
+         'AxonTelegraphGetDataString', 'AxonTelegraphGetDataStruct',
+         'AxonTelegraphGetTimeoutMs', 'AxonTelegraphSetTimeoutMs', 'Base64Decode',
+         'Base64Encode', 'Besseli', 'Besselj', 'Besselk', 'Bessely', 'beta', 'betai',
+         'BinarySearch', 'BinarySearchInterp', 'binomial', 'binomialln', 'binomialNoise',
+         'cabs', 'CaptureHistory', 'CaptureHistoryStart', 'ceil', 'centerOfMass',
+         'centerOfMassXY', 'cequal', 'char2num', 'chebyshev', 'chebyshevU', 'CheckName',
+         'ChildWindowList', 'CleanupName', 'cmplx', 'cmpstr', 'conj', 'ContourInfo',
+         'ContourNameList', 'ContourNameToWaveRef', 'ContourZ', 'ControlNameList',
+         'ConvertTextEncoding', 'cos', 'cosh', 'cosIntegral', 'cot', 'coth',
+         'CountObjects', 'CountObjectsDFR', 'cpowi', 'CreateDataObjectName',
+         'CreationDate', 'csc', 'csch', 'CsrInfo', 'CsrWave', 'CsrWaveRef', 'CsrXWave',
+         'CsrXWaveRef', 'CTabList', 'DataFolderDir', 'DataFolderExists',
+         'DataFolderList', 'DataFolderRefChanges', 'DataFolderRefsEqual',
+         'DataFolderRefStatus', 'date', 'datetime', 'DateToJulian', 'date2secs',
+         'Dawson', 'defined', 'deltax', 'digamma', 'dilogarithm', 'DimDelta',
+         'DimOffset', 'DimSize', 'ei', 'ellipticE', 'ellipticK', 'enoise', 'equalWaves',
+         'erf', 'erfc', 'erfcw', 'erfcx', 'exists', 'exp', 'expInt', 'expIntegralE1',
+         'expNoise', 'factorial', 'Faddeeva', 'fakedata', 'faverage', 'faverageXY',
+         'fDAQmx_AI_ChannelConfigs', 'fDAQmx_AI_GetReader', 'fDAQmx_AO_UpdateOutputs',
+         'fDAQmx_ConnectTerminals', 'fDAQmx_CTR_Finished', 'fDAQmx_CTR_IsFinished',
+         'fDAQmx_CTR_IsPulseFinished', 'fDAQmx_CTR_ReadCounter',
+         'fDAQmx_CTR_ReadWithOptions', 'fDAQmx_CTR_SetPulseFrequency',
+         'fDAQmx_CTR_Start', 'fDAQmx_DeviceNames', 'fDAQmx_DIO_Finished',
+         'fDAQmx_DIO_PortWidth', 'fDAQmx_DIO_Read', 'fDAQmx_DIO_Write',
+         'fDAQmx_DisconnectTerminals', 'fDAQmx_ErrorString', 'fDAQmx_ExternalCalDate',
+         'fDAQmx_NumAnalogInputs', 'fDAQmx_NumAnalogOutputs', 'fDAQmx_NumCounters',
+         'fDAQmx_NumDIOPorts', 'fDAQmx_ReadChan', 'fDAQmx_ReadNamedChan',
+         'fDAQmx_ResetDevice', 'fDAQmx_ScanGetAvailable', 'fDAQmx_ScanGetNextIndex',
+         'fDAQmx_ScanStart', 'fDAQmx_ScanStop', 'fDAQmx_ScanWait',
+         'fDAQmx_ScanWaitWithTimeout', 'fDAQmx_SelfCalDate', 'fDAQmx_SelfCalibration',
+         'fDAQmx_WaveformStart', 'fDAQmx_WaveformStop', 'fDAQmx_WF_IsFinished',
+         'fDAQmx_WF_WaitUntilFinished', 'fDAQmx_WriteChan', 'FetchURL', 'FindDimLabel',
+         'FindListItem', 'floor', 'FontList', 'FontSizeHeight', 'FontSizeStringWidth',
+         'FresnelCos', 'FresnelSin', 'FuncRefInfo', 'FunctionInfo', 'FunctionList',
+         'FunctionPath', 'gamma', 'gammaEuler', 'gammaInc', 'gammaNoise', 'gammln',
+         'gammp', 'gammq', 'Gauss', 'Gauss1D', 'Gauss2D', 'gcd', 'GeometricMean',
+         'GetBrowserLine', 'GetBrowserSelection', 'GetDataFolder', 'GetDataFolderDFR',
+         'GetDefaultFont', 'GetDefaultFontSize', 'GetDefaultFontStyle', 'GetDimLabel',
+         'GetEnvironmentVariable', 'GetErrMessage', 'GetFormula',
+         'GetIndependentModuleName', 'GetIndexedObjName', 'GetIndexedObjNameDFR',
+         'GetKeyState', 'GetRTErrMessage', 'GetRTError', 'GetRTLocation', 'GetRTLocInfo',
+         'GetRTStackInfo', 'GetScrapText', 'GetUserData', 'GetWavesDataFolder',
+         'GetWavesDataFolderDFR', 'GetWindowBrowserSelection', 'GISGetAllFileFormats',
+         'GISSRefsAreEqual', 'GizmoInfo', 'GizmoScale', 'gnoise', 'GrepList',
+         'GrepString', 'GuideInfo', 'GuideNameList', 'Hash', 'hcsr', 'HDF5AttributeInfo',
+         'HDF5DatasetInfo', 'HDF5LibraryInfo', 'HDF5LinkInfo', 'HDF5TypeInfo', 'hermite',
+         'hermiteGauss', 'HyperGNoise', 'HyperGPFQ', 'HyperG0F1', 'HyperG1F1',
+         'HyperG2F1', 'i', 'IgorInfo', 'IgorVersion', 'imag', 'ImageInfo',
+         'ImageNameList', 'ImageNameToWaveRef', 'IndependentModuleList', 'IndexedDir',
+         'IndexedFile', 'IndexToScale', 'Inf', 'Integrate1D', 'interp', 'Interp2D',
+         'Interp3D', 'inverseERF', 'inverseERFC', 'ItemsInList', 'JacobiCn', 'JacobiSn',
+         'JulianToDate', 'Laguerre', 'LaguerreA', 'LaguerreGauss', 'LambertW',
+         'LayoutInfo', 'leftx', 'LegendreA', 'limit', 'ListMatch', 'ListToTextWave',
+         'ListToWaveRefWave', 'ln', 'log', 'logNormalNoise', 'lorentzianNoise',
+         'LowerStr', 'MacroInfo', 'MacroList', 'MacroPath', 'magsqr', 'MandelbrotPoint',
+         'MarcumQ', 'MatrixCondition', 'MatrixDet', 'MatrixDot', 'MatrixRank',
+         'MatrixTrace', 'max', 'MCC_AutoBridgeBal', 'MCC_AutoFastComp',
+         'MCC_AutoPipetteOffset', 'MCC_AutoSlowComp', 'MCC_AutoWholeCellComp',
+         'MCC_GetBridgeBalEnable', 'MCC_GetBridgeBalResist', 'MCC_GetFastCompCap',
+         'MCC_GetFastCompTau', 'MCC_GetHolding', 'MCC_GetHoldingEnable', 'MCC_GetMode',
+         'MCC_GetNeutralizationCap', 'MCC_GetNeutralizationEnable',
+         'MCC_GetOscKillerEnable', 'MCC_GetPipetteOffset', 'MCC_GetPrimarySignalGain',
+         'MCC_GetPrimarySignalHPF', 'MCC_GetPrimarySignalLPF', 'MCC_GetRsCompBandwidth',
+         'MCC_GetRsCompCorrection', 'MCC_GetRsCompEnable', 'MCC_GetRsCompPrediction',
+         'MCC_GetSecondarySignalGain', 'MCC_GetSecondarySignalLPF', 'MCC_GetSlowCompCap',
+         'MCC_GetSlowCompTau', 'MCC_GetSlowCompTauX20Enable',
         'MCC_GetSlowCurrentInjEnable', 'MCC_GetSlowCurrentInjLevel',
         'MCC_GetSlowCurrentInjSetlTime', 'MCC_GetWholeCellCompCap',
         'MCC_GetWholeCellCompEnable', 'MCC_GetWholeCellCompResist',
@@ -268,24 +285,25 @@
         'MCC_SetRsCompPrediction', 'MCC_SetSecondarySignalGain',
         'MCC_SetSecondarySignalLPF', 'MCC_SetSlowCompCap', 'MCC_SetSlowCompTau',
         'MCC_SetSlowCompTauX20Enable', 'MCC_SetSlowCurrentInjEnable',
-        'MCC_SetSlowCurrentInjLevel', 'MCC_SetSlowCurrentInjSetlTime', 'MCC_SetTimeoutMs',
-        'MCC_SetWholeCellCompCap', 'MCC_SetWholeCellCompEnable',
+        'MCC_SetSlowCurrentInjLevel', 'MCC_SetSlowCurrentInjSetlTime',
+        'MCC_SetTimeoutMs', 'MCC_SetWholeCellCompCap', 'MCC_SetWholeCellCompEnable',
         'MCC_SetWholeCellCompResist', 'mean', 'median', 'min', 'mod', 'ModDate',
-        'MPFXEMGPeak', 'MPFXExpConvExpPeak', 'MPFXGaussPeak', 'MPFXLorenzianPeak',
+        'MPFXEMGPeak', 'MPFXExpConvExpPeak', 'MPFXGaussPeak', 'MPFXLorentzianPeak',
         'MPFXVoigtPeak', 'NameOfWave', 'NaN', 'NewFreeDataFolder', 'NewFreeWave', 'norm',
         'NormalizeUnicode', 'note', 'NumberByKey', 'numpnts', 'numtype',
         'NumVarOrDefault', 'num2char', 'num2istr', 'num2str', 'NVAR_Exists',
         'OperationList', 'PadString', 'PanelResolution', 'ParamIsDefault',
         'ParseFilePath', 'PathList', 'pcsr', 'Pi', 'PICTInfo', 'PICTList',
         'PixelFromAxisVal', 'pnt2x', 'poissonNoise', 'poly', 'PolygonArea', 'poly2D',
-        'PossiblyQuoteName', 'ProcedureText', 'p2rect', 'qcsr', 'real', 'RemoveByKey',
-        'RemoveEnding', 'RemoveFromList', 'RemoveListItem', 'ReplaceNumberByKey',
-        'ReplaceString', 'ReplaceStringByKey', 'rightx', 'round', 'r2polar', 'sawtooth',
-        'scaleToIndex', 'ScreenResolution', 'sec', 'sech', 'Secs2Date', 'Secs2Time',
-        'SelectNumber', 'SelectString', 'SetEnvironmentVariable', 'sign', 'sin', 'sinc',
-        'sinh', 'sinIntegral', 'SortList', 'SpecialCharacterInfo', 'SpecialCharacterList',
-        'SpecialDirPath', 'SphericalBessJ', 'SphericalBessJD', 'SphericalBessY',
-        'SphericalBessYD', 'SphericalHarmonics', 'SQLAllocHandle', 'SQLAllocStmt',
+        'PossiblyQuoteName', 'ProcedureText', 'ProcedureVersion', 'p2rect', 'qcsr',
+        'real', 'RemoveByKey', 'RemoveEnding', 'RemoveFromList', 'RemoveListItem',
+        'ReplaceNumberByKey', 'ReplaceString', 'ReplaceStringByKey', 'ReplicateString',
+        'rightx', 'round', 'r2polar', 'sawtooth', 'scaleToIndex', 'ScreenResolution',
+        'sec', 'sech', 'Secs2Date', 'Secs2Time', 'SelectNumber', 'SelectString',
+        'SetEnvironmentVariable', 'sign', 'sin', 'sinc', 'sinh', 'sinIntegral',
+        'SortList', 'SpecialCharacterInfo', 'SpecialCharacterList', 'SpecialDirPath',
+        'SphericalBessJ', 'SphericalBessJD', 'SphericalBessY', 'SphericalBessYD',
+        'SphericalHarmonics', 'SQLAllocHandle', 'SQLAllocStmt',
         'SQLBinaryWavesToTextWave', 'SQLBindCol', 'SQLBindParameter', 'SQLBrowseConnect',
         'SQLBulkOperations', 'SQLCancel', 'SQLCloseCursor', 'SQLColAttributeNum',
         'SQLColAttributeStr', 'SQLColumnPrivileges', 'SQLColumns', 'SQLConnect',
@@ -294,77 +312,71 @@
         'SQLExecute', 'SQLFetch', 'SQLFetchScroll', 'SQLForeignKeys', 'SQLFreeConnect',
         'SQLFreeEnv', 'SQLFreeHandle', 'SQLFreeStmt', 'SQLGetConnectAttrNum',
         'SQLGetConnectAttrStr', 'SQLGetCursorName', 'SQLGetDataNum', 'SQLGetDataStr',
-        'SQLGetDescFieldNum', 'SQLGetDescFieldStr', 'SQLGetDescRec', 'SQLGetDiagFieldNum',
-        'SQLGetDiagFieldStr', 'SQLGetDiagRec', 'SQLGetEnvAttrNum', 'SQLGetEnvAttrStr',
-        'SQLGetFunctions', 'SQLGetInfoNum', 'SQLGetInfoStr', 'SQLGetStmtAttrNum',
-        'SQLGetStmtAttrStr', 'SQLGetTypeInfo', 'SQLMoreResults', 'SQLNativeSql',
-        'SQLNumParams', 'SQLNumResultCols', 'SQLNumResultRowsIfKnown',
+        'SQLGetDescFieldNum', 'SQLGetDescFieldStr', 'SQLGetDescRec',
+        'SQLGetDiagFieldNum', 'SQLGetDiagFieldStr', 'SQLGetDiagRec', 'SQLGetEnvAttrNum',
+        'SQLGetEnvAttrStr', 'SQLGetFunctions', 'SQLGetInfoNum', 'SQLGetInfoStr',
+        'SQLGetStmtAttrNum', 'SQLGetStmtAttrStr', 'SQLGetTypeInfo', 'SQLMoreResults',
+        'SQLNativeSql', 'SQLNumParams', 'SQLNumResultCols', 'SQLNumResultRowsIfKnown',
         'SQLNumRowsFetched', 'SQLParamData', 'SQLPrepare', 'SQLPrimaryKeys',
         'SQLProcedureColumns', 'SQLProcedures', 'SQLPutData', 'SQLReinitialize',
-        'SQLRowCount', 'SQLSetConnectAttrNum', 'SQLSetConnectAttrStr', 'SQLSetCursorName',
-        'SQLSetDescFieldNum', 'SQLSetDescFieldStr', 'SQLSetDescRec', 'SQLSetEnvAttrNum',
-        'SQLSetEnvAttrStr', 'SQLSetPos', 'SQLSetStmtAttrNum', 'SQLSetStmtAttrStr',
-        'SQLSpecialColumns', 'SQLStatistics', 'SQLTablePrivileges', 'SQLTables',
-        'SQLTextWaveToBinaryWaves', 'SQLTextWaveTo2DBinaryWave', 'SQLUpdateBoundValues',
-        'SQLXOPCheckState', 'SQL2DBinaryWaveToTextWave', 'sqrt', 'StartMSTimer',
-        'StatsBetaCDF', 'StatsBetaPDF', 'StatsBinomialCDF', 'StatsBinomialPDF',
-        'StatsCauchyCDF', 'StatsCauchyPDF', 'StatsChiCDF', 'StatsChiPDF', 'StatsCMSSDCDF',
-        'StatsCorrelation', 'StatsDExpCDF', 'StatsDExpPDF', 'StatsErlangCDF',
-        'StatsErlangPDF', 'StatsErrorPDF', 'StatsEValueCDF', 'StatsEValuePDF',
-        'StatsExpCDF', 'StatsExpPDF', 'StatsFCDF', 'StatsFPDF', 'StatsFriedmanCDF',
-        'StatsGammaCDF', 'StatsGammaPDF', 'StatsGeometricCDF', 'StatsGeometricPDF',
-        'StatsGEVCDF', 'StatsGEVPDF', 'StatsHyperGCDF', 'StatsHyperGPDF',
-        'StatsInvBetaCDF', 'StatsInvBinomialCDF', 'StatsInvCauchyCDF', 'StatsInvChiCDF',
-        'StatsInvCMSSDCDF', 'StatsInvDExpCDF', 'StatsInvEValueCDF', 'StatsInvExpCDF',
-        'StatsInvFCDF', 'StatsInvFriedmanCDF', 'StatsInvGammaCDF', 'StatsInvGeometricCDF',
-        'StatsInvKuiperCDF', 'StatsInvLogisticCDF', 'StatsInvLogNormalCDF',
-        'StatsInvMaxwellCDF', 'StatsInvMooreCDF', 'StatsInvNBinomialCDF',
-        'StatsInvNCChiCDF', 'StatsInvNCFCDF', 'StatsInvNormalCDF', 'StatsInvParetoCDF',
-        'StatsInvPoissonCDF', 'StatsInvPowerCDF', 'StatsInvQCDF', 'StatsInvQpCDF',
-        'StatsInvRayleighCDF', 'StatsInvRectangularCDF', 'StatsInvSpearmanCDF',
-        'StatsInvStudentCDF', 'StatsInvTopDownCDF', 'StatsInvTriangularCDF',
-        'StatsInvUsquaredCDF', 'StatsInvVonMisesCDF', 'StatsInvWeibullCDF',
-        'StatsKuiperCDF', 'StatsLogisticCDF', 'StatsLogisticPDF', 'StatsLogNormalCDF',
-        'StatsLogNormalPDF', 'StatsMaxwellCDF', 'StatsMaxwellPDF', 'StatsMedian',
-        'StatsMooreCDF', 'StatsNBinomialCDF', 'StatsNBinomialPDF', 'StatsNCChiCDF',
-        'StatsNCChiPDF', 'StatsNCFCDF', 'StatsNCFPDF', 'StatsNCTCDF', 'StatsNCTPDF',
-        'StatsNormalCDF', 'StatsNormalPDF', 'StatsParetoCDF', 'StatsParetoPDF',
-        'StatsPermute', 'StatsPoissonCDF', 'StatsPoissonPDF', 'StatsPowerCDF',
-        'StatsPowerNoise', 'StatsPowerPDF', 'StatsQCDF', 'StatsQpCDF', 'StatsRayleighCDF',
+        'SQLRowCount', 'SQLSetConnectAttrNum', 'SQLSetConnectAttrStr',
+        'SQLSetCursorName', 'SQLSetDescFieldNum', 'SQLSetDescFieldStr', 'SQLSetDescRec',
+        'SQLSetEnvAttrNum', 'SQLSetEnvAttrStr', 'SQLSetPos', 'SQLSetStmtAttrNum',
+        'SQLSetStmtAttrStr', 'SQLSpecialColumns', 'SQLStatistics', 'SQLTablePrivileges',
+        'SQLTables', 'SQLTextWaveToBinaryWaves', 'SQLTextWaveTo2DBinaryWave',
+        'SQLUpdateBoundValues', 'SQLXOPCheckState', 'SQL2DBinaryWaveToTextWave', 'sqrt',
+        'StartMSTimer', 'StatsBetaCDF', 'StatsBetaPDF', 'StatsBinomialCDF',
+        'StatsBinomialPDF', 'StatsCauchyCDF', 'StatsCauchyPDF', 'StatsChiCDF',
+        'StatsChiPDF', 'StatsCMSSDCDF', 'StatsCorrelation', 'StatsDExpCDF',
+        'StatsDExpPDF', 'StatsErlangCDF', 'StatsErlangPDF', 'StatsErrorPDF',
+        'StatsEValueCDF', 'StatsEValuePDF', 'StatsExpCDF', 'StatsExpPDF', 'StatsFCDF',
+        'StatsFPDF', 'StatsFriedmanCDF', 'StatsGammaCDF', 'StatsGammaPDF',
+        'StatsGeometricCDF', 'StatsGeometricPDF', 'StatsGEVCDF', 'StatsGEVPDF',
+        'StatsHyperGCDF', 'StatsHyperGPDF', 'StatsInvBetaCDF', 'StatsInvBinomialCDF',
+        'StatsInvCauchyCDF', 'StatsInvChiCDF', 'StatsInvCMSSDCDF', 'StatsInvDExpCDF',
+        'StatsInvEValueCDF', 'StatsInvExpCDF', 'StatsInvFCDF', 'StatsInvFriedmanCDF',
+        'StatsInvGammaCDF', 'StatsInvGeometricCDF', 'StatsInvKuiperCDF',
+        'StatsInvLogisticCDF', 'StatsInvLogNormalCDF', 'StatsInvMaxwellCDF',
+        'StatsInvMooreCDF', 'StatsInvNBinomialCDF', 'StatsInvNCChiCDF', 'StatsInvNCFCDF',
+        'StatsInvNormalCDF', 'StatsInvParetoCDF', 'StatsInvPoissonCDF',
+        'StatsInvPowerCDF', 'StatsInvQCDF', 'StatsInvQpCDF', 'StatsInvRayleighCDF',
+        'StatsInvRectangularCDF', 'StatsInvSpearmanCDF', 'StatsInvStudentCDF',
+        'StatsInvTopDownCDF', 'StatsInvTriangularCDF', 'StatsInvUsquaredCDF',
+        'StatsInvVonMisesCDF', 'StatsInvWeibullCDF', 'StatsKuiperCDF',
+        'StatsLogisticCDF', 'StatsLogisticPDF', 'StatsLogNormalCDF', 'StatsLogNormalPDF',
+        'StatsMaxwellCDF', 'StatsMaxwellPDF', 'StatsMedian', 'StatsMooreCDF',
+        'StatsNBinomialCDF', 'StatsNBinomialPDF', 'StatsNCChiCDF', 'StatsNCChiPDF',
+        'StatsNCFCDF', 'StatsNCFPDF', 'StatsNCTCDF', 'StatsNCTPDF', 'StatsNormalCDF',
+        'StatsNormalPDF', 'StatsParetoCDF', 'StatsParetoPDF', 'StatsPermute',
+        'StatsPoissonCDF', 'StatsPoissonPDF', 'StatsPowerCDF', 'StatsPowerNoise',
+        'StatsPowerPDF', 'StatsQCDF', 'StatsQpCDF', 'StatsRayleighCDF',
         'StatsRayleighPDF', 'StatsRectangularCDF', 'StatsRectangularPDF', 'StatsRunsCDF',
         'StatsSpearmanRhoCDF', 'StatsStudentCDF', 'StatsStudentPDF', 'StatsTopDownCDF',
         'StatsTriangularCDF', 'StatsTriangularPDF', 'StatsTrimmedMean',
         'StatsUSquaredCDF', 'StatsVonMisesCDF', 'StatsVonMisesNoise', 'StatsVonMisesPDF',
         'StatsWaldCDF', 'StatsWaldPDF', 'StatsWeibullCDF', 'StatsWeibullPDF',
         'StopMSTimer', 'StringByKey', 'stringCRC', 'StringFromList', 'StringList',
-        'stringmatch', 'strlen', 'strsearch', 'StrVarOrDefault', 'str2num', 'StudentA',
-        'StudentT', 'sum', 'SVAR_Exists', 'TableInfo', 'TagVal', 'TagWaveRef', 'tan',
-        'tango_close_device', 'tango_command_inout', 'tango_compute_image_proj',
-        'tango_get_dev_attr_list', 'tango_get_dev_black_box', 'tango_get_dev_cmd_list',
-        'tango_get_dev_status', 'tango_get_dev_timeout', 'tango_get_error_stack',
-        'tango_open_device', 'tango_ping_device', 'tango_read_attribute',
-        'tango_read_attributes', 'tango_reload_dev_interface',
-        'tango_resume_attr_monitor', 'tango_set_attr_monitor_period',
-        'tango_set_dev_timeout', 'tango_start_attr_monitor', 'tango_stop_attr_monitor',
-        'tango_suspend_attr_monitor', 'tango_write_attribute', 'tango_write_attributes',
-        'tanh', 'TDMAddChannel', 'TDMAddGroup', 'TDMAppendDataValues',
-        'TDMAppendDataValuesTime', 'TDMChannelPropertyExists', 'TDMCloseChannel',
-        'TDMCloseFile', 'TDMCloseGroup', 'TDMCreateChannelProperty', 'TDMCreateFile',
-        'TDMCreateFileProperty', 'TDMCreateGroupProperty', 'TDMFilePropertyExists',
-        'TDMGetChannelPropertyNames', 'TDMGetChannelPropertyNum',
-        'TDMGetChannelPropertyStr', 'TDMGetChannelPropertyTime',
-        'TDMGetChannelPropertyType', 'TDMGetChannels', 'TDMGetChannelStringPropertyLen',
-        'TDMGetDataType', 'TDMGetDataValues', 'TDMGetDataValuesTime',
-        'TDMGetFilePropertyNames', 'TDMGetFilePropertyNum', 'TDMGetFilePropertyStr',
-        'TDMGetFilePropertyTime', 'TDMGetFilePropertyType', 'TDMGetFileStringPropertyLen',
-        'TDMGetGroupPropertyNames', 'TDMGetGroupPropertyNum', 'TDMGetGroupPropertyStr',
-        'TDMGetGroupPropertyTime', 'TDMGetGroupPropertyType', 'TDMGetGroups',
-        'TDMGetGroupStringPropertyLen', 'TDMGetLibraryErrorDescription',
-        'TDMGetNumChannelProperties', 'TDMGetNumChannels', 'TDMGetNumDataValues',
-        'TDMGetNumFileProperties', 'TDMGetNumGroupProperties', 'TDMGetNumGroups',
-        'TDMGroupPropertyExists', 'TDMOpenFile', 'TDMOpenFileEx', 'TDMRemoveChannel',
-        'TDMRemoveGroup', 'TDMReplaceDataValues', 'TDMReplaceDataValuesTime',
-        'TDMSaveFile', 'TDMSetChannelPropertyNum', 'TDMSetChannelPropertyStr',
+        'stringmatch', 'StringToUnsignedByteWave', 'strlen', 'strsearch',
+        'StrVarOrDefault', 'str2num', 'StudentA', 'StudentT', 'sum', 'SVAR_Exists',
+        'TableInfo', 'TagVal', 'TagWaveRef', 'tan', 'tanh', 'TDMAddChannel',
+        'TDMAddGroup', 'TDMAppendDataValues', 'TDMAppendDataValuesTime',
+        'TDMChannelPropertyExists', 'TDMCloseChannel', 'TDMCloseFile', 'TDMCloseGroup',
+        'TDMCreateChannelProperty', 'TDMCreateFile', 'TDMCreateFileProperty',
+        'TDMCreateGroupProperty', 'TDMFilePropertyExists', 'TDMGetChannelPropertyNames',
+        'TDMGetChannelPropertyNum', 'TDMGetChannelPropertyStr',
+        'TDMGetChannelPropertyTime', 'TDMGetChannelPropertyType', 'TDMGetChannels',
+        'TDMGetChannelStringPropertyLen', 'TDMGetDataType', 'TDMGetDataValues',
+        'TDMGetDataValuesTime', 'TDMGetFilePropertyNames', 'TDMGetFilePropertyNum',
+        'TDMGetFilePropertyStr', 'TDMGetFilePropertyTime', 'TDMGetFilePropertyType',
+        'TDMGetFileStringPropertyLen', 'TDMGetGroupPropertyNames',
+        'TDMGetGroupPropertyNum', 'TDMGetGroupPropertyStr', 'TDMGetGroupPropertyTime',
+        'TDMGetGroupPropertyType', 'TDMGetGroups', 'TDMGetGroupStringPropertyLen',
+        'TDMGetLibraryErrorDescription', 'TDMGetNumChannelProperties',
+        'TDMGetNumChannels', 'TDMGetNumDataValues', 'TDMGetNumFileProperties',
+        'TDMGetNumGroupProperties', 'TDMGetNumGroups', 'TDMGroupPropertyExists',
+        'TDMOpenFile', 'TDMOpenFileEx', 'TDMRemoveChannel', 'TDMRemoveGroup',
+        'TDMReplaceDataValues', 'TDMReplaceDataValuesTime', 'TDMSaveFile',
+        'TDMSetChannelPropertyNum', 'TDMSetChannelPropertyStr',
         'TDMSetChannelPropertyTime', 'TDMSetDataValues', 'TDMSetDataValuesTime',
         'TDMSetFilePropertyNum', 'TDMSetFilePropertyStr', 'TDMSetFilePropertyTime',
         'TDMSetGroupPropertyNum', 'TDMSetGroupPropertyStr', 'TDMSetGroupPropertyTime',
@@ -385,15 +397,19 @@
         'viSetAttribute', 'viSetAttributeString', 'viStatusDesc', 'viTerminate',
         'viUnlock', 'viUnmapAddress', 'viUnmapTrigger', 'viUsbControlIn',
         'viUsbControlOut', 'viVxiCommandQuery', 'viWaitOnEvent', 'viWrite', 'VoigtFunc',
-        'VoigtPeak', 'WaveCRC', 'WaveDims', 'WaveExists', 'WaveHash', 'WaveInfo',
-        'WaveList', 'WaveMax', 'WaveMin', 'WaveName', 'WaveRefIndexed',
-        'WaveRefIndexedDFR', 'WaveRefsEqual', 'WaveRefWaveToList', 'WaveTextEncoding',
-        'WaveType', 'WaveUnits', 'WhichListItem', 'WinList', 'WinName', 'WinRecreation',
-        'WinType', 'wnoise', 'xcsr', 'XWaveName', 'XWaveRefFromTrace', 'x2pnt', 'zcsr',
-        'ZernikeR', 'zeromq_client_connect', 'zeromq_client_recv',
-        'zeromq_client_send', 'zeromq_handler_start', 'zeromq_handler_stop',
-        'zeromq_server_bind', 'zeromq_server_recv', 'zeromq_server_send', 'zeromq_set',
-        'zeromq_stop', 'zeromq_test_callfunction', 'zeromq_test_serializeWave', 'zeta'
+        'VoigtPeak', 'WaveCRC', 'WaveDataToString', 'WaveDims', 'WaveExists', 'WaveHash',
+        'WaveInfo', 'WaveList', 'WaveMax', 'WaveMin', 'WaveMinAndMax', 'WaveModCount',
+        'WaveName', 'WaveRefIndexed', 'WaveRefIndexedDFR', 'WaveRefsEqual',
+        'WaveRefWaveToList', 'WaveTextEncoding', 'WaveType', 'WaveUnits',
+        'WhichListItem', 'WinList', 'WinName', 'WinRecreation', 'WinType', 'wnoise',
+        'xcsr', 'XWaveName', 'XWaveRefFromTrace', 'x2pnt', 'zcsr', 'ZernikeR',
+        'zeromq_client_connect', 'zeromq_client_recv', 'zeromq_client_send',
+        'zeromq_handler_start', 'zeromq_handler_stop', 'zeromq_pub_bind',
+        'zeromq_pub_send', 'zeromq_server_bind', 'zeromq_server_recv',
+        'zeromq_server_send', 'zeromq_set', 'zeromq_set_logging_template', 'zeromq_stop',
+        'zeromq_sub_add_filter', 'zeromq_sub_connect', 'zeromq_sub_recv',
+        'zeromq_sub_remove_filter', 'zeromq_test_callfunction',
+        'zeromq_test_serializeWave', 'zeta'
     )
 
     tokens = {
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/jsx.py pygments-2.17.2+dfsg/pygments/lexers/jsx.py
--- pygments-2.15.1+dfsg/pygments/lexers/jsx.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/jsx.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,76 @@
+"""
+    pygments.lexers.jsx
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexers for JSX (React).
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import bygroups, default, include, inherit
+from pygments.lexers.javascript import JavascriptLexer
+from pygments.token import Name, Operator, Punctuation, String, Text, \
+    Whitespace
+
+__all__ = ['JsxLexer']
+
+
+class JsxLexer(JavascriptLexer):
+    """For JavaScript Syntax Extension (JSX).
+
+    .. versionadded:: 2.17
+    """
+
+    name = "JSX"
+    aliases = ["jsx", "react"]
+    filenames = ["*.jsx", "*.react"]
+    mimetypes = ["text/jsx", "text/typescript-jsx"]
+    url = "https://facebook.github.io/jsx/"
+
+    flags = re.MULTILINE | re.DOTALL
+
+    # Use same tokens as `JavascriptLexer`, but with tags and attributes support
+    tokens = {
+        "root": [
+            include("jsx"),
+            inherit,
+        ],
+        "jsx": [
+            (r"</?>", Punctuation),  # JSXFragment <>|</>
+            (r"(<)(\w+)(\.?)", bygroups(Punctuation, Name.Tag, Punctuation), "tag"),
+            (
+                r"(</)(\w+)(>)",
+                bygroups(Punctuation, Name.Tag, Punctuation),
+            ),
+            (
+                r"(</)(\w+)",
+                bygroups(Punctuation, Name.Tag),
+                "fragment",
+            ),  # Same for React.Context
+        ],
+        "tag": [
+            (r"\s+", Whitespace),
+            (r"([\w-]+)(\s*)(=)(\s*)", bygroups(Name.Attribute, Whitespace, Operator, Whitespace), "attr"),
+            (r"[{}]+", Punctuation),
+            (r"[\w\.]+", Name.Attribute),
+            (r"(/?)(\s*)(>)", bygroups(Punctuation, Text, Punctuation), "#pop"),
+        ],
+        "fragment": [
+            (r"(.)(\w+)", bygroups(Punctuation, Name.Attribute)),
+            (r"(>)", bygroups(Punctuation), "#pop"),
+        ],
+        "attr": [
+            (r"\{", Punctuation, "expression"),
+            (r'".*?"', String, "#pop"),
+            (r"'.*?'", String, "#pop"),
+            default("#pop"),
+        ],
+        "expression": [
+            (r"\{", Punctuation, "#push"),
+            (r"\}", Punctuation, "#pop"),
+            include("root"),
+        ],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/kusto.py pygments-2.17.2+dfsg/pygments/lexers/kusto.py
--- pygments-2.15.1+dfsg/pygments/lexers/kusto.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/kusto.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,94 @@
+"""
+    pygments.lexers.kusto
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Kusto Query Language (KQL).
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import (Comment, Keyword, Name, Number, Punctuation,
+                            String, Whitespace)
+
+__all__ = ["KustoLexer"]
+
+# Although these all seem to be keywords
+# https://github.com/microsoft/Kusto-Query-Language/blob/master/src/Kusto.Language/Syntax/SyntaxFacts.cs
+# it appears that only the ones with tags here
+# https://github.com/microsoft/Kusto-Query-Language/blob/master/src/Kusto.Language/Parser/QueryGrammar.cs
+# are highlighted in the Azure portal log query editor.
+KUSTO_KEYWORDS = [
+    'and', 'as', 'between', 'by', 'consume', 'contains', 'containscs', 'count',
+    'distinct', 'evaluate', 'extend', 'facet', 'filter', 'find', 'fork',
+    'getschema', 'has', 'invoke', 'join', 'limit', 'lookup', 'make-series',
+    'matches regex', 'mv-apply', 'mv-expand', 'notcontains', 'notcontainscs',
+    '!contains', '!has', '!startswith', 'on', 'or', 'order', 'parse', 'parse-where',
+    'parse-kv', 'partition', 'print', 'project', 'project-away', 'project-keep',
+    'project-rename', 'project-reorder', 'range', 'reduce', 'regex', 'render',
+    'sample', 'sample-distinct', 'scan', 'search', 'serialize', 'sort', 'startswith',
+    'summarize', 'take', 'top', 'top-hitters', 'top-nested', 'typeof', 'union',
+    'where', 'bool', 'date', 'datetime', 'int', 'long', 'real', 'string', 'time'
+]
+
+# From
+# https://github.com/microsoft/Kusto-Query-Language/blob/master/src/Kusto.Language/Syntax/SyntaxFacts.cs
+KUSTO_PUNCTUATION = [
+    "(", ")", "[", "]", "{", "}", "|", "<|", "+", "-", "*", "/",
+    "%", ".." "!", "<", "<=", ">", ">=", "=", "==", "!=", "<>",
+    ":", ";", ",", "=~", "!~", "?", "=>",
+]
+
+
+class KustoLexer(RegexLexer):
+    """For Kusto Query Language source code.
+
+    .. versionadded:: 2.17
+    """
+
+    name = "Kusto"
+    aliases = ["kql", "kusto"]
+    filenames = ["*.kql", "*.kusto", ".csl"]
+    url = "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query"
+
+    tokens = {
+        "root": [
+            (r"\s+", Whitespace),
+            (words(KUSTO_KEYWORDS, suffix=r"\b"), Keyword),
+            (r"//.*", Comment),
+            (words(KUSTO_PUNCTUATION), Punctuation),
+            (r"[^\W\d]\w*", Name),
+            # Numbers can take the form 1, .1, 1., 1.1, 1.1111, etc.
+            (r"\d+[.]\d*|[.]\d+", Number.Float),
+            (r"\d+", Number.Integer),
+            (r"'", String, "single_string"),
+            (r'"', String, "double_string"),
+            (r"@'", String, "single_verbatim"),
+            (r'@"', String, "double_verbatim"),
+            (r"```", String, "multi_string"),
+        ],
+        "single_string": [
+            (r"'", String, "#pop"),
+            (r"\\.", String.Escape),
+            (r"[^'\\]+", String),
+        ],
+        "double_string": [
+            (r'"', String, "#pop"),
+            (r"\\.", String.Escape),
+            (r'[^"\\]+', String),
+        ],
+        "single_verbatim": [
+            (r"'", String, "#pop"),
+            (r"[^']+", String),
+        ],
+        "double_verbatim": [
+            (r'"', String, "#pop"),
+            (r'[^"]+', String),
+        ],
+        "multi_string": [
+            (r"[^`]+", String),
+            (r"```", String, "#pop"),
+            (r"`", String),
+        ],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/ldap.py pygments-2.17.2+dfsg/pygments/lexers/ldap.py
--- pygments-2.15.1+dfsg/pygments/lexers/ldap.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/ldap.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,157 @@
+"""
+    pygments.lexers.ldap
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Pygments lexers for LDAP.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+
+from pygments.lexer import RegexLexer, bygroups, default
+from pygments.token import Operator, Comment, Keyword, Literal, Name, String, \
+    Number, Punctuation, Whitespace, Escape
+
+__all__ = ['LdifLexer', 'LdaprcLexer']
+
+
+class LdifLexer(RegexLexer):
+
+    """
+    Lexer for LDIF
+
+    .. versionadded:: 2.17
+    """
+
+    name = 'LDIF'
+    aliases = ['ldif']
+    filenames = ['*.ldif']
+    mimetypes = ["text/x-ldif"]
+    url = "https://datatracker.ietf.org/doc/html/rfc2849"
+
+    tokens = {
+        'root': [
+            (r'\s*\n', Whitespace),
+            (r'(-)(\n)', bygroups(Punctuation, Whitespace)),
+            (r'(#.*)(\n)', bygroups(Comment.Single, Whitespace)),
+            (r'(version)(:)([ \t]*)(.*)([ \t]*\n)', bygroups(Keyword,
+             Punctuation, Whitespace, Number.Integer, Whitespace)),
+            (r'(control)(:)([ \t]*)([\.0-9]+)([ \t]+)((?:true|false)?)([ \t]*)',
+                bygroups(Keyword, Punctuation, Whitespace, Name.Other, Whitespace, Keyword, Whitespace), "after-control"),
+            (r'(deleteoldrdn)(:)([ \n]*)([0-1]+)([ \t]*\n)',
+             bygroups(Keyword, Punctuation, Whitespace, Number, Whitespace)),
+            (r'(add|delete|replace)(::?)(\s*)(.*)([ \t]*\n)', bygroups(
+                Keyword, Punctuation, Whitespace, Name.Attribute, Whitespace)),
+            (r'(changetype)(:)([ \t]*)([a-z]*)([ \t]*\n)',
+             bygroups(Keyword, Punctuation, Whitespace, Keyword, Whitespace)),
+            (r'(dn|newrdn)(::)', bygroups(Keyword, Punctuation), "base64-dn"),
+            (r'(dn|newrdn)(:)', bygroups(Keyword, Punctuation), "dn"),
+            (r'(objectclass)(:)([ \t]*)([^ \t\n]*)([ \t]*\n)', bygroups(
+                Keyword, Punctuation, Whitespace, Name.Class, Whitespace)),
+            (r'([a-zA-Z]*|[0-9][0-9\.]*[0-9])(;)',
+             bygroups(Name.Attribute, Punctuation), "property"),
+            (r'([a-zA-Z]*|[0-9][0-9\.]*[0-9])(:<)',
+             bygroups(Name.Attribute, Punctuation), "url"),
+            (r'([a-zA-Z]*|[0-9][0-9\.]*[0-9])(::?)',
+             bygroups(Name.Attribute, Punctuation), "value"),
+        ],
+        "after-control": [
+            (r":<", Punctuation, ("#pop", "url")),
+            (r"::?", Punctuation, ("#pop", "value")),
+            default("#pop"),
+        ],
+        'property': [
+            (r'([-a-zA-Z0-9]*)(;)', bygroups(Name.Property, Punctuation)),
+            (r'([-a-zA-Z0-9]*)(:<)',
+             bygroups(Name.Property, Punctuation), ("#pop", "url")),
+            (r'([-a-zA-Z0-9]*)(::?)',
+             bygroups(Name.Property, Punctuation), ("#pop", "value")),
+        ],
+        'value': [
+            (r'(\s*)([^\n]+\S)(\n )',
+             bygroups(Whitespace, String, Whitespace)),
+            (r'(\s*)([^\n]+\S)(\n)',
+             bygroups(Whitespace, String, Whitespace), "#pop"),
+        ],
+        'url': [
+            (r'([ \t]*)(\S*)([ \t]*\n )',
+             bygroups(Whitespace, Comment.PreprocFile, Whitespace)),
+            (r'([ \t]*)(\S*)([ \t]*\n)', bygroups(Whitespace,
+             Comment.PreprocFile, Whitespace), "#pop"),
+        ],
+        "dn": [
+            (r'([ \t]*)([-a-zA-Z0-9\.]+)(=)', bygroups(Whitespace,
+             Name.Attribute, Operator), ("#pop", "dn-value")),
+        ],
+        "dn-value": [
+            (r'\\[^\n]', Escape),
+            (r',', Punctuation, ("#pop", "dn")),
+            (r'\+', Operator, ("#pop", "dn")),
+            (r'[^,\+\n]+', String),
+            (r'\n ', Whitespace),
+            (r'\n', Whitespace, "#pop"),
+        ],
+        "base64-dn": [
+            (r'([ \t]*)([^ \t\n][^ \t\n]*[^\n])([ \t]*\n )',
+             bygroups(Whitespace, Name, Whitespace)),
+            (r'([ \t]*)([^ \t\n][^ \t\n]*[^\n])([ \t]*\n)',
+             bygroups(Whitespace, Name, Whitespace), "#pop"),
+        ]
+    }
+
+
+class LdaprcLexer(RegexLexer):
+    """
+    Lexer for OpenLDAP configuration files.
+
+    .. versionadded:: 2.17
+    """
+
+    name = 'LDAP configuration file'
+    aliases = ['ldapconf', 'ldaprc']
+    filenames = ['.ldaprc', 'ldaprc', 'ldap.conf']
+    mimetypes = ["text/x-ldapconf"]
+    url = 'https://www.openldap.org/software//man.cgi?query=ldap.conf&sektion=5&apropos=0&manpath=OpenLDAP+2.4-Release'
+
+    _sasl_keywords = r'SASL_(?:MECH|REALM|AUTHCID|AUTHZID|CBINDING)'
+    _tls_keywords = r'TLS_(?:CACERT|CACERTDIR|CERT|ECNAME|KEY|CIPHER_SUITE|PROTOCOL_MIN|RANDFILE|CRLFILE)'
+    _literal_keywords = rf'(?:URI|SOCKET_BIND_ADDRESSES|{_sasl_keywords}|{_tls_keywords})'
+    _boolean_keywords = r'GSSAPI_(?:ALLOW_REMOTE_PRINCIPAL|ENCRYPT|SIGN)|REFERRALS|SASL_NOCANON'
+    _integer_keywords = r'KEEPALIVE_(?:IDLE|PROBES|INTERVAL)|NETWORK_TIMEOUT|PORT|SIZELIMIT|TIMELIMIT|TIMEOUT'
+    _secprops = r'none|noanonymous|noplain|noactive|nodict|forwardsec|passcred|(?:minssf|maxssf|maxbufsize)=\d+'
+
+    flags = re.IGNORECASE | re.MULTILINE
+
+    tokens = {
+        'root': [
+            (r'#.*', Comment.Single),
+            (r'\s+', Whitespace),
+            (rf'({_boolean_keywords})(\s+)(on|true|yes|off|false|no)$',
+             bygroups(Keyword, Whitespace, Keyword.Constant)),
+            (rf'({_integer_keywords})(\s+)(\d+)',
+             bygroups(Keyword, Whitespace, Number.Integer)),
+            (r'(VERSION)(\s+)(2|3)', bygroups(Keyword, Whitespace, Number.Integer)),
+            # Constants
+            (r'(DEREF)(\s+)(never|searching|finding|always)',
+             bygroups(Keyword, Whitespace, Keyword.Constant)),
+            (rf'(SASL_SECPROPS)(\s+)((?:{_secprops})(?:,{_secprops})*)',
+             bygroups(Keyword, Whitespace, Keyword.Constant)),
+            (r'(SASL_CBINDING)(\s+)(none|tls-unique|tls-endpoint)',
+             bygroups(Keyword, Whitespace, Keyword.Constant)),
+            (r'(TLS_REQ(?:CERT|SAN))(\s+)(allow|demand|hard|never|try)',
+             bygroups(Keyword, Whitespace, Keyword.Constant)),
+            (r'(TLS_CRLCHECK)(\s+)(none|peer|all)',
+             bygroups(Keyword, Whitespace, Keyword.Constant)),
+            # Literals
+            (r'(BASE|BINDDN)(\s+)(\S+)$',
+             bygroups(Keyword, Whitespace, Literal)),
+            # Accepts hostname with or without port.
+            (r'(HOST)(\s+)([a-z0-9]+)((?::(\d+))?)',
+             bygroups(Keyword, Whitespace, Literal, Number.Integer)),
+            (rf'({_literal_keywords})(\s+)(\S+)$',
+             bygroups(Keyword, Whitespace, Literal)),
+        ],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/lean.py pygments-2.17.2+dfsg/pygments/lexers/lean.py
--- pygments-2.15.1+dfsg/pygments/lexers/lean.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/lean.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,122 @@
+"""
+    pygments.lexers.lean
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for the Lean theorem prover.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+import re
+
+from pygments.lexer import RegexLexer, default, words, include
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Generic, Whitespace
+
+__all__ = ['Lean3Lexer']
+
+class Lean3Lexer(RegexLexer):
+    """
+    For the Lean 3 theorem prover.
+
+    .. versionadded:: 2.0
+    """
+    name = 'Lean'
+    url = 'https://leanprover-community.github.io/lean3'
+    aliases = ['lean', 'lean3']
+    filenames = ['*.lean']
+    mimetypes = ['text/x-lean', 'text/x-lean3']
+
+    tokens = {
+        'expression': [
+            (r'\s+', Text),
+            (r'/--', String.Doc, 'docstring'),
+            (r'/-', Comment, 'comment'),
+            (r'--.*?$', Comment.Single),
+            (words((
+                    'forall', 'fun', 'Pi', 'from', 'have', 'show', 'assume', 'suffices',
+                    'let', 'if', 'else', 'then', 'in', 'with', 'calc', 'match',
+                    'do'
+                ), prefix=r'\b', suffix=r'\b'), Keyword),
+            (words(('sorry', 'admit'), prefix=r'\b', suffix=r'\b'), Generic.Error),
+            (words(('Sort', 'Prop', 'Type'), prefix=r'\b', suffix=r'\b'), Keyword.Type),
+            (words((
+                '(', ')', ':', '{', '}', '[', ']', '⟨', '⟩', '‹', '›', '⦃', '⦄', ':=', ',',
+            )), Operator),
+            (r'[A-Za-z_\u03b1-\u03ba\u03bc-\u03fb\u1f00-\u1ffe\u2100-\u214f]'
+             r'[.A-Za-z_\'\u03b1-\u03ba\u03bc-\u03fb\u1f00-\u1ffe\u2070-\u2079'
+             r'\u207f-\u2089\u2090-\u209c\u2100-\u214f0-9]*', Name),
+            (r'0x[A-Za-z0-9]+', Number.Integer),
+            (r'0b[01]+', Number.Integer),
+            (r'\d+', Number.Integer),
+            (r'"', String.Double, 'string'),
+            (r"'(?:(\\[\\\"'nt])|(\\x[0-9a-fA-F]{2})|(\\u[0-9a-fA-F]{4})|.)'", String.Char),
+            (r'[~?][a-z][\w\']*:', Name.Variable),
+            (r'\S', Name.Builtin.Pseudo),
+        ],
+        'root': [
+            (words((
+                'import', 'renaming', 'hiding',
+                'namespace',
+                'local',
+                'private', 'protected', 'section',
+                'include', 'omit', 'section',
+                'protected', 'export',
+                'open',
+                'attribute',
+            ), prefix=r'\b', suffix=r'\b'), Keyword.Namespace),
+            (words((
+                'lemma', 'theorem', 'def', 'definition', 'example',
+                'axiom', 'axioms', 'constant', 'constants',
+                'universe', 'universes',
+                'inductive', 'coinductive', 'structure', 'extends',
+                'class', 'instance',
+                'abbreviation',
+
+                'noncomputable theory',
+
+                'noncomputable', 'mutual', 'meta',
+
+                'attribute',
+
+                'parameter', 'parameters',
+                'variable', 'variables',
+
+                'reserve', 'precedence',
+                'postfix', 'prefix', 'notation', 'infix', 'infixl', 'infixr',
+
+                'begin', 'by', 'end',
+
+                'set_option',
+                'run_cmd',
+            ), prefix=r'\b', suffix=r'\b'), Keyword.Declaration),
+            (r'@\[', Keyword.Declaration, 'attribute'),
+            (words((
+                '#eval', '#check', '#reduce', '#exit',
+                '#print', '#help',
+            ), suffix=r'\b'), Keyword),
+            include('expression')
+        ],
+        'attribute': [
+            (r'\]', Keyword.Declaration, '#pop'),
+            include('expression'),
+        ],
+        'comment': [
+            (r'[^/-]', Comment.Multiline),
+            (r'/-', Comment.Multiline, '#push'),
+            (r'-/', Comment.Multiline, '#pop'),
+            (r'[/-]', Comment.Multiline)
+        ],
+        'docstring': [
+            (r'[^/-]', String.Doc),
+            (r'-/', String.Doc, '#pop'),
+            (r'[/-]', String.Doc)
+        ],
+        'string': [
+            (r'[^\\"]+', String.Double),
+            (r"(?:(\\[\\\"'nt])|(\\x[0-9a-fA-F]{2})|(\\u[0-9a-fA-F]{4}))", String.Escape),
+            ('"', String.Double, '#pop'),
+        ],
+    }
+
+LeanLexer = Lean3Lexer
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/lisp.py pygments-2.17.2+dfsg/pygments/lexers/lisp.py
--- pygments-2.15.1+dfsg/pygments/lexers/lisp.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/lisp.py	2020-02-02 00:00:00.000000000 +0000
@@ -471,6 +471,16 @@
         ],
     }
 
+    def analyse_text(text):
+        """Competes with Visual Prolog on *.cl"""
+        # This is a *really* good indicator (and not conflicting with Visual Prolog)
+        # '(defun ' first on a line
+        # section keyword alone on line e.g. 'clauses'
+        if re.search(r'^\s*\(defun\s', text):
+            return 0.8
+        else:
+            return 0
+
 
 class HyLexer(RegexLexer):
     """
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/macaulay2.py pygments-2.17.2+dfsg/pygments/lexers/macaulay2.py
--- pygments-2.15.1+dfsg/pygments/lexers/macaulay2.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/macaulay2.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,7 +13,7 @@
 
 __all__ = ['Macaulay2Lexer']
 
-# Auto-generated for Macaulay2-1.21. Do not modify this file manually.
+# Auto-generated for Macaulay2-1.22. Do not modify this file manually.
 
 M2KEYWORDS = (
     "and",
@@ -69,6 +69,7 @@
     "BOLD",
     "Boolean",
     "BR",
+    "BUTTON",
     "CacheFunction",
     "CacheTable",
     "CC",
@@ -89,6 +90,7 @@
     "Descent",
     "Describe",
     "Dictionary",
+    "DirectSum",
     "DIV",
     "Divide",
     "DL",
@@ -131,9 +133,11 @@
     "Hypertext",
     "HypertextContainer",
     "HypertextParagraph",
+    "HypertextVoid",
     "Ideal",
     "IMG",
     "ImmutableType",
+    "INDENT",
     "IndeterminateNumber",
     "IndexedVariable",
     "IndexedVariableTable",
@@ -141,9 +145,11 @@
     "InexactFieldFamily",
     "InexactNumber",
     "InfiniteNumber",
+    "INPUT",
     "IntermediateMarkUpType",
     "ITALIC",
     "Iterator",
+    "KBD",
     "Keyword",
     "LABEL",
     "LATER",
@@ -175,7 +181,6 @@
     "MutableMatrix",
     "Net",
     "NetFile",
-    "NonAssociativeProduct",
     "Nothing",
     "Number",
     "NumberedVerticalList",
@@ -210,6 +215,7 @@
     "RowExpression",
     "RR",
     "RRi",
+    "SAMP",
     "SCRIPT",
     "ScriptedFunctor",
     "SelfInitializingType",
@@ -238,6 +244,7 @@
     "Tally",
     "Task",
     "TD",
+    "TensorProduct",
     "TestInput",
     "TEX",
     "TH",
@@ -252,6 +259,7 @@
     "Type",
     "UL",
     "URL",
+    "VAR",
     "Variety",
     "Vector",
     "VectorExpression",
@@ -622,6 +630,7 @@
     "isMember",
     "isModule",
     "isMonomialIdeal",
+    "isMutable",
     "isNormal",
     "isOpen",
     "isOutputFile",
@@ -720,6 +729,7 @@
     "minimalPresentation",
     "minimalPrimes",
     "minimalReduction",
+    "minimize",
     "minimizeFilename",
     "minors",
     "minPosition",
@@ -1095,6 +1105,7 @@
     "BeforePrint",
     "BeginningMacaulay2",
     "Benchmark",
+    "BernsteinSato",
     "Bertini",
     "BettiCharacters",
     "BGG",
@@ -1118,6 +1129,7 @@
     "CannedExample",
     "CatalanConstant",
     "Caveat",
+    "CellularResolutions",
     "Center",
     "Certification",
     "ChainComplexExtras",
@@ -1295,6 +1307,7 @@
     "HighestWeights",
     "Hilbert",
     "HodgeIntegrals",
+    "HolonomicSystems",
     "homeDirectory",
     "HomePage",
     "Homogeneous",
@@ -1375,6 +1388,7 @@
     "MakePDF",
     "MapleInterface",
     "Markov",
+    "MatchingFields",
     "Matroids",
     "maxAllowableThreads",
     "maxExponent",
@@ -1470,6 +1484,7 @@
     "Points",
     "Polyhedra",
     "Polymake",
+    "PolyominoIdeals",
     "Posets",
     "Position",
     "PositivityToricBundles",
@@ -1558,6 +1573,7 @@
     "RunDirectory",
     "RunExamples",
     "RunExternalM2",
+    "SagbiGbDetection",
     "Saturation",
     "Schubert2",
     "SchurComplexes",
@@ -1703,7 +1719,7 @@
     """Lexer for Macaulay2, a software system for research in algebraic geometry."""
 
     name = 'Macaulay2'
-    url = 'https://faculty.math.illinois.edu/Macaulay2/'
+    url = 'https://macaulay2.com/'
     aliases = ['macaulay2']
     filenames = ['*.m2']
 
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/make.py pygments-2.17.2+dfsg/pygments/lexers/make.py
--- pygments-2.15.1+dfsg/pygments/lexers/make.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/make.py	2020-02-02 00:00:00.000000000 +0000
@@ -179,6 +179,7 @@
             (r'(\$<)(.+?)(>)', bygroups(Operator, Name.Variable, Operator)),
             (r'(?s)".*?"', String.Double),
             (r'\\\S+', String),
+            (r'\[(?P<level>=*)\[[\w\W]*?\](?P=level)\]', String.Multiline),
             (r'[^)$"# \t\n]+', String),
             (r'\n', Whitespace),  # explicitly legal
             include('keywords'),
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/markup.py pygments-2.17.2+dfsg/pygments/lexers/markup.py
--- pygments-2.15.1+dfsg/pygments/lexers/markup.py	2023-04-10 12:41:41.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/markup.py	2020-02-02 00:00:00.000000000 +0000
@@ -512,32 +512,31 @@
     flags = re.MULTILINE
 
     def _handle_codeblock(self, match):
-        """
-        match args: 1:backticks, 2:lang_name, 3:newline, 4:code, 5:backticks
-        """
         from pygments.lexers import get_lexer_by_name
 
-        # section header
-        yield match.start(1), String.Backtick, match.group(1)
-        yield match.start(2), String.Backtick, match.group(2)
-        yield match.start(3), Text           , match.group(3)
+        yield match.start('initial'), String.Backtick, match.group('initial')
+        yield match.start('lang'), String.Backtick, match.group('lang')
+        if match.group('afterlang') is not None:
+            yield match.start('whitespace'), Whitespace, match.group('whitespace')
+            yield match.start('extra'), Text, match.group('extra')
+        yield match.start('newline'), Whitespace, match.group('newline')
 
         # lookup lexer if wanted and existing
         lexer = None
         if self.handlecodeblocks:
             try:
-                lexer = get_lexer_by_name( match.group(2).strip() )
+                lexer = get_lexer_by_name(match.group('lang').strip())
             except ClassNotFound:
                 pass
-        code = match.group(4)
-
+        code = match.group('code')
         # no lexer for this language. handle it like it was a code block
         if lexer is None:
-            yield match.start(4), String, code
+            yield match.start('code'), String, code
         else:
+            # FIXME: aren't the offsets wrong?
             yield from do_insertions([], lexer.get_tokens_unprocessed(code))
 
-        yield match.start(5), String.Backtick, match.group(5)
+        yield match.start('terminator'), String.Backtick, match.group('terminator')
 
     tokens = {
         'root': [
@@ -563,7 +562,19 @@
             # code block fenced by 3 backticks
             (r'^(\s*```\n[\w\W]*?^\s*```$\n)', String.Backtick),
             # code block with language
-            (r'^(\s*```)(\w+)(\n)([\w\W]*?)(^\s*```$\n)', _handle_codeblock),
+            # Some tools include extra stuff after the language name, just
+            # highlight that as text. For example: https://docs.enola.dev/use/execmd
+            (r'''(?x)
+              ^(?P<initial>\s*```)
+              (?P<lang>[\w\-]+)
+              (?P<afterlang>
+                 (?P<whitespace>[^\S\n]+)
+                 (?P<extra>.*))?
+              (?P<newline>\n)
+              (?P<code>(.|\n)*?)
+              (?P<terminator>^\s*```$\n)
+              ''',
+             _handle_codeblock),
 
             include('inline'),
         ],
@@ -919,7 +930,9 @@
     variant_langs = {
         # ZhConverter.php
         'zh', 'zh-hans', 'zh-hant', 'zh-cn', 'zh-hk', 'zh-mo', 'zh-my', 'zh-sg', 'zh-tw',
-        # UnConverter.php
+        # WuuConverter.php
+        'wuu', 'wuu-hans', 'wuu-hant',
+        # UzConverter.php
         'uz', 'uz-latn', 'uz-cyrl',
         # TlyConverter.php
         'tly', 'tly-cyrl',
@@ -1039,7 +1052,7 @@
             include('entity'),
             # Bold & italic
             (r"('')(''')(?!')", bygroups(Generic.Emph,
-             Generic.Strong), 'inline-italic-bold'),
+             Generic.EmphStrong), 'inline-italic-bold'),
             (r"'''(?!')", Generic.Strong, 'inline-bold'),
             (r"''(?!')", Generic.Emph, 'inline-italic'),
             # Comments & parameters & templates
@@ -1049,37 +1062,37 @@
                 r"""(?xi)
                 (\[\[)
                     (File|Image) (:)
-                    ([{}]*)
-                    (?: (\#) ([{}]*?) )?
-                """.format(title_char, f'{title_char}#'),
+                    ((?: [%s] | \{{2,3}[^{}]*?\}{2,3} | <!--[\s\S]*?--> )*)
+                    (?: (\#) ([%s]*?) )?
+                """ % (title_char, f'{title_char}#'),
                 bygroups(Punctuation, Name.Namespace,  Punctuation,
-                         Name.Tag, Punctuation, Name.Label),
+                         using(this, state=['wikilink-name']), Punctuation, Name.Label),
                 'medialink-inner'
             ),
             # Wikilinks
             (
                 r"""(?xi)
-                (\[\[)(?!{}) # Should not contain URLs
-                    (?: ([{}]*) (:))?
-                    ([{}]*?)
-                    (?: (\#) ([{}]*?) )?
+                (\[\[)(?!%s) # Should not contain URLs
+                    (?: ([%s]*) (:))?
+                    ((?: [%s] | \{{2,3}[^{}]*?\}{2,3} | <!--[\s\S]*?--> )*?)
+                    (?: (\#) ([%s]*?) )?
                 (\]\])
-                """.format('|'.join(protocols), title_char.replace('/', ''),
-                           title_char, f'{title_char}#'),
+                """ % ('|'.join(protocols), title_char.replace('/', ''),
+                       title_char, f'{title_char}#'),
                 bygroups(Punctuation, Name.Namespace,  Punctuation,
-                         Name.Tag, Punctuation, Name.Label, Punctuation)
+                         using(this, state=['wikilink-name']), Punctuation, Name.Label, Punctuation)
             ),
             (
                 r"""(?xi)
-                (\[\[)(?!{})
-                    (?: ([{}]*) (:))?
-                    ([{}]*?)
-                    (?: (\#) ([{}]*?) )?
+                (\[\[)(?!%s)
+                    (?: ([%s]*) (:))?
+                    ((?: [%s] | \{{2,3}[^{}]*?\}{2,3} | <!--[\s\S]*?--> )*?)
+                    (?: (\#) ([%s]*?) )?
                     (\|)
-                """.format('|'.join(protocols), title_char.replace('/', ''),
-                           title_char, f'{title_char}#'),
+                """ % ('|'.join(protocols), title_char.replace('/', ''),
+                       title_char, f'{title_char}#'),
                 bygroups(Punctuation, Name.Namespace,  Punctuation,
-                         Name.Tag, Punctuation, Name.Label, Punctuation),
+                         using(this, state=['wikilink-name']), Punctuation, Name.Label, Punctuation),
                 'wikilink-inner'
             ),
             # External links
@@ -1177,16 +1190,43 @@
             # LanguageConverter markups
             (
                 r"""(?xi)
-                (-\{{) # Escape format()
-                    (?: ([^|]) (\|))?
-                    (?: (\s* (?:{variants}) \s*) (=>))?
-                    (\s* (?:{variants}) \s*) (:)
+                (-\{{) # Use {{ to escape format()
+                    ([^|]) (\|)
+                    (?: 
+                        (?: ([^;]*?) (=>))?
+                        (\s* (?:{variants}) \s*) (:)
+                    )?
                 """.format(variants='|'.join(variant_langs)),
                 bygroups(Punctuation, Keyword, Punctuation,
-                         Name.Label, Operator, Name.Label, Punctuation),
+                         using(this, state=['root', 'lc-raw']),
+                         Operator, Name.Label, Punctuation),
+                'lc-inner'
+            ),
+            # LanguageConverter markups: composite conversion grammar
+            (
+                r"""(?xi)
+                (-\{)
+                    ([a-z\s;-]*?) (\|)
+                """,
+                bygroups(Punctuation,
+                         using(this, state=['root', 'lc-flag']),
+                         Punctuation),
+                'lc-raw'
+            ),
+            # LanguageConverter markups: fallbacks
+            (
+                r"""(?xi)
+                (-\{{) (?!\{{) # Use {{ to escape format()
+                    (?: (\s* (?:{variants}) \s*) (:))?
+                """.format(variants='|'.join(variant_langs)),
+                bygroups(Punctuation, Name.Label, Punctuation),
                 'lc-inner'
             ),
-            (r'-\{', Punctuation, 'lc-raw'),
+        ],
+        'wikilink-name': [
+            include('replaceable'),
+            (r'[^{<]+', Name.Tag),
+            (r'(?s).', Name.Tag),
         ],
         'wikilink-inner': [
             # Quit in case of another wikilink
@@ -1212,7 +1252,7 @@
             include('quote-common'),
             (r"('')(''')(?!')", bygroups(Generic.Emph,
              Generic.Strong), ('#pop', 'inline-bold')),
-            (r"'''(?!')", Generic.Strong, ('#pop', 'inline-italic-bold')),
+            (r"'''(?!')", Generic.EmphStrong, ('#pop', 'inline-italic-bold')),
             (r"''(?!')", Generic.Emph, '#pop'),
             include('inline'),
             include('text-italic'),
@@ -1222,35 +1262,41 @@
             (r"(''')('')(?!')", bygroups(
                 Generic.Strong, Generic.Emph), ('#pop', 'inline-italic')),
             (r"'''(?!')", Generic.Strong, '#pop'),
-            (r"''(?!')", Generic.Emph, ('#pop', 'inline-bold-italic')),
+            (r"''(?!')", Generic.EmphStrong, ('#pop', 'inline-bold-italic')),
             include('inline'),
             include('text-bold'),
         ],
         'inline-bold-italic': [
             include('quote-common'),
-            (r"('')(''')(?!')", bygroups(Generic.Emph,
+            (r"('')(''')(?!')", bygroups(Generic.EmphStrong,
              Generic.Strong), '#pop'),
-            (r"'''(?!')", Generic.Strong, ('#pop', 'inline-italic')),
-            (r"''(?!')", Generic.Emph, ('#pop', 'inline-bold')),
+            (r"'''(?!')", Generic.EmphStrong, ('#pop', 'inline-italic')),
+            (r"''(?!')", Generic.EmphStrong, ('#pop', 'inline-bold')),
             include('inline'),
-            include('text-italic'),
+            include('text-bold-italic'),
         ],
         'inline-italic-bold': [
             include('quote-common'),
             (r"(''')('')(?!')", bygroups(
-                Generic.Strong, Generic.Emph), '#pop'),
-            (r"'''(?!')", Generic.Strong, ('#pop', 'inline-italic')),
-            (r"''(?!')", Generic.Emph, ('#pop', 'inline-bold')),
-            include('text-bold'),
+                Generic.EmphStrong, Generic.Emph), '#pop'),
+            (r"'''(?!')", Generic.EmphStrong, ('#pop', 'inline-italic')),
+            (r"''(?!')", Generic.EmphStrong, ('#pop', 'inline-bold')),
+            include('inline'),
+            include('text-bold-italic'),
+        ],
+        'lc-flag': [
+            (r'\s+', Whitespace),
+            (r';', Punctuation),
+            *text_rules(Keyword),
         ],
         'lc-inner': [
             (
                 r"""(?xi)
                 (;)
-                (?: (\s* (?:{variants}) \s*) (=>))?
+                (?: ([^;]*?) (=>))?
                 (\s* (?:{variants}) \s*) (:)
                 """.format(variants='|'.join(variant_langs)),
-                bygroups(Punctuation, Name.Label,
+                bygroups(Punctuation, using(this, state=['root', 'lc-raw']),
                          Operator, Name.Label, Punctuation)
             ),
             (r';?\s*?\}-', Punctuation, '#pop'),
@@ -1499,5 +1545,6 @@
         'tag-templatedata': delegate_tag_rules('templatedata', JsonLexer),
         'text-italic': text_rules(Generic.Emph),
         'text-bold': text_rules(Generic.Strong),
+        'text-bold-italic': text_rules(Generic.EmphStrong),
         'text': text_rules(Text),
     }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/minecraft.py pygments-2.17.2+dfsg/pygments/lexers/minecraft.py
--- pygments-2.15.1+dfsg/pygments/lexers/minecraft.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/minecraft.py	2020-02-02 00:00:00.000000000 +0000
@@ -5,11 +5,11 @@
     Lexers for Minecraft related languages.
     
     SNBT. A data communication format used in Minecraft.
-    wiki: https://minecraft.fandom.com/wiki/NBT_format
+    wiki: https://minecraft.wiki/w/NBT_format
     
     MCFunction. The Function file for Minecraft Data packs and Add-ons.
     official: https://learn.microsoft.com/en-us/minecraft/creator/documents/functionsintroduction
-    wiki: https://minecraft.fandom.com/wiki/Function
+    wiki: https://minecraft.wiki/w/Function
     
     MCSchema. A kind of data Schema for Minecraft Add-on Development.
     official: https://learn.microsoft.com/en-us/minecraft/creator/reference/content/schemasreference/
@@ -33,7 +33,7 @@
     """
 
     name = "SNBT"
-    url = "https://minecraft.fandom.com/wiki/NBT_format"
+    url = "https://minecraft.wiki/w/NBT_format"
     aliases = ["snbt"]
     filenames = ["*.snbt"]
     mimetypes = ["text/snbt"]
@@ -107,7 +107,7 @@
     """
 
     name = "MCFunction"
-    url = "https://minecraft.fandom.com/wiki/Commands"
+    url = "https://minecraft.wiki/w/Commands"
     aliases = ["mcfunction", "mcf"]
     filenames = ["*.mcfunction"]
     mimetypes = ["text/mcfunction"]
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/ml.py pygments-2.17.2+dfsg/pygments/lexers/ml.py
--- pygments-2.15.1+dfsg/pygments/lexers/ml.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/ml.py	2020-02-02 00:00:00.000000000 +0000
@@ -366,13 +366,13 @@
     mimetypes = ['text/x-ocaml']
 
     keywords = (
-        'as', 'assert', 'begin', 'class', 'constraint', 'do', 'done',
+        'and', 'as', 'assert', 'begin', 'class', 'constraint', 'do', 'done',
         'downto', 'else', 'end', 'exception', 'external', 'false',
         'for', 'fun', 'function', 'functor', 'if', 'in', 'include',
         'inherit', 'initializer', 'lazy', 'let', 'match', 'method',
         'module', 'mutable', 'new', 'object', 'of', 'open', 'private',
         'raise', 'rec', 'sig', 'struct', 'then', 'to', 'true', 'try',
-        'type', 'value', 'val', 'virtual', 'when', 'while', 'with',
+        'type', 'val', 'virtual', 'when', 'while', 'with',
     )
     keyopts = (
         '!=', '#', '&', '&&', r'\(', r'\)', r'\*', r'\+', ',', '-',
@@ -382,7 +382,7 @@
     )
 
     operators = r'[!$%&*+\./:<=>?@^|~-]'
-    word_operators = ('and', 'asr', 'land', 'lor', 'lsl', 'lxor', 'mod', 'or')
+    word_operators = ('asr', 'land', 'lor', 'lsl', 'lxor', 'mod', 'or')
     prefix_syms = r'[!?~]'
     infix_syms = r'[=<>@^|&+\*/$%-]'
     primitives = ('unit', 'int', 'float', 'bool', 'string', 'char', 'list', 'array')
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/nix.py pygments-2.17.2+dfsg/pygments/lexers/nix.py
--- pygments-2.15.1+dfsg/pygments/lexers/nix.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/nix.py	2020-02-02 00:00:00.000000000 +0000
@@ -34,8 +34,8 @@
                 'else', 'then', '...']
     builtins = ['import', 'abort', 'baseNameOf', 'dirOf', 'isNull', 'builtins',
                 'map', 'removeAttrs', 'throw', 'toString', 'derivation']
-    operators = ['++', '+', '?', '.', '!', '//', '==',
-                 '!=', '&&', '||', '->', '=']
+    operators = ['++', '+', '?', '.', '!', '//', '==', '/',
+                 '!=', '&&', '||', '->', '=', '<', '>', '*', '-']
 
     punctuations = ["(", ")", "[", "]", ";", "{", "}", ":", ",", "@"]
 
@@ -59,6 +59,17 @@
 
             (r'\b(true|false|null)\b', Name.Constant),
 
+            # floats
+            (r'-?(\d+\.\d*|\.\d+)([eE][-+]?\d+)?', Number.Float),
+
+            # integers
+            (r'-?[0-9]+', Number.Integer),
+
+            # paths
+            (r'[\w.+-]*(\/[\w.+-]+)+', Literal),
+            (r'~(\/[\w.+-]+)+', Literal),
+            (r'\<[\w.+-]+(\/[\w.+-]+)*\>', Literal),
+
             # operators
             ('(%s)' % '|'.join(re.escape(entry) for entry in operators),
              Operator),
@@ -66,27 +77,23 @@
             # word operators
             (r'\b(or|and)\b', Operator.Word),
 
+            (r'\{', Punctuation, 'block'),
+
             # punctuations
             ('(%s)' % '|'.join(re.escape(entry) for entry in punctuations), Punctuation),
 
-            # integers
-            (r'[0-9]+', Number.Integer),
-
             # strings
             (r'"', String.Double, 'doublequote'),
-            (r"''", String.Single, 'singlequote'),
-
-            # paths
-            (r'[\w.+-]*(\/[\w.+-]+)+', Literal),
-            (r'\<[\w.+-]+(\/[\w.+-]+)*\>', Literal),
+            (r"''", String.Multiline, 'multiline'),
 
             # urls
             (r'[a-zA-Z][a-zA-Z0-9\+\-\.]*\:[\w%/?:@&=+$,\\.!~*\'-]+', Literal),
 
             # names of variables
-            (r'[\w-]+\s*=', String.Symbol),
+            (r'[\w-]+(?=\s*=)', String.Symbol),
             (r'[a-zA-Z_][\w\'-]*', Text),
 
+            (r"\$\{", String.Interpol, 'antiquote'),
         ],
         'comment': [
             (r'[^/*]+', Comment.Multiline),
@@ -94,24 +101,23 @@
             (r'\*/', Comment.Multiline, '#pop'),
             (r'[*/]', Comment.Multiline),
         ],
-        'singlequote': [
-            (r"'''", String.Escape),
-            (r"''\$\{", String.Escape),
-            (r"''\n", String.Escape),
-            (r"''\r", String.Escape),
-            (r"''\t", String.Escape),
-            (r"''", String.Single, '#pop'),
+        'multiline': [
+            (r"''(\$|'|\\n|\\r|\\t|\\)", String.Escape),
+            (r"''", String.Multiline, '#pop'),
             (r'\$\{', String.Interpol, 'antiquote'),
-            (r"['$]", String.Single),
-            (r"[^'$]+", String.Single),
+            (r"[^'\$]+", String.Multiline),
+            (r"\$[^\{']", String.Multiline),
+            (r"'[^']", String.Multiline),
+            (r"\$(?=')", String.Multiline),
         ],
         'doublequote': [
-            (r'\\', String.Escape),
-            (r'\\"', String.Escape),
-            (r'\\$\{', String.Escape),
+            (r'\\(\\|"|\$|n)', String.Escape),
             (r'"', String.Double, '#pop'),
             (r'\$\{', String.Interpol, 'antiquote'),
-            (r'[^"]', String.Double),
+            (r'[^"\\\$]+', String.Double),
+            (r'\$[^\{"]', String.Double),
+            (r'\$(?=")', String.Double),
+            (r'\\', String.Double),
         ],
         'antiquote': [
             (r"\}", String.Interpol, '#pop'),
@@ -119,6 +125,10 @@
             (r"\$\{", String.Interpol, '#push'),
             include('root'),
         ],
+        'block': [
+            (r"\}", Punctuation, '#pop'),
+            include('root'),
+        ],
     }
 
     def analyse_text(text):
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/openscad.py pygments-2.17.2+dfsg/pygments/lexers/openscad.py
--- pygments-2.15.1+dfsg/pygments/lexers/openscad.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/openscad.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,97 @@
+"""
+    pygments.lexers.openscad
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for the OpenSCAD languages.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, bygroups, words, include
+from pygments.token import Text, Comment, Punctuation, Operator, Keyword, Name, Number, Whitespace, Literal, String
+
+__all__ = ['OpenScadLexer']
+
+
+class OpenScadLexer(RegexLexer):
+    """For openSCAD code.
+
+    .. versionadded:: 2.16
+    """
+    name = "OpenSCAD"
+    url = "https://openscad.org/"
+    aliases = ["openscad"]
+    filenames = ["*.scad"]
+    mimetypes = ["application/x-openscad"]
+
+    tokens = {
+        "root": [
+            (r"[^\S\n]+", Whitespace),
+            (r'//', Comment.Single, 'comment-single'),
+            (r'/\*', Comment.Multiline, 'comment-multi'),
+            (r"[{}\[\]\(\),;:]", Punctuation),
+            (r"[*!#%\-+=?/]", Operator),
+            (r"<=|<|==|!=|>=|>|&&|\|\|", Operator),
+            (r"\$(f[asn]|t|vp[rtd]|children)", Operator),
+            (r"(undef|PI)\b", Keyword.Constant),
+            (
+                r"(use|include)((?:\s|\\\\s)+)",
+                bygroups(Keyword.Namespace, Text),
+                "includes",
+            ),
+            (r"(module)(\s*)([^\s\(]+)",
+             bygroups(Keyword.Namespace, Whitespace, Name.Namespace)),
+            (r"(function)(\s*)([^\s\(]+)",
+             bygroups(Keyword.Declaration, Whitespace, Name.Function)),
+            (words(("true", "false"), prefix=r"\b", suffix=r"\b"), Literal),
+            (words((
+                "function", "module", "include", "use", "for",
+                "intersection_for", "if", "else", "return"
+                ), prefix=r"\b", suffix=r"\b"), Keyword
+            ),
+            (words((
+                "circle", "square", "polygon", "text", "sphere", "cube",
+                "cylinder", "polyhedron", "translate", "rotate", "scale",
+                "resize", "mirror", "multmatrix", "color", "offset", "hull",
+                "minkowski", "union", "difference", "intersection", "abs",
+                "sign", "sin", "cos", "tan", "acos", "asin", "atan", "atan2",
+                "floor", "round", "ceil", "ln", "log", "pow", "sqrt", "exp",
+                "rands", "min", "max", "concat", "lookup", "str", "chr",
+                "search", "version", "version_num", "norm", "cross",
+                "parent_module", "echo", "import", "import_dxf",
+                "dxf_linear_extrude", "linear_extrude", "rotate_extrude",
+                "surface", "projection", "render", "dxf_cross",
+                "dxf_dim", "let", "assign", "len"
+                ), prefix=r"\b", suffix=r"\b"),
+                Name.Builtin
+            ),
+            (r"\bchildren\b", Name.Builtin.Pseudo),
+            (r'""".*?"""', String.Double),
+            (r'"(\\\\|\\[^\\]|[^"\\])*"', String.Double),
+            (r"-?\d+(\.\d+)?(e[+-]?\d+)?", Number),
+            (r"\w+", Name),
+        ],
+        "includes": [
+            (
+                r"(<)([^>]*)(>)",
+                bygroups(Punctuation, Comment.PreprocFile, Punctuation),
+            ),
+        ],
+        'comment': [
+            (r':param: [a-zA-Z_]\w*|:returns?:|(FIXME|MARK|TODO):',
+             Comment.Special)
+        ],
+        'comment-single': [
+            (r'\n', Text, '#pop'),
+            include('comment'),
+            (r'[^\n]+', Comment.Single)
+        ],
+        'comment-multi': [
+            include('comment'),
+            (r'[^*/]+', Comment.Multiline),
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[*/]', Comment.Multiline)
+        ],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/prolog.py pygments-2.17.2+dfsg/pygments/lexers/prolog.py
--- pygments-2.15.1+dfsg/pygments/lexers/prolog.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/prolog.py	2020-02-02 00:00:00.000000000 +0000
@@ -78,7 +78,12 @@
     }
 
     def analyse_text(text):
-        return ':-' in text
+        """Competes with IDL and Visual Prolog on *.pro"""
+        if ':-' in text:
+            # Visual Prolog also uses :-
+            return 0.5
+        else:
+            return 0
 
 
 class LogtalkLexer(RegexLexer):
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/prql.py pygments-2.17.2+dfsg/pygments/lexers/prql.py
--- pygments-2.15.1+dfsg/pygments/lexers/prql.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/prql.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,252 @@
+"""
+    pygments.lexers.prql
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the PRQL query language.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, combined, words, include, bygroups
+from pygments.token import Comment, Literal, Keyword, Name, Number, Operator, \
+    Punctuation, String, Text, Whitespace
+
+__all__ = ['PrqlLexer']
+
+
+class PrqlLexer(RegexLexer):
+    """
+    For PRQL source code.
+
+    .. versionadded:: 2.17
+
+    grammar: https://github.com/PRQL/prql/tree/main/grammars
+    """
+
+    name = 'PRQL'
+    url = 'https://prql-lang.org/'
+    aliases = ['prql']
+    filenames = ['*.prql']
+    mimetypes = ['application/prql', 'application/x-prql']
+
+    builtinTypes = words((
+        "bool",
+        "int",
+        "int8", "int16", "int32", "int64", "int128",
+        "float",
+        "text",
+        "set"), suffix=r'\b')
+
+    def innerstring_rules(ttype):
+        return [
+            # the new style '{}'.format(...) string formatting
+            (r'\{'
+             r'((\w+)((\.\w+)|(\[[^\]]+\]))*)?'  # field name
+             r'(\:(.?[<>=\^])?[-+ ]?#?0?(\d+)?,?(\.\d+)?[E-GXb-gnosx%]?)?'
+             r'\}', String.Interpol),
+
+            (r'[^\\\'"%{\n]+', ttype),
+            (r'[\'"\\]', ttype),
+            (r'%|(\{{1,2})', ttype)
+        ]
+
+    def fstring_rules(ttype):
+        return [
+            (r'\}', String.Interpol),
+            (r'\{', String.Interpol, 'expr-inside-fstring'),
+            (r'[^\\\'"{}\n]+', ttype),
+            (r'[\'"\\]', ttype),
+        ]
+
+    tokens = {
+        'root': [
+
+            # Comments
+            (r'#!.*', String.Doc),
+            (r'#.*', Comment.Single),
+
+            # Whitespace
+            (r'\s+', Whitespace),
+
+            # Modules
+            (r'^(\s*)(module)(\s*)',
+             bygroups(Whitespace, Keyword.Namespace, Whitespace),
+             'imports'),
+
+            (builtinTypes, Keyword.Type),
+
+            # Main
+            (r'^prql ', Keyword.Reserved),
+
+            ('let', Keyword.Declaration),
+
+            include('keywords'),
+            include('expr'),
+
+            # Transforms
+            (r'^[A-Za-z_][a-zA-Z0-9_]*', Keyword),
+        ],
+        'expr': [
+            # non-raw f-strings
+            ('(f)(""")', bygroups(String.Affix, String.Double),
+             combined('fstringescape', 'tdqf')),
+            ("(f)(''')", bygroups(String.Affix, String.Single),
+             combined('fstringescape', 'tsqf')),
+            ('(f)(")', bygroups(String.Affix, String.Double),
+             combined('fstringescape', 'dqf')),
+            ("(f)(')", bygroups(String.Affix, String.Single),
+             combined('fstringescape', 'sqf')),
+
+            # non-raw s-strings
+            ('(s)(""")', bygroups(String.Affix, String.Double),
+             combined('stringescape', 'tdqf')),
+            ("(s)(''')", bygroups(String.Affix, String.Single),
+             combined('stringescape', 'tsqf')),
+            ('(s)(")', bygroups(String.Affix, String.Double),
+             combined('stringescape', 'dqf')),
+            ("(s)(')", bygroups(String.Affix, String.Single),
+             combined('stringescape', 'sqf')),
+
+            # raw strings
+            ('(?i)(r)(""")',
+             bygroups(String.Affix, String.Double), 'tdqs'),
+            ("(?i)(r)(''')",
+             bygroups(String.Affix, String.Single), 'tsqs'),
+            ('(?i)(r)(")',
+             bygroups(String.Affix, String.Double), 'dqs'),
+            ("(?i)(r)(')",
+             bygroups(String.Affix, String.Single), 'sqs'),
+
+            # non-raw strings
+            ('"""', String.Double, combined('stringescape', 'tdqs')),
+            ("'''", String.Single, combined('stringescape', 'tsqs')),
+            ('"', String.Double, combined('stringescape', 'dqs')),
+            ("'", String.Single, combined('stringescape', 'sqs')),
+
+            # Time and dates
+            (r'@\d{4}-\d{2}-\d{2}T\d{2}(:\d{2})?(:\d{2})?(\.\d{1,6})?(Z|[+-]\d{1,2}(:\d{1,2})?)?', Literal.Date),
+            (r'@\d{4}-\d{2}-\d{2}', Literal.Date),
+            (r'@\d{2}(:\d{2})?(:\d{2})?(\.\d{1,6})?(Z|[+-]\d{1,2}(:\d{1,2})?)?', Literal.Date),
+
+            (r'[^\S\n]+', Text),
+            include('numbers'),
+            (r'->|=>|==|!=|>=|<=|~=|&&|\|\||\?\?|\/\/', Operator),
+            (r'[-~+/*%=<>&^|.@]', Operator),
+            (r'[]{}:(),;[]', Punctuation),
+            include('functions'),
+
+            # Variable Names
+            (r'[A-Za-z_][a-zA-Z0-9_]*', Name.Variable),
+        ],
+        'numbers': [
+            (r'(\d(?:_?\d)*\.(?:\d(?:_?\d)*)?|(?:\d(?:_?\d)*)?\.\d(?:_?\d)*)'
+             r'([eE][+-]?\d(?:_?\d)*)?', Number.Float),
+            (r'\d(?:_?\d)*[eE][+-]?\d(?:_?\d)*j?', Number.Float),
+            (r'0[oO](?:_?[0-7])+', Number.Oct),
+            (r'0[bB](?:_?[01])+', Number.Bin),
+            (r'0[xX](?:_?[a-fA-F0-9])+', Number.Hex),
+            (r'\d(?:_?\d)*', Number.Integer),
+        ],
+        'fstringescape': [
+            include('stringescape'),
+        ],
+        'bytesescape': [
+            (r'\\([\\bfnrt"\']|\n|x[a-fA-F0-9]{2}|[0-7]{1,3})', String.Escape)
+        ],
+        'stringescape': [
+            (r'\\(N\{.*?\}|u\{[a-fA-F0-9]{1,6}\})', String.Escape),
+            include('bytesescape')
+        ],
+        'fstrings-single': fstring_rules(String.Single),
+        'fstrings-double': fstring_rules(String.Double),
+        'strings-single': innerstring_rules(String.Single),
+        'strings-double': innerstring_rules(String.Double),
+        'dqf': [
+            (r'"', String.Double, '#pop'),
+            (r'\\\\|\\"|\\\n', String.Escape),  # included here for raw strings
+            include('fstrings-double')
+        ],
+        'sqf': [
+            (r"'", String.Single, '#pop'),
+            (r"\\\\|\\'|\\\n", String.Escape),  # included here for raw strings
+            include('fstrings-single')
+        ],
+        'dqs': [
+            (r'"', String.Double, '#pop'),
+            (r'\\\\|\\"|\\\n', String.Escape),  # included here for raw strings
+            include('strings-double')
+        ],
+        'sqs': [
+            (r"'", String.Single, '#pop'),
+            (r"\\\\|\\'|\\\n", String.Escape),  # included here for raw strings
+            include('strings-single')
+        ],
+        'tdqf': [
+            (r'"""', String.Double, '#pop'),
+            include('fstrings-double'),
+            (r'\n', String.Double)
+        ],
+        'tsqf': [
+            (r"'''", String.Single, '#pop'),
+            include('fstrings-single'),
+            (r'\n', String.Single)
+        ],
+        'tdqs': [
+            (r'"""', String.Double, '#pop'),
+            include('strings-double'),
+            (r'\n', String.Double)
+        ],
+        'tsqs': [
+            (r"'''", String.Single, '#pop'),
+            include('strings-single'),
+            (r'\n', String.Single)
+        ],
+
+        'expr-inside-fstring': [
+            (r'[{([]', Punctuation, 'expr-inside-fstring-inner'),
+            # without format specifier
+            (r'(=\s*)?'         # debug (https://bugs.python.org/issue36817)
+             r'\}', String.Interpol, '#pop'),
+            # with format specifier
+            # we'll catch the remaining '}' in the outer scope
+            (r'(=\s*)?'         # debug (https://bugs.python.org/issue36817)
+             r':', String.Interpol, '#pop'),
+            (r'\s+', Whitespace),  # allow new lines
+            include('expr'),
+        ],
+        'expr-inside-fstring-inner': [
+            (r'[{([]', Punctuation, 'expr-inside-fstring-inner'),
+            (r'[])}]', Punctuation, '#pop'),
+            (r'\s+', Whitespace),  # allow new lines
+            include('expr'),
+        ],
+        'keywords': [
+            (words((
+                'into', 'case', 'type', 'module', 'internal',
+            ), suffix=r'\b'),
+                Keyword),
+            (words(('true', 'false', 'null'), suffix=r'\b'), Keyword.Constant),
+        ],
+        'functions': [
+            (words((
+                "min", "max", "sum", "average", "stddev", "every", "any",
+                "concat_array", "count", "lag", "lead", "first", "last",
+                "rank", "rank_dense", "row_number", "round", "as", "in",
+                "tuple_every", "tuple_map", "tuple_zip", "_eq", "_is_null",
+                "from_text", "lower", "upper", "read_parquet", "read_csv"),
+                suffix=r'\b'),
+             Name.Function),
+        ],
+
+        'comment': [
+            (r'-(?!\})', Comment.Multiline),
+            (r'\{-', Comment.Multiline, 'comment'),
+            (r'[^-}]', Comment.Multiline),
+            (r'-\}', Comment.Multiline, '#pop'),
+        ],
+
+        'imports': [
+            (r'\w+(\.\w+)*', Name.Class, '#pop'),
+        ],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/ptx.py pygments-2.17.2+dfsg/pygments/lexers/ptx.py
--- pygments-2.15.1+dfsg/pygments/lexers/ptx.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/ptx.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,120 @@
+"""
+    pygments.lexers.ptx
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexer for other PTX language.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include, words
+from pygments.token import Comment, Keyword, Name, String, Number, \
+    Punctuation, Whitespace, Operator
+
+__all__ = ["PtxLexer"]
+
+
+class PtxLexer(RegexLexer):
+    """
+    For NVIDIA `PTX <https://docs.nvidia.com/cuda/parallel-thread-execution/>`_
+    source.
+
+    .. versionadded:: 2.16
+    """
+    name = 'PTX'
+    url = "https://docs.nvidia.com/cuda/parallel-thread-execution/"
+    filenames = ['*.ptx']
+    aliases = ['ptx']
+    mimetypes = ['text/x-ptx']
+
+    #: optional Comment or Whitespace
+    string = r'"[^"]*?"'
+    followsym = r'[a-zA-Z0-9_$]'
+    identifier = r'([-a-zA-Z$._][\w\-$.]*|' + string + ')'
+    block_label = r'(' + identifier + r'|(\d+))'
+
+    tokens = {
+        'root': [
+            include('whitespace'),
+
+            (block_label + r'\s*:', Name.Label),
+
+            include('keyword'),
+
+            (r'%' + identifier, Name.Variable),
+            (r'%\d+', Name.Variable.Anonymous),
+            (r'c?' + string, String),
+            (identifier, Name.Variable),
+            (r';', Punctuation),
+            (r'[*+-/]', Operator),
+
+            (r'0[xX][a-fA-F0-9]+', Number),
+            (r'-?\d+(?:[.]\d+)?(?:[eE][-+]?\d+(?:[.]\d+)?)?', Number),
+
+            (r'[=<>{}\[\]()*.,!]|x\b', Punctuation)
+
+        ],
+        'whitespace': [
+            (r'(\n|\s+)+', Whitespace),
+            (r'//.*?\n', Comment)
+        ],
+
+        'keyword': [
+            # Instruction keywords
+            (words((
+                'abs', 'discard', 'min', 'shf', 'vadd',
+                'activemask', 'div', 'mma', 'shfl', 'vadd2',
+                'add', 'dp2a', 'mov', 'shl', 'vadd4',
+                'addc', 'dp4a', 'movmatrix', 'shr', 'vavrg2',
+                'alloca', 'elect', 'mul', 'sin', 'vavrg4',
+                'and', 'ex2', 'mul24', 'slct', 'vmad',
+                'applypriority', 'exit', 'multimem', 'sqrt', 'vmax',
+                'atom', 'fence', 'nanosleep', 'st', 'vmax2',
+                'bar', 'fma', 'neg', 'stackrestore', 'vmax4',
+                'barrier', 'fns', 'not', 'stacksave', 'vmin',
+                'bfe', 'getctarank', 'or', 'stmatrix', 'vmin2',
+                'bfi', 'griddepcontrol', 'pmevent', 'sub', 'vmin4',
+                'bfind', 'isspacep', 'popc', 'subc', 'vote',
+                'bmsk', 'istypep', 'prefetch', 'suld', 'vset',
+                'bra', 'ld', 'prefetchu', 'suq', 'vset2',
+                'brev', 'ldmatrix', 'prmt', 'sured', 'vset4',
+                'brkpt', 'ldu', 'rcp', 'sust', 'vshl',
+                'brx', 'lg2', 'red', 'szext', 'vshr',
+                'call', 'lop3', 'redux', 'tanh', 'vsub',
+                'clz', 'mad', 'rem', 'testp', 'vsub2',
+                'cnot', 'mad24', 'ret', 'tex', 'vsub4',
+                'copysign', 'madc', 'rsqrt', 'tld4', 'wgmma',
+                'cos', 'mapa', 'sad', 'trap', 'wmma',
+                'cp', 'match', 'selp', 'txq', 'xor',
+                'createpolicy', 'max', 'set', 'vabsdiff', 'cvt',
+                'mbarrier', 'setmaxnreg', 'vabsdiff2', 'cvta',
+                'membar', 'setp', 'vabsdiff4')), Keyword),
+            # State Spaces and Suffixes
+            (words((
+                'reg', '.sreg', '.const', '.global',
+                '.local', '.param', '.shared', '.tex',
+                '.wide', '.loc'
+            )), Keyword.Pseudo),
+            # PTX Directives
+            (words((
+                '.address_size', '.explicitcluster', '.maxnreg', '.section',
+                '.alias', '.extern', '.maxntid', '.shared',
+                '.align', '.file', '.minnctapersm', '.sreg',
+                '.branchtargets', '.func', '.noreturn', '.target',
+                '.callprototype', '.global', '.param', '.tex',
+                '.calltargets', '.loc', '.pragma', '.version',
+                '.common', '.local', '.reg', '.visible',
+                '.const', '.maxclusterrank', '.reqnctapercluster', '.weak',
+                '.entry', '.maxnctapersm', '.reqntid')), Keyword.Reserved),
+            # Fundamental Types
+            (words((
+                '.s8', '.s16', '.s32', '.s64',
+                '.u8', '.u16', '.u32', '.u64',
+                '.f16', '.f16x2', '.f32', '.f64',
+                '.b8', '.b16', '.b32', '.b64',
+                '.pred'
+            )), Keyword.Type)
+        ],
+
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/python.py pygments-2.17.2+dfsg/pygments/lexers/python.py
--- pygments-2.15.1+dfsg/pygments/lexers/python.py	2023-04-15 11:31:49.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/python.py	2020-02-02 00:00:00.000000000 +0000
@@ -35,8 +35,8 @@
     """
 
     name = 'Python'
-    url = 'http://www.python.org'
-    aliases = ['python', 'py', 'sage', 'python3', 'py3']
+    url = 'https://www.python.org'
+    aliases = ['python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark']
     filenames = [
         '*.py',
         '*.pyw',
@@ -425,7 +425,7 @@
     """
 
     name = 'Python 2.x'
-    url = 'http://www.python.org'
+    url = 'https://www.python.org'
     aliases = ['python2', 'py2']
     filenames = []  # now taken over by PythonLexer (3.x)
     mimetypes = ['text/x-python2', 'application/x-python2']
@@ -830,7 +830,7 @@
     """
 
     name = 'Cython'
-    url = 'http://cython.org'
+    url = 'https://cython.org'
     aliases = ['cython', 'pyx', 'pyrex']
     filenames = ['*.pyx', '*.pxd', '*.pxi']
     mimetypes = ['text/x-cython', 'application/x-cython']
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/rdf.py pygments-2.17.2+dfsg/pygments/lexers/rdf.py
--- pygments-2.15.1+dfsg/pygments/lexers/rdf.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/rdf.py	2020-02-02 00:00:00.000000000 +0000
@@ -260,6 +260,10 @@
             (r'(' + PN_PREFIX + r')?(\:)(' + PN_LOCAL + r')?',
              bygroups(Name.Namespace, Punctuation, Name.Tag)),
 
+            # BlankNodeLabel
+            (r'(_)(:)([' + PN_CHARS_U_GRP + r'0-9]([' + PN_CHARS_GRP + r'.]*' + PN_CHARS + ')?)',
+             bygroups(Name.Namespace, Punctuation, Name.Tag)),
+
             # Comment
             (r'#[^\n]+', Comment),
 
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/ruby.py pygments-2.17.2+dfsg/pygments/lexers/ruby.py
--- pygments-2.15.1+dfsg/pygments/lexers/ruby.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/ruby.py	2020-02-02 00:00:00.000000000 +0000
@@ -394,19 +394,12 @@
 
 class RubyConsoleLexer(Lexer):
     """
-    For Ruby interactive console (**irb**) output like:
-
-    .. sourcecode:: rbcon
-
-        irb(main):001:0> a = 1
-        => 1
-        irb(main):002:0> puts a
-        1
-        => nil
+    For Ruby interactive console (**irb**) output.
     """
     name = 'Ruby irb session'
     aliases = ['rbcon', 'irb']
     mimetypes = ['text/x-ruby-shellsession']
+    _example = 'rbcon/console'
 
     _prompt_re = re.compile(r'irb\([a-zA-Z_]\w*\):\d{3}:\d+[>*"\'] '
                             r'|>> |\?> ')
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/scdoc.py pygments-2.17.2+dfsg/pygments/lexers/scdoc.py
--- pygments-2.15.1+dfsg/pygments/lexers/scdoc.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/scdoc.py	2020-02-02 00:00:00.000000000 +0000
@@ -66,14 +66,21 @@
     }
 
     def analyse_text(text):
-        """This is very similar to markdown, save for the escape characters
-        needed for * and _."""
+        """We checks for bold and underline text with * and _. Also
+        every scdoc file must start with a strictly defined first line."""
         result = 0
 
-        if '\\*' in text:
+        if '*' in text:
             result += 0.01
 
-        if '\\_' in text:
+        if '_' in text:
             result += 0.01
 
+        # name(section) ["left_footer" ["center_header"]]
+        first_line = text.partition('\n')[0]
+        scdoc_preamble_pattern = r'^.*\([1-7]\)( "[^"]+"){0,2}$'
+
+        if re.search(scdoc_preamble_pattern, first_line):
+            result += 0.5
+
         return result
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/spice.py pygments-2.17.2+dfsg/pygments/lexers/spice.py
--- pygments-2.15.1+dfsg/pygments/lexers/spice.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/spice.py	2020-02-02 00:00:00.000000000 +0000
@@ -40,8 +40,7 @@
             (r'(import|as)\b', Keyword.Namespace),
             (r'(f|p|type|struct|interface|enum|alias|operator)\b', Keyword.Declaration),
             (words(('if', 'else', 'for', 'foreach', 'do', 'while', 'break',
-                    'continue', 'return', 'assert', 'thread', 'unsafe', 'ext',
-                    'dll'), suffix=r'\b'), Keyword),
+                    'continue', 'return', 'assert', 'unsafe', 'ext'), suffix=r'\b'), Keyword),
             (words(('const', 'signed', 'unsigned', 'inline', 'public', 'heap'),
                    suffix=r'\b'), Keyword.Pseudo),
             (words(('new', 'switch', 'case', 'yield', 'stash', 'pick', 'sync',
@@ -49,21 +48,21 @@
             (r'(true|false|nil)\b', Keyword.Constant),
             (words(('double', 'int', 'short', 'long', 'byte', 'char', 'string',
                     'bool', 'dyn'), suffix=r'\b'), Keyword.Type),
-            (words(('printf', 'sizeof', 'len', 'tid', 'join'), suffix=r'\b(\()'),
+            (words(('printf', 'sizeof', 'alignof', 'len', 'panic'), suffix=r'\b(\()'),
              bygroups(Name.Builtin, Punctuation)),
             # numeric literals
-            (r'[0-9]*[.][0-9]+', Number.Double),
-            (r'0[bB][01]+[sl]?', Number.Bin),
-            (r'0[oO][0-7]+[sl]?', Number.Oct),
-            (r'0[xXhH][0-9a-fA-F]+[sl]?', Number.Hex),
-            (r'(0[dD])?[0-9]+[sl]?', Number.Integer),
+            (r'[-]?[0-9]*[.][0-9]+([eE][+-]?[0-9]+)?', Number.Double),
+            (r'0[bB][01]+[slu]?', Number.Bin),
+            (r'0[oO][0-7]+[slu]?', Number.Oct),
+            (r'0[xXhH][0-9a-fA-F]+[slu]?', Number.Hex),
+            (r'(0[dD])?[0-9]+[slu]?', Number.Integer),
             # string literal
             (r'"(\\\\|\\[^\\]|[^"\\])*"', String),
             # char literal
             (r'\'(\\\\|\\[^\\]|[^\'\\])\'', String.Char),
             # tokens
             (r'<<=|>>=|<<|>>|<=|>=|\+=|-=|\*=|/=|\%=|\|=|&=|\^=|&&|\|\||&|\||'
-             r'\+\+|--|\%|\^|\~|==|!=|::|[.]{3}|[+\-*/&]', Operator),
+             r'\+\+|--|\%|\^|\~|==|!=|->|::|[.]{3}|#!|#|[+\-*/&]', Operator),
             (r'[|<>=!()\[\]{}.,;:\?]', Punctuation),
             # identifiers
             (r'[^\W\d]\w*', Name.Other),
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/sql.py pygments-2.17.2+dfsg/pygments/lexers/sql.py
--- pygments-2.15.1+dfsg/pygments/lexers/sql.py	2023-04-10 12:41:06.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/sql.py	2020-02-02 00:00:00.000000000 +0000
@@ -431,7 +431,7 @@
                     'Planning Time', 'Execution time', 'Execution Time',
                     'Workers Planned', 'Workers Launched', 'Buffers',
                     'Planning', 'Worker', 'Query Identifier', 'Time',
-                    'Full-sort Groups'), suffix=r'\b'), Comment.Preproc),
+                    'Full-sort Groups', 'Pre-sorted Groups'), suffix=r'\b'), Comment.Preproc),
 
             # Emphasize these keywords
 
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/tal.py pygments-2.17.2+dfsg/pygments/lexers/tal.py
--- pygments-2.15.1+dfsg/pygments/lexers/tal.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/tal.py	2020-02-02 00:00:00.000000000 +0000
@@ -54,19 +54,22 @@
             (r'[][{}](?!\S)', Punctuation), # delimiters
             (r'#([0-9a-f]{2}){1,2}(?!\S)', Number.Hex), # integer
             (r'"\S+', String), # raw string
-            (r"'\S(?!\S)", String.Char), # raw char
             (r'([0-9a-f]{2}){1,2}(?!\S)', Literal), # raw integer
             (r'[|$][0-9a-f]{1,4}(?!\S)', Keyword.Declaration), # abs/rel pad
             (r'%\S+', Name.Decorator), # macro
             (r'@\S+', Name.Function), # label
             (r'&\S+', Name.Label), # sublabel
             (r'/\S+', Name.Tag), # spacer
-            (r'\.\S+', Name.Variable.Magic), # zero page addr
-            (r',\S+', Name.Variable.Instance), # rel addr
-            (r';\S+', Name.Variable.Global), # abs addr
-            (r':\S+', Literal), # raw addr
+            (r'\.\S+', Name.Variable.Magic), # literal zero page addr
+            (r',\S+', Name.Variable.Instance), # literal rel addr
+            (r';\S+', Name.Variable.Global), # literal abs addr
+            (r'-\S+', Literal), # raw zero page addr
+            (r'_\S+', Literal), # raw relative addr
+            (r'=\S+', Literal), # raw absolute addr
+            (r'!\S+', Name.Function), # immediate jump
+            (r'\?\S+', Name.Function), # conditional immediate jump
             (r'~\S+', Keyword.Namespace), # include
-            (r'\S+', Name),
+            (r'\S+', Name.Function), # macro invocation, immediate subroutine
         ]
     }
 
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/textfmts.py pygments-2.17.2+dfsg/pygments/lexers/textfmts.py
--- pygments-2.15.1+dfsg/pygments/lexers/textfmts.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/textfmts.py	2020-02-02 00:00:00.000000000 +0000
@@ -173,7 +173,7 @@
 
     tokens = {
         'root': [
-            (r'(GET|POST|PUT|DELETE|HEAD|OPTIONS|TRACE|PATCH|CONNECT)( +)([^ ]+)( +)'
+            (r'([a-zA-Z][-_a-zA-Z]+)( +)([^ ]+)( +)'
              r'(HTTP)(/)(1\.[01]|2(?:\.0)?|3)(\r?\n|\Z)',
              bygroups(Name.Function, Text, Name.Namespace, Text,
                       Keyword.Reserved, Operator, Number, Text),
@@ -184,7 +184,7 @@
              'headers'),
         ],
         'headers': [
-            (r'([^\s:]+)( *)(:)( *)([^\r\n]+)(\r?\n|\Z)', header_callback),
+            (r'([^\s:]+)( *)(:)( *)([^\r\n]*)(\r?\n|\Z)', header_callback),
             (r'([\t ]+)([^\r\n]+)(\r?\n|\Z)', continuous_header_callback),
             (r'\r?\n', Text, 'content')
         ],
@@ -194,8 +194,13 @@
     }
 
     def analyse_text(text):
-        return text.startswith(('GET /', 'POST /', 'PUT /', 'DELETE /', 'HEAD /',
-                                'OPTIONS /', 'TRACE /', 'PATCH /', 'CONNECT '))
+        return any (
+            re.search(pattern, text) is not None
+            for pattern in (
+                r'^([a-zA-Z][-_a-zA-Z]+)( +)([^ ]+)( +)(HTTP)(/)(1\.[01]|2(?:\.0)?|3)(\r?\n|\Z)',
+                r'^(HTTP)(/)(1\.[01]|2(?:\.0)?|3)( +)(\d{3})(?:( +)([^\r\n]*))?(\r?\n|\Z)',
+            )
+        )
 
 
 class TodotxtLexer(RegexLexer):
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/theorem.py pygments-2.17.2+dfsg/pygments/lexers/theorem.py
--- pygments-2.15.1+dfsg/pygments/lexers/theorem.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/theorem.py	2020-02-02 00:00:00.000000000 +0000
@@ -4,15 +4,20 @@
 
     Lexers for theorem-proving languages.
 
+    See also :mod:`pygments.lexers.lean`
+
     :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from pygments.lexer import RegexLexer, default, words
+import re
+
+from pygments.lexer import RegexLexer, default, words, include
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Whitespace
+from pygments.lexers.lean import LeanLexer
 
-__all__ = ['CoqLexer', 'IsabelleLexer', 'LeanLexer']
+__all__ = ['CoqLexer', 'IsabelleLexer']
 
 
 class CoqLexer(RegexLexer):
@@ -384,101 +389,3 @@
             (r'`', String.Other, '#pop'),
         ],
     }
-
-
-class LeanLexer(RegexLexer):
-    """
-    For the Lean theorem prover.
-
-    .. versionadded:: 2.0
-    """
-    name = 'Lean'
-    url = 'https://github.com/leanprover/lean'
-    aliases = ['lean']
-    filenames = ['*.lean']
-    mimetypes = ['text/x-lean']
-
-    tokens = {
-        'root': [
-            (r'\s+', Text),
-            (r'/--', String.Doc, 'docstring'),
-            (r'/-', Comment, 'comment'),
-            (r'--.*?$', Comment.Single),
-            (words((
-                'import', 'renaming', 'hiding',
-                'namespace',
-                'local',
-                'private', 'protected', 'section',
-                'include', 'omit', 'section',
-                'protected', 'export',
-                'open',
-                'attribute',
-            ), prefix=r'\b', suffix=r'\b'), Keyword.Namespace),
-            (words((
-                'lemma', 'theorem', 'def', 'definition', 'example',
-                'axiom', 'axioms', 'constant', 'constants',
-                'universe', 'universes',
-                'inductive', 'coinductive', 'structure', 'extends',
-                'class', 'instance',
-                'abbreviation',
-
-                'noncomputable theory',
-
-                'noncomputable', 'mutual', 'meta',
-
-                'attribute',
-
-                'parameter', 'parameters',
-                'variable', 'variables',
-
-                'reserve', 'precedence',
-                'postfix', 'prefix', 'notation', 'infix', 'infixl', 'infixr',
-
-                'begin', 'by', 'end',
-
-                'set_option',
-                'run_cmd',
-            ), prefix=r'\b', suffix=r'\b'), Keyword.Declaration),
-            (r'@\[[^\]]*\]', Keyword.Declaration),
-            (words((
-                'forall', 'fun', 'Pi', 'from', 'have', 'show', 'assume', 'suffices',
-                'let', 'if', 'else', 'then', 'in', 'with', 'calc', 'match',
-                'do'
-            ), prefix=r'\b', suffix=r'\b'), Keyword),
-            (words(('sorry', 'admit'), prefix=r'\b', suffix=r'\b'), Generic.Error),
-            (words(('Sort', 'Prop', 'Type'), prefix=r'\b', suffix=r'\b'), Keyword.Type),
-            (words((
-                '#eval', '#check', '#reduce', '#exit',
-                '#print', '#help',
-            ), suffix=r'\b'), Keyword),
-            (words((
-                '(', ')', ':', '{', '}', '[', ']', '⟨', '⟩', '‹', '›', '⦃', '⦄', ':=', ',',
-            )), Operator),
-            (r'[A-Za-z_\u03b1-\u03ba\u03bc-\u03fb\u1f00-\u1ffe\u2100-\u214f]'
-             r'[.A-Za-z_\'\u03b1-\u03ba\u03bc-\u03fb\u1f00-\u1ffe\u2070-\u2079'
-             r'\u207f-\u2089\u2090-\u209c\u2100-\u214f0-9]*', Name),
-            (r'0x[A-Za-z0-9]+', Number.Integer),
-            (r'0b[01]+', Number.Integer),
-            (r'\d+', Number.Integer),
-            (r'"', String.Double, 'string'),
-            (r"'(?:(\\[\\\"'nt])|(\\x[0-9a-fA-F]{2})|(\\u[0-9a-fA-F]{4})|.)'", String.Char),
-            (r'[~?][a-z][\w\']*:', Name.Variable),
-            (r'\S', Name.Builtin.Pseudo),
-        ],
-        'comment': [
-            (r'[^/-]', Comment.Multiline),
-            (r'/-', Comment.Multiline, '#push'),
-            (r'-/', Comment.Multiline, '#pop'),
-            (r'[/-]', Comment.Multiline)
-        ],
-        'docstring': [
-            (r'[^/-]', String.Doc),
-            (r'-/', String.Doc, '#pop'),
-            (r'[/-]', String.Doc)
-        ],
-        'string': [
-            (r'[^\\"]+', String.Double),
-            (r"(?:(\\[\\\"'nt])|(\\x[0-9a-fA-F]{2})|(\\u[0-9a-fA-F]{4}))", String.Escape),
-            ('"', String.Double, '#pop'),
-        ],
-    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/tls.py pygments-2.17.2+dfsg/pygments/lexers/tls.py
--- pygments-2.15.1+dfsg/pygments/lexers/tls.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/tls.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,55 @@
+"""
+    pygments.lexers.tls
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexers for the TLS presentation language.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+import re
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace
+
+__all__ = ['TlsLexer']
+
+
+class TlsLexer(RegexLexer):
+    """
+    The TLS presentation language, described in RFC 8446.
+
+    .. versionadded:: 2.16
+    """
+    name = 'TLS Presentation Language'
+    url = 'https://www.rfc-editor.org/rfc/rfc8446#section-3'
+    filenames = []
+    aliases = ['tls']
+    mimetypes = []
+
+    flags = re.MULTILINE | re.DOTALL
+
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+            # comments
+            (r'/[*].*?[*]/', Comment.Multiline),
+            # Keywords
+            (words(('struct', 'enum', 'select', 'case'), suffix=r'\b'),
+             Keyword),
+            (words(('uint8', 'uint16', 'uint24', 'uint32', 'uint64', 'opaque'),
+                   suffix=r'\b'), Keyword.Type),
+            # numeric literals
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+            (r'[0-9]+', Number.Integer),
+            # string literal
+            (r'"(\\.|[^"\\])*"', String),
+            # tokens
+            (r'[.]{2}', Operator),
+            (r'[+\-*/&^]', Operator),
+            (r'[|<>=!()\[\]{}.,;:\?]', Punctuation),
+            # identifiers
+            (r'[^\W\d]\w*', Name.Other),
+        ]
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/verifpal.py pygments-2.17.2+dfsg/pygments/lexers/verifpal.py
--- pygments-2.15.1+dfsg/pygments/lexers/verifpal.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/verifpal.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,66 @@
+"""
+    pygments.lexers.verifpal
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Verifpal languages.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words, bygroups, default
+from pygments.token import Comment, Keyword, Name, String, Punctuation, \
+    Whitespace
+
+__all__ = ['VerifpalLexer']
+
+
+class VerifpalLexer(RegexLexer):
+    """
+    For Verifpal code.
+
+    .. versionadded:: 2.16
+    """
+
+    name = 'Verifpal'
+    aliases = ['verifpal']
+    filenames = ['*.vp']
+    mimetypes = ['text/x-verifpal']
+    url = 'https://verifpal.com'
+
+    tokens = {
+        'root': [
+            (r'//.*$', Comment.Single),
+            (r'(principal)( +)(\w+)( *)(\[)(.*)$', bygroups(Name.Builtin, Whitespace, String, Whitespace, Punctuation, Whitespace)),
+            (r'(attacker)( *)(\[)( *)(passive|active)( *)(\])( *)$', bygroups(Name.Builtin, Whitespace, Punctuation, Whitespace, String, Whitespace, Punctuation, Whitespace)),
+            (r'(knows)( +)(private|public)( +)', bygroups(Name.Builtin, Whitespace, Keyword.Constant, Whitespace), 'shared'),
+            (r'(queries)( +)(\[)', bygroups(Name.Builtin, Whitespace, Punctuation), 'queries'),
+            (r'(\w+)( +)(->|→)( *)(\w+)( *)(\:)', bygroups(String, Whitespace, Punctuation, Whitespace, String, Whitespace, Punctuation), 'shared'),
+            (words(('generates', 'leaks'), suffix=r'\b'), Name.Builtin, 'shared'),
+            (words(( 'phase', 'precondition',), suffix=r'\b'), Name.Builtin),
+            (r'[\[\(\)\]\?:=→^,]', Punctuation),
+            (r'->', Punctuation),
+            (words(('password',), suffix=r'\b'), Keyword.Constant),
+            (words(('AEAD_DEC', 'AEAD_ENC', 'ASSERT', 'BLIND', 'CONCAT',
+                    'DEC', 'ENC', 'G', 'HASH', 'HKDF', 'MAC', 'PKE_DEC',
+                    'PKE_ENC', 'PW_HASH', 'RINGSIGN', 'RINGSIGNVERIF',
+                    'SHAMIR_JOIN', 'SHAMIR_SPLIT', 'SIGN', 'SIGNVERIF',
+                    'SPLIT', 'UNBLIND', '_', 'nil'), suffix=r'\b'),
+             Name.Function),
+            (r'\s+', Whitespace),
+            (r'\w+', Name.Variable),
+        ],
+        'shared': [
+            (r'[\^\[\],]', Punctuation),
+            (r' +', Whitespace),
+            (r'\w+', Name.Variable),
+            default('#pop')
+        ],
+        'queries': [
+            (r'\s+', Name.Variable),
+            (words(('confidentiality?', 'authentication?', 'freshness?',
+                    'unlinkability?', 'equivalence?'), suffix='( )'),
+             bygroups(Keyword.Pseudo, Whitespace), 'shared'),
+            default('#pop')
+        ]
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/vip.py pygments-2.17.2+dfsg/pygments/lexers/vip.py
--- pygments-2.15.1+dfsg/pygments/lexers/vip.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/vip.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,152 @@
+"""
+    pygments.lexers.vip
+    ~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Visual Prolog & Grammar files.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import re
+
+from pygments.lexer import RegexLexer, inherit, words, include
+from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace
+
+__all__ = ['VisualPrologLexer', 'VisualPrologGrammarLexer']
+
+
+class VisualPrologBaseLexer(RegexLexer):
+    minorendkw = ('try', 'foreach', 'if')
+    minorkwexp = ('and', 'catch', 'do', 'else', 'elseif', 'erroneous', 'externally', 'failure', 'finally', 'foreach', 'if', 'or', 'orelse', 'otherwise', 'then',
+                  'try', 'div', 'mod', 'rem', 'quot')
+    dockw = ('short', 'detail', 'end', 'withdomain')
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+            (words(minorendkw, prefix=r'\bend\s+', suffix=r'\b'), Keyword.Minor),
+            (r'end', Keyword),
+            (words(minorkwexp, suffix=r'\b'), Keyword.Minor),
+            (r'0[xo][\da-fA-F_]+', Number),
+            (r'((\d[\d_]*)?\.)?\d[\d_]*([eE][\-+]?\d+)?', Number),
+            (r'_\w*', Name.Variable.Anonymous),
+            (r'[A-Z]\w*', Name.Variable),
+            (r'@\w+', Name.Variable),
+            (r'[a-z]\w*', Name),
+            (r'/\*', Comment, 'comment'),
+            (r'\%', Comment, 'commentline'),
+            (r'"', String.Symbol, 'string'),
+            (r'\'', String.Symbol, 'stringsingle'),
+            (r'@"', String.Symbol, 'atstring'),
+            (r'[\-+*^/!?<>=~:]+', Operator),
+            (r'[$,.[\]|(){}\\]+', Punctuation),
+            (r'.', Text),
+        ],
+        'commentdoc': [
+            (words(dockw, prefix=r'@', suffix=r'\b'), Comment.Preproc),
+            (r'@', Comment),
+        ],
+        'commentline': [
+            include('commentdoc'),
+            (r'[^@\n]+', Comment),
+            (r'$', Comment, '#pop'),
+        ],
+        'comment': [
+            include('commentdoc'),
+            (r'[^@*/]+', Comment),
+            (r'/\*', Comment, '#push'),
+            (r'\*/', Comment, '#pop'),
+            (r'[*/]', Comment),
+        ],
+        'stringescape': [
+            (r'\\u[0-9a-fA-F]{4}', String.Escape),
+            (r'\\[\'"ntr\\]', String.Escape),
+        ],
+        'stringsingle': [
+            include('stringescape'),
+            (r'\'', String.Symbol, '#pop'),
+            (r'[^\'\\\n]+', String),
+            (r'\n', String.Escape.Error, '#pop'),
+        ],
+        'string': [
+            include('stringescape'),
+            (r'"', String.Symbol, '#pop'),
+            (r'[^"\\\n]+', String),
+            (r'\n', String.Escape.Error, '#pop'),
+        ],
+        'atstring': [
+            (r'""', String.Escape),
+            (r'"', String.Symbol, '#pop'),
+            (r'[^"]+', String),
+        ]
+    }
+
+
+class VisualPrologLexer(VisualPrologBaseLexer):
+    """Lexer for VisualProlog
+
+    .. versionadded:: 2.17
+    """
+    name = 'Visual Prolog'
+    url = 'https://www.visual-prolog.com/'
+    aliases = ['visualprolog']
+    filenames = ['*.pro', '*.cl', '*.i', '*.pack', '*.ph']
+
+    majorkw = ('goal', 'namespace', 'interface', 'class', 'implement', 'where', 'open', 'inherits', 'supports', 'resolve',
+               'delegate', 'monitor', 'constants', 'domains', 'predicates', 'constructors', 'properties', 'clauses', 'facts')
+    minorkw = ('align', 'anyflow', 'as', 'bitsize', 'determ', 'digits', 'erroneous', 'externally', 'failure', 'from',
+               'guard', 'multi', 'nondeterm', 'or', 'orelse', 'otherwise', 'procedure', 'resolve', 'single', 'suspending')
+    directivekw = ('bininclude', 'else', 'elseif', 'endif', 'error', 'export', 'externally', 'from', 'grammargenerate',
+                   'grammarinclude', 'if', 'include', 'message', 'options', 'orrequires', 'requires', 'stringinclude', 'then')
+    tokens = {
+        'root': [
+            (words(minorkw, suffix=r'\b'), Keyword.Minor),
+            (words(majorkw, suffix=r'\b'), Keyword),
+            (words(directivekw, prefix='#', suffix=r'\b'), Keyword.Directive),
+            inherit
+        ]
+    }
+
+    def analyse_text(text):
+        """Competes with IDL and Prolog on *.pro; div. lisps on*.cl and SwigLexer on *.i"""
+        # These are *really* good indicators (and not conflicting with the other languages)
+        # end-scope first on line e.g. 'end implement'
+        # section keyword alone on line e.g. 'clauses'
+        if re.search(r'^\s*(end\s+(interface|class|implement)|(clauses|predicates|domains|facts|constants|properties)\s*$)', text):
+            return 0.98
+        else:
+            return 0
+
+
+class VisualPrologGrammarLexer(VisualPrologBaseLexer):
+    """Lexer for VisualProlog grammar
+
+    .. versionadded:: 2.17
+    """
+
+    name = 'Visual Prolog Grammar'
+    url = 'https://www.visual-prolog.com/'
+    aliases = ['visualprologgrammar']
+    filenames = ['*.vipgrm']
+
+    majorkw = ('open', 'namespace', 'grammar', 'nonterminals',
+               'startsymbols', 'terminals', 'rules', 'precedence')
+    directivekw = ('bininclude', 'stringinclude')
+    tokens = {
+        'root': [
+            (words(majorkw, suffix=r'\b'), Keyword),
+            (words(directivekw, prefix='#', suffix=r'\b'), Keyword.Directive),
+            inherit
+        ]
+    }
+
+    def analyse_text(text):
+        """No competditors (currently)"""
+        # These are *really* good indicators
+        # end-scope first on line e.g. 'end grammar'
+        # section keyword alone on line e.g. 'rules'
+        if re.search(r'^\s*(end\s+grammar|(nonterminals|startsymbols|terminals|rules|precedence)\s*$)', text):
+            return 0.98
+        else:
+            return 0
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/vyper.py pygments-2.17.2+dfsg/pygments/lexers/vyper.py
--- pygments-2.15.1+dfsg/pygments/lexers/vyper.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/vyper.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,141 @@
+"""
+    pygments.lexers.vyper
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the Vyper Smart Contract language.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, bygroups, words
+from pygments.token import (Comment, String, Name, Keyword, Number,
+                            Operator, Punctuation, Text, Whitespace)
+
+__all__ = ['VyperLexer']
+
+
+class VyperLexer(RegexLexer):
+    """For the Vyper smart contract language.
+    
+    .. versionadded:: 2.17
+    """
+    name = 'Vyper'
+    aliases = ['vyper']
+    filenames = ['*.vy']
+    url = "https://vyper.readthedocs.io"
+
+    tokens = {
+        'root': [
+            # Whitespace
+            (r'\s+', Whitespace),
+
+            # Line continuations
+            (r'(\\)(\n|\r\n|\r)', bygroups(Text, Whitespace)),
+
+            # Comments - inline and multiline
+            (r'#.*$', Comment.Single),
+            (r'\"\"\"', Comment.Multiline, 'multiline-comment'),
+
+            # Strings - single and double
+            (r"'", String.Single, 'single-string'),
+            (r'"', String.Double, 'double-string'),
+
+            # Functions (working)
+            (r'(def)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)',
+             bygroups(Keyword, Whitespace, Name.Function)),
+
+            # Event and Struct
+            (r'(event|struct|interface|log)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)',
+             bygroups(Keyword, Whitespace, Name.Class)),
+
+            # Imports
+            (r'(from)(\s+)(vyper\.\w+)(\s+)(import)(\s+)(\w+)',
+             bygroups(Keyword, Whitespace, Name.Namespace, Whitespace,
+                      Keyword, Whitespace, Name.Class)),
+
+            # Numeric Literals
+            (r'\b0x[0-9a-fA-F]+\b', Number.Hex),
+            (r'\b(\d{1,3}(?:_\d{3})*|\d+)\b', Number.Integer),
+            (r'\b\d+\.\d*\b', Number.Float),
+
+            # Keywords
+            (words(('def', 'event', 'pass', 'return', 'for', 'while', 'if', 'elif',
+                    'else', 'assert', 'raise', 'import', 'in', 'struct', 'implements',
+                    'interface', 'from', 'indexed', 'log'),
+                   prefix=r'\b', suffix=r'\b'), Keyword),
+
+            # Visibility and State Mutability
+            (words(('public', 'private', 'view', 'pure', 'constant',
+                    'immutable', 'nonpayable'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Declaration),
+
+            # Built-in Functions
+            (words(('bitwise_and', 'bitwise_not', 'bitwise_or', 'bitwise_xor', 'shift',
+                    'create_minimal_proxy_to', 'create_copy_of', 'create_from_blueprint',
+                    'ecadd', 'ecmul', 'ecrecover', 'keccak256', 'sha256', 'concat', 'convert',
+                    'uint2str', 'extract32', 'slice', 'abs', 'ceil', 'floor', 'max', 'max_value',
+                    'min', 'min_value', 'pow_mod256', 'sqrt', 'isqrt', 'uint256_addmod',
+                    'uint256_mulmod', 'unsafe_add', 'unsafe_sub', 'unsafe_mul', 'unsafe_div',
+                    'as_wei_value', 'blockhash', 'empty', 'len', 'method_id', '_abi_encode',
+                    '_abi_decode', 'print', 'range'), prefix=r'\b', suffix=r'\b'),
+             Name.Builtin),
+
+            # Built-in Variables and Attributes
+            (words(('msg.sender', 'msg.value', 'block.timestamp', 'block.number', 'msg.gas'),
+                   prefix=r'\b', suffix=r'\b'),
+             Name.Builtin.Pseudo),
+
+            (words(('uint', 'uint8', 'uint16', 'uint32', 'uint64', 'uint128', 'uint256',
+                    'int', 'int8', 'int16', 'int32', 'int64', 'int128', 'int256', 'bool',
+                    'decimal', 'bytes', 'bytes1', 'bytes2', 'bytes3', 'bytes4', 'bytes5',
+                    'bytes6', 'bytes7', 'bytes8', 'bytes9', 'bytes10', 'bytes11',
+                    'bytes12', 'bytes13', 'bytes14', 'bytes15', 'bytes16', 'bytes17',
+                    'bytes18', 'bytes19', 'bytes20', 'bytes21', 'bytes22', 'bytes23',
+                    'bytes24', 'bytes25', 'bytes26', 'bytes27', 'bytes28', 'bytes29',
+                    'bytes30', 'bytes31', 'bytes32', 'string', 'String', 'address',
+                    'enum', 'struct'), prefix=r'\b', suffix=r'\b'),
+             Keyword.Type),
+
+            # indexed keywords
+            (r'\b(indexed)\b(\s*)(\()(\s*)(\w+)(\s*)(\))',
+             bygroups(Keyword, Whitespace, Punctuation, Whitespace,
+                      Keyword.Type, Punctuation)),
+
+            # Operators and Punctuation
+            (r'(\+|\-|\*|\/|<=?|>=?|==|!=|=|\||&|%)', Operator),
+            (r'[.,:;()\[\]{}]', Punctuation),
+
+            # Other variable names and types
+            (r'@[\w.]+', Name.Decorator),
+            (r'__\w+__', Name.Magic),  # Matches double underscores followed by word characters
+            (r'EMPTY_BYTES32', Name.Constant),
+            (r'\bERC20\b', Name.Class),
+            (r'\bself\b', Name.Attribute),
+
+            (r'Bytes\[\d+\]', Keyword.Type),
+
+            # Generic names and variables
+            (r'\b[a-zA-Z_]\w*\b:', Name.Variable),
+            (r'\b[a-zA-Z_]\w*\b', Name),
+
+        ],
+
+        'multiline-comment': [
+            (r'\"\"\"', Comment.Multiline, '#pop'),
+            (r'[^"]+', Comment.Multiline),
+            (r'\"', Comment.Multiline)
+        ],
+
+        'single-string': [
+            (r"[^\\']+", String.Single),
+            (r"'", String.Single, '#pop'),
+            (r'\\.', String.Escape),
+        ],
+
+        'double-string': [
+            (r'[^\\"]+', String.Double),
+            (r'"', String.Double, '#pop'),
+            (r'\\.', String.Escape),
+        ]
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/lexers/yara.py pygments-2.17.2+dfsg/pygments/lexers/yara.py
--- pygments-2.15.1+dfsg/pygments/lexers/yara.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/lexers/yara.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,70 @@
+"""
+    pygments.lexers.yara
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for YARA.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import Comment, String, Name, Text, Punctuation, \
+    Operator, Keyword, Whitespace, Number
+
+__all__ = ['YaraLexer']
+
+
+class YaraLexer(RegexLexer):
+    """
+    For YARA rules
+
+    .. versionadded:: 2.16
+    """
+
+    name = 'YARA'
+    url = 'https://virustotal.github.io/yara/'
+    aliases = ['yara', 'yar']
+    filenames = ['*.yar']
+    mimetypes = ['text/x-yara']
+
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+            (r'//.*?$', Comment.Single),
+            (r'\#.*?$', Comment.Single),
+            (r'/\*', Comment.Multiline, 'comment'),
+            (words(('rule', 'private', 'global', 'import', 'include'),
+                   prefix=r'\b', suffix=r'\b'),
+             Keyword.Declaration),
+            (words(('strings', 'condition', 'meta'), prefix=r'\b', suffix=r'\b'),
+             Keyword),
+            (words(('ascii', 'at', 'base64', 'base64wide', 'condition',
+                    'contains', 'endswith', 'entrypoint', 'filesize', 'for',
+                    'fullword', 'icontains', 'iendswith', 'iequals', 'in',
+                    'include', 'int16', 'int16be', 'int32', 'int32be', 'int8',
+                    'int8be', 'istartswith', 'matches', 'meta', 'nocase',
+                    'none', 'of', 'startswith', 'strings', 'them', 'uint16',
+                    'uint16be', 'uint32', 'uint32be', 'uint8', 'uint8be',
+                    'wide', 'xor', 'defined'),
+                   prefix=r'\b', suffix=r'\b'),
+             Name.Builtin),
+            (r'(true|false)\b', Keyword.Constant),
+            (r'(and|or|not|any|all)\b', Operator.Word),
+            (r'(\$\w+)', Name.Variable),
+            (r'"[^"]*"', String.Double),
+            (r'\'[^\']*\'', String.Single),
+            (r'\{.*?\}$', Number.Hex),
+            (r'(/.*?/)', String.Regex),
+            (r'[a-z_]\w*', Name),
+            (r'[$(){}[\].?+*|]', Punctuation),
+            (r'[:=,;]', Punctuation),
+            (r'.', Text)
+        ],
+        'comment': [
+            (r'[^*/]+', Comment.Multiline),
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[*/]', Comment.Multiline)
+        ]
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/sphinxext.py pygments-2.17.2+dfsg/pygments/sphinxext.py
--- pygments-2.15.1+dfsg/pygments/sphinxext.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/sphinxext.py	2020-02-02 00:00:00.000000000 +0000
@@ -147,6 +147,10 @@
 
     def document_lexers(self):
         from pygments.lexers._mapping import LEXERS
+        import pygments
+        import inspect
+        import pathlib
+
         out = []
         modules = {}
         moduledocstrings = {}
@@ -160,6 +164,24 @@
             docstring = cls.__doc__
             if isinstance(docstring, bytes):
                 docstring = docstring.decode('utf8')
+
+            example_file = getattr(cls, '_example', None)
+            if example_file:
+                p = pathlib.Path(inspect.getabsfile(pygments)).parent.parent /\
+                    'tests' / 'examplefiles' / example_file
+                content = p.read_text(encoding='utf-8')
+                if not content:
+                    raise Exception(
+                        f"Empty example file '{example_file}' for lexer "
+                        f"{classname}")
+
+                if data[2]:
+                    lexer_name = data[2][0]
+                    docstring += '\n\n    .. admonition:: Example\n'
+                    docstring += f'\n      .. code-block:: {lexer_name}\n\n'
+                    for line in content.splitlines():
+                        docstring += f'          {line}\n'
+
             modules.setdefault(module, []).append((
                 classname,
                 ', '.join(data[2]) or 'None',
diff -Nru pygments-2.15.1+dfsg/pygments/style.py pygments-2.17.2+dfsg/pygments/style.py
--- pygments-2.15.1+dfsg/pygments/style.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/style.py	2020-02-02 00:00:00.000000000 +0000
@@ -190,6 +190,12 @@
     #: Style definitions for individual token types.
     styles = {}
 
+    #: user-friendly style name (used when selecting the style, so this
+    # should be all-lowercase, no spaces, hyphens)
+    name = 'unnamed'
+
+    aliases = []
+
     # Attribute for lexers defined within Pygments. If set
     # to True, the style is not shown in the style gallery
     # on the website. This is intended for language-specific
diff -Nru pygments-2.15.1+dfsg/pygments/styles/__init__.py pygments-2.17.2+dfsg/pygments/styles/__init__.py
--- pygments-2.15.1+dfsg/pygments/styles/__init__.py	2023-04-15 11:31:49.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/__init__.py	2020-02-02 00:00:00.000000000 +0000
@@ -10,59 +10,15 @@
 
 from pygments.plugin import find_plugin_styles
 from pygments.util import ClassNotFound
+from pygments.styles._mapping import STYLES
 
 #: A dictionary of built-in styles, mapping style names to
 #: ``'submodule::classname'`` strings.
-STYLE_MAP = {
-    'default':  'default::DefaultStyle',
-    'emacs':    'emacs::EmacsStyle',
-    'friendly': 'friendly::FriendlyStyle',
-    'friendly_grayscale': 'friendly_grayscale::FriendlyGrayscaleStyle',
-    'colorful': 'colorful::ColorfulStyle',
-    'autumn':   'autumn::AutumnStyle',
-    'murphy':   'murphy::MurphyStyle',
-    'manni':    'manni::ManniStyle',
-    'material': 'material::MaterialStyle',
-    'monokai':  'monokai::MonokaiStyle',
-    'perldoc':  'perldoc::PerldocStyle',
-    'pastie':   'pastie::PastieStyle',
-    'borland':  'borland::BorlandStyle',
-    'trac':     'trac::TracStyle',
-    'native':   'native::NativeStyle',
-    'fruity':   'fruity::FruityStyle',
-    'bw':       'bw::BlackWhiteStyle',
-    'vim':      'vim::VimStyle',
-    'vs':       'vs::VisualStudioStyle',
-    'tango':    'tango::TangoStyle',
-    'rrt':      'rrt::RrtStyle',
-    'xcode':    'xcode::XcodeStyle',
-    'igor':     'igor::IgorStyle',
-    'paraiso-light': 'paraiso_light::ParaisoLightStyle',
-    'paraiso-dark': 'paraiso_dark::ParaisoDarkStyle',
-    'lovelace': 'lovelace::LovelaceStyle',
-    'algol':    'algol::AlgolStyle',
-    'algol_nu': 'algol_nu::Algol_NuStyle',
-    'arduino':  'arduino::ArduinoStyle',
-    'rainbow_dash': 'rainbow_dash::RainbowDashStyle',
-    'abap':     'abap::AbapStyle',
-    'solarized-dark': 'solarized::SolarizedDarkStyle',
-    'solarized-light': 'solarized::SolarizedLightStyle',
-    'sas':         'sas::SasStyle',
-    'staroffice' : 'staroffice::StarofficeStyle',
-    'stata':       'stata_light::StataLightStyle',
-    'stata-light': 'stata_light::StataLightStyle',
-    'stata-dark':  'stata_dark::StataDarkStyle',
-    'inkpot':      'inkpot::InkPotStyle',
-    'zenburn': 'zenburn::ZenburnStyle',
-    'gruvbox-dark': 'gruvbox::GruvboxDarkStyle',
-    'gruvbox-light': 'gruvbox::GruvboxLightStyle',
-    'dracula': 'dracula::DraculaStyle',
-    'one-dark': 'onedark::OneDarkStyle',
-    'lilypond' : 'lilypond::LilyPondStyle',
-    'nord': 'nord::NordStyle',
-    'nord-darker': 'nord::NordDarkerStyle',
-    'github-dark': 'gh_dark::GhDarkStyle'
-}
+#: This list is deprecated. Use `pygments.styles.STYLES` instead
+STYLE_MAP = {v[1]: v[0].split('.')[-1] + '::' + k for k, v in STYLES.items()}
+
+#: Internal reverse mapping to make `get_style_by_name` more efficient
+_STYLE_NAME_TO_MODULE_MAP = {v[1]: (v[0], k) for k, v in STYLES.items()}
 
 
 def get_style_by_name(name):
@@ -73,8 +29,8 @@
     Will raise :exc:`pygments.util.ClassNotFound` if no style of that name is
     found.
     """
-    if name in STYLE_MAP:
-        mod, cls = STYLE_MAP[name].split('::')
+    if name in _STYLE_NAME_TO_MODULE_MAP:
+        mod, cls = _STYLE_NAME_TO_MODULE_MAP[name]
         builtin = "yes"
     else:
         for found_name, style in find_plugin_styles():
@@ -82,14 +38,15 @@
                 return style
         # perhaps it got dropped into our styles package
         builtin = ""
-        mod = name
+        mod = 'pygments.styles.' + name
         cls = name.title() + "Style"
 
     try:
-        mod = __import__('pygments.styles.' + mod, None, None, [cls])
+        mod = __import__(mod, None, None, [cls])
     except ImportError:
         raise ClassNotFound("Could not find style module %r" % mod +
-                         (builtin and ", though it should be builtin") + ".")
+                            (builtin and ", though it should be builtin")
+                            + ".")
     try:
         return getattr(mod, cls)
     except AttributeError:
@@ -98,6 +55,7 @@
 
 def get_all_styles():
     """Return a generator for all styles by name, both builtin and plugin."""
-    yield from STYLE_MAP
+    for v in STYLES.values():
+        yield v[1]
     for name, _ in find_plugin_styles():
         yield name
diff -Nru pygments-2.15.1+dfsg/pygments/styles/_mapping.py pygments-2.17.2+dfsg/pygments/styles/_mapping.py
--- pygments-2.15.1+dfsg/pygments/styles/_mapping.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/_mapping.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,53 @@
+# Automatically generated by scripts/gen_mapfiles.py.
+# DO NOT EDIT BY HAND; run `tox -e mapfiles` instead.
+
+STYLES = {
+    'AbapStyle': ('pygments.styles.abap', 'abap', ()),
+    'AlgolStyle': ('pygments.styles.algol', 'algol', ()),
+    'Algol_NuStyle': ('pygments.styles.algol_nu', 'algol_nu', ()),
+    'ArduinoStyle': ('pygments.styles.arduino', 'arduino', ()),
+    'AutumnStyle': ('pygments.styles.autumn', 'autumn', ()),
+    'BlackWhiteStyle': ('pygments.styles.bw', 'bw', ()),
+    'BorlandStyle': ('pygments.styles.borland', 'borland', ()),
+    'ColorfulStyle': ('pygments.styles.colorful', 'colorful', ()),
+    'DefaultStyle': ('pygments.styles.default', 'default', ()),
+    'DraculaStyle': ('pygments.styles.dracula', 'dracula', ()),
+    'EmacsStyle': ('pygments.styles.emacs', 'emacs', ()),
+    'FriendlyGrayscaleStyle': ('pygments.styles.friendly_grayscale', 'friendly_grayscale', ()),
+    'FriendlyStyle': ('pygments.styles.friendly', 'friendly', ()),
+    'FruityStyle': ('pygments.styles.fruity', 'fruity', ()),
+    'GhDarkStyle': ('pygments.styles.gh_dark', 'github-dark', ()),
+    'GruvboxDarkStyle': ('pygments.styles.gruvbox', 'gruvbox-dark', ()),
+    'GruvboxLightStyle': ('pygments.styles.gruvbox', 'gruvbox-light', ()),
+    'IgorStyle': ('pygments.styles.igor', 'igor', ()),
+    'InkPotStyle': ('pygments.styles.inkpot', 'inkpot', ()),
+    'LightbulbStyle': ('pygments.styles.lightbulb', 'lightbulb', ()),
+    'LilyPondStyle': ('pygments.styles.lilypond', 'lilypond', ()),
+    'LovelaceStyle': ('pygments.styles.lovelace', 'lovelace', ()),
+    'ManniStyle': ('pygments.styles.manni', 'manni', ()),
+    'MaterialStyle': ('pygments.styles.material', 'material', ()),
+    'MonokaiStyle': ('pygments.styles.monokai', 'monokai', ()),
+    'MurphyStyle': ('pygments.styles.murphy', 'murphy', ()),
+    'NativeStyle': ('pygments.styles.native', 'native', ()),
+    'NordDarkerStyle': ('pygments.styles.nord', 'nord-darker', ()),
+    'NordStyle': ('pygments.styles.nord', 'nord', ()),
+    'OneDarkStyle': ('pygments.styles.onedark', 'one-dark', ()),
+    'ParaisoDarkStyle': ('pygments.styles.paraiso_dark', 'paraiso-dark', ()),
+    'ParaisoLightStyle': ('pygments.styles.paraiso_light', 'paraiso-light', ()),
+    'PastieStyle': ('pygments.styles.pastie', 'pastie', ()),
+    'PerldocStyle': ('pygments.styles.perldoc', 'perldoc', ()),
+    'RainbowDashStyle': ('pygments.styles.rainbow_dash', 'rainbow_dash', ()),
+    'RrtStyle': ('pygments.styles.rrt', 'rrt', ()),
+    'SasStyle': ('pygments.styles.sas', 'sas', ()),
+    'SolarizedDarkStyle': ('pygments.styles.solarized', 'solarized-dark', ()),
+    'SolarizedLightStyle': ('pygments.styles.solarized', 'solarized-light', ()),
+    'StarofficeStyle': ('pygments.styles.staroffice', 'staroffice', ()),
+    'StataDarkStyle': ('pygments.styles.stata_dark', 'stata-dark', ()),
+    'StataLightStyle': ('pygments.styles.stata_light', 'stata-light', ()),
+    'TangoStyle': ('pygments.styles.tango', 'tango', ()),
+    'TracStyle': ('pygments.styles.trac', 'trac', ()),
+    'VimStyle': ('pygments.styles.vim', 'vim', ()),
+    'VisualStudioStyle': ('pygments.styles.vs', 'vs', ()),
+    'XcodeStyle': ('pygments.styles.xcode', 'xcode', ()),
+    'ZenburnStyle': ('pygments.styles.zenburn', 'zenburn', ()),
+}
diff -Nru pygments-2.15.1+dfsg/pygments/styles/abap.py pygments-2.17.2+dfsg/pygments/styles/abap.py
--- pygments-2.15.1+dfsg/pygments/styles/abap.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/abap.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,7 +13,11 @@
     Number, Operator
 
 
+__all__ = ['AbapStyle']
+
+
 class AbapStyle(Style):
+    name = 'abap'
 
     styles = {
         Comment:                'italic #888',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/algol.py pygments-2.17.2+dfsg/pygments/styles/algol.py
--- pygments-2.15.1+dfsg/pygments/styles/algol.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/algol.py	2020-02-02 00:00:00.000000000 +0000
@@ -33,7 +33,11 @@
 from pygments.token import Keyword, Name, Comment, String, Error, Operator
 
 
+__all__ = ['AlgolStyle']
+
+
 class AlgolStyle(Style):
+    name = 'algol'
 
     background_color = "#ffffff"
 
diff -Nru pygments-2.15.1+dfsg/pygments/styles/algol_nu.py pygments-2.17.2+dfsg/pygments/styles/algol_nu.py
--- pygments-2.15.1+dfsg/pygments/styles/algol_nu.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/algol_nu.py	2020-02-02 00:00:00.000000000 +0000
@@ -33,7 +33,11 @@
 from pygments.token import Keyword, Name, Comment, String, Error, Operator
 
 
+__all__ = ['Algol_NuStyle']
+
+
 class Algol_NuStyle(Style):
+    name = 'algol_nu'
 
     background_color = "#ffffff"
 
diff -Nru pygments-2.15.1+dfsg/pygments/styles/arduino.py pygments-2.17.2+dfsg/pygments/styles/arduino.py
--- pygments-2.15.1+dfsg/pygments/styles/arduino.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/arduino.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,84 +13,88 @@
     Number, Operator, Generic, Whitespace
 
 
+__all__ = ['ArduinoStyle']
+
+
 class ArduinoStyle(Style):
     """
     The Arduino® language style. This style is designed to highlight the
     Arduino source code, so expect the best results with it.
     """
+    name = 'arduino'
 
     background_color = "#ffffff"
 
     styles = {
-        Whitespace:                "",        # class: 'w'
-        Error:                     "#a61717", # class: 'err'
+        Whitespace:                "",         # class: 'w'
+        Error:                     "#a61717",  # class: 'err'
 
-        Comment:                   "#95a5a6", # class: 'c'
-        Comment.Multiline:         "",        # class: 'cm'
-        Comment.Preproc:           "#728E00", # class: 'cp'
-        Comment.Single:            "",        # class: 'c1'
-        Comment.Special:           "",        # class: 'cs'
-
-        Keyword:                   "#728E00", # class: 'k'
-        Keyword.Constant:          "#00979D", # class: 'kc'
-        Keyword.Declaration:       "",        # class: 'kd'
-        Keyword.Namespace:         "",        # class: 'kn'
-        Keyword.Pseudo:            "#00979D", # class: 'kp'
-        Keyword.Reserved:          "#00979D", # class: 'kr'
-        Keyword.Type:              "#00979D", # class: 'kt'
-
-        Operator:                  "#728E00", # class: 'o'
-        Operator.Word:             "",        # class: 'ow'
-
-        Name:                      "#434f54", # class: 'n'
-        Name.Attribute:            "",        # class: 'na'
-        Name.Builtin:              "#728E00", # class: 'nb'
-        Name.Builtin.Pseudo:       "",        # class: 'bp'
-        Name.Class:                "",        # class: 'nc'
-        Name.Constant:             "",        # class: 'no'
-        Name.Decorator:            "",        # class: 'nd'
-        Name.Entity:               "",        # class: 'ni'
-        Name.Exception:            "",        # class: 'ne'
-        Name.Function:             "#D35400", # class: 'nf'
-        Name.Property:             "",        # class: 'py'
-        Name.Label:                "",        # class: 'nl'
-        Name.Namespace:            "",        # class: 'nn'
-        Name.Other:                "#728E00", # class: 'nx'
-        Name.Tag:                  "",        # class: 'nt'
-        Name.Variable:             "",        # class: 'nv'
-        Name.Variable.Class:       "",        # class: 'vc'
-        Name.Variable.Global:      "",        # class: 'vg'
-        Name.Variable.Instance:    "",        # class: 'vi'
-
-        Number:                    "#8A7B52", # class: 'm'
-        Number.Float:              "",        # class: 'mf'
-        Number.Hex:                "",        # class: 'mh'
-        Number.Integer:            "",        # class: 'mi'
-        Number.Integer.Long:       "",        # class: 'il'
-        Number.Oct:                "",        # class: 'mo'
-
-        String:                    "#7F8C8D", # class: 's'
-        String.Backtick:           "",        # class: 'sb'
-        String.Char:               "",        # class: 'sc'
-        String.Doc:                "",        # class: 'sd'
-        String.Double:             "",        # class: 's2'
-        String.Escape:             "",        # class: 'se'
-        String.Heredoc:            "",        # class: 'sh'
-        String.Interpol:           "",        # class: 'si'
-        String.Other:              "",        # class: 'sx'
-        String.Regex:              "",        # class: 'sr'
-        String.Single:             "",        # class: 's1'
-        String.Symbol:             "",        # class: 'ss'
-
-        Generic:                   "",        # class: 'g'
-        Generic.Deleted:           "",        # class: 'gd',
-        Generic.Emph:              "",        # class: 'ge'
-        Generic.Error:             "",        # class: 'gr'
-        Generic.Heading:           "",        # class: 'gh'
-        Generic.Inserted:          "",        # class: 'gi'
-        Generic.Output:            "",        # class: 'go'
-        Generic.Prompt:            "",        # class: 'gp'
-        Generic.Strong:            "",        # class: 'gs'
-        Generic.Subheading:        "",        # class: 'gu'
-        Generic.Traceback:         "",        # class: 'gt'
+        Comment:                   "#95a5a6",  # class: 'c'
+        Comment.Multiline:         "",         # class: 'cm'
+        Comment.Preproc:           "#728E00",  # class: 'cp'
+        Comment.Single:            "",         # class: 'c1'
+        Comment.Special:           "",         # class: 'cs'
+
+        Keyword:                   "#728E00",  # class: 'k'
+        Keyword.Constant:          "#00979D",  # class: 'kc'
+        Keyword.Declaration:       "",         # class: 'kd'
+        Keyword.Namespace:         "",         # class: 'kn'
+        Keyword.Pseudo:            "#00979D",  # class: 'kp'
+        Keyword.Reserved:          "#00979D",  # class: 'kr'
+        Keyword.Type:              "#00979D",  # class: 'kt'
+
+        Operator:                  "#728E00",  # class: 'o'
+        Operator.Word:             "",         # class: 'ow'
+
+        Name:                      "#434f54",  # class: 'n'
+        Name.Attribute:            "",         # class: 'na'
+        Name.Builtin:              "#728E00",  # class: 'nb'
+        Name.Builtin.Pseudo:       "",         # class: 'bp'
+        Name.Class:                "",         # class: 'nc'
+        Name.Constant:             "",         # class: 'no'
+        Name.Decorator:            "",         # class: 'nd'
+        Name.Entity:               "",         # class: 'ni'
+        Name.Exception:            "",         # class: 'ne'
+        Name.Function:             "#D35400",  # class: 'nf'
+        Name.Property:             "",         # class: 'py'
+        Name.Label:                "",         # class: 'nl'
+        Name.Namespace:            "",         # class: 'nn'
+        Name.Other:                "#728E00",  # class: 'nx'
+        Name.Tag:                  "",         # class: 'nt'
+        Name.Variable:             "",         # class: 'nv'
+        Name.Variable.Class:       "",         # class: 'vc'
+        Name.Variable.Global:      "",         # class: 'vg'
+        Name.Variable.Instance:    "",         # class: 'vi'
+
+        Number:                    "#8A7B52",  # class: 'm'
+        Number.Float:              "",         # class: 'mf'
+        Number.Hex:                "",         # class: 'mh'
+        Number.Integer:            "",         # class: 'mi'
+        Number.Integer.Long:       "",         # class: 'il'
+        Number.Oct:                "",         # class: 'mo'
+
+        String:                    "#7F8C8D",  # class: 's'
+        String.Backtick:           "",         # class: 'sb'
+        String.Char:               "",         # class: 'sc'
+        String.Doc:                "",         # class: 'sd'
+        String.Double:             "",         # class: 's2'
+        String.Escape:             "",         # class: 'se'
+        String.Heredoc:            "",         # class: 'sh'
+        String.Interpol:           "",         # class: 'si'
+        String.Other:              "",         # class: 'sx'
+        String.Regex:              "",         # class: 'sr'
+        String.Single:             "",         # class: 's1'
+        String.Symbol:             "",         # class: 'ss'
+
+        Generic:                   "",         # class: 'g'
+        Generic.Deleted:           "",         # class: 'gd',
+        Generic.Emph:              "",         # class: 'ge'
+        Generic.Error:             "",         # class: 'gr'
+        Generic.Heading:           "",         # class: 'gh'
+        Generic.Inserted:          "",         # class: 'gi'
+        Generic.Output:            "",         # class: 'go'
+        Generic.Prompt:            "",         # class: 'gp'
+        Generic.Strong:            "",         # class: 'gs'
+        Generic.Subheading:        "",         # class: 'gu'
+        Generic.Traceback:         "",         # class: 'gt'
     }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/autumn.py pygments-2.17.2+dfsg/pygments/styles/autumn.py
--- pygments-2.15.1+dfsg/pygments/styles/autumn.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/autumn.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,10 +13,14 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['AutumnStyle']
+
+
 class AutumnStyle(Style):
     """
     A colorful style, inspired by the terminal highlighting style.
     """
+    name = 'autumn'
 
     styles = {
         Whitespace:                 '#bbbbbb',
@@ -54,6 +58,7 @@
         Generic.Error:              '#aa0000',
         Generic.Emph:               'italic',
         Generic.Strong:             'bold',
+        Generic.EmphStrong:         'bold italic',
         Generic.Prompt:             '#555555',
         Generic.Output:             '#888888',
         Generic.Traceback:          '#aa0000',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/borland.py pygments-2.17.2+dfsg/pygments/styles/borland.py
--- pygments-2.15.1+dfsg/pygments/styles/borland.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/borland.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,10 +13,14 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['BorlandStyle']
+
+
 class BorlandStyle(Style):
     """
     Style similar to the style used in the borland IDEs.
     """
+    name = 'borland'
 
     styles = {
         Whitespace:             '#bbbbbb',
@@ -40,6 +44,7 @@
         Generic.Error:          '#aa0000',
         Generic.Emph:           'italic',
         Generic.Strong:         'bold',
+        Generic.EmphStrong:     'bold italic',
         Generic.Prompt:         '#555555',
         Generic.Output:         '#888888',
         Generic.Traceback:      '#aa0000',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/bw.py pygments-2.17.2+dfsg/pygments/styles/bw.py
--- pygments-2.15.1+dfsg/pygments/styles/bw.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/bw.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,7 +13,11 @@
      Operator, Generic
 
 
+__all__ = ['BlackWhiteStyle']
+
+
 class BlackWhiteStyle(Style):
+    name = 'bw'
 
     background_color = "#ffffff"
 
@@ -41,6 +45,7 @@
         Generic.Subheading:        "bold",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold",
 
         Error:                     "border:#FF0000"
diff -Nru pygments-2.15.1+dfsg/pygments/styles/colorful.py pygments-2.17.2+dfsg/pygments/styles/colorful.py
--- pygments-2.15.1+dfsg/pygments/styles/colorful.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/colorful.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,10 +13,14 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['ColorfulStyle']
+
+
 class ColorfulStyle(Style):
     """
     A colorful style, inspired by CodeRay.
     """
+    name = 'colorful'
 
     styles = {
         Whitespace:                "#bbbbbb",
@@ -70,6 +74,7 @@
         Generic.Error:             "#FF0000",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold #c65d09",
         Generic.Output:            "#888",
         Generic.Traceback:         "#04D",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/default.py pygments-2.17.2+dfsg/pygments/styles/default.py
--- pygments-2.15.1+dfsg/pygments/styles/default.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/default.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,10 +13,14 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['DefaultStyle']
+
+
 class DefaultStyle(Style):
     """
     The default style (inspired by Emacs 22).
     """
+    name = 'default'
 
     background_color = "#f8f8f8"
 
@@ -63,6 +67,7 @@
         Generic.Error:             "#E40000",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold #000080",
         Generic.Output:            "#717171",
         Generic.Traceback:         "#04D",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/dracula.py pygments-2.17.2+dfsg/pygments/styles/dracula.py
--- pygments-2.15.1+dfsg/pygments/styles/dracula.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/dracula.py	2020-02-02 00:00:00.000000000 +0000
@@ -16,87 +16,75 @@
     Number, Operator, Other, Punctuation, Text, Generic, Whitespace
 
 
+__all__ = ['DraculaStyle']
+
+background = "#282a36"
+foreground = "#f8f8f2"
+selection = "#44475a"
+comment = "#6272a4"
+cyan = "#8be9fd"
+green = "#50fa7b"
+orange = "#ffb86c"
+pink = "#ff79c6"
+purple = "#bd93f9"
+red = "#ff5555"
+yellow = "#f1fa8c"
+
+deletion = "#8b080b"
+
 class DraculaStyle(Style):
+    name = 'dracula'
 
-    background_color = "#282a36"
-    highlight_color = "#44475a"
-    line_number_color = "#f1fa8c"
-    line_number_background_color = "#44475a"
-    line_number_special_color = "#50fa7b"
-    line_number_special_background_color = "#6272a4"
+    background_color = background
+    highlight_color = selection
+    line_number_color = yellow
+    line_number_background_color = selection
+    line_number_special_color = green
+    line_number_special_background_color = comment
 
     styles = {
-        Whitespace: "#f8f8f2",
+        Whitespace: foreground,
+
+        Comment: comment,
+        Comment.Preproc: pink,
+
+        Generic: foreground,
+        Generic.Deleted: deletion,
+        Generic.Emph: "underline",
+        Generic.Heading: "bold",
+        Generic.Inserted: "bold",
+        Generic.Output: selection,
+        Generic.EmphStrong: "underline",
+        Generic.Subheading: "bold",
+
+        Error: foreground,
+
+        Keyword: pink,
+        Keyword.Constant: pink,
+        Keyword.Declaration: cyan + " italic",
+        Keyword.Type: cyan,
+
+        Literal: foreground,
+
+        Name: foreground,
+        Name.Attribute: green,
+        Name.Builtin: cyan + " italic",
+        Name.Builtin.Pseudo: foreground,
+        Name.Class: green,
+        Name.Function: green,
+        Name.Label: cyan + " italic",
+        Name.Tag: pink,
+        Name.Variable: cyan + " italic",
+
+        Number: orange,
+
+        Operator: pink,
+
+        Other: foreground,
+
+        Punctuation: foreground,
+
+        String: purple,
 
-        Comment: "#6272a4",
-        Comment.Hashbang: "#6272a4",
-        Comment.Multiline: "#6272a4",
-        Comment.Preproc: "#ff79c6",
-        Comment.Single: "#6272a4",
-        Comment.Special: "#6272a4",
-
-        Generic: "#f8f8f2",
-        Generic.Deleted: "#8b080b",
-        Generic.Emph: "#f8f8f2 underline",
-        Generic.Error: "#f8f8f2",
-        Generic.Heading: "#f8f8f2 bold",
-        Generic.Inserted: "#f8f8f2 bold",
-        Generic.Output: "#44475a",
-        Generic.Prompt: "#f8f8f2",
-        Generic.Strong: "#f8f8f2",
-        Generic.Subheading: "#f8f8f2 bold",
-        Generic.Traceback: "#f8f8f2",
-
-        Error: "#f8f8f2",
-        Keyword: "#ff79c6",
-        Keyword.Constant: "#ff79c6",
-        Keyword.Declaration: "#8be9fd italic",
-        Keyword.Namespace: "#ff79c6",
-        Keyword.Pseudo: "#ff79c6",
-        Keyword.Reserved: "#ff79c6",
-        Keyword.Type: "#8be9fd",
-        Literal: "#f8f8f2",
-        Literal.Date: "#f8f8f2",
-        Name: "#f8f8f2",
-        Name.Attribute: "#50fa7b",
-        Name.Builtin: "#8be9fd italic",
-        Name.Builtin.Pseudo: "#f8f8f2",
-        Name.Class: "#50fa7b",
-        Name.Constant: "#f8f8f2",
-        Name.Decorator: "#f8f8f2",
-        Name.Entity: "#f8f8f2",
-        Name.Exception: "#f8f8f2",
-        Name.Function: "#50fa7b",
-        Name.Label: "#8be9fd italic",
-        Name.Namespace: "#f8f8f2",
-        Name.Other: "#f8f8f2",
-        Name.Tag: "#ff79c6",
-        Name.Variable: "#8be9fd italic",
-        Name.Variable.Class: "#8be9fd italic",
-        Name.Variable.Global: "#8be9fd italic",
-        Name.Variable.Instance: "#8be9fd italic",
-        Number: "#ffb86c",
-        Number.Bin: "#ffb86c",
-        Number.Float: "#ffb86c",
-        Number.Hex: "#ffb86c",
-        Number.Integer: "#ffb86c",
-        Number.Integer.Long: "#ffb86c",
-        Number.Oct: "#ffb86c",
-        Operator: "#ff79c6",
-        Operator.Word: "#ff79c6",
-        Other: "#f8f8f2",
-        Punctuation: "#f8f8f2",
-        String: "#bd93f9",
-        String.Backtick: "#bd93f9",
-        String.Char: "#bd93f9",
-        String.Doc: "#bd93f9",
-        String.Double: "#bd93f9",
-        String.Escape: "#bd93f9",
-        String.Heredoc: "#bd93f9",
-        String.Interpol: "#bd93f9",
-        String.Other: "#bd93f9",
-        String.Regex: "#bd93f9",
-        String.Single: "#bd93f9",
-        String.Symbol: "#bd93f9",
-        Text: "#f8f8f2",
+        Text: foreground,
     }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/emacs.py pygments-2.17.2+dfsg/pygments/styles/emacs.py
--- pygments-2.15.1+dfsg/pygments/styles/emacs.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/emacs.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,10 +13,14 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['EmacsStyle']
+
+
 class EmacsStyle(Style):
     """
     The default style (inspired by Emacs 22).
     """
+    name = 'emacs'
 
     background_color = "#f8f8f8"
 
@@ -62,6 +66,7 @@
         Generic.Error:             "#FF0000",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold #000080",
         Generic.Output:            "#888",
         Generic.Traceback:         "#04D",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/friendly.py pygments-2.17.2+dfsg/pygments/styles/friendly.py
--- pygments-2.15.1+dfsg/pygments/styles/friendly.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/friendly.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,10 +13,14 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['FriendlyStyle']
+
+
 class FriendlyStyle(Style):
     """
     A modern style based on the VIM pyte theme.
     """
+    name = 'friendly'
 
     background_color = "#f0f0f0"
     line_number_color = "#666666"
@@ -63,6 +67,7 @@
         Generic.Error:             "#FF0000",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold #c65d09",
         Generic.Output:            "#888",
         Generic.Traceback:         "#04D",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/friendly_grayscale.py pygments-2.17.2+dfsg/pygments/styles/friendly_grayscale.py
--- pygments-2.15.1+dfsg/pygments/styles/friendly_grayscale.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/friendly_grayscale.py	2020-02-02 00:00:00.000000000 +0000
@@ -16,12 +16,16 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['FriendlyGrayscaleStyle']
+
+
 class FriendlyGrayscaleStyle(Style):
     """
     A modern grayscale style based on the friendly style.
 
     .. versionadded:: 2.11
     """
+    name = 'friendly_grayscale'
 
     background_color = "#f0f0f0"
 
@@ -67,6 +71,7 @@
         Generic.Error:             "#898989",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold #7E7E7E",
         Generic.Output:            "#888888",
         Generic.Traceback:         "#6D6D6D",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/fruity.py pygments-2.17.2+dfsg/pygments/styles/fruity.py
--- pygments-2.15.1+dfsg/pygments/styles/fruity.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/fruity.py	2020-02-02 00:00:00.000000000 +0000
@@ -12,11 +12,17 @@
 from pygments.token import Token, Comment, Name, Keyword, \
     Generic, Number, String, Whitespace
 
+
+__all__ = ['FruityStyle']
+
+
 class FruityStyle(Style):
     """
     Pygments version of the "native" vim theme.
     """
 
+    name = 'fruity'
+
     background_color = '#111111'
     highlight_color = '#333333'
 
diff -Nru pygments-2.15.1+dfsg/pygments/styles/gh_dark.py pygments-2.17.2+dfsg/pygments/styles/gh_dark.py
--- pygments-2.15.1+dfsg/pygments/styles/gh_dark.py	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/gh_dark.py	2020-02-02 00:00:00.000000000 +0000
@@ -14,6 +14,9 @@
     Generic, Text, Literal, String, Token
 
 
+__all__ = ['GhDarkStyle']
+
+
 # vars are defined to match the defs in
 # - [GitHub's VS Code theme](https://github.com/primer/github-vscode-theme) and
 # - [Primer styles](https://github.com/primer/primitives)
@@ -40,6 +43,8 @@
     """
     Github's Dark-Colorscheme based theme for Pygments
     """
+    
+    name = 'github-dark'
 
     background_color = BG_DEFAULT
 
@@ -99,6 +104,7 @@
         Generic.Output:             GRAY_3,
         Generic.Prompt:             GRAY_3,
         Generic.Strong:             "bold",
+        Generic.EmphStrong:         "bold italic",
         Generic.Subheading:         BLUE_2,
         Generic.Traceback:          RED_3,
         Generic.Underline:          "underline",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/gruvbox.py pygments-2.17.2+dfsg/pygments/styles/gruvbox.py
--- pygments-2.15.1+dfsg/pygments/styles/gruvbox.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/gruvbox.py	2020-02-02 00:00:00.000000000 +0000
@@ -14,10 +14,15 @@
      Number, Operator, Generic
 
 
+__all__ = ['GruvboxDarkStyle', 'GruvboxLightStyle']
+
+
 class GruvboxDarkStyle(Style):
     """
     Pygments version of the "gruvbox" dark vim theme.
     """
+    
+    name = 'gruvbox-dark'
 
     background_color = '#282828'
     highlight_color = '#ebdbb2'
@@ -55,6 +60,7 @@
         Generic.Error:      '#fb4934',
         Generic.Emph:       'italic',
         Generic.Strong:     'bold',
+        Generic.EmphStrong: 'bold italic',
         Generic.Prompt:     '#a89984',
         Generic.Output:     '#f2e5bc',
         Generic.Traceback:  '#fb4934',
@@ -62,11 +68,14 @@
         Error:              'bg:#fb4934 #282828'
     }
 
+
 class GruvboxLightStyle(Style):
     """
     Pygments version of the "gruvbox" Light vim theme.
     """
 
+    name = 'gruvbox-light'
+
     background_color = '#fbf1c7'
     highlight_color = '#3c3836'
 
diff -Nru pygments-2.15.1+dfsg/pygments/styles/igor.py pygments-2.17.2+dfsg/pygments/styles/igor.py
--- pygments-2.15.1+dfsg/pygments/styles/igor.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/igor.py	2020-02-02 00:00:00.000000000 +0000
@@ -12,11 +12,16 @@
 from pygments.token import Keyword, Name, Comment, String
 
 
+__all__ = ['IgorStyle']
+
+
 class IgorStyle(Style):
     """
     Pygments version of the official colors for Igor Pro procedures.
     """
 
+    name = 'igor'
+
     styles = {
         Comment:                'italic #FF0000',
         Keyword:                '#0000FF',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/inkpot.py pygments-2.17.2+dfsg/pygments/styles/inkpot.py
--- pygments-2.15.1+dfsg/pygments/styles/inkpot.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/inkpot.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,8 +13,12 @@
     Error, Number, Operator, Generic, Whitespace, Punctuation
 
 
-class InkPotStyle(Style):
+__all__ = ['InkPotStyle']
+
 
+class InkPotStyle(Style):
+    name = 'inkpot'
+    
     background_color = "#1e1e27"
 
     styles = {
@@ -59,6 +63,7 @@
         Generic.Error:             "#FF0000",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold #000080",
         Generic.Output:            "#888",
         Generic.Traceback:         "#04D",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/lightbulb.py pygments-2.17.2+dfsg/pygments/styles/lightbulb.py
--- pygments-2.15.1+dfsg/pygments/styles/lightbulb.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/lightbulb.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,110 @@
+"""
+    pygments.styles.lightbulb
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    A minimal dark theme based on the Lightbulb theme for VSCode.
+
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.style import Style
+from pygments.token import (
+    Comment,
+    Error,
+    Generic,
+    Keyword,
+    Literal,
+    Name,
+    Number,
+    Operator,
+    Punctuation,
+    String,
+    Token,
+)
+
+
+__all__ = ['LightbulbStyle']
+
+
+COLORS = {
+    "bg": "#1d2331",
+    "blue_1": "#73D0FF",
+    "gray_1": "#7e8aa1",
+    "gray_2": "#3c4354",
+    "gray_3": "#6e7681",
+    "red_1": "#f88f7f",
+    "red_2": "#3d1e20",
+    "orange_1": "#FFAD66",
+    "orange_2": "#F29E74",
+    "yellow_1": "#FFD173",
+    "white": "#d4d2c8",
+    "magenta_1": "#DFBFFF",
+    "green_1": "#D5FF80",
+    "green_2": "#19362c",
+    "cyan_1": "#95E6CB",
+}
+
+
+class LightbulbStyle(Style):
+    """
+    A minimal dark theme based on the Lightbulb theme for VSCode.
+    """
+
+    name = 'lightbulb'
+
+    background_color = COLORS['bg']
+    highlight_color = COLORS['gray_3']
+
+    line_number_color = COLORS['gray_2']
+    line_number_special_color = COLORS['gray_2']
+
+    styles = {
+        Comment: COLORS["gray_1"],
+        Comment.Hashbang: "italic " + COLORS['red_1'],
+        Comment.Preproc: "bold " + COLORS['orange_1'],
+        Comment.Special: "italic " + COLORS['gray_1'],
+        Error: COLORS['red_1'],
+        Generic.Deleted: f"bg:{COLORS['red_2']} #f88f7f",
+        Generic.Emph: "italic",
+        Generic.Error: "#f88f7f",
+        Generic.Inserted: f"bg:{COLORS['green_2']} #6ad4af",
+        Generic.Output: COLORS['gray_1'],
+        Generic.Strong: "bold",
+        Generic.Traceback: COLORS['red_1'],
+        Keyword: COLORS['orange_1'],
+        Keyword.Constant: COLORS['orange_1'],
+        Keyword.Declaration: COLORS['orange_1'],
+        Keyword.Namespace: COLORS['orange_1'],
+        Keyword.Reserved: COLORS['orange_1'],
+        Keyword.Type: COLORS['blue_1'],
+        Literal: COLORS['green_1'],
+        Name: COLORS['white'],
+        Name.Attribute: COLORS['yellow_1'],
+        Name.Builtin: COLORS['yellow_1'],
+        Name.Builtin.Pseudo: "#5CCFE6",
+        Name.Class: COLORS['blue_1'],
+        Name.Constant: COLORS['yellow_1'],
+        Name.Decorator: "bold italic " + COLORS['gray_1'],
+        Name.Entity: COLORS['cyan_1'],
+        Name.Exception: COLORS['blue_1'],
+        Name.Function: COLORS['yellow_1'],
+        Name.Function.Magic: COLORS['yellow_1'],
+        Name.Other: COLORS['white'],
+        Name.Property: COLORS['yellow_1'],
+        Name.Tag: "#5CCFE6",
+        Name.Variable: COLORS['white'],
+        Number: COLORS['magenta_1'],
+        Operator: COLORS['orange_1'],
+        Operator.Word: COLORS['orange_1'],
+        Punctuation: COLORS['white'],
+        String: COLORS['green_1'],
+        String.Affix: COLORS['orange_2'],
+        String.Doc: COLORS['gray_1'],
+        String.Escape: COLORS['cyan_1'],
+        String.Interpol: COLORS['cyan_1'],
+        String.Other: COLORS['cyan_1'],
+        String.Regex: COLORS['cyan_1'],
+        String.Symbol: COLORS['magenta_1'],
+        Token: COLORS['white'],
+    }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/lilypond.py pygments-2.17.2+dfsg/pygments/styles/lilypond.py
--- pygments-2.15.1+dfsg/pygments/styles/lilypond.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/lilypond.py	2020-02-02 00:00:00.000000000 +0000
@@ -11,13 +11,19 @@
 from pygments.style import Style
 from pygments.token import Token
 
+
+__all__ = ['LilyPondStyle']
+
+
 class LilyPondStyle(Style):
     """
     Style for the LilyPond language.
-        
+
     .. versionadded:: 2.11
     """
 
+    name = 'lilypond'
+    
     # Don't show it in the gallery, it's intended for LilyPond
     # input only and doesn't show good output on Python code.
     web_style_gallery_exclude = True
diff -Nru pygments-2.15.1+dfsg/pygments/styles/lovelace.py pygments-2.17.2+dfsg/pygments/styles/lovelace.py
--- pygments-2.15.1+dfsg/pygments/styles/lovelace.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/lovelace.py	2020-02-02 00:00:00.000000000 +0000
@@ -17,20 +17,25 @@
     Number, Operator, Punctuation, Generic, Whitespace
 
 
+__all__ = ['LovelaceStyle']
+
+
 class LovelaceStyle(Style):
     """
     The style used in Lovelace interactive learning environment. Tries to avoid
     the "angry fruit salad" effect with desaturated and dim colours.
     """
-    _KW_BLUE =       '#2838b0'
-    _NAME_GREEN =    '#388038'
-    _DOC_ORANGE =    '#b85820'
-    _OW_PURPLE =     '#a848a8'
-    _FUN_BROWN =     '#785840'
-    _STR_RED =       '#b83838'
-    _CLS_CYAN =      '#287088'
-    _ESCAPE_LIME =   '#709030'
-    _LABEL_CYAN =    '#289870'
+    name = 'lovelace'
+
+    _KW_BLUE = '#2838b0'
+    _NAME_GREEN = '#388038'
+    _DOC_ORANGE = '#b85820'
+    _OW_PURPLE = '#a848a8'
+    _FUN_BROWN = '#785840'
+    _STR_RED = '#b83838'
+    _CLS_CYAN = '#287088'
+    _ESCAPE_LIME = '#709030'
+    _LABEL_CYAN = '#289870'
     _EXCEPT_YELLOW = '#908828'
 
     styles = {
@@ -88,6 +93,7 @@
         Generic.Output:      '#666666',
         Generic.Prompt:      '#444444',
         Generic.Strong:      'bold',
+        Generic.EmphStrong:  'bold italic',
         Generic.Traceback:   _KW_BLUE,
 
         Error:               'bg:'+_OW_PURPLE,
diff -Nru pygments-2.15.1+dfsg/pygments/styles/manni.py pygments-2.17.2+dfsg/pygments/styles/manni.py
--- pygments-2.15.1+dfsg/pygments/styles/manni.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/manni.py	2020-02-02 00:00:00.000000000 +0000
@@ -16,11 +16,15 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['ManniStyle']
+
+
 class ManniStyle(Style):
     """
     A colorful style, inspired by the terminal highlighting style.
     """
-
+    name = 'manni'
+    
     background_color = '#f0f3f3'
 
     styles = {
@@ -66,6 +70,7 @@
         Generic.Error:      '#FF0000',
         Generic.Emph:       'italic',
         Generic.Strong:     'bold',
+        Generic.EmphStrong: 'bold italic',
         Generic.Prompt:     'bold #000099',
         Generic.Output:     '#AAAAAA',
         Generic.Traceback:  '#99CC66',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/material.py pygments-2.17.2+dfsg/pygments/styles/material.py
--- pygments-2.15.1+dfsg/pygments/styles/material.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/material.py	2020-02-02 00:00:00.000000000 +0000
@@ -14,24 +14,30 @@
 from pygments.token import Keyword, Name, Comment, String, Escape, \
     Error, Text, Number, Operator, Generic, Punctuation, Literal
 
+
+__all__ = ['MaterialStyle']
+
+
 class MaterialStyle(Style):
     """
     This style mimics the Material Theme color scheme.
     """
+    name = 'material'
+    
     dark_teal = '#263238'
-    white= '#FFFFFF'
-    black= '#000000'
-    red= '#FF5370'
-    orange= '#F78C6C'
-    yellow= '#FFCB6B'
-    green= '#C3E88D'
-    cyan= '#89DDFF'
-    blue= '#82AAFF'
-    paleblue= '#B2CCD6'
-    purple= '#C792EA'
-    brown= '#C17E70'
-    pink= '#F07178'
-    violet= '#BB80B3'
+    white = '#FFFFFF'
+    black = '#000000'
+    red = '#FF5370'
+    orange = '#F78C6C'
+    yellow = '#FFCB6B'
+    green = '#C3E88D'
+    cyan = '#89DDFF'
+    blue = '#82AAFF'
+    paleblue = '#B2CCD6'
+    purple = '#C792EA'
+    brown = '#C17E70'
+    pink = '#F07178'
+    violet = '#BB80B3'
     foreground = '#EEFFFF'
     faded = '#546E7A'
 
@@ -112,6 +118,7 @@
         Generic.Output:                faded,
         Generic.Prompt:                yellow,
         Generic.Strong:                red,
+        Generic.EmphStrong:            yellow,
         Generic.Subheading:            cyan,
         Generic.Traceback:             red,
     }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/monokai.py pygments-2.17.2+dfsg/pygments/styles/monokai.py
--- pygments-2.15.1+dfsg/pygments/styles/monokai.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/monokai.py	2020-02-02 00:00:00.000000000 +0000
@@ -14,11 +14,16 @@
 from pygments.token import Keyword, Name, Comment, String, Error, Token, \
      Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
 
+
+__all__ = ['MonokaiStyle']
+
+
 class MonokaiStyle(Style):
     """
     This style mimics the Monokai color scheme.
     """
-
+    name = 'monokai'
+    
     background_color = "#272822"
     highlight_color = "#49483e"
 
@@ -26,10 +31,10 @@
         # No corresponding class for the following:
         Token:                     "#f8f8f2", # class:  ''
         Whitespace:                "",        # class: 'w'
-        Error:                     "#960050 bg:#1e0010", # class: 'err'
+        Error:                     "#ed007e bg:#1e0010", # class: 'err'
         Other:                     "",        # class 'x'
 
-        Comment:                   "#75715e", # class: 'c'
+        Comment:                   "#959077", # class: 'c'
         Comment.Multiline:         "",        # class: 'cm'
         Comment.Preproc:           "",        # class: 'cp'
         Comment.Single:            "",        # class: 'c1'
@@ -38,12 +43,12 @@
         Keyword:                   "#66d9ef", # class: 'k'
         Keyword.Constant:          "",        # class: 'kc'
         Keyword.Declaration:       "",        # class: 'kd'
-        Keyword.Namespace:         "#f92672", # class: 'kn'
+        Keyword.Namespace:         "#ff4689", # class: 'kn'
         Keyword.Pseudo:            "",        # class: 'kp'
         Keyword.Reserved:          "",        # class: 'kr'
         Keyword.Type:              "",        # class: 'kt'
 
-        Operator:                  "#f92672", # class: 'o'
+        Operator:                  "#ff4689", # class: 'o'
         Operator.Word:             "",        # class: 'ow' - like keywords
 
         Punctuation:               "#f8f8f2", # class: 'p'
@@ -62,7 +67,7 @@
         Name.Label:                "",        # class: 'nl'
         Name.Namespace:            "",        # class: 'nn' - to be revised
         Name.Other:                "#a6e22e", # class: 'nx'
-        Name.Tag:                  "#f92672", # class: 'nt' - like a keyword
+        Name.Tag:                  "#ff4689", # class: 'nt' - like a keyword
         Name.Variable:             "",        # class: 'nv' - to be revised
         Name.Variable.Class:       "",        # class: 'vc' - to be revised
         Name.Variable.Global:      "",        # class: 'vg' - to be revised
@@ -93,14 +98,15 @@
 
 
         Generic:                   "",        # class: 'g'
-        Generic.Deleted:           "#f92672", # class: 'gd',
+        Generic.Deleted:           "#ff4689", # class: 'gd',
         Generic.Emph:              "italic",  # class: 'ge'
         Generic.Error:             "",        # class: 'gr'
         Generic.Heading:           "",        # class: 'gh'
         Generic.Inserted:          "#a6e22e", # class: 'gi'
         Generic.Output:            "#66d9ef", # class: 'go'
-        Generic.Prompt:            "bold #f92672", # class: 'gp'
+        Generic.Prompt:            "bold #ff4689", # class: 'gp'
         Generic.Strong:            "bold",    # class: 'gs'
-        Generic.Subheading:        "#75715e", # class: 'gu'
+        Generic.EmphStrong:        "bold italic",  # class: 'ges'
+        Generic.Subheading:        "#959077", # class: 'gu'
         Generic.Traceback:         "",        # class: 'gt'
     }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/murphy.py pygments-2.17.2+dfsg/pygments/styles/murphy.py
--- pygments-2.15.1+dfsg/pygments/styles/murphy.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/murphy.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,11 +13,15 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['MurphyStyle']
+
+
 class MurphyStyle(Style):
     """
     Murphy's style from CodeRay.
     """
-
+    name = 'murphy'
+    
     styles = {
         Whitespace:                "#bbbbbb",
         Comment:                   "#666 italic",
@@ -69,6 +73,7 @@
         Generic.Error:             "#FF0000",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold #c65d09",
         Generic.Output:            "#888",
         Generic.Traceback:         "#04D",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/native.py pygments-2.17.2+dfsg/pygments/styles/native.py
--- pygments-2.15.1+dfsg/pygments/styles/native.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/native.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,11 +13,15 @@
      Number, Operator, Generic, Token, Whitespace
 
 
+__all__ = ['NativeStyle']
+
+
 class NativeStyle(Style):
     """
     Pygments version of the "native" vim theme.
     """
-
+    name = 'native'
+    
     background_color = '#202020'
     highlight_color = '#404040'
     line_number_color = '#aaaaaa'
@@ -57,6 +61,7 @@
         Generic.Error:      '#d22323',
         Generic.Emph:       'italic',
         Generic.Strong:     'bold',
+        Generic.EmphStrong: 'bold italic',
         Generic.Prompt:     '#aaaaaa',
         Generic.Output:     '#cccccc',
         Generic.Traceback:  '#d22323',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/nord.py pygments-2.17.2+dfsg/pygments/styles/nord.py
--- pygments-2.15.1+dfsg/pygments/styles/nord.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/nord.py	2020-02-02 00:00:00.000000000 +0000
@@ -14,11 +14,15 @@
     Operator, Generic, Whitespace, Punctuation, Text, Token
 
 
+__all__ = ['NordStyle', 'NordDarkerStyle']
+
+
 class NordStyle(Style):
     """
     Pygments version of the "nord" theme by Arctic Ice Studio.
     """
-
+    name = 'nord'
+    
     line_number_color = "#D8DEE9"
     line_number_background_color = "#242933"
     line_number_special_color = "#242933"
@@ -73,6 +77,7 @@
         Generic.Error:              '#bf616a',
         Generic.Emph:               'italic',
         Generic.Strong:             'bold',
+        Generic.EmphStrong:         'bold italic',
         Generic.Prompt:             'bold #616e88',
         Generic.Output:             '#d8dee9',
         Generic.Traceback:          '#bf616a',
@@ -86,7 +91,8 @@
     """
     Pygments version of a darker "nord" theme by Arctic Ice Studio
     """
-
+    name = 'nord-darker'
+    
     line_number_color = "#D8DEE9"
     line_number_background_color = "#242933"
     line_number_special_color = "#242933"
diff -Nru pygments-2.15.1+dfsg/pygments/styles/onedark.py pygments-2.17.2+dfsg/pygments/styles/onedark.py
--- pygments-2.15.1+dfsg/pygments/styles/onedark.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/onedark.py	2020-02-02 00:00:00.000000000 +0000
@@ -16,13 +16,17 @@
     Punctuation, String, Token
 
 
+__all__ = ['OneDarkStyle']
+
+
 class OneDarkStyle(Style):
     """
     Theme inspired by One Dark Pro for Atom.
 
     .. versionadded:: 2.11
     """
-
+    name = 'one-dark'
+    
     background_color = '#282C34'
 
     styles = {
diff -Nru pygments-2.15.1+dfsg/pygments/styles/paraiso_dark.py pygments-2.17.2+dfsg/pygments/styles/paraiso_dark.py
--- pygments-2.15.1+dfsg/pygments/styles/paraiso_dark.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/paraiso_dark.py	2020-02-02 00:00:00.000000000 +0000
@@ -17,6 +17,9 @@
     Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
 
 
+__all__ = ['ParaisoDarkStyle']
+
+
 BACKGROUND = "#2f1e2e"
 CURRENT_LINE = "#41323f"
 SELECTION = "#4f424c"
@@ -32,7 +35,8 @@
 
 
 class ParaisoDarkStyle(Style):
-
+    name = 'paraiso-dark'
+    
     background_color = BACKGROUND
     highlight_color = SELECTION
 
@@ -114,6 +118,7 @@
         Generic.Output:            "",                    # class: 'go'
         Generic.Prompt:            "bold " + COMMENT,     # class: 'gp'
         Generic.Strong:            "bold",                # class: 'gs'
+        Generic.EmphStrong:        "bold italic",         # class: 'ges'
         Generic.Subheading:        "bold " + AQUA,        # class: 'gu'
         Generic.Traceback:         "",                    # class: 'gt'
     }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/paraiso_light.py pygments-2.17.2+dfsg/pygments/styles/paraiso_light.py
--- pygments-2.15.1+dfsg/pygments/styles/paraiso_light.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/paraiso_light.py	2020-02-02 00:00:00.000000000 +0000
@@ -17,6 +17,9 @@
     Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
 
 
+__all__ = ['ParaisoLightStyle']
+
+
 BACKGROUND = "#e7e9db"
 CURRENT_LINE = "#b9b6b0"
 SELECTION = "#a39e9b"
@@ -32,7 +35,8 @@
 
 
 class ParaisoLightStyle(Style):
-
+    name = 'paraiso-light'
+    
     background_color = BACKGROUND
     highlight_color = SELECTION
 
@@ -114,6 +118,7 @@
         Generic.Output:            "",                    # class: 'go'
         Generic.Prompt:            "bold " + COMMENT,     # class: 'gp'
         Generic.Strong:            "bold",                # class: 'gs'
+        Generic.EmphStrong:        "bold italic",         # class: 'ges'
         Generic.Subheading:        "bold " + AQUA,        # class: 'gu'
         Generic.Traceback:         "",                    # class: 'gt'
     }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/pastie.py pygments-2.17.2+dfsg/pygments/styles/pastie.py
--- pygments-2.15.1+dfsg/pygments/styles/pastie.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/pastie.py	2020-02-02 00:00:00.000000000 +0000
@@ -15,11 +15,16 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['PastieStyle']
+
+
 class PastieStyle(Style):
     """
     Style similar to the pastie default style.
     """
 
+    name = 'pastie'
+    
     styles = {
         Whitespace:             '#bbbbbb',
         Comment:                '#888888',
@@ -64,6 +69,7 @@
         Generic.Error:          '#aa0000',
         Generic.Emph:           'italic',
         Generic.Strong:         'bold',
+        Generic.EmphStrong:     'bold italic',
         Generic.Prompt:         '#555555',
         Generic.Output:         '#888888',
         Generic.Traceback:      '#aa0000',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/perldoc.py pygments-2.17.2+dfsg/pygments/styles/perldoc.py
--- pygments-2.15.1+dfsg/pygments/styles/perldoc.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/perldoc.py	2020-02-02 00:00:00.000000000 +0000
@@ -15,11 +15,16 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['PerldocStyle']
+
+
 class PerldocStyle(Style):
     """
     Style similar to the style used in the perldoc code blocks.
     """
 
+    name = 'perldoc'
+    
     background_color = '#eeeedd'
 
     styles = {
@@ -59,6 +64,7 @@
         Generic.Error:          '#aa0000',
         Generic.Emph:           'italic',
         Generic.Strong:         'bold',
+        Generic.EmphStrong:     'bold italic',
         Generic.Prompt:         '#555555',
         Generic.Output:         '#888888',
         Generic.Traceback:      '#aa0000',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/rainbow_dash.py pygments-2.17.2+dfsg/pygments/styles/rainbow_dash.py
--- pygments-2.15.1+dfsg/pygments/styles/rainbow_dash.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/rainbow_dash.py	2020-02-02 00:00:00.000000000 +0000
@@ -14,6 +14,10 @@
 from pygments.token import Comment, Error, Generic, Name, Number, Operator, \
     String, Text, Whitespace, Keyword
 
+
+__all__ = ['RainbowDashStyle']
+
+
 BLUE_LIGHT = '#0080ff'
 BLUE = '#2c5dcd'
 GREEN = '#00cc66'
@@ -37,6 +41,8 @@
     A bright and colorful syntax highlighting theme.
     """
 
+    name = 'rainbow_dash'
+    
     background_color = WHITE
 
     styles = {
@@ -54,6 +60,7 @@
         Generic.Output: GREY,
         Generic.Prompt: 'bold {}'.format(BLUE),
         Generic.Strong: 'bold',
+        Generic.EmphStrong: 'bold italic',
         Generic.Subheading: 'bold {}'.format(BLUE),
         Generic.Traceback: RED_DARK,
 
diff -Nru pygments-2.15.1+dfsg/pygments/styles/rrt.py pygments-2.17.2+dfsg/pygments/styles/rrt.py
--- pygments-2.15.1+dfsg/pygments/styles/rrt.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/rrt.py	2020-02-02 00:00:00.000000000 +0000
@@ -9,7 +9,10 @@
 """
 
 from pygments.style import Style
-from pygments.token import Token, Comment, Name, Keyword, String
+from pygments.token import Token, Comment, Name, Keyword, String, Number
+
+
+__all__ = ['RrtStyle']
 
 
 class RrtStyle(Style):
@@ -17,6 +20,8 @@
     Minimalistic "rrt" theme, based on Zap and Emacs defaults.
     """
 
+    name = 'rrt'
+
     background_color = '#000000'
     highlight_color = '#0000ff'
 
@@ -30,4 +35,5 @@
         Comment.Preproc:    '#e5e5e5',
         String:             '#87ceeb',
         Keyword.Type:       '#ee82ee',
+        Number:             '#ff00ff',
     }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/sas.py pygments-2.17.2+dfsg/pygments/styles/sas.py
--- pygments-2.15.1+dfsg/pygments/styles/sas.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/sas.py	2020-02-02 00:00:00.000000000 +0000
@@ -15,6 +15,9 @@
     Number, Other, Whitespace, Generic
 
 
+__all__ = ['SasStyle']
+
+
 class SasStyle(Style):
     """
     Style inspired by SAS' enhanced program editor. Note This is not
@@ -22,6 +25,8 @@
     program editor syntax highlighting.
     """
 
+    name = 'sas'
+    
     styles = {
         Whitespace:            '#bbbbbb',
         Comment:               'italic #008800',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/solarized.py pygments-2.17.2+dfsg/pygments/styles/solarized.py
--- pygments-2.15.1+dfsg/pygments/styles/solarized.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/solarized.py	2020-02-02 00:00:00.000000000 +0000
@@ -16,6 +16,9 @@
     Operator, String, Token
 
 
+__all__ = ['SolarizedLightStyle', 'SolarizedDarkStyle']
+
+
 def make_style(colors):
     return {
         Token:               colors['base0'],
@@ -67,6 +70,7 @@
         Generic.Output:      colors['base0'],
         Generic.Prompt:      'bold ' + colors['blue'],
         Generic.Strong:      'bold',
+        Generic.EmphStrong:  'bold italic',
         Generic.Traceback:   colors['blue'],
 
         Error:               'bg:' + colors['red'],
@@ -117,6 +121,8 @@
     The solarized style, dark.
     """
 
+    name = 'solarized-dark'
+    
     styles = make_style(DARK_COLORS)
     background_color = DARK_COLORS['base03']
     highlight_color = DARK_COLORS['base02']
@@ -129,6 +135,8 @@
     The solarized style, light.
     """
 
+    name = 'solarized-light'
+    
     styles = make_style(LIGHT_COLORS)
     background_color = LIGHT_COLORS['base03']
     highlight_color = LIGHT_COLORS['base02']
diff -Nru pygments-2.15.1+dfsg/pygments/styles/staroffice.py pygments-2.17.2+dfsg/pygments/styles/staroffice.py
--- pygments-2.15.1+dfsg/pygments/styles/staroffice.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/staroffice.py	2020-02-02 00:00:00.000000000 +0000
@@ -12,11 +12,16 @@
 from pygments.token import Comment, Error, Literal, Name, Token
 
 
+__all__ = ['StarofficeStyle']
+
+
 class StarofficeStyle(Style):
     """
     Style similar to StarOffice style, also in OpenOffice and LibreOffice.
     """
+    name = 'staroffice'
 
+    
     styles = {
         Token:                  '#000080',   # Blue
         Comment:                '#696969',   # DimGray
diff -Nru pygments-2.15.1+dfsg/pygments/styles/stata_dark.py pygments-2.17.2+dfsg/pygments/styles/stata_dark.py
--- pygments-2.15.1+dfsg/pygments/styles/stata_dark.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/stata_dark.py	2020-02-02 00:00:00.000000000 +0000
@@ -15,8 +15,12 @@
     Number, Operator, Whitespace, Generic
 
 
-class StataDarkStyle(Style):
+__all__ = ['StataDarkStyle']
+
 
+class StataDarkStyle(Style):
+    name = 'stata-dark'
+    
     background_color = "#232629"
     highlight_color = "#49483e"
 
diff -Nru pygments-2.15.1+dfsg/pygments/styles/stata_light.py pygments-2.17.2+dfsg/pygments/styles/stata_light.py
--- pygments-2.15.1+dfsg/pygments/styles/stata_light.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/stata_light.py	2020-02-02 00:00:00.000000000 +0000
@@ -14,12 +14,17 @@
     Number, Operator, Whitespace, Text
 
 
+__all__ = ['StataLightStyle']
+
+
 class StataLightStyle(Style):
     """
     Light mode style inspired by Stata's do-file editor. This is not
     meant to be a complete style, just for use with Stata.
     """
 
+    name = 'stata-light'
+    
     styles = {
         Text:                  '#111111',
         Whitespace:            '#bbbbbb',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/tango.py pygments-2.17.2+dfsg/pygments/styles/tango.py
--- pygments-2.15.1+dfsg/pygments/styles/tango.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/tango.py	2020-02-02 00:00:00.000000000 +0000
@@ -41,14 +41,17 @@
      Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
 
 
+__all__ = ['TangoStyle']
+
+
 class TangoStyle(Style):
     """
     The Crunchy default Style inspired from the color palette from
     the Tango Icon Theme Guidelines.
     """
 
-    # work in progress...
-
+    name = 'tango'
+    
     background_color = "#f8f8f8"
 
     styles = {
@@ -134,6 +137,7 @@
         Generic.Output:            "italic #000000", # class: 'go'
         Generic.Prompt:            "#8f5902",        # class: 'gp'
         Generic.Strong:            "bold #000000",   # class: 'gs'
+        Generic.EmphStrong:        "bold italic #000000",  # class: 'ges'
         Generic.Subheading:        "bold #800080",   # class: 'gu'
         Generic.Traceback:         "bold #a40000",   # class: 'gt'
     }
diff -Nru pygments-2.15.1+dfsg/pygments/styles/trac.py pygments-2.17.2+dfsg/pygments/styles/trac.py
--- pygments-2.15.1+dfsg/pygments/styles/trac.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/trac.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,11 +13,16 @@
      Number, Operator, Generic, Whitespace
 
 
+__all__ = ['TracStyle']
+
+
 class TracStyle(Style):
     """
     Port of the default trac highlighter design.
     """
 
+    name = 'trac'
+    
     styles = {
         Whitespace:             '#bbbbbb',
         Comment:                'italic #999988',
@@ -52,6 +57,7 @@
         Generic.Error:          '#aa0000',
         Generic.Emph:           'italic',
         Generic.Strong:         'bold',
+        Generic.EmphStrong:     'bold italic',
         Generic.Prompt:         '#555555',
         Generic.Output:         '#888888',
         Generic.Traceback:      '#aa0000',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/vim.py pygments-2.17.2+dfsg/pygments/styles/vim.py
--- pygments-2.15.1+dfsg/pygments/styles/vim.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/vim.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,11 +13,16 @@
      Number, Operator, Generic, Whitespace, Token
 
 
+__all__ = ['VimStyle']
+
+
 class VimStyle(Style):
     """
     Styles somewhat like vim 7.0
     """
 
+    name = 'vim'
+    
     background_color = "#000000"
     highlight_color = "#222222"
 
@@ -53,6 +58,7 @@
         Generic.Error:             "#FF0000",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold #000080",
         Generic.Output:            "#888",
         Generic.Traceback:         "#04D",
diff -Nru pygments-2.15.1+dfsg/pygments/styles/vs.py pygments-2.17.2+dfsg/pygments/styles/vs.py
--- pygments-2.15.1+dfsg/pygments/styles/vs.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/vs.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,8 +13,12 @@
      Operator, Generic
 
 
-class VisualStudioStyle(Style):
+__all__ = ['VisualStudioStyle']
+
 
+class VisualStudioStyle(Style):
+    name = 'vs'
+    
     background_color = "#ffffff"
 
     styles = {
@@ -30,6 +34,7 @@
         Generic.Subheading:        "bold",
         Generic.Emph:              "italic",
         Generic.Strong:            "bold",
+        Generic.EmphStrong:        "bold italic",
         Generic.Prompt:            "bold",
 
         Error:                     "border:#FF0000"
diff -Nru pygments-2.15.1+dfsg/pygments/styles/xcode.py pygments-2.17.2+dfsg/pygments/styles/xcode.py
--- pygments-2.15.1+dfsg/pygments/styles/xcode.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/xcode.py	2020-02-02 00:00:00.000000000 +0000
@@ -13,11 +13,16 @@
      Number, Operator, Literal
 
 
+__all__ = ['XcodeStyle']
+
+
 class XcodeStyle(Style):
     """
     Style similar to the Xcode default colouring theme.
     """
 
+    name = 'xcode'
+    
     styles = {
         Comment:                '#177500',
         Comment.Preproc:        '#633820',
diff -Nru pygments-2.15.1+dfsg/pygments/styles/zenburn.py pygments-2.17.2+dfsg/pygments/styles/zenburn.py
--- pygments-2.15.1+dfsg/pygments/styles/zenburn.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/styles/zenburn.py	2020-02-02 00:00:00.000000000 +0000
@@ -16,11 +16,16 @@
     Number, String, Literal, Punctuation, Error
 
 
+__all__ = ['ZenburnStyle']
+
+
 class ZenburnStyle(Style):
     """
     Low contrast Zenburn style.
     """
 
+    name = 'zenburn'
+    
     background_color = '#3f3f3f'
     highlight_color = '#484848'
     line_number_color = '#5d6262'
diff -Nru pygments-2.15.1+dfsg/pygments/token.py pygments-2.17.2+dfsg/pygments/token.py
--- pygments-2.15.1+dfsg/pygments/token.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/pygments/token.py	2020-02-02 00:00:00.000000000 +0000
@@ -209,5 +209,6 @@
     Generic.Prompt:                'gp',
     Generic.Strong:                'gs',
     Generic.Subheading:            'gu',
+    Generic.EmphStrong:            'ges',
     Generic.Traceback:             'gt',
 }
diff -Nru pygments-2.15.1+dfsg/pyproject.toml pygments-2.17.2+dfsg/pyproject.toml
--- pygments-2.15.1+dfsg/pyproject.toml	2023-02-25 10:36:04.000000000 +0000
+++ pygments-2.17.2+dfsg/pyproject.toml	2020-02-02 00:00:00.000000000 +0000
@@ -1,7 +1,6 @@
 [build-system]
-# setuptools added pyproject.toml support in v61.0.0
-requires = ["setuptools >= 61"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "Pygments"
@@ -34,6 +33,7 @@
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Text Processing :: Filters",
@@ -42,6 +42,7 @@
 
 [project.optional-dependencies]
 plugins = ["importlib-metadata;python_version<'3.8'"]
+windows-terminal = ["colorama >= 0.4.6"]
 
 [project.urls]
 Homepage = "https://pygments.org"
@@ -53,8 +54,9 @@
 [project.scripts]
 pygmentize = "pygments.cmdline:main"
 
-[tool.setuptools.dynamic]
-version = {attr = "pygments.__version__" }
+# Temporary workaround for https://github.com/pypa/hatch/issues/1054
+[tool.hatch.build.targets.wheel]
+packages = ["pygments"]
 
-[tool.setuptools.packages.find]
-include = ["pygments", "pygments.*"]
+[tool.hatch.version]
+path = "pygments/__init__.py"
diff -Nru pygments-2.15.1+dfsg/requirements.txt pygments-2.17.2+dfsg/requirements.txt
--- pygments-2.15.1+dfsg/requirements.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/requirements.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,2 @@
+tox ~= 4.4
+# Other requirements are installed by tox.
diff -Nru pygments-2.15.1+dfsg/scripts/check_crlf.py pygments-2.17.2+dfsg/scripts/check_crlf.py
--- pygments-2.15.1+dfsg/scripts/check_crlf.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/scripts/check_crlf.py	2020-02-02 00:00:00.000000000 +0000
@@ -14,6 +14,7 @@
 import os
 
 if __name__ == '__main__':
+    error = False
     for directory in sys.argv[1:]:
         if not os.path.exists(directory):
             continue
@@ -27,6 +28,9 @@
                 with open(full_path, 'rb') as f:
                     if b'\r\n' in f.read():
                         print('CR/LF found in', full_path)
-                        sys.exit(1)
+                        error = True
+
+    if error:
+        sys.exit(1)
 
     sys.exit(0)
diff -Nru pygments-2.15.1+dfsg/scripts/gen_mapfiles.py pygments-2.17.2+dfsg/scripts/gen_mapfiles.py
--- pygments-2.15.1+dfsg/scripts/gen_mapfiles.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/scripts/gen_mapfiles.py	2020-02-02 00:00:00.000000000 +0000
@@ -19,7 +19,7 @@
 from pygments.util import docstring_headline
 
 def main():
-    for key in ['lexers', 'formatters']:
+    for key in ['lexers', 'formatters', 'styles']:
         lines = []
         for file in (pygments_package / key).glob('[!_]*.py'):
             module_name = '.'.join(file.relative_to(pygments_package.parent).with_suffix('').parts)
@@ -27,11 +27,13 @@
             module = import_module(module_name)
             for obj_name in module.__all__:
                 obj = getattr(module, obj_name)
-                desc = (module_name, obj.name, tuple(obj.aliases), tuple(obj.filenames))
+                desc = (module_name, obj.name, tuple(obj.aliases))
                 if key == 'lexers':
-                    desc += (tuple(obj.mimetypes),)
+                    desc += (tuple(obj.filenames), tuple(obj.mimetypes),)
                 elif key == 'formatters':
-                    desc += (docstring_headline(obj),)
+                    desc += (tuple(obj.filenames), docstring_headline(obj),)
+                elif key == 'styles':
+                    pass
                 else:
                     assert False
                 lines.append(f'    {obj_name!r}: {desc!r},')
diff -Nru pygments-2.15.1+dfsg/setup.cfg pygments-2.17.2+dfsg/setup.cfg
--- pygments-2.15.1+dfsg/setup.cfg	2023-04-18 18:45:02.000000000 +0000
+++ pygments-2.17.2+dfsg/setup.cfg	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
diff -Nru pygments-2.15.1+dfsg/tests/conftest.py pygments-2.17.2+dfsg/tests/conftest.py
--- pygments-2.15.1+dfsg/tests/conftest.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/conftest.py	2020-02-02 00:00:00.000000000 +0000
@@ -46,9 +46,15 @@
 
     def runtest(self):
         lexer = pygments.lexers.get_lexer_by_name(self.lexer)
-        tokens = lexer.get_tokens(self.input)
+        tokens = list(lexer.get_tokens(self.input))
         self.actual = '\n'.join(self._prettyprint_tokens(tokens)).rstrip('\n') + '\n'
-        if not self.config.getoption('--update-goldens'):
+        if self.config.getoption('--update-goldens'):
+            # Make sure the new golden output corresponds to the input.
+            output = ''.join(val for (tok, val) in tokens)
+            preproc_input = lexer._preprocess_lexer_input(self.input) # remove BOMs etc.
+            assert output == preproc_input
+        else:
+            # Make sure the output is the expected golden output
             assert self.actual == self.expected
 
     def _test_file_rel_path(self):
@@ -59,12 +65,18 @@
 
     def repr_failure(self, excinfo):
         if isinstance(excinfo.value, AssertionError):
-            rel_path = self._test_file_rel_path()
-            message = (
-                'The tokens produced by the "{}" lexer differ from the '
-                'expected ones in the file "{}".\n'
-                'Run `pytest {} --update-goldens` to update it.'
-            ).format(self.lexer, rel_path, Path(*rel_path.parts[:2]))
+            if self.config.getoption('--update-goldens'):
+                message = (
+                    f'The tokens produced by the "{self.lexer}" lexer '
+                    'do not add up to the input.'
+                )
+            else:
+                rel_path = self._test_file_rel_path()
+                message = (
+                    'The tokens produced by the "{}" lexer differ from the '
+                    'expected ones in the file "{}".\n'
+                    'Run `tox -- {} --update-goldens` to update it.'
+                ).format(self.lexer, rel_path, Path(*rel_path.parts[:2]))
             diff = str(excinfo.value).split('\n', 1)[-1]
             return message + '\n\n' + diff
         else:
diff -Nru pygments-2.15.1+dfsg/tests/contrast/min_contrasts.json pygments-2.17.2+dfsg/tests/contrast/min_contrasts.json
--- pygments-2.15.1+dfsg/tests/contrast/min_contrasts.json	2023-02-01 20:17:02.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/contrast/min_contrasts.json	2020-02-02 00:00:00.000000000 +0000
@@ -1,50 +1,50 @@
 {
+  "abap": 2.5,
+  "algol": 3.5,
+  "algol_nu": 3.5,
+  "arduino": 2.6,
+  "autumn": 2.2,
+  "bw": 21.0,
+  "borland": 2.3,
+  "colorful": 2.2,
   "default": 4.5,
+  "dracula": 1.4,
   "emacs": 2.4,
+  "fruity": 1.6,
   "friendly": 2.2,
   "friendly_grayscale": 2.2,
-  "colorful": 2.2,
-  "autumn": 2.2,
-  "murphy": 1.4,
+  "github-dark": 4.8,
+  "gruvbox-dark": 4.0,
+  "gruvbox-light": 3.2,
+  "igor": 3.6,
+  "inkpot": 1.0,
+  "lilypond": 2.3,
+  "lovelace": 3.5,
   "manni": 1.4,
   "material": 1.6,
-  "monokai": 2.3,
-  "perldoc": 2.7,
-  "pastie": 2.5,
-  "borland": 2.3,
-  "trac": 2.3,
+  "monokai": 4.6,
+  "murphy": 1.4,
   "native": 3.1,
-  "fruity": 1.6,
-  "bw": 21.0,
-  "vim": 1.3,
-  "vs": 3.6,
-  "tango": 2.4,
-  "rrt": 5.3,
-  "xcode": 5.1,
-  "igor": 3.6,
-  "paraiso-light": 1.3,
+  "nord": 2.4,
+  "nord-darker": 2.8,
+  "one-dark": 3.7,
   "paraiso-dark": 1.3,
-  "lovelace": 3.5,
-  "algol": 3.5,
-  "algol_nu": 3.5,
-  "arduino": 2.6,
+  "paraiso-light": 1.3,
+  "pastie": 2.5,
+  "perldoc": 2.7,
   "rainbow_dash": 2.1,
-  "abap": 2.5,
+  "rrt": 5.3,
+  "sas": 4.6,
   "solarized-dark": 1.5,
   "solarized-light": 1.0,
-  "sas": 4.6,
   "staroffice": 4.5,
   "stata": 2.4,
-  "stata-light": 2.4,
   "stata-dark": 3.4,
-  "inkpot": 1.0,
-  "zenburn": 1.6,
-  "gruvbox-dark": 4.0,
-  "gruvbox-light": 3.2,
-  "dracula": 1.4,
-  "one-dark": 3.7,
-  "lilypond": 2.3,
-  "nord": 2.4,
-  "nord-darker": 2.8,
-  "github-dark": 4.8
-}
\ No newline at end of file
+  "stata-light": 2.4,
+  "tango": 2.4,
+  "trac": 2.3,
+  "vim": 1.3,
+  "vs": 3.6,
+  "xcode": 5.1,
+  "zenburn": 1.6
+}
diff -Nru pygments-2.15.1+dfsg/tests/snippets/asn1/certificate.txt pygments-2.17.2+dfsg/tests/snippets/asn1/certificate.txt
--- pygments-2.15.1+dfsg/tests/snippets/asn1/certificate.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/asn1/certificate.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,147 @@
+---input---
+Certificate  ::=  SEQUENCE  {
+        tbsCertificate       TBSCertificate,
+        signatureAlgorithm   AlgorithmIdentifier,
+        signatureValue       BIT STRING  }
+
+TBSCertificate  ::=  SEQUENCE  {
+    version         [0]  EXPLICIT Version DEFAULT v1,
+    serialNumber         CertificateSerialNumber,
+    signature            AlgorithmIdentifier,
+    issuer               Name,
+    validity             Validity,
+    subject              Name,
+    subjectPublicKeyInfo SubjectPublicKeyInfo,
+    issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
+                            -- If present, version MUST be v2 or v3
+    subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
+                                -- If present, version MUST be v2 or v3
+    extensions      [3]  EXPLICIT Extensions OPTIONAL
+                        -- If present, version MUST be v3
+    }
+
+---tokens---
+'Certificate' Name.Type
+'  '          Text.Whitespace
+'::='         Operator
+'  '          Text.Whitespace
+'SEQUENCE'    Keyword.Declaration
+'  '          Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'tbsCertificate' Name.Variable
+'       '     Text.Whitespace
+'TBSCertificate' Name.Type
+','           Punctuation
+'\n        '  Text.Whitespace
+'signatureAlgorithm' Name.Variable
+'   '         Text.Whitespace
+'AlgorithmIdentifier' Name.Type
+','           Punctuation
+'\n        '  Text.Whitespace
+'signatureValue' Name.Variable
+'       '     Text.Whitespace
+'BIT STRING'  Keyword.Type
+'  '          Text.Whitespace
+'}'           Punctuation
+'\n\n'        Text.Whitespace
+
+'TBSCertificate' Name.Type
+'  '          Text.Whitespace
+'::='         Operator
+'  '          Text.Whitespace
+'SEQUENCE'    Keyword.Declaration
+'  '          Text.Whitespace
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'version'     Name.Variable
+'         '   Text.Whitespace
+'['           Punctuation
+'0'           Literal.Number.Integer
+']'           Punctuation
+'  '          Text.Whitespace
+'EXPLICIT'    Keyword
+' '           Text.Whitespace
+'Version'     Name.Type
+' '           Text.Whitespace
+'DEFAULT'     Keyword.Declaration
+' '           Text.Whitespace
+'v1'          Name.Variable
+','           Punctuation
+'\n    '      Text.Whitespace
+'serialNumber' Name.Variable
+'         '   Text.Whitespace
+'CertificateSerialNumber' Name.Type
+','           Punctuation
+'\n    '      Text.Whitespace
+'signature'   Name.Variable
+'            ' Text.Whitespace
+'AlgorithmIdentifier' Name.Type
+','           Punctuation
+'\n    '      Text.Whitespace
+'issuer'      Name.Variable
+'               ' Text.Whitespace
+'Name'        Name.Type
+','           Punctuation
+'\n    '      Text.Whitespace
+'validity'    Name.Variable
+'             ' Text.Whitespace
+'Validity'    Name.Type
+','           Punctuation
+'\n    '      Text.Whitespace
+'subject'     Name.Variable
+'              ' Text.Whitespace
+'Name'        Name.Type
+','           Punctuation
+'\n    '      Text.Whitespace
+'subjectPublicKeyInfo' Name.Variable
+' '           Text.Whitespace
+'SubjectPublicKeyInfo' Name.Type
+','           Punctuation
+'\n    '      Text.Whitespace
+'issuerUniqueID' Name.Variable
+'  '          Text.Whitespace
+'['           Punctuation
+'1'           Literal.Number.Integer
+']'           Punctuation
+'  '          Text.Whitespace
+'IMPLICIT'    Keyword
+' '           Text.Whitespace
+'UniqueIdentifier' Name.Type
+' '           Text.Whitespace
+'OPTIONAL'    Keyword.Declaration
+','           Punctuation
+'\n                            ' Text.Whitespace
+'-- If present, version MUST be v2 or v3' Comment.Single
+'\n    '      Text.Whitespace
+'subjectUniqueID' Name.Variable
+' '           Text.Whitespace
+'['           Punctuation
+'2'           Literal.Number.Integer
+']'           Punctuation
+'  '          Text.Whitespace
+'IMPLICIT'    Keyword
+' '           Text.Whitespace
+'UniqueIdentifier' Name.Type
+' '           Text.Whitespace
+'OPTIONAL'    Keyword.Declaration
+','           Punctuation
+'\n                                ' Text.Whitespace
+'-- If present, version MUST be v2 or v3' Comment.Single
+'\n    '      Text.Whitespace
+'extensions'  Name.Variable
+'      '      Text.Whitespace
+'['           Punctuation
+'3'           Literal.Number.Integer
+']'           Punctuation
+'  '          Text.Whitespace
+'EXPLICIT'    Keyword
+' '           Text.Whitespace
+'Extensions'  Name.Type
+' '           Text.Whitespace
+'OPTIONAL'    Keyword.Declaration
+'\n                        ' Text.Whitespace
+'-- If present, version MUST be v3' Comment.Single
+'\n    '      Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/asn1/nested-comment.txt pygments-2.17.2+dfsg/tests/snippets/asn1/nested-comment.txt
--- pygments-2.15.1+dfsg/tests/snippets/asn1/nested-comment.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/asn1/nested-comment.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,49 @@
+---input---
+/*
+   Outer comment
+   /*
+   Inner comment
+   */
+   Outer comment
+*/
+
+test  ::=  SEQUENCE  {
+        a   INTEGER,
+        b   OCTET STRING,
+        b   BIT STRING  }
+
+---tokens---
+'/*'          Comment.Multiline
+'\n   Outer comment\n   ' Comment.Multiline
+'/*'          Comment.Multiline
+'\n   Inner comment\n   ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n   Outer comment\n' Comment.Multiline
+
+'*/'          Comment.Multiline
+'\n\n'        Text.Whitespace
+
+'test'        Name.Variable
+'  '          Text.Whitespace
+'::='         Operator
+'  '          Text.Whitespace
+'SEQUENCE'    Keyword.Declaration
+'  '          Text.Whitespace
+'{'           Punctuation
+'\n        '  Text.Whitespace
+'a'           Error
+'   '         Text.Whitespace
+'INTEGER'     Keyword.Type
+','           Punctuation
+'\n        '  Text.Whitespace
+'b'           Error
+'   '         Text.Whitespace
+'OCTET STRING' Keyword.Type
+','           Punctuation
+'\n        '  Text.Whitespace
+'b'           Error
+'   '         Text.Whitespace
+'BIT STRING'  Keyword.Type
+'  '          Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/bqn/test_arguments.txt pygments-2.17.2+dfsg/tests/snippets/bqn/test_arguments.txt
--- pygments-2.15.1+dfsg/tests/snippets/bqn/test_arguments.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/bqn/test_arguments.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,28 @@
+---input---
+Ambiv ← { ⟨1,𝕩⟩ ; ⟨2,𝕨,𝕩⟩ }
+
+---tokens---
+'Ambiv'       Operator
+' '           Text.Whitespace
+'←'           Keyword.Declaration
+' '           Text.Whitespace
+'{'           Keyword.Type
+' '           Text.Whitespace
+'⟨'           Punctuation
+'1'           Literal.Number
+','           Punctuation
+'𝕩'           Name.Entity
+'⟩'           Punctuation
+' '           Text.Whitespace
+';'           Name.Entity
+' '           Text.Whitespace
+'⟨'           Punctuation
+'2'           Literal.Number
+','           Punctuation
+'𝕨'           Name.Entity
+','           Punctuation
+'𝕩'           Name.Entity
+'⟩'           Punctuation
+' '           Text.Whitespace
+'}'           Keyword.Type
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/bqn/test_comment.txt pygments-2.17.2+dfsg/tests/snippets/bqn/test_comment.txt
--- pygments-2.15.1+dfsg/tests/snippets/bqn/test_comment.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/bqn/test_comment.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,12 @@
+---input---
+'#' - 1  #This is the comment
+
+---tokens---
+"'#'"         Literal.String.Single
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number
+'  '          Text.Whitespace
+'#This is the comment' Comment.Single
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/bqn/test_define.txt pygments-2.17.2+dfsg/tests/snippets/bqn/test_define.txt
--- pygments-2.15.1+dfsg/tests/snippets/bqn/test_define.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/bqn/test_define.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,42 @@
+---input---
+⟨alias⇐a, b⟩ ← {
+  b‿c⇐
+  a⇐2
+  c←÷b↩1+a
+}
+
+---tokens---
+'⟨'           Punctuation
+'alias'       Name.Variable
+'⇐'           Keyword.Declaration
+'a'           Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'b'           Name.Variable
+'⟩'           Punctuation
+' '           Text.Whitespace
+'←'           Keyword.Declaration
+' '           Text.Whitespace
+'{'           Keyword.Type
+'\n  '        Text.Whitespace
+'b'           Name.Variable
+'‿'           Punctuation
+'c'           Name.Variable
+'⇐'           Keyword.Declaration
+'\n  '        Text.Whitespace
+'a'           Name.Variable
+'⇐'           Keyword.Declaration
+'2'           Literal.Number
+'\n  '        Text.Whitespace
+'c'           Name.Variable
+'←'           Keyword.Declaration
+'÷'           Operator
+'b'           Name.Variable
+'↩'           Keyword.Declaration
+'1'           Literal.Number
+'+'           Operator
+'a'           Name.Variable
+'\n'          Text.Whitespace
+
+'}'           Keyword.Type
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/bqn/test_syntax_roles.txt pygments-2.17.2+dfsg/tests/snippets/bqn/test_syntax_roles.txt
--- pygments-2.15.1+dfsg/tests/snippets/bqn/test_syntax_roles.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/bqn/test_syntax_roles.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,23 @@
+---input---
+⟨ט,√⟩ {𝕎𝕩}⌜ 1‿4‿9
+
+---tokens---
+'⟨'           Punctuation
+'×'           Operator
+'˜'           Name.Attribute
+','           Punctuation
+'√'           Operator
+'⟩'           Punctuation
+' '           Text.Whitespace
+'{'           Keyword.Type
+'𝕎'           Operator
+'𝕩'           Name.Entity
+'}'           Keyword.Type
+'⌜'           Name.Attribute
+' '           Text.Whitespace
+'1'           Literal.Number
+'‿'           Punctuation
+'4'           Literal.Number
+'‿'           Punctuation
+'9'           Literal.Number
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/c/builtin_types.txt pygments-2.17.2+dfsg/tests/snippets/c/builtin_types.txt
--- pygments-2.15.1+dfsg/tests/snippets/c/builtin_types.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/c/builtin_types.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,13 @@
+---input---
+__int128
+_BitInt(2)
+
+---tokens---
+'__int128'    Keyword.Type
+'\n'          Text.Whitespace
+
+'_BitInt'     Keyword.Type
+'('           Punctuation
+'2'           Literal.Number.Integer
+')'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/carbon/unterminated_comment.txt pygments-2.17.2+dfsg/tests/snippets/carbon/unterminated_comment.txt
--- pygments-2.15.1+dfsg/tests/snippets/carbon/unterminated_comment.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/carbon/unterminated_comment.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,80 @@
+---input---
+/*
+This
+is
+a
+long
+unterminated
+comment
+with
+many
+newlines.
+
+It
+should
+take
+a
+reasonable
+time
+to
+lex.
+
+---tokens---
+'/'           Operator
+'*'           Operator
+'\n'          Text.Whitespace
+
+'This'        Name.Other
+'\n'          Text.Whitespace
+
+'is'          Keyword
+'\n'          Text.Whitespace
+
+'a'           Name.Other
+'\n'          Text.Whitespace
+
+'long'        Name.Other
+'\n'          Text.Whitespace
+
+'unterminated' Name.Other
+'\n'          Text.Whitespace
+
+'comment'     Name.Other
+'\n'          Text.Whitespace
+
+'with'        Name.Other
+'\n'          Text.Whitespace
+
+'many'        Name.Other
+'\n'          Text.Whitespace
+
+'newlines'    Name.Other
+'.'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'It'          Name.Other
+'\n'          Text.Whitespace
+
+'should'      Name.Other
+'\n'          Text.Whitespace
+
+'take'        Name.Other
+'\n'          Text.Whitespace
+
+'a'           Name.Other
+'\n'          Text.Whitespace
+
+'reasonable'  Name.Other
+'\n'          Text.Whitespace
+
+'time'        Name.Other
+'\n'          Text.Whitespace
+
+'to'          Name.Other
+'\n'          Text.Whitespace
+
+'lex'         Name.Other
+'.'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/cpp/alternative_tokens.txt pygments-2.17.2+dfsg/tests/snippets/cpp/alternative_tokens.txt
--- pygments-2.15.1+dfsg/tests/snippets/cpp/alternative_tokens.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/cpp/alternative_tokens.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,46 @@
+---input---
+and
+and_eq
+bitand
+bitor
+compl
+not
+not_eq
+or
+or_eq
+xor
+xor_eq
+
+---tokens---
+'and'         Keyword
+'\n'          Text.Whitespace
+
+'and_eq'      Keyword
+'\n'          Text.Whitespace
+
+'bitand'      Keyword
+'\n'          Text.Whitespace
+
+'bitor'       Keyword
+'\n'          Text.Whitespace
+
+'compl'       Keyword
+'\n'          Text.Whitespace
+
+'not'         Keyword
+'\n'          Text.Whitespace
+
+'not_eq'      Keyword
+'\n'          Text.Whitespace
+
+'or'          Keyword
+'\n'          Text.Whitespace
+
+'or_eq'       Keyword
+'\n'          Text.Whitespace
+
+'xor'         Keyword
+'\n'          Text.Whitespace
+
+'xor_eq'      Keyword
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/cpp/extension_keywords.txt pygments-2.17.2+dfsg/tests/snippets/cpp/extension_keywords.txt
--- pygments-2.15.1+dfsg/tests/snippets/cpp/extension_keywords.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/cpp/extension_keywords.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,17 @@
+---input---
+__restrict
+__int128
+_BitInt(2)
+
+---tokens---
+'__restrict'  Keyword
+'\n'          Text.Whitespace
+
+'__int128'    Keyword.Type
+'\n'          Text.Whitespace
+
+'_BitInt'     Keyword.Type
+'('           Punctuation
+'2'           Literal.Number.Integer
+')'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/desktop/example.txt pygments-2.17.2+dfsg/tests/snippets/desktop/example.txt
--- pygments-2.15.1+dfsg/tests/snippets/desktop/example.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/desktop/example.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,107 @@
+---input---
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Foo Viewer
+Comment=The best viewer for Foo objects available!
+Comment[fr]=Le meilleur visionneur d'objets Foo disponible !
+TryExec=fooview
+Exec=fooview %F
+Icon=fooview
+MimeType=image/x-foo;
+Actions=Gallery;Create;
+
+[Desktop Action Gallery]
+Exec=fooview --gallery
+Name=Browse Gallery
+
+[Desktop Action Create]
+Exec=fooview --create-new
+Name=Create a new Foo!
+Icon=fooview-new
+
+---tokens---
+'[Desktop Entry]' Keyword
+'\n'          Text.Whitespace
+
+'Version'     Name.Attribute
+'='           Operator
+'1.0'         Literal.String
+'\n'          Text.Whitespace
+
+'Type'        Name.Attribute
+'='           Operator
+'Application' Literal.String
+'\n'          Text.Whitespace
+
+'Name'        Name.Attribute
+'='           Operator
+'Foo Viewer'  Literal.String
+'\n'          Text.Whitespace
+
+'Comment'     Name.Attribute
+'='           Operator
+'The best viewer for Foo objects available!' Literal.String
+'\n'          Text.Whitespace
+
+'Comment'     Name.Attribute
+'[fr]'        Name.Namespace
+'='           Operator
+"Le meilleur visionneur d'objets Foo disponible !" Literal.String
+'\n'          Text.Whitespace
+
+'TryExec'     Name.Attribute
+'='           Operator
+'fooview'     Literal.String
+'\n'          Text.Whitespace
+
+'Exec'        Name.Attribute
+'='           Operator
+'fooview %F'  Literal.String
+'\n'          Text.Whitespace
+
+'Icon'        Name.Attribute
+'='           Operator
+'fooview'     Literal.String
+'\n'          Text.Whitespace
+
+'MimeType'    Name.Attribute
+'='           Operator
+'image/x-foo;' Literal.String
+'\n'          Text.Whitespace
+
+'Actions'     Name.Attribute
+'='           Operator
+'Gallery;Create;' Literal.String
+'\n\n'        Text.Whitespace
+
+'[Desktop Action Gallery]' Keyword
+'\n'          Text.Whitespace
+
+'Exec'        Name.Attribute
+'='           Operator
+'fooview --gallery' Literal.String
+'\n'          Text.Whitespace
+
+'Name'        Name.Attribute
+'='           Operator
+'Browse Gallery' Literal.String
+'\n\n'        Text.Whitespace
+
+'[Desktop Action Create]' Keyword
+'\n'          Text.Whitespace
+
+'Exec'        Name.Attribute
+'='           Operator
+'fooview --create-new' Literal.String
+'\n'          Text.Whitespace
+
+'Name'        Name.Attribute
+'='           Operator
+'Create a new Foo!' Literal.String
+'\n'          Text.Whitespace
+
+'Icon'        Name.Attribute
+'='           Operator
+'fooview-new' Literal.String
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/elpi/test_quotations.txt pygments-2.17.2+dfsg/tests/snippets/elpi/test_quotations.txt
--- pygments-2.15.1+dfsg/tests/snippets/elpi/test_quotations.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/elpi/test_quotations.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,33 @@
+---input---
+tc {{ Eq lp:A }} {{ f lp:B l } }} :- foo A B.
+
+---tokens---
+'tc'          Text
+' '           Text.Whitespace
+'{{'          Punctuation
+' Eq '        Text
+'lp:'         Keyword
+'A'           Name.Variable
+' '           Text
+'}}'          Punctuation
+' '           Text.Whitespace
+'{{'          Punctuation
+' f '         Text
+'lp:'         Keyword
+'B'           Name.Variable
+' '           Text
+'l'           Text
+' '           Text
+'}'           Text
+' '           Text
+'}}'          Punctuation
+' '           Text.Whitespace
+':-'          Keyword.Declaration
+' '           Text.Whitespace
+'foo'         Text
+' '           Text.Whitespace
+'A'           Name.Variable
+' '           Text.Whitespace
+'B'           Name.Variable
+'.'           Operator
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/http/test_urlencoded.txt pygments-2.17.2+dfsg/tests/snippets/http/test_urlencoded.txt
--- pygments-2.15.1+dfsg/tests/snippets/http/test_urlencoded.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/http/test_urlencoded.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,41 @@
+---input---
+POST /login HTTP/1.1
+Content-Type: application/x-www-form-urlencoded
+Content-Length: 50
+
+login=foo&password=12345
+
+
+---tokens---
+'POST'        Name.Function
+' '           Text
+'/login'      Name.Namespace
+' '           Text
+'HTTP'        Keyword.Reserved
+'/'           Operator
+'1.1'         Literal.Number
+'\n'          Text
+
+'Content-Type' Name.Attribute
+''            Text
+':'           Operator
+' '           Text
+'application/x-www-form-urlencoded' Literal
+'\n'          Text
+
+'Content-Length' Name.Attribute
+''            Text
+':'           Operator
+' '           Text
+'50'          Literal
+'\n'          Text
+
+'\n'          Text
+
+'login'       Name.Tag
+'='           Operator
+'foo'         Literal.String
+'&'           Punctuation
+'password'    Name.Tag
+'='           Operator
+'12345\n'     Literal.String
diff -Nru pygments-2.15.1+dfsg/tests/snippets/jsx/test_aria_attribute.txt pygments-2.17.2+dfsg/tests/snippets/jsx/test_aria_attribute.txt
--- pygments-2.15.1+dfsg/tests/snippets/jsx/test_aria_attribute.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/jsx/test_aria_attribute.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,16 @@
+---input---
+<button aria-label="Submit">Submit</button>
+
+---tokens---
+'<'           Punctuation
+'button'      Name.Tag
+' '           Text.Whitespace
+'aria-label'  Name.Attribute
+'='           Operator
+'"Submit"'    Literal.String
+'>'           Punctuation
+'Submit'      Name.Other
+'</'          Punctuation
+'button'      Name.Tag
+'>'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/jsx/test_arrow_function_attribute.txt pygments-2.17.2+dfsg/tests/snippets/jsx/test_arrow_function_attribute.txt
--- pygments-2.15.1+dfsg/tests/snippets/jsx/test_arrow_function_attribute.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/jsx/test_arrow_function_attribute.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,25 @@
+---input---
+<button onClick={e => e.preventDefault ()} />
+
+---tokens---
+'<'           Punctuation
+'button'      Name.Tag
+' '           Text.Whitespace
+'onClick'     Name.Attribute
+'='           Operator
+'{'           Punctuation
+'e'           Name.Other
+' '           Text.Whitespace
+'=>'          Punctuation
+' '           Text.Whitespace
+'e'           Name.Other
+'.'           Punctuation
+'preventDefault' Name.Other
+' '           Text.Whitespace
+'('           Punctuation
+')'           Punctuation
+'}'           Punctuation
+' '           Text.Whitespace
+'/'           Punctuation
+'>'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/jsx/test_fragment.txt pygments-2.17.2+dfsg/tests/snippets/jsx/test_fragment.txt
--- pygments-2.15.1+dfsg/tests/snippets/jsx/test_fragment.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/jsx/test_fragment.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,15 @@
+---input---
+<React.Fragment></React.Fragment>
+
+---tokens---
+'<'           Punctuation
+'React'       Name.Tag
+'.'           Punctuation
+'Fragment'    Name.Attribute
+'>'           Punctuation
+'</'          Punctuation
+'React'       Name.Tag
+'.'           Punctuation
+'Fragment'    Name.Attribute
+'>'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/jsx/test_function_returning_jsx.text pygments-2.17.2+dfsg/tests/snippets/jsx/test_function_returning_jsx.text
--- pygments-2.15.1+dfsg/tests/snippets/jsx/test_function_returning_jsx.text	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/jsx/test_function_returning_jsx.text	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,25 @@
+---input---
+<Component wrapped={data => <User name={data.name} />} />
+
+---tokens---
+'<'         Token.Punctuation
+'Component' Token.Name.Tag
+'wrapped'   Token.Name.Attribute
+'='         Token.Operator
+'{'         Token.Punctuation
+'data'      Token.Name.Other
+'=>'        Token.Punctuation
+'<'         Token.Punctuation
+'User'      Token.Name.Tag
+'name'      Token.Name.Attribute
+'='         Token.Operator
+'{'         Token.Punctuation
+'data'      Token.Name.Other
+'.'         Token.Punctuation
+'name'      Token.Name.Other
+'}'         Token.Punctuation
+'/'         Token.Punctuation
+'>'         Token.Punctuation
+'}'         Token.Punctuation
+'/'         Token.Punctuation
+'>'         Token.Punctuation
diff -Nru pygments-2.15.1+dfsg/tests/snippets/jsx/test_multiple_attributes.txt pygments-2.17.2+dfsg/tests/snippets/jsx/test_multiple_attributes.txt
--- pygments-2.15.1+dfsg/tests/snippets/jsx/test_multiple_attributes.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/jsx/test_multiple_attributes.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,22 @@
+---input---
+<User name={'john'} last={'doe'} />
+
+---tokens---
+'<'           Punctuation
+'User'        Name.Tag
+' '           Text.Whitespace
+'name'        Name.Attribute
+'='           Operator
+'{'           Punctuation
+"'john'"      Literal.String.Single
+'}'           Punctuation
+' '           Text.Whitespace
+'last'        Name.Attribute
+'='           Operator
+'{'           Punctuation
+"'doe'"       Literal.String.Single
+'}'           Punctuation
+' '           Text.Whitespace
+'/'           Punctuation
+'>'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/jsx/test_object_attribute.txt pygments-2.17.2+dfsg/tests/snippets/jsx/test_object_attribute.txt
--- pygments-2.15.1+dfsg/tests/snippets/jsx/test_object_attribute.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/jsx/test_object_attribute.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,23 @@
+---input---
+<div style={{ color: 'red' }} />
+
+---tokens---
+'<'           Punctuation
+'div'         Name.Tag
+' '           Text.Whitespace
+'style'       Name.Attribute
+'='           Operator
+'{'           Punctuation
+'{'           Punctuation
+' '           Text.Whitespace
+'color'       Name.Other
+':'           Operator
+' '           Text.Whitespace
+"'red'"       Literal.String.Single
+' '           Text.Whitespace
+'}'           Punctuation
+'}'           Punctuation
+' '           Text.Whitespace
+'/'           Punctuation
+'>'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/jsx/test_short_syntax.txt pygments-2.17.2+dfsg/tests/snippets/jsx/test_short_syntax.txt
--- pygments-2.15.1+dfsg/tests/snippets/jsx/test_short_syntax.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/jsx/test_short_syntax.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,7 @@
+---input---
+<></>
+
+---tokens---
+'<>'          Punctuation
+'</>'         Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/kusto/test_kusto.txt pygments-2.17.2+dfsg/tests/snippets/kusto/test_kusto.txt
--- pygments-2.15.1+dfsg/tests/snippets/kusto/test_kusto.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/kusto/test_kusto.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,59 @@
+---input---
+StormEvents
+| where StartTime between (datetime(2007-11-01) .. datetime(2007-12-01))
+| where State == "FLORIDA"
+| count
+
+---tokens---
+'StormEvents' Name
+'\n'          Text.Whitespace
+
+'|'           Punctuation
+' '           Text.Whitespace
+'where'       Keyword
+' '           Text.Whitespace
+'StartTime'   Name
+' '           Text.Whitespace
+'between'     Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'datetime'    Keyword
+'('           Punctuation
+'2007'        Literal.Number.Integer
+'-'           Punctuation
+'11'          Literal.Number.Integer
+'-'           Punctuation
+'01'          Literal.Number.Integer
+')'           Punctuation
+' '           Text.Whitespace
+'.'           Error
+'.'           Error
+' '           Text.Whitespace
+'datetime'    Keyword
+'('           Punctuation
+'2007'        Literal.Number.Integer
+'-'           Punctuation
+'12'          Literal.Number.Integer
+'-'           Punctuation
+'01'          Literal.Number.Integer
+')'           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'|'           Punctuation
+' '           Text.Whitespace
+'where'       Keyword
+' '           Text.Whitespace
+'State'       Name
+' '           Text.Whitespace
+'=='          Punctuation
+' '           Text.Whitespace
+'"'           Literal.String
+'FLORIDA'     Literal.String
+'"'           Literal.String
+'\n'          Text.Whitespace
+
+'|'           Punctuation
+' '           Text.Whitespace
+'count'       Keyword
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/markdown/test_code.txt pygments-2.17.2+dfsg/tests/snippets/markdown/test_code.txt
--- pygments-2.15.1+dfsg/tests/snippets/markdown/test_code.txt	2023-03-29 19:10:25.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/markdown/test_code.txt	2020-02-02 00:00:00.000000000 +0000
@@ -17,6 +17,12 @@
 foo
 ```
 
+Code fence with extra stuff after the language name:
+
+```shell-session $?
+$ unknown
+```
+
 ---tokens---
 'Code'        Text
 ' '           Text
@@ -38,7 +44,7 @@
 
 '\n```'       Literal.String.Backtick
 'python'      Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword.Namespace
 ' '           Text
@@ -60,13 +66,43 @@
 'language:'   Text
 '\n'          Text.Whitespace
 
+'\n```'       Literal.String.Backtick
+'invalid-lexer' Literal.String.Backtick
 '\n'          Text.Whitespace
 
-'```invalid-lexer' Text
+'foo\n'       Literal.String
+
+'```\n'       Literal.String.Backtick
+
 '\n'          Text.Whitespace
 
-'foo'         Text
+'Code'        Text
+' '           Text
+'fence'       Text
+' '           Text
+'with'        Text
+' '           Text
+'extra'       Text
+' '           Text
+'stuff'       Text
+' '           Text
+'after'       Text
+' '           Text
+'the'         Text
+' '           Text
+'language'    Text
+' '           Text
+'name:'       Text
 '\n'          Text.Whitespace
 
-'```'         Text
+'\n```'       Literal.String.Backtick
+'shell-session' Literal.String.Backtick
+' '           Text.Whitespace
+'$?'          Text
+'\n'          Text.Whitespace
+
+'$ '          Generic.Prompt
+'unknown'     Text
 '\n'          Text.Whitespace
+
+'```\n'       Literal.String.Backtick
diff -Nru pygments-2.15.1+dfsg/tests/snippets/md/test_code_block_with_language.txt pygments-2.17.2+dfsg/tests/snippets/md/test_code_block_with_language.txt
--- pygments-2.15.1+dfsg/tests/snippets/md/test_code_block_with_language.txt	2023-03-11 12:47:16.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/md/test_code_block_with_language.txt	2020-02-02 00:00:00.000000000 +0000
@@ -6,7 +6,7 @@
 ---tokens---
 '```'         Literal.String.Backtick
 'python'      Literal.String.Backtick
-'\n'          Text
+'\n'          Text.Whitespace
 
 'import'      Keyword.Namespace
 ' '           Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/basic_values.txt pygments-2.17.2+dfsg/tests/snippets/nix/basic_values.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/basic_values.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/basic_values.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,125 @@
+---input---
+"hello world"
+
+"hello ${ { a = "world"; }.a }"
+
+"1 2 ${toString 3}"
+
+"${pkgs.bash}/bin/sh"
+
+true, false, null, 123, 3.141
+
+-1
+
+/etc
+./foo.png
+~/.config
+
+<nixpkgs>
+
+''
+  multi
+   line
+    string
+''
+
+''
+  multi
+   ${value}
+    string
+''
+
+---tokens---
+'"'           Literal.String.Double
+'hello world' Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'hello '      Literal.String.Double
+'${'          Literal.String.Interpol
+' '           Text
+'{'           Punctuation
+' '           Text
+'a'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'"'           Literal.String.Double
+'world'       Literal.String.Double
+'"'           Literal.String.Double
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+'.'           Operator
+'a'           Text
+' '           Text
+'}'           Literal.String.Interpol
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'1 2 '        Literal.String.Double
+'${'          Literal.String.Interpol
+'toString'    Name.Builtin
+' '           Text
+'3'           Literal.Number.Integer
+'}'           Literal.String.Interpol
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'${'          Literal.String.Interpol
+'pkgs'        Text
+'.'           Operator
+'bash'        Text
+'}'           Literal.String.Interpol
+'/bin/sh'     Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'true'        Name.Constant
+','           Punctuation
+' '           Text
+'false'       Name.Constant
+','           Punctuation
+' '           Text
+'null'        Name.Constant
+','           Punctuation
+' '           Text
+'123'         Literal.Number.Integer
+','           Punctuation
+' '           Text
+'3.141'       Literal.Number.Float
+'\n\n'        Text
+
+'-1'          Literal.Number.Integer
+'\n\n'        Text
+
+'/etc'        Literal
+'\n'          Text
+
+'./foo.png'   Literal
+'\n'          Text
+
+'~/.config'   Literal
+'\n\n'        Text
+
+'<nixpkgs>'   Literal
+'\n\n'        Text
+
+"''"          Literal.String.Multiline
+'\n  multi\n   line\n    string\n' Literal.String.Multiline
+
+"''"          Literal.String.Multiline
+'\n\n'        Text
+
+"''"          Literal.String.Multiline
+'\n  multi\n   ' Literal.String.Multiline
+'${'          Literal.String.Interpol
+'value'       Text
+'}'           Literal.String.Interpol
+'\n    string\n' Literal.String.Multiline
+
+"''"          Literal.String.Multiline
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/built_in.txt pygments-2.17.2+dfsg/tests/snippets/nix/built_in.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/built_in.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/built_in.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,34 @@
+---input---
+import ./foo.nix
+
+map (x: x + x) [ 1 2 3 ]
+
+---tokens---
+'import'      Name.Builtin
+' '           Text
+'./foo.nix'   Literal
+'\n\n'        Text
+
+'map'         Name.Builtin
+' '           Text
+'('           Punctuation
+'x'           Text
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'x'           Text
+')'           Punctuation
+' '           Text
+'['           Punctuation
+' '           Text
+'1'           Literal.Number.Integer
+' '           Text
+'2'           Literal.Number.Integer
+' '           Text
+'3'           Literal.Number.Integer
+' '           Text
+']'           Punctuation
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/comments.txt pygments-2.17.2+dfsg/tests/snippets/nix/comments.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/comments.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/comments.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,16 @@
+---input---
+# single line comment
+
+/* multi
+line
+comment */
+
+
+---tokens---
+'# single line comment' Comment.Single
+'\n\n'        Text
+
+'/*'          Comment.Multiline
+' multi\nline\ncomment ' Comment.Multiline
+'*/'          Comment.Multiline
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/compound_values.txt pygments-2.17.2+dfsg/tests/snippets/nix/compound_values.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/compound_values.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/compound_values.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,140 @@
+---input---
+{ x = 1; y = 2; }
+
+{ foo.bar = 1; }
+
+rec { x = "foo"; y = x + "bar"; }
+
+[ "foo" "bar" "baz" ]
+
+[ 1 2 3 ]
+
+[ (f 1) { a = 1; b = 2; } [ "c" ] ]
+
+---tokens---
+'{'           Punctuation
+' '           Text
+'x'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'1'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'y'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'2'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+'\n\n'        Text
+
+'{'           Punctuation
+' '           Text
+'foo'         Text
+'.'           Operator
+'bar'         Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'1'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+'\n\n'        Text
+
+'rec'         Keyword
+' '           Text
+'{'           Punctuation
+' '           Text
+'x'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'"'           Literal.String.Double
+'foo'         Literal.String.Double
+'"'           Literal.String.Double
+';'           Punctuation
+' '           Text
+'y'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+'\n\n'        Text
+
+'['           Punctuation
+' '           Text
+'"'           Literal.String.Double
+'foo'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'"'           Literal.String.Double
+'baz'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+']'           Punctuation
+'\n\n'        Text
+
+'['           Punctuation
+' '           Text
+'1'           Literal.Number.Integer
+' '           Text
+'2'           Literal.Number.Integer
+' '           Text
+'3'           Literal.Number.Integer
+' '           Text
+']'           Punctuation
+'\n\n'        Text
+
+'['           Punctuation
+' '           Text
+'('           Punctuation
+'f'           Text
+' '           Text
+'1'           Literal.Number.Integer
+')'           Punctuation
+' '           Text
+'{'           Punctuation
+' '           Text
+'a'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'1'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'b'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'2'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+' '           Text
+'['           Punctuation
+' '           Text
+'"'           Literal.String.Double
+'c'           Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+']'           Punctuation
+' '           Text
+']'           Punctuation
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/computed_property_names.txt pygments-2.17.2+dfsg/tests/snippets/nix/computed_property_names.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/computed_property_names.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/computed_property_names.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,56 @@
+---input---
+let
+  bar = "bar";
+in {
+  foo.${bar} = 3;
+  foo.${bar + "bar"} = 3;
+}
+
+---tokens---
+'let'         Keyword
+'\n  '        Text
+'bar'         Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+';'           Punctuation
+'\n'          Text
+
+'in'          Keyword
+' '           Text
+'{'           Punctuation
+'\n  '        Text
+'foo'         Text
+'.'           Operator
+'${'          Literal.String.Interpol
+'bar'         Text
+'}'           Literal.String.Interpol
+' '           Text
+'='           Operator
+' '           Text
+'3'           Literal.Number.Integer
+';'           Punctuation
+'\n  '        Text
+'foo'         Text
+'.'           Operator
+'${'          Literal.String.Interpol
+'bar'         Text
+' '           Text
+'+'           Operator
+' '           Text
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+'}'           Literal.String.Interpol
+' '           Text
+'='           Operator
+' '           Text
+'3'           Literal.Number.Integer
+';'           Punctuation
+'\n'          Text
+
+'}'           Punctuation
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/control_structures.txt pygments-2.17.2+dfsg/tests/snippets/nix/control_structures.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/control_structures.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/control_structures.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,99 @@
+---input---
+if 1 + 1 == 2 then "yes!" else "no!"
+
+assert 1 + 1 == 2; "yes!"
+
+let x = "foo"; y = "bar"; in x + y
+
+with builtins; head [ 1 2 3 ]
+
+---tokens---
+'if'          Keyword
+' '           Text
+'1'           Literal.Number.Integer
+' '           Text
+'+'           Operator
+' '           Text
+'1'           Literal.Number.Integer
+' '           Text
+'=='          Operator
+' '           Text
+'2'           Literal.Number.Integer
+' '           Text
+'then'        Keyword
+' '           Text
+'"'           Literal.String.Double
+'yes!'        Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'else'        Keyword
+' '           Text
+'"'           Literal.String.Double
+'no!'         Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'assert'      Keyword
+' '           Text
+'1'           Literal.Number.Integer
+' '           Text
+'+'           Operator
+' '           Text
+'1'           Literal.Number.Integer
+' '           Text
+'=='          Operator
+' '           Text
+'2'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'"'           Literal.String.Double
+'yes!'        Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'let'         Keyword
+' '           Text
+'x'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'"'           Literal.String.Double
+'foo'         Literal.String.Double
+'"'           Literal.String.Double
+';'           Punctuation
+' '           Text
+'y'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+';'           Punctuation
+' '           Text
+'in'          Keyword
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'y'           Text
+'\n\n'        Text
+
+'with'        Keyword
+' '           Text
+'builtins'    Name.Builtin
+';'           Punctuation
+' '           Text
+'head'        Text
+' '           Text
+'['           Punctuation
+' '           Text
+'1'           Literal.Number.Integer
+' '           Text
+'2'           Literal.Number.Integer
+' '           Text
+'3'           Literal.Number.Integer
+' '           Text
+']'           Punctuation
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/floats.txt pygments-2.17.2+dfsg/tests/snippets/nix/floats.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/floats.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/floats.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,26 @@
+---input---
+0.3
+.1
+0.1e4
+-3.0
+0.1E-4
+0.2e+4
+
+---tokens---
+'0.3'         Literal.Number.Float
+'\n'          Text
+
+'.1'          Literal.Number.Float
+'\n'          Text
+
+'0.1e4'       Literal.Number.Float
+'\n'          Text
+
+'-3.0'        Literal.Number.Float
+'\n'          Text
+
+'0.1E-4'      Literal.Number.Float
+'\n'          Text
+
+'0.2e+4'      Literal.Number.Float
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/functions.txt pygments-2.17.2+dfsg/tests/snippets/nix/functions.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/functions.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/functions.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,219 @@
+---input---
+x: x + 1
+
+
+A function that expects an integer and returns it increased by 1
+
+x: y: x + y
+
+(x: x + 1) 100
+
+let inc = x: x + 1; in inc (inc (inc 100))
+
+{ x, y }: x + y
+
+{ x, y ? "bar" }: x + y
+
+{ x, y, ... }: x + y
+
+{ x, y } @ args: x + y
+
+args @ { x, y }: x + y
+
+---tokens---
+'x'           Text
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'1'           Literal.Number.Integer
+'\n\n\n'      Text
+
+'A'           Text
+' '           Text
+'function'    Text
+' '           Text
+'that'        Text
+' '           Text
+'expects'     Text
+' '           Text
+'an'          Text
+' '           Text
+'integer'     Text
+' '           Text
+'and'         Operator.Word
+' '           Text
+'returns'     Text
+' '           Text
+'it'          Text
+' '           Text
+'increased'   Text
+' '           Text
+'by'          Text
+' '           Text
+'1'           Literal.Number.Integer
+'\n\n'        Text
+
+'x'           Text
+':'           Punctuation
+' '           Text
+'y'           Text
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'y'           Text
+'\n\n'        Text
+
+'('           Punctuation
+'x'           Text
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'1'           Literal.Number.Integer
+')'           Punctuation
+' '           Text
+'100'         Literal.Number.Integer
+'\n\n'        Text
+
+'let'         Keyword
+' '           Text
+'inc'         Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'x'           Text
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'1'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'in'          Keyword
+' '           Text
+'inc'         Text
+' '           Text
+'('           Punctuation
+'inc'         Text
+' '           Text
+'('           Punctuation
+'inc'         Text
+' '           Text
+'100'         Literal.Number.Integer
+')'           Punctuation
+')'           Punctuation
+'\n\n'        Text
+
+'{'           Punctuation
+' '           Text
+'x'           Text
+','           Punctuation
+' '           Text
+'y'           Text
+' '           Text
+'}'           Punctuation
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'y'           Text
+'\n\n'        Text
+
+'{'           Punctuation
+' '           Text
+'x'           Text
+','           Punctuation
+' '           Text
+'y'           Text
+' '           Text
+'?'           Operator
+' '           Text
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'}'           Punctuation
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'y'           Text
+'\n\n'        Text
+
+'{'           Punctuation
+' '           Text
+'x'           Text
+','           Punctuation
+' '           Text
+'y'           Text
+','           Punctuation
+' '           Text
+'.'           Operator
+'.'           Operator
+'.'           Operator
+' '           Text
+'}'           Punctuation
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'y'           Text
+'\n\n'        Text
+
+'{'           Punctuation
+' '           Text
+'x'           Text
+','           Punctuation
+' '           Text
+'y'           Text
+' '           Text
+'}'           Punctuation
+' '           Text
+'@'           Punctuation
+' '           Text
+'args'        Text
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'y'           Text
+'\n\n'        Text
+
+'args'        Text
+' '           Text
+'@'           Punctuation
+' '           Text
+'{'           Punctuation
+' '           Text
+'x'           Text
+','           Punctuation
+' '           Text
+'y'           Text
+' '           Text
+'}'           Punctuation
+':'           Punctuation
+' '           Text
+'x'           Text
+' '           Text
+'+'           Operator
+' '           Text
+'y'           Text
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/operators.txt pygments-2.17.2+dfsg/tests/snippets/nix/operators.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/operators.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/operators.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,186 @@
+---input---
+"foo" + "bar"
+
+1 + 2
+
+2 / 1
+
+"foo" == "f" + "oo"
+
+"foo" != "bar"
+
+!true
+
+2 * 2 < 5
+
+5 > 1
+
+2 - 1
+
+{ x = 1; y = 2; }.x
+
+{ x = 1; y = 2; }.z or 3
+
+{ x = 1; y = 2; } // { z = 3; }
+
+---tokens---
+'"'           Literal.String.Double
+'foo'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'+'           Operator
+' '           Text
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'1'           Literal.Number.Integer
+' '           Text
+'+'           Operator
+' '           Text
+'2'           Literal.Number.Integer
+'\n\n'        Text
+
+'2'           Literal.Number.Integer
+' '           Text
+'/'           Operator
+' '           Text
+'1'           Literal.Number.Integer
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'foo'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'=='          Operator
+' '           Text
+'"'           Literal.String.Double
+'f'           Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'+'           Operator
+' '           Text
+'"'           Literal.String.Double
+'oo'          Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'foo'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'!'           Operator
+'='           Operator
+' '           Text
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'!'           Operator
+'true'        Name.Constant
+'\n\n'        Text
+
+'2'           Literal.Number.Integer
+' '           Text
+'*'           Operator
+' '           Text
+'2'           Literal.Number.Integer
+' '           Text
+'<'           Operator
+' '           Text
+'5'           Literal.Number.Integer
+'\n\n'        Text
+
+'5'           Literal.Number.Integer
+' '           Text
+'>'           Operator
+' '           Text
+'1'           Literal.Number.Integer
+'\n\n'        Text
+
+'2'           Literal.Number.Integer
+' '           Text
+'-'           Operator
+' '           Text
+'1'           Literal.Number.Integer
+'\n\n'        Text
+
+'{'           Punctuation
+' '           Text
+'x'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'1'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'y'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'2'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+'.'           Operator
+'x'           Text
+'\n\n'        Text
+
+'{'           Punctuation
+' '           Text
+'x'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'1'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'y'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'2'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+'.'           Operator
+'z'           Text
+' '           Text
+'or'          Operator.Word
+' '           Text
+'3'           Literal.Number.Integer
+'\n\n'        Text
+
+'{'           Punctuation
+' '           Text
+'x'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'1'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'y'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'2'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+' '           Text
+'//'          Operator
+' '           Text
+'{'           Punctuation
+' '           Text
+'z'           Literal.String.Symbol
+' '           Text
+'='           Operator
+' '           Text
+'3'           Literal.Number.Integer
+';'           Punctuation
+' '           Text
+'}'           Punctuation
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/nix/string_escape.txt pygments-2.17.2+dfsg/tests/snippets/nix/string_escape.txt
--- pygments-2.15.1+dfsg/tests/snippets/nix/string_escape.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/nix/string_escape.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,101 @@
+---input---
+''
+  ''\t ''\n ''\r ''' ''$ '
+''
+
+"\"\$${builtins.toString maxArgIndex}\""
+
+"\n"
+
+"cp \"$(nix-build -A ${attr})\" \"$0\" > /dev/null"
+
+"$" #
+
+''$'' #
+
+" \ "
+
+'' ''\ ''
+
+---tokens---
+"''"          Literal.String.Multiline
+'\n  '        Literal.String.Multiline
+"''\\t"       Literal.String.Escape
+' '           Literal.String.Multiline
+"''\\n"       Literal.String.Escape
+' '           Literal.String.Multiline
+"''\\r"       Literal.String.Escape
+' '           Literal.String.Multiline
+"'''"         Literal.String.Escape
+' '           Literal.String.Multiline
+"''$"         Literal.String.Escape
+' '           Literal.String.Multiline
+"'\n"         Literal.String.Multiline
+
+"''"          Literal.String.Multiline
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'\\"'         Literal.String.Escape
+'\\$'         Literal.String.Escape
+'${'          Literal.String.Interpol
+'builtins'    Name.Builtin
+'.'           Operator
+'toString'    Name.Builtin
+' '           Text
+'maxArgIndex' Text
+'}'           Literal.String.Interpol
+'\\"'         Literal.String.Escape
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'\\n'         Literal.String.Escape
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'cp '         Literal.String.Double
+'\\"'         Literal.String.Escape
+'$('          Literal.String.Double
+'nix-build -A ' Literal.String.Double
+'${'          Literal.String.Interpol
+'attr'        Text
+'}'           Literal.String.Interpol
+')'           Literal.String.Double
+'\\"'         Literal.String.Escape
+' '           Literal.String.Double
+'\\"'         Literal.String.Escape
+'$0'          Literal.String.Double
+'\\"'         Literal.String.Escape
+' > /dev/null' Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+'"'           Literal.String.Double
+'$'           Literal.String.Double
+'"'           Literal.String.Double
+' '           Text
+'#'           Comment.Single
+'\n\n'        Text
+
+"''"          Literal.String.Multiline
+'$'           Literal.String.Multiline
+"''"          Literal.String.Multiline
+' '           Text
+'#'           Comment.Single
+'\n\n'        Text
+
+'"'           Literal.String.Double
+' '           Literal.String.Double
+'\\'          Literal.String.Double
+' '           Literal.String.Double
+'"'           Literal.String.Double
+'\n\n'        Text
+
+"''"          Literal.String.Multiline
+' '           Literal.String.Multiline
+"''\\"        Literal.String.Escape
+' '           Literal.String.Multiline
+"''"          Literal.String.Multiline
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/openscad/test_basic.txt pygments-2.17.2+dfsg/tests/snippets/openscad/test_basic.txt
--- pygments-2.15.1+dfsg/tests/snippets/openscad/test_basic.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/openscad/test_basic.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,391 @@
+---input---
+
+include <threads.scad>
+
+/*
+   Multiline comment
+*/
+
+egg(1500);
+
+// Single line comment
+// TODO: add a line
+
+module egg(length, start=-1000, end=-1000) {
+    rotate_extrude()
+    translate([0, -length/2, 0])
+    rotate([0, 0, 90])
+    polygon(egg_half_poly(
+        length,
+        start == -1000 ? 0 : start,
+        end == -1000 ? length : end
+    ));
+}
+
+function egg_half_poly(length, start, end) =
+    concat(
+    [[start, 0]],
+        [for (x=[start : (release ? 0.5 : 1) : end]) [x, egg_eq(x - length/2, length)]],
+        [[end, 0]]
+    );
+
+function egg_eq(x, length) =
+    length / 1.25 / 2 * sqrt(
+        (length * length - 4 * x * x) /
+        (length * length + 8 * egg_w * x + 4 * egg_w * egg_w)
+    );
+
+
+---tokens---
+'include'     Keyword.Namespace
+' '           Text
+'<'           Punctuation
+'threads.scad' Comment.PreprocFile
+'>'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'/*'          Comment.Multiline
+'\n   Multiline comment\n' Comment.Multiline
+
+'*/'          Comment.Multiline
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'egg'         Name
+'('           Punctuation
+'1500'        Literal.Number
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'//'          Comment.Single
+' Single line comment' Comment.Single
+'\n'          Text
+
+'//'          Comment.Single
+' TODO: add a line' Comment.Single
+'\n'          Text
+
+'\n'          Text.Whitespace
+
+'module'      Keyword.Namespace
+' '           Text.Whitespace
+'egg'         Name.Namespace
+'('           Punctuation
+'length'      Name
+','           Punctuation
+' '           Text.Whitespace
+'start'       Name
+'='           Operator
+'-'           Operator
+'1000'        Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'end'         Name
+'='           Operator
+'-'           Operator
+'1000'        Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'rotate_extrude' Name.Builtin
+'('           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'translate'   Name.Builtin
+'('           Punctuation
+'['           Punctuation
+'0'           Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'-'           Operator
+'length'      Name
+'/'           Operator
+'2'           Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number
+']'           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'rotate'      Name.Builtin
+'('           Punctuation
+'['           Punctuation
+'0'           Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'90'          Literal.Number
+']'           Punctuation
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'polygon'     Name.Builtin
+'('           Punctuation
+'egg_half_poly' Name
+'('           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'length'      Name
+','           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'start'       Name
+' '           Text.Whitespace
+'='           Operator
+'='           Operator
+' '           Text.Whitespace
+'-'           Operator
+'1000'        Literal.Number
+' '           Text.Whitespace
+'?'           Operator
+' '           Text.Whitespace
+'0'           Literal.Number
+' '           Text.Whitespace
+':'           Punctuation
+' '           Text.Whitespace
+'start'       Name
+','           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'end'         Name
+' '           Text.Whitespace
+'='           Operator
+'='           Operator
+' '           Text.Whitespace
+'-'           Operator
+'1000'        Literal.Number
+' '           Text.Whitespace
+'?'           Operator
+' '           Text.Whitespace
+'length'      Name
+' '           Text.Whitespace
+':'           Punctuation
+' '           Text.Whitespace
+'end'         Name
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+')'           Punctuation
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'function'    Keyword.Declaration
+' '           Text.Whitespace
+'egg_half_poly' Name.Function
+'('           Punctuation
+'length'      Name
+','           Punctuation
+' '           Text.Whitespace
+'start'       Name
+','           Punctuation
+' '           Text.Whitespace
+'end'         Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'concat'      Name.Builtin
+'('           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'['           Punctuation
+'['           Punctuation
+'start'       Name
+','           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number
+']'           Punctuation
+']'           Punctuation
+','           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'['           Punctuation
+'for'         Keyword
+' '           Text.Whitespace
+'('           Punctuation
+'x'           Name
+'='           Operator
+'['           Punctuation
+'start'       Name
+' '           Text.Whitespace
+':'           Punctuation
+' '           Text.Whitespace
+'('           Punctuation
+'release'     Name
+' '           Text.Whitespace
+'?'           Operator
+' '           Text.Whitespace
+'0.5'         Literal.Number
+' '           Text.Whitespace
+':'           Punctuation
+' '           Text.Whitespace
+'1'           Literal.Number
+')'           Punctuation
+' '           Text.Whitespace
+':'           Punctuation
+' '           Text.Whitespace
+'end'         Name
+']'           Punctuation
+')'           Punctuation
+' '           Text.Whitespace
+'['           Punctuation
+'x'           Name
+','           Punctuation
+' '           Text.Whitespace
+'egg_eq'      Name
+'('           Punctuation
+'x'           Name
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'length'      Name
+'/'           Operator
+'2'           Literal.Number
+','           Punctuation
+' '           Text.Whitespace
+'length'      Name
+')'           Punctuation
+']'           Punctuation
+']'           Punctuation
+','           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'['           Punctuation
+'['           Punctuation
+'end'         Name
+','           Punctuation
+' '           Text.Whitespace
+'0'           Literal.Number
+']'           Punctuation
+']'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'function'    Keyword.Declaration
+' '           Text.Whitespace
+'egg_eq'      Name.Function
+'('           Punctuation
+'x'           Name
+','           Punctuation
+' '           Text.Whitespace
+'length'      Name
+')'           Punctuation
+' '           Text.Whitespace
+'='           Operator
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+'length'      Name
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'1.25'        Literal.Number
+' '           Text.Whitespace
+'/'           Operator
+' '           Text.Whitespace
+'2'           Literal.Number
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'sqrt'        Name.Builtin
+'('           Punctuation
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'('           Punctuation
+'length'      Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'length'      Name
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'4'           Literal.Number
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'x'           Name
+')'           Punctuation
+' '           Text.Whitespace
+'/'           Operator
+'\n'          Text.Whitespace
+
+'        '    Text.Whitespace
+'('           Punctuation
+'length'      Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'length'      Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'8'           Literal.Number
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'egg_w'       Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'x'           Name
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'4'           Literal.Number
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'egg_w'       Name
+' '           Text.Whitespace
+'*'           Operator
+' '           Text.Whitespace
+'egg_w'       Name
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'    '        Text.Whitespace
+')'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/prql/filename.txt pygments-2.17.2+dfsg/tests/snippets/prql/filename.txt
--- pygments-2.15.1+dfsg/tests/snippets/prql/filename.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/prql/filename.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,188 @@
+---input---
+from invoices
+filter invoice_date >= @1970-01-16
+derive {
+  transaction_fees = 0.8,
+  income = total - transaction_fees
+}
+filter income > 1
+group customer_id (
+  aggregate {
+    average total,
+    sum_income = sum income,
+    ct = count total,
+  }
+)
+sort {-sum_income}
+take 10
+join c=customers (==customer_id)
+derive name = f"{c.last_name}, {c.first_name}"
+select {
+  c.customer_id, name, sum_income
+}
+derive db_version = s"version()"
+
+---tokens---
+'from'        Name.Variable
+' '           Text.Whitespace
+'invoices'    Name.Variable
+'\n'          Text.Whitespace
+
+'filter'      Name.Variable
+' '           Text.Whitespace
+'invoice_date' Name.Variable
+' '           Text.Whitespace
+'>='          Operator
+' '           Text.Whitespace
+'@1970-01-16' Literal.Date
+'\n'          Text.Whitespace
+
+'derive'      Name.Variable
+' '           Text.Whitespace
+'{'           Punctuation
+'\n  '        Text.Whitespace
+'transaction_fees' Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'0.8'         Literal.Number.Float
+','           Punctuation
+'\n  '        Text.Whitespace
+'income'      Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'total'       Name.Variable
+' '           Text.Whitespace
+'-'           Operator
+' '           Text.Whitespace
+'transaction_fees' Name.Variable
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'filter'      Name.Variable
+' '           Text.Whitespace
+'income'      Name.Variable
+' '           Text.Whitespace
+'>'           Operator
+' '           Text.Whitespace
+'1'           Literal.Number.Integer
+'\n'          Text.Whitespace
+
+'group'       Name.Variable
+' '           Text.Whitespace
+'customer_id' Name.Variable
+' '           Text.Whitespace
+'('           Punctuation
+'\n  '        Text.Whitespace
+'aggregate'   Name.Variable
+' '           Text.Whitespace
+'{'           Punctuation
+'\n    '      Text.Whitespace
+'average'     Name.Function
+' '           Text.Whitespace
+'total'       Name.Variable
+','           Punctuation
+'\n    '      Text.Whitespace
+'sum_income'  Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'sum'         Name.Function
+' '           Text.Whitespace
+'income'      Name.Variable
+','           Punctuation
+'\n    '      Text.Whitespace
+'ct'          Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'count'       Name.Function
+' '           Text.Whitespace
+'total'       Name.Variable
+','           Punctuation
+'\n  '        Text.Whitespace
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'sort'        Name.Variable
+' '           Text.Whitespace
+'{'           Punctuation
+'-'           Operator
+'sum_income'  Name.Variable
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'take'        Name.Variable
+' '           Text.Whitespace
+'10'          Literal.Number.Integer
+'\n'          Text.Whitespace
+
+'join'        Name.Variable
+' '           Text.Whitespace
+'c'           Name.Variable
+'='           Operator
+'customers'   Name.Variable
+' '           Text.Whitespace
+'('           Punctuation
+'=='          Operator
+'customer_id' Name.Variable
+')'           Punctuation
+'\n'          Text.Whitespace
+
+'derive'      Name.Variable
+' '           Text.Whitespace
+'name'        Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'f'           Literal.String.Affix
+'"'           Literal.String.Double
+'{'           Literal.String.Interpol
+'c'           Name.Variable
+'.'           Operator
+'last_name'   Name.Variable
+'}'           Literal.String.Interpol
+', '          Literal.String.Double
+'{'           Literal.String.Interpol
+'c'           Name.Variable
+'.'           Operator
+'first_name'  Name.Variable
+'}'           Literal.String.Interpol
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'select'      Name.Variable
+' '           Text.Whitespace
+'{'           Punctuation
+'\n  '        Text.Whitespace
+'c'           Name.Variable
+'.'           Operator
+'customer_id' Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'name'        Name.Variable
+','           Punctuation
+' '           Text.Whitespace
+'sum_income'  Name.Variable
+'\n'          Text.Whitespace
+
+'}'           Punctuation
+'\n'          Text.Whitespace
+
+'derive'      Name.Variable
+' '           Text.Whitespace
+'db_version'  Name.Variable
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'s'           Literal.String.Affix
+'"'           Literal.String.Double
+'version()'   Literal.String.Double
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/prql/fstring.txt pygments-2.17.2+dfsg/tests/snippets/prql/fstring.txt
--- pygments-2.15.1+dfsg/tests/snippets/prql/fstring.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/prql/fstring.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,13 @@
+---input---
+f"Hello {name}!"
+
+---tokens---
+'f'           Literal.String.Affix
+'"'           Literal.String.Double
+'Hello '      Literal.String.Double
+'{'           Literal.String.Interpol
+'name'        Name.Variable
+'}'           Literal.String.Interpol
+'!'           Literal.String.Double
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/prql/rstring.txt pygments-2.17.2+dfsg/tests/snippets/prql/rstring.txt
--- pygments-2.15.1+dfsg/tests/snippets/prql/rstring.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/prql/rstring.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,11 @@
+---input---
+r"Not \n escaped"
+
+---tokens---
+'r'           Literal.String.Affix
+'"'           Literal.String.Double
+'Not '        Literal.String.Double
+'\\'          Literal.String.Double
+'n escaped'   Literal.String.Double
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/prql/sstring.txt pygments-2.17.2+dfsg/tests/snippets/prql/sstring.txt
--- pygments-2.15.1+dfsg/tests/snippets/prql/sstring.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/prql/sstring.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,9 @@
+---input---
+s"version()"
+
+---tokens---
+'s'           Literal.String.Affix
+'"'           Literal.String.Double
+'version()'   Literal.String.Double
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/ptx/test_ptx_snippet.txt pygments-2.17.2+dfsg/tests/snippets/ptx/test_ptx_snippet.txt
--- pygments-2.15.1+dfsg/tests/snippets/ptx/test_ptx_snippet.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/ptx/test_ptx_snippet.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,311 @@
+---input---
+.const  .u32 foo = 42;
+.global .u32 bar[] = { 2, 3, 5 };
+.global .u32 p1 = foo;          // offset of foo in .const space
+.global .u32 p2 = generic(foo); // generic address of foo
+
+// array of generic-address pointers to elements of bar
+.global .u32 parr[] = { generic(bar), generic(bar)+4,
+generic(bar)+8 };
+
+// examples using mask() operator are pruned for brevity
+.global .u8 addr[] = {0xff(foo), 0xff00(foo), 0xff0000(foo), ...};
+
+.global .u8 addr2[] = {0xff(foo+4), 0xff00(foo+4), 0xff0000(foo+4),...}
+
+.global .u8 addr3[] = {0xff(generic(foo)), 0xff00(generic(foo)),...}
+
+.global .u8 addr4[] = {0xff(generic(foo)+4), 0xff00(generic(foo)+4),...}
+
+// mask() operator with integer const expression
+.global .u8 addr5[] = { 0xFF(1000 + 546), 0xFF00(131187), ...};
+
+---tokens---
+'.const'      Keyword.Pseudo
+'  '          Text.Whitespace
+'.u32'        Keyword.Type
+' '           Text.Whitespace
+'foo'         Name.Variable
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'42'          Literal.Number
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u32'        Keyword.Type
+' '           Text.Whitespace
+'bar'         Keyword
+'['           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'2'           Literal.Number
+','           Operator
+' '           Text.Whitespace
+'3'           Literal.Number
+','           Operator
+' '           Text.Whitespace
+'5'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u32'        Keyword.Type
+' '           Text.Whitespace
+'p1'          Name.Variable
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'foo'         Name.Variable
+';'           Punctuation
+'          '  Text.Whitespace
+'// offset of foo in .const space\n' Comment
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u32'        Keyword.Type
+' '           Text.Whitespace
+'p2'          Name.Variable
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'generic'     Name.Variable
+'('           Punctuation
+'foo'         Name.Variable
+')'           Punctuation
+';'           Punctuation
+' '           Text.Whitespace
+'// generic address of foo\n' Comment
+
+'\n'          Text.Whitespace
+
+'// array of generic-address pointers to elements of bar\n' Comment
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u32'        Keyword.Type
+' '           Text.Whitespace
+'parr'        Name.Variable
+'['           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'generic'     Name.Variable
+'('           Punctuation
+'bar'         Keyword
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'generic'     Name.Variable
+'('           Punctuation
+'bar'         Keyword
+')'           Punctuation
+'+'           Operator
+'4'           Literal.Number
+','           Operator
+'\n'          Text.Whitespace
+
+'generic'     Name.Variable
+'('           Punctuation
+'bar'         Keyword
+')'           Punctuation
+'+'           Operator
+'8'           Literal.Number
+' '           Text.Whitespace
+'}'           Punctuation
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'// examples using mask() operator are pruned for brevity\n' Comment
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u8'         Keyword.Type
+' '           Text.Whitespace
+'add'         Keyword
+'r'           Name.Variable
+'['           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'0xff'        Literal.Number
+'('           Punctuation
+'foo'         Name.Variable
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'0xff00'      Literal.Number
+'('           Punctuation
+'foo'         Name.Variable
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'0xff0000'    Literal.Number
+'('           Punctuation
+'foo'         Name.Variable
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'...'         Name.Variable
+'}'           Punctuation
+';'           Punctuation
+'\n\n'        Text.Whitespace
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u8'         Keyword.Type
+' '           Text.Whitespace
+'add'         Keyword
+'r2'          Name.Variable
+'['           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'0xff'        Literal.Number
+'('           Punctuation
+'foo'         Name.Variable
+'+'           Operator
+'4'           Literal.Number
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'0xff00'      Literal.Number
+'('           Punctuation
+'foo'         Name.Variable
+'+'           Operator
+'4'           Literal.Number
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'0xff0000'    Literal.Number
+'('           Punctuation
+'foo'         Name.Variable
+'+'           Operator
+'4'           Literal.Number
+')'           Punctuation
+','           Operator
+'...'         Name.Variable
+'}'           Punctuation
+'\n\n'        Text.Whitespace
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u8'         Keyword.Type
+' '           Text.Whitespace
+'add'         Keyword
+'r3'          Name.Variable
+'['           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'0xff'        Literal.Number
+'('           Punctuation
+'generic'     Name.Variable
+'('           Punctuation
+'foo'         Name.Variable
+')'           Punctuation
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'0xff00'      Literal.Number
+'('           Punctuation
+'generic'     Name.Variable
+'('           Punctuation
+'foo'         Name.Variable
+')'           Punctuation
+')'           Punctuation
+','           Operator
+'...'         Name.Variable
+'}'           Punctuation
+'\n\n'        Text.Whitespace
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u8'         Keyword.Type
+' '           Text.Whitespace
+'add'         Keyword
+'r4'          Name.Variable
+'['           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+'0xff'        Literal.Number
+'('           Punctuation
+'generic'     Name.Variable
+'('           Punctuation
+'foo'         Name.Variable
+')'           Punctuation
+'+'           Operator
+'4'           Literal.Number
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'0xff00'      Literal.Number
+'('           Punctuation
+'generic'     Name.Variable
+'('           Punctuation
+'foo'         Name.Variable
+')'           Punctuation
+'+'           Operator
+'4'           Literal.Number
+')'           Punctuation
+','           Operator
+'...'         Name.Variable
+'}'           Punctuation
+'\n\n'        Text.Whitespace
+
+'// mask() operator with integer const expression\n' Comment
+
+'.global'     Keyword.Pseudo
+' '           Text.Whitespace
+'.u8'         Keyword.Type
+' '           Text.Whitespace
+'add'         Keyword
+'r5'          Name.Variable
+'['           Punctuation
+']'           Punctuation
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'0xFF'        Literal.Number
+'('           Punctuation
+'1000'        Literal.Number
+' '           Text.Whitespace
+'+'           Operator
+' '           Text.Whitespace
+'546'         Literal.Number
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'0xFF00'      Literal.Number
+'('           Punctuation
+'131187'      Literal.Number
+')'           Punctuation
+','           Operator
+' '           Text.Whitespace
+'...'         Name.Variable
+'}'           Punctuation
+';'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/systemd/example1.txt pygments-2.17.2+dfsg/tests/snippets/systemd/example1.txt
--- pygments-2.15.1+dfsg/tests/snippets/systemd/example1.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/systemd/example1.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,77 @@
+---input---
+[Section A]
+KeyOne=value 1
+KeyTwo=value 2
+
+# a comment
+
+[Section B]
+Setting="something" "some thing" "…"
+KeyTwo=value 2 \
+       value 2 continued
+
+[Section C]
+KeyThree=value 3\
+# this line is ignored
+; this line is ignored too
+       value 3 continued
+
+---tokens---
+'[Section A]' Keyword
+'\n'          Text.Whitespace
+
+'KeyOne'      Name.Attribute
+'='           Operator
+'value 1'     Literal.String
+'\n'          Text.Whitespace
+
+'KeyTwo'      Name.Attribute
+'='           Operator
+'value 2'     Literal.String
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'# a comment' Comment.Single
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'[Section B]' Keyword
+'\n'          Text.Whitespace
+
+'Setting'     Name.Attribute
+'='           Operator
+'"something" "some thing" "…"' Literal.String
+'\n'          Text.Whitespace
+
+'KeyTwo'      Name.Attribute
+'='           Operator
+'value 2 '    Literal.String
+'\\'          Text
+'\n'          Text.Whitespace
+
+'       '     Text.Whitespace
+'value 2 continued' Literal.String
+'\n'          Text.Whitespace
+
+'\n'          Text.Whitespace
+
+'[Section C]' Keyword
+'\n'          Text.Whitespace
+
+'KeyThree'    Name.Attribute
+'='           Operator
+'value 3'     Literal.String
+'\\'          Text
+'\n'          Text.Whitespace
+
+'# this line is ignored' Comment.Single
+'\n'          Text.Whitespace
+
+'; this line is ignored too' Comment.Single
+'\n'          Text.Whitespace
+
+'       '     Text.Whitespace
+'value 3 continued' Literal.String
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/toml/bool-comment.txt pygments-2.17.2+dfsg/tests/snippets/toml/bool-comment.txt
--- pygments-2.15.1+dfsg/tests/snippets/toml/bool-comment.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/toml/bool-comment.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,12 @@
+---input---
+foo = true # comment used to prevent bool from being recognized
+
+---tokens---
+'foo'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'true'        Keyword.Constant
+' '           Text.Whitespace
+'# comment used to prevent bool from being recognized' Comment.Single
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/toml/comment-section-header.txt pygments-2.17.2+dfsg/tests/snippets/toml/comment-section-header.txt
--- pygments-2.15.1+dfsg/tests/snippets/toml/comment-section-header.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/toml/comment-section-header.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,20 @@
+---input---
+[example] # A comment can appear on the same line as a section header
+foo = "bar"
+
+---tokens---
+'['           Keyword
+'example'     Keyword
+']'           Keyword
+' '           Text.Whitespace
+'# A comment can appear on the same line as a section header' Comment.Single
+'\n'          Text.Whitespace
+
+'foo'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'bar'         Literal.String.Double
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/toml/multiline-string-comment.txt pygments-2.17.2+dfsg/tests/snippets/toml/multiline-string-comment.txt
--- pygments-2.15.1+dfsg/tests/snippets/toml/multiline-string-comment.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/toml/multiline-string-comment.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,15 @@
+---input---
+message = """multiline strings
+            can be followed by""" # comments
+
+---tokens---
+'message'     Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"""'         Literal.String.Double
+'multiline strings\n            can be followed by' Literal.String.Double
+'"""'         Literal.String.Double
+' '           Text.Whitespace
+'# comments'  Comment.Single
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/toml/number-keys.txt pygments-2.17.2+dfsg/tests/snippets/toml/number-keys.txt
--- pygments-2.15.1+dfsg/tests/snippets/toml/number-keys.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/toml/number-keys.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,64 @@
+---input---
+1234 = "foo" # 1234 is a name
+foo = 1234 # 1234 is a number
+foo2 = [
+  1234, # number
+  { 1234 = "foo", foo = 1234 } # name then number
+]
+
+---tokens---
+'1234'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'foo'         Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'# 1234 is a name' Comment.Single
+'\n'          Text.Whitespace
+
+'foo'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'1234'        Literal.Number.Integer
+' '           Text.Whitespace
+'# 1234 is a number' Comment.Single
+'\n'          Text.Whitespace
+
+'foo2'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'['           Punctuation
+'\n  '        Text.Whitespace
+'1234'        Literal.Number.Integer
+','           Punctuation
+' '           Text.Whitespace
+'# number'    Comment.Single
+'\n  '        Text.Whitespace
+'{'           Punctuation
+' '           Text.Whitespace
+'1234'        Name
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'foo'         Literal.String.Double
+'"'           Literal.String.Double
+','           Punctuation
+' '           Text.Whitespace
+'foo'         Name
+' '           Text.Whitespace
+'='           Punctuation
+' '           Text.Whitespace
+'1234'        Literal.Number.Integer
+' '           Text.Whitespace
+'}'           Punctuation
+' '           Text.Whitespace
+'# name then number' Comment.Single
+'\n'          Text.Whitespace
+
+']'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/toml/section-header-whitespace.txt pygments-2.17.2+dfsg/tests/snippets/toml/section-header-whitespace.txt
--- pygments-2.15.1+dfsg/tests/snippets/toml/section-header-whitespace.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/toml/section-header-whitespace.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,16 @@
+---input---
+[ foo . bar ] # whitespace allowed in table headers
+
+---tokens---
+'['           Keyword
+' '           Text.Whitespace
+'foo'         Keyword
+' '           Text.Whitespace
+'.'           Keyword
+' '           Text.Whitespace
+'bar'         Keyword
+' '           Text.Whitespace
+']'           Keyword
+' '           Text.Whitespace
+'# whitespace allowed in table headers' Comment.Single
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/toml/string-escapes.txt pygments-2.17.2+dfsg/tests/snippets/toml/string-escapes.txt
--- pygments-2.15.1+dfsg/tests/snippets/toml/string-escapes.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/toml/string-escapes.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,86 @@
+---input---
+[strings]
+basic-string = "I'm a basic string. I can contain 'single quotes', \u0055nicode escapes \U0001f61b \U0001F61B, \"escaped\" double quotes, \n and \t more."
+literal-string = 'I am literal string. Escapes like \this have no effect on me. I can contain "double quotes".'
+multiline-basic-string = """
+I'm a multiline basic string.
+I can span several lines and contain 'single' and "double" quotes
+as well as \u0055nicode escapes. Line continuations \
+   work too.
+"""
+multiline-literal-string = '''
+I'm a "multiline" 'literal' string.
+Escapes like \this have no effect on me. Neither does this: \
+   it is not a line continuation.'''
+
+---tokens---
+'['           Keyword
+'strings'     Keyword
+']'           Keyword
+'\n'          Text.Whitespace
+
+'basic-string' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+"I'm a basic string. I can contain 'single quotes', " Literal.String.Double
+'\\u0055'     Literal.String.Escape
+'nicode escapes ' Literal.String.Double
+'\\U0001f61b' Literal.String.Escape
+' '           Literal.String.Double
+'\\U0001F61B' Literal.String.Escape
+', '          Literal.String.Double
+'\\"'         Literal.String.Escape
+'escaped'     Literal.String.Double
+'\\"'         Literal.String.Escape
+' double quotes, ' Literal.String.Double
+'\\n'         Literal.String.Escape
+' and '       Literal.String.Double
+'\\t'         Literal.String.Escape
+' more.'      Literal.String.Double
+'"'           Literal.String.Double
+'\n'          Text.Whitespace
+
+'literal-string' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+"'"           Literal.String.Single
+'I am literal string. Escapes like \\this have no effect on me. I can contain "double quotes".\'' Literal.String.Single
+'\n'          Text.Whitespace
+
+'multiline-basic-string' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"""'         Literal.String.Double
+"\nI'm a multiline basic string.\nI can span several lines and contain 'single' and " Literal.String.Double
+'"'           Literal.String.Double
+'double'      Literal.String.Double
+'"'           Literal.String.Double
+' quotes\nas well as ' Literal.String.Double
+'\\u0055'     Literal.String.Escape
+'nicode escapes. Line continuations ' Literal.String.Double
+'\\'          Literal.String.Escape
+'\n'          Text.Whitespace
+
+'   work too.\n' Literal.String.Double
+
+'"""'         Literal.String.Double
+'\n'          Text.Whitespace
+
+'multiline-literal-string' Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+"'''"         Literal.String.Single
+'\nI'         Literal.String.Single
+"'"           Literal.String.Single
+'m a "multiline" ' Literal.String.Single
+"'"           Literal.String.Single
+'literal'     Literal.String.Single
+"'"           Literal.String.Single
+' string.\nEscapes like \\this have no effect on me. Neither does this: \\\n   it is not a line continuation.' Literal.String.Single
+"'''"         Literal.String.Single
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/toml/strings-eager.txt pygments-2.17.2+dfsg/tests/snippets/toml/strings-eager.txt
--- pygments-2.15.1+dfsg/tests/snippets/toml/strings-eager.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/toml/strings-eager.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,49 @@
+---input---
+foo = "this string should" # not extend into the comment that contains "quotes"
+bar = 'same with a' # basic 'string'
+baz = """same with a""" # multiline """basic string"""
+spam = '''same with a''' # multiline '''literal string'''
+
+---tokens---
+'foo'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"'           Literal.String.Double
+'this string should' Literal.String.Double
+'"'           Literal.String.Double
+' '           Text.Whitespace
+'# not extend into the comment that contains "quotes"' Comment.Single
+'\n'          Text.Whitespace
+
+'bar'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+"'"           Literal.String.Single
+"same with a'" Literal.String.Single
+' '           Text.Whitespace
+"# basic 'string'" Comment.Single
+'\n'          Text.Whitespace
+
+'baz'         Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+'"""'         Literal.String.Double
+'same with a' Literal.String.Double
+'"""'         Literal.String.Double
+' '           Text.Whitespace
+'# multiline """basic string"""' Comment.Single
+'\n'          Text.Whitespace
+
+'spam'        Name
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
+"'''"         Literal.String.Single
+'same with a' Literal.String.Single
+"'''"         Literal.String.Single
+' '           Text.Whitespace
+"# multiline '''literal string'''" Comment.Single
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/toml/table-header-string.txt pygments-2.17.2+dfsg/tests/snippets/toml/table-header-string.txt
--- pygments-2.15.1+dfsg/tests/snippets/toml/table-header-string.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/toml/table-header-string.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,27 @@
+---input---
+[table.header.with.some."strings".and."escape\nsequences\u263a"]
+
+---tokens---
+'['           Keyword
+'table'       Keyword
+'.'           Keyword
+'header'      Keyword
+'.'           Keyword
+'with'        Keyword
+'.'           Keyword
+'some'        Keyword
+'.'           Keyword
+'"'           Literal.String.Double
+'strings'     Literal.String.Double
+'"'           Literal.String.Double
+'.'           Keyword
+'and'         Keyword
+'.'           Keyword
+'"'           Literal.String.Double
+'escape'      Literal.String.Double
+'\\n'         Literal.String.Escape
+'sequences'   Literal.String.Double
+'\\u263a'     Literal.String.Escape
+'"'           Literal.String.Double
+']'           Keyword
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/urlencoded/example.txt pygments-2.17.2+dfsg/tests/snippets/urlencoded/example.txt
--- pygments-2.15.1+dfsg/tests/snippets/urlencoded/example.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/urlencoded/example.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,11 @@
+---input---
+login=foo&password=12345
+
+---tokens---
+'login'       Name.Tag
+'='           Operator
+'foo'         Literal.String
+'&'           Punctuation
+'password'    Name.Tag
+'='           Operator
+'12345\n'     Literal.String
diff -Nru pygments-2.15.1+dfsg/tests/snippets/vyper/test.txt pygments-2.17.2+dfsg/tests/snippets/vyper/test.txt
--- pygments-2.15.1+dfsg/tests/snippets/vyper/test.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/vyper/test.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,24 @@
+---input---
+log Transfer
+
+event Transfer:
+
+struct Tessst:
+
+---tokens---
+'log'         Keyword
+' '           Text.Whitespace
+'Transfer'    Name.Class
+'\n\n'        Text.Whitespace
+
+'event'       Keyword
+' '           Text.Whitespace
+'Transfer'    Name.Class
+':'           Punctuation
+'\n\n'        Text.Whitespace
+
+'struct'      Keyword
+' '           Text.Whitespace
+'Tessst'      Name.Class
+':'           Punctuation
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/wikitext/bold-italic.txt pygments-2.17.2+dfsg/tests/snippets/wikitext/bold-italic.txt
--- pygments-2.15.1+dfsg/tests/snippets/wikitext/bold-italic.txt	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/wikitext/bold-italic.txt	2020-02-02 00:00:00.000000000 +0000
@@ -111,11 +111,11 @@
 'produces'    Text
 ' '           Text
 "''"          Generic.Emph
-"'''"         Generic.Strong
-'bold'        Generic.Strong
-' '           Generic.Strong
-'italics'     Generic.Strong
-"'''"         Generic.Strong
+"'''"         Generic.EmphStrong
+'bold'        Generic.EmphStrong
+' '           Generic.EmphStrong
+'italics'     Generic.EmphStrong
+"'''"         Generic.EmphStrong
 "''"          Generic.Emph
 '.'           Text
 '\n'          Text
@@ -123,15 +123,15 @@
 '\n'          Text
 
 "''"          Generic.Emph
-"'''"         Generic.Strong
-'Italic'      Generic.Strong
-' '           Generic.Strong
-'and'         Generic.Strong
-' '           Generic.Strong
-'bold'        Generic.Strong
-' '           Generic.Strong
-'formatting'  Generic.Strong
-"'''"         Generic.Strong
+"'''"         Generic.EmphStrong
+'Italic'      Generic.EmphStrong
+' '           Generic.EmphStrong
+'and'         Generic.EmphStrong
+' '           Generic.EmphStrong
+'bold'        Generic.EmphStrong
+' '           Generic.EmphStrong
+'formatting'  Generic.EmphStrong
+"'''"         Generic.EmphStrong
 "''"          Generic.Emph
 ' '           Text
 'works'       Text
@@ -154,10 +154,10 @@
 
 "'"           Text
 "''"          Generic.Emph
-"'''"         Generic.Strong
-'foo'         Generic.Strong
-"'"           Generic.Strong
-"'''"         Generic.Strong
+"'''"         Generic.EmphStrong
+'foo'         Generic.EmphStrong
+"'"           Generic.EmphStrong
+"'''"         Generic.EmphStrong
 "''"          Generic.Emph
 '\n'          Text
 
@@ -166,9 +166,9 @@
 'L'           Text
 "'"           Text
 "''"          Generic.Emph
-"'''"         Generic.Strong
-'Étranger'    Generic.Strong
-"'''"         Generic.Strong
+"'''"         Generic.EmphStrong
+'Étranger'    Generic.EmphStrong
+"'''"         Generic.EmphStrong
 "''"          Generic.Emph
 '\n'          Text
 
@@ -178,11 +178,11 @@
 ' '           Generic.Emph
 'a'           Generic.Emph
 ' '           Generic.Emph
-"'''"         Generic.Strong
-' '           Generic.Strong
-'a'           Generic.Strong
-' '           Generic.Strong
-"'''"         Generic.Strong
+"'''"         Generic.EmphStrong
+' '           Generic.EmphStrong
+'a'           Generic.EmphStrong
+' '           Generic.EmphStrong
+"'''"         Generic.EmphStrong
 ' '           Generic.Emph
 'a'           Generic.Emph
 ' '           Generic.Emph
@@ -195,11 +195,11 @@
 ' '           Generic.Emph
 'a'           Generic.Emph
 ' '           Generic.Emph
-"'''"         Generic.Strong
-' '           Generic.Strong
-'a'           Generic.Strong
-' '           Generic.Strong
-"''"          Generic.Emph
+"'''"         Generic.EmphStrong
+' '           Generic.EmphStrong
+'a'           Generic.EmphStrong
+' '           Generic.EmphStrong
+"''"          Generic.EmphStrong
 ' '           Generic.Strong
 'a'           Generic.Strong
 ' '           Generic.Strong
@@ -209,11 +209,11 @@
 '\n'          Text
 
 "''"          Generic.Emph
-"'''"         Generic.Strong
-' '           Generic.Strong
-'a'           Generic.Strong
-' '           Generic.Strong
-"''"          Generic.Emph
+"'''"         Generic.EmphStrong
+' '           Generic.EmphStrong
+'a'           Generic.EmphStrong
+' '           Generic.EmphStrong
+"''"          Generic.EmphStrong
 ' '           Generic.Strong
 'a'           Generic.Strong
 ' '           Generic.Strong
@@ -221,11 +221,11 @@
 '\n'          Text
 
 "''"          Generic.Emph
-"'''"         Generic.Strong
-' '           Generic.Strong
-'a'           Generic.Strong
-' '           Generic.Strong
-"'''"         Generic.Strong
+"'''"         Generic.EmphStrong
+' '           Generic.EmphStrong
+'a'           Generic.EmphStrong
+' '           Generic.EmphStrong
+"'''"         Generic.EmphStrong
 ' '           Generic.Emph
 'a'           Generic.Emph
 ' '           Generic.Emph
@@ -235,9 +235,9 @@
 '\n'          Text
 
 "''"          Generic.Emph
-"'''"         Generic.Strong
-' '           Generic.Strong
-'a'           Generic.Strong
+"'''"         Generic.EmphStrong
+' '           Generic.EmphStrong
+'a'           Generic.EmphStrong
 '\n'          Text
 
 'a'           Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/wikitext/language-converter.txt pygments-2.17.2+dfsg/tests/snippets/wikitext/language-converter.txt
--- pygments-2.15.1+dfsg/tests/snippets/wikitext/language-converter.txt	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/wikitext/language-converter.txt	2020-02-02 00:00:00.000000000 +0000
@@ -1,33 +1,43 @@
 ---input---
--{H|zh-cn:[[博客]]; zh-hk:網誌; zh-tw:部落格}-
+-{R|zh-cn:博客;; zh-hk:網誌; zh-tw:部落格;}-
+-{T|zh-cn:博客; zh-hk:網誌; zh-tw:部落格;}-
+-{A|zh-cn:博客; zh-hk:網誌; zh-tw:部落格;}-
 -{H|zh-cn:博客; zh-hk:網誌; zh-tw:部落格;}-
--{H|zh-cn:[[博客]]; zh-hk:網誌; zh-tw:部落格;  }-
+-{-|zh-cn:博客; zh-hk:網誌; zh-tw:部落格;}-
+-{H|zh-cn:[[博客]]; zh-hk:網誌; zh-tw:部落格}-
 
--{zh-cn:[[博客]]; zh-hk:網誌; zh-tw:部落格}-
 -{zh-cn:博客; zh-hk:網誌; zh-tw:部落格;}-
+-{zh-cn:[[博客]]; zh-hk:網誌; zh-tw:部落格}-
 -{zh-cn:[[博客]]; zh-hk:網誌; zh-tw:部落格;  }-
 
--{zh-tw=>zh-cn:[[博客]];zh-hk=>zh-cn:[[博客]]; }-
+-{H|巨集=>zh-cn:宏;}-
+-{D|U槽=>zh-cn:U盘; U槽=>zh-sg:U盘; U槽=>zh-my:U盘; U槽=>zh-tw:USB磁碟機; U槽=>zh-hk:U磁碟機; U槽=>zh-mo:U磁碟機}-
+
+北-{}-韓、北朝-{}-鲜
 
 -{部落格}- -{[[部落格]]}-
 
--{zh-cn:-{[[博客]]}-; zh-invalid:網誌; zh-tw:部落格}-
+-{zh;zh-hans;zh-hant|博客、網誌、部落格}-
+-{zh;zh-hans;zh-hant|zh-hans:博客、網誌、部落格;zh-hant:;;;;;;;;;}-
+-{zh;zh-cn;zh-hk|博客、網誌、部落格}-
 
+-{zh-cn:-{[[博客]]}-; zh-invalid:網誌; zh-tw:部落格}-
 -{zh-invalid:''a''[[博客]];;;zh-cn:a}-
 -{zh:''a''[[博客]]}-
-
 -{zh-hans:<span style="font-size:120%;">xxx</span>;zh-hant:\
 <span style="font-size:120%;">yyy</span>;}-
 
+-{{This is a template}}-
+-{{{This is a template parameter}}}-
+
 ---tokens---
 '-{'          Punctuation
-'H'           Keyword
+'R'           Keyword
 '|'           Punctuation
 'zh-cn'       Name.Label
 ':'           Punctuation
-'[['          Punctuation
-'博客'          Name.Tag
-']]'          Punctuation
+'博客'          Text
+';'           Text
 ';'           Punctuation
 ' zh-hk'      Name.Label
 ':'           Punctuation
@@ -36,11 +46,28 @@
 ' zh-tw'      Name.Label
 ':'           Punctuation
 '部落格'         Text
-'}-'          Punctuation
+';}-'         Punctuation
 '\n'          Text
 
 '-{'          Punctuation
-'H'           Keyword
+'T'           Keyword
+'|'           Punctuation
+'zh-cn'       Name.Label
+':'           Punctuation
+'博客'          Text
+';'           Punctuation
+' zh-hk'      Name.Label
+':'           Punctuation
+'網誌'          Text
+';'           Punctuation
+' zh-tw'      Name.Label
+':'           Punctuation
+'部落格'         Text
+';}-'         Punctuation
+'\n'          Text
+
+'-{'          Punctuation
+'A'           Keyword
 '|'           Punctuation
 'zh-cn'       Name.Label
 ':'           Punctuation
@@ -61,9 +88,7 @@
 '|'           Punctuation
 'zh-cn'       Name.Label
 ':'           Punctuation
-'[['          Punctuation
-'博客'          Name.Tag
-']]'          Punctuation
+'博客'          Text
 ';'           Punctuation
 ' zh-hk'      Name.Label
 ':'           Punctuation
@@ -72,12 +97,29 @@
 ' zh-tw'      Name.Label
 ':'           Punctuation
 '部落格'         Text
-';  }-'       Punctuation
+';}-'         Punctuation
 '\n'          Text
 
+'-{'          Punctuation
+'-'           Keyword
+'|'           Punctuation
+'zh-cn'       Name.Label
+':'           Punctuation
+'博客'          Text
+';'           Punctuation
+' zh-hk'      Name.Label
+':'           Punctuation
+'網誌'          Text
+';'           Punctuation
+' zh-tw'      Name.Label
+':'           Punctuation
+'部落格'         Text
+';}-'         Punctuation
 '\n'          Text
 
 '-{'          Punctuation
+'H'           Keyword
+'|'           Punctuation
 'zh-cn'       Name.Label
 ':'           Punctuation
 '[['          Punctuation
@@ -94,6 +136,8 @@
 '}-'          Punctuation
 '\n'          Text
 
+'\n'          Text
+
 '-{'          Punctuation
 'zh-cn'       Name.Label
 ':'           Punctuation
@@ -123,28 +167,99 @@
 ' zh-tw'      Name.Label
 ':'           Punctuation
 '部落格'         Text
-';  }-'       Punctuation
-'\n'          Text
-
+'}-'          Punctuation
 '\n'          Text
 
 '-{'          Punctuation
-'zh-tw'       Name.Label
-'=>'          Operator
 'zh-cn'       Name.Label
 ':'           Punctuation
 '[['          Punctuation
 '博客'          Name.Tag
 ']]'          Punctuation
 ';'           Punctuation
-'zh-hk'       Name.Label
+' zh-hk'      Name.Label
+':'           Punctuation
+'網誌'          Text
+';'           Punctuation
+' zh-tw'      Name.Label
+':'           Punctuation
+'部落格'         Text
+';'           Punctuation
+'  '          Text
+'}-'          Punctuation
+'\n'          Text
+
+'\n'          Text
+
+'-{'          Punctuation
+'H'           Keyword
+'|'           Punctuation
+'巨集'          Text
 '=>'          Operator
 'zh-cn'       Name.Label
 ':'           Punctuation
-'[['          Punctuation
-'博客'          Name.Tag
-']]'          Punctuation
-'; }-'        Punctuation
+'宏'           Text
+';'           Punctuation
+'}-'          Punctuation
+'\n'          Text
+
+'-{'          Punctuation
+'D'           Keyword
+'|'           Punctuation
+'U槽'          Text
+'=>'          Operator
+'zh-cn'       Name.Label
+':'           Punctuation
+'U盘'          Text
+';'           Punctuation
+' '           Text
+'U槽'          Text
+'=>'          Operator
+'zh-sg'       Name.Label
+':'           Punctuation
+'U盘'          Text
+';'           Punctuation
+' '           Text
+'U槽'          Text
+'=>'          Operator
+'zh-my'       Name.Label
+':'           Punctuation
+'U盘'          Text
+';'           Punctuation
+' '           Text
+'U槽'          Text
+'=>'          Operator
+'zh-tw'       Name.Label
+':'           Punctuation
+'USB磁碟機'      Text
+';'           Punctuation
+' '           Text
+'U槽'          Text
+'=>'          Operator
+'zh-hk'       Name.Label
+':'           Punctuation
+'U磁碟機'        Text
+';'           Punctuation
+' '           Text
+'U槽'          Text
+'=>'          Operator
+'zh-mo'       Name.Label
+':'           Punctuation
+'U磁碟機'        Text
+'}-'          Punctuation
+'\n'          Text
+
+'\n'          Text
+
+'北'           Text
+'-{'          Punctuation
+'}-'          Punctuation
+'韓'           Text
+'、'           Text
+'北朝'          Text
+'-{'          Punctuation
+'}-'          Punctuation
+'鲜'           Text
 '\n'          Text
 
 '\n'          Text
@@ -163,6 +278,83 @@
 '\n'          Text
 
 '-{'          Punctuation
+'zh'          Keyword
+';'           Punctuation
+'zh'          Keyword
+'-'           Keyword
+'hans'        Keyword
+';'           Punctuation
+'zh'          Keyword
+'-'           Keyword
+'hant'        Keyword
+'|'           Punctuation
+'博客'          Text
+'、'           Text
+'網誌'          Text
+'、'           Text
+'部落格'         Text
+'}-'          Punctuation
+'\n'          Text
+
+'-{'          Punctuation
+'zh'          Keyword
+';'           Punctuation
+'zh'          Keyword
+'-'           Keyword
+'hans'        Keyword
+';'           Punctuation
+'zh'          Keyword
+'-'           Keyword
+'hant'        Keyword
+'|'           Punctuation
+'zh'          Text
+'-'           Text
+'hans'        Text
+':'           Text
+'博客'          Text
+'、'           Text
+'網誌'          Text
+'、'           Text
+'部落格'         Text
+';'           Text
+'zh'          Text
+'-'           Text
+'hant'        Text
+':'           Text
+';'           Text
+';'           Text
+';'           Text
+';'           Text
+';'           Text
+';'           Text
+';'           Text
+';'           Text
+';'           Text
+'}-'          Punctuation
+'\n'          Text
+
+'-{'          Punctuation
+'zh'          Keyword
+';'           Punctuation
+'zh'          Keyword
+'-'           Keyword
+'cn'          Keyword
+';'           Punctuation
+'zh'          Keyword
+'-'           Keyword
+'hk'          Keyword
+'|'           Punctuation
+'博客'          Text
+'、'           Text
+'網誌'          Text
+'、'           Text
+'部落格'         Text
+'}-'          Punctuation
+'\n'          Text
+
+'\n'          Text
+
+'-{'          Punctuation
 'zh-cn'       Name.Label
 ':'           Punctuation
 '-{'          Punctuation
@@ -184,8 +376,6 @@
 '}-'          Punctuation
 '\n'          Text
 
-'\n'          Text
-
 '-{'          Punctuation
 'zh'          Text
 '-'           Text
@@ -199,11 +389,9 @@
 ']]'          Punctuation
 ';'           Text
 ';'           Text
-';'           Text
-'zh'          Text
-'-'           Text
-'cn'          Text
-':'           Text
+';'           Punctuation
+'zh-cn'       Name.Label
+':'           Punctuation
 'a'           Text
 '}-'          Punctuation
 '\n'          Text
@@ -220,8 +408,6 @@
 '}-'          Punctuation
 '\n'          Text
 
-'\n'          Text
-
 '-{'          Punctuation
 'zh-hans'     Name.Label
 ':'           Punctuation
@@ -271,3 +457,25 @@
 '>'           Punctuation
 ';}-'         Punctuation
 '\n'          Text
+
+'\n'          Text
+
+'-'           Text
+'{{'          Punctuation
+'This'        Name.Tag
+' '           Name.Tag
+'is'          Name.Tag
+' '           Name.Tag
+'a'           Name.Tag
+' '           Name.Tag
+'template'    Name.Tag
+'}}'          Punctuation
+'-'           Text
+'\n'          Text
+
+'-'           Text
+'{{{'         Punctuation
+'This is a template parameter' Name.Variable
+'}}}'         Punctuation
+'-'           Text
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/wikitext/wikilink.txt pygments-2.17.2+dfsg/tests/snippets/wikitext/wikilink.txt
--- pygments-2.15.1+dfsg/tests/snippets/wikitext/wikilink.txt	2023-04-10 12:40:27.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/wikitext/wikilink.txt	2020-02-02 00:00:00.000000000 +0000
@@ -83,6 +83,8 @@
 
 [[A|[//example.com a b c]]]
 
+'''[[Special:BlockList/{{BASEPAGENAMEE}}|check]]'''
+
 ---tokens---
 '[['          Punctuation
 'a'           Name.Tag
@@ -770,3 +772,19 @@
 ']'           Punctuation
 ']]'          Punctuation
 '\n'          Text
+
+'\n'          Text
+
+"'''"         Generic.Strong
+'[['          Punctuation
+'Special'     Name.Namespace
+':'           Punctuation
+'BlockList/'  Name.Tag
+'{{'          Punctuation
+'BASEPAGENAMEE' Name.Function
+'}}'          Punctuation
+'|'           Punctuation
+'check'       Text
+']]'          Punctuation
+"'''"         Generic.Strong
+'\n'          Text
diff -Nru pygments-2.15.1+dfsg/tests/snippets/zone/a-record.txt pygments-2.17.2+dfsg/tests/snippets/zone/a-record.txt
--- pygments-2.15.1+dfsg/tests/snippets/zone/a-record.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/zone/a-record.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,10 @@
+---input---
+delta           A      192.0.2.4
+
+---tokens---
+'delta'       Name
+'           ' Text.Whitespace
+'A'           Keyword.Type
+'      '      Text.Whitespace
+'192.0.2.4'   Literal
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/zone/include.txt pygments-2.17.2+dfsg/tests/snippets/zone/include.txt
--- pygments-2.15.1+dfsg/tests/snippets/zone/include.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/zone/include.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,8 @@
+---input---
+$INCLUDE test.zone
+
+---tokens---
+'$INCLUDE'    Comment.Preproc
+' '           Text.Whitespace
+'test.zone'   Comment.PreprocFile
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/snippets/zone/soa.txt pygments-2.17.2+dfsg/tests/snippets/zone/soa.txt
--- pygments-2.15.1+dfsg/tests/snippets/zone/soa.txt	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/snippets/zone/soa.txt	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,55 @@
+---input---
+@       IN      SOA     ns root ( ; E-mail
+                             42   ; Serial
+                             2h   ; Refresh
+                             1h   ; Retry
+                            14d   ; Expire
+                             1h ) ; Negative Cache TTL
+
+---tokens---
+'@'           Operator
+'       '     Text.Whitespace
+'IN'          Name.Class
+'      '      Text.Whitespace
+'SOA'         Keyword.Type
+'     '       Text.Whitespace
+'ns'          Literal
+' '           Text.Whitespace
+'root'        Literal
+' '           Text.Whitespace
+'('           Punctuation
+' '           Text.Whitespace
+'; E-mail'    Comment.Single
+'\n'          Text.Whitespace
+
+'                             ' Text.Whitespace
+'42'          Literal.Number.Integer
+'   '         Text.Whitespace
+'; Serial'    Comment.Single
+'\n'          Text.Whitespace
+
+'                             ' Text.Whitespace
+'2h'          Literal.Number.Integer
+'   '         Text.Whitespace
+'; Refresh'   Comment.Single
+'\n'          Text.Whitespace
+
+'                             ' Text.Whitespace
+'1h'          Literal.Number.Integer
+'   '         Text.Whitespace
+'; Retry'     Comment.Single
+'\n'          Text.Whitespace
+
+'                            ' Text.Whitespace
+'14d'         Literal.Number.Integer
+'   '         Text.Whitespace
+'; Expire'    Comment.Single
+'\n'          Text.Whitespace
+
+'                             ' Text.Whitespace
+'1h'          Literal.Number.Integer
+' '           Text.Whitespace
+')'           Punctuation
+' '           Text.Whitespace
+'; Negative Cache TTL' Comment.Single
+'\n'          Text.Whitespace
diff -Nru pygments-2.15.1+dfsg/tests/test_graphql.py pygments-2.17.2+dfsg/tests/test_graphql.py
--- pygments-2.15.1+dfsg/tests/test_graphql.py	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/test_graphql.py	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,872 @@
+import unittest
+import textwrap
+
+from pygments.lexers import GraphQLLexer
+from pygments.token import (
+    Comment,
+    Error,
+    Keyword,
+    Name,
+    Number,
+    Punctuation,
+    String,
+    Whitespace
+)
+
+
+def assert_tokens_equal(self, text, expected, stack=("root",)):
+    text = textwrap.dedent(text)
+    lexer = GraphQLLexer()
+    tokens_itr = lexer.get_tokens_unprocessed(text, stack=stack)
+    self.assertEqual(list(tokens_itr), expected)
+
+
+def assert_value_equal(self, text, expected):
+    if not isinstance(expected, list):
+        expected = [expected]
+    assert_tokens_equal(self, text, expected, stack=("value",))
+
+
+def assert_string_equal(self, text, tokens):
+    start = (0, String, '"')
+    end = (len(text) - 1, String, '"')
+    expected = [start, *tokens, end]
+    assert_tokens_equal(self, text, expected, stack=("value",))
+
+
+class TestValue(unittest.TestCase):
+
+    maxDiff = None
+
+    def test_float(self):
+        assert_value_equal(self, "5.5", (0, Number.Float, "5.5"))
+        assert_value_equal(self, "5e3", (0, Number.Float, "5e3"))
+        assert_value_equal(self, "5E3", (0, Number.Float, "5E3"))
+        assert_value_equal(self, "5e-3", (0, Number.Float, "5e-3"))
+        assert_value_equal(self, "5E-3", (0, Number.Float, "5E-3"))
+        assert_value_equal(self, "5e+3", (0, Number.Float, "5e+3"))
+        assert_value_equal(self, "5E+3", (0, Number.Float, "5E+3"))
+        assert_value_equal(self, "5.1e3", (0, Number.Float, "5.1e3"))
+        assert_value_equal(self, "5.1E3", (0, Number.Float, "5.1E3"))
+        assert_value_equal(self, "5.1e-3", (0, Number.Float, "5.1e-3"))
+        assert_value_equal(self, "5.1E-3", (0, Number.Float, "5.1E-3"))
+        assert_value_equal(self, "5.1e+3", (0, Number.Float, "5.1e+3"))
+        assert_value_equal(self, "5.1E+3", (0, Number.Float, "5.1E+3"))
+
+    def test_integer(self):
+        assert_value_equal(self, "5", (0, Number.Integer, "5"))
+        assert_value_equal(self, "-0", (0, Number.Integer, "-0"))
+        # Not really following the specifications
+        assert_value_equal(self, "-02", (0, Number.Integer, "-02"))
+
+    def test_string(self):
+        assert_string_equal(self, '"asdf"', [(1, String, "asdf")])
+        assert_string_equal(
+            self,
+            r'"asdf\""',
+            [
+                (1, String, "asdf"),
+                (5, String.Escape, r"\""),
+            ],
+        )
+        assert_string_equal(
+            self, r'"asdf\m"', [(1, String, "asdf"), (5, Error, "\\"), (6, String, "m")]
+        )
+        assert_string_equal(
+            self,
+            r'"asdf\u00E8"',
+            [
+                (1, String, "asdf"),
+                (5, String.Escape, r"\u00E8"),
+            ],
+        )
+
+    def test_boolean(self):
+        assert_value_equal(self, "true", (0, Name.Builtin, "true"))
+        assert_value_equal(self, "false", (0, Name.Builtin, "false"))
+
+    def test_variable(self):
+        assert_value_equal(self, "$hello", (0, Name.Variable, "$hello"))
+        assert_value_equal(
+            self,
+            "$0hello",
+            [
+                (0, Error, "$"),
+                (1, Number.Integer, "0"),
+                (2, Name.Constant, "hello"),
+            ],
+        )
+
+    def test_list_value(self):
+        assert_value_equal(
+            self,
+            '[1, 1.1, "abc"]',
+            [
+                (0, Punctuation, "["),
+                (1, Number.Integer, "1"),
+                (2, Punctuation, ","),
+                (3, Whitespace, " "),
+                (4, Number.Float, "1.1"),
+                (7, Punctuation, ","),
+                (8, Whitespace, " "),
+                (9, String, '"'),
+                (10, String, "abc"),
+                (13, String, '"'),
+                (14, Punctuation, "]"),
+            ],
+        )
+        assert_value_equal(
+            self,
+            '[1, 1.1, ["abc"]]',
+            [
+                (0, Punctuation, "["),
+                (1, Number.Integer, "1"),
+                (2, Punctuation, ","),
+                (3, Whitespace, " "),
+                (4, Number.Float, "1.1"),
+                (7, Punctuation, ","),
+                (8, Whitespace, " "),
+                (9, Punctuation, "["),
+                (10, String, '"'),
+                (11, String, "abc"),
+                (14, String, '"'),
+                (15, Punctuation, "]"),
+                (16, Punctuation, "]"),
+            ],
+        )
+
+
+class TestGraphqlLexer(unittest.TestCase):
+
+    maxDiff = None
+
+    def assert_builtin(self, text):
+        assert_tokens_equal(self, text, [(0, Name.Builtin, text)], stack=("builtins",))
+
+    def test_keyworkd(self):
+        assert_tokens_equal(self, "type", [(0, Keyword, "type")])
+        assert_tokens_equal(self, "schema", [(0, Keyword, "schema")])
+        assert_tokens_equal(self, "extend", [(0, Keyword, "extend")])
+        assert_tokens_equal(self, "enum", [(0, Keyword, "enum")])
+        assert_tokens_equal(self, "scalar", [(0, Keyword, "scalar")])
+        assert_tokens_equal(self, "implements", [(0, Keyword, "implements")])
+        assert_tokens_equal(self, "interface", [(0, Keyword, "interface")])
+        assert_tokens_equal(self, "union", [(0, Keyword, "union")])
+        assert_tokens_equal(self, "input", [(0, Keyword, "input")])
+        assert_tokens_equal(self, "directive", [(0, Keyword, "directive")])
+
+    def test_arguments_integer(self):
+        text = """\
+        {
+          field(arg: 24)
+          field
+        }
+        """
+
+        expected = [
+            (0, Punctuation, "{"),
+            (1, Whitespace, "\n  "),
+            (4, Name, "field"),
+            (9, Punctuation, "("),
+            (10, Name, "arg"),
+            # (10, Name.Attribute, 'arg'),
+            (13, Punctuation, ":"),
+            (14, Whitespace, " "),
+            (15, Number.Integer, "24"),
+            (17, Punctuation, ")"),
+            (18, Whitespace, "\n  "),
+            (21, Name, "field"),
+            (26, Whitespace, "\n"),
+            (27, Punctuation, "}"),
+            (28, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_arguments(self):
+        text = """\
+        {
+          human(id: "1000") {
+            name
+            height
+          }
+        }
+        """
+        expected = [
+            (0, Punctuation, "{"),
+            (1, Whitespace, "\n  "),
+            (4, Name, "human"),
+            (9, Punctuation, "("),
+            # (10, Name.Attribute, 'id'),
+            (10, Name, "id"),
+            (12, Punctuation, ":"),
+            (13, Whitespace, " "),
+            (14, String, '"'),
+            (15, String, "1000"),
+            (19, String, '"'),
+            (20, Punctuation, ")"),
+            (21, Whitespace, " "),
+            (22, Punctuation, "{"),
+            (23, Whitespace, "\n    "),
+            (28, Name, "name"),
+            (32, Whitespace, "\n    "),
+            (37, Name, "height"),
+            (43, Whitespace, "\n  "),
+            (46, Punctuation, "}"),
+            (47, Whitespace, "\n"),
+            (48, Punctuation, "}"),
+            (49, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_argument_scalar(self):
+        text = """\
+        {
+          human(id: "1000") {
+            name
+            height(unit: FOOT)
+          }
+        }
+        """
+        expected = [
+            (0, Punctuation, "{"),
+            (1, Whitespace, "\n  "),
+            (4, Name, "human"),
+            (9, Punctuation, "("),
+            # (10, Name.Attribute, 'id'),
+            (10, Name, "id"),
+            (12, Punctuation, ":"),
+            (13, Whitespace, " "),
+            (14, String, '"'),
+            (15, String, "1000"),
+            (19, String, '"'),
+            (20, Punctuation, ")"),
+            (21, Whitespace, " "),
+            (22, Punctuation, "{"),
+            (23, Whitespace, "\n    "),
+            (28, Name, "name"),
+            (32, Whitespace, "\n    "),
+            (37, Name, "height"),
+            (43, Punctuation, "("),
+            # (44, Name.Attribute, 'unit'),
+            (44, Name, "unit"),
+            (48, Punctuation, ":"),
+            (49, Whitespace, " "),
+            (50, Name.Constant, "FOOT"),
+            (54, Punctuation, ")"),
+            (55, Whitespace, "\n  "),
+            (58, Punctuation, "}"),
+            (59, Whitespace, "\n"),
+            (60, Punctuation, "}"),
+            (61, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_alias(self):
+        text = """\
+        {
+          empireHero: hero(episode: EMPIRE) {
+            name
+          }
+          jediHero: hero(episode: JEDI) {
+            name
+          }
+        }
+        """
+        expected = [
+            (0, Punctuation, "{"),
+            (1, Whitespace, "\n  "),
+            (4, Name.Label, "empireHero"),
+            (14, Punctuation, ":"),
+            (15, Whitespace, " "),
+            (16, Name, "hero"),
+            (20, Punctuation, "("),
+            # (21, Name.Attribute, 'episode'),
+            (21, Name, "episode"),
+            (28, Punctuation, ":"),
+            (29, Whitespace, " "),
+            (30, Name.Constant, "EMPIRE"),
+            (36, Punctuation, ")"),
+            (37, Whitespace, " "),
+            (38, Punctuation, "{"),
+            (39, Whitespace, "\n    "),
+            (44, Name, "name"),
+            (48, Whitespace, "\n  "),
+            (51, Punctuation, "}"),
+            (52, Whitespace, "\n  "),
+            (55, Name.Label, "jediHero"),
+            (63, Punctuation, ":"),
+            (64, Whitespace, " "),
+            (65, Name, "hero"),
+            (69, Punctuation, "("),
+            # (70, Name.Attribute, 'episode'),
+            (70, Name, "episode"),
+            (77, Punctuation, ":"),
+            (78, Whitespace, " "),
+            (79, Name.Constant, "JEDI"),
+            (83, Punctuation, ")"),
+            (84, Whitespace, " "),
+            (85, Punctuation, "{"),
+            (86, Whitespace, "\n    "),
+            (91, Name, "name"),
+            (95, Whitespace, "\n  "),
+            (98, Punctuation, "}"),
+            (99, Whitespace, "\n"),
+            (100, Punctuation, "}"),
+            (101, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_variables(self):
+        text = """\
+        mutation testVar($int: Int, $myType: MyType,
+            $required: String!, $list: [Int!]!)
+        {
+          doSomenthing(int: $int, myType: $myType,
+              required: $required, list: $list)
+          {
+            response
+          }
+        }
+        """
+        expected = [
+            (0, Keyword, "mutation"),
+            (8, Whitespace, " "),
+            (9, Name.Function, "testVar"),
+            (16, Punctuation, "("),
+            (17, Name.Variable, "$int"),
+            (21, Punctuation, ":"),
+            (22, Whitespace, " "),
+            (23, Name.Builtin, "Int"),
+            (26, Punctuation, ","),
+            (27, Whitespace, " "),
+            (28, Name.Variable, "$myType"),
+            (35, Punctuation, ":"),
+            (36, Whitespace, " "),
+            (37, Name.Class, "MyType"),
+            (43, Punctuation, ","),
+            (44, Whitespace, "\n    "),
+            (49, Name.Variable, "$required"),
+            (58, Punctuation, ":"),
+            (59, Whitespace, " "),
+            (60, Name.Builtin, "String"),
+            (66, Punctuation, "!"),
+            (67, Punctuation, ","),
+            (68, Whitespace, " "),
+            (69, Name.Variable, "$list"),
+            (74, Punctuation, ":"),
+            (75, Whitespace, " "),
+            (76, Punctuation, "["),
+            (77, Name.Builtin, "Int"),
+            (80, Punctuation, "!"),
+            (81, Punctuation, "]"),
+            (82, Punctuation, "!"),
+            (83, Punctuation, ")"),
+            (84, Whitespace, "\n"),
+            (85, Punctuation, "{"),
+            (86, Whitespace, "\n  "),
+            (89, Name, "doSomenthing"),
+            (101, Punctuation, "("),
+            (102, Name, "int"),
+            (105, Punctuation, ":"),
+            (106, Whitespace, " "),
+            (107, Name.Variable, "$int"),
+            (111, Punctuation, ","),
+            (112, Whitespace, " "),
+            (113, Name, "myType"),
+            (119, Punctuation, ":"),
+            (120, Whitespace, " "),
+            (121, Name.Variable, "$myType"),
+            (128, Punctuation, ","),
+            (129, Whitespace, "\n      "),
+            (136, Name, "required"),
+            (144, Punctuation, ":"),
+            (145, Whitespace, " "),
+            (146, Name.Variable, "$required"),
+            (155, Punctuation, ","),
+            (156, Whitespace, " "),
+            (157, Name, "list"),
+            (161, Punctuation, ":"),
+            (162, Whitespace, " "),
+            (163, Name.Variable, "$list"),
+            (168, Punctuation, ")"),
+            (169, Whitespace, "\n  "),
+            (172, Punctuation, "{"),
+            (173, Whitespace, "\n    "),
+            (178, Name, "response"),
+            (186, Whitespace, "\n  "),
+            (189, Punctuation, "}"),
+            (190, Whitespace, "\n"),
+            (191, Punctuation, "}"),
+            (192, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_operation_definition_directives(self):
+        text = """\
+        query ($foo: Boolean = true, $bar: Boolean = false) {
+          field @skip(if: $foo) {
+            subfieldA
+          }
+          field @skip(if: $bar) {
+            subfieldB
+          }
+        }
+        """
+        expected = [
+            (0, Keyword, "query"),
+            (5, Whitespace, " "),
+            (6, Punctuation, "("),
+            (7, Name.Variable, "$foo"),
+            (11, Punctuation, ":"),
+            (12, Whitespace, " "),
+            (13, Name.Builtin, "Boolean"),
+            (20, Whitespace, " "),
+            (21, Punctuation, "="),
+            (22, Whitespace, " "),
+            (23, Name.Builtin, "true"),
+            (27, Punctuation, ","),
+            (28, Whitespace, " "),
+            (29, Name.Variable, "$bar"),
+            (33, Punctuation, ":"),
+            (34, Whitespace, " "),
+            (35, Name.Builtin, "Boolean"),
+            (42, Whitespace, " "),
+            (43, Punctuation, "="),
+            (44, Whitespace, " "),
+            (45, Name.Builtin, "false"),
+            (50, Punctuation, ")"),
+            (51, Whitespace, " "),
+            (52, Punctuation, "{"),
+            (53, Whitespace, "\n  "),
+            (56, Name, "field"),
+            (61, Whitespace, " "),
+            (62, Name.Decorator, "@skip"),
+            (67, Punctuation, "("),
+            (68, Name, "if"),
+            (70, Punctuation, ":"),
+            (71, Whitespace, " "),
+            (72, Name.Variable, "$foo"),
+            (76, Punctuation, ")"),
+            (77, Whitespace, " "),
+            (78, Punctuation, "{"),
+            (79, Whitespace, "\n    "),
+            (84, Name, "subfieldA"),
+            (93, Whitespace, "\n  "),
+            (96, Punctuation, "}"),
+            (97, Whitespace, "\n  "),
+            (100, Name, "field"),
+            (105, Whitespace, " "),
+            (106, Name.Decorator, "@skip"),
+            (111, Punctuation, "("),
+            (112, Name, "if"),
+            (114, Punctuation, ":"),
+            (115, Whitespace, " "),
+            (116, Name.Variable, "$bar"),
+            (120, Punctuation, ")"),
+            (121, Whitespace, " "),
+            (122, Punctuation, "{"),
+            (123, Whitespace, "\n    "),
+            (128, Name, "subfieldB"),
+            (137, Whitespace, "\n  "),
+            (140, Punctuation, "}"),
+            (141, Whitespace, "\n"),
+            (142, Punctuation, "}"),
+            (143, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_operation_definition_multi_directives(self):
+        text = """\
+        query ($foo: Boolean = true, $bar: Boolean = false) {
+          field @skip(if: $foo) @skip(if: $bar)
+        }
+        """
+        expected = [
+            (0, Keyword, "query"),
+            (5, Whitespace, " "),
+            (6, Punctuation, "("),
+            (7, Name.Variable, "$foo"),
+            (11, Punctuation, ":"),
+            (12, Whitespace, " "),
+            (13, Name.Builtin, "Boolean"),
+            (20, Whitespace, " "),
+            (21, Punctuation, "="),
+            (22, Whitespace, " "),
+            (23, Name.Builtin, "true"),
+            (27, Punctuation, ","),
+            (28, Whitespace, " "),
+            (29, Name.Variable, "$bar"),
+            (33, Punctuation, ":"),
+            (34, Whitespace, " "),
+            (35, Name.Builtin, "Boolean"),
+            (42, Whitespace, " "),
+            (43, Punctuation, "="),
+            (44, Whitespace, " "),
+            (45, Name.Builtin, "false"),
+            (50, Punctuation, ")"),
+            (51, Whitespace, " "),
+            (52, Punctuation, "{"),
+            (53, Whitespace, "\n  "),
+            (56, Name, "field"),
+            (61, Whitespace, " "),
+            (62, Name.Decorator, "@skip"),
+            (67, Punctuation, "("),
+            (68, Name, "if"),
+            (70, Punctuation, ":"),
+            (71, Whitespace, " "),
+            (72, Name.Variable, "$foo"),
+            (76, Punctuation, ")"),
+            (77, Whitespace, " "),
+            (78, Name.Decorator, "@skip"),
+            (83, Punctuation, "("),
+            (84, Name, "if"),
+            (86, Punctuation, ":"),
+            (87, Whitespace, " "),
+            (88, Name.Variable, "$bar"),
+            (92, Punctuation, ")"),
+            (93, Whitespace, "\n"),
+            (94, Punctuation, "}"),
+            (95, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_fragment_spread(self):
+        text = """\
+        query withNestedFragments {
+          user(id: 4) {
+            friends(first: 10) {
+              ...friendFields
+            }
+            mutualFriends(first: 10) {
+              ...friendFields @skip(if: true)
+            }
+          }
+        }
+        """
+        expected = [
+            (0, Keyword, "query"),
+            (5, Whitespace, " "),
+            (6, Name.Function, "withNestedFragments"),
+            (25, Whitespace, " "),
+            (26, Punctuation, "{"),
+            (27, Whitespace, "\n  "),
+            (30, Name, "user"),
+            (34, Punctuation, "("),
+            (35, Name, "id"),
+            (37, Punctuation, ":"),
+            (38, Whitespace, " "),
+            (39, Number.Integer, "4"),
+            (40, Punctuation, ")"),
+            (41, Whitespace, " "),
+            (42, Punctuation, "{"),
+            (43, Whitespace, "\n    "),
+            (48, Name, "friends"),
+            (55, Punctuation, "("),
+            (56, Name, "first"),
+            (61, Punctuation, ":"),
+            (62, Whitespace, " "),
+            (63, Number.Integer, "10"),
+            (65, Punctuation, ")"),
+            (66, Whitespace, " "),
+            (67, Punctuation, "{"),
+            (68, Whitespace, "\n      "),
+            (75, Punctuation, "..."),
+            (78, Name, "friendFields"),
+            (90, Whitespace, "\n    "),
+            (95, Punctuation, "}"),
+            (96, Whitespace, "\n    "),
+            (101, Name, "mutualFriends"),
+            (114, Punctuation, "("),
+            (115, Name, "first"),
+            (120, Punctuation, ":"),
+            (121, Whitespace, " "),
+            (122, Number.Integer, "10"),
+            (124, Punctuation, ")"),
+            (125, Whitespace, " "),
+            (126, Punctuation, "{"),
+            (127, Whitespace, "\n      "),
+            (134, Punctuation, "..."),
+            (137, Name, "friendFields"),
+            (149, Whitespace, " "),
+            (150, Name.Decorator, "@skip"),
+            (155, Punctuation, "("),
+            (156, Name, "if"),
+            (158, Punctuation, ":"),
+            (159, Whitespace, " "),
+            (160, Name.Builtin, "true"),
+            (164, Punctuation, ")"),
+            (165, Whitespace, "\n    "),
+            (170, Punctuation, "}"),
+            (171, Whitespace, "\n  "),
+            (174, Punctuation, "}"),
+            (175, Whitespace, "\n"),
+            (176, Punctuation, "}"),
+            (177, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_inline_fragment(self):
+        text = """\
+        query inlineFragmentTyping {
+          profiles(handles: ["zuck", "cocacola"]) {
+            handle
+            ... on User {
+              friends {
+                count
+              }
+            }
+            ... on Page {
+              likers {
+                count
+              }
+            }
+          }
+        }
+        """
+        expected = [
+            (0, Keyword, "query"),
+            (5, Whitespace, " "),
+            (6, Name.Function, "inlineFragmentTyping"),
+            (26, Whitespace, " "),
+            (27, Punctuation, "{"),
+            (28, Whitespace, "\n  "),
+            (31, Name, "profiles"),
+            (39, Punctuation, "("),
+            (40, Name, "handles"),
+            (47, Punctuation, ":"),
+            (48, Whitespace, " "),
+            (49, Punctuation, "["),
+            (50, String, '"'),
+            (51, String, "zuck"),
+            (55, String, '"'),
+            (56, Punctuation, ","),
+            (57, Whitespace, " "),
+            (58, String, '"'),
+            (59, String, "cocacola"),
+            (67, String, '"'),
+            (68, Punctuation, "]"),
+            (69, Punctuation, ")"),
+            (70, Whitespace, " "),
+            (71, Punctuation, "{"),
+            (72, Whitespace, "\n    "),
+            (77, Name, "handle"),
+            (83, Whitespace, "\n    "),
+            (88, Punctuation, "..."),
+            (91, Whitespace, " "),
+            (92, Keyword, "on"),
+            (94, Whitespace, " "),
+            (95, Name.Class, "User"),
+            (99, Whitespace, " "),
+            (100, Punctuation, "{"),
+            (101, Whitespace, "\n      "),
+            (108, Name, "friends"),
+            (115, Whitespace, " "),
+            (116, Punctuation, "{"),
+            (117, Whitespace, "\n        "),
+            (126, Name, "count"),
+            (131, Whitespace, "\n      "),
+            (138, Punctuation, "}"),
+            (139, Whitespace, "\n    "),
+            (144, Punctuation, "}"),
+            (145, Whitespace, "\n    "),
+            (150, Punctuation, "..."),
+            (153, Whitespace, " "),
+            (154, Keyword, "on"),
+            (156, Whitespace, " "),
+            (157, Name.Class, "Page"),
+            (161, Whitespace, " "),
+            (162, Punctuation, "{"),
+            (163, Whitespace, "\n      "),
+            (170, Name, "likers"),
+            (176, Whitespace, " "),
+            (177, Punctuation, "{"),
+            (178, Whitespace, "\n        "),
+            (187, Name, "count"),
+            (192, Whitespace, "\n      "),
+            (199, Punctuation, "}"),
+            (200, Whitespace, "\n    "),
+            (205, Punctuation, "}"),
+            (206, Whitespace, "\n  "),
+            (209, Punctuation, "}"),
+            (210, Whitespace, "\n"),
+            (211, Punctuation, "}"),
+            (212, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_input_value_nested_array(self):
+        text = """\
+        {
+          node(arg: [1, [2, 3]])
+        }
+        """
+        expected = [
+            (0, Punctuation, "{"),
+            (1, Whitespace, "\n  "),
+            (4, Name, "node"),
+            (8, Punctuation, "("),
+            (9, Name, "arg"),
+            (12, Punctuation, ":"),
+            (13, Whitespace, " "),
+            (14, Punctuation, "["),
+            (15, Number.Integer, "1"),
+            (16, Punctuation, ","),
+            (17, Whitespace, " "),
+            (18, Punctuation, "["),
+            (19, Number.Integer, "2"),
+            (20, Punctuation, ","),
+            (21, Whitespace, " "),
+            (22, Number.Integer, "3"),
+            (23, Punctuation, "]"),
+            (24, Punctuation, "]"),
+            (25, Punctuation, ")"),
+            (26, Whitespace, "\n"),
+            (27, Punctuation, "}"),
+            (28, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_input_value_object(self):
+        text = """\
+        {
+          node(arg: {a: "a", b: "b"})
+        }
+        """
+        expected = [
+            (0, Punctuation, "{"),
+            (1, Whitespace, "\n  "),
+            (4, Name, "node"),
+            (8, Punctuation, "("),
+            (9, Name, "arg"),
+            (12, Punctuation, ":"),
+            (13, Whitespace, " "),
+            (14, Punctuation, "{"),
+            (15, Name, "a"),
+            (16, Punctuation, ":"),
+            (17, Whitespace, " "),
+            (18, String, '"'),
+            (19, String, "a"),
+            (20, String, '"'),
+            (21, Punctuation, ","),
+            (22, Whitespace, " "),
+            (23, Name, "b"),
+            (24, Punctuation, ":"),
+            (25, Whitespace, " "),
+            (26, String, '"'),
+            (27, String, "b"),
+            (28, String, '"'),
+            (29, Punctuation, "}"),
+            (30, Punctuation, ")"),
+            (31, Whitespace, "\n"),
+            (32, Punctuation, "}"),
+            (33, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_input_nested_value_object(self):
+        text = """\
+        {
+          node(arg: {a: "a", b: {c: "c", d: {e: "e"}}})
+        }
+        """
+        expected = [
+            (0, Punctuation, "{"),
+            (1, Whitespace, "\n  "),
+            (4, Name, "node"),
+            (8, Punctuation, "("),
+            (9, Name, "arg"),
+            (12, Punctuation, ":"),
+            (13, Whitespace, " "),
+            (14, Punctuation, "{"),
+            (15, Name, "a"),
+            (16, Punctuation, ":"),
+            (17, Whitespace, " "),
+            (18, String, '"'),
+            (19, String, "a"),
+            (20, String, '"'),
+            (21, Punctuation, ","),
+            (22, Whitespace, " "),
+            (23, Name, "b"),
+            (24, Punctuation, ":"),
+            (25, Whitespace, " "),
+            (26, Punctuation, "{"),
+            (27, Name, "c"),
+            (28, Punctuation, ":"),
+            (29, Whitespace, " "),
+            (30, String, '"'),
+            (31, String, "c"),
+            (32, String, '"'),
+            (33, Punctuation, ","),
+            (34, Whitespace, " "),
+            (35, Name, "d"),
+            (36, Punctuation, ":"),
+            (37, Whitespace, " "),
+            (38, Punctuation, "{"),
+            (39, Name, "e"),
+            (40, Punctuation, ":"),
+            (41, Whitespace, " "),
+            (42, String, '"'),
+            (43, String, "e"),
+            (44, String, '"'),
+            (45, Punctuation, "}"),
+            (46, Punctuation, "}"),
+            (47, Punctuation, "}"),
+            (48, Punctuation, ")"),
+            (49, Whitespace, "\n"),
+            (50, Punctuation, "}"),
+            (51, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
+
+    def test_input_value_mixed(self):
+        text = """\
+        {
+          node1(arg: {a: [1, 2]})
+          node2(arg: [1, {a: "a"}])
+        }
+        """
+        expected = [
+            (0, Punctuation, "{"),
+            (1, Whitespace, "\n  "),
+            (4, Name, "node1"),
+            (9, Punctuation, "("),
+            (10, Name, "arg"),
+            (13, Punctuation, ":"),
+            (14, Whitespace, " "),
+            (15, Punctuation, "{"),
+            (16, Name, "a"),
+            (17, Punctuation, ":"),
+            (18, Whitespace, " "),
+            (19, Punctuation, "["),
+            (20, Number.Integer, "1"),
+            (21, Punctuation, ","),
+            (22, Whitespace, " "),
+            (23, Number.Integer, "2"),
+            (24, Punctuation, "]"),
+            (25, Punctuation, "}"),
+            (26, Punctuation, ")"),
+            (27, Whitespace, "\n  "),
+            (30, Name, "node2"),
+            (35, Punctuation, "("),
+            (36, Name, "arg"),
+            (39, Punctuation, ":"),
+            (40, Whitespace, " "),
+            (41, Punctuation, "["),
+            (42, Number.Integer, "1"),
+            (43, Punctuation, ","),
+            (44, Whitespace, " "),
+            (45, Punctuation, "{"),
+            (46, Name, "a"),
+            (47, Punctuation, ":"),
+            (48, Whitespace, " "),
+            (49, String, '"'),
+            (50, String, "a"),
+            (51, String, '"'),
+            (52, Punctuation, "}"),
+            (53, Punctuation, "]"),
+            (54, Punctuation, ")"),
+            (55, Whitespace, "\n"),
+            (56, Punctuation, "}"),
+            (57, Whitespace, "\n"),
+        ]
+        assert_tokens_equal(self, text, expected)
diff -Nru pygments-2.15.1+dfsg/tests/test_html_formatter.py pygments-2.17.2+dfsg/tests/test_html_formatter.py
--- pygments-2.15.1+dfsg/tests/test_html_formatter.py	2023-03-29 19:10:26.000000000 +0000
+++ pygments-2.17.2+dfsg/tests/test_html_formatter.py	2020-02-02 00:00:00.000000000 +0000
@@ -235,12 +235,12 @@
     except ImportError:
         # we can't check without the ctags module, but at least check the exception
         assert pytest.raises(
-            RuntimeError, HtmlFormatter, tagsfile='support/tags'
+            RuntimeError, HtmlFormatter, tagsfile='tests/support/tags'
         )
     else:
         # this tagfile says that test_ctags() is on line 165, even if it isn't
         # anymore in the actual source
-        fmt = HtmlFormatter(tagsfile='support/tags', lineanchors='L',
+        fmt = HtmlFormatter(tagsfile='tests/support/tags', lineanchors='L',
                             tagurlformat='%(fname)s%(fext)s')
         outfile = StringIO()
         fmt.format(tokensource, outfile)
diff -Nru pygments-2.15.1+dfsg/tox.ini pygments-2.17.2+dfsg/tox.ini
--- pygments-2.15.1+dfsg/tox.ini	1970-01-01 00:00:00.000000000 +0000
+++ pygments-2.17.2+dfsg/tox.ini	2020-02-02 00:00:00.000000000 +0000
@@ -0,0 +1,94 @@
+[tox]
+envlist = py
+
+[testenv]
+description =
+  run tests with pytest (you can pass extra arguments for pytest,
+  e.g., "tox -- --update-goldens")
+deps =
+    pytest >= 7.0
+    pytest-cov
+    pytest-randomly
+    wcag-contrast-ratio
+commands = pytest {posargs}
+use_develop = True
+
+[testenv:regexlint]
+description =
+  lint regular expressions with regexlint
+deps =
+    git+https://github.com/pygments/regexlint.git@master
+commands = regexlint pygments.lexers
+
+
+[testenv:pylint]
+description =
+  lint code with pylint
+deps =
+  pylint
+skip_install = True # doesn't need installing Pygments into the venv
+commands =
+  pylint --rcfile scripts/pylintrc pygments
+
+
+[testenv:check]
+description =
+  miscellaneous checks on the source code, including pyflakes
+deps =
+  flake8
+commands =
+  python scripts/check_crlf.py pygments external
+  python scripts/detect_missing_analyse_text.py --skip-no-aliases
+  # We only use pyflakes, not pycodestyle, but use it through flake8 nevertheless
+  # to be able to use the --ignore option.
+  flake8 --select F --ignore F401 pygments
+  python scripts/check_sources.py -i pygments/lexers/_mapping.py \
+        -i pygments/styles/_mapping.py \
+        -i docs/_build -i pygments/formatters/_mapping.py -i pygments/unistring.py \
+        -i tests/support/empty.py
+  python scripts/count_token_references.py --minfiles=1 --maxfiles=1 \
+                                           --minlines=1 --maxlines=3 --subtoken
+
+[testenv:mapfiles]
+description =
+  regenerate map files
+deps =
+commands =
+  python scripts/gen_mapfiles.py
+
+
+[testenv:coverage]
+description =
+  run tests, and generate a coverage report in htmlcov/
+commands =
+  pytest --cov --cov-report=html --cov-report=term {posargs}
+
+
+[testenv:doc]
+description =
+  compile documentation with Sphinx. You can pass a builder name,
+  like "tox -e doc -- latex". You can also add extra options, like
+  "SPHINXOPTS='-D latex_paper_size=letter' tox -e doc -- latex".
+change_dir = doc
+deps =
+  sphinx
+  wcag-contrast-ratio
+commands =
+  sphinx-build -b {posargs:html} -n {env:SPHINXOPTS} . _build/{posargs:html}
+
+
+[testenv:web-doc]
+description =
+  same as doc, but also build the demo by compiling Pygments to WASM.
+change_dir = doc
+deps = {[testenv:doc]deps}
+allowlist_externals =
+  docker
+setenv =
+  # Enable the BuildKit backend to use the --output option.
+  DOCKER_BUILDKIT = 1
+  # Build the demo page.
+  WEBSITE_BUILD = 1
+commands =
+  docker build --file pyodide/Dockerfile --output _build/pyodide/pyodide ..
+  sphinx-build -b {posargs:html} {env:SPHINXOPTS} . _build/{posargs:html}