latex-dev (17jun22)

git-svn-id: svn://tug.org/texlive/trunk@63631 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 176 insertions, 52 deletions

diff --git a/Master/texmf-dist/source/latex-dev/base/doc.dtx b/Master/texmf-dist/source/latex-dev/base/doc.dtx
index 7c602327efb..d6b21744df0 100644
--- a/Master/texmf-dist/source/latex-dev/base/doc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/doc.dtx
@@ -45,7 +45,7 @@
 %<+package>
 %<+package>\ProvidesPackage{doc}
 %<+shortvrb>\ProvidesPackage{shortvrb}
-%<+package|shortvrb>  [2022/06/01 v3.0h
+%<+package|shortvrb>  [2022/06/08 v3.0j
 %<+package|shortvrb>   Standard LaTeX documentation package V3 (FMi)]
 %\catcode`\<=12
 %
@@ -146,11 +146,12 @@
 %
 % \newcommand{\DOC}{\texttt{doc}\xspace}
 %
-% \newcommand\env{\texttt}
-% \newcommand\opt{\texttt}
-% \newcommand\cls{\texttt}
-% \newcommand\pkg{\texttt}
-% \newcommand\prg{\textsf}
+% \changes{v3.0j}{2022/06/02}{Use \cs{providecommand} to define \cs{pkg}}
+% \providecommand\env{\texttt}
+% \providecommand\opt{\texttt}
+% \providecommand\cls{\texttt}
+% \providecommand\pkg{\texttt}
+% \providecommand\prg{\textsf}
 %
 % \newcommand\DOX{\env{DoX}\xspace}
 % \newcommand\api{\textsc{api}\xspace}
@@ -276,7 +277,7 @@
 %    that are upwards compatible but hopefully serve well. Most
 %    important modifications are the integration of the
 %    \pkg{hypdoc} package to enable links within the document (in
-%    particular from the index) is so desired. Also integrated are the
+%    particular from the index) if so desired. Also integrated are the
 %    ideas from the \DOX package by Didier Verna (although I
 %    offer a different interface that imho fits better with the rest
 %    of \DOC's interfaces). Finally I updated a few odds and ends.
@@ -1909,7 +1910,6 @@
 %    \fmi{cleanup replacement of kvoptions}
 %
 %    \begin{macrocode}
-\RequirePackage{l3keys2e}
 \ExplSyntaxOn
 %    \end{macrocode}
 % Some keys are available as options for use in \cs{usepackage} some are
@@ -2020,7 +2020,7 @@
 % \subsection{Processing the package keys}
 %
 %    \begin{macrocode}
-\ProcessKeysOptions {doc}
+\ProcessKeyOptions
 %    \end{macrocode}
 %
 %
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfiles.dtx b/Master/texmf-dist/source/latex-dev/base/ltfiles.dtx
index 2a87756da54..d99dfdcd48f 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfiles.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfiles.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfiles.dtx}
-             [2022/04/01 v1.2q LaTeX Kernel (File Handling)]
+             [2022/05/27 v1.2r LaTeX Kernel (File Handling)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfiles.dtx}
@@ -1640,6 +1640,7 @@
 %
 % \changes{v1.0o}{1994/11/30}
 %         {Use \cs{@dofilelist}}
+% \changes{v1.2r}{2022/05/27}{Try saved version string, if ver@.. is \cs{relax} (gh/825)}
 %    \begin{macrocode}
   \def\@dofilelist{%
      \typeout{^^J *File List*}%
@@ -1650,6 +1651,15 @@
           \ifx\filename@ext\relax tex\else\filename@ext\fi}%
        \expandafter\let\expandafter\reserved@b
                               \csname ver@\reserved@a\endcsname
+%    \end{macrocode}
+%    Packages that \cs{relax} their \cs{ver@...} string to allow for
+%    multiple loading (e.g., \pkg{fontenc}) can use \cs{ver@@...} to
+%    store the version information instead.
+%    \begin{macrocode}
+       \ifx\reserved@b\relax
+         \expandafter\let\expandafter\reserved@b
+                         \csname ver@@\reserved@a\endcsname
+       \fi
        \expandafter\expandafter\expandafter\@listfiles\expandafter
              \filename@area\filename@base\\\\\\\\\\\\\\\\\\\@@
        \typeout{%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx b/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
index 5857e6cf589..b1b8ff953be 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfinal.dtx}
-             [2022/04/21 v2.2t LaTeX Kernel (Final Settings)]
+             [2022/06/02 v2.2u LaTeX Kernel (Final Settings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfinal.dtx}
@@ -273,9 +273,9 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{trace_stack_levels}
+% \begin{macro}{trace\string_stack\string_levels}
 %   Now define the Lua function to emulate \cs{tracingstacklevels} and
-%   install it in the \texttt{input_level_string} callback.
+%   install it in the |input_level_string| callback.
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
@@ -1064,6 +1064,7 @@
 %
 % \begin{macro}{\MakeUppercase}
 % \begin{macro}{\MakeUppercase}
+% \begin{macro}{\NoCaseChange}
 % \begin{macro}{\@uclclist}
 % \begin{macro}{\@expl@text@lowercase@@n}
 % \begin{macro}{\@expl@text@uppercase@@n}
@@ -1091,10 +1092,17 @@
 \ExplSyntaxOn
 \protected\def\@expl@text@lowercase@@n{\text_lowercase:n}
 \protected\def\@expl@text@uppercase@@n{\text_uppercase:n}
+%    \end{macrocode}
+%
+% \changes{v2.2u}{2022/06/02}{Add \cs{NoCaseChange}}
+% |\NoCaseChange| protects its argument from the case change functions.
+%    \begin{macrocode}
+\tl_put_right:Nn \l_text_case_exclude_arg_tl  { \NoCaseChange }
+\cs_new_protected:Npn \NoCaseChange #1 {#1}
 \ExplSyntaxOff
 %    \end{macrocode}
-
-%%    \begin{macrocode}
+%
+%    \begin{macrocode}
 \DeclareRobustCommand{\MakeUppercase}[1]{{%
       \def\i{I}\def\j{J}%
       \def\reserved@a##1##2{\let##1##2\reserved@a}%
@@ -1151,6 +1159,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \changes{v1.0h}{1994/05/13}{Added output enc stuff}
 % \changes{v1.0i}{1994/05/16}{moved output enc stuff to lfonts}
diff --git a/Master/texmf-dist/source/latex-dev/base/lthooks.dtx b/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
index 06a0e8258f6..cfa1454775d 100644
--- a/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
@@ -31,8 +31,8 @@
 %%% From File: lthooks.dtx
 %
 %    \begin{macrocode}
-\def\lthooksversion{v1.0u}
-\def\lthooksdate{2022/05/19}
+\def\lthooksversion{v1.0v}
+\def\lthooksdate{2022/06/15}
 %    \end{macrocode}
 %
 %<*driver>
@@ -2649,6 +2649,13 @@
             \@@_make_usable:n {#1}
             \tl_gset:cx { g_@@_#1_reversed_tl }
               { \@@_if_generic_reversed:nT {#1} { - } }
+%    \end{macrocode}
+%    Reflect that we have activated the generic hook and set its
+%    execution code.
+% \changes{v1.0v}{2022/06/15}{Ensure that a newly activated generic hook
+%               gets its execution code set}
+%    \begin{macrocode}
+            \@@_update_hook_code:n {#1}
           }
       }
   }
diff --git a/Master/texmf-dist/source/latex-dev/base/ltkeys.dtx b/Master/texmf-dist/source/latex-dev/base/ltkeys.dtx
index 00c26002896..c6dfa5f6ddb 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltkeys.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltkeys.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltkeys.dtx}
-             [2022/02/21 v1.0f LaTeX Kernel (Kevyal options)]
+             [2022/06/16 v1.0g LaTeX Kernel (Kevyal options)]
 % \iffalse
 \documentclass{l3doc}
 \GetFileInfo{ltkeys.dtx}
@@ -277,6 +277,9 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_options_class:n}
+% \changes{v1.0g}{2022/06/16}{Better handling of option removal}
+% \begin{macro}{\@@_options_remove:nnn}
+% \changes{v1.0g}{2022/06/16}{New function}
 %   For classes, each option (stripped of any content after |=|)
 %   is checked for existence as a key. If found, the option is added to
 %   the combined list for processing. On the other hand, unused options
@@ -296,18 +299,26 @@
           {
             \clist_map_inline:cn { opt@ \@currname . \@currext }
               {
-                \keys_if_exist:neTF
-                  {#1} { \@@_remove_equals:n {##1} }
-                  { \clist_put_right:Nn \l_@@_options_clist {##1} }
-                  { \clist_put_right:Nn \@unusedoptionlist {##1} }
+                \@@_options_remove:enn
+                  { \@@_remove_equals:n {##1} }
+                  {##1} {#1}
               }
           }
       }
   }
+\cs_new_protected:Npn \@@_options_remove:nnn #1#2#3
+  {
+    \keys_if_exist:nnTF {#3} {#1}
+      { \clist_put_right:Nn \l_@@_options_clist {#2} }
+      { \clist_put_right:Nn \@unusedoptionlist {#1} }
+  }
+\cs_generate_variant:Nn \@@_options_remove:nnn { e }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\@@_options_package:n}
+% \changes{v1.0g}{2022/06/16}{Better handling of option removal}
 %   For global options when processing a package, the tasks are slightly
 %   different from those for a class. The check is the same, but here
 %   there is nothing to do if the option is not applicable. Each valid
@@ -317,11 +328,9 @@
   {
     \clist_map_inline:Nn \@classoptionslist
       {
-        \keys_if_exist:neT {#1} { \@@_remove_equals:n {##1} }
-          {
-            \clist_put_right:Nn \l_@@_options_clist {##1}
-            \clist_remove_all:Nn \@unusedoptionlist {##1}
-          }
+        \@@_options_remove:enn
+          { \@@_remove_equals:n {##1} }
+          {##1} {#1}
       }
   }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltmarks.dtx b/Master/texmf-dist/source/latex-dev/base/ltmarks.dtx
index e8971c9d6c5..3dc4b493ace 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltmarks.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltmarks.dtx
@@ -14,8 +14,8 @@
 %%% From File: ltmarks.dtx
 %
 %    \begin{macrocode}
-\def\ltmarksversion{v1.0c}
-\def\ltmarksdate{2022/05/06}
+\def\ltmarksversion{v1.0d}
+\def\ltmarksdate{2022/06/01}
 %    \end{macrocode}
 %<*driver>
 \documentclass{l3doc}
@@ -826,18 +826,25 @@
       \dim_set_eq:NN \tex_vfuzz:D         \c_max_dim
 %    \end{macrocode}
 %    There is a further complication: if the region contains infinite
-%    shrinking glue then a \cs{vsplit} operation will balk with a
+%    shrinking glue then a \tn{vsplit} operation will balk with a
 %    low-level error. Now pages or columns, which are our main concern here, can't
 %    have such infinite shrinkage if they are cut straight from the
-%    galley, however the use of \cs{enlargethispage} actually does add
+%    galley, however the use of \tn{enlargethispage} actually does add
 %    some at the very bottom (and also wraps the whole page into a box
 %    by itself, so if we leave it this way then a) we get this error
 %    and b) we don't see any marks because they are hidden one level
 %    down).
+%      
+%    Another possible issue are packages or user code that place stray
+%    \tn{vbox}es directly into the main galley (an example is
+%    \pkg{marginnote} that attaches its marginals in this way). If such
+%    boxes end up as the last item on the page we should not unpack
+%    them.
 %
 %    We therefore do an \tn{unskip} to get rid of that glue if present and
-%    also check if we have then a \cs{vbox} as the last item and if so
-%    unpack that too. All this is temporary, just for getting the
+%    also check if we have then a \tn{vbox} as the last item and if so
+%    unpack that too, but only under certain conditions, see
+%    below. All this is temporary, just for getting the
 %    marks out, so it doesn't affect the final page production.
 %
 %    In fact, we go one step further and set the box to a large
@@ -856,16 +863,50 @@
           #2
           \tex_unskip:D
           \box_set_to_last:N \l_@@_box
-          \box_if_vertical:NT \l_@@_box
-              { \vbox_unpack:N \l_@@_box }
+%    \end{macrocode}
+%    After having removed the last box from the current list (if there
+%    was one)
+%    we check if the list is now empty. If not, the the last box is
+%    definitely not the one from \tn{enlargethispage} and so we can
+%    and should leave it alone. Otherwise we check if this last box is
+%    a \tn{vbox}.
+% \changes{v1.0d}{2022/06/01}{Extend the logic for detecting the marks
+%    in the box (gh/836)}
+%    \begin{macrocode}
+          \int_compare:nNnT \tex_lastnodetype:D < 0
+            {
+              \box_if_vertical:NT \l_@@_box
+                {
+%    \end{macrocode}
+%    If it is we do a further test and reset the \cs{l_@@_box}
+%    to check if it contains infinitely shrinkable glue.
+%    \begin{macrocode}
+                  \vbox_set_to_ht:Nnn \l_@@_box { -.5\c_max_dim }
+                    {
+                      \vbox_unpack:N \l_@@_box
+                      \tex_kern:D \c_zero_dim % ensure that box
+                                              % is not empty
+                    }
+%    \end{macrocode}
+%    If not, then we unpack it, if yes we still ignore it for the process of
+%    mark extraction. We do not generate an error though, because in all
+%    likelihood this is an ordinary box like a marginal that does
+%    contain something like \tn{vss}.
+%    \begin{macrocode}
+                    \int_compare:nNnT \tex_badness:D > 0
+                      { \vbox_unpack:N \l_@@_box }
+                  }
+            }
 %    \end{macrocode}
 %    If it wasn't a vbox, it was either an hbox or there was no box.
 %    Given that we are only interested in the marks we don't need put
-%    it back in that case. However, we have to make sure that the box
+%    it back in that case. However, we have to make sure that the
+%    outer box under construction
 %    is not totally empty (which it might have been from the start, or
 %    now), because \TeX{} does not report a badness for empty boxes
-%    which means out test would incorrectly conclude that we have
-%    infinite shrinking glue. A simple \tn{kern} is enough to avoid this.
+%    and that means our test would incorrectly conclude that we have
+%    infinite shrinking glue. A simple \tn{kern} is enough to avoid
+%    this (the same was already done above).
 %    \begin{macrocode}
           \tex_kern:D \c_zero_dim
         }
@@ -1165,6 +1206,12 @@
 %
 % \subsection{Messages}
 %
+%    Mark errors are LaTeX kernel errors:
+% \changes{v1.0d}{2022/06/01}{Marks are kernel errors}
+%    \begin{macrocode}
+\prop_gput:Nnn \g_msg_module_type_prop { mark } { LaTeX }
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \msg_new:nnnn { mark } { class-already-defined }
   { Mark~class~'#1'~already~defined }
diff --git a/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx b/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx
index 8e4867417b0..4dac4e15486 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx
@@ -44,7 +44,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltoutenc.dtx}
-             [2021/12/12 v2.0y LaTeX Kernel (font encodings)]
+             [2022/05/27 v2.0z LaTeX Kernel (font encodings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutenc.dtx}
@@ -3764,7 +3764,10 @@
   \@elt{\csname opt@fontenc.sty\endcsname}}
 %    \end{macrocode}
 %
+% \changes{v2.0z}{2022/05/27}{Save the version string (gh/825)}
 %    \begin{macrocode}
+\global\expandafter\let\csname ver@@fontenc.sty\expandafter\endcsname
+                       \csname ver@fontenc.sty\endcsname
 \global\expandafter\let\csname ver@fontenc.sty\endcsname\relax
 \global\expandafter\let\csname opt@fontenc.sty\endcsname\relax
 \global\let\@ifl@ter@@\@ifl@ter
diff --git a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
index f4075ea2ab8..cd228e62b4c 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
@@ -115,7 +115,7 @@
    {2022-06-01}
 %</2ekernel|latexrelease>
 %<*2ekernel>
-\def\patch@level{-4}
+\def\patch@level{-0}
 %    \end{macrocode}
 %
 % \begin{macro}{\development@branch@name}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltxdoc.dtx b/Master/texmf-dist/source/latex-dev/base/ltxdoc.dtx
index 10ddd44828c..f68c45ee360 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltxdoc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltxdoc.dtx
@@ -30,7 +30,7 @@
 %
 %<class>\NeedsTeXFormat{LaTeX2e}
 %<class>\ProvidesClass{ltxdoc}
-%<class>         [2021/12/07 v2.1d Standard LaTeX documentation class]
+%<class>         [2022/06/14 v2.1g Standard LaTeX documentation class]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -51,6 +51,8 @@
 %
 % \fi
 %
+% \providecommand\pkg[1]{\texttt{#1}}
+%
 %
 % \changes{v2.0i}{1994/04/29}{Update the documentation.}
 % \changes{v2.0s}{1998/08/17}{(RmS) Documentation fixes.}
@@ -115,10 +117,13 @@
 % \AtBeginDocument{\OnlyDescription}
 %\end{verbatim}
 %
+% If your document relies on using the old \pkg{doc} version, you can
+% request that the class loads \pkg{doc} version~2 by passing the
+% option \texttt{doc2}.
 %
 % If the full source listing |sources2e.tex| is processed, then an index
-% and change history are produced by default, however indices are not
-% normally produced for individual files.
+% and change history are produced by default, however indexes are normally
+% not produced for individual files.
 %
 % As an example, consider |ltclass.dtx|, which contains the sources for
 % the new class and package interface commands.  With no |cfg|
@@ -175,6 +180,13 @@
 \DeclareOption{nocfg}{\ltxdoc@load@cfg@false}
 %    \end{macrocode}
 %
+%    Support rolling back \pkg{doc} to version 2:
+% \changes{v2.1e}{2022/05/27}{Support rolling  back doc to version 2}
+%    \begin{macrocode}
+\let\ltxdoc@doc@version\@empty  % use current version by default
+\DeclareOption{doc2}{\def\ltxdoc@doc@version{=v2}}
+%    \end{macrocode}
+% 
 %    \begin{macrocode}
 \DeclareOption*{%
     \PassOptionsToClass  {\CurrentOption}{article}}
@@ -209,8 +221,13 @@
 \LoadClass{article}
 %    \end{macrocode}
 %
+%     By default, loadthe current \pkg{doc} version
+%    (\cs{ltxdoc@doc@version} is empty). If option
+%    \texttt{doc2} is given version 2 is loaded
+%    (\cs{ltxdoc@doc@version} contains \texttt{=v2}).
+% \changes{v2.1e}{2022/05/27}{Support rolling  back doc to version 2}
 %    \begin{macrocode}
-\RequirePackage{doc}
+\RequirePackage{doc}[\ltxdoc@doc@version]
 %    \end{macrocode}
 %
 % Make \verb+|+ be a `short verb' character, but not in the document
@@ -606,14 +623,33 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\url}
+%
 %    \begin{macrocode}
-\providecommand\url{\texttt}
+\def\task#1#2{}
+%    \end{macrocode}
+%
+%
+% \changes{v2.1f}{2022/06/03}{define \cs{pkg} and other commands}
+% \changes{v2.1f}{2022/06/03}{allow \_ in macro names}
+% Some feaures from l3doc.cls
+% \changes{v2.1g}{2022/06/14}{define \cs{pkg} but delay until begin document}
+%    \begin{macrocode}
+\DeclareRobustCommand\cs[1]{\texttt{\bslash\detokenize{#1}}}%
+\AtBeginDocument{%
+  \renewcommand\PrintMacroName[1]{\MacroFont\detokenize{#1}}%
+%    \end{macrocode}
+%    We provide those delated in case somebody has loaded \texttt{csquotes}
+%    or makes some definitions in the preamble.
+%    \begin{macrocode}
+  \providecommand\LuaTeX{Lua\TeX}
+  \providecommand\cls{\textsf}
+  \providecommand\pkg{\textsf}
+  \providecommand\enquote[1]{``#1''}
+  \providecommand\url{\texttt}
+}
 %    \end{macrocode}
-% \end{macro}
 %
 %    \begin{macrocode}
-\def\task#1#2{}
 %</class>
 %    \end{macrocode}
 %
@@ -634,7 +670,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 % 
 
 \ProvidesFile{ltxdoc.cfg}%
-  [2021/12/07 v2.0c ltxdoc.cls configuration (LaTeX Project)]
+  [2022/06/14 v2.0d ltxdoc.cls configuration (LaTeX Project)]
 \PassOptionsToClass{a4paper}{article}
 
 % hyperref and hypdoc are now loaded late (or by the user) so we have to wait
diff --git a/Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx b/Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx
index c6ec89872ec..363998a8538 100644
--- a/Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/utf8ienc.dtx
@@ -216,7 +216,7 @@
 %<+ts1> \ProvidesFile{ts1enc.dfu}
 %<+x2>  \ProvidesFile{x2enc.dfu}
 %<+all> \ProvidesFile{utf8enc.dfu}
-%<-utf8-2018>   [2022/05/08 v1.3b UTF-8 support]
+%<-utf8-2018>   [2022/06/07 v1.3c UTF-8 support]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1152,6 +1152,7 @@
 % \changes{v1.1r}{2015/12/03}{Add some more ogonek cases}
 % \changes{v1.1s}{2016/01/11}{Add some more caron and acute}
 % \changes{v1.1t}{2017/01/28}{Add caron combinations for GgYy}
+% \changes{v1.3c}{2022/06/07}{Fix \cs{guillemetleft} and \cs{guillemetright} also in dfu files (gh/65)}%
 %    \begin{macrocode}
 %<all,t1,ot1,ly1>\DeclareUnicodeCharacter{00A0}{\nobreakspace}
 %<all,t1,ot1,ly1>\DeclareUnicodeCharacter{00A1}{\textexclamdown}
@@ -1165,7 +1166,8 @@
 %<all,ts1,utf8>\DeclareUnicodeCharacter{00A9}{\textcopyright}
 %<all,ts1,ly1,utf8>\DeclareUnicodeCharacter{00AA}{\textordfeminine}
 %<*all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy>
-\DeclareUnicodeCharacter{00AB}{\guillemotleft}
+%\DeclareUnicodeCharacter{00AB}{\guillemotleft}  % wrong Adobe name
+\DeclareUnicodeCharacter{00AB}{\guillemetleft}
 %</all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy>
 %<all,ts1>\DeclareUnicodeCharacter{00AC}{\textlnot}
 %<all,t1,ot1,ly1>\DeclareUnicodeCharacter{00AD}{\-}
@@ -1183,7 +1185,8 @@
 %<all,ts1>\DeclareUnicodeCharacter{00B9}{\textonesuperior}
 %<all,ts1,ly1,utf8>\DeclareUnicodeCharacter{00BA}{\textordmasculine}
 %<*all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy>
-\DeclareUnicodeCharacter{00BB}{\guillemotright}
+%\DeclareUnicodeCharacter{00BB}{\guillemotright} % wrong Adobe name
+\DeclareUnicodeCharacter{00BB}{\guillemetright}
 %</all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy>
 %<all,ts1,ly1>\DeclareUnicodeCharacter{00BC}{\textonequarter}
 %<all,ts1,ly1>\DeclareUnicodeCharacter{00BD}{\textonehalf}