1 files changed, 41 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index f0deae0fbd0..f72ba828003 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -47,12 +47,13 @@
 %<tex4htcfg>\ProvidesFile{htex4ht.cfg}
 %<pd1enc>\ProvidesFile{pd1enc.def}
 %<puenc>\ProvidesFile{puenc.def}
-%<puextra>\ProvidesFile{puencextra.def}
+%<puextra>\ProvidesFile{puenc-extra.def}
+%<pugreek>\ProvidesFile{puenc-greek.def}
 %<puvnenc>\ProvidesFile{puvnenc.def}
 %<puarenc>\ProvidesFile{puarenc.def}
 %<psdextra>\ProvidesFile{psdextra.def}
 %<lang>\ProvidesFile{hyperref-langpatches.def}
-%<!none>  [2021-02-08 v7.00i %
+%<!none>  [2021-02-10 v7.00j %
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -87,8 +88,9 @@
 %<tex4ht>\Hy@VersionCheck{htex4ht.def}
 %<tex4htcfg>  Hyperref configuration file for TeX4ht]
 %<pd1enc>  Hyperref: PDFDocEncoding definition (HO)]
-%<puenc>  Hyperref: PDF Unicode definition (HO)]
+%<puenc>      Hyperref: PDF Unicode definition (HO)]
 %<puextra>  Hyperref: PDF Unicode extra definition (HO)]
+%<pugreek>  Hyperref: PDF Unicode definition (greek block) (HO)]
 %<puvnenc>  Hyperref: Additions to puenc.def for VnTeX]
 %<puarenc>  Hyperref: Additions to puenc.def for Arabi]
 %<psdextra>  Hyperref: Additions to PDF string support]
@@ -883,6 +885,12 @@
 \Hy@pdftoolbartrue
 \Hy@typexmlfalse
 \Hy@unicodetrue
+\ifx\kanjiskip\@undefined
+\else
+  \ifx\forcecjktoken\@undefined
+   \Hy@unicodefalse
+  \fi
+\fi
 \Hy@pdfusetitlefalse
 \Hy@verbosefalse
 \Hy@pdfwindowuitrue
@@ -2063,6 +2071,10 @@
 \def\HyPsd@LoadExtra{%
   \ifHy@psdextra
     \ltx@iffileloaded{puenc.def}{%
+      \ltx@iffileloaded{puenc-greek.def}{}{%
+       \Hy@SaveCatcodeSettings{pu}%
+       \input{puenc-greek.def}%
+       \Hy@RestoreCatcodeSettings{pu}}%
       \Hy@SaveCatcodeSettings{psdextra}%
       \input{psdextra.def}%
       \Hy@RestoreCatcodeSettings{psdextra}%
@@ -4439,7 +4451,11 @@
   \let\Hy@RestoreLastskip\relax
   \ifvmode
     \ifdim\lastskip=\z@
-      \let\Hy@RestoreLastskip\nobreak
+      \ifnum\lastnodetype=11 %
+        \let\Hy@RestoreLastskip\nobreak
+      \else
+        \let\Hy@RestoreLastskip\relax
+      \fi
     \else
       \begingroup
         \skip@=-\lastskip
@@ -4890,6 +4906,7 @@
 % change 2020-08-14, use unicode by default:
 %    \begin{macrocode}
 \let\HyPsd@pdfencoding\HyPsd@pdfencoding@unicode
+\HyPsd@LoadUnicode
 \def\HyPsd@LoadStringEnc{%
   \RequirePackage{stringenc}[2009/12/15]%
   \let\HyPsd@LoadStringEnc\relax
@@ -6821,12 +6838,6 @@
 %    \end{macrocode}
 %
 %    After processing options.
-% \subsection{Load unicode support}
-%    \begin{macrocode}
-\ifHy@unicode
-  \HyPsd@LoadUnicode
-\fi
-%    \end{macrocode}
 %
 % \subsection{Package xspace support}
 %
@@ -10241,7 +10252,13 @@
   \endgroup}
 %</xetex>
 %    \end{macrocode}
-%
+% set the pdf version
+%    \begin{macrocode}
+%<*dvipdfm|xetex>
+\special{pdf:majorversion \Hy@pdf@majorversion}
+\special{pdf:minorversion \Hy@pdf@minorversion}
+%</dvipdfm|xetex>
+%    \end{macrocode}
 % \subsubsection{pdfmarkbase, dvipdfm, xetex}
 %
 %    \begin{macrocode}
@@ -14552,7 +14569,12 @@
 %    \end{macrocode}
 % \subsection{dvipdfm/xetex dvi to PDF converter}
 % Provided by Mark Wicks (mwicks@kettering.edu)
+%
+% (x)dvipdfmx replaces destination names by numbers. This makes it impossible
+% to link from an external document with xr-hyper, so from version 7.00j on
+% this is suppressed with a config special.
 %    \begin{macrocode}
+\special{dvipdfmx:config C 0x0010}
 \providecommand*{\XR@ext}{pdf}
 \Hy@setbreaklinks{true}
 \def\HyPat@ObjRef{%
@@ -20962,7 +20984,9 @@
 \DeclareTextCommand{\=}{PU}[1]{#1\83\004}% U+0304
 % U+0306 COMBINING BREVE; brevecmb
 \DeclareTextCommand{\u}{PU}[1]{#1\83\006}% U+0306
+\ifx\CYRDZE\@undefined \else
 \DeclareTextCommand{\U}{PU}[1]{#1\83\006}% U+0306
+\fi
 % U+0307 COMBINING DOT ABOVE; dotaccentcmb
 \DeclareTextCommand{\.}{PU}[1]{#1\83\007}% U+0307
 % U+0308 COMBINING DIAERESIS; dieresiscmb
@@ -22341,6 +22365,10 @@
 % Greek is only loaded if \cs{textBeta} is defined.
 %    \begin{macrocode}
 \ifx\textBeta\@undefined \else
+\input{puenc-greek.def}
+\fi
+%</puenc>
+%<*pugreek>
 % U+0374 GREEK NUMERAL SIGN; numeralsigngreek
 \DeclareTextCommand{\textnumeralsigngreek}{PU}{\83\164}% U+0374
 \DeclareTextCommand{\textdexiakeraia}{PU}{\83\164}% U+0374
@@ -22522,7 +22550,7 @@
 % U+03F6 GREEK REVERSED LUNATE EPSILON SYMBOL;
 %   \backepsilon (AmS)
 \DeclareTextCommand{\textbackepsilon}{PU}{\83\366}% U+03F6
-\fi
+%</pugreek>
 %    \end{macrocode}
 %
 % \subsubsection{Cyrillic: U+0400 to U+04FF}
@@ -22531,6 +22559,7 @@
 %    the help with the Cyrillic glyph names.
 %    Cyrillic only loaded if \cs{CYRDZE} is defined.
 %    \begin{macrocode}
+%<*puenc>
 \ifx\CYRDZE\@undefined \else
 % U+0400 CYRILLIC CAPITAL LETTER IE WITH GRAVE
 \DeclareTextCompositeCommand{\`}{PU}{\CYRE}{\84\000}% U+0400