From 257d6571ceb6943a612a52f71a885fefb573a685 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Oct 2020 21:48:30 +0000 Subject: bxbase (3oct20) git-svn-id: svn://tug.org/texlive/trunk@56528 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bxbase/LICENSE | 2 +- Master/texmf-dist/doc/latex/bxbase/README-ja.md | 5 +++-- Master/texmf-dist/doc/latex/bxbase/README.md | 2 ++ Master/texmf-dist/doc/latex/bxbase/bxbase-ja.pdf | Bin 76496 -> 66552 bytes Master/texmf-dist/doc/latex/bxbase/bxbase-ja.tex | 4 ++-- Master/texmf-dist/tex/latex/bxbase/bxbase.def | 8 ++++---- Master/texmf-dist/tex/latex/bxbase/bxbase.sty | 6 +++--- .../texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def | 17 ++++++++++++++--- Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def | 7 ++++++- Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def | 2 +- Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty | 6 +++--- Master/texmf-dist/tex/latex/bxbase/bxutf8.def | 2 +- Master/texmf-dist/tex/latex/bxbase/bxutf8x.def | 2 +- Master/texmf-dist/tex/latex/bxbase/zxbase.sty | 6 +++--- 14 files changed, 44 insertions(+), 25 deletions(-) diff --git a/Master/texmf-dist/doc/latex/bxbase/LICENSE b/Master/texmf-dist/doc/latex/bxbase/LICENSE index 8ada757fbc8..7f5fde238b9 100644 --- a/Master/texmf-dist/doc/latex/bxbase/LICENSE +++ b/Master/texmf-dist/doc/latex/bxbase/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017 Takayuki YATO (aka. "ZR") +Copyright (c) 2008-2020 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Master/texmf-dist/doc/latex/bxbase/README-ja.md b/Master/texmf-dist/doc/latex/bxbase/README-ja.md index c4489be1f78..54d2130fec0 100644 --- a/Master/texmf-dist/doc/latex/bxbase/README-ja.md +++ b/Master/texmf-dist/doc/latex/bxbase/README-ja.md @@ -166,8 +166,6 @@ bxbase パッケージ ― 基礎ライブラリ * `\bxDocumentSpecial{<テキスト>}` `\AtBeginDvi` を普通に用いて DVI の先頭部に special を出力する。 - * `\bxDocumentSpecialUrgent{<テキスト>}` - DVI のなるべく先頭(他の special より前)の位置に special を出力。 #### Safe caret 機能 @@ -508,6 +506,9 @@ zxbase パッケージ ― XeTeX 用基礎ライブラリ 更新履歴 -------- + * Version 1.2 〈2020/10/04〉 + - LaTeX カーネル 2020/10/01 版への対応。 + - `\bxDocumentSpecialUrgent` を非推奨にした。 * Version 1.1 〈2017/05/29〉 - 内容の整理。 - 一部の機能を非推奨にした。 diff --git a/Master/texmf-dist/doc/latex/bxbase/README.md b/Master/texmf-dist/doc/latex/bxbase/README.md index 7daab0f13bf..cf86e21af6d 100644 --- a/Master/texmf-dist/doc/latex/bxbase/README.md +++ b/Master/texmf-dist/doc/latex/bxbase/README.md @@ -120,6 +120,8 @@ For the present this package contains no public features. Revision History ---------------- + * Version 1.2 〈2020/10/04〉 + - Support LaTeX kernel 2020/10/01. * Version 1.1 〈2017/05/29〉 * Version 1.0 〈2013/04/29〉 * Version 0.5 〈2010/06/15〉 diff --git a/Master/texmf-dist/doc/latex/bxbase/bxbase-ja.pdf b/Master/texmf-dist/doc/latex/bxbase/bxbase-ja.pdf index 8ce551a1522..f4acb8dea0d 100644 Binary files a/Master/texmf-dist/doc/latex/bxbase/bxbase-ja.pdf and b/Master/texmf-dist/doc/latex/bxbase/bxbase-ja.pdf differ diff --git a/Master/texmf-dist/doc/latex/bxbase/bxbase-ja.tex b/Master/texmf-dist/doc/latex/bxbase/bxbase-ja.tex index aac6d387771..0abf1a10681 100644 --- a/Master/texmf-dist/doc/latex/bxbase/bxbase-ja.tex +++ b/Master/texmf-dist/doc/latex/bxbase/bxbase-ja.tex @@ -3,8 +3,8 @@ \documentclass[a4paper,uplatex]{jsarticle} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{1.1} -\newcommand{\PkgDate}{2017/05/29} +\newcommand{\PkgVersion}{1.2} +\newcommand{\PkgDate}{2020/10/04} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} diff --git a/Master/texmf-dist/tex/latex/bxbase/bxbase.def b/Master/texmf-dist/tex/latex/bxbase/bxbase.def index 614ac5dcc81..9094d91a3f4 100644 --- a/Master/texmf-dist/tex/latex/bxbase/bxbase.def +++ b/Master/texmf-dist/tex/latex/bxbase/bxbase.def @@ -4,7 +4,7 @@ %% file declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{bxbase.def}[2017/05/29 v1.1 BX base library] +\ProvidesFile{bxbase.def}[2020/10/04 v1.2 BX base library] \def\bx@pkgname{BXbase} % bundle name %% check intergrity @@ -599,15 +599,15 @@ \bxPreamble\newcommand*\usejapanesepdfstring{} \if s\bxInternalJaEncoding \def\usejapanesepdfstring{% why use CP932?? - \bxDocumentSpecialUrgent{pdf:tounicode 90ms-RKSJ-UCS2}% + \bx@docspec@urgent{pdf:tounicode 90ms-RKSJ-UCS2}% \bxNullify\usejapanesepdfstring} \else\if e\bxInternalJaEncoding \def\usejapanesepdfstring{% - \bxDocumentSpecialUrgent{pdf:tounicode EUC-UCS2}% + \bx@docspec@urgent{pdf:tounicode EUC-UCS2}% \bxNullify\usejapanesepdfstring} \else\if u\bxInternalJaEncoding \def\usejapanesepdfstring{% - \bxDocumentSpecialUrgent{pdf:tounicode UTF8-UCS2}% + \bx@docspec@urgent{pdf:tounicode UTF8-UCS2}% \bxNullify\usejapanesepdfstring} \else \def\usejapanesepdfstring{% diff --git a/Master/texmf-dist/tex/latex/bxbase/bxbase.sty b/Master/texmf-dist/tex/latex/bxbase/bxbase.sty index 194d7ccf3f0..aba1056922c 100644 --- a/Master/texmf-dist/tex/latex/bxbase/bxbase.sty +++ b/Master/texmf-dist/tex/latex/bxbase/bxbase.sty @@ -1,7 +1,7 @@ %% %% This is file 'bxbase.sty'. -%% -%% Copyright (c) 2017 Takayuki YATO (aka. "ZR") +%% +%% Copyright (c) 2008-2020 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxbase}[2017/05/29 v1.1 BX base library] +\ProvidesPackage{bxbase}[2020/10/04 v1.2 BX base library] %--------------------------------------- main diff --git a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def index 63b7927f5c6..42c38d8b068 100644 --- a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def +++ b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def @@ -4,7 +4,7 @@ %% file declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{bxtoolbox-ext.def}[2017/05/29 v1.1] +\ProvidesFile{bxtoolbox-ext.def}[2020/10/04 v1.2] %% check intergrity \edef\bxtb@tmpa{\@currname.\@currext}\def\bxtb@tmpb{bxtoolbox-ext.def} @@ -402,10 +402,17 @@ \bxPreamble\newcommand*\bxDocumentSpecial[1]{% \bxAtBeginDviX{\special{#1}}} -%%%% \bxDocumentSpecialUrgent{} +%%<+D> \bxDocumentSpecialUrgent{} % Similar to the above, but it demands that the given special be % placed as early as possible. -\bxPreamble\newcommand*\bxDocumentSpecialUrgent[1]{% +\bxPreamble\newcommand*\bxDocumentSpecialUrgent{% + \bx@docspec@urgent@warn + \bx@docspec@urgent} +\bxPreamble\def\bx@docspec@urgent@warn{% + \bxbz@warn@depre\bxDocumentSpecialUrgent{}% + \bxNullify\bx@docspec@urgent@warn} +\ifx\AddToHook\@undefined %---- +\bxPreamble\def\bx@docspec@urgent#1{% \bx@docspec@urgent@init \bx@prepend@box\bx@dsu@box{\special{#1}}} \def\bx@prepend@box#1#2{% @@ -421,6 +428,10 @@ \xdef\AtBegShi@HookFirst{\the\toks@\the\toks\tw@}} \fi}% \bxNullify\bx@docspec@urgent@init} +\else %---- +\bxPreamble\def\bx@docspec@urgent#1{% + \AtBeginDvi{\special{#1}}}% fallback +\fi %---- %--------------------------------------- "shadow map" module diff --git a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def index a522d6e29a8..0ebd9f9190f 100644 --- a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def +++ b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def @@ -4,7 +4,7 @@ %% file declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{bxtoolbox-ja.def}[2017/05/29 v1.1] +\ProvidesFile{bxtoolbox-ja.def}[2020/10/04 v1.2] %% check intergrity \edef\bxtb@tmpa{\@currname.\@currext}\def\bxtb@tmpb{bxtoolbox-ja.def} @@ -62,9 +62,14 @@ %%<+> \bxAtBeginDviX % \AtBeginDvi that is safe to use in pTeX. +\ifx\AddToHook\@undefined %---- \newcommand\bxAtBeginDviX[1]{% \global\setbox\@begindvibox\vbox{% \bxToYokoDir\unvbox\@begindvibox#1}} +\else %---- +\newcommand\bxAtBeginDviX[1]{% + \AtBeginDvi{#1}} +\fi %---- %--------------------------------------- Japanese something diff --git a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def index 07dae477f10..4e9738d3aa3 100644 --- a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def +++ b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def @@ -4,7 +4,7 @@ %% file declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{bxtoolbox.def}[2017/05/29 v1.1] +\ProvidesFile{bxtoolbox.def}[2020/10/04 v1.2] \providecommand*\bxtb@pkgname{BXtoolbox}% bundle name %% check intergrity diff --git a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty index 4f1ee3b8319..552ad0ae8fc 100644 --- a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty +++ b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty @@ -1,7 +1,7 @@ %% %% This is file 'bxtoolbox.sty'. -%% -%% Copyright (c) 2017 Takayuki YATO (aka. "ZR") +%% +%% Copyright (c) 2008-2020 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% file declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxtoolbox}[2017/05/29 v1.1 BX developers' toolbox] +\ProvidesPackage{bxtoolbox}[2020/10/04 v1.2 BX developers' toolbox] \def\bxtb@pkgname{bxtoolbox} %--------------------------------------- main diff --git a/Master/texmf-dist/tex/latex/bxbase/bxutf8.def b/Master/texmf-dist/tex/latex/bxbase/bxutf8.def index 9fd21684250..f4bf787f171 100644 --- a/Master/texmf-dist/tex/latex/bxbase/bxutf8.def +++ b/Master/texmf-dist/tex/latex/bxbase/bxutf8.def @@ -3,7 +3,7 @@ %% % %% file declaration -\ProvidesFile{bxutf8.def}[2017/05/29 v1.1 BX UTF-8 input encoding] +\ProvidesFile{bxutf8.def}[2020/10/04 v1.2 BX UTF-8 input encoding] % % Note: All definitions in this file should be local. % This file should not spill any spaces or \par. diff --git a/Master/texmf-dist/tex/latex/bxbase/bxutf8x.def b/Master/texmf-dist/tex/latex/bxbase/bxutf8x.def index 972f392fd94..e0ffd5413f3 100644 --- a/Master/texmf-dist/tex/latex/bxbase/bxutf8x.def +++ b/Master/texmf-dist/tex/latex/bxbase/bxutf8x.def @@ -3,7 +3,7 @@ %% % %% file declaration -\ProvidesFile{bxutf8x.def}[2017/05/29 v1.1 BX extended utf8x input] +\ProvidesFile{bxutf8x.def}[2020/10/04 v1.2 BX extended utf8x input] % % Note: All definitions in this file should be local. % This file should not spill any spaces or \par. diff --git a/Master/texmf-dist/tex/latex/bxbase/zxbase.sty b/Master/texmf-dist/tex/latex/bxbase/zxbase.sty index 4d5b2baef31..a600d2d396d 100644 --- a/Master/texmf-dist/tex/latex/bxbase/zxbase.sty +++ b/Master/texmf-dist/tex/latex/bxbase/zxbase.sty @@ -1,7 +1,7 @@ %% %% This is file 'zxbase.sty'. -%% -%% Copyright (c) 2017 Takayuki YATO (aka. "ZR") +%% +%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{zxbase}[2017/05/29 v1.1] +\ProvidesPackage{zxbase}[2020/10/04 v1.2] \RequirePackage{ifxetex} \RequireXeTeX -- cgit v1.2.3