jsclasses (13dec16)

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

3 files changed, 55 insertions, 30 deletions

diff --git a/Master/texmf-dist/source/platex/jsclasses/Makefile b/Master/texmf-dist/source/platex/jsclasses/Makefile
index 4c39a08c323..ee3111d5c1d 100644
--- a/Master/texmf-dist/source/platex/jsclasses/Makefile
+++ b/Master/texmf-dist/source/platex/jsclasses/Makefile
@@ -1,38 +1,39 @@
-all: jsarticle.cls okumacro.sty jsverb.sty okuverb.sty morisawa.sty jslogo.sty \
-	jsclasses.pdf okumacro.pdf jsverb.pdf okuverb.pdf morisawa.pdf jslogo.pdf
+STRIPTARGET = jsarticle.cls okumacro.sty jsverb.sty okuverb.sty morisawa.sty jslogo.sty
+PDFTARGET = jsclasses.pdf okumacro.pdf jsverb.pdf okuverb.pdf morisawa.pdf jslogo.pdf
+DVOTARGET = jsclasses.dvi okumacro.dvi jsverb.dvi okuverb.dvi morisawa.dvi jslogo.dvi
+KANJI = --kanji=jis
+
+default: $(STRIPTARGET) $(DVITARGET)
+strip: $(STRIPTARGET)
+all: $(STRIPTARGET) $(PDFTARGET)
 
 jsarticle.cls: jsclasses.dtx
-	platex --kanji=jis jsclasses.ins
+	platex $(KANJI) jsclasses.ins
+
+jslogo.sty: jslogo.dtx
+	platex $(KANJI) jslogo.ins
 
 okumacro.sty: okumacro.dtx
-	platex --kanji=jis okumacro.ins
+	platex $(KANJI) okumacro.ins
 
 jsverb.sty: jsverb.dtx
-	platex --kanji=jis jsverb.ins
+	platex $(KANJI) jsverb.ins
 
 okuverb.sty: okuverb.dtx
-	platex --kanji=jis okuverb.ins
+	platex $(KANJI) okuverb.ins
 
 morisawa.sty: morisawa.dtx
-	platex --kanji=jis morisawa.ins
-
-jslogo.sty: jslogo.dtx
-	platex --kanji=jis jslogo.ins
-
-jsclasses.pdf: jsclasses.dtx
-	ptex2pdf -l -ot --kanji=jis jsclasses.dtx
-
-okumacro.pdf: okumacro.dtx
-	ptex2pdf -l -ot --kanji=jis okumacro.dtx
-
-jsverb.pdf: jsverb.dtx
-	ptex2pdf -l -ot --kanji=jis jsverb.dtx
-
-okuverb.pdf: okuverb.dtx
-	ptex2pdf -l -ot --kanji=jis okuverb.dtx
-
-morisawa.pdf: morisawa.dtx
-	ptex2pdf -l -ot --kanji=jis morisawa.dtx
-
-jslogo.pdf: jslogo.dtx
-	ptex2pdf -l -ot --kanji=jis jslogo.dtx
+	platex $(KANJI) morisawa.ins
+
+.SUFFIXES: .dtx .dvi .pdf
+.dtx.dvi:
+	platex $(KANJI) $<
+	platex $(KANJI) $<
+.dvi.pdf:
+	dvipdfmx $<
+
+.PHONY: clean
+clean:
+	rm -f \
+	*.cls jslogo.sty okumacro.sty jsverb.sty okuverb.sty morisawa.sty \
+	jsclasses.pdf okumacro.pdf jsverb.pdf okuverb.pdf morisawa.pdf jslogo.pdf
diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
index a307d630a9b..b6cfd11bf75 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
@@ -38,7 +38,7 @@
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [2016/12/01 okumura, texjporg]
+  [2016/12/13 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -3415,13 +3415,20 @@
 % $BN>LL0u:~$N$H$-$OGr%Z!<%8$rDI2C$7$^$9!#(B
 % $BFsCJAH$N$H$-$K$O!$FsCJAH$KLa$7$^$9!#(B
 %
+% [2016-12-13] \texttt{openany} $B$N$H$-$K$OGr%Z!<%8$,DI2C$5$l$k$N$OJQ$J$N$G!$(B
+% $B$=$N>l9g$ODI2C$7$J$$$h$&$K$7$^$7$?!#$3$N%P%0$O(B\LaTeX $B$G$O(B
+% classes.dtx v1.4b (2000/05/19)
+% $B$G=$@5$5$l$F$$$^$9!#(B
+%
 %    \begin{macrocode}
 %<*book>
 \def\@endpart{\vfil\newpage
   \if@twoside
+   \if@openright %% added (2016/12/13)
     \null
     \thispagestyle{empty}%
     \newpage
+   \fi %% added (2016/12/13)
   \fi
   \if@restonecol
     \twocolumn
diff --git a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
index b2c8e835e87..195e3a5dcd3 100644
--- a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
@@ -11,7 +11,7 @@
 %  $B$F$$$^$9$N$G!$;d$N$b$N$b$=$l$K=`$8$F!J(Bmodified$B!K(BBSD$B$H$9$k$3$H$K$7$^$9!#(B
 %
 %<okumacro>\NeedsTeXFormat{pLaTeX2e}
-%<okumacro>\ProvidesPackage{okumacro}[2016/10/08 okumura, texjporg]
+%<okumacro>\ProvidesPackage{okumacro}[2016/12/13 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -373,6 +373,23 @@
 \def\$B!=!=(B{$B!=(B\kern-.5zw$B!=(B\kern-.5zw$B!=(B}
 %    \end{macrocode}
 %
+% [2016-12-04] \pLaTeX $B$GDL$k%3!<%I$,(B \upLaTeX $B$GDL$i$J$/$J$k$3$H$rKI$0$?$a$K!$(Bu\pLaTeX $B$N>l9g$K$O(BU+FF0D$B!$(BU+2014$B$GDj5A$7$?$b$N$bJLESMQ0U$7$^$7$?!#(B
+%
+%    \begin{macrocode}
+\ifx\ucs\@undefined\else
+  \begingroup
+    \kansujichar1="FF0D
+    \kansujichar2="2014
+    \expandafter\expandafter\expandafter\gdef
+    \expandafter\csname\expandafter\kansuji\expandafter1%
+    \expandafter\endcsname\kansuji1{$B!=(B\kern-.5zw$B!=(B\kern-.5zw$B!=(B}
+    \expandafter\expandafter\expandafter\gdef
+    \expandafter\csname\expandafter\kansuji\expandafter2%
+    \expandafter\endcsname\kansuji2{$B!=(B\kern-.5zw$B!=(B\kern-.5zw$B!=(B}
+  \endgroup
+\fi
+%    \end{macrocode}
+%
 % \end{macro}
 % \end{macro}
 %