ptex-base (18aug18)

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

19 files changed, 396 insertions, 121 deletions

diff --git a/Master/texmf-dist/doc/ptex/ptex-base/LICENSE b/Master/texmf-dist/doc/ptex/ptex-base/LICENSE
index cadee562cf4..14b562dcc89 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/LICENSE
+++ b/Master/texmf-dist/doc/ptex/ptex-base/LICENSE
@@ -1,26 +1,28 @@
 Copyright (C) 2010 ASCII MEDIA WORKS.
-Copyright (C) 2016-2017 Japanese TeX Development Community
+Copyright (C) 2016-2018 Japanese TeX Development Community
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of the author may be used to endorse or promote products
-   derived from this software without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/Makefile b/Master/texmf-dist/doc/ptex/ptex-base/Makefile
index d7602e87bdd..5dd25d6f87b 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/Makefile
+++ b/Master/texmf-dist/doc/ptex/ptex-base/Makefile
@@ -1,13 +1,22 @@
+DOCTARGET = jfm eptexdoc
+# following documents are not maintained anymore;
+# even some descriptions might be different from
+# current status of pTeX
+#   jtex_asciimw jtexdoc_asciimw
+#   ptexdoc_asciimw ptexskip_asciimw
+#   eptex_resume
+PDFTARGET = $(addsuffix .pdf,$(DOCTARGET))
+DVITARGET = $(addsuffix .dvi,$(DOCTARGET))
 KANJI = -kanji=jis
 FONTMAP = -f ipaex.map -f ptex-ipaex.map
+TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
 
-all: jfm.pdf jtex.pdf jtexdoc.pdf ptexdoc.pdf ptexskip.pdf \
-	eptexdoc.pdf #eptex_resume.pdf
+all: $(PDFTARGET)
 
-eptexdoc.pdf: eptexdoc.tex
+eptexdoc.pdf: eptexdoc.tex fam256p.tex fam256d.tex
 	platex $(KANJI) eptexdoc.tex
 	platex $(KANJI) eptexdoc.tex
-	mendex -J eptexdoc.idx
+	mendex -J -s gind.ist eptexdoc.idx
 	platex $(KANJI) eptexdoc.tex
 	platex $(KANJI) eptexdoc.tex
 	dvipdfmx $(FONTMAP) eptexdoc.dvi
@@ -22,6 +31,23 @@ eptexdoc.pdf: eptexdoc.tex
 .dvi.pdf:
 	dvipdfmx $(FONTMAP) $<
 
-.PHONY: clean
+.PHONY: install clean
+install:
+	mkdir -p ${TEXMF}/doc/ptex/ptex-base
+	cp ./LICENSE ${TEXMF}/doc/ptex/ptex-base/
+	cp ./README* ${TEXMF}/doc/ptex/ptex-base/
+	cp ./Makefile ${TEXMF}/doc/ptex/ptex-base/
+	cp ./*.pdf ${TEXMF}/doc/ptex/ptex-base/
+	ls ./*.tex | \
+	grep -v ptex.tex | grep -v ascii-jplain.tex | grep -v kinsoku.tex | \
+	xargs -I % cp % ${TEXMF}/doc/ptex/ptex-base/
+	cp ./Change* ${TEXMF}/doc/ptex/ptex-base/
+	mkdir -p ${TEXMF}/tex/ptex/ptex-base
+	cp ./ptex.tex ${TEXMF}/tex/ptex/ptex-base/
+	cp ./ascii-jplain.tex ${TEXMF}/tex/ptex/ptex-base/
+	cp ./kinsoku.tex ${TEXMF}/tex/ptex/ptex-base/
+	cp ./*.ini ${TEXMF}/tex/ptex/ptex-base/
+	cp ./eptex.src ${TEXMF}/tex/ptex/ptex-base/
+	cp ./eptexdefs.lib  ${TEXMF}/tex/ptex/ptex-base/
 clean:
-	rm -f *.dvi *.pdf
+	rm -f $(DVITARGET) $(PDFTARGET)
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/README.md b/Master/texmf-dist/doc/ptex/ptex-base/README.md
index 2c26e358c12..23e865fb9c0 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/README.md
+++ b/Master/texmf-dist/doc/ptex/ptex-base/README.md
@@ -22,6 +22,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2017-08-27
+2018-08-18
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/eptex_resume.pdf b/Master/texmf-dist/doc/ptex/ptex-base/eptex_resume.pdf
index 5eed1b3f9b4..7a91fe6e152 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/eptex_resume.pdf
+++ b/Master/texmf-dist/doc/ptex/ptex-base/eptex_resume.pdf
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/eptexdoc.pdf b/Master/texmf-dist/doc/ptex/ptex-base/eptexdoc.pdf
index c766e874c3b..6d36050dafb 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/eptexdoc.pdf
+++ b/Master/texmf-dist/doc/ptex/ptex-base/eptexdoc.pdf
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/eptexdoc.tex b/Master/texmf-dist/doc/ptex/ptex-base/eptexdoc.tex
index 4e699364b8b..407e7b22a64 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/eptexdoc.tex
+++ b/Master/texmf-dist/doc/ptex/ptex-base/eptexdoc.tex
@@ -7,7 +7,7 @@
 \usepackage[T1]{fontenc}
 \usepackage{booktabs,enumitem}
 \usepackage{lmodern}
-\usepackage[dvipdfmx]{hyperref}
+\usepackage[dvipdfmx,hyperfootnotes=false]{hyperref}
 \usepackage{pxjahyper}
 \usepackage[bold,deluxe]{otf}
 \usepackage{hologo}
@@ -49,8 +49,7 @@
 \AtBeginDvi{\special{pdf:mapfile otf-ipaex.map}}
 \def\delbit#1#2{\underbracket[0.4pt]{#1}_{\text{#2}}}
 
-\def\TeXXeT{\TeX-\reflectbox{\TeX-}}
-\def\TeXXeTbf{\TeX-\reflectbox{\bfseries \TeX-}}
+\def\TeXXeT{\TeX-\reflectbox{\bfseries\TeX-}}
 
 \newenvironment{multilist}[2]%
  {$$\setbox\z@=\hbox\bgroup  % catch some funny things -> \mathord
@@ -107,13 +106,15 @@
 \smallskipamount=.25\baselineskip
 
 \usepackage{etoolbox}
-\patchcmd\@verbatim\@totalleftmargin{\dimexpr\@totalleftmargin+3zw\relax}{}{}
-
 \newenvironment{curve}{%
-  \par\small\leftskip=\dimexpr\textwidth-44zw\relax\@totalleftmargin=\leftskip
+  \par\medskip
+  \bgroup\small\leftskip=\dimexpr\textwidth-44zw\relax\@totalleftmargin=\leftskip
   \parindent1zw\noindent\kern-\leftskip\hbox to\leftskip{\dbend\hss}%
+  \bigskipamount=\baselineskip
+  \medskipamount=.5\baselineskip
+  \smallskipamount=.25\baselineskip
   \everypar{\everypar{}}\ignorespaces
-}{\par\medskip}
+}{\par\egroup\medskip}
 
 \renewenvironment{theindex}{%
     \def\presectionname{}\def\postsectionname{}%
@@ -129,17 +130,63 @@
     \end{multicols}
     \clearpage
   }
+
+\patchcmd\@verbatim\@totalleftmargin{\dimexpr\@totalleftmargin+2zw\relax}{}{}
+\patchcmd\quote{\list{}}{\par\list{\topsep\medskipamount}}{}{}
+\patchcmd\@verbatim{\trivlist}{\trivlist\addvspace\medskipamount\noautoxspacing}{}{}
+\patchcmd\endverbatim{\endtrivlist}{\endtrivlist\addvspace\medskipamount}{}{}
+\expandafter\let\csname endverbatim*\endcsname =\endverbatim
+\patchcmd\verb{\ifmmode\hbox\else\leavevmode\vadjust{}\fi\bgroup}
+  {\ifmmode\else\leavevmode\vadjust{}\fi\hbox
+  \bgroup\textcompwordmark\noautoxspacing\noautospacing}{}{}
+\patchcmd\verb@egroup{\egroup}{\egroup\textcompwordmark}{}{}
+
+\usepackage{shortvrb}
+\MakeShortVerb*{|}
+%%%%%%%% macros for index (simplified from doc.sty)
+\newif\ifscan@allowed
+\def\dotfill{\leaders\hbox to.6em{\hss .\hss}\hskip\z@ plus1fill}%
+\def\pfill{\unskip~\dotfill\nobreak}
+
+\long\def\@footnotetext{%
+  \insert\footins\bgroup
+    \normalfont\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+       \csname p@footnote\endcsname\@thefnmark
+    }%
+    \color@begingroup
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces}%
+      \futurelet\next\fo@t}
+\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
+                                \else \let\next\f@t\fi \next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+\def\f@t#1{#1\@foot}
+\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
+  \ifx\pltx@foot@penalty\@undefined\else
+    \ifhmode\null\fi
+    \ifnum\pltx@foot@penalty=\z@\else
+      \penalty\pltx@foot@penalty
+      \pltx@foot@penalty\z@
+    \fi
+  \fi}
+
 \makeatother
 %%%%%%%%%%%%%%%%
 
 \def\_{\leavevmode\vrule width .45em height -.2ex depth .3ex\relax}
+
 \frenchspacing
 \begin{document}
 \title{\emph{\epTeX $B$K$D$$$F(B}}
 \author{$BKL@n(B $B90E5(B\null
 \thanks{\url{http://osdn.jp/projects/eptex/wiki/},\ 
 e-mail: \texttt{h\_kitagawa2001(at)yahoo.co.jp}}}
-\date{version 161114$B!$(B\today}
+\date{version 180226$B!$(B\today}
 \maketitle
 
 \tableofcontents
@@ -154,7 +201,7 @@ e-mail: \texttt{h\_kitagawa2001(at)yahoo.co.jp}}}
   \item \TeX~Live~2011$B$K<h$j9~$^$l$k$K$"$?$j!$(B
   \eTeX $B$r%Y!<%9$K$7$F!$$=$N>e$K(B\pTeX $B3HD%$d$=$NB>DI2C5!G=$r:\$;$kJ}?K$X$H(B
   $BJQ99$5$l$?!%(B
-  \item $BIbF0>.?tE@1i;;$N5!G=$O(B090927$BHG(B(2009/9)$B$+$i:o=|$5$l$F$$$k(B
+  \item $BIbF0>.?tE@1i;;$N5!G=$O(B\epTeX~090927$B$+$i:o=|$5$l$F$$$k(B
   \footnote{%
   \TeX $B%=!<%9Cf$GIbF0>.?tE@1i;;$r9T$&<jCJ$H$7$F$O!$Nc$($P(B\LaTeX3$B$N(B
   $B5!G=(B(\Pkg{l3fp})$B$d!$(B\Pkg{xint}$B%Q%C%1!<%8%P%s%I%k$,$"$k$N$G!$(B
@@ -174,7 +221,6 @@ e-mail: \texttt{h\_kitagawa2001(at)yahoo.co.jp}}}
 \item $B$=$&$9$k$H!$(B\pTeX $B$@$1$,@)8B$r%l%8%9%?@)8B$r0z$-$:$C$F$$$k$N$O@$3&(B
       $B$+$i<h$j;D$5$l$k$3$H$K$J$k$N$G$O$J$$$+!%(B
 \end{itemize}
-\indent
 
 \section{\eTeX $B3HD%$K$D$$$F(B}
 $BA0$K=R$Y$?$h$&$K!$(B\eTeX $B$O(B\TeX $B$N3HD%$N0l$D$G$"$k!%(B\eTeX $B$N%^%K%e%"%k(B
@@ -195,8 +241,9 @@ Meanwhile \eTeX\ intends to fill the gap between \TeX3 and the future
 
 \NTS $B$,$I$&$J$C$?$N$+KM$OCN$i$J$$!%$7$+$7!$>/$J$/$H$b(B\eTeX $B3HD%<+BN$O<BMQ(B
 $BE*$JJ*$G$"$j!$$=$N$;$$$+(B$\aleph$~(Aleph), \hologo{pdfTeX}, \hologo{XeTeX}$B$J$I$NB>$N3HD%(B
-$B$K$b%^!<%8$5$l$F$*$j!$$+$J$j$N?M$,(B\eTeX $B3HD%$r;H$&$3$H$,$G$-$k$h$&$K$J$C(B
-$B$F$$$k!%(B
+$B$K$b%^!<%8$5$l$F$*$j!$$[$H$s$I$N?M$,(B\eTeX $B3HD%$r;H$&$3$H$,$G$-$k$h$&$K$J$C(B
+$B$F$$$k(B\footnote{\LaTeXe~2017-01-01$B$+$i$O!$(B\LaTeXe $B$N%U%)!<%^%C%H:n@.CJ3,$+$i(B
+\eTeX $B3HD%$,I,?\$H$J$C$?(B(\cite{l2e26})$B!%(B}$B!%(B
 
 \eTeX $B3HD%$GDI2C$5$l$k5!G=$K$D$$$F!$>\$7$/$O(B\cite{etexman}$B$r;2>H$7$FM_$7(B
 $B$$$,!$(B\cite{h7k}$BCf$N(B4.2$B@a!V(B\eTeX $B$N5!G=!W$+$i0lIt2~JQ$7$F0zMQ$9$k!%(B
@@ -214,24 +261,23 @@ Meanwhile \eTeX\ intends to fill the gap between \TeX3 and the future
 
 \paragraph{$B%l%8%9%?$NA}2C(B}
 $B:G=i$K=R$Y$?$h$&$K!$(B\TeX $B$G$O(B6$B<oN`$N%l%8%9%?$,3F(B256$B8D$:$DMxMQ$G$-$k!%$=$l(B
-$B$>$l$N%l%8%9%?$K$O(B\.{dimen75}$B$J$I$N$h$&$K(B0\,$B!A(B\,255$B$NHV9f$G;XDj$G$-$k(B
+$B$>$l$N%l%8%9%?$K$O(B\.{dimen75}$B$J$I$N$h$&$K(B0--255$B$NHV9f$G;XDj$G$-$k(B
 $BB>!$M=$aJLL>$NDj5A$r$7$F$*$1$P$=$l$K$h$C$F;XDj$9$k$3$H$b$G$-$k!%$3$l$i$N(B
 $B$$$/$D$+$OFC<l$JMQES$KMQ$$$i$l$k!JNc$($P(B\.{count0}$B$O%Z!<%8HV9f$J$I$N(B
 $B$h$&$K!K$3$H$K$J$C$F$$$k$N$G!$$5$i$K(Buser $B$,;H$($k%l%8%9%?$O8:>/$9$k!%(B
 
-\eTeX $B$G$O!$DI2C$N%l%8%9%?$H$7$FHV9f$G8@$&$H(B256\,$B!A(B\,32767$B$,;HMQ$G$-$k$h(B
-$B$&$K$J$C$?!%>e$N(Bpdf$B$K$h$k$H:G=i$N(B0\,$B!A(B\,255$B$H0c$C$F<c43$N@)8B$O$"$k$h$&$@(B
+\eTeX $B$G$O!$DI2C$N%l%8%9%?$H$7$FHV9f$G8@$&$H(B256--32767$B$,;HMQ$G$-$k$h(B
+$B$&$K$J$C$?!%>e$N(Bpdf$B$K$h$k$H:G=i$N(B0--255$B$H0c$C$F<c43$N@)8B$O$"$k$h$&$@(B
 $B$,!$$=$l$O:3:Y$JOC$G$"$k!%DI2C$5$l$?!J3F<oN`$"$?$j!K(B$32768-256=32512$$B8D$N(B
 $B%l%8%9%?$O!$%a%b%j$N8zN($r=E;k$9$k$?$a(Bsparse register$B$H$7$F!$$D$^$j!$I,MW(B
 $B$J;~$K;O$a$F%D%j!<9=B$$NCf$G3NJ]$5$l$k$h$&$K$J$C$F$$$k!%(B
 
 \paragraph{$B<0$,;HMQ2DG=$K(B}
 \TeX $B$K$*$1$k?tNL$N7W;;$O=<<B$7$F$$$k$H$O8@$$Fq$$!%Nc$($P!$(B
-
-\noindent\null\hfill\verb+\dimen123+${}\leftarrow($\verb+\dimen42+
-${}+{}$\verb+\@tempdima+$)/2$\hfill\null
-
-\noindent $B$H$$$&7W;;$r85!9$N(B\TeX $B$G=q$3$&$H$9$k$H!$(B
+\[
+\hbox{|\dimen123|}\leftarrow\frac12(\hbox{|\dimen42|}+\hbox{|\@tempdima|})
+\]
+$B$H$$$&7W;;$r85!9$N(B\TeX $B$G=q$3$&$H$9$k$H!$(B
 \begin{verbatim}
 \dimen123=\dimen42
 \advance\dimen123by\@tempdima
@@ -259,10 +305,11 @@ ${}+{}$\verb+\@tempdima+$)/2$\hfill\null
 $B$5$i$K(B\.{middle}\indcs{middle}\ primitive$B$,DI2C$5$l$?!%(B
 
 $B6qBNNc$r=R$Y$k!%(B
+{\catcode`\|12
 \def\set#1#2{\setbox0=\hbox{$\displaystyle #1,#2$}%
 \left\{\, \vphantom{\copy0}#1 \,\right|\!\left.\, \vphantom{\copy0}#2 \,\right\}}
 \def\eset#1#2{\left\{\, #1 \,\middle|\, #2 \,\right\}}
-\[ \set{n+\frac12}{n\in \omega} \eset{n+\frac12}{n\in \omega} \]
+\[ \set{n+\frac12}{n\in \omega} \eset{n+\frac12}{n\in \omega} \]}
 $B$3$l$O0J2<$N(Bsource$B$G=PNO$7$?$b$N$G$"$k!'(B
 
 {\narrowbaselines
@@ -274,14 +321,14 @@ ${}+{}$\verb+\@tempdima+$)/2$\hfill\null
 \[ \set{n+\frac12}{n\in \omega} \eset{n+\frac12}{n\in \omega} \]
 \end{verbatim}}
 $BN>J}$H$b=89g$NI=5-$r9T$&%3%^%s%I$G$"$k!%(B\TeX $BN.$N(B\.{set}$B$G$O(B2$B$D$N(B
-\.{left}, \.{right}$B$NAH$G<B8=$5$;$J$1$l$P$J$i$:!$$=$N$?$a$K(B$|$$B$N(B
+\.{left}, \.{right}$B$NAH$G<B8=$5$;$J$1$l$P$J$i$:!$$=$N$?$a$K(B{\catcode`\|=12$|$}$B$N(B
 $B:8B&$H1&B&$KF~$k<0$N:GBg@#K!$rB,Dj$9$k$H$$$&LLE]$JJ}K!$r;H$C$F$$$k!%$=$N(B
 $B>e!$$3$NDj5A$G$O(B\.{textstyle}$B0J2<$N?t<0!JJ8Cf?t<0$H$+!K$G$O$=$N$^(B
 $B$^;H$($:!$$=$l$K$bBP1~$5$;$h$&$H$9$k$HLLE]$K$J$k!%0lJ}!$(B\eTeX $BN.$N(B
 \.{eset}$B$G$O!$2?$b9M$($:$K(B
 \.{left}, \.{middle}, \.{right}$B$@$1$G<B8=$G$-$k!%(B
 
-\paragraph{\TeXXeTbf\ \textmd{(\texttt{TeX-{}-XeT})}}
+\paragraph{\TeXXeT\ \textmd{(\texttt{TeX-{}-XeT})}}
 left-to-right$B$H(Bright-to-left$B$r:.?"$G$-$k$H$$$&5!G=$G$"$k$i$7$$!%(B
 $B%X%V%i%$8l$"$?$j$NAHHG$K;H$($k$i$7$$$,!$$h$/CN$i$J$$!%(B
 $B$3$3$G$N(BRtoL$B$O(BLtoR$B$KAH$s$@$b$N$r5U=g$K$7$F$$$k$@$1$N$h$&$J(B
@@ -344,7 +391,6 @@ tracing$B5!G=$d>r7oH=CGJ8$N6/2=$J$I$"$k$,!$$=$3$iJU$O%Q%C$H$7$J$$$N$G$3$3(B
 \item \bf 29&\.{ifpdfprimtive}\cr
 \end{multilist}
 
-
 \section{\OMEGA $BM3Mh$N5!G=!J5lL>>N!'(B\texttt{FAM256}$B%Q%C%A!K(B}
 \epTeX $B$K$O!$7G<(HD(B\TeX\ Q\ \&\ A$B$N;3K\;a$N=q$-9~$_(B
 \cite{yamamoto}$B$K;I7c$5$l$F:n$C$?!$K\@a$G$K@bL@$9$k(B\OMEGA $B$N0lIt(B
@@ -412,15 +458,15 @@ extended mode$B$N;~$K8B$jM-8z$K$J$k!%(B
 \OMEGA $B$N9T$r;2>H$7$FM_$7$$!%>e$K=q$$$?FbIt$N%G!<%?9=B$$+$i?dB,$G$-$kDL$j!$(B
 \.{omathchar}$BEy$N(Bcharacter code$B$N;XDj$K;H$o$l$k(B16\,bit$B$N?tCM$N$&$A<B:]$K;H$o$l$k$N$O2<0L(B
 8\,bit$B$G$"$j!$>e0L(B8\,bit$B$OL5;k$5$l$k!%(B
-$BNc$($P!$(B\.{omathchar"4012345}$B$H(B\.{omathchar"4010045}$B$OFbItI=8=$H$7$F$OA4$/F1$8$G$"$k!%(B
+$BNc$($P!$(B|\omathchar"4012345|$B$H(B|\omathchar"4010045|$B$OFbItI=8=$H$7$F$OA4$/F1$8$G$"$k!%(B
 
-$B$J$*!$(B\.{odelcode}\ \bits 8$B$H$7$F(B
+$B$J$*!$(B|\odelcode|~\bits 8$B$H$7$F(B
 delimiter code$B$r<hF@$7$h$&$H$7$F$b!$8=;~E@$N%Q%C%A$G$O!$$&$^$/F0:n$7$J$$(B
 \footnote{51\,bit$B<+A3?t$rJV$5$J$$$H$$$1$J$$$G$9$+$i$M$(!%$d$k5$$,$"$l$P(B
 $B8!F$$7$F$_$^$9!%(B}$B!%(B
 
 \medskip
-\LaTeX $B$K$*$$$F?t<0%U%)%s%H$rF1;~$K(B16$B8D0J>e;H$&$K$O!$(B\.{omathchar}%
+\LaTeX $B$K$*$$$F?t<0%U%)%s%H$rF1;~$K(B16$B8D0J>e;H$&$K$O!$(B|\omathchar|%
 $B$J$I$N%W%j%_%F%#%V$KBP1~$7$?%^%/%m$r;H$&I,MW$,$"$k!%(B
 $B:G6a$N(B\pLaTeX$B!J(B2016/11/29$B0J9_!K$O$3$l$rItJ,E*$K%5%]!<%H$7$F$$$F!$(B
 \emph{\.{DeclareMathAlphabet}$B$G;H$&$3$H$N$G$-$k?t<0MQ%"%k%U%!%Y%C%H$N(B
@@ -434,18 +480,19 @@ delimiter code$B$r<hF@$7$h$&$H$7$F$b!$8=;~E@$N%Q%C%A$G$O!$$&$^$/F0:n$7$J$$(B
 % \end{verbatim}
 % $B$r%W%j%"%s%V%k$K5-=R$9$kI,MW$,$"$C$?!%(B
 $B$@$,!$$3$l$@$1$G$O5-9fN`$NDj5A$KMQ$$$i$l$k(B
-\.{DeclareMathSymbol}$B$d(B\.{DeclareMathDelimiter}$B$,(B\.{omathchar}$B$d(B
-\.{odelcode}$B$r;HMQ$7$J$$$N$GIT==J,$G$"$k!%(B
+|\DeclareMathSymbol|$B$d(B|\DeclareMathDelimiter|$B$,(B|\omathchar|$B$d(B
+|\odelcode|$B$r;HMQ$7$J$$$N$GIT==J,$G$"$k!%(B
 $B<B83E*$H=q$+$l$F$O$$$k$,!$(B
-$B;3K\;a$K$h$k!V:GDc8B$N%Q%C%1!<%8!W(B\cite{yamamoto3}$B$,<j$C<h$jAa$$$h$&$J5$(B
-$B$,$9$k!%(B
+$B;3K\;a$K$h$k!V:GDc8B$N%Q%C%1!<%8!W(B\cite{yamamoto3}$B!$$^$?$O$3$l$r(B
+$B:G?7$N(B\LaTeX $B$KDI?o$7$F$^$H$aD>$5$l$?(B\Pkg{mathfam256}$B%Q%C%1!<%8(B
+\footnote{\url{https://ctan.org/pkg/mathfam256}$B!%(B}$B$r(B
+$B;H$&$N$,<j$C<h$jAa$$$h$&$J5$$,$9$k!%(B
 
 \paragraph{$BL58B$N%l%Y%k(B}
 \TeX $B$G$O!$(Bglue$B$N?-=LNL$K(B\texttt{fil}, \texttt{fill}, \texttt{filll}
 $B$H$$$&(B3$B$D$NL58BBg$N%l%Y%k$,B8:_$7!$(B\texttt{l}$B$,B?$$$[$IL58BBg$N%*!<%@!<$,9b$/$J$C$F$$$?!%(B
 \OMEGA $B$G$O!$!V(Binter-letter spacing$B$N$?$a$K!W(B\texttt{fi}$B$H$$$&!$M-8B$H(B
-\texttt{fil}$B$NCf4V$K$"$?$kL58BBg$N%l%Y%k$,IU$12C$($i$l!$(B\.{hfi}, \.{vfi}$B$H$$$&(B2$B$D(B
-$B$N%W%j%_%F%#%V$bDI2C$5$l$?!%$=$3$G!$$3$NL58BBg%l%Y%k(B
+\texttt{fil}$B$NCf4V$K$"$?$kL58BBg$N%l%Y%k$,IU$12C$($i$l$?!%$=$3$G!$$3$NL58BBg%l%Y%k(B
 \texttt{fi}$B$b:NMQ$9$k$3$H$K$7$?!%(B
 
 \medskip
@@ -453,11 +500,16 @@ delimiter code$B$r<hF@$7$h$&$H$7$F$b!$8=;~E@$N%Q%C%A$G$O!$$&$^$/F0:n$7$J$$(B
 $B<BAuJ}K!$O!$Bg$^$+$K$O(B\OMEGA $B$G(B\texttt{fi}$B$N<BAu$r9T$C$F$$$k(Bchange file\
 \texttt{omfi.ch}$B$NDL$j$G$"$k$N$@$,!$$3$l$K(B\pTeX $B$d(B\eTeX $B$KH<$&>/!9$N=$@5$r9T$C$F$$$k!%(B
 \begin{itemize}
-\item $B%W%j%_%F%#%V(B\.{pagefistretch}$B$r?7$?$KDj5A$7$F$$$k!%(B
-\item \.{gluestretchorder}, \.{glueshrinkorder}$B$NF0:n$r(B\eTeX $B$N$=$l$H9g$o$;$?!%(B
-      $B6qBNE*$K$O!$$"$kE,Ev$J(Bglue~\.{someglue}$B$N?-$SNL$r(B<stretch>$B$H$*$/$H$-!$(B
+\item $B%W%j%_%F%#%V(B|\pagefistretch|, |\hfi|, |\vfi|$B$r?7$?$KDj5A$7$F$$$k(B
+\footnote{%
+      |\hfi|, |\vfi|$B$K$D$$$F$O(B\cite{omegaman}$B$K5-=R$,$"$k$,!$(B
+      \TeX~Live$B$K<}O?$5$l$F$$$k(B$\aleph$$B!J(B\OMEGA $B$O(B\TeX~Live$B$K<}O?$5$l$F$$$J$$!K$G$O(B
+      $B<BAu$5$l$F$$$J$$!%(B|\pagefistretch|$B$r<BAu$7$?$N$OKL@n$N40A4$J4*0c$$$G$"$k!%(B
+}$B!%(B
+\item |\gluestretchorder|, |\glueshrinkorder|$B$NF0:n$r(B\eTeX $B$N$=$l$H9g$o$;$?!%(B
+      $B6qBNE*$K$O!$$"$kE,Ev$J(Bglue~|\someglue|$B$N?-$SNL$r(B<stretch>$B$H$*$/$H$-!$(B
 \[
- \hbox{\.{gluestretchorder}\.{someglue}}=
+ \hbox{|\gluestretchorder\someglue|}=
 \begin{cases}
 0&<stretch>\text{$B$,9b!9(B\texttt{fi}$B%l%Y%k$NNL(B}\\
 1&<stretch>\text{$B$,$A$g$&$I(B\texttt{fil}$B%l%Y%k$NL58BNL(B}\\
@@ -504,7 +556,14 @@ delimiter code$B$r<hF@$7$h$&$H$7$F$b!$8=;~E@$N%Q%C%A$G$O!$$&$^$/F0:n$7$J$$(B
 \begin{verbatim}
 \pdfstrcmp{$B$"(B}{^^e3^^81^^83} % $B!V$"!W$O(BUTF-8$B$G(BE38182
 \end{verbatim}
-  $B$N<B9T7k2L$O(B$\pdfstrcmp{$B$"(B}{^^e3^^81^^83}$$B$G$"$k!%(B
+  $B$N<B9T7k2L$O(B
+    {\ifdefined\UseRawInputEncoding\UseRawInputEncoding\fi
+    $\pdfstrcmp{$B$"(B}{^^e3^^81^^83}$}%
+  $B$G$"$k(B\footnote{%
+    \LaTeX~2018-04-01$B0J9_$G$OI8=`$G(BUTF-8$BF~NO$H$J$C$?!J(B|\usepackage[utf8]{inputenc}|$B$,<+F0(B
+    $B$G9T$o$l$F$$$k$3$H$KAjEv$9$k!K4X78>e!$K\J8$K=R$Y$?F~NONc$r<B9T$9$k:]$K$O(B
+    |\UseRawInputEncoding|$B$N<B9T$,I,MW$K$J$k!%(B
+  }$B!%(B
 
  \csitem[\.{pdfpagewidth}, \.{pdfpageheight}]
   $B%Z!<%8$N!VI}!W!V9b$5!W$rI=$9FbItD9$5$G$"$k$,!$(B
@@ -523,7 +582,7 @@ delimiter code$B$r<hF@$7$h$&$H$7$F$b!$8=;~E@$N%Q%C%A$G$O!$$&$^$/F0:n$7$J$$(B
 	\.{hoffset}$B!J$^$?$O(B\.{voffset}$B!K$NCM$+$i<+F0E*$K7W;;$5$l$k!%(B
   \item \pTeX $B$G$O2#AH!&=DAH$HAHJ}8~$,J#?t$"$k$N$G!$(B\.{pdflastxpos}, \.{pdflastypos}$B$NCM$N:BI87O$r(B
 	$B!VJ*M}E*$J!W8~$-$H$9$Y$-$+!$$=$l$H$b!VAHJ}8~$K1~$8$?!W8~$-$H$9$Y$-$+$OG:$_$I$3$m$G$"$k!%(B
-	110227$BHG0J9_!$8=:_$^$G$NHG$G$O>e5-$N$h$&$KJ*M}E*$J8~$-$H$7$F$$$k!%(B
+	\epTeX~110227$B0J9_!$8=:_$^$G$N%P!<%8%g%s$G$O>e5-$N$h$&$KJ*M}E*$J8~$-$H$7$F$$$k!%(B
  \end{itemize}
   
  \csitem[\.{pdfcreationdate}]
@@ -589,7 +648,7 @@ delimiter code$B$r<hF@$7$h$&$H$7$F$b!$8=;~E@$N%Q%C%A$G$O!$$&$^$/F0:n$7$J$$(B
   \.{pdfsetrandomseed} <number>\indcs{pdfsetrandomseed}$B$K$h$C$FFCDj$NCM$K@_Dj2DG=$G$"$k!%(B
   
   \LaTeX3$B$N(Bl3fp$B$K$*$$$F!$(B2016/11/12$B$"$?$j$+$i<BAu$5$l$?Mp?t@8@.5!G=(B(\cite{random})$B$r(B
-  $B%5%]!<%H$9$k$?$a$K(B161114$BHG$+$i<BAu$5$l$?!%(B
+  $B%5%]!<%H$9$k$?$a$K(B\epTeX~161114$B$+$i<BAu$5$l$?!%(B
 
  \csitem[\.{pdfelapsedtime}, \.{pdfresettimer}]
   \.{pdfelapsedtime}$B$O!$%(%s%8%s5/F0$+$i$N7P2a;~4V$r(B``scaled seconds''$B$9$J$o$A(B
@@ -597,10 +656,28 @@ delimiter code$B$r<hF@$7$h$&$H$7$F$b!$8=;~E@$N%Q%C%A$G$O!$$&$^$/F0:n$7$J$$(B
   $B$9$0>e$NMp?t@8@.%W%j%_%F%#%V$HF1;~$K<BAu$5$l$?!%(B
 \end{cslist}
 
+\section{$B%P!<%8%g%sHV9f(B}
+\pTeX~p3.8.0$B$K(B\.{ptexversion}$B$,<BAu$5$l$?$N$HF1;~$K!$(B\epTeX $B$G$b%P!<%8%g%sHV9f$r(B
+$B<hF@$9$k(B\.{epTeXversion}$B%W%j%_%F%#%V$,(B\epTeX~180121$B$+$iDI2C$5$l$?!%(B
+
+\begin{cslist}
+ \csitem[\.{epTeXversion}]
+  \epTeX $B$N%P!<%8%g%sHV9f!JNc$($P(B\the\epTeXversion$B!K$rFbIt@0?t$GJV$9!%(B\epTeX $B5/F0;~$N%P%J!<$G$O(B
+  \eTeX, \pTeX $B$N%P!<%8%g%sHV9f$bI=<($5$l$k$N$G!$$=$l$r:F8=$7$h$&$H$9$k$H0J2<$N$h$&$K$J$k!%(B
+\begin{verbatim}
+This is e-pTeX, Version 3.14159265-%
+p\number\ptexversion.\number\ptexminorversion\ptexrevision-%
+\number\epTeXversion-\number\eTeXversion\eTeXrevision ...
+\end{verbatim}
+
+
+\end{cslist}
+
+
 \section{\.{lastnodechar}$B%W%j%_%F%#%V(B}
 $BK\%W%j%_%F%#%V$O(B
 \TeX $B%f!<%6$N=8$$(B2014$B$G%j%/%(%9%H$r<u$1$F(B
-$B<BAu$5$l$?(B(\cite{pdfse})$B%W%j%_%F%#%V$G!$(Bextended mode$B$G$7$+MxMQ$G$-$J$$!%(B
+$B<BAu$5$l$?(B(\cite{pdfse})$B%W%j%_%F%#%V$G!$(B\epTeX~141119$B0J9_$N(Bextended mode$B$GMxMQ2DG=$G$"$k!%(B
 $B>\:Y$JGX7J@bL@!&;EMM$O(B\cite{lnc}$B$K>y$k!%(B
 
 \pTeX $B$G$O(B
@@ -622,7 +699,7 @@ delimiter code$B$r<hF@$7$h$&$H$7$F$b!$8=;~E@$N%Q%C%A$G$O!$$&$^$/F0:n$7$J$$(B
   W$B$H(Bo$B$N4V$N%+!<%K%s%0$,(B\.{relax}$B$K$h$C$FA^F~$5$l$J$/$J$C$?$3$H$,$o$+$k!%(B
 }$B$K$h$k!%(B
 min10$B%U%)%s%H%a%H%j%C%/$G!V$A$g$C$H!W$rAH$`$H!V$g$C!W$N4V$,5M$^$k$H$$$&IT6q9g$OM-L>$G$"$k$,!$(B
-$B!V(B\verb+$B$A$g(B{}$B$C$H(B+$B!W$H6u%0%k!<%W$r64$`$3$H$G2sHr$5$l$k$N$b!$F1$8M}M3$G$"$k!%(B
+$B!V(B|$B$A$g(B{}$B$C$H(B|$B!W$H6u%0%k!<%W$r64$`$3$H$G2sHr$5$l$k$N$b!$F1$8M}M3$G$"$k!%(B
 
 \medskip
 
@@ -671,9 +748,8 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
 $B$H$J$j!$8+$?L\$G$OF1$8!V(Bfi$B!W$,(B\.{lastnodechar}$B<B9T;~$N!V:G8e$N%N!<%I!W$G$"$k$+$N$h$&$K8+$($F$b!$(B
 $B$=$l$,9g;z$N>l9g!J:8B&!K$G$O(B\.{lastnodechar}$B$N<B9T7k2L$O:G8e$N9=@.MWAG!V(Bi$B!W$N%3!<%IHV9f(B105$B$H$J$k!%(B
 
-\medskip
 \begin{curve}
-  $B!V(B\verb+$B$3$l$O!$(B+$B!W$H%=!<%9Cf$KF~NO$7$?$H$-$N(B
+  $B!V(B|$B$3$l$O!$(B|$B!W$H%=!<%9Cf$KF~NO$7$?$H$-$N(B
   $B%N!<%I$N>uBV$r(B\.{showlists}$B$GD4$Y$F$_$k$H<!$N$h$&$K$J$C$F$*$j!$(B
   $BK\Ev$K0lHV:G8e$N%N!<%I$O(BJFM$B$K$h$C$FA^F~$5$l$kFsJ,6u$-$N6uGr(B
   $B!J!V!$!W$HDL>o$NOBJ8J8;z$N4V$KF~$k$O$:$N$b$N!K$G$"$k$3$H$,$o$+$k!%(B
@@ -701,7 +777,95 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
 \end{quote}
 $B$H$J$k!%(B
 
+\section{\.{lastnodesubtype}$B%W%j%_%F%#%V(B}
+\cite{tjb28,plt63}$B$J$I$N5DO@$G!$!V:G8e$N%0%k!<$,(BJFM$B%0%k!<$@$1(B\.{unskip}$B$9$k!W=hM}$NI,MW@-$,(B
+$B>'$($i$l$F$-$?!%(B\epTeX $B$K$O$b$H$b$H:G8e$N%N!<%I$N<oJL$rJV$9(B\.{lastnodetype}$B%W%j%_%F%#%V$,(B
+$B$"$C$?$,!$$3$l$G$O:G8e$N%N!<%I$,%0%k!<$G$"$k$+$7$+$o$+$i$J$$!%(B
+$B$=$N$?$a!$(B\epTeX~180226$B$G(B\.{lastnodesubtype}$B%W%j%_%F%#%V$rDI2C$7$?!%(B
+
+\begin{cslist}
+ \csitem[\.{lastnodesubtype}]
+ $B8=:_9=C[Cf$N%j%9%H$N!V:G8e$N%N!<%I!W!J(B\.{lastnodechar}$B%W%j%_%F%#%V$HF1MM!K$N(B
+ subtype$BCM$rFbIt@0?t$H$7$FJV$9!%(B
+\begin{itemize}
+ \item $B!V:G8e$N%N!<%I!W$,J8;z%N!<%I$N$H$-$O(B0$B$,JV$k!%(B
+ \item $B8=:_9=C[Cf$N%j%9%H$,6u$N$H$-$O(B$-1$$B$,JV$k!%(B
+\end{itemize}
+\end{cslist}
+
+$B<B:]$KM-MQ$J$N$O!$0J2<$N>l9g$G$"$m$&!'(B
+ \begin{description}
+  \item[$B:G8e$N%N!<%I$,%0%k!<(B($\.{lastnodetype}=11$)$B$N$H$-(B]
+\begin{multilist}{3}{\hfil\hskip1.5em#:&\quad#\hfil}
+\item 0&$BL@<(E*$J(B\.{hskip}, \.{vskip}\cr
+\item 1&\.{lineskip}\cr
+\item 2&\.{baselineskip}\cr
+\item 3&\.{parskip}\cr
+\item 4&\.{abovedisplayskip}\cr
+\item 5&\.{belowdisplayskip}\cr
+\item 6&\.{abovedisplayshortskip}\cr
+\item 7&\.{belowdisplayshortskip}\cr
+\item 8&\.{leftskip}\cr
+\item 9&\.{rightskip}\cr
+\item 10&\.{topskip}\cr
+\item 11&\.{splittopskip}\cr
+\item 12&\.{tabskip}\cr
+\item 13&\.{spaceskip}\cr
+\item 14&\.{xspaceskip}\cr
+\item 15&\.{parfillskip}\cr
+\item 16&\.{kanjiskip}\cr
+\item 17&\.{xkanjiskip}\cr
+\item 18&\.{thinmuskip}\cr
+\item 19&\.{medmuskip}\cr
+\item 20&\.{thickmuskip}\cr
+\item 21&JFM$BM3Mh%0%k!<(B\cr
+\item 98&\.{nonscript}\cr
+\item 99&\.{mskip}\cr
+\item 100&\.{leaders}\cr
+\item 101&\.{cleaders}\cr
+\item 102&\.{xleaders}\cr
+\end{multilist}
+  \item[$B:G8e$N%N!<%I$,%+!<%s(B($\.{lastnodetype}=12$)$B$N$H$-(B]
+  \leavevmode
+\begin{multilist}{3}{\hfil\hskip1.5zw#:&\quad#\qquad\hfil}
+\item 0&$B%+!<%K%s%0(B\cr
+\item 1&$BL@<(E*$J(B\.{kern}\cr
+\item 2&$B%"%/%;%s%HM3Mh(B\cr
+\item 3&$B%$%?%j%C%/Jd@5(B\.{/}\cr
+\item 99&\.{mkern}\cr
+\end{multilist}
+  \item[$B:G8e$N%N!<%I$,%Z%J%k%F%#(B($\.{lastnodetype}=13$)$B$N$H$-(B]
+  \leavevmode
+\begin{multilist}{2}{\hfil\hskip1.5zw#:&\quad#\qquad\hfil}
+\item 0&$BL@<(E*$J(B\.{penalty}\cr
+\item 1&\.{jcharwidowpenalty}\cr
+\item 2&$B6XB'=hM}M3Mh(B\cr
+\end{multilist}
+ \end{description}
+
+$B$7$+$7!$K\%W%j%_%F%#%V$O(B
+\epTeX $BFbIt$G;HMQ$7$F$$$k(Bsubtype$B$NCM$r$=$N$^$^JV$9$@$1$G$"$k$N$G!$(B
+$B6qBNE*$J?tCM$O>-MhJQ$o$k62$l$,$"$k!%$=$N$?$a!$(B
+\begin{verbatim}
+\ifdefined\ucs\jfont\tenmin=upjisr-h at 9.62216pt
+\else\jfont\tenmin=min10\fi
+\tenmin\char\jis"214B\null\setbox0\lastbox%"
+\global\chardef\pltx@gluetype\lastnodetype
+\global\chardef\pltx@jfmgluesubtype\lastnodesubtype
+\end{verbatim}
+$B$N$h$&$K(B\TeX $B%=!<%9Fb$+$i<hF@!&J]B8$7$F$*$/$3$H$,K>$^$7$$!%(B
 
+\medskip
+$B$J$*(B\pLaTeX~2018-04-01$B0J9_$G$O!$>e5-$N%3!<%I$rMxMQ$7$F(B
+$B!V:G8e$N%0%k!<$,(BJFM$B%0%k!<$N$H$-$@$1>C$9!WL?Na(B|\removejfmglue|$B$r(B
+\begin{verbatim}
+\protected\def\removejfmglue{%
+  \ifnum\lastnodetype=\pltx@gluetype\relax
+    \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax
+      \unskip
+    \fi\fi}
+\end{verbatim}
+$B$H$7$FDj5A$7$F$$$k!%(B
 
 \section{\.{epTeXinputencoding}$B%W%j%_%F%#%V(B}
 $B8=:_FI$_9~$s$G$$$k%U%!%$%k$NJ8;z%3!<%I$r@Z$jBX$($k%W%j%_%F%#%V$G$"$j!$(B
@@ -718,7 +882,6 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
   (\texttt{euc}, \texttt{sjis}, \texttt{jis}, \texttt{utf8})$B$G$"$k!%(B
 \end{cslist}
 
-
 \begin{comment}
   \section{$B8_49@-(B}
 \eTeX, \pTeX $B$H$N8_49@-$r$O$+$k$N$KM-8z$J<jCJ$H$7$F$O!$$^$:(B\texttt{TRIP}
@@ -745,7 +908,7 @@ compatibility mode$B$K$h$k=PNO$N0c$$$r8!>Z$9$k$H!$(BMemory usage$B$N0c$$$d%a%
 \par\vskip0.5\baselineskip\par
 
 $B<!$K!$(B\eTeX $B$K$O!$(B\eTeX $B$K$h$C$F3HD%$5$l$?ItJ,$rD4$Y$k!$F1MM$N(B
-\texttt{e-TRIP} test$B$,B8:_$9$k!%(B\pTeX $B7ONs$G$O!$(B\verb+\showbox+$B$J$I$G$$(B
+\texttt{e-TRIP} test$B$,B8:_$9$k!%(B\pTeX $B7ONs$G$O!$(B|\showbox|$B$J$I$G$$(B
 $B$A$$$AAHJ}8~$rI=<($9$k$N$G!$$=$l$r(B
 \begin{verbatim}
   $ alias sep='sed "s/, yoko direction//;s/yoko direction, //;\
@@ -786,7 +949,7 @@ $3$\,sp$B!K$@$,!$$I$3$+5$$K$J$k$H$3$m$G$"$k!%(B
   \url{https://osdn.jp/projects/eptex/document/resume/ja/1/resume.pdf}$B$[$+!$(B
   $BK\(Bpdf$B$HF1$8%G%#%l%/%H%j$K$"$k(B\texttt{resume.pdf}$B$,$=$l$K$"$?$k!%(B
  \bibitem{yamamoto} $B;3K\(B $BOB5A!$!V?t<0(Bfam$B$N@)8B$H(Bluatex$B!W!$7G<(HD!V(B\TeX\
-  Q\ \&\ A$B!W!$(B2009/02/12$B!%(B
+  Q\ \&\ A$B!W!$(B2009/02/12$B!%(B\\
   \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/52744.html}
  \bibitem{yamamoto2} $B;3K\(B $BOB5A!$!V(BRe: $B?t<0(Bfam$B$N@)8B$H(Bluatex$B!W!$7G<(HD!V(B\TeX\
   Q\ \&\ A$B!W!$(B2009/02/16$B!%(B
@@ -806,12 +969,12 @@ $3$\,sp$B!K$@$,!$$I$3$+5$$K$J$k$H$3$m$G$"$k!%(B
  \bibitem{strcmp} $B3QF#(B $BN<!$!V(BRe: e-pTeX 101231$B!W!$7G<(HD!V(B\TeX\
   Q\ \&\ A$B!W!$(B2011/01/01$B!%(B\\
   \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/55528.html}
- \bibitem{pdfse} Dora TeX$B!$!V(BRe: \textbackslash pdfshellescape,
-  \textbackslash lastnodechar $B$N<BAu!W!$(B\TeX~Forum$B!$(B2014/11/19$B!%(B
+ \bibitem{pdfse} Dora TeX$B!$!V(BRe: |\pdfshellescape|,
+  |\lastnodechar| $B$N<BAu!W!$(B\TeX~Forum$B!$(B2014/11/19$B!%(B
   \url{http://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=1435#p8053}
- \bibitem{lnc} $BKL@n(B $B90E5!$!V(B\textbackslash lastnodechar $B%W%j%_%F%#%V$K$D$$$F!W!$(B2014/12/15$B!%(B\\
- \url{https://osdn.jp/projects/eptex/wiki/lastnodechar}
- \bibitem{xe5} Joseph Wright, ``[XeTeX] \textbackslash (pdf)mdfivesum'',
+ \bibitem{lnc} $BKL@n(B $B90E5!$!V(B|\lastnodechar| $B%W%j%_%F%#%V$K$D$$$F!W!$(B2014/12/15$B!%(B\\
+ \url{https://ja.osdn.net/projects/eptex/wiki/lastnodechar}
+ \bibitem{xe5} Joseph Wright, ``[XeTeX] |\(pdf)mdfivesum|'',
   2015/07/01,\\
   \url{http://tug.org/pipermail/xetex/2015-July/026044.html}
  \bibitem{15715} tat tsan$B!$!V(B[expl3 / e(u)ptex] 2015/07/15 $BHG(B expl3 $B%Q%C%1!<%8$,(B
@@ -821,17 +984,28 @@ $3$\,sp$B!K$@$,!$$I$3$+5$$K$J$k$H$3$m$G$"$k!%(B
   2016/11/12,\\
   \url{http://tug.org/pipermail/tex-live/2016-November/039436.html}
  \bibitem{eptexinputenc} $B0$It(B $B5*9T!$!V(B2016$BG/(B2$B7n(B2$BF|!W!$(B2016/02/02$B!%(B\\
-  \url{http://abenori.blogspot.jp/2016/02/e-ptexeptexinputencoding.html}$B!%(B  
+  \url{http://abenori.blogspot.jp/2016/02/e-ptexeptexinputencoding.html}$B!%(B
  \bibitem{etexman} The \NTS\!\ Team. \textit{The \eTeX\ manual} (v2.0). \\
-  \verb+$TEXMFDIST/doc/etex/base/etex_man.pdf+
+  |$TEXMFDIST/doc/etex/base/etex_man.pdf|
  \bibitem{omegaman} J.\ Plaice, Y.\ Haralambous. \textit{Draft
   documentation for the $\it\Omega$ system}, 1999.\\
-  \verb+$TEXMFDIST/doc/omega/base/doc-1.8.tex+
+  |$TEXMFDIST/doc/omega/base/doc-1.8.tex|
  \bibitem{pdftexman} H\`an Th\'{\^e} Th\`anh et al. \textit{The 
 	\hologo{pdfTeX}\ user manual}, 2015.\\
-  \verb+$TEXMFDIST/doc/pdftex/manual/pdftex-a.pdf+
+	|$TEXMFDIST/doc/pdftex/manual/pdftex-a.pdf|
+\bibitem{l2e26}
+	The \LaTeX3 Project Team, \textit{\LaTeX\ News Issue 26}, 2017.\\
+	|$TEXMFDIST/source/latex/base/ltnews26.tex|, \\
+	\url{https://www.latex-project.org/news/latex2e-news/ltnews26.pdf}.
+\bibitem{tjb28} $BKL@n(B $B90E5!$(B
+	$B!V(B[ptex] |\inhibitglue|$B$N8zNO!W!$(B2017/09/20$B!%(B\\
+	\url{https://github.com/texjporg/tex-jp-build/issues/28}$B!%(B
+\bibitem{plt63} Dora TeX$B!$(B
+	$B!V(Bp $B;XDj$N(B tabular $B$G$N%;%kKAF,$N(B |\relax\par|$B!W!$(B2018/02/19$B!%(B\\
+	\url{https://github.com/texjporg/platex/issues/63}$B!%(B
 \end{thebibliography}
 
+\newpage
 \printindex
 
 \newpage\scrollmode
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jfm.pdf b/Master/texmf-dist/doc/ptex/ptex-base/jfm.pdf
index 5a559476e81..2a499781a45 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 f46e63a3331..ecae5460628 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jfm.tex
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jfm.tex
@@ -3,43 +3,73 @@
 \setlength{\oddsidemargin}{.4in}
 \setlength{\evensidemargin}{.4in}
 \pagestyle{headings}
+\title{JFM$B%U%!%$%k%U%)!<%^%C%H(B}
+\author{ASCII Corporation \& Japanese \TeX\ Development Community}
 \begin{document}
+\maketitle
+
 \section{JFM file format}
-%JFM$B%U%!%$%k%U%)!<%^%C%H(B
 JFM$B%U%!%$%k$N%U%)!<%^%C%H$O!"(B
 $B4pK\E*$K$O(BTFM$B%U%!%$%k$N%U%)!<%^%C%H$K=`5r$7$F$*$j!"(B
 TFM$B$r3HD%$7$?7A$K$J$C$F$$$k!#(B
 $B$3$3$G$O!"<g$K$=$N3HD%ItJ,$K$D$$$F@bL@$r9T$$!"(B
 $B$=$NB>$NItJ,$K4X$7$F$O!"(B
 \TeX\ the program$BEy$N(BTFM$B$N@bL@$r;2>H$7$F$b$i$$$?$$!#(B
+
+$B$3$NJ8=q$O$b$H$b$H3t<02q<R%"%9%-!<$,3+H/$7$?(Bp\TeX{}$B$KIUB0$7$F$$$?(B
+$B$b$N$G$"$k!#(B2018$BG/$KF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$O(BJFM$B%U%)!<%^%C%H$r(B
+$B3HD%$7$?$?$a!"$=$NFbMF$K$D$$$FDI5-$7$F$"$k!#(B
+
 \subsection{JFM$B%U%!%$%k$N9=@.(B}
 JFM$B%U%!%$%kA4BN$N9=@.$O!"(B
-Table\ref{$B9=@.(B}(\pageref{$B9=@.(B}$B%Z!<%8(B)$B$K<($9$H$*$j$G$"$k!#(B \\
+Table~\ref{$B9=@.(B}(\pageref{$B9=@.(B}$B%Z!<%8(B)$B$K<($9$H$*$j$G$"$k!#(B \\
 $B$3$3$G(BTFM$B$H0[$J$k$N$O<!$NE@$G$"$k!#(B
 \begin{enumerate}
 \item {\it char\_type}$B$N%F!<%V%k$,IU$12C$($i$l$?$3$H!#(B
-\item {\it ligature}$B$N49$o$j$K(B{\it glue}$B$N%F!<%V%k$,@_$1$i$l$?$3$H!#(B
+\item {\it exten}$B$N49$o$j$K(B{\it glue}$B$N%F!<%V%k$,@_$1$i$l$?$3$H!#(B
 \item 2$B$K4XO"$7$F!"(B{\it lig\_kern}$B$+$i(B{\it glue\_kern}$B%F!<%V%k$XJQ99$5$l$?$3$H!#(B
 \item $B$3$l$i$KH<$$!"@hF,$N%U%!%$%kFb$N3FItJ,$r5,Dj$9$k(B
 	$B%Q%i%a!<%?I=$,JQ99$5$l$F$$$k!#(B
 	$B$^$?!"%*%j%8%J%k$N(BTFM$B$H$N6hJL$N$?$a$K(Bid$B$rIU2C$7$F$$$k!#(B
 \end{enumerate}
+$B:G=i$N(B7$B%o!<%I$OH>%o!<%I!J!a(B2$B%P%$%H!K$:$D$K6h@Z$i$l!"(B
+JFM$B%U%!%$%k$r9=@.$9$k(B14$B8D$NMWAG$N%5%$%:$,<}$a$i$l$F$$$k!#(B
+$B$3$l$i$NCM$O!"$9$Y$F(B$2^{15}$$B$h$j$b>.$5$$HsIi$NCM$G!"(B
+$B<!$N>r7o$rK~$?$7$F$$$J$1$l$P$J$i$J$$!'(B
+\begin{eqnarray*}
+bc &=& 0 \\
+lf &=& 7 + lh + (ec - bc + 1) + nw + nh + nd + ni + nl + nk + ng + np
+\end{eqnarray*}
 
 \subsection{char\_type}
 $B:#2s$N(B\TeX $B$NF|K\8l2=$K$*$$$F$O!"F10l$NJ8;zI}!"(B
 $B9b$5A08e$KA^F~$5$l$k%0%k!<Ey!"$=$NJ8;z$,;}$DB0@-A4$F$,(B
 $BF1$8$b$N$r!"(B1$B$D$N(B{\it `char\_type'}$B$H$7$F1Q;z%U%)%s%H$N(B1$B%-%c%i%/%?$H(B
 $BF1MM$K$7$F07$&$h$&$K$7$F$$$k!#(B
-$B$=$3$G!"4A;z$N(B2$B%P%$%H%3!<%I$H$3$N(B{\it char\_type}$B$H$NBP1~IU$1$r(B
+$B$=$3$G!"4A;z$NJ8;z%3!<%I$H$3$N(B{\it char\_type}$B$H$NBP1~IU$1$r(B
 $B$3$N%F!<%V%k$r;H$C$F9T$&!#(B
 
-$B$3$N%F!<%V%k$N3F%(%s%H%j!<$O(B1$B%o!<%I$G9=@.$5$l!"(B
-$B>e0LH>%o!<%I$K4A;z%3!<%I!"2<0LH>%o!<%I$K(B{\it char\_type}$B$r;}$A!"(B
+$B$3$N%F!<%V%k$N3F%(%s%H%j!<$O(B1$B%o!<%I!J!a(B4$B%P%$%H!K$G9=@.$5$l!"(B
+$B>e0L(B3$B%P%$%H$K4A;z%3!<%I!"2<0L(B1$B%P%$%H$K%-%c%i%/%?%?%$%W$r;}$D(B
+\footnote{$B$3$l$,F|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$C$F(B2018$BG/(B1$B7n$KF3F~$5$l$?(B
+$B?7;EMM$G$"$k!(%*%j%8%J%k$N%"%9%-!<$K$h$k;EMM$G$O!"!V>e0LH>%o!<%I$K(B
+$B4A;z%3!<%I!"2<0LH>%o!<%I$K%-%c%i%/%?%?%$%W$r;}$D!W$H$$$&$b$N$G$"$C$?!#(B
+p\TeX{}$B$G$OFbIt=hM}$K(BJIS$B$,MQ$$$i$l!"(BJFM$B$G07$&4A;z%3!<%I$O(B2$B%P%$%H$,(B
+$B>e8B$@$C$?$?$a==J,$G$"$C$?$,!"(Bup\TeX{}$B$G(BBMP$BD6$($N(B3$B%P%$%H$NJ8;z$r(B
+JFM$B$G07$&$3$H$rL\E*$K;EMM3HD%$7$?!#(B}$B!#(B
+$B4A;z%3!<%I$O!"$=$l$,(B16$B?J?t(B24bit$B!J(B3$B%P%$%H!K$G(B0xABcdef$B$HI=$5$l$k$H$-!"(B
+{\it char\_type}$B%F!<%V%k$K$O(B{\tt cd ef AB}$B$H$7$F3JG<$5$l$k(B
+\footnote{$B%*%j%8%J%k$N;EMM$G$O!"2<0LH>%o!<%I$K%-%c%i%/%?%?%$%W$r(B
+$B3JG<$7$F$$$?$,!"%-%c%i%/%?%?%$%W$N>e8B$O(B255$B$J$N$G!"<B$O$=$N>e0L%P%$%H$O(B
+$B>o$K(B{\tt 00}$B$G$"$C$?!#$3$N$3$H$rMxMQ$7!"F|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$N(B
+$B?7;EMM$G$O!V$3$N(B{\tt 00}$B$,<B$O4A;z%3!<%I$N>e0L$@$C$?!W$H$$$&$3$H$K(B
+$B$7$F!"(B3$B%P%$%H!J(BU+10000$B0J>e!K$N4A;z%3!<%I$GITB-$9$k(B1$B%P%$%H$r3NJ]$7$?!#(B
+$B$3$l$K$h$j!"?7;EMM$O%*%j%8%J%k$N;EMM$N>e0L8_49$G$"$k$3$H$,J]>Z$5$l$F$$$k!#(B}$B!#(B
 $B%F!<%V%kFb$K$O%3!<%I$NCM$N=gHV$K<}$a$i$l$F$$$J$1$l$P$J$i$J$$!#(B
 $B$^$?$3$N%F!<%V%k$N@hF,$K$O!"%G%U%)%k%H$N%$%s%G%C%/%9$H$7$F(B
-$B4A;z%3!<%I5Z$S(B{\it char\_type}$B$N9`$,(B0$B$N$b$N$,!"(B
+$B4A;z%3!<%I5Z$S%-%c%i%/%?%?%$%W$N9`$,(B0$B$N$b$N$,!"(B
 $BI,$:(B1$B$DB8:_$7$J$1$l$P$J$i$:!"$3$N%F!<%V%k$KEPO?$5$l$F$$$J$$J8;z$O!"(B
-$char\_type = 0$$B$H$7$F07$&!#(B
+$B%-%c%i%/%?%?%$%W$,(B0$B$H$7$F07$&!#(B
 $B$D$^$j!"$3$N%G%U%)%k%H0J30$NJ8;zI}!"%+!<%sEy$NB0@-$r;}$D%-%c%i%/%?(B
 $B$N%3!<%I$H%?%$%W$,(B2$BHVL\0J9_$N%(%s%H%j!<$H$7$FB8:_$7$J$1$l$P$J$i$J$$!#(B
 
@@ -49,55 +79,96 @@ $char\_type = 0$$B$H$7$F07$&!#(B
 $B3F%F!<%V%k$X$N%$%s%G%C%/%9Ey$N>pJs$r<!$N=gHV$G%Q%C%-%s%0(B
 $B$7$F(B1$B%o!<%I$K<}$a$F$"$k!#(B
 \begin{description}
-\item{width\_index(8bits)} width\_table $B$X$N%$%s%G%C%/%9(B
-\item{height\_index(4bits)} height\_table $B$X$N%$%s%G%C%/%9(B
-\item{depth\_index(4bits)} depth\_table $B$X$N%$%s%G%C%/%9(B
-\item{italic\_index(6bits)} italic\_table $B$X$N%$%s%G%C%/%9(B
-\item{tag(2bits)}
+\item{{\it width\_index} (8bits)} width\_table$B$X$N%$%s%G%C%/%9(B
+\item{{\it height\_index} (4bits)} height\_table$B$X$N%$%s%G%C%/%9(B
+\item{{\it depth\_index} (4bits)} depth\_table$B$X$N%$%s%G%C%/%9(B
+\item{{\it italic\_index} (6bits)} italic\_table$B$X$N%$%s%G%C%/%9(B
+\item{{\it 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[remainder]}
-		$B$+$i$K<}$a$i$l$F$$$k$3$H$r<($9!#(B
-	\item{tag=2$B!"(B3} $B;HMQ$7$J$$!#(B
+	\item{${\it tag}=0$} {\it remainder}$B$N9`$OL58z$G$"$j(B
+		$B;HMQ$7$J$$$3$H$r<($9!#(B
+	\item{${\it tag}=1$} {\it remainder}$B$N9`$,(B{\it glue\_kern}$B$X$NM-8z$J(B
+		$B%$%s%G%C%/%9$G$"$k$3$H$r<($9!#(B
+	\item{${\it tag}=2, 3$} JFM$B$G$O;HMQ$7$F$$$J$$!#(B
 	\end{description}
-\item{remainder(8bits)}
+\item{remainder (8bits)}
 \end{description}
-%
+JFM$B$G$O(B$bc$$B$OI,$:%<%m(B\footnote{$BA0@a$K$"$kDL$j!"4A;z%3!<%I5Z$S(B
+$B%-%c%i%/%?%?%$%W$N9`$,(B0$B$N$b$N$,I,$:(B1$B$DB8:_$9$k$?$a!#(B}$B$J$N$G!"(B
+1$B$D$N(BJFM$B$K4^$^$l$k(B{\it char\_info}$B$OA4It$G(B$ec+1$$B%o!<%I$K$J$k!#(B
+
 \subsection{glue\_kern}
-$BFCDj$N%-%c%i%/%?%?%$%W$NAH$_9g$;;~$KA^F~$9$Y$-(Bglue$BKt$O(Bkern$B$r(B
+$BFCDj$N%-%c%i%/%?%?%$%W$NAH$_9g$;;~$KA^F~$9$Y$-(B{\it glue}$BKt$O(B{\it kern}$B$r(B
 $B4JC1$J%W%m%0%i%`8@8l$K$h$C$F;XDj$9$k!#(B
 $B3FL?Na$O!"0J2<$N(B4$B%P%$%H$G9=@.$5$l$k!#(B
 \begin{description}
-\item{$BBh(B1$B%P%$%H(B} 128$B0J>e$N;~!"$3$N%o!<%I$G%W%m%0%i%`=*N;!#(B
-\item{$BBh(B2$B%P%$%H(B}
+\item{$BBh(B1$B%P%$%H(B({\it skip\_byte})}
+	\begin{itemize}
+	\item 128$B$h$jBg$-$$$H$-(B\\
+		$B8=:_$N%o!<%I$,(B{\it char\_info}$B$+$i<($5$l$?:G=i$N%o!<%I(B
+		$B$G$"$k>l9g$O!"<B:]$N(B{\it glue\_kern}$B%W%m%0%i%`$,(B
+		{\it glue\_kern}[$256*{\it op\_byte}+{\it remainder}$]$B$+$i(B
+		$B<}$a$i$l$F$$$k!J$9$J$o$A!":FG[CV$5$l$F$$$k!K$3$H$r<($9(B
+		\footnote{$B!V:FG[CV!W$O!"%5%$%:$,(B256$B$rD6$($kBg$-$J(B
+		{\it glue\_kern}$B%F!<%V%k$r3JG<$9$k$?$a$NJ}:v$G$"$j!"(B
+		$B2$J8(BTFM$B$N(B{\it lig\_kern}$B%F!<%V%k$K$*$1$k$=$l$HF1MM$G$"$k!#(B
+		2018$BG/(B2$B7n$KF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$C$F!"(B
+		p\TeX{}$B5Z$S(BpPLtoTF$B$G?7$?$K%5%]!<%H$5$l$?!#(B}$B!#(B
+		$B:G=i$N%o!<%I$G$J$$>l9g!J$9$J$o$A!"4{$K:FG[CV@h$"$k$$$O(B
+		$B%W%m%0%i%`$N%9%F%C%W$r3+;O$7$?8e$N%o!<%I$G$"$k>l9g!K$O!"(B
+		$B$=$N>l$G%W%m%0%i%`$r=*N;$9$k!#(B
+	\item 128$B$N$H$-(B\\
+		$B$3$N%o!<%I$r<B9T$7$F%W%m%0%i%`$r=*N;$9$k!#(B
+	\item 128$B$h$j>.$5$$$H$-(B\\
+		$B$3$N%o!<%I$r<B9T$7$?8e!"<!$N%9%F%C%W$^$G%9%-%C%W$9$k(B
+		$B%o!<%I?t$r<($9(B
+		\footnote{$B!V%9%-%C%W!W(B(SKIP)$B$O!"85!9%"%9%-!<$N8x<0%Z!<%8(B
+		{\tt http://ascii.asciimw.jp/pb/ptex/tfm/jfm.html}$B$KJ8=q2=(B
+		$B$5$l$F$O$$$?$,!"<B:]$K$O(B(p)PLtoTF$B$N(B{\it glue\_kern}$B%F!<%V%kFb$G(B
+		SKIP$BL?Na$r;HMQ$9$k$3$H$,$G$-$:!"(Bp\TeX{}$B$b$d$O$j(BSKIP$BL?Na$r(B
+		$B%5%]!<%H$7$F$$$J$+$C$?!#(B
+		2018$BG/(B2$B7n$NF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$N2~=$$K$h$j!"(B
+		$B?7$?$K%5%]!<%H$,3+;O$5$l$?!#(B}$B!#(B
+	\end{itemize}
+\item{$BBh(B2$B%P%$%H(B({\it char\_type})}
 	\begin{itemize}
 	\item $B<!$NJ8;z$N%-%c%i%/%?%?%$%W$,!"(B
-		$B$3$N%P%$%H$G<($9%-%c%i%/%?%?%$%W$HF1$8>l9g!"(B
+		$B$3$N%P%$%H$G<($9%-%c%i%/%?%?%$%W(B
+		\footnote{$B$3$3$K%-%c%i%/%?%?%$%W$,3JG<$5$l$k$?$a!"(B
+		$B%-%c%i%/%?%?%$%W$N>e8B$O(B255$B$J$N$G$"$k!#(B}$B$HF1$8>l9g!"(B
 		$BBh(B3$B%P%$%H$N=hM}$r<B9T$7!"%W%m%0%i%`=*N;!#(B
 	\item $B$=$&$G$J$1$l$P<!$N%9%F%C%W$X!#(B
 	\end{itemize}
-\item{$BBh(B3$B%P%$%H(B}
+\item{$BBh(B3$B%P%$%H(B({\it op\_byte})}\\
 	$B$3$NCM$K$h$C$F%0%k!<$r07$&$+%+!<%s$r07$&$+$r5,Dj$9$k!#(B
 	\begin{itemize}
 	\item 127$B0J2<$N>l9g(B{\it glue[remainder$\times$3]}$B$N%0%k!<$rA^F~!#(B
 	\item 128$B0J>e$N>l9g(B{\it kern[remainder]}$B$N%+!<%s$rA^F~!#(B
 	\end{itemize}
-\item{$BBh(B4$B%P%$%H(B} remainder
+\item{$BBh(B4$B%P%$%H(B({\it remainder})}\\
+	$BBh(B3$B%P%$%H$K$h$j5,Dj$5$l$k(B
+	{\it glue}$B$^$?$O(B{\it kern}$B$X$N%$%s%G%C%/%9$r<($9!#(B
 \end{description}
+%
 \subsection{glue$B%F!<%V%k(B}
-3$B%o!<%I$G(B1$B$D$N%0%k!<$r9=@.$9$k!#(B
+$B<+A3D9!"?-$SD9!"=L$_D9$N(B3$B%o!<%I$G(B1$B$D$N%0%k!<$r9=@.$9$k(B
+$B!J$7$?$,$C$F!"(B$ng$$B$OI,$:(B3$B$NG\?t$H$J$k!K!#(B
 $B3FCM$O!"(B$design size\times2^{-20}$$B$rC10L$H$7$FI=$9!#(B
 \begin{description}
 \item{$BBh(B1$B%o!<%I(B} width
 \item{$BBh(B2$B%o!<%I(B} stretch
 \item{$BBh(B3$B%o!<%I(B} shrink
 \end{description}
+%
 \subsection{param$B%F!<%V%k(B}
 \begin{description}
-\item{param[1]} italic slant$B!#(B
-\item{param[2][3][4]} $B4A;z%U%)%s%H4V$KA^F~$9$k%0%k!<$N%G%U%)%k%HCM!#(B
-\item{param[5][6][7]} $B4A;z(B--$B1Q;z%U%)%s%H4V$KA^F~$9$k%0%k!<$N%G%U%)%k%HCM!#(B
+\item{param[1]} $BJ8;z$N79$-(B (italic slant)$B!#(B
+\item{param[2][3][4]} $B4A;z4V$KA^F~$9$k%0%k!<$N%G%U%)%k%HCM!#(B
+\item{param[5]} p\TeX{}$B$G(Bzh$B$G;2>H$5$l$k@#K!!#(B
+\item{param[6]} p\TeX{}$B$G(Bzw$B$G;2>H$5$l$k@#K!!#(B
+\item{param[7][8][9]} $B4A;z$H1Q;z4V$KA^F~$9$k%0%k!<$N%G%U%)%k%HCM!#(B
 \end{description}
+%
 \newpage
 \begin{table}[h]
 \begin{minipage}[b]{2in}
@@ -147,11 +218,11 @@ $ng$ & $np$ \\ \hline
 \begin{minipage}[b]{3.3in}
 \noindent
 \begin{tabular}{l}
-$id=$ JFM\_ID number. ($=11$) \\
+$id=$ JFM\_ID number. ($=11$ for yoko, $9$ for tate) \\
 $nt=$ number of words in the character type table. \\
 $lf=$ length of the entire file, in words. \\
 $lh=$ length of the header data, in words. \\
-$bc=$ smallest character type in the font. \\
+$bc=$ smallest character type in the font. ($=0$ for JFM) \\
 $ec=$ largest character type in the font. \\
 $nw=$ number of words in the width table. \\
 $nh=$ number of words in the height table. \\
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jtex.pdf b/Master/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.pdf
index f4672369842..f4672369842 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jtex.pdf
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.pdf
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jtex.tex b/Master/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.tex
index 4cce31c37d1..4cce31c37d1 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jtex.tex
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.tex
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jtexdoc.pdf b/Master/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.pdf
index b44ec169d50..b44ec169d50 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jtexdoc.pdf
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.pdf
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/jtexdoc.tex b/Master/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.tex
index 2512c5652ba..2512c5652ba 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/jtexdoc.tex
+++ b/Master/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.tex
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/ptexdoc.pdf b/Master/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.pdf
index ab1dc9ab54e..ab1dc9ab54e 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/ptexdoc.pdf
+++ b/Master/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.pdf
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/ptexdoc.tex b/Master/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.tex
index 1aabe60ad2b..1aabe60ad2b 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/ptexdoc.tex
+++ b/Master/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.tex
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/ptexskip.pdf b/Master/texmf-dist/doc/ptex/ptex-base/ptexskip_asciimw.pdf
index fc89e00a914..fc89e00a914 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/ptexskip.pdf
+++ b/Master/texmf-dist/doc/ptex/ptex-base/ptexskip_asciimw.pdf
diff --git a/Master/texmf-dist/doc/ptex/ptex-base/ptexskip.tex b/Master/texmf-dist/doc/ptex/ptex-base/ptexskip_asciimw.tex
index cacb1d96368..cacb1d96368 100644
--- a/Master/texmf-dist/doc/ptex/ptex-base/ptexskip.tex
+++ b/Master/texmf-dist/doc/ptex/ptex-base/ptexskip_asciimw.tex
diff --git a/Master/texmf-dist/tex/ptex/ptex-base/eptexdefs.lib b/Master/texmf-dist/tex/ptex/ptex-base/eptexdefs.lib
index 42d91264078..6a4df97e7e3 100644
--- a/Master/texmf-dist/tex/ptex/ptex-base/eptexdefs.lib
+++ b/Master/texmf-dist/tex/ptex/ptex-base/eptexdefs.lib
@@ -1,4 +1,4 @@
-%% e-pTeXlib
+%% e-pTeXlib (2018/03/12)
 %% derived from $TEXMF/tex/plain/etex/etexdefs.lib (V2.0;8 24-MAR-1998)
 
 \module {grouptypes}
@@ -87,5 +87,6 @@
 \etexifdef tboxif = 25
 \etexifdef yboxif = 26
 \etexifdef dboxif = 27
-\etexifdef pdfprimitiveif = 28
+\etexifdef mboxif = 28
+\etexifdef pdfprimitiveif = 29
 \endmodule
diff --git a/Master/texmf-dist/tex/ptex/ptex-base/ptex.tex b/Master/texmf-dist/tex/ptex/ptex-base/ptex.tex
index ca0943d06f6..b77d13f6ba5 100644
--- a/Master/texmf-dist/tex/ptex/ptex-base/ptex.tex
+++ b/Master/texmf-dist/tex/ptex/ptex-base/ptex.tex
@@ -1,5 +1,5 @@
 % This is the pTeX format (community edition)
-%   last update: texjporg 2017/03/12
+%   last update: texjporg 2017/10/18
 %
 %       (C)copyright ASCII corporation,1987,1995,1997
 %
@@ -43,13 +43,13 @@
 \newfam\tminfam % \tmin is family 10
 \newfam\tgtfam  % \tgt is family 11
 %
-\def\mc{\iftdir\fam\tminfam\tentmin\else\fam\minfam\tenmin\fi}%
+\def\mc{\iftdir\fam\tminfam\else\fam\minfam\fi\tentmin\tenmin}%
 \textfont\minfam=\tenmin\scriptfont\minfam=\sevenmin%
 \scriptscriptfont\minfam=\fivemin
 \textfont\tminfam=\tentmin\scriptfont\tminfam=\seventmin%
 \scriptscriptfont\tminfam=\fivetmin
 %
-\def\gt{\iftdir\fam\tgtfam\tentgt\else\fam\gtfam\tengt\fi}%
+\def\gt{\iftdir\fam\tgtfam\else\fam\gtfam\fi\tentgt\tengt}%
 \textfont\gtfam=\tengt\scriptfont\gtfam=\sevengt%
 \scriptscriptfont\gtfam=\fivegt
 \textfont\tgtfam=\tentgt\scriptfont\tgtfam=\seventgt%
@@ -65,4 +65,4 @@
 %
 % identifies the current format based on plain
 \def\fmtname{ptex}
-\edef\fmtversion{\fmtversion\space p1.0b}
+\edef\fmtversion{\fmtversion\space p1.0c}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index fe27875c171..c7fa288b093 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -435,7 +435,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'expressgx',   "&MAKEexpressg",
  'extractpdfmark', "die 'skipping, compiled program'",
  'fac',         "die 'skipping, noinfo license'",
- 'xfakebold',	"&MAKEflatten",
  'fancyvrb',    "&MAKEfancyvrb",
  'faq',         "die 'skipping, use FAQ-en'",
  'faq-en',      "die 'skipping, use FAQ-en'",
@@ -806,6 +805,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'norasi-c90',  "&MAKEnorasi_c90",
  'notes',       "&MAKEnotes",
  'notestex',    "&MAKEflatten",
+ 'notocjksc',	"die 'skipping, 300mb is just too big'",
  'npp-for-context', "die 'skipping, await next release'",
  'ntabbing',    "die 'skipping, noinfo license, author email bad'",
  'ntg',         "die 'skipping, ntg is stale user group information'",
@@ -1242,6 +1242,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'xelibertine', "die 'skipping, replaced by libertine'",
  'xetex-def',	"die 'skipping, replaced by graphics-def'",
  'xetex-pstricks',"&MAKEcopy",
+ 'xfakebold',	"&MAKEflatten",
  'xfrac',       "die 'skipping, use mh (I think)'",
  'xinitials',   "die 'skipping, will be in xpackages when ready (Morten says)'",
  'xindy-persian',"die 'skipping, do by hand in /texmf-dist/xindy/modules/lang/persian: too painful to preserve rest of xindy'",