texlive[46612] Master/texmf-dist: bxjscls (12feb18)

commits+karl at tug.org commits+karl at tug.org
Mon Feb 12 23:55:47 CET 2018


Revision: 46612
          http://tug.org/svn/texlive?view=revision&revision=46612
Author:   karl
Date:     2018-02-12 23:55:46 +0100 (Mon, 12 Feb 2018)
Log Message:
-----------
bxjscls (12feb18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
    trunk/Master/texmf-dist/doc/latex/bxjscls/README.md
    trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
    trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
    trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
    trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
    trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls

Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md	2018-02-12 22:55:46 UTC (rev 46612)
@@ -98,6 +98,8 @@
 更新履歴
 --------
 
+  * Version 1.7c 〈2018/02/04〉
+      - オプション `label-section` を新設。
   * Version 1.7b 〈2018/01/28〉
       - 和文パラメタ `units` を新設。
       - バグ修正。

Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/README.md
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex	2018-02-12 22:55:46 UTC (rev 46612)
@@ -12,8 +12,8 @@
   \renewcommand*{\XeLaTeX}{XeLaTeX}}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{v1.7b}
-\newcommand{\PkgDate}{2018/01/28}
+\newcommand{\PkgVersion}{v1.7c}
+\newcommand{\PkgDate}{2018/02/04}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
 \newcommand{\Note}{\par\noindent ※}
@@ -792,6 +792,24 @@
   \end{quote}
 \item |fix-at-cmd=|\Meta{真偽値}\Means
   |\@| 命令に対してJSクラスと同様の拡張を施すか否か。
+\item |label-section=|\Meta{値}\Means
+  節番号の書式出力、特に
+  「|\pre|/|postsectionname|」
+  「\Pkg{bxjsarticle}での付録部における |\appendixname|」
+  の語句の付加の方法を選択する。
+  \begin{itemize}
+  \item |compat|(既定)\Means
+    JSクラスと同じ実装を用いる。
+    この場合、節のカウンタの書式(|\thesection|)そのものに語句が
+    付加されるため、|\thesection| を参照する他のカウンタ書式が
+    奇妙になる可能性がある。
+  \item |modern|\Means
+    節のカウンタの書式(|\thesection|)には語句の付加を行わず、
+    実際にそれが節番号として出力される際に語句を付加する。
+  \item |none|\Means
+    節番号に対する語句の付加を抑止する。
+    欧文・和文の標準文書クラスと同等になる。
+  \end{itemize}
 \item |layout=|\Meta{値}\Means
   レイアウトの変種を選択する。
   現状では、過去の版との互換性を維持するために用いられている。

Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx	2018-02-12 22:55:46 UTC (rev 46612)
@@ -68,7 +68,8 @@
 %<*driver>
 \ProvidesFile{bxjscls.dtx}
 %</driver>
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
+% [2018/01/28 v1.7b BXJS document classes]
 % [2017/12/09 v1.7a BXJS document classes]
 % [2017/10/21 v1.7 BXJS document classes]
 % [2017/09/28 v1.6b BXJS document classes]
@@ -1841,6 +1842,20 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\bxjs at label@section}
+% |label-section| の指定値。
+%    \begin{macrocode}
+\chardef\bxjs at label@section at none=0
+\chardef\bxjs at label@section at compat=1
+\chardef\bxjs at label@section at modern=2
+\let\bxjs at label@section\bxjs at label@section at compat
+\def\bxjs at kv@labelsection at none{\let\bxjs at label@section\bxjs at label@section at none}
+\def\bxjs at kv@labelsection at compat{\let\bxjs at label@section\bxjs at label@section at compat}
+\def\bxjs at kv@labelsection at modern{\let\bxjs at label@section\bxjs at label@section at modern}
+\define at key{bxjs}{label-section}{\bxjs at set@keyval{labelsection}{#1}{}}
+%    \end{macrocode}
+% \end{macro}
+%
 % \end{ZRnote}
 %
 % \paragraph{オプションの実行}
@@ -4143,10 +4158,10 @@
         \hbox to \fullwidth{{\rightmark}\hfil\textbf{\thepage}}}\hss}%
     \let\@mkboth\markboth
     \def\sectionmark##1{\markboth{%
-       \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+       \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
        ##1}{}}%
     \def\subsectionmark##1{\markright{%
-       \ifnum \c at secnumdepth >\@ne \thesubsection \hskip1\jsZw\fi
+       \ifnum \c at secnumdepth >\@ne \bxjs at label@sect{subsection}\hskip1\jsZw\fi
        ##1}}%
   }
 \else % if not twoside
@@ -4157,7 +4172,7 @@
         \hbox to \fullwidth{{\rightmark}\hfil\textbf{\thepage}}}\hss}%
     \let\@mkboth\markboth
     \def\sectionmark##1{\markright{%
-        \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+        \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
         ##1}}}
 \fi
 %</article|slide>
@@ -4199,7 +4214,7 @@
     \fi
     ##1}{}}%
   \def\sectionmark##1{\markright{%
-    \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+    \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
     ##1}}}%
 %</book|report>
 %    \end{macrocode}
@@ -4553,6 +4568,44 @@
 %
 % \subsection{章・節}
 %
+% \begin{ZRnote}
+% ムニャムニャ……。
+% \begin{macro}{\bxjs at label@sect}
+% 節付 |#1| の番号を出力する。
+% 節付 |XXX| に対して、|\labelXXX| が定義済ならそれが出力書式を表す。
+% 未定義ならばカウンタの出力書式 |\theXXX| が使われる。
+%    \begin{macrocode}
+\def\bxjs at label@sect#1{%
+  \expandafter\ifx\csname label#1\endcsname\relax
+    \csname the#1\endcsname
+  \else \csname label#1\endcsname
+  \fi}
+\def\@seccntformat#1{\bxjs at label@sect{#1}\quad}
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@secapp}
+% 節番号の接頭辞。
+% \begin{macro}{\@secpos}
+% 節番号の接尾辞。
+%    \begin{macrocode}
+\ifnum\bxjs at label@section=\bxjs at label@section at compat\else
+\def\@secapp{\presectionname}
+\def\@secpos{\postsectionname}
+\fi
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\labelsection}
+% 節番号の出力書式。
+%    \begin{macrocode}
+\ifnum\bxjs at label@section=\bxjs at label@section at modern
+\def\labelsection{\@secapp\thesection\@secpos}
+\fi
+%    \end{macrocode}
+% \end{macro}
+%
+% \end{ZRnote}
+%
 % \paragraph{構成要素}
 %
 % |\@startsection| マクロは6個の必須引数と,オプションとして |*| と
@@ -4661,7 +4714,7 @@
       \csname #1mark\endcsname{#7}%
       \addcontentsline{toc}{#1}{%
         \ifnum #2>\c at secnumdepth \else
-          \protect\numberline{\csname the#1\endcsname}%
+          \protect\numberline{\bxjs at label@sect{#1}}%
         \fi
         #7}}% 目次にフルネームを載せるなら #8
   \else
@@ -4675,7 +4728,7 @@
     \csname #1mark\endcsname{#7}%
     \addcontentsline{toc}{#1}{%
       \ifnum #2>\c at secnumdepth \else
-        \protect\numberline{\csname the#1\endcsname}%
+        \protect\numberline{\bxjs at label@sect{#1}}%
       \fi
       #7}% 目次にフルネームを載せるならここは #8
   \fi
@@ -4829,9 +4882,15 @@
 %
 %    \begin{macrocode}
 \renewcommand{\thepart}{\@Roman\c at part}
-%<!book&!report>% \renewcommand{\thesection}{\@arabic\c at section}
-%<!book&!report>\renewcommand{\thesection}{\presectionname\@arabic\c at section\postsectionname}
-%<!book&!report>\renewcommand{\thesubsection}{\@arabic\c at section.\@arabic\c at subsection}
+%<*!book&!report>
+\ifnum\bxjs at label@section=\bxjs at label@section at compat
+\renewcommand{\thesection}{\presectionname\@arabic\c at section\postsectionname}
+\renewcommand{\thesubsection}{\@arabic\c at section.\@arabic\c at subsection}
+\else
+\renewcommand{\thesection}{\@arabic\c at section}
+\renewcommand{\thesubsection}{\thesection.\@arabic\c at subsection}
+\fi
+%</!book&!report>
 %<*book|report>
 \renewcommand{\thechapter}{\@arabic\c at chapter}
 \renewcommand{\thesection}{\thechapter.\@arabic\c at section}
@@ -5900,11 +5959,17 @@
 \newcommand{\appendix}{\par
   \setcounter{section}{0}%
   \setcounter{subsection}{0}%
+  \ifnum\bxjs at label@section=\bxjs at label@section at compat
   \gdef\presectionname{\appendixname}%
   \gdef\postsectionname{}%
 % \gdef\thesection{\@Alph\c at section}% [2003-03-02]
   \gdef\thesection{\presectionname\@Alph\c at section\postsectionname}%
-  \gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}}
+  \gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}%
+  \else
+  \gdef\@secapp{\appendixname}%
+  \gdef\@secpos{}%
+  \gdef\thesection{\@Alph\c at section}%
+  \fi}
 %</!book&!report>
 %<*book|report>
 \newcommand{\appendix}{\par
@@ -8637,10 +8702,17 @@
 %
 % \paragraph{和文用単位のサポート}
 %
+% エンジンが{(u)\pTeX}の場合は |units| を無効にする。
+%    \begin{macrocode}
+\if j\jsEngine
+  \bxjs at jp@unitsfalse
+\fi
+%    \end{macrocode}
+%
 % |units| パラメタが有効の場合は、|bxcalc| パッケージを読みこんで、
 % |\usepTeXunits| 命令を実行する。
 %    \begin{macrocode}
-\ifbxjs at jp@units\if j\jsEngine\else
+\ifbxjs at jp@units
   \IfFileExists{bxcalc.sty}{%
     \RequirePackage{bxcalc}[2018/01/28]%v1.0a
     \ifx\usepTeXunits\@undefined
@@ -8654,9 +8726,23 @@
      {Cannot support pTeX units (zw etc.), since\MessageBreak
       the package 'bxcalc' is unavailable}%
   }
-\fi\fi
+\fi
 %    \end{macrocode}
 %
+% \begin{macro}{\bxjs at let@lenexpr}
+% |\bxjs at let@lenexpr\CS{|\Meta{長さ式}|}|\Means
+% 長さ式に |bxcalc| の展開を適用した結果のトークン列を |\CS| に代入する。
+%    \begin{macrocode}
+\ifbxjs at jp@units
+  \def\bxjs at let@lenexpr#1#2{%
+    \edef#1{#2}%
+    \expandafter\CUXParseExpr\expandafter#1\expandafter{#1}}
+\else
+  \def\bxjs at let@lenexpr{\edef}
+\fi
+%    \end{macrocode}
+% \end{macro}
+%
 % \paragraph{共通命令の実装}
 %
 % |\jQ| 等の「単位」系の共通命令を実装する。
@@ -8801,7 +8887,7 @@
 % 和文間空白の量を設定する。
 %    \begin{macrocode}
 \newcommand*\setkanjiskip[1]{%
-  \edef\bxjs at kanjiskip{#1}%
+  \bxjs at let@lenexpr\bxjs at kanjiskip{#1}%
   \bxjs at reset@kanjiskip}
 %    \end{macrocode}
 % \end{macro}
@@ -8860,7 +8946,7 @@
 %    \begin{macrocode}
 \def\bxjs at xkanjiskip{0pt}
 \newcommand*\setxkanjiskip[1]{%
-  \edef\bxjs at xkanjiskip{#1}%
+  \bxjs at let@lenexpr\bxjs at xkanjiskip{#1}%
   \bxjs at reset@xkanjiskip}
 \newcommand*\getxkanjiskip{%
   \bxjs at xkanjiskip}

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls	2018-02-12 22:55:46 UTC (rev 46612)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsarticle}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs at clsname{bxjsarticle}
 \newif\ifjsc at needsp@tch
@@ -566,6 +566,14 @@
 \def\bxjs at kv@everyparhook at compat{\let\bxjs at everyparhook\bxjs at everyparhook@compat}
 \def\bxjs at kv@everyparhook at modern{\let\bxjs at everyparhook\bxjs at everyparhook@modern}
 \define at key{bxjs}{everyparhook}{\bxjs at set@keyval{everyparhook}{#1}{}}
+\chardef\bxjs at label@section at none=0
+\chardef\bxjs at label@section at compat=1
+\chardef\bxjs at label@section at modern=2
+\let\bxjs at label@section\bxjs at label@section at compat
+\def\bxjs at kv@labelsection at none{\let\bxjs at label@section\bxjs at label@section at none}
+\def\bxjs at kv@labelsection at compat{\let\bxjs at label@section\bxjs at label@section at compat}
+\def\bxjs at kv@labelsection at modern{\let\bxjs at label@section\bxjs at label@section at modern}
+\define at key{bxjs}{label-section}{\bxjs at set@keyval{labelsection}{#1}{}}
 \let\bxjs at ltx@removeelement\@removeelement
 \def\@removeelement#1#2#3{%
   \def\reserved at a{#2}%
@@ -1163,10 +1171,10 @@
         \hbox to \fullwidth{{\rightmark}\hfil\textbf{\thepage}}}\hss}%
     \let\@mkboth\markboth
     \def\sectionmark##1{\markboth{%
-       \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+       \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
        ##1}{}}%
     \def\subsectionmark##1{\markright{%
-       \ifnum \c at secnumdepth >\@ne \thesubsection \hskip1\jsZw\fi
+       \ifnum \c at secnumdepth >\@ne \bxjs at label@sect{subsection}\hskip1\jsZw\fi
        ##1}}%
   }
 \else % if not twoside
@@ -1177,7 +1185,7 @@
         \hbox to \fullwidth{{\rightmark}\hfil\textbf{\thepage}}}\hss}%
     \let\@mkboth\markboth
     \def\sectionmark##1{\markright{%
-        \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+        \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
         ##1}}}
 \fi
 \def\ps at myheadings{%
@@ -1328,6 +1336,19 @@
     \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi
   }
 \fi
+\def\bxjs at label@sect#1{%
+  \expandafter\ifx\csname label#1\endcsname\relax
+    \csname the#1\endcsname
+  \else \csname label#1\endcsname
+  \fi}
+\def\@seccntformat#1{\bxjs at label@sect{#1}\quad}
+\ifnum\bxjs at label@section=\bxjs at label@section at compat\else
+\def\@secapp{\presectionname}
+\def\@secpos{\postsectionname}
+\fi
+\ifnum\bxjs at label@section=\bxjs at label@section at modern
+\def\labelsection{\@secapp\thesection\@secpos}
+\fi
 \def\@startsection#1#2#3#4#5#6{%
   \if at noskipsec \leavevmode \fi
   \par
@@ -1371,7 +1392,7 @@
       \csname #1mark\endcsname{#7}%
       \addcontentsline{toc}{#1}{%
         \ifnum #2>\c at secnumdepth \else
-          \protect\numberline{\csname the#1\endcsname}%
+          \protect\numberline{\bxjs at label@sect{#1}}%
         \fi
         #7}}% 目次にフルネームを載せるなら #8
   \else
@@ -1384,7 +1405,7 @@
     \csname #1mark\endcsname{#7}%
     \addcontentsline{toc}{#1}{%
       \ifnum #2>\c at secnumdepth \else
-        \protect\numberline{\csname the#1\endcsname}%
+        \protect\numberline{\bxjs at label@sect{#1}}%
       \fi
       #7}% 目次にフルネームを載せるならここは #8
   \fi
@@ -1440,9 +1461,13 @@
 \newcounter{paragraph}[subsubsection]
 \newcounter{subparagraph}[paragraph]
 \renewcommand{\thepart}{\@Roman\c at part}
-% \renewcommand{\thesection}{\@arabic\c at section}
+\ifnum\bxjs at label@section=\bxjs at label@section at compat
 \renewcommand{\thesection}{\presectionname\@arabic\c at section\postsectionname}
 \renewcommand{\thesubsection}{\@arabic\c at section.\@arabic\c at subsection}
+\else
+\renewcommand{\thesection}{\@arabic\c at section}
+\renewcommand{\thesubsection}{\thesection.\@arabic\c at subsection}
+\fi
 \renewcommand{\thesubsubsection}{%
    \thesubsection.\@arabic\c at subsubsection}
 \renewcommand{\theparagraph}{%
@@ -1710,10 +1735,16 @@
 \newcommand{\appendix}{\par
   \setcounter{section}{0}%
   \setcounter{subsection}{0}%
+  \ifnum\bxjs at label@section=\bxjs at label@section at compat
   \gdef\presectionname{\appendixname}%
   \gdef\postsectionname{}%
   \gdef\thesection{\presectionname\@Alph\c at section\postsectionname}%
-  \gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}}
+  \gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}%
+  \else
+  \gdef\@secapp{\appendixname}%
+  \gdef\@secpos{}%
+  \gdef\thesection{\@Alph\c at section}%
+  \fi}
 \setlength\arraycolsep{5\p@?}
 \setlength\tabcolsep{6\p@?}
 \setlength\arrayrulewidth{.4\p@}

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls	2018-02-12 22:55:46 UTC (rev 46612)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsbook}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs at clsname{bxjsbook}
 \newif\ifjsc at needsp@tch
@@ -575,6 +575,14 @@
 \def\bxjs at kv@everyparhook at compat{\let\bxjs at everyparhook\bxjs at everyparhook@compat}
 \def\bxjs at kv@everyparhook at modern{\let\bxjs at everyparhook\bxjs at everyparhook@modern}
 \define at key{bxjs}{everyparhook}{\bxjs at set@keyval{everyparhook}{#1}{}}
+\chardef\bxjs at label@section at none=0
+\chardef\bxjs at label@section at compat=1
+\chardef\bxjs at label@section at modern=2
+\let\bxjs at label@section\bxjs at label@section at compat
+\def\bxjs at kv@labelsection at none{\let\bxjs at label@section\bxjs at label@section at none}
+\def\bxjs at kv@labelsection at compat{\let\bxjs at label@section\bxjs at label@section at compat}
+\def\bxjs at kv@labelsection at modern{\let\bxjs at label@section\bxjs at label@section at modern}
+\define at key{bxjs}{label-section}{\bxjs at set@keyval{labelsection}{#1}{}}
 \let\bxjs at ltx@removeelement\@removeelement
 \def\@removeelement#1#2#3{%
   \def\reserved at a{#2}%
@@ -1206,7 +1214,7 @@
     \fi
     ##1}{}}%
   \def\sectionmark##1{\markright{%
-    \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+    \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
     ##1}}}%
 \def\ps at myheadings{%
   \let\@oddfoot\@empty\let\@evenfoot\@empty
@@ -1355,6 +1363,19 @@
     \par\vskip 1.5em
   }
 \fi
+\def\bxjs at label@sect#1{%
+  \expandafter\ifx\csname label#1\endcsname\relax
+    \csname the#1\endcsname
+  \else \csname label#1\endcsname
+  \fi}
+\def\@seccntformat#1{\bxjs at label@sect{#1}\quad}
+\ifnum\bxjs at label@section=\bxjs at label@section at compat\else
+\def\@secapp{\presectionname}
+\def\@secpos{\postsectionname}
+\fi
+\ifnum\bxjs at label@section=\bxjs at label@section at modern
+\def\labelsection{\@secapp\thesection\@secpos}
+\fi
 \def\@startsection#1#2#3#4#5#6{%
   \if at noskipsec \leavevmode \fi
   \par
@@ -1398,7 +1419,7 @@
       \csname #1mark\endcsname{#7}%
       \addcontentsline{toc}{#1}{%
         \ifnum #2>\c at secnumdepth \else
-          \protect\numberline{\csname the#1\endcsname}%
+          \protect\numberline{\bxjs at label@sect{#1}}%
         \fi
         #7}}% 目次にフルネームを載せるなら #8
   \else
@@ -1411,7 +1432,7 @@
     \csname #1mark\endcsname{#7}%
     \addcontentsline{toc}{#1}{%
       \ifnum #2>\c at secnumdepth \else
-        \protect\numberline{\csname the#1\endcsname}%
+        \protect\numberline{\bxjs at label@sect{#1}}%
       \fi
       #7}% 目次にフルネームを載せるならここは #8
   \fi

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty	2018-02-12 22:55:46 UTC (rev 46612)
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesPackage{bxjscjkcat}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 \def\bxjx at pkgname{bxjscjkcat}
 \newcount\bxjx at cnta
 \let\bxjx at engine=n

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty	2018-02-12 22:55:46 UTC (rev 46612)
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesPackage{bxjscompat}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 \def\bxac at pkgname{bxjscompat}
 \let\bxac at engine=n
 \def\bxac at do#1#2{%

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def	2018-02-12 22:55:46 UTC (rev 46612)
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-minimal.def}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 %% このファイルは日本語文字を含みます
 \def\DeclareJaTextFontCommand#1#2{%
   \DeclareRobustCommand#1[1]{%

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def	2018-02-12 22:55:46 UTC (rev 46612)
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-modern.def}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 \input{bxjsja-standard.def}
 \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@
 \def\encodingdefault{T1}%

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def	2018-02-12 22:55:46 UTC (rev 46612)
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-pandoc.def}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 \input{bxjsja-standard.def}
 \RequirePackage{bxjspandoc}
 \@onlypreamble\bxjs at set@dupload at proc

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def	2018-02-12 22:55:46 UTC (rev 46612)
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-standard.def}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 %% このファイルは日本語文字を含みます
 \input{bxjsja-minimal.def}
 \bxjs at simplejasetupfalse
@@ -44,7 +44,10 @@
   \g at addto@macro\@classoptionslist{,jis2004}
   \PassOptionsToPackage{jis2004}{otf}
 \fi
-\ifbxjs at jp@units\if j\jsEngine\else
+\if j\jsEngine
+  \bxjs at jp@unitsfalse
+\fi
+\ifbxjs at jp@units
   \IfFileExists{bxcalc.sty}{%
     \RequirePackage{bxcalc}[2018/01/28]%v1.0a
     \ifx\usepTeXunits\@undefined
@@ -58,7 +61,14 @@
      {Cannot support pTeX units (zw etc.), since\MessageBreak
       the package 'bxcalc' is unavailable}%
   }
-\fi\fi
+\fi
+\ifbxjs at jp@units
+  \def\bxjs at let@lenexpr#1#2{%
+    \edef#1{#2}%
+    \expandafter\CUXParseExpr\expandafter#1\expandafter{#1}}
+\else
+  \def\bxjs at let@lenexpr{\edef}
+\fi
 \ifjsWitheTeX
   \@tempdima=0.25mm
   \protected\edef\jQ{\dimexpr\the\@tempdima\relax}
@@ -124,7 +134,7 @@
   \@defaultunits\@tempdima\bxjs at tmpb pt\relax\@nnil}
 \def\bxjs at kanjiskip{0pt}
 \newcommand*\setkanjiskip[1]{%
-  \edef\bxjs at kanjiskip{#1}%
+  \bxjs at let@lenexpr\bxjs at kanjiskip{#1}%
   \bxjs at reset@kanjiskip}
 \newcommand*\getkanjiskip{%
   \bxjs at kanjiskip}
@@ -143,7 +153,7 @@
   \bxjs at apply@kanjiskip}
 \def\bxjs at xkanjiskip{0pt}
 \newcommand*\setxkanjiskip[1]{%
-  \edef\bxjs at xkanjiskip{#1}%
+  \bxjs at let@lenexpr\bxjs at xkanjiskip{#1}%
   \bxjs at reset@xkanjiskip}
 \newcommand*\getxkanjiskip{%
   \bxjs at xkanjiskip}

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty	2018-02-12 22:55:46 UTC (rev 46612)
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesPackage{bxjspandoc}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjsp at pkgname{bxjscjkcat}
 \let\bxjsp at engine=n

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls	2018-02-12 22:55:46 UTC (rev 46612)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsreport}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs at clsname{bxjsreport}
 \newif\ifjsc at needsp@tch
@@ -574,6 +574,14 @@
 \def\bxjs at kv@everyparhook at compat{\let\bxjs at everyparhook\bxjs at everyparhook@compat}
 \def\bxjs at kv@everyparhook at modern{\let\bxjs at everyparhook\bxjs at everyparhook@modern}
 \define at key{bxjs}{everyparhook}{\bxjs at set@keyval{everyparhook}{#1}{}}
+\chardef\bxjs at label@section at none=0
+\chardef\bxjs at label@section at compat=1
+\chardef\bxjs at label@section at modern=2
+\let\bxjs at label@section\bxjs at label@section at compat
+\def\bxjs at kv@labelsection at none{\let\bxjs at label@section\bxjs at label@section at none}
+\def\bxjs at kv@labelsection at compat{\let\bxjs at label@section\bxjs at label@section at compat}
+\def\bxjs at kv@labelsection at modern{\let\bxjs at label@section\bxjs at label@section at modern}
+\define at key{bxjs}{label-section}{\bxjs at set@keyval{labelsection}{#1}{}}
 \let\bxjs at ltx@removeelement\@removeelement
 \def\@removeelement#1#2#3{%
   \def\reserved at a{#2}%
@@ -1188,7 +1196,7 @@
     \fi
     ##1}{}}%
   \def\sectionmark##1{\markright{%
-    \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+    \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
     ##1}}}%
 \def\ps at myheadings{%
   \let\@oddfoot\@empty\let\@evenfoot\@empty
@@ -1337,6 +1345,19 @@
     \par\vskip 1.5em
   }
 \fi
+\def\bxjs at label@sect#1{%
+  \expandafter\ifx\csname label#1\endcsname\relax
+    \csname the#1\endcsname
+  \else \csname label#1\endcsname
+  \fi}
+\def\@seccntformat#1{\bxjs at label@sect{#1}\quad}
+\ifnum\bxjs at label@section=\bxjs at label@section at compat\else
+\def\@secapp{\presectionname}
+\def\@secpos{\postsectionname}
+\fi
+\ifnum\bxjs at label@section=\bxjs at label@section at modern
+\def\labelsection{\@secapp\thesection\@secpos}
+\fi
 \def\@startsection#1#2#3#4#5#6{%
   \if at noskipsec \leavevmode \fi
   \par
@@ -1380,7 +1401,7 @@
       \csname #1mark\endcsname{#7}%
       \addcontentsline{toc}{#1}{%
         \ifnum #2>\c at secnumdepth \else
-          \protect\numberline{\csname the#1\endcsname}%
+          \protect\numberline{\bxjs at label@sect{#1}}%
         \fi
         #7}}% 目次にフルネームを載せるなら #8
   \else
@@ -1393,7 +1414,7 @@
     \csname #1mark\endcsname{#7}%
     \addcontentsline{toc}{#1}{%
       \ifnum #2>\c at secnumdepth \else
-        \protect\numberline{\csname the#1\endcsname}%
+        \protect\numberline{\bxjs at label@sect{#1}}%
       \fi
       #7}% 目次にフルネームを載せるならここは #8
   \fi

Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls	2018-02-12 22:55:28 UTC (rev 46611)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls	2018-02-12 22:55:46 UTC (rev 46612)
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsslide}
-  [2018/01/28 v1.7b BXJS document classes]
+  [2018/02/04 v1.7c BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs at clsname{bxjsslide}
 \newif\ifjsc at needsp@tch
@@ -566,6 +566,14 @@
 \def\bxjs at kv@everyparhook at compat{\let\bxjs at everyparhook\bxjs at everyparhook@compat}
 \def\bxjs at kv@everyparhook at modern{\let\bxjs at everyparhook\bxjs at everyparhook@modern}
 \define at key{bxjs}{everyparhook}{\bxjs at set@keyval{everyparhook}{#1}{}}
+\chardef\bxjs at label@section at none=0
+\chardef\bxjs at label@section at compat=1
+\chardef\bxjs at label@section at modern=2
+\let\bxjs at label@section\bxjs at label@section at compat
+\def\bxjs at kv@labelsection at none{\let\bxjs at label@section\bxjs at label@section at none}
+\def\bxjs at kv@labelsection at compat{\let\bxjs at label@section\bxjs at label@section at compat}
+\def\bxjs at kv@labelsection at modern{\let\bxjs at label@section\bxjs at label@section at modern}
+\define at key{bxjs}{label-section}{\bxjs at set@keyval{labelsection}{#1}{}}
 \let\bxjs at ltx@removeelement\@removeelement
 \def\@removeelement#1#2#3{%
   \def\reserved at a{#2}%
@@ -1161,10 +1169,10 @@
         \hbox to \fullwidth{{\rightmark}\hfil\textbf{\thepage}}}\hss}%
     \let\@mkboth\markboth
     \def\sectionmark##1{\markboth{%
-       \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+       \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
        ##1}{}}%
     \def\subsectionmark##1{\markright{%
-       \ifnum \c at secnumdepth >\@ne \thesubsection \hskip1\jsZw\fi
+       \ifnum \c at secnumdepth >\@ne \bxjs at label@sect{subsection}\hskip1\jsZw\fi
        ##1}}%
   }
 \else % if not twoside
@@ -1175,7 +1183,7 @@
         \hbox to \fullwidth{{\rightmark}\hfil\textbf{\thepage}}}\hss}%
     \let\@mkboth\markboth
     \def\sectionmark##1{\markright{%
-        \ifnum \c at secnumdepth >\z@ \thesection \hskip1\jsZw\fi
+        \ifnum \c at secnumdepth >\z@ \bxjs at label@sect{section}\hskip1\jsZw\fi
         ##1}}}
 \fi
 \def\ps at myheadings{%
@@ -1326,6 +1334,19 @@
     \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi
   }
 \fi
+\def\bxjs at label@sect#1{%
+  \expandafter\ifx\csname label#1\endcsname\relax
+    \csname the#1\endcsname
+  \else \csname label#1\endcsname
+  \fi}
+\def\@seccntformat#1{\bxjs at label@sect{#1}\quad}
+\ifnum\bxjs at label@section=\bxjs at label@section at compat\else
+\def\@secapp{\presectionname}
+\def\@secpos{\postsectionname}
+\fi
+\ifnum\bxjs at label@section=\bxjs at label@section at modern
+\def\labelsection{\@secapp\thesection\@secpos}
+\fi
 \def\@startsection#1#2#3#4#5#6{%
   \if at noskipsec \leavevmode \fi
   \par
@@ -1369,7 +1390,7 @@
       \csname #1mark\endcsname{#7}%
       \addcontentsline{toc}{#1}{%
         \ifnum #2>\c at secnumdepth \else
-          \protect\numberline{\csname the#1\endcsname}%
+          \protect\numberline{\bxjs at label@sect{#1}}%
         \fi
         #7}}% 目次にフルネームを載せるなら #8
   \else
@@ -1382,7 +1403,7 @@
     \csname #1mark\endcsname{#7}%
     \addcontentsline{toc}{#1}{%
       \ifnum #2>\c at secnumdepth \else
-        \protect\numberline{\csname the#1\endcsname}%
+        \protect\numberline{\bxjs at label@sect{#1}}%
       \fi
       #7}% 目次にフルネームを載せるならここは #8
   \fi
@@ -1438,9 +1459,13 @@
 \newcounter{paragraph}[subsubsection]
 \newcounter{subparagraph}[paragraph]
 \renewcommand{\thepart}{\@Roman\c at part}
-% \renewcommand{\thesection}{\@arabic\c at section}
+\ifnum\bxjs at label@section=\bxjs at label@section at compat
 \renewcommand{\thesection}{\presectionname\@arabic\c at section\postsectionname}
 \renewcommand{\thesubsection}{\@arabic\c at section.\@arabic\c at subsection}
+\else
+\renewcommand{\thesection}{\@arabic\c at section}
+\renewcommand{\thesubsection}{\thesection.\@arabic\c at subsection}
+\fi
 \renewcommand{\thesubsubsection}{%
    \thesubsection.\@arabic\c at subsubsection}
 \renewcommand{\theparagraph}{%
@@ -1708,10 +1733,16 @@
 \newcommand{\appendix}{\par
   \setcounter{section}{0}%
   \setcounter{subsection}{0}%
+  \ifnum\bxjs at label@section=\bxjs at label@section at compat
   \gdef\presectionname{\appendixname}%
   \gdef\postsectionname{}%
   \gdef\thesection{\presectionname\@Alph\c at section\postsectionname}%
-  \gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}}
+  \gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}%
+  \else
+  \gdef\@secapp{\appendixname}%
+  \gdef\@secpos{}%
+  \gdef\thesection{\@Alph\c at section}%
+  \fi}
 \setlength\arraycolsep{5\p@?}
 \setlength\tabcolsep{6\p@?}
 \setlength\arrayrulewidth{.4\p@}



More information about the tex-live-commits mailing list