From 02e8fad91e42f53270727f0573f3d04bba8ebaf9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Apr 2022 21:55:37 +0000 Subject: pxjahyper (2apr22) git-svn-id: svn://tug.org/texlive/trunk@62921 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/platex/pxjahyper/pxjahyper-ajm.def | 2 +- .../tex/platex/pxjahyper/pxjahyper-enc.sty | 2 +- .../tex/platex/pxjahyper/pxjahyper-uni.def | 2 +- .../texmf-dist/tex/platex/pxjahyper/pxjahyper.sty | 101 +++++++++++++++++++-- 4 files changed, 94 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def index f4f0f427e21..54fee59714b 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def @@ -11,7 +11,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxjahyper-ajm.def}[2022/03/15 v0.9d] +\ProvidesFile{pxjahyper-ajm.def}[2022/04/01 v1.0] %% avoid multiple loading \csname pxjahyperajmLoaded\endcsname diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty index 1e2ae71bb52..57a74a6f9bd 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper-enc}[2022/03/15 v0.9d] +\ProvidesPackage{pxjahyper-enc}[2022/04/01 v1.0] \def\pxhe@pkgname{pxjahyper-enc} \providecommand{\bxDebug}[1]{} diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def index 0b1019fbb98..81c62ecf889 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxjahyper-uni.def}[2022/03/15 v0.9d] +\ProvidesFile{pxjahyper-uni.def}[2022/04/01 v1.0] \providecommand{\bxDebug}[1]{} %--------------------------------------- environment check diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty index 47a913f8ee8..0a4a928952b 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}[2022/03/15 v0.9d] +\ProvidesPackage{pxjahyper}[2022/04/01 v1.0] \def\pxhy@pkgname{pxjahyper} \providecommand{\bxDebug}[1]{} @@ -48,6 +48,8 @@ \newif\ifpxhy@otfutf \newif\ifpxhy@otfcid \newif\ifpxhy@otfmacros +\let\pxhy@jsclasses@name\relax +\newif\ifpxhy@jlreq@cls %--------------------------------------- Package options @@ -64,10 +66,10 @@ \DeclareOption{nodvidriver}{% \let\pxhy@driver\pxhy@driver@none } -%% modes -\DeclareOption{none}{% - \let\pxhy@driver\pxhy@driver@none %FIXME +\DeclareOption{autodvidriver}{% + \let\pxhy@driver\@undefined } +%% modes \DeclareOption{auto}{% \let\pxhy@driver\@undefined %FIXME } @@ -207,6 +209,17 @@ \expandafter\endinput \fi +%% Check the document class. +% jlreq +\ifpxhy@etex + \ifx\jlreqsetup\@undefined\else \pxhy@jlreq@clstrue \fi +\fi +% jsclasses +\@ifclassloaded{jsarticle}{\def\pxhy@jsclasses@name{jsarticle}}{} +\@ifclassloaded{jsbook}{\def\pxhy@jsclasses@name{jsbook}}{} +\ifx\bxjs@clsname\@undefined\else \let\pxhy@jsclasses@name\relax \fi +\ifx\jsc@clsname\@undefined\else \let\pxhy@jsclasses@name\jsc@clsname \fi + %% Check for the new hook system. \@ifl@t@r\fmtversion{2021/11/15}{% \chardef\pxhy@hook@system=2 @@ -245,11 +258,9 @@ % hyperref 'unicode' is allowed only on upLaTeX. \ifnum0\ifpxhy@hy@unicode\ifpxhy@uptex\else \ifx t\pxhy@force@unicode\else1\fi\fi\fi>\z@ - \PackageError\pxhy@pkgname - {The hyperref 'unicode' mode is not supported\MessageBreak - on the pTeX engine}% - {\pxhy@eh@fatal}% - \expandafter\endinput + \PackageWarningNoLine\pxhy@pkgname + {The support for the hyperref 'unicode' mode\MessageBreak + on the pTeX engine is currently experimental}% \fi \ifpxhy@hy@unicode \pxhy@uniescapefalse @@ -325,6 +336,12 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \endgroup } +%% \pxhy@let@jchar@jc\CS{} +\def\pxhy@let@jchar@jc#1#2{% + \pxhy@get@jchar{\jis"#2}% + \let#1\pxhy@jchar +} + %% \pxhy@forcecjktoken \ifpxhy@uptex \let\pxhy@forcecjktoken\forcecjktoken @@ -733,6 +750,17 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% } \fi +%% \pxhy@let@jchar@uc\CS{} +\ifx\pxhy@Ux\@undefined + \def\pxhy@let@jchar@uc#1#2{% + \let#1\noindent % issue a warning + } +\else + \def\pxhy@let@jchar@uc#1#2{% + \def#1{\pxhy@Ux{#2}}% + } +\fi + %--------------------------------------- Support for 'otfutf' \ifpxhy@otfutf @@ -801,7 +829,7 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \pxhy@Ux{#1}% \else \@nameuse{CID+#2}% - %\pxhy@geta %FIXME: future change + \pxhy@geta \fi } \fi @@ -1468,6 +1496,7 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \let\inhibitglue\@empty \let\noautospacing\@empty \let\noautoxspacing\@empty + \let\disinhibitglue\@empty % pLaTeX core \let\romanencoding\@gobble \let\kanjiencoding\@gobble @@ -1504,6 +1533,58 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% % and thus is prepended to pdfstringdefPreHook. \ltx@GlobalPrependToMacro\pdfstringdefPreHook{\pxhy@disable@commands} +%% additions for jsclasses +\ifx\pxhy@jsclasses@name\relax\else + \g@addto@macro\pxhy@disable@commands{% + \let\HUGE\@empty + \pxhy@ifdef@let\maybeblue\@empty + } +\fi + +%% additions for jlreq +\ifpxhy@jlreq@cls + % characters + \pxhy@let@jchar@jc\pxhy@C@ZWSP{2121} + \pxhy@let@jchar@jc\pxhy@C@ZWQM{2129} + \pxhy@let@jchar@jc\pxhy@C@ZWEM{212A} + %% \pxhy@P@tatechuyoko*{} + \def\pxhy@P@tatechuyoko{\pxhy@if@star\@firstofone\@firstofone} + %% \pxhy@P@jaspace{} + \def\pxhy@P@jaspace#1{\@nameuse{jaspace(arg=#1)}} + \@namedef{jaspace(arg=zenkaku)}{\pxhy@C@ZWSP} + \@namedef{jaspace(arg=nibu)}{ } + \@namedef{jaspace(arg=shibu)}{} + % addition + \def\pxhy@next#1{% + \let\expandafter\noexpand\csname#1\endcsname\noexpand#1} + \edef\pxhy@disable@commands{% + \unexpanded\expandafter{\pxhy@disable@commands}% + \pxhy@next\pxhy@C@ZWSP + \pxhy@next\pxhy@C@ZWQM + \pxhy@next\pxhy@C@ZWEM + \unexpanded{% + \let\jafontsize\@gobbletwo + \let\jaspace\pxhy@P@jaspace + \let\tatechuyoko\pxhy@P@tatechuyoko + \let\jidori\@secondoftwo + \let\akigumi\@secondoftwo}% + } +\fi + +%% additions for ascmac (experimental) +\@onlypreamble\pxhy@dispatch@dc@ascmac +\def\pxhy@dispatch@dc@ascmac{% + \pxhy@let@jchar@jc\pxhy@P@yen{216F} + \pxhy@let@jchar@uc\pxhy@P@return{23CE} + \g@addto@macro\pxhy@disable@commands{% + \let\keytop\@firstofone + \let\yen\pxhy@P@yen + \let\return\pxhy@P@return + \let\Return\pxhy@P@return + }% +} +\pxhy@hook@after@package{ascmac}{\pxhy@dispatch@dc@ascmac} + \fi %--------------------------------------- All done \endinput -- cgit v1.2.3