From 1047c66359c02d8f8852e0dbdd69f5cf1cd1a76b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 5 Sep 2019 22:25:35 +0000 Subject: plautopatch (5sep19) git-svn-id: svn://tug.org/texlive/trunk@52034 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/plautopatch/README.md | 9 +- .../doc/latex/plautopatch/plautopatch-ja.pdf | Bin 100134 -> 100423 bytes .../doc/latex/plautopatch/plautopatch-ja.tex | 3 + .../doc/latex/plautopatch/plautopatch.pdf | Bin 33938 -> 34221 bytes .../doc/latex/plautopatch/plautopatch.tex | 3 + .../tex/latex/plautopatch/plautopatch.sty | 4 +- .../tex/latex/plautopatch/pxstfloats.sty | 106 +++++++++++++++++++++ 7 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/plautopatch/pxstfloats.sty diff --git a/Master/texmf-dist/doc/latex/plautopatch/README.md b/Master/texmf-dist/doc/latex/plautopatch/README.md index bfec3d0daf8..a67ed6ec728 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/README.md +++ b/Master/texmf-dist/doc/latex/plautopatch/README.md @@ -30,7 +30,9 @@ The following patches are currently registered: - atbegshi (oberdiek) -> pxatbegshi (platex-tools) - ftnright (latex-tools) -> pxftnright (platex-tools) - multicol (latex-tools) -> pxmulticol (platex-tools) +- xspace (latex-tools) -> pxxspace (platex-tools) - pdfpages -> pxpdfpages (maintained here!) +- stfloats (sttools) -> pxstfloats (pxsttools) - pgfrcs (pgf) -> pxpgfrcs (maintained here!) - pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) @@ -72,6 +74,11 @@ together with the main package. Short information: Patch for pgfrcs.sty (part of PGF) to support Japanese classes for vertical writing. Can be used on pLaTeX/upLaTeX. +- pxstfloats.sty: + Patch for stfloats.sty (sttools) to improve + compatibility with pLaTeX/upLaTeX. + Actually part of pxsttols (https://github.com/aminophen/pxsttools) + but included here for convenience. ## Installation @@ -90,6 +97,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2019-06-06 +2019-09-05 Hironobu Yamashita diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf index a1dfcfdac78..e3d20f56be3 100644 Binary files a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf and b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf differ diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex index f199a1b349d..c6d37e605bb 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex @@ -116,7 +116,9 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools) \ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools) \ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools) +\ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools) \ITEMxTx pdfpages -> pxpdfpages (maintained here!) +\ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) \ITEMoTx pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) \end{itemize} @@ -149,6 +151,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \item 2018/11/03 v0.9 \textsf{siunitx}のサポート \item 2018/11/25 v0.9b \textsf{multicol}と\textsf{doc}のサポート \item 2019/06/06 v0.9c \textsf{siunitx}のパッチ改良 + \item 2019/09/05 v0.9d \textsf{xspace}と\textsf{stfloats}のサポート \end{itemize} \end{document} diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf index 2d9b0ad42b3..245820e0ee5 100644 Binary files a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf and b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf differ diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex index 06f2db69464..cddfa40e477 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex @@ -115,7 +115,9 @@ Current version (\filedate\space\fileversion) supports the followings: \ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools) \ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools) \ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools) +\ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools) \ITEMxTx pdfpages -> pxpdfpages (maintained here!) +\ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) \ITEMoTx pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) \end{itemize} @@ -151,6 +153,7 @@ a comma-separated list of them: \item 2018/11/03 v0.9 Add support for \textsf{siunitx} \item 2018/11/25 v0.9b Add support for \textsf{multicol} and \textsf{doc} \item 2019/06/06 v0.9c Update patch for \textsf{siunitx} + \item 2019/09/05 v0.9d Add support for \textsf{xspace} and \textsf{stfloats} \end{itemize} \end{document} diff --git a/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty b/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty index 378c2b32082..2d9f3cb43ab 100644 --- a/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty +++ b/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty @@ -8,7 +8,7 @@ \NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose! \ProvidesPackage{plautopatch} - [2019/06/06 v0.9c Automated patches for pLaTeX/upLaTeX] + [2019/09/05 v0.9d Automated patches for pLaTeX/upLaTeX] \ifx\pfmtname\@undefined \PackageWarningNoLine{plautopatch}{% @@ -189,7 +189,9 @@ \platpc@patch@after{atbegshi}{pxatbegshi}% platex-tools \platpc@patch@before{ftnright}{pxftnright}% platex-tools \platpc@patch@after{multicol}{pxmulticol}% platex-tools +\platpc@patch@after{xspace}{pxxspace}% platex-tools \platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!) +\platpc@patch@before{stfloats}{pxstfloats}% pxsttools -- (!!) % for TikZ/PGF \platpc@patch@after{pgfrcs}{pxpgfrcs}% (maintained here!) diff --git a/Master/texmf-dist/tex/latex/plautopatch/pxstfloats.sty b/Master/texmf-dist/tex/latex/plautopatch/pxstfloats.sty new file mode 100644 index 00000000000..fe199749312 --- /dev/null +++ b/Master/texmf-dist/tex/latex/plautopatch/pxstfloats.sty @@ -0,0 +1,106 @@ +% +% pxstfloats.sty +% written by Hironobu Yamashita (@aminophen) +% +% This package is actually part of the pxsttools bundle, but +% for now distributed as part of the plautopatch bundle. +% https://github.com/aminophen/plautopatch +% +% This package `pxstfloats.sty' is based on: +% * stfloats.sty in sttools (2016/06/28 v3.2) +% Many thanks to lltjp-stfloats.sty in LuaTeX-ja project. +% + +\NeedsTeXFormat{pLaTeX2e} +\ProvidesPackage{pxstfloats} + [2017/02/19 v0.2 stfloats package for pLaTeX] +\RequirePackage{stfloats} + +%% mostly based on \fn@makecol in stfloats.sty, and +%% the additions for supporting pLaTeX are based on +%% pLaTeX2e 2017/04/08 community ed. +%% the code is essentially compatible with +%% fnpos.sty (yafoot) 1999/07/14 v1.0 +%% |\makeFNmid| + |\makeFNbelow| status. +\gdef\pxstfl@fnbelowfl@makecol{% + \setbox\@outputbox \box\@cclv + \let\@elt\relax + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats + \ifvoid\footins + \else + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \fi + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox \vbox to\@colht {% + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox + \iftdir\vbox{\hskip\z@}\fi %% for pLaTeX + \vskip -\dimen@ + \@textbottom + }% + \fi + \global \maxdepth \@maxdepth +} + +%% mostly based on \@makecol in latex.ltx, and +%% the additions for supporting pLaTeX are based on +%% pLaTeX2e 2017/04/08 community ed. +%% the code is essentially compatible with +%% fnpos.sty (yafoot) 1999/07/14 v1.0 +%% |\makeFNmid| + |\makeFNabove| status. +\gdef\pxstfl@fnabovefl@makecol {% + \ifvoid\footins + \setbox\@outputbox \box\@cclv + \else + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@cclv + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \fi + \let\@elt\relax + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox \vbox to\@colht {% + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox + \iftdir\vbox{\hskip\z@}\fi %% for pLaTeX + \vskip -\dimen@ + \@textbottom + }% + \fi + \global \maxdepth \@maxdepth +} + +%% the definition \fnunderfloat is unnecessary, as stfloats.sty +%% has already defined it. others should be re-declared here +\def\fnbelowfloat{\global\let\@makecol\pxstfl@fnbelowfl@makecol} +\def\fnabovefloat{\global\let\@makecol\pxstfl@fnabovefl@makecol} + +%% all done + +\endinput -- cgit v1.2.3