Merge branch 'master' into 671/upsuper/webidl

This allows us to resolve the merge conflict properly.

12 files changed, 199 insertions, 84 deletions

diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
index 5544f98a..5f7ecf92 100644
--- a/doc/_templates/indexsidebar.html
+++ b/doc/_templates/indexsidebar.html
@@ -3,12 +3,12 @@
 <p>This documentation is for version <b>{{ version }}</b>, which is
   not released yet.</p>
 <p>You can use it from the
-  <a href="http://github.com/pygments/pygments/">Git repo</a> or look for
-  released versions in the <a href="http://pypi.python.org/pypi/Pygments">Python
+  <a href="https://github.com/pygments/pygments/">Git repo</a> or look for
+  released versions in the <a href="https://pypi.python.org/pypi/Pygments">Python
     Package Index</a>.</p>
 {% else %}
 <p>Current version: <b>{{ version }}</b></p>
-<p>Get Pygments from the <a href="http://pypi.python.org/pypi/Pygments">Python Package
+<p>Get Pygments from the <a href="https://pypi.python.org/pypi/Pygments">Python Package
     Index</a>, or install it with:</p>
 <pre>pip install Pygments</pre>
 {% endif %}
@@ -20,5 +20,5 @@
 <p>You can also open an issue at the
   <a href="https://github.com/pygments/pygments/issues">tracker</a>.</p>
 
-<p class="logo">A <a href="http://pocoo.org/">
+<p class="logo">A <a href="https://pocoo.org/">
     <img src="{{ pathto("_static/pocoo.png", 1) }}" /></a> project</a></p>
diff --git a/doc/_themes/pygments14/layout.html b/doc/_themes/pygments14/layout.html
index 53f8f37f..3e04665d 100644
--- a/doc/_themes/pygments14/layout.html
+++ b/doc/_themes/pygments14/layout.html
@@ -17,7 +17,7 @@
 {% block relbar2 %}{% endblock %}
 
 {% block extrahead %}
-    <link href='http://fonts.googleapis.com/css?family={{ theme_font|replace(' ', '+') }}:300,400,700'
+    <link href='https://fonts.googleapis.com/css?family={{ theme_font|replace(' ', '+') }}:300,400,700'
           rel='stylesheet' type='text/css'>
 {{ super() }}
 {%- if not embedded %}
@@ -83,10 +83,10 @@
 {% block footer %}
     <div class="footer" role="contentinfo">
       &copy; Copyright 2006-2019, Georg Brandl and Pygments contributors.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{
+      Created using <a href="https://sphinx-doc.org/">Sphinx</a> {{
       sphinx_version }}. <br/>
-      Pygments logo created by <a href="http://joelunger.com">Joel Unger</a>.
-      Backgrounds from <a href="http://subtlepatterns.com">subtlepatterns.com</a>.
+      Pygments logo created by <a href="https://joelunger.com">Joel Unger</a>.
+      Backgrounds from <a href="https://subtlepatterns.com">subtlepatterns.com</a>.
     </div>
   </div> {# closes "outerwrapper" div #}
 {% endblock %}
diff --git a/doc/docs/integrate.rst b/doc/docs/integrate.rst
index 77daaa43..5f266ac5 100644
--- a/doc/docs/integrate.rst
+++ b/doc/docs/integrate.rst
@@ -12,7 +12,7 @@ that uses Pygments to render source code in
 :file:`external/markdown-processor.py`.  You can copy and adapt it to your
 liking.
 
-.. _Markdown: http://www.freewisdom.org/projects/python-markdown/
+.. _Markdown: https://pypi.org/project/Markdown/
 
 TextMate
 --------
@@ -20,7 +20,7 @@ TextMate
 Antonio Cangiano has created a Pygments bundle for TextMate that allows to
 colorize code via a simple menu option.  It can be found here_.
 
-.. _here: http://antoniocangiano.com/2008/10/28/pygments-textmate-bundle/
+.. _here: https://programmingzen.com/pygments-textmate-bundle/
 
 Bash completion
 ---------------
diff --git a/doc/docs/java.rst b/doc/docs/java.rst
index f553463c..a8a5beb3 100644
--- a/doc/docs/java.rst
+++ b/doc/docs/java.rst
@@ -2,18 +2,18 @@
 Use Pygments in Java
 =====================
 
-Thanks to `Jython <http://www.jython.org>`_ it is possible to use Pygments in
+Thanks to `Jython <https://www.jython.org/>`_ it is possible to use Pygments in
 Java.
 
 This page is a simple tutorial to get an idea of how this works. You can
-then look at the `Jython documentation <http://www.jython.org/docs/>`_ for more
+then look at the `Jython documentation <https://jython.readthedocs.io/en/latest/>`_ for more
 advanced uses.
 
 Since version 1.5, Pygments is deployed on `Maven Central
-<http://repo1.maven.org/maven2/org/pygments/pygments/>`_ as a JAR, as is Jython
+<https://repo1.maven.org/maven2/org/pygments/pygments/>`_ as a JAR, as is Jython
 which makes it a lot easier to create a Java project.
 
-Here is an example of a `Maven <http://www.maven.org>`_ ``pom.xml`` file for a
+Here is an example of a `Maven <https://maven.apache.org/>`_ ``pom.xml`` file for a
 project running Pygments:
 
 .. sourcecode:: xml
diff --git a/doc/docs/lexerdevelopment.rst b/doc/docs/lexerdevelopment.rst
index 5b6813fb..c776457b 100644
--- a/doc/docs/lexerdevelopment.rst
+++ b/doc/docs/lexerdevelopment.rst
@@ -106,13 +106,13 @@ flag ``-x``:
 
 .. code-block:: console
 
-    $ pygmentize -l your_lexer_file.py -x
+    $ python -m pygments -l your_lexer_file.py -x
 
 To specify a class name other than CustomLexer, append it with a colon:
 
 .. code-block:: console
 
-    $ pygmentize -l your_lexer.py:SomeLexer -x
+    $ python -m pygments -l your_lexer.py:SomeLexer -x
 
 Or, using the Python API:
 
@@ -140,7 +140,7 @@ cloned from GitHub.
 
 .. code-block:: console
 
-    $ cd .../pygments-main
+    $ cd pygments
 
 Select a matching module under ``pygments/lexers``, or create a new module for
 your lexer class.
@@ -164,16 +164,17 @@ To test the new lexer, store an example file with the proper extension in
 ``tests/examplefiles``.  For example, to test your ``DiffLexer``, add a
 ``tests/examplefiles/example.diff`` containing a sample diff output.
 
-Now you can use pygmentize to render your example to HTML:
+Now you can use ``python -m pygments`` from the current root of the checkout to
+render your example to HTML:
 
 .. code-block:: console
 
-    $ ./pygmentize -O full -f html -o /tmp/example.html tests/examplefiles/example.diff
+    $ python -m pygments -O full -f html -o /tmp/example.html tests/examplefiles/example.diff
 
-Note that this explicitly calls the ``pygmentize`` in the current directory
-by preceding it with ``./``. This ensures your modifications are used.
-Otherwise a possibly already installed, unmodified version without your new
-lexer would have been called from the system search path (``$PATH``).
+Note that this explicitly calls the ``pygments`` module in the current
+directory. This ensures your modifications are used. Otherwise a possibly
+already installed, unmodified version without your new lexer would have been
+called from the system search path (``$PATH``).
 
 To view the result, open ``/tmp/example.html`` in your browser.
 
@@ -196,7 +197,7 @@ defined, it defaults to `re.MULTILINE`.  For more information about regular
 expression flags see the page about `regular expressions`_ in the Python
 documentation.
 
-.. _regular expressions: http://docs.python.org/library/re.html#regular-expression-syntax
+.. _regular expressions: https://docs.python.org/library/re.html#regular-expression-syntax
 
 
 Scanning multiple tokens at once
diff --git a/doc/docs/moinmoin.rst b/doc/docs/moinmoin.rst
index 8b2216b3..80ed25c3 100644
--- a/doc/docs/moinmoin.rst
+++ b/doc/docs/moinmoin.rst
@@ -36,4 +36,4 @@ If you do not want to do that and are willing to accept larger HTML output, you
 can set the ``INLINESTYLES`` option to True.
 
 
-.. _Moin: http://moinmoin.wikiwikiweb.de/
+.. _Moin: https://moinmo.in/
diff --git a/doc/docs/plugins.rst b/doc/docs/plugins.rst
index a6f8d7b0..1008013a 100644
--- a/doc/docs/plugins.rst
+++ b/doc/docs/plugins.rst
@@ -7,7 +7,7 @@ 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: http://peak.telecommunity.com/DevCenter/setuptools
+.. _setuptools: https://pypi.org/project/setuptools/
 
 That means you can use your highlighter modules with the `pygmentize` script,
 which relies on the mentioned functions.
@@ -82,7 +82,7 @@ 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.
 
-.. _setuptools documentation: http://peak.telecommunity.com/DevCenter/setuptools
+.. _setuptools documentation: https://setuptools.readthedocs.io/en/latest/
 
 
 Extending The Core
diff --git a/doc/docs/rstdirective.rst b/doc/docs/rstdirective.rst
index c0d503b3..edc117d3 100644
--- a/doc/docs/rstdirective.rst
+++ b/doc/docs/rstdirective.rst
@@ -19,4 +19,4 @@ From Pygments 0.9, the directive is shipped in the distribution as
    ``.. code::`` directives and highlights the contents in the specified language
    if the `handlecodeblocks` option is true.
 
-.. _ReST: http://docutils.sf.net/rst.html
+.. _ReST: https://docutils.sourceforge.io/rst.html
diff --git a/doc/download.rst b/doc/download.rst
index 975c41b0..7ac08680 100644
--- a/doc/download.rst
+++ b/doc/download.rst
@@ -7,8 +7,8 @@ Packaged versions
 -----------------
 
 You can download it `from the Python Package Index
-<http://pypi.python.org/pypi/Pygments>`_.  For installation of packages from
-PyPI, we recommend `Pip <http://www.pip-installer.org>`_, which works on all
+<https://pypi.python.org/pypi/Pygments>`_.  For installation of packages from
+PyPI, we recommend `Pip <https://www.pip-installer.org>`_, which works on all
 major platforms.
 
 Under Linux, most distributions include a package for Pygments, usually called
diff --git a/doc/faq.rst b/doc/faq.rst
index 108cef44..c094d085 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -89,41 +89,41 @@ Who uses Pygments?
 
 This is an (incomplete) list of projects and sites known to use the Pygments highlighter.
 
-* `Wikipedia <http://en.wikipedia.org>`_
-* `BitBucket <http://bitbucket.org/>`_, a Mercurial and Git hosting site
-* `The Sphinx documentation builder <http://sphinx.pocoo.org/>`_, for embedded source examples
-* `rst2pdf <http://code.google.com/p/rst2pdf/>`_, a reStructuredText to PDF converter
-* `Codecov <http://codecov.io/>`_, a code coverage CI service
-* `Trac <http://trac.edgewall.org/>`_, the universal project management tool
-* `AsciiDoc <http://www.methods.co.nz/asciidoc/>`_, a text-based documentation generator
-* `ActiveState Code <http://code.activestate.com/>`_, the Python Cookbook successor
+* `Wikipedia <https://en.wikipedia.org/>`_
+* `BitBucket <https://bitbucket.org/>`_, a Mercurial and Git hosting site
+* `The Sphinx documentation builder <https://sphinx-doc.org/>`_, for embedded source examples
+* `rst2pdf <https://github.com/ralsina/rst2pdf>`_, a reStructuredText to PDF converter
+* `Codecov <https://codecov.io/>`_, a code coverage CI service
+* `Trac <https://trac.edgewall.org/>`_, the universal project management tool
+* `AsciiDoc <https://www.methods.co.nz/asciidoc/>`_, a text-based documentation generator
+* `ActiveState Code <https://code.activestate.com/>`_, the Python Cookbook successor
 * `ViewVC <http://viewvc.org/>`_, a web-based version control repository browser
-* `BzrFruit <http://repo.or.cz/w/bzrfruit.git>`_, a Bazaar branch viewer
+* `BzrFruit <https://repo.or.cz/w/bzrfruit.git>`_, a Bazaar branch viewer
 * `QBzr <http://bazaar-vcs.org/QBzr>`_, a cross-platform Qt-based GUI front end for Bazaar
-* `Review Board <http://www.review-board.org/>`_, a collaborative code reviewing tool
-* `Diamanda <http://code.google.com/p/diamanda/>`_, a Django powered wiki system with support for Pygments
+* `Review Board <https://www.reviewboard.org/>`_, a collaborative code reviewing tool
+* `Diamanda <https://code.google.com/archive/p/diamanda/>`_, a Django powered wiki system with support for Pygments
 * `Progopedia <http://progopedia.ru/>`_ (`English <http://progopedia.com/>`_),
   an encyclopedia of programming languages
-* `Bruce <http://r1chardj0n3s.googlepages.com/bruce>`_, a reStructuredText presentation tool
+* `Bruce <https://sites.google.com/site/r1chardj0n3s/bruce>`_, a reStructuredText presentation tool
 * `PIDA <http://pida.co.uk/>`_, a universal IDE written in Python
-* `BPython <http://www.noiseforfree.com/bpython/>`_, a curses-based intelligent Python shell
-* `PuDB <http://pypi.python.org/pypi/pudb>`_, a console Python debugger
-* `XWiki <http://www.xwiki.org/>`_, a wiki-based development framework in Java, using Jython
+* `BPython <https://bpython-interpreter.org/>`_, a curses-based intelligent Python shell
+* `PuDB <https://pypi.org/project/pudb/>`_, a console Python debugger
+* `XWiki <https://www.xwiki.org/>`_, a wiki-based development framework in Java, using Jython
 * `roux <http://ananelson.com/software/roux/>`_, a script for running R scripts
   and creating beautiful output including graphs
 * `hurl <http://hurl.it/>`_, a web service for making HTTP requests
 * `wxHTMLPygmentizer <http://colinbarnette.net/projects/wxHTMLPygmentizer>`_ is
   a GUI utility, used to make code-colorization easier
-* `Postmarkup <http://code.google.com/p/postmarkup/>`_, a BBCode to XHTML generator
+* `Postmarkup <https://code.google.com/archive/p/postmarkup/>`_, a BBCode to XHTML generator
 * `WpPygments <http://blog.mirotin.net/?page_id=49>`_, and `WPygments
   <https://github.com/capynet/WPygments>`_, highlighter plugins for WordPress
 * `Siafoo <http://siafoo.net>`_, a tool for sharing and storing useful code and programming experience
 * `D source <http://www.dsource.org/>`_, a community for the D programming language
 * `dpaste.com <http://dpaste.com/>`_, another Django pastebin
-* `Django snippets <http://www.djangosnippets.org/>`_, a pastebin for Django code
+* `Django snippets <https://djangosnippets.org/>`_, a pastebin for Django code
 * `Fayaa <http://www.fayaa.com/code/>`_, a Chinese pastebin
 * `Incollo.com <http://incollo.com>`_, a free collaborative debugging tool
-* `PasteBox <http://p.boxnet.eu/>`_, a pastebin focused on privacy
+* `PasteBox <https://p.boxnet.eu/>`_, a pastebin focused on privacy
 * `hilite.me <http://www.hilite.me/>`_, a site to highlight code snippets
 * `patx.me <http://patx.me/paste>`_, a pastebin
 * `Fluidic <https://github.com/richsmith/fluidic>`_, an experiment in
diff --git a/doc/index.rst b/doc/index.rst
index d89277ec..e538aadb 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -5,7 +5,7 @@ This is the home of Pygments.  It is a generic syntax highlighter suitable for
 use in code hosting, forums, wikis or other applications that need to prettify
 source code.  Highlights are:
 
-* a wide range of over 300 languages and other text formats is supported
+* a wide range of over 500 languages and other text formats is supported
 * special attention is paid to details that increase highlighting quality
 * support for new languages and formats are added easily; most languages use a
   simple regex-based lexing mechanism
@@ -15,7 +15,7 @@ source code.  Highlights are:
 * ... and it highlights even Perl 6!
 
 Read more in the :doc:`FAQ list <faq>` or the :doc:`documentation <docs/index>`,
-or `download the latest release <http://pypi.python.org/pypi/Pygments>`_.
+or `download the latest release <https://pypi.python.org/pypi/Pygments>`_.
 
 .. _contribute:
 
@@ -40,7 +40,7 @@ Pygments is maintained by **Georg Brandl**, e-mail address *georg*\ *@*\ *python
 and **Matthäus Chajdas**.
 
 Many lexers and fixes have been contributed by **Armin Ronacher**, the rest of
-the `Pocoo <http://dev.pocoo.org/>`_ team and **Tim Hatch**.
+the `Pocoo <https://dev.pocoo.org/>`_ team and **Tim Hatch**.
 
 .. toctree::
    :maxdepth: 1
diff --git a/doc/languages.rst b/doc/languages.rst
index 6f77f859..586a6287 100644
--- a/doc/languages.rst
+++ b/doc/languages.rst
@@ -10,103 +10,171 @@ Programming languages
 
 * ActionScript
 * Ada
+* Agda (incl. literate)
+* `Alloy <https://alloytools.org/>`_
+* `AMPL <https://ampl.com/>`_
 * ANTLR
+* APL
 * AppleScript
 * Assembly (various)
 * Asymptote
 * `Augeas <http://augeas.net>`_
+* AutoIt
 * Awk
 * BBC Basic
 * Befunge
-* `Boa <http://boa.cs.iastate.edu/docs/index.php>`_
+* BlitzBasic
+* `Boa <https://boa.cs.iastate.edu/docs/>`_
 * Boo
+* `Boogie <https://boogie.codeplex.com/>`_
 * BrainFuck
-* C, C++
+* C, C++ (incl. dialects like Arduino)
 * C#
+* `Chapel <https://chapel-lang.org/>`_
 * `Charm++ CI <http://charmplusplus.org/>`_
+* Cirru
+* Clay
+* `Clean <https://clean.cs.ru.nl/Clean>`_
 * Clojure
 * CoffeeScript
 * ColdFusion
 * Common Lisp
-* Coq
+* Component Pascal
+* `Coq <https://coq.inria.fr/>`_
+* Croc (MiniD)
 * Cryptol (incl. Literate Cryptol)
-* `Crystal <http://crystal-lang.org>`_
-* `Cython <http://cython.org>`_
-* `D <http://dlang.org>`_
+* `Crystal <https://crystal-lang.org>`_
+* Cypher
+* `Cython <https://cython.org>`_
+* `D <https://dlang.org>`_
 * Dart
 * DCPU-16
 * Delphi
-* Dylan
-* `Elm <http://elm-lang.org/>`_
+* Dylan (incl. console)
+* Eiffel
+* `Elm <https://elm-lang.org/>`_
+* Emacs Lisp
 * Email
-* Erlang
-* `Ezhil <http://ezhillang.org>`_ Ezhil - A Tamil programming language
+* Erlang (incl. shell sessions)
+* `Ezhil <http://ezhillang.org>`_
 * Factor
 * Fancy
+* Fantom
 * `Fennel <https://fennel-lang.org/>`_
-* `FloScript <http://ioflo.com/>`_
+* `FloScript <https://ioflo.com/>`_
 * Fortran
 * `FreeFEM++ <https://freefem.org/>`_
 * F#
 * GAP
 * Gherkin (Cucumber)
-* GL shaders
+* GLSL shaders
+* `Golo <https://golo-lang.org/>`_
+* Gosu
 * Groovy
-* `Haskell <http://www.haskell.org>`_ (incl. Literate Haskell)
+* `Haskell <https://www.haskell.org/>`_ (incl. Literate Haskell)
 * HLSL
-* `HSpec <http://hackage.haskell.org/package/hspec>`_
+* `HSpec <https://hackage.haskell.org/package/hspec>`_
+* Hy
 * IDL
+* Idris (incl. Literate Idris)
+* Igor Pro
 * Io
+* Jags
 * Java
 * JavaScript
-* Lasso
-* LLVM
+* Jasmin
+* Jcl
+* `Julia <https://julialang.org>`_
+* Kotlin
+* Lasso (incl. templating)
+* Limbo
+* LiveScript
 * Logtalk
-* `Lua <http://www.lua.org>`_
+* Logos
+* `Lua <https://lua.org>`_
+* Mathematica
 * Matlab
-* MiniD
 * Modelica
 * Modula-2
+* Monkey
+* `Monte <https://monte.readthedocs.io/>`_
+* MoonScript
+* Mosel
 * MuPad
+* NASM
 * Nemerle
+* NesC
+* NewLISP
 * Nimrod
+* `Nit <https://nitlanguage.org/>`_
 * Notmuch
+* NuSMV
 * Objective-C
 * Objective-J
 * Octave
 * OCaml
+* Opa
+* OpenCOBOL
+* `ParaSail <https://www.parasail-lang.org/>`_
+* Pawn
 * PHP
-* `Perl 5 <http://perl.org>`_ and `Perl 6 <https://perl6.org>`_
+* `Perl 5 <https://perl.org>`_
+* Pike
 * `Pony <https://www.ponylang.io/>`_
 * PovRay
 * PostScript
 * PowerShell
+* `Praat <http://www.praat.org>`_
 * Prolog
-* `Python <http://www.python.org>`_ 2.x and 3.x (incl. console sessions and tracebacks)
+* `Python <https://python.org/>`_ 2.x and 3.x (incl. console sessions and
+  tracebacks)
+* QBasic
+* `Racket <https://racket-lang.org/>`_
+* `Raku <https://www.raku.org/>`_ a.k.a. Perl 6
 * `REBOL <http://www.rebol.com>`_
-* `Red <http://www.red-lang.org>`_
+* `Red <https://www.red-lang.org>`_
 * Redcode
-* `Ruby <http://www.ruby-lang.org>`_ (incl. irb sessions)
-* Rust
+* Rexx
+* Ride
+* `Ruby <https://www.ruby-lang.org>`_ (incl. irb sessions)
+* `Rust <https://rust-lang.org>`_
 * S, S-Plus, R
 * Scala
 * `Scdoc <https://git.sr.ht/~sircmpwn/scdoc>`_
 * Scheme
 * Scilab
 * `SGF <https://www.red-bean.com/sgf/>`_
+* Shell scripts (Bash, Tcsh, Fish)
+* `Shen <http://shenlanguage.org/>`_
+* Silver
 * `Slash <https://github.com/arturadib/Slash-A>`_
 * `Slurm <https://slurm.schedmd.com/overview.html>`_
 * Smalltalk
 * SNOBOL
+* `Snowball <https://snowballstem.org/>`_
 * `Solidity <https://solidity.readthedocs.io/>`_
+* SourcePawn
+* `Stan <https://mc-stan.org/>`_
+* Standard ML
+* Stata
+* Swift
+* Swig
+* `SuperCollider <https://supercollider.github.io/>`_
 * Tcl
 * `Tera Term language <https://ttssh2.osdn.jp/>`_
-* `TOML <https://github.com/toml-lang/toml>`_
+* TypeScript
+* TypoScript
+* `USD <https://graphics.pixar.com/usd/docs/index.html>`_
+* Unicon
+* Urbiscript
 * Vala
-* Verilog
+* VBScript
+* Verilog, SystemVerilog
 * VHDL
 * Visual Basic.NET
 * Visual FoxPro
+* `Whiley <http://whiley.org/>`_
+* `Xtend <https://www.eclipse.org/xtend/>`_
 * XQuery
 * `Zeek <https://www.zeek.org>`_
 * Zephir
@@ -115,50 +183,95 @@ Programming languages
 Template languages
 ------------------
 
+* Angular templates
 * Cheetah templates
-* `Django <http://www.djangoproject.com>`_ / `Jinja
-  <http://jinja.pocoo.org/jinja>`_ templates
+* ColdFusion
+* `Django <https://www.djangoproject.com>`_ / `Jinja
+  <https://jinja.pocoo.org/jinja>`_ templates
 * ERB (Ruby templating)
-* `Genshi <http://genshi.edgewall.org>`_ (the Trac template language)
+* Evoque
+* `Genshi <https://genshi.edgewall.org>`_ (the Trac template language)
+* Handlebars
 * JSP (Java Server Pages)
-* `Myghty <http://www.myghty.org>`_ (the HTML::Mason based framework)
-* `Mako <http://www.makotemplates.org>`_ (the Myghty successor)
-* `Smarty <http://www.smarty.net>`_ templates (PHP templating)
+* Liquid
+* `Myghty <https://pypi.org/project/Myghty/>`_ (the HTML::Mason based framework)
+* `Mako <https://www.makotemplates.org>`_ (the Myghty successor)
+* Slim
+* `Smarty <https://www.smarty.net>`_ templates (PHP templating)
 * Tea
+* `Twig <https://twig.symfony.com/>`_
 
 Other markup
 ------------
 
 * Apache config files
-* Bash shell scripts
+* Apache Pig
 * BBCode
+* CapDL
+* `Cap'n Proto <https://capnproto.com>`_
 * CMake
+* `Csound <https://csound.com>`_ scores
 * CSS
 * Debian control files
 * Diff files
+* Dockerfiles
 * DTD
+* EBNF
+* E-mail headers
+* Extempore
+* Flatline
 * Gettext catalogs
 * Gnuplot script
 * Groff markup
+* Hexdumps
 * HTML
 * HTTP sessions
+* IDL
+* Inform
 * INI-style config files
 * IRC logs (irssi style)
+* Isabelle
+* JSGF notation
+* JSON, JSON-LD
+* Lean theorem prover
 * Lighttpd config files
+* Linux kernel log (dmesg)
+* LLVM assembly
+* LSL scripts
 * Makefiles
 * MoinMoin/Trac Wiki markup
+* MQL
 * MySQL
+* NCAR command language
 * Nginx config files
+* `Nix language <https://nixos.org/nix/>`_
+* NSIS scripts
+* Notmuch
 * POV-Ray scenes
+* `Puppet <https://puppet.com/>`_
+* QML
 * Ragel
 * Redcode
 * ReST
+* `Roboconf <http://roboconf.net/en/roboconf.html>`_
 * Robot Framework
 * RPM spec files
+* Rql
+* RSL
+* Scdoc
+* Sieve
+* SPARQL
 * SQL, also MySQL, SQLite
 * Squid configuration
+* TADS 3
+* Terraform
 * TeX
-* tcsh
+* `Thrift <https://thrift.apache.org/>`_
+* `TOML <https://github.com/toml-lang/toml>`_
+* Treetop grammars
+* USD (Universal Scene Description)
+* Varnish configs
+* VGL
 * Vim Script
 * WDiff
 * Web IDL
@@ -166,6 +279,7 @@ Other markup
 * XML
 * XSLT
 * YAML
+* Windows Registry files
 
 ... that's all?
 ---------------