pxjahyper (25jan18)

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

5 files changed, 32 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md b/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
index c7430c53fa9..6e64d6e4c02 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
+++ b/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
@@ -35,6 +35,9 @@ pxjahyper パッケージ ー 本体
 更新履歴
 --------
 
+  * Version 0.3c 〈2018/01/25〉
+      - バグ修正。
+
   * Version 0.3b 〈2018/01/13〉
       - パッケージ定義の PDF 文字列の文字定義を拡充した。
       - (試験的) 自動判別の誤判定を防ぐため、アウトラインファイルに
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/README.md b/Master/texmf-dist/doc/platex/pxjahyper/README.md
index 3d0200e7df6..d6d78dbf366 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/README.md
+++ b/Master/texmf-dist/doc/platex/pxjahyper/README.md
@@ -36,6 +36,7 @@ Please refer to the manual `pxjahyper.pdf` (in Japanese) for detail.
 Revision History
 ----------------
 
+  * Version 0.3c 〈2018/01/25〉
   * Version 0.3b 〈2018/01/13〉
   * Version 0.3a 〈2017/10/17〉
   * Version 0.3  〈2012/05/28〉
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
index 2cde89f0939..72cb117721d 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
+++ b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
index b387f63d481..6d1b7014498 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
+++ b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
@@ -3,8 +3,8 @@
 \documentclass[a4paper]{jsarticle}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{0.3b}
-\newcommand{\PkgDate}{2018/01/13}
+\newcommand{\PkgVersion}{0.3c}
+\newcommand{\PkgDate}{2018/01/25}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
 \newcommand{\Note}{\par\noindent ※}
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