pxjahyper (25jan18)

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

1 files changed, 26 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
index 647f5e23d16..a637c63f515 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2018/01/13 v0.3b]
+\ProvidesPackage{pxjahyper}[2018/01/25 v0.3c]
 
 %% error messages
 \def\pxhy@pkgname{pxjahyper}
@@ -34,6 +34,7 @@
 \newif\ifpxhy@tounicode
 \newif\ifpxhy@zerox
 \newif\ifpxhy@bigcode
+\let\pxhy@bigcode\relax
 \chardef\pxhy@driver@none=0
 \chardef\pxhy@driver@dvipdfmx=1
 \let\pxhy@driver\@undefined
@@ -70,10 +71,10 @@
   \pxhy@zeroxfalse
 }
 \DeclareOption{bigcode}{%
-  \pxhy@bigcodetrue
+  \let\pxhy@bigcode=t%
 }
 \DeclareOption{nobigcode}{%
-  \pxhy@bigcodefalse
+  \let\pxhy@bigcode=f%
 }
 \DeclareOption{jacommentline}{%
   \pxhy@jacommentlinetrue
@@ -82,7 +83,7 @@
   \pxhy@jacommentlinefalse
 }
 \ExecuteOptions{%
-  auto,tounicode,noout2uni,bigcode,jacommentline%
+  auto,tounicode,noout2uni,jacommentline%
 }
 \ProcessOptions*
 
@@ -147,9 +148,17 @@
   \pxhy@zeroxfalse
 \fi\fi
 % bigcode cannot be used without upTeX.
-\ifpxhy@uptex\else \ifpxhy@bigcode
-  \pxhy@warn{bigcode is invalid without upTeX}
-  \pxhy@bigcodefalse
+\if t\pxhy@bigcode
+  \ifpxhy@uptex
+    \pxhy@bigcodetrue
+  \else
+    \pxhy@warn{bigcode is invalid without upTeX}
+  \fi
+\else\if f\pxhy@bigcode
+\else
+  \ifpxhy@uptex
+    \pxhy@bigcodetrue
+  \fi
 \fi\fi
 % out2uni disables tounicode.
 \ifpxhy@zerox
@@ -931,14 +940,17 @@ pxhy@driver = \the\pxhy@driver^^J%
 \endgroup
 
 %% attach a hook
-\g@addto@macro\ReadBookmarks{%
-  \if@filesw
-    \ifx\@outlinefile\@undefined\else
-      \immediate\write\@outlinefile{%
-        \@percentchar\pxhy@jacomment.}%
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname ReadBookmarks\endcsname\relax\else
+  \g@addto@macro\ReadBookmarks{%
+    \if@filesw
+      \ifx\@outlinefile\@undefined\else
+        \immediate\write\@outlinefile{%
+          \@percentchar\pxhy@jacomment.}%
+      \fi
     \fi
-  \fi
-}
+  }
+\fi
 
 \fi
 %--------------------------------------- All done