From 6ee6197fa058cb894250c66be74b3a63c11069fc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 29 Jul 2017 21:38:40 +0000 Subject: platex-tools (29jul17) git-svn-id: svn://tug.org/texlive/trunk@44912 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/platex-tools/plarray.sty | 39 ++++++++++++++++++++++ .../tex/latex/platex-tools/plextarray.sty | 10 +++--- .../tex/latex/platex-tools/pxgentombow.sty | 38 +++++++++++++++++++-- 3 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/platex-tools/plarray.sty (limited to 'Master/texmf-dist/tex/latex/platex-tools') diff --git a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty new file mode 100644 index 00000000000..55002889c62 --- /dev/null +++ b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty @@ -0,0 +1,39 @@ +% +% plarray.sty +% written by Hironobu Yamashita (@aminophen) +% +% This package is part of the platex-tools bundle. +% https://github.com/aminophen/platex-tools +% +% This package `plarray.sty' is based on: +% * array.sty in latex-tools (2016/10/06 v2.4d) +% * plcore.ltx in platex (2017/07/21 v1.2p) +% + +\NeedsTeXFormat{pLaTeX2e} +\ProvidesPackage{plarray} + [2017/07/29 v0.1c Tabular extension package for pLaTeX/upLaTeX] +\RequirePackage{array} + +%% patching internal code for array.sty +% +%% remove extra \xkanjiskip (pLaTeX2e 2016/04/17) +\def\@tabular{% + \leavevmode \null + \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup + \let\d@llarend\endgroup + \@tabarray} +\def\endtabular{\endarray $\egroup\null} +\expandafter \let \csname endtabular*\endcsname = \endtabular +% +%% inhibit JFM glue around tabular cell components (pLaTeX2e 2017/07/29) +\def\insert@column{% + \the@toks \the \@tempcnta + \mbox{}\inhibitglue \ignorespaces \@sharp \unskip \unskip + \the@toks \the \count@ \relax} +% +%% done + +%% all done + +\endinput diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty index 6c34ee0e4f5..579c29cbacf 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty @@ -7,15 +7,15 @@ % % This package `plextarray.sty' is based on: % * array.sty in latex-tools (2016/10/06 v2.4d) -% * plext.sty in platex (2016/08/20 v1.2a) +% * plext.sty in platex (2017/07/21 v1.2h) % and lltjext.sty from LuaTeX-ja project. % \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plextarray} - [2016/10/23 v1.0g Tabular extension package for plext and array] + [2017/07/29 v1.0j Tabular extension package for plext and array] \RequirePackage{plext} -\RequirePackage{array} +\RequirePackage{plarray} %% save definitions from array.sty \def\array{\col@sep\arraycolsep @@ -30,7 +30,7 @@ % \def\@startpbox#1{\bgroup \box@dir\adjustbaseline %% added - \hsize=#1\@arrayparboxrestore + \setlength\hsize{#1}\@arrayparboxrestore \everypar{% \vrule \@height \ht\@arstrutbox \@width \z@ \everypar{}}% @@ -94,8 +94,6 @@ \lineskip\z@skip\baselineskip\z@skip\@preamble} % \def\endarray{\crcr \egroup \egroup \@end@alignbox \@arrayright \gdef\@preamble{}} -\def\endtabular{\endarray $\egroup\null} -\expandafter \let \csname endtabular*\endcsname = \endtabular % %% done diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxgentombow.sty b/Master/texmf-dist/tex/latex/platex-tools/pxgentombow.sty index 0a183c6481f..834510c55b1 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/pxgentombow.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/pxgentombow.sty @@ -1,9 +1,29 @@ +% % pxgentombow.sty -\NeedsTeXFormat{pLaTeX2e} +% written by Hironobu Yamashita (@aminophen) +% +% This package is part of the platex-tools bundle. +% https://github.com/aminophen/platex-tools +% + +\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxgentombow} - [2017/05/05 v0.5 Generate crop mark 'tombow'] + [2017/07/23 v0.7 Generate crop mark 'tombow'] \def\pxgtmb@pkgname{pxgentombow} +%% error status +\chardef\pxgtmb@errlevel=\z@ + +%% supported engines +\ifx\pfmtversion\@undefined + \@ifpackageloaded{luatexja}{}{\chardef\pxgtmb@errlevel=\@ne} +\fi +\ifnum\pxgtmb@errlevel>\z@ + \PackageError{\pxgtmb@pkgname}{% + Only pLaTeX, upLaTeX and LuaTeX-ja are supported now}\@ehc + \expandafter\endinput +\fi + %% import from jsclasses \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -13,6 +33,20 @@ % if tombow-related option is not included in class option list, % show info and enable it now \iftombow\else + % if jsclasses is detected, it's too late + % -- When a size option other than `10pt' is specified, + % jsclasses uses \mag and calculates \oddsidemargin and \topmargin + % differently, depending on tombow status. + % In order to force `jsclasses' to calculate correctly, + % `tombow' or `tombo' is required as a class option. + % ... or, you may add `nomag' or `nomag*' instead. + \ifnum\mag=\@m\else \ifx\inv@mag\@undefined\else + \PackageError{\pxgtmb@pkgname}{% + It seems you are using Japanese `jsclasses'\MessageBreak + (jsarticle, jsbook, jsreport, etc.) or some\MessageBreak + derived class. Please add `tombow' or `tombo'\MessageBreak + to the class option list}\@ehc + \fi \fi \PackageInfo\pxgtmb@pkgname{tombow feature enabled by \pxgtmb@pkgname} \fi \tombowtrue %\tombowdatetrue %% enabled by tombowdate option -- cgit v1.2.3