[latex3-commits] [latex3/latex2e] develop: Gh1102 (#1164) (26fbd179)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/26fbd179d095e7cef3da9d371ba9f7ae3a1c5604

>---------------------------------------------------------------

commit 26fbd179d095e7cef3da9d371ba9f7ae3a1c5604
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Nov 9 17:57:21 2023 +0100

    Gh1102 (#1164)
    
    * improve error message for #1102
    
    * add news entry


>---------------------------------------------------------------

26fbd179d095e7cef3da9d371ba9f7ae3a1c5604
 base/changes.txt                  |  6 ++++++
 base/doc/ltnews39.tex             | 14 +++++++++++++-
 base/ltoutenc.dtx                 |  9 +++++++--
 base/nfssfont.dtx                 |  6 +++---
 base/testfiles/tlb2054.luatex.tlg |  4 +++-
 base/testfiles/tlb2054.tlg        |  4 +++-
 6 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index f9930dc3..51e856dd 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -14,6 +14,12 @@ not part of the distribution.
 	Mention correct source file names in license footnotes
 
 2023-11-07  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+	* ltoutenc.dtx (subsection{The fontenc package}):
+	Add more explanation to error message about missing encoding (gh/1102)
+
+	* nfssfont.dtx (section{The code}):
+	Corrected spelling in error message.
+
 	* ltcounts.dtx (subsection{Environment Counter Macros}):
 	In \newcounter do not change \the... if already defined (gh/823)
 
diff --git a/base/doc/ltnews39.tex b/base/doc/ltnews39.tex
index ab081313..b3cc99ec 100644
--- a/base/doc/ltnews39.tex
+++ b/base/doc/ltnews39.tex
@@ -163,9 +163,21 @@ corrected.
 \githubissue{549}
 
 
-
 \section{Code improvements}
 
+\subsection{Improve \pkg{fontenc} error message}
+
+If the \pkg{fontenc} is asked to load a font encoding for which it
+doesn't find a suitable \texttt{.def} file it generates an error
+message indicating that the encoding name might be misspelled. That
+is, of course, one of the possible causes, but another one is that the
+installation is missing a necessary support package, e.g., that no
+support for Cyrillic fonts has been installed. The error message text
+has therefore been extended to explain the issue more generally.
+%
+\githubissue{1102}
+
+
 \subsection{Warn if counter names are problematic}
 
 In the past it was possible to declare, for example,
diff --git a/base/ltoutenc.dtx b/base/ltoutenc.dtx
index 1d257805..56f45dea 100644
--- a/base/ltoutenc.dtx
+++ b/base/ltoutenc.dtx
@@ -44,7 +44,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltoutenc.dtx}
-             [2022/05/27 v2.0z LaTeX Kernel (font encodings)]
+             [2023/11/07 v2.1a LaTeX Kernel (font encodings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutenc.dtx}
@@ -3677,6 +3677,7 @@
    \if at tempswa
 %    \end{macrocode}
 %
+% \changes{v2.1a}{2023/11/07}{Add more explanation to error message (gh/1102)}
 %    \begin{macrocode}
      \edef\reserved at f{%
        \lowercase{\def\noexpand\reserved at f{\CurrentOption enc.def}}}%
@@ -3685,7 +3686,11 @@
           {}{\PackageError{fontenc}%
            {Encoding file `\reserved at f' not found.%
             \MessageBreak
-             You might have misspelt the name of the encoding}%
+            You might have misspelled the name of the encoding
+            \MessageBreak
+            or a required support package (e.g., cyrillic) is
+            \MessageBreak
+            missing in your installation}%
            {Necessary code for this encoding was not
             loaded.\MessageBreak
             Thus calling the encoding later on will
diff --git a/base/nfssfont.dtx b/base/nfssfont.dtx
index 556ce5f7..2fa4fbcc 100644
--- a/base/nfssfont.dtx
+++ b/base/nfssfont.dtx
@@ -26,8 +26,8 @@
 % extension .ins) which are part of the distribution.
 %
 % \fi
-\def\nfssfontfileversion{v2.2e}
-\def\nfssfontfiledate{2020/11/26}
+\def\nfssfontfileversion{v2.2f}
+\def\nfssfontfiledate{2023/11/07}
 
 %
 % \iffalse
@@ -197,7 +197,7 @@
        {\PackageWarningNoLine{nfssfont}%
         {Encoding file `\next' not found.%
           \MessageBreak
-           You might have misspelt the name of the encoding
+           You might have misspelled the name of the encoding
           \MessageBreak
            or perhaps this encoding is not a text encoding,
          \MessageBreak
diff --git a/base/testfiles/tlb2054.luatex.tlg b/base/testfiles/tlb2054.luatex.tlg
index 9e5a9a16..0782591a 100644
--- a/base/testfiles/tlb2054.luatex.tlg
+++ b/base/testfiles/tlb2054.luatex.tlg
@@ -6,7 +6,9 @@ Package: fontenc
 (fontenc.sty
 Package: fontenc ....-..-.. v... Standard LaTeX package
 ! Package fontenc Error: Encoding file `x1enc.def' not found.
-(fontenc)                You might have misspelt the name of the encoding.
+(fontenc)                You might have misspelled the name of the encoding 
+(fontenc)                or a required support package (e.g., cyrillic) is 
+(fontenc)                missing in your installation.
 See the fontenc package documentation for explanation.
 Type  H <return>  for immediate help.
  ...                                              
diff --git a/base/testfiles/tlb2054.tlg b/base/testfiles/tlb2054.tlg
index 39fe622a..a2695736 100644
--- a/base/testfiles/tlb2054.tlg
+++ b/base/testfiles/tlb2054.tlg
@@ -6,7 +6,9 @@ Package: fontenc
 (fontenc.sty
 Package: fontenc ....-..-.. v... Standard LaTeX package
 ! Package fontenc Error: Encoding file `x1enc.def' not found.
-(fontenc)                You might have misspelt the name of the encoding.
+(fontenc)                You might have misspelled the name of the encoding 
+(fontenc)                or a required support package (e.g., cyrillic) is 
+(fontenc)                missing in your installation.
 See the fontenc package documentation for explanation.
 Type  H <return>  for immediate help.
  ...