summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/LICENSE2
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdfbin43566 -> 49513 bytes
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/bounddvi-en.tex1
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/bounddvi.pdfbin118273 -> 123721 bytes
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/bounddvi.tex1
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdfbin212291 -> 213739 bytes
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex5
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/gentombow.pdfbin145247 -> 150461 bytes
-rw-r--r--Master/texmf-dist/doc/latex/gentombow/gentombow.tex4
-rw-r--r--Master/texmf-dist/source/latex/gentombow/Makefile36
-rw-r--r--Master/texmf-dist/tex/latex/gentombow/bounddvi.sty37
12 files changed, 43 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/latex/gentombow/LICENSE b/Master/texmf-dist/doc/latex/gentombow/LICENSE
index c463b620a91..9661ce7b8d1 100644
--- a/Master/texmf-dist/doc/latex/gentombow/LICENSE
+++ b/Master/texmf-dist/doc/latex/gentombow/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2019 Hironobu Yamashita
+Copyright (c) 2016-2020 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/latex/gentombow/README.md b/Master/texmf-dist/doc/latex/gentombow/README.md
index 82fc0584d5f..6ea7f2aea55 100644
--- a/Master/texmf-dist/doc/latex/gentombow/README.md
+++ b/Master/texmf-dist/doc/latex/gentombow/README.md
@@ -44,6 +44,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2019-07-21
+2020-09-25
Hironobu Yamashita
diff --git a/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdf b/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdf
index cbbdb00ef2d..fb9647d1eca 100644
--- a/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.tex b/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.tex
index 61e78f985b9..82046f888aa 100644
--- a/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.tex
+++ b/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.tex
@@ -130,6 +130,7 @@ using \textsf{bounddvi} package.
\item 2016/10/25 v7.1 (HY) Support for p\LaTeXe\ tombow option,
compatibility with \textsf{graphics}/\textsf{color} packages
\item 2016/12/28 v7.2 (HY) Documentation for the new \texttt{dvips} behavior
+ \item 2020/09/25 v8.0 (HY) Support for \LaTeXe/p\LaTeXe~2020-10-01
\end{itemize}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/gentombow/bounddvi.pdf b/Master/texmf-dist/doc/latex/gentombow/bounddvi.pdf
index ca36021fc9e..c0a2b20af65 100644
--- a/Master/texmf-dist/doc/latex/gentombow/bounddvi.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/bounddvi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/gentombow/bounddvi.tex b/Master/texmf-dist/doc/latex/gentombow/bounddvi.tex
index b21b9c33a51..198bbb7fb98 100644
--- a/Master/texmf-dist/doc/latex/gentombow/bounddvi.tex
+++ b/Master/texmf-dist/doc/latex/gentombow/bounddvi.tex
@@ -143,6 +143,7 @@ DVIファイルは用紙サイズ情報を含みませんが、PostScriptやPDF
\item 2016/10/25 v7.1 (HY) p\LaTeXe{}のトンボサポート、
2016年の新しい\textsf{graphics}/\textsf{color}に対応
\item 2016/12/28 v7.2 (HY) 新仕様の\texttt{dvips}をドキュメント化
+ \item 2020/09/25 v8.0 (HY) \LaTeXe/p\LaTeXe~2020-10-01(予定)への対応
\end{itemize}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
index 7d26cf32e71..ada6318d413 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
index ce0d6e767e1..763f790020f 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
@@ -393,6 +393,11 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以
\end{verbatim}
\end{dangerous}
+なお、\textsf{geometry}パッケージは用紙サイズ
+(\verb+\paperwidth+, \verb+\paperheight+)を変更する場合もあります。
+こうした場合に備え、\textsf{gentombow}パッケージは
+\textsf{geometry}パッケージよりも後に読み込むようにしてください。
+
\section*{雑記}
発端はこの話です。
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf b/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
index b346075d67b..c47dab8edbc 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow.tex b/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
index 3f6a1ada649..81be1fe6c52 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
@@ -280,6 +280,10 @@ conflict with the feature of \textsf{gentombow} package.
To set page layout correctly, you should adjust \verb+\oddsidemargin+
or \verb+\topmargin+, or leave it to \textsf{geometry} package.
+Note: since the package \textsf{geometry} also has a feature to
+change the paper size (\verb+\paperwidth+, \verb+\paperheight+),
+please load \textsf{gentombow} after \textsf{geometry}.
+
\section*{Change History}
\begin{itemize}
diff --git a/Master/texmf-dist/source/latex/gentombow/Makefile b/Master/texmf-dist/source/latex/gentombow/Makefile
deleted file mode 100644
index f376d1ade0b..00000000000
--- a/Master/texmf-dist/source/latex/gentombow/Makefile
+++ /dev/null
@@ -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
diff --git a/Master/texmf-dist/tex/latex/gentombow/bounddvi.sty b/Master/texmf-dist/tex/latex/gentombow/bounddvi.sty
index 35432df5f05..3e355d63c1d 100644
--- a/Master/texmf-dist/tex/latex/gentombow/bounddvi.sty
+++ b/Master/texmf-dist/tex/latex/gentombow/bounddvi.sty
@@ -1,7 +1,7 @@
%
% bounddvi.sty
-% 2016/12/28 v7.2-v7.0 h.y.acetaminophen@gmail.com
-% 2004/12/15 v6.0-v1.0 inoue@ma.ns.tcu.ac.jp
+% 2020/09/25 v8.0-v7.0 h.y.acetaminophen [at] gmail.com
+% 2004/12/15 v6.0-v1.0 inoue [at] ma.ns.tcu.ac.jp
%
% This package, originally written by Koichi Inoue
% and modified by Hironobu Yamashita, is distributed
@@ -10,7 +10,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bounddvi}[2016/12/28 v7.2 bounddvi]
+\ProvidesPackage{bounddvi}[2020/09/25 v8.0 bounddvi]
% catcode trick to hide \iftombow ... \else ... \fi
% since \iftombow is defined only in pLaTeX.
@@ -50,6 +50,33 @@ Q \fi
% reset catcode trick
\catcode`\Q=11\relax
+%% Since LaTeX2e 2020-10-01, \@begindocumenthook is deprecated
+%% and \UseHook{begindocument} etc. are used.
+%% This code appends papersize special to the _end_ of the hook.
+%% (Note: support for old dvips is removed.)
+\ifx\AddToHook\@undefined\else
+ \AtBeginDocument{\AtBeginDvi{%
+ \begingroup
+ % if \stockwidth/\stockheight are defined & have effective
+ % values, copy them to \paperwidth/\paperheight
+ % for current group
+ \ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@
+ \paperwidth\stockwidth
+ \fi\fi
+ \ifx\stockheight\@undefined\else \ifdim\stockheight>\z@
+ \paperheight\stockheight
+ \fi\fi
+ % adjust for \mag and emit papersize special
+ \divide\paperwidth\@m\multiply\paperwidth\mag
+ \divide\paperheight\@m\multiply\paperheight\mag
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ \endgroup}}
+ \expandafter\endinput
+\fi
+
+%% The rest of this package is meant for
+%% LaTeX2e 2020-02-02 PL5 or older.
+
% following code is almost equivalent to
% \AtBeginDocument{\AtBeginDvi{...}}
% however, we append the specification to the _beginning_ of
@@ -59,16 +86,12 @@ Q \fi
\def\@prependto@begindocumenthook{\global\setbox\@begindvibox
\vbox{\csname yoko\endcsname\unvbox\@begindvibox
\begingroup
- % if \stockwidth/\stockheight are defined & have effective
- % values, copy them to \paperwidth/\paperheight
- % for current group
\ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@
\paperwidth\stockwidth
\fi\fi
\ifx\stockheight\@undefined\else \ifdim\stockheight>\z@
\paperheight\stockheight
\fi\fi
- % adjust for \mag and emit papersize special
\divide\paperwidth\@m\multiply\paperwidth\mag
\divide\paperheight\@m\multiply\paperheight\mag
\special{papersize=\the\paperwidth,\the\paperheight}%