texlive[51697] Master/texmf-dist: gentombow (21jul19)
commits+karl at tug.org
commits+karl at tug.org
Sun Jul 21 22:51:18 CEST 2019
Revision: 51697
http://tug.org/svn/texlive?view=revision&revision=51697
Author: karl
Date: 2019-07-21 22:51:18 +0200 (Sun, 21 Jul 2019)
Log Message:
-----------
gentombow (21jul19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/gentombow/LICENSE
trunk/Master/texmf-dist/doc/latex/gentombow/README.md
trunk/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
trunk/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
trunk/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
trunk/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
trunk/Master/texmf-dist/tex/latex/gentombow/gentombow.sty
Added Paths:
-----------
trunk/Master/texmf-dist/source/latex/gentombow/
trunk/Master/texmf-dist/source/latex/gentombow/Makefile
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/gentombow/Makefile
Modified: trunk/Master/texmf-dist/doc/latex/gentombow/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/latex/gentombow/LICENSE 2019-07-21 20:50:55 UTC (rev 51696)
+++ trunk/Master/texmf-dist/doc/latex/gentombow/LICENSE 2019-07-21 20:51:18 UTC (rev 51697)
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 Hironobu Yamashita
+Copyright (c) 2016-2019 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
Deleted: trunk/Master/texmf-dist/doc/latex/gentombow/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/gentombow/Makefile 2019-07-21 20:50:55 UTC (rev 51696)
+++ trunk/Master/texmf-dist/doc/latex/gentombow/Makefile 2019-07-21 20:51:18 UTC (rev 51697)
@@ -1,36 +0,0 @@
-KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f ptex-ipaex.map
-TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
-
-all: bounddvi.pdf bounddvi-en.pdf \
- gentombow.pdf gentombow-ja.pdf #pxgentombow.pdf
-
-.SUFFIXES: .tex .dvi .pdf
-.tex.dvi:
- platex $(KANJI) $<
- platex $(KANJI) $<
- rm *.aux *.log
-.dvi.pdf:
- dvipdfmx $(FONTMAP) $<
-
-bounddvi-en.dvi: bounddvi-en.tex
- latex $<
- latex $<
- rm *.aux *.log
-gentombow.pdf: gentombow.tex
- pdflatex $<
- pdflatex $<
- rm *.aux *.log
-
-.PHONY: install clean
-install:
- mkdir -p ${TEXMF}/doc/latex/gentombow
- cp ./Makefile ${TEXMF}/doc/latex/gentombow/
- cp ./LICENSE ${TEXMF}/doc/latex/gentombow/
- cp ./README.md ${TEXMF}/doc/latex/gentombow/
- cp ./*.pdf ${TEXMF}/doc/latex/gentombow/
- cp ./*.tex ${TEXMF}/doc/latex/gentombow/
- mkdir -p ${TEXMF}/tex/latex/gentombow
- cp ./*.sty ${TEXMF}/tex/latex/gentombow/
-clean:
- rm -f *.dvi *.pdf
Modified: trunk/Master/texmf-dist/doc/latex/gentombow/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/gentombow/README.md 2019-07-21 20:50:55 UTC (rev 51696)
+++ trunk/Master/texmf-dist/doc/latex/gentombow/README.md 2019-07-21 20:51:18 UTC (rev 51697)
@@ -44,6 +44,6 @@
## Release Date
-2018-08-30
+2019-07-21
Hironobu Yamashita
Modified: trunk/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex 2019-07-21 20:50:55 UTC (rev 51696)
+++ trunk/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex 2019-07-21 20:51:18 UTC (rev 51697)
@@ -291,6 +291,9 @@
\item \verb+/BleedBox+: 裁ち落とし領域を含んだサイズ。
\item \verb+/CropBox+, \verb+/ArtBox+: 明示しない。
\end{itemize}
+注意：\textsf{pdfx}パッケージがPDF/Xモードで読み込まれていれば、
+このオプション機能は自動的に有効化されます。
+また、\verb+/CropBox+も明示します。
\section{その他の注意点}
@@ -444,6 +447,7 @@
\verb+pdfbox+オプションが正常動作するように改良、
\verb+\settombowbleed+が\verb+/TrimBox+に反映されな
かったバグの修正
+ \item 2019/07/21 v0.9k \textsf{pdfx}パッケージとの整合性をとる改良
\end{itemize}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/gentombow/gentombow.tex 2019-07-21 20:50:55 UTC (rev 51696)
+++ trunk/Master/texmf-dist/doc/latex/gentombow/gentombow.tex 2019-07-21 20:51:18 UTC (rev 51697)
@@ -252,6 +252,9 @@
\item \verb+/BleedBox+: paper size plus bleed margin.
\item \verb+/CropBox+ and \verb+/ArtBox+ are not set.
\end{itemize}
+Note: if the package \textsf{pdfx} is loaded with PDF/X mode,
+this optional feature is automatically enabled.
+Also, \verb+/CropBox+ is set explicitly.
\section{Additional Notes}
@@ -293,6 +296,7 @@
also with \verb+pdfbox+ option.
Fix a bug that \verb+\settombowbleed+ is not
considered by \verb+/TrimBox+.
+ \item 2019/07/21 v0.9k Support \textsf{pdfx} package.
\end{itemize}
\end{document}
Added: trunk/Master/texmf-dist/source/latex/gentombow/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/gentombow/Makefile (rev 0)
+++ trunk/Master/texmf-dist/source/latex/gentombow/Makefile 2019-07-21 20:51:18 UTC (rev 51697)
@@ -0,0 +1,36 @@
+KANJI = -kanji=utf8
+FONTMAP = -f ipaex.map -f ptex-ipaex.map
+TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
+
+all: bounddvi.pdf bounddvi-en.pdf \
+ gentombow.pdf gentombow-ja.pdf #pxgentombow.pdf
+
+.SUFFIXES: .tex .dvi .pdf
+.tex.dvi:
+ platex $(KANJI) $<
+ platex $(KANJI) $<
+ rm *.aux *.log
+.dvi.pdf:
+ dvipdfmx $(FONTMAP) $<
+
+bounddvi-en.dvi: bounddvi-en.tex
+ latex $<
+ latex $<
+ rm *.aux *.log
+gentombow.pdf: gentombow.tex
+ pdflatex $<
+ pdflatex $<
+ rm *.aux *.log
+
+.PHONY: install clean
+install:
+ mkdir -p ${TEXMF}/doc/latex/gentombow
+ cp ./Makefile ${TEXMF}/doc/latex/gentombow/
+ cp ./LICENSE ${TEXMF}/doc/latex/gentombow/
+ cp ./README.md ${TEXMF}/doc/latex/gentombow/
+ cp ./*.pdf ${TEXMF}/doc/latex/gentombow/
+ cp ./*.tex ${TEXMF}/doc/latex/gentombow/
+ mkdir -p ${TEXMF}/tex/latex/gentombow
+ cp ./*.sty ${TEXMF}/tex/latex/gentombow/
+clean:
+ rm -f *.dvi *.pdf
Property changes on: trunk/Master/texmf-dist/source/latex/gentombow/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/gentombow/gentombow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/gentombow/gentombow.sty 2019-07-21 20:50:55 UTC (rev 51696)
+++ trunk/Master/texmf-dist/tex/latex/gentombow/gentombow.sty 2019-07-21 20:51:18 UTC (rev 51697)
@@ -8,7 +8,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gentombow}
- [2018/08/30 v0.9j Generate crop mark 'tombow']
+ [2019/07/21 v0.9k Generate crop mark 'tombow']
\def\pxgtmb at pkgname{gentombow}
\@namedef{ver at pxgentombow.sty}{}% fake
@@ -290,6 +290,7 @@
%% prepare flag
\newif\ifpxgtmb at switch \pxgtmb at switchfalse
\newif\ifpxgtmb at landscape \pxgtmb at landscapefalse
+\newif\ifpxgtmb at pdfx@x \pxgtmb at pdfx@xfalse
%% passed from class options
%% should be declared first inside this package (least priority)
@@ -507,7 +508,7 @@
%% pdf "digital tombo" (driver-dependent)
% the box size calculation is delayed until \AtBeginDocument
% to allow users to change \@tombowbleed in the preamble
-\if 1\pxgtmb at pdfbox@status
+
% convert pt -> bp
\def\pxgtmb at PDF@setbp#1#2{%
\@tempdima=.996264#2\relax % 0.996264 = 72/72.27 (cf. 1in = 72.27pt = 72bp)
@@ -521,8 +522,8 @@
\def\pxgtmb at magscale{1}%
\fi
% set pdf boxes in bp unit
- %\pxgtmb at PDF@setbp\pxgtmb at PDF@crop at ur@x\stockwidth
- %\pxgtmb at PDF@setbp\pxgtmb at PDF@crop at ur@y\stockheight
+ \pxgtmb at PDF@setbp\pxgtmb at PDF@crop at ur@x\stockwidth
+ \pxgtmb at PDF@setbp\pxgtmb at PDF@crop at ur@y\stockheight
\pxgtmb at PDF@setbp\pxgtmb at PDF@trim at ll@x{\dimexpr(\stockwidth-\paperwidth)/2}%
\pxgtmb at PDF@setbp\pxgtmb at PDF@trim at ll@y{\dimexpr(\stockheight-\paperheight)/2}%
\pxgtmb at PDF@setbp\pxgtmb at PDF@trim at ur@x{\dimexpr(\stockwidth+\paperwidth)/2}%
@@ -532,8 +533,14 @@
\pxgtmb at PDF@setbp\pxgtmb at PDF@bleed at ur@x{\dimexpr(\stockwidth+\paperwidth)/2+\@tombowbleed}%
\pxgtmb at PDF@setbp\pxgtmb at PDF@bleed at ur@y{\dimexpr(\stockheight+\paperheight)/2+\@tombowbleed}%
\xdef\pxgtmb at PDF@CTM{%
- %% CropBox: implicit (same as MediaBox, large paper size)
- %/CropBox [0 0 \pxgtmb at PDF@crop at ur@x\space \pxgtmb at PDF@crop at ur@y]
+ %% CropBox: normally implicit (same as MediaBox, large paper size)
+ %% however, pdfx.sty in PDF/X mode sets /CropBox explicitly, so I need to override it!
+ \ifpxgtmb at pdfx@x
+ \noexpand\pxgtmb at PDF@begin
+ /CropBox [0 0
+ \pxgtmb at PDF@crop at ur@x\space
+ \pxgtmb at PDF@crop at ur@y] \noexpand\pxgtmb at PDF@end
+ \fi
%% BleedBox: explicit (final paper size + surrounding \@tombowbleed)
\noexpand\pxgtmb at PDF@begin
/BleedBox [\pxgtmb at PDF@bleed at ll@x\space
@@ -547,9 +554,20 @@
\pxgtmb at PDF@trim at ur@x\space
\pxgtmb at PDF@trim at ur@y] \noexpand\pxgtmb at PDF@end
%% ArtBox: implicit
+ %% [Note] PDF/X requires /TrimBox or /ArtBox but not both!
}%
\endgroup
}
+
+% do it
+\AtBeginDocument{\pxgtmb at PDF@emit}
+\def\pxgtmb at PDF@emit{%
+ % handle compatibility with pdfx.sty here;
+ % if pdfx.sty with PDF/X mode detected, force [pdfbox] option!
+ \pxgtmb at handle@pdfx
+ \ifpxgtmb at pdfx@x\def\pxgtmb at pdfbox@status{1}\fi
+ % start actual procedure for [pdfbox] option
+ \if 1\pxgtmb at pdfbox@status
%% supported drivers: dvips, dvipdfmx, XeTeX, pdfTeX, LuaTeX
\ifnum0\ifx\pdfvariable\@undefined\else\the\outputmode\fi=0\relax
\ifnum0\ifx\pdfpageattr\@undefined\else\the\pdfoutput\fi=0\relax
@@ -666,8 +684,7 @@
\def\pxgtmb at PDF@begin{}\def\pxgtmb at PDF@end{}%
\edef\pxgtmb at PDF@CTM{{\pxgtmb at PDF@CTM}}%
\expandafter\pdfpageattr\pxgtmb at PDF@CTM}
-\fi
-\else
+\fi\else
%% for LuaTeX
\def\pxgtmb at driver{l}
% force paper size
@@ -679,7 +696,8 @@
\edef\pxgtmb at PDF@CTM{pageattr{\pxgtmb at PDF@CTM}}%
\expandafter\pdfvariable\pxgtmb at PDF@CTM}
\fi
-\fi
+ \fi
+}
%% make visible tombow box according to the current status of
%% \@bannerfont, \@bannertoken, \@tombowwidth & \@tombowbleed
@@ -713,7 +731,7 @@
% because pdf boxes are calculated only inside \AtBeginDocument
\@onlypreamble\settombowbleed
-%% patch internal for pdfpages to work with tombow
+%% patch internal of pdfpages.sty to work with tombow
%% (tested on pdfpages 2017/10/31 v0.5l)
%% Note the code is the same as that of pxpdfpages.sty,
%% but reserved here since gentombow.sty can be used on
@@ -744,4 +762,8 @@
%% do it
\AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxgtmb at patch@pdfpages}{}}
+%% patch pdfx.sty
+%% (tested on pdfx 2019/02/27 v1.6.3)
+\def\pxgtmb at handle@pdfx{\@ifpackageloaded{pdfx}{\let\ifpxgtmb at pdfx@x\ifpdfx at x}{}}
+
\endinput
More information about the tex-live-commits
mailing list