ptex-base (27aug17)

git-svn-id: svn://tug.org/texlive/trunk@45140 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 16 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/ptex/ptex-base/Makefile b/Master/texmf-dist/doc/ptex/ptex-base/Makefile
index e54c586f0b4..d7602e87bdd 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/Makefile
+++ b/Master/texmf-dist/doc/ptex/ptex-base/Makefile
@@ -11,13 +11,14 @@ eptexdoc.pdf: eptexdoc.tex
 	platex $(KANJI) eptexdoc.tex
 	platex $(KANJI) eptexdoc.tex
 	dvipdfmx $(FONTMAP) eptexdoc.dvi
-	rm *.aux *.log *.toc *.idx *.ind *.ilg *.out eptexdoc.dvi
+	rm -f *.aux *.log *.toc *.idx *.ind *.ilg *.out eptexdoc.dvi
 
 .SUFFIXES: .tex .dvi .pdf
 .tex.dvi:
 	platex $(KANJI) $<
 	platex $(KANJI) $<
-	rm *.aux *.log
+	platex $(KANJI) $<
+	rm -f *.aux *.log *.toc
 .dvi.pdf:
 	dvipdfmx $(FONTMAP) $<
 
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/README.md b/Master/texmf-dist/doc/ptex/ptex-base/README.md
index f3db0b707fb..2c26e358c12 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/README.md
+++ b/Master/texmf-dist/doc/ptex/ptex-base/README.md
@@ -4,9 +4,9 @@ The bundle contains plain TeX format and documents for pTeX and e-pTeX.
 
 ## Character encoding
 
-All the text files containing Japanese characters in ptex-texmf are
-encoded in ISO-2022-JP. This is because ISO-2022-JP encoded texts
-are most suitable for the traditional pTeX engine.
+All the text files containing Japanese characters in this repository
+are encoded in ISO-2022-JP. This is because ISO-2022-JP encoded
+texts are most suitable for the traditional pTeX engine.
 
 ## Repository
 
@@ -22,6 +22,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2017-04-17
+2017-08-27
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jfm.pdf b/Master/texmf-dist/doc/ptex/ptex-base/jfm.pdf
index 9ebb05c2411..5a559476e81 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jfm.pdf
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jfm.pdf
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jfm.tex b/Master/texmf-dist/doc/ptex/ptex-base/jfm.tex
index 426b2c6509a..f46e63a3331 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jfm.tex
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jfm.tex
@@ -56,8 +56,8 @@ $char\_type = 0$$B$H$7$F07$&!#(B
 \item{tag(2bits)}
 	\begin{description}
 	\item{tag=0} {\it remainder}$B$N9`$OL58z$G$"$j;HMQ$7$J$$$3$H$r<($9!#(B
-	\item{tag=1} {\it glue\_kern}$B%W%m%0%i%`$,(B{\it glue\_kern[remender]}
-		$B$+$i$K<}$a$l$l$F$$$k$3$H$r<($9!#(B
+	\item{tag=1} {\it glue\_kern}$B%W%m%0%i%`$,(B{\it glue\_kern[remainder]}
+		$B$+$i$K<}$a$i$l$F$$$k$3$H$r<($9!#(B
 	\item{tag=2$B!"(B3} $B;HMQ$7$J$$!#(B
 	\end{description}
 \item{remainder(8bits)}
@@ -140,7 +140,7 @@ $ng$ & $np$ \\ \hline
 \multicolumn{2}{|c|}{glue} \\
 \multicolumn{2}{|c|}{}\\ \hline
 \multicolumn{2}{|c|}{}\\
-\multicolumn{2}{|c|}{patam} \\
+\multicolumn{2}{|c|}{param} \\
 \multicolumn{2}{|c|}{}\\ \hline
 \end{tabular}
 \end{minipage}
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jtex.pdf b/Master/texmf-dist/doc/ptex/ptex-base/jtex.pdf
index 9a2ad83cf38..f4672369842 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jtex.pdf
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jtex.pdf
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jtex.tex b/Master/texmf-dist/doc/ptex/ptex-base/jtex.tex
index dc9bd30cd98..4cce31c37d1 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jtex.tex
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jtex.tex
@@ -165,7 +165,7 @@ Table~\ref{tb:prim}$B$K<($9%W%j%_%F%#%V$,DI2C$5$l$F$$$k!#(B
 $B%V%l!<%/%]%$%s%H$NBP>]$H$9$k$+$NLdBj$G$"$k!#(B
 \begin{itemize}
 \item $B2$J8Cf$G$N%i%$%s%V%l!<%/$O!"%O%$%U%M!<%7%g%s=hM}Ey$NFCJL$J>l9g$r=|$$$F!"(B
-$BC18lCf$D$^$jO"B3$9$kJ8;zNsCf$O!"%V%l!<%-%s%0%]%$%s%H$7$FA*Br$5$l$J$$!#(B
+$BC18lCf$D$^$jO"B3$9$kJ8;zNsCf$O!"%V%l!<%-%s%0%]%$%s%H$H$7$FA*Br$5$l$J$$!#(B
 \item $BOBJ8Cf$G$O6XB'$NNc30$r=|$$$F!"(B
 $BA4$F$NJ8;z4V$,%V%l!<%/%]%$%s%H$NBP>]$K$J$jF@$k!#(B
 \end{itemize}
diff --git a/Master/texmf-dist/tex/ptex/ptex-base/kinsoku.tex b/Master/texmf-dist/tex/ptex/ptex-base/kinsoku.tex
index ed294a8d4f0..959395006b6 100644
--- a/Master/texmf-dist/tex/ptex/ptex-base/kinsoku.tex
+++ b/Master/texmf-dist/tex/ptex/ptex-base/kinsoku.tex
@@ -1,13 +1,13 @@
 %
-% $B9TF,!"9TKv6XB'%Q%i%a!<%?(B (Last update: 2016/06/10 texjporg)
+% $B9TF,!"9TKv6XB'%Q%i%a!<%?(B (Last update: 2017/08/05 texjporg)
 %
 % 1byte characters
 \prebreakpenalty`!=10000
 \prebreakpenalty`"=10000
 \postbreakpenalty`\#=500
 \postbreakpenalty`\$=500
-\postbreakpenalty`\%=500
-\postbreakpenalty`\&=500
+\prebreakpenalty`\%=500
+\prebreakpenalty`\&=500
 \postbreakpenalty`\`=10000
 \prebreakpenalty`'=10000
 \prebreakpenalty`)=10000
@@ -70,8 +70,8 @@
 \prebreakpenalty`$B!a(B=200
 \postbreakpenalty`$B!t(B=200
 \postbreakpenalty`$B!p(B=200
-\postbreakpenalty`$B!s(B=200
-\postbreakpenalty`$B!u(B=200
+\prebreakpenalty`$B!s(B=200
+\prebreakpenalty`$B!u(B=200
 \prebreakpenalty`$B$!(B=150
 \prebreakpenalty`$B$#(B=150
 \prebreakpenalty`$B$%(B=150