Merge branch 'develop' into rawoptions (let's see how this works out)

# Conflicts:
#	base/ltclass.dtx
#	base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
#	base/testfiles/tlb-latexrelease-rollback-003-often.tlg
#	base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
#	base/testfiles/tlb-rollback-004-often.luatex.tlg
#	base/testfiles/tlb-rollback-004-often.tlg
#	base/testfiles/tlb-rollback-004-often.xetex.tlg

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [davidcarlisle,FrankMittelbach,josephwright]

.github/stale.yml

@@ -5,7 +5,7 @@ daysUntilClose: 999999
 # Issues with these labels will never be considered stale
 exemptLabels:
   - pinned
-  - longterm
+  - long-term
   - fixed in dev
 # Label to use when marking an issue as stale
 staleLabel: stale

.travis.yml

@@ -12,8 +12,11 @@ cache:
 jobs:
   include:
     - if: NOT tag IS present
-      script: l3build check -q  --show-log-on-error
-      name: "Test suite"
+      script: cd base && l3build check -q --show-log-on-error
+      name: "Test suite: base"
+    - if: NOT tag IS present
+      script: cd required && l3build check -q --show-log-on-error
+      name: "Test suite: required"
     - if: NOT tag IS present
       script: l3build doc -q -H --show-log-on-error
       name: "Documentation"

README.md

@@ -93,4 +93,7 @@ The LaTeX kernel is developed by [The LaTeX3 Project](https://latex-project.org)
 
 ## Copyright
 
-This README file is copyright 2019 The LaTeX Project.
+This README file is
+
+Copyright (C) 2019-2021
+The LaTeX Project

base/README.md

@@ -1,7 +1,7 @@
 The LaTeX kernel
 ================
 
-Release 2020-10-01 pre-release 7
+Release 2021-05-01 pre-release 1
 
 Overview
 --------

base/TEMPLATE-IncludeInRelease.txt

@@ -1,6 +1,6 @@
 %</2ekernel>
 %<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease>\IncludeInRelease{2021/05/01}%
 %<latexrelease>                 {\XXX}{Info}%
 
 

base/alltt.dtx

@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2020
-% The LaTeX3 Project and any individual authors listed elsewhere
+% Copyright (C) 1993-2021
+% The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
 % This file is part of the LaTeX base system.
@@ -30,7 +30,7 @@
 %%
 %% File `alltt.dtx'.
 %% Copyright (C) 1987 by Leslie Lamport
-%% Copyright (C) 1994--1997 LaTeX3 project, Johannes Braams
+%% Copyright (C) 1994-2021 LaTeX Project, Johannes Braams
 %%                       all rights reserved.
 %%
 %<*dtx>
@@ -40,10 +40,11 @@
 %<package>\ProvidesPackage{alltt}
 %<driver>\ProvidesFile{alltt.drv}
 %\ProvidesFile{alltt.dtx}
-              [1997/06/16 v2.0g defines alltt environment]
+              [2021/01/29 v2.0g defines alltt environment]
 %
 %<*driver>
 \documentclass{ltxdoc}
+\usepackage{alltt}
 \begin{document}
 \providecommand{\Lenv}[1]{\textsf{#1}}
 \providecommand{\pkg}[1]{\texttt{#1}}
@@ -55,6 +56,8 @@
 %
 % \changes{v2.0g}{1997/06/16}{A few documentation fixes (PR 2520)}
 % \changes{v2.0d}{1995/04/02}{A few documentation fixes (PR 1517)}
+% \changes{v2.0g}{2021-01-29}{Added a warning about OT1 versus T1 font
+% encoding}
 %
 %  \GetFileInfo{alltt.dtx}
 %  \title{The \texttt{alltt} environment\thanks{This file
@@ -88,11 +91,19 @@
 %    extra blank line if you're not careful.
 %
 %   \item Insert a math formula.  Note that |$| just produces a dollar
-%   sign, so you'll have to type |\(...\)| or |\[...\]|.  Also, |^|
-%   and |_| just produce their characters; use |\sp| or |\sb| for
-%   super- and subscripts, as in |\(x\sp{2}\)|.
+%    sign, so you'll have to type |\(...\)| or |\[...\]|.  Also, |^|
+%    and |_| just produce their characters; use |\sp| or |\sb| for
+%    super- and subscripts, as in |\(x\sp{2}\)|.
 %   \end{itemize}
 %
+%    \textbf{NB} When you are using \textsf{OT1} encoded fonts you might
+%    be surprsied when you switch to italics, becuase those fonts have
+%    a different set of glyphs:
+%    \begin{alltt}
+%  The glyph at the position of the $ in a slanted font: \textsl{$}.
+%  The glyph at the position of the $ in an italic font: \textit{$}.
+%    \end{alltt}
+%
 %  \StopEventually{}
 %
 %  \section{The Implementation}
@@ -173,7 +184,7 @@
 %    control sequence |\do| between the characters. We use that to
 %    check whether a character has to be removed.
 %
-%    The macro |\g@remfrom@specials| takes one argument, the chracter
+%    The macro |\g@remfrom@specials| takes one argument, the character
 %    to be removed from the list.
 %    \begin{macrocode}
 \def\g@remfrom@specials#1{%

base/alltt.ins

@@ -3,8 +3,8 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 1993-2020
-%% The LaTeX3 Project and any individual authors listed elsewhere
+%% Copyright (C) 1993-2021
+%% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
 %%
 %% This file is part of the LaTeX base system.
@@ -48,8 +48,8 @@ reports for it can be opened at https://latex-project.org/bugs.html
 (but please observe conditions on bug reports sent to that address!)
 
 
-Copyright (C) 1993-2020
-The LaTeX3 Project and any individual authors listed elsewhere
+Copyright (C) 1993-2021
+The LaTeX Project and any individual authors listed elsewhere
 in this file.
 
 This file was generated from file(s) of the LaTeX base system.

base/bugs.txt

@@ -21,7 +21,7 @@ Before you report an error, please check that:
      https://www.latex-project.org/bugs.html
 
  * The error is not caused by software other than the core LaTeX
-   software that is produced and maintained by the LaTeX3 project
+   software that is produced and maintained by the LaTeX Project
    team. Please report problems with other software to the authors
    or suppliers of that software, and not to us!
 
@@ -30,9 +30,9 @@ Before you report an error, please check that:
 
    Also, the test file demonstrating the error should not use any
    classes or packages other than those authored and supported by the
-   LaTeX3 team.  The files for the package or class will tell you how
+   LaTeX Project team.  The files for the package or class will tell you how
    it is supported. The test file should use the package latexbug to
-   check that all packages in the file are supported by the LaTeX3
+   check that all packages in the file are supported by the LaTeX
    Project (see the discussion on the website why this is important).
 
  * The error is not caused by using an obsolete version of any file or
@@ -85,4 +85,4 @@ given in that corresponding errata file.
 Please *do not* send such reports to the latex-bugs address.
 
 
---- Copyright 1997,1998,2006,2008,2017,2020 the LaTeX3 project.  All rights reserved ---
+--- Copyright (C) 1997-2021 the LaTeX Project.  All rights reserved ---

base/build.lua

@@ -109,6 +109,7 @@ typesetfiles   =
     "ltx3info.tex",
     "modguide.tex",
     "usrguide.tex",
+    "usrguide3.tex",
     "latexchanges.tex",
     "lthooks-doc.tex",
     "ltshipout-doc.tex",
@@ -125,6 +126,7 @@ dynamicfiles = {"*.tst"}
 unpackfiles     = {"unpack.ins"}
 unpacksuppfiles =
   {
+    "glyphtounicode.tex",
     "hyphen.cfg",
     "UShyphen.tex",
     "ot1lmr.fd",
@@ -140,21 +142,21 @@ unpacksuppfiles =
 testsuppdir = "testfiles/helpers"
 
 -- No dependencies at all (other than l3build and for typesetting)
-checkdeps   = { }
+checkdeps   = { maindir .. "/required/firstaid"  }
 typesetdeps =
   {
     maindir .. "/required/graphics",
     maindir .. "/required/tools",
     maindir .. "/required/amsmath"    -- for l3doc.cls :-(
   }
-unpackdeps  = { }
+unpackdeps  = {}
 
 -- Customise typesetting
 indexstyle = "source2e.ist"
 
 -- Allow for TU and other test configurations
 checkconfigs = {"build","config-1run","config-TU","config-legacy","config-lthooks",
-                "config-lthooks2"}
+                "config-lthooks2","config-ltcmd"}
 
 update_tag = update_tag_base
 
@@ -209,9 +211,3 @@ dofile (maindir .. "/build-config.lua")
 if not master_branch then
   makeindexfiles = { }
 end
-
--- Find and run the build system
-kpse.set_program_name ("kpsewhich")
-if not release_date then
-  dofile(kpse.lookup("l3build.lua"))
-end