[latex3-commits] [git/LaTeX3-latex3-hyperref] master: load iftex directly and avoid ifvtex wrapper (11de7d8)

[David Carlisle]

Repository : https://github.com/latex3/hyperref
On branch  : master
Link       : https://github.com/latex3/hyperref/commit/11de7d8b07dc148226a3eb862064611bd4d3052d

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

commit 11de7d8b07dc148226a3eb862064611bd4d3052d
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Thu Nov 7 09:41:58 2019 +0000

    load iftex directly and avoid ifvtex wrapper


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

11de7d8b07dc148226a3eb862064611bd4d3052d
 ChangeLog.txt |  4 ++--
 hyperref.dtx  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b63f3e5..c93958e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,6 @@
 2019-11-06  David Carlisle
-   * don't load hobsub-hyperref,ifpdf,ifluatex,ifxetex,
-     do load new iftex based ifvtex
+   * don't load hobsub-hyperref,ifpdf,ifluatex,ifxetex,ifvtex
+     do load new iftex
 
 2019-10-03  David Carlisle
    * xr-hyper update to match xr
diff --git a/hyperref.dtx b/hyperref.dtx
index 586b41e..769e98c 100644
--- a/hyperref.dtx
+++ b/hyperref.dtx
@@ -588,7 +588,7 @@
 %
 %    \begin{macrocode}
 \RequirePackage{ltxcmds}[2010/11/12]
-\RequirePackage{ifvtex}[2019/10/24]
+\RequirePackage{iftex}[2019/10/24]
 \RequirePackage{pdftexcmds}[2009/04/10]
 \@ifpackagelater{pdftexcmds}{2010/11/04}{}{%
   \ltx at IfUndefined{pdfdraftmode}{%
@@ -5310,7 +5310,7 @@
     \def\Hy at DviErrMsg{XeTeX is running}%
   \else
     \ifvtex
-      \ifvtexdvi
+      \ifnum\OpMode=\z@
         \Hy at DviModetrue
       \else
         \def\Hy at DviErrMsg{VTeX is running, but not in DVI mode}%
@@ -7415,7 +7415,7 @@
   \ifx\Hy at driver\@empty
   \else
     \def\Hy at temp{hvtexhtm}%
-    \ifvtexhtml
+    \ifnum\OpMode=10 %
       \ifx\Hy at driver\Hy at temp
       \else
         \Hy at WarningNoLine{%
@@ -7455,7 +7455,7 @@
         \ifxetex
           \def\Hy at driver{hxetex}%
         \else
-          \ifvtexhtml
+          \ifnum\OpMode=10 %
             \def\Hy at driver{hvtexhtm}%
             \def\MaybeStopEarly{%
               \Hy at Message{Stopped early}%
@@ -7466,10 +7466,10 @@
               \endinput
             }%
           \else
-            \ifvtexpdf
+            \ifnum\OpMode=\@ne
               \def\Hy at driver{hvtex}%
             \else
-              \ifvtexps
+              \ifnum\OpMode=\tw@
                 \def\Hy at driver{hvtex}%
               \else
                 \ifx\HyOpt at DriverFallback\ltx at empty